[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=19ebafe

The following commit has been merged in the master branch:
commit 19ebafedd3dea93aef6efeced15a9b2155b0cbbd
Author: Roman Nazarenko <me at jtalk.me>
Date:   Sun Mar 3 22:10:23 2013 +0600

    busyOverlay now hides if presence chooser is editable.
    
    REVIEW: 109262
    BUG: 292282
---
 global-presence-chooser.cpp | 20 ++++++++++++++++----
 global-presence-chooser.h   |  1 +
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/global-presence-chooser.cpp b/global-presence-chooser.cpp
index 9e7994f..f748197 100644
--- a/global-presence-chooser.cpp
+++ b/global-presence-chooser.cpp
@@ -176,16 +176,15 @@ GlobalPresenceChooser::GlobalPresenceChooser(QWidget *parent) :
     KComboBox(parent),
     m_globalPresence(new KTp::GlobalPresence(this)),
     m_model(new PresenceModel(this)),
-    m_modelExtended(new PresenceModelExtended(m_model, this))
+    m_modelExtended(new PresenceModelExtended(m_model, this)),
+    m_busyOverlay(new KPixmapSequenceOverlayPainter(this))
 {
     this->setModel(m_modelExtended);
-    setEditable(false);
     //needed for mousemove events
     setMouseTracking(true);
 
-    m_busyOverlay = new KPixmapSequenceOverlayPainter(this);
     m_busyOverlay->setSequence(KPixmapSequence("process-working"));
-    m_busyOverlay->setWidget(this);
+    setEditable(false);
 
     onPresenceChanged(m_globalPresence->currentPresence());
 
@@ -297,6 +296,19 @@ bool GlobalPresenceChooser::event(QEvent *e)
     return KComboBox::event(e); // krazy:exclude=qclasses
 }
 
+void GlobalPresenceChooser::setEditable(bool editable)
+{
+    if (editable) {
+        m_busyOverlay->setWidget(0);
+    } else {
+        m_busyOverlay->setWidget(this);
+        if (m_globalPresence->connectionStatus() == Tp::ConnectionStatusConnecting) {
+            m_busyOverlay->start(); // If telepathy is still connecting, overlay must be spinning again.
+        }
+    }
+    KComboBox::setEditable(editable);
+}
+
 void GlobalPresenceChooser::onCurrentIndexChanged(int index)
 {
     if (index == -1) {
diff --git a/global-presence-chooser.h b/global-presence-chooser.h
index d7a19c4..678681c 100644
--- a/global-presence-chooser.h
+++ b/global-presence-chooser.h
@@ -47,6 +47,7 @@ public:
 
 protected:
     virtual bool event(QEvent *event);
+    virtual void setEditable(bool editable); /** Hides overlay and calls ancestor's method. */
 
 private Q_SLOTS:
     void onCurrentIndexChanged(int index);

-- 
ktp-contact-list packaging