[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=0f003e0

The following commit has been merged in the master branch:
commit 0f003e0b9a6a62694b7e851b3b31f1dd6e2059a2
Author: Lasath Fernando <kde at lasath.org>
Date:   Tue Feb 14 11:14:44 2012 +1100

    Hide message header in chatArea if sequential message
---
 plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ChatWidget.qml   | 2 +-
 plasmoid/org.kde.ktp-chatplasmoid/contents/ui/TextDelegate.qml | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ChatWidget.qml b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ChatWidget.qml
index e3052b8..592cd44 100644
--- a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ChatWidget.qml
+++ b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ChatWidget.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.1
 import org.kde.telepathy.chat 0.1
 import org.kde.plasma.core 0.1 as PlasmaCore
 import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
diff --git a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/TextDelegate.qml b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/TextDelegate.qml
index 9fd6e0b..2e1115d 100644
--- a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/TextDelegate.qml
+++ b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/TextDelegate.qml
@@ -28,6 +28,13 @@ Item {
         text: "<b>[" + Qt.formatTime(model.time) + "] " + model.user + " :</b>"
 
         verticalAlignment: Text.AlignBottom
+
+        visible: !model.continuing
+        Component.onCompleted: {
+            if(model.continuing) {
+                height = 0;
+            }
+        }
     }
     PlasmaComponents.Label {
         id: body
@@ -39,7 +46,7 @@ Item {
         color: textColor
         text: model.text
         textFormat: Text.RichText
-        verticalAlignment: Text.AlignTop
+        height: paintedHeight
     }
 
     height: header.height + body.height

-- 
ktp-text-ui packaging