Add ProxyModel for filtering for plugins

interfaces/CMakeLists.txt

@@ -16,6 +16,7 @@ set(libkdeconnect_SRC
     conversationmessage.cpp
     remotecommandsmodel.cpp
     remotesinksmodel.cpp
+    devicespluginfilterproxymodel.cpp
 #    modeltest.cpp
 )
 

interfaces/devicespluginfilterproxymodel.cpp

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2019 Nicolas Fella <nicolas.fella@gmx.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "devicespluginfilterproxymodel.h"
+
+bool DevicesPluginFilterProxyModel::filterAcceptsRow(int source_row, const QModelIndex & source_parent) const {
+    const QModelIndex idx = sourceModel()->index(source_row, 0, source_parent);
+    auto device = qobject_cast<DeviceDbusInterface*>(idx.data(DevicesModel::DeviceRole).value<QObject*>());
+    return device->hasPlugin(m_pluginFilter);
+}
+
+void DevicesPluginFilterProxyModel::setPluginFilter(const QString plugin)
+{
+    m_pluginFilter = plugin;
+}
+
+QString DevicesPluginFilterProxyModel::pluginFilter() const
+{
+    return m_pluginFilter;
+}

interfaces/devicespluginfilterproxymodel.h

@@ -0,0 +1,42 @@
+/**
+ * Copyright 2019 Nicolas Fella <nicolas.fella@gmx.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef DEVICESPLUGINFILTERPROXYMODEL_H
+#define DEVICESPLUGINFILTERPROXYMODEL_H
+
+#include "devicessortproxymodel.h"
+#include "dbusinterfaces.h"
+#include "devicesmodel.h"
+
+class KDECONNECTINTERFACES_EXPORT DevicesPluginFilterProxyModel : public DevicesSortProxyModel
+{
+    Q_OBJECT
+    Q_PROPERTY(QString pluginFilter READ pluginFilter WRITE setPluginFilter)
+public:
+    bool filterAcceptsRow(int source_row, const QModelIndex & source_parent) const override;
+    void setPluginFilter(const QString plugin);
+    QString pluginFilter() const;
+
+private:
+    QString m_pluginFilter;
+};
+
+#endif
+

urlhandler/kdeconnect-handler.cpp

@@ -32,7 +32,7 @@
 #include <dbushelper.h>
 
 #include <interfaces/devicesmodel.h>
-#include <interfaces/devicessortproxymodel.h>
+#include <interfaces/devicespluginfilterproxymodel.h>
 #include <interfaces/dbusinterfaces.h>
 #include <interfaces/dbushelpers.h>
 #include "kdeconnect-version.h"
@@ -41,16 +41,6 @@
 /**
  * Show only devices that can be shared to
  */
-class ShareDevicesProxyModel : public DevicesSortProxyModel
-{
-    Q_OBJECT
-public:
-    bool filterAcceptsRow(int source_row, const QModelIndex & source_parent) const override {
-        const QModelIndex idx = sourceModel()->index(source_row, 0, source_parent);
-        auto device = qobject_cast<DeviceDbusInterface*>(idx.data(DevicesModel::DeviceRole).value<QObject*>());
-        return device->supportedPlugins().contains(QStringLiteral("kdeconnect_share"));
-    }
-};
 
 int main(int argc, char** argv)
 {
@@ -86,7 +76,8 @@ int main(int argc, char** argv)
 
     DevicesModel model;
     model.setDisplayFilter(DevicesModel::Paired | DevicesModel::Reachable);
-    ShareDevicesProxyModel proxyModel;
+    DevicesPluginFilterProxyModel proxyModel;
+    proxyModel.setPluginFilter(QStringLiteral("kdeconnect_share"));
     proxyModel.setSourceModel(&model);
 
     QDialog dialog;
@@ -129,5 +120,3 @@ int main(int argc, char** argv)
         return 1;
     }
 }
-
-#include "kdeconnect-handler.moc"