[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=350f4e4

The following commit has been merged in the master branch:
commit 350f4e4fc166685aebc2ac320a33027389bb1dc2
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Mar 14 23:52:20 2012 +0000

    Add a scrollbar
---
 org.kde.ktp.contactlist/contents/ui/ContactList.qml | 19 +++++++++++++++++--
 org.kde.ktp.contactlist/contents/ui/main.qml        | 10 ++++------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/org.kde.ktp.contactlist/contents/ui/ContactList.qml b/org.kde.ktp.contactlist/contents/ui/ContactList.qml
index d9d6bab..9ee83b5 100644
--- a/org.kde.ktp.contactlist/contents/ui/ContactList.qml
+++ b/org.kde.ktp.contactlist/contents/ui/ContactList.qml
@@ -18,8 +18,9 @@
  ***************************************************************************/
 
 import Qt 4.7
-import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
+
 import org.kde.telepathy.contactlist 0.1 as KtpContactList
+import org.kde.plasma.components 0.1 as PlasmaComponents
 
 
 
@@ -48,7 +49,7 @@ Item {
             top: parent.top;
             topMargin: 5;
             left: parent.left;
-            right: parent.right;
+            right: viewScrollBar.left;
             bottom: parent.bottom;
         }
 
@@ -58,5 +59,19 @@ Item {
 
         delegate: ListContactDelegate {}
     }
+    
+    PlasmaComponents.ScrollBar {
+        id: viewScrollBar
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            right: parent.right
+        }
+
+        flickableItem: contactsList
+        interactive: true
+        opacity: 1
+        orientation: Qt.Vertical
+    }
 
 }
diff --git a/org.kde.ktp.contactlist/contents/ui/main.qml b/org.kde.ktp.contactlist/contents/ui/main.qml
index 3391c9a..a025a93 100644
--- a/org.kde.ktp.contactlist/contents/ui/main.qml
+++ b/org.kde.ktp.contactlist/contents/ui/main.qml
@@ -29,11 +29,9 @@ Item {
     ContactList {
         id: contactList;
         anchors.fill: parent;
-        anchors.topMargin:10
-        anchors.bottomMargin:10
-        anchors.leftMargin:10
-        anchors.rightMargin:10
-        
-        state: "listView";   // start with list view
+//         anchors.topMargin:10
+//         anchors.bottomMargin:10
+//         anchors.leftMargin:10
+//         anchors.rightMargin:10
     }
 }

-- 
ktp-contact-applet packaging