[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=5b6a18b

The following commit has been merged in the master branch:
commit 5b6a18b4926f94dc69bb6e2f4cbf30ee79b0a252
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Apr 17 16:34:33 2012 +0200

    Improve size managing in the Chat Plasmoid
    
    Report the list size as the minimum size
    If its shape is vertical (width<height) set a vertical orientation. This lets you put the plasmoid on a vertical panel
    
    REVIEW: 104633
---
 plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml | 7 ++++---
 plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop     | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml
index f548c33..b39208c 100644
--- a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml
+++ b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml
@@ -6,8 +6,10 @@ import org.kde.plasma.components 0.1 as PlasmaComponents
 ListView {
     id: base
     anchors.fill: parent
-    orientation: Qt.Horizontal
     spacing: 5
+    property alias minimumHeight: base.contentHeight
+    property alias minimumWidth: base.contentWidth
+    orientation: width>height ? ListView.Horizontal : ListView.Vertical
 
     model: handler.conversations
 
@@ -19,8 +21,7 @@ ListView {
         //FIXME: rename the two variables named 'conv' as it's confusing
         property alias active: conv.checked
         id: conv
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
+        height: Math.min(base.width, base.height)
 
         image: model.conversation.target.avatar
         overlayText: model.conversation.messages.unreadCount
diff --git a/plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop b/plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop
index f949f65..8279924 100644
--- a/plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop
+++ b/plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop
@@ -21,7 +21,6 @@ Icon=kde-telepathy
 
 X-Plasma-API=declarativeappletscript
 X-Plasma-MainScript=ui/main.qml
-X-Plasma-DefaultSize=300,68
 X-Plasma-RequiredExtensions=LaunchApp
 
 X-KDE-PluginInfo-Author=Lasath Fernando

-- 
ktp-text-ui packaging