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

The following commit has been merged in the master branch:
commit e20ae35ba369c509bebb763f14778315964b84c5
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue May 28 03:12:11 2013 +0100

    Show warning and disable text input when channel is not connected
---
 chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
index 9b77af4..8883d5f 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
@@ -149,7 +149,7 @@ FocusScope {
             top: space.bottom
             left: parent.left
             right: parent.right
-            bottom: input.top
+            bottom: disconnectedLabel.top
             topMargin: 3
             rightMargin: viewScrollBar.width+5
             leftMargin: 5
@@ -208,9 +208,25 @@ FocusScope {
         Behavior on opacity { NumberAnimation { duration: 250 } }
     }
 
+
+    PlasmaComponents.Label {
+        id: disconnectedLabel
+        visible: !conv.valid
+
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: input.top
+        }
+
+        text: i18n("Chat is not connected. You cannot send messages at this time")
+        wrapMode: Text.Wrap
+    }
+
     PlasmaComponents.TextField {
         id: input
         focus: true
+        enabled: conv.valid
 
         anchors {
             left: parent.left

-- 
ktp-contact-applet packaging