[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=4ef2a07

The following commit has been merged in the master branch:
commit 4ef2a07f7b16ab5c72c37d998314c4877630b699
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Tue Jul 1 01:15:23 2014 +0200

    CLI can now list notifications from a device
---
 cli/kdeconnect-cli.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/cli/kdeconnect-cli.cpp b/cli/kdeconnect-cli.cpp
index d425bd3..08accee 100644
--- a/cli/kdeconnect-cli.cpp
+++ b/cli/kdeconnect-cli.cpp
@@ -23,6 +23,7 @@
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <interfaces/devicesmodel.h>
+#include <interfaces/notificationsmodel.h>
 #include <interfaces/dbusinterfaces.h>
 #include <iostream>
 #include <QDBusMessage>
@@ -41,13 +42,13 @@ int main(int argc, char** argv)
     options.add("pair", ki18n("Request pairing to a said device"));
     options.add("unpair", ki18n("Stop pairing to a said device"));
     options.add("ping", ki18n("Sends a ping to said device"));
+    options.add("list-notifications", ki18n("Display the notifications on a said device"));
     options.add("device <dev>", ki18n("Device ID"));
     KCmdLineArgs::addCmdLineOptions( options );
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
     KApplication app;
     if(args->isSet("l")) {
         DevicesModel devices;
-        devices.setDisplayFilter(DevicesModel::StatusUnknown);
         for(int i=0, rows=devices.rowCount(); i<rows; ++i) {
             QModelIndex idx = devices.index(i);
             QString statusInfo;
@@ -62,7 +63,6 @@ int main(int argc, char** argv)
                     statusInfo = "(paired and reachable)";
                     break;
             }
-
             std::cout << "- " << idx.data(Qt::DisplayRole).toString().toStdString()
                       << ": " << idx.data(DevicesModel::IdModelRole).toString().toStdString() << ' ' << statusInfo.toStdString() << std::endl;
         }
@@ -102,8 +102,17 @@ int main(int argc, char** argv)
         } else if(args->isSet("ping")) {
             QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.kdeconnect", "/modules/kdeconnect/devices/"+device+"/ping", "org.kde.kdeconnect.device.ping", "sendPing");
             QDBusConnection::sessionBus().call(msg);
-        } else
+        } else if(args->isSet("list-notifications")) {
+            NotificationsModel notifications;
+            notifications.setDeviceId(device);
+            for(int i=0, rows=notifications.rowCount(); i<rows; ++i) {
+                QModelIndex idx = notifications.index(i);
+                std::cout << "- " << idx.data(NotificationsModel::AppNameModelRole).toString().toStdString()
+                << ": " << idx.data(NotificationsModel::NameModelRole).toString().toStdString() << std::endl;
+            }
+        } else {
             KCmdLineArgs::usageError(i18n("Nothing to be done with the device"));
+        }
     }
     QMetaObject::invokeMethod(&app, "quit", Qt::QueuedConnection);
 

-- 
kdeconnect packaging