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

The following commit has been merged in the master branch:
commit c9e76b75a2f0f4822b7ca8be2b6a5fba89c9f261
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue May 14 14:38:32 2013 +0200

    Chat Plasmoid: Small usability tweaks
    
    Makes sure the text field doesn't have the focus when it's closed (yeah, it
    happens, you can write to a non-visible window)
    Removes a workaround I introduced thinking would be magic and solve all
    problems (because it's hard to reproduce). It didn't.
    Makes sure the plasmoid knows there's no currentIndex when we've closed all
    windows.
    
    REVIEW: 110412
---
 chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml           | 1 -
 chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml | 2 +-
 chat/org.kde.ktp-chat/contents/ui/main.qml                 | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
index 613c6a2..a159d6e 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
@@ -30,7 +30,6 @@ FocusScope {
 
     signal closeRequested
 
-    onFocusChanged: input.focus = true
     Connections {
         target: chatWidget.conv
         onValidChanged: chatWidget.closeRequested()
diff --git a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
index cecf252..b651c6f 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
@@ -74,10 +74,10 @@ ConversationDelegateButton {
                 dialog.x = point.x;
                 dialog.y = point.y;
                 dialog.activateWindow();
-                dialog.mainItem.focus = true;
             } else if(base.currentIndex == index) {
                 closeConversation();
             }
+            dialog.mainItem.focus = visible;
         }
     }
 
diff --git a/chat/org.kde.ktp-chat/contents/ui/main.qml b/chat/org.kde.ktp-chat/contents/ui/main.qml
index 0f18b8b..cea702b 100644
--- a/chat/org.kde.ktp-chat/contents/ui/main.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/main.qml
@@ -112,5 +112,8 @@ Grid {
             popupSide: base.popupSide
         }
         model: handler.conversations
+        onCountChanged: if(base.currentIndex>=conversationsView.count) {
+            base.currentIndex = -1;
+        }
     }
 }

-- 
ktp-contact-applet packaging