[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=551960d

The following commit has been merged in the master branch:
commit 551960d4ac8b8b84ee00113c318ad80960cf9c6e
Author: Aleix Pol <aleixpol at kde.org>
Date:   Mon Apr 14 00:06:58 2014 +0200

    Make the plasmoid display an icon when on compact representation
---
 .../contents/ui/ConversationDelegateButton.qml      |  4 ++--
 .../contents/ui/Presence.qml                        | 21 ++++++++++++---------
 .../org.kde.ktp-contactlist/contents/ui/main.qml    | 12 +++++++++++-
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
index fb3621c..a04f6e4 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
@@ -29,13 +29,13 @@ PlasmaComponents.ToolButton
 {
     property variant account
     property variant contact
-    property alias avatar: icon.icon
+    property alias avatar: icon.source
     property string title
     property var presenceIconName
     property alias overlay: overlayLoader.sourceComponent
     checked: base.currentIndex==index
 
-    ExtraComponents.QIconItem {
+    PlasmaCore.IconItem {
         id: icon
         opacity: dropArea.dragging ? 0.5 : 1
         anchors {
diff --git a/chat/org.kde.ktp-chat/contents/ui/main.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/Presence.qml
similarity index 78%
copy from chat/org.kde.ktp-chat/contents/ui/main.qml
copy to contactlist/org.kde.ktp-contactlist/contents/ui/Presence.qml
index bd67635..575d97f 100644
--- a/chat/org.kde.ktp-chat/contents/ui/main.qml
+++ b/contactlist/org.kde.ktp-contactlist/contents/ui/Presence.qml
@@ -1,5 +1,4 @@
 /***************************************************************************
- *   Copyright (C) 2011 by Francesco Nwokeka <francesco.nwokeka at gmail.com> *
  *   Copyright (C) 2014 by Aleix Pol Gonzalez <aleixpol at kde.org>           *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,14 +17,18 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-import QtQuick 2.1
-import org.kde.plasma.plasmoid 2.0
+import QtQuick 2.0
+import org.kde.kquickcontrolsaddons 2.0
+import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components 2.0 as PlasmaComponents
+import org.kde.telepathy 0.1
 
-QtObject
+PlasmaCore.IconItem
 {
-    Plasmoid.switchWidth: 0
-    Plasmoid.switchHeight: 0
-    Plasmoid.preferredRepresentation: Plasmoid.fullRepresentation
-    Plasmoid.fullRepresentation: FullChatList {}
-    Plasmoid.onActivated: Plasmoid.fullRepresentationItem.activate()
+    id: panelIconWidget
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: plasmoid.expanded = !plasmoid.expanded
+    }
 }
diff --git a/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
index a1a377e..b7527bb 100644
--- a/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
+++ b/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
@@ -22,13 +22,23 @@ import QtQuick 2.1
 import org.kde.telepathy 0.1 as KTp
 import org.kde.plasma.plasmoid 2.0
 
-QtObject
+Item
 {
+    id: root
+
     Plasmoid.switchWidth: 200
     Plasmoid.switchHeight: 300
 
     Plasmoid.fullRepresentation: ContactList {}
+    Plasmoid.compactRepresentation: Presence {
+        source: ktpPresence.currentPresenceIcon
+    }
 
+
+    KTp.GlobalPresence {
+        id: ktpPresence
+        accountManager: telepathyManager.accountManager
+    }
     Component.onCompleted: {
         telepathyManager.addContactListFeatures();
         telepathyManager.becomeReady();

-- 
ktp-contact-applet packaging