[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=1809514

The following commit has been merged in the master branch:
commit 18095146bda2f6b104a7d54c37d421baf09574f3
Author: Aleix Pol <aleixpol at kde.org>
Date:   Mon Apr 14 01:19:40 2014 +0200

    Add the rest of the actions for the new contact list plasmoid
---
 .../org.kde.ktp-contactlist/contents/ui/main.qml   | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
index bcd4cad..baa5d26 100644
--- a/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
+++ b/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
@@ -62,5 +62,28 @@ Item
             plasmoid.action(actionName).triggered.connect(f);
         }
         plasmoid.setActionSeparator("statuses");
+
+        // application actions
+        plasmoid.setAction("openIMSettings", i18n("Instant Messaging Settings..."), "telepathy-kde");
+        plasmoid.setAction("openContactList", i18n("Contact List..."), "meeting-attending");
+        plasmoid.setActionSeparator("applications");
+
+        plasmoid.setAction("addContact", i18n("Add New Contacts..."), "list-add-user");
+        plasmoid.setAction("joinChatRoom", i18n("Join Chat Room..."), "im-irc");
+
+        if (telepathyManager.canDial) {
+            plasmoid.setAction("dial", i18n("Make a Call..."), "internet-telephony");
+        }
+        if (telepathyManager.canSendFile) {
+            plasmoid.setAction("sendFile", i18n("Send a File..."), "mail-attachment");
+        }
+        plasmoid.setActionSeparator("actions");
     }
+
+    function action_dial() { telepathyManager.openDialUi(); }
+    function action_sendFile() { telepathyManager.openDialUi(); }
+    function action_addContact() { telepathyManager.addContact(); }
+    function action_joinChatRoom() { telepathyManager.joinChatRoom(); }
+    function action_openContactList() { telepathyManager.toggleContactList(); }
+    function action_openIMSettings() {telepathyManager.showSettingsKCM(); }
 }

-- 
ktp-contact-applet packaging