[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=13b243b

The following commit has been merged in the master branch:
commit 13b243bbe039906ee1f193740892b334593fe05e
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Wed Mar 7 10:49:10 2012 +0100

    Add special button to toggle the presence message editing mode. This effectively returns the combobox back to its normal working state.
    
    Reviewed-by: Dominik Cermak
    REVIEW: 104168
---
 global-presence-chooser.cpp | 6 +++---
 global-presence-chooser.h   | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/global-presence-chooser.cpp b/global-presence-chooser.cpp
index 3d85ea0..9377c37 100644
--- a/global-presence-chooser.cpp
+++ b/global-presence-chooser.cpp
@@ -231,7 +231,7 @@ bool GlobalPresenceChooser::event(QEvent *e)
     }
 
     if (e->type() == QEvent::Resize) {
-        repositionSpinner();
+        repositionOverlays();
     }
 
     if (e->type() == QEvent::KeyPress) {
@@ -323,14 +323,14 @@ void GlobalPresenceChooser::onPresenceChanged(const KTp::Presence &presence)
 void GlobalPresenceChooser::onConnectionStatusChanged(Tp::ConnectionStatus connectionStatus)
 {
     if (connectionStatus == Tp::ConnectionStatusConnecting) {
-        repositionSpinner();
+        repositionOverlays();
         m_busyOverlay->start();
     } else {
         m_busyOverlay->stop();
     }
 }
 
-void GlobalPresenceChooser::repositionSpinner()
+void GlobalPresenceChooser::repositionOverlays()
 {
     //set 2px margins so that the button is not bigger than the combo
     m_changePresenceMessageButton->setMaximumHeight(height() - 2);
diff --git a/global-presence-chooser.h b/global-presence-chooser.h
index e57cfdc..ce96cdf 100644
--- a/global-presence-chooser.h
+++ b/global-presence-chooser.h
@@ -26,6 +26,7 @@
 #include <TelepathyQt/AccountManager>
 #include <KTp/presence.h>
 
+class QPushButton;
 class KPixmapSequenceOverlayPainter;
 class PresenceModel;
 class PresenceModelExtended;
@@ -41,15 +42,17 @@ public:
     explicit GlobalPresenceChooser(QWidget *parent = 0);
     void setAccountManager(const Tp::AccountManagerPtr &accountManager);
 
-    void repositionSpinner();
+    void repositionOverlays();
 
 protected:
     virtual bool event(QEvent *event);
 
-private slots:
+private Q_SLOTS:
     void onCurrentIndexChanged(int index);
     void onPresenceChanged(const KTp::Presence &presence);
     void onConnectionStatusChanged(Tp::ConnectionStatus connectionStatus);
+    void onChangePresenceMessageClicked();
+    void onConfirmPresenceMessageClicked();
 
 private:
     KTp::GlobalPresence *m_globalPresence;
@@ -58,6 +61,7 @@ private:
 
     KPixmapSequenceOverlayPainter *m_busyOverlay;
     Tp::AccountManagerPtr m_accountManager;
+    QPushButton *m_changePresenceMessageButton;
 };
 
 #endif // GLOBALPRESENCECHOOSER_H

-- 
ktp-contact-list packaging