[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=81c1ff5

The following commit has been merged in the master branch:
commit 81c1ff550830c138c952895f77bae2deaa0fb184
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Jul 17 01:31:02 2012 +0200

    Make the minimize button a separate button
    
    Improves the minimize feature discoverability.
    
    REVIEW: 105542
    BUG: 293488
---
 .../contents/ui/ChatWidget.qml                     | 35 ++++++++++++++++++----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ChatWidget.qml b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ChatWidget.qml
index 90cc07d..5eea8b7 100644
--- a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ChatWidget.qml
+++ b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ChatWidget.qml
@@ -21,9 +21,11 @@
 import QtQuick 1.1
 import org.kde.telepathy.chat 0.1
 import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
+import org.kde.qtextracomponents 0.1 as ExtraComponents
 import org.kde.plasma.components 0.1 as PlasmaComponents
 
 Item {
+    id: chatWidget
     property Conversation conv
 
     signal closeRequested
@@ -38,19 +40,41 @@ Item {
         }
         height: 24
 
-        PlasmaComponents.ToolButton {
-            id: contactButton
-
+        ExtraComponents.QIconItem {
+            id: contactIcon
             anchors {
                 top: parent.top
                 left: parent.left
-                right: popoutButton.left
                 bottom: parent.bottom
+                margins: 3
             }
+            width: height
+
+            icon: conv.target.presenceIcon
+        }
 
+        PlasmaComponents.Label {
+            id: contactName
+            anchors {
+                left: contactIcon.right
+                right: minimizeButton.left
+                top: parent.top
+                bottom: parent.bottom
+                leftMargin: 5
+            }
             text: conv.target.nick
-            iconSource: conv.target.presenceIcon
+        }
+
+        PlasmaComponents.ToolButton {
+            id: minimizeButton
+
+            anchors {
+                top: parent.top
+                right: popoutButton.left
+                bottom: parent.bottom
+            }
 
+            iconSource: "arrow-down"
             onClicked: closeRequested()
         }
 
@@ -103,6 +127,7 @@ Item {
             left: parent.left
             right: parent.right
             bottom: input.top
+            topMargin: 3
             rightMargin: viewScrollBar.width+5
             leftMargin: 5
         }

-- 
ktp-text-ui packaging