[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=749ede8

The following commit has been merged in the master branch:
commit 749ede8940f012ad8d5fe151404e156e135bce53
Author: Aleix Pol <aleixpol at kde.org>
Date:   Fri Oct 31 18:04:09 2014 +0100

    Re-work the conversation toolbar
    
    Add tooltips
    Use RowLayout
    Drop the hide conversation button, as we already have the parent plasmoid
    for that.
---
 chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml | 72 +++++-------------------
 1 file changed, 15 insertions(+), 57 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
index 68fcc88..eb20fd2 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
@@ -19,6 +19,7 @@
 */
 
 import QtQuick 2.1
+import QtQuick.Layouts 1.1
 import org.kde.telepathy 0.1
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
@@ -29,55 +30,39 @@ FocusScope {
 
     signal closeRequested
 
-    Item {
+    RowLayout {
         id: titleArea
+        clip: true
         anchors {
-            margins: 5
             top: parent.top
             left: parent.left
             right: parent.right
         }
-        height: 24
+        spacing: 3
+        height: 30
 
         PlasmaCore.IconItem {
-            id: contactIcon
-            anchors {
-                top: parent.top
-                left: parent.left
-                bottom: parent.bottom
-                margins: 3
-            }
-            width: height
+            Layout.fillHeight: true
 
             source: conv.presenceIcon
         }
 
         PlasmaComponents.Label {
-            id: contactName
-            anchors {
-                left: contactIcon.right
-                right: pinButton.left
-                top: parent.top
-                bottom: parent.bottom
-                leftMargin: 5
-            }
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+
             text: conv.title
             elide: Text.ElideRight
         }
 
         PlasmaComponents.ToolButton {
-            id: pinButton
-
-            anchors {
-                top: parent.top
-                right: minimizeButton.left
-                bottom: parent.bottom
-            }
+            Layout.fillHeight: true
             checkable: true
             checked: pin.pinned
 
             iconSource: "rating"
             onClicked: pin.toggle()
+            tooltip: i18n("Pin contact")
             ContactPin {
                 id: pin
                 model: pinnedModel
@@ -87,43 +72,16 @@ FocusScope {
         }
 
         PlasmaComponents.ToolButton {
-            id: minimizeButton
-
-            anchors {
-                top: parent.top
-                right: popoutButton.left
-                bottom: parent.bottom
-            }
-
-            iconSource: "arrow-down"
-            onClicked: closeRequested()
-        }
-
-        PlasmaComponents.ToolButton {
-            id: popoutButton
-
-            anchors {
-                top: parent.top
-                right: closeButton.left
-                bottom: parent.bottom
-            }
-
+            Layout.fillHeight: true
             iconSource: "view-conversation-balloon"
-
+            tooltip: i18n("Move conversation into a window")
             onClicked: conv.delegateToProperClient()
         }
 
         PlasmaComponents.ToolButton {
-            id: closeButton
-
-            anchors {
-                top: parent.top
-                right: parent.right
-                bottom: parent.bottom
-            }
-
+            Layout.fillHeight: true
             iconSource: "dialog-close"
-
+            tooltip: i18n("Close conversation")
             onClicked: conv.requestClose()
         }
     }

-- 
ktp-contact-applet packaging