[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=f9445b1

The following commit has been merged in the master branch:
commit f9445b101c8023331aa3f92cb377f265c3574156
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Mar 14 21:57:29 2012 +0000

    Remove pointless code, and broken resizing
---
 src/declarative/contents/ui/ContactList.qml |  5 +----
 src/declarative/contents/ui/main.qml        | 22 ++++++----------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/declarative/contents/ui/ContactList.qml b/src/declarative/contents/ui/ContactList.qml
index 168bcd9..d4c7d39 100644
--- a/src/declarative/contents/ui/ContactList.qml
+++ b/src/declarative/contents/ui/ContactList.qml
@@ -33,10 +33,7 @@ import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
 
 Item {
     id: contactListContainer;
-    anchors.fill: parent;
-
-
-    
+    anchors.fill: parent;    
     
     // TOOLBAR
     ToolBar {
diff --git a/src/declarative/contents/ui/main.qml b/src/declarative/contents/ui/main.qml
index ce90088..9bb1ec8 100644
--- a/src/declarative/contents/ui/main.qml
+++ b/src/declarative/contents/ui/main.qml
@@ -22,19 +22,18 @@ import Qt 4.7
 Item {
     id: main;
 
-    // these settings are made to stay in bounds of the Plasma::DeclarativeWidget
-    x: 10;
-    y:10;
-
+    anchors.fill: parent
     // plasmoid starting size
-    /// TODO load this from KConfig and read from C++
-    width: 230;
-    height: 380;
 
     // contact listview
     ContactList {
         id: contactList;
         anchors.fill: parent;
+        anchors.topMargin:10
+        anchors.bottomMargin:10
+        anchors.leftMargin:10
+        anchors.rightMargin:10
+        
         state: "listView";   // start with list view
     }
 
@@ -44,13 +43,4 @@ Item {
 //         border.color: "green"
 //     }
 
-    function onWidthChanged()
-    {
-        main.width = TelepathyContactList.width - 20;
-    }
-
-    function onHeightChanged()
-    {
-        main.height = TelepathyContactList.height - 20;
-    }
 }

-- 
ktp-contact-applet packaging