[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:28:24 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=60d8593
The following commit has been merged in the master branch:
commit 60d85932db73f6fd20817172321260c03225bda6
Author: Albert Vaca <albertvaka at gmail.com>
Date: Sun Mar 22 23:08:37 2015 -0700
Sort devices alphabetically in KCM
---
kcm/devicessortproxymodel.cpp | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/kcm/devicessortproxymodel.cpp b/kcm/devicessortproxymodel.cpp
index b83e78c..02d02a6 100644
--- a/kcm/devicessortproxymodel.cpp
+++ b/kcm/devicessortproxymodel.cpp
@@ -40,10 +40,23 @@ void DevicesSortProxyModel::sourceDataChanged(QModelIndex , QModelIndex )
bool DevicesSortProxyModel::lessThan(const QModelIndex& left, const QModelIndex& right) const
{
- QVariant leftData = sourceModel()->data(left, Qt::InitialSortOrderRole);
- QVariant rightData = sourceModel()->data(right, Qt::InitialSortOrderRole);
+ QAbstractItemModel* model = sourceModel();
+ Q_ASSERT(qobject_cast<DevicesModel*>(model));
+
+ //Show connected devices first
+ int statusLeft = model->data(left, DevicesModel::StatusModelRole).toInt();
+ int statusRight = model->data(right, DevicesModel::StatusModelRole).toInt();
+
+ if (statusLeft != statusRight) {
+ return statusLeft > statusRight;
+ }
+
+ //Fallback to alphabetical order
+ QString nameLeft = model->data(left, DevicesModel::NameModelRole).toString();
+ QString nameRight = model->data(right, DevicesModel::NameModelRole).toString();
+
+ return nameLeft > nameRight;
- return leftData.toInt() > rightData.toInt();
}
bool DevicesSortProxyModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list