[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=42c0a54

The following commit has been merged in the master branch:
commit 42c0a54997605f921c3e32099deeff03fcdc16ca
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Fri Jul 11 08:56:53 2008 +0000

    Add a label for the master presence status to be displayed.
    
    svn path=/trunk/playground/base/plasma/applets/presence/; revision=830797
---
 presence/src/presence.cpp | 38 ++++++++++++++++++++++++++++++--------
 presence/src/presence.h   |  4 ++++
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/presence/src/presence.cpp b/presence/src/presence.cpp
index 2404915..5aa94fc 100644
--- a/presence/src/presence.cpp
+++ b/presence/src/presence.cpp
@@ -46,7 +46,9 @@ PresenceApplet::PresenceApplet(QObject * parent, const QVariantList & args)
     m_engine(0),
     m_colorScheme(0),
     m_messageEdit(0),
+    m_masterStatusLayout(0),
     m_masterIconLabel(0),
+    m_masterStatusMessageLabel(0),
     m_accountsModel(0),
     m_accountsView(0),
     m_layout(0),
@@ -115,9 +117,19 @@ PresenceApplet::widget()
         m_accountsView->header()->setVisible(true);
         m_accountsView->setColumnHidden(0, true);   //Hide the source id column
 
-        // Make sure we have a masterIconPixmap.
+        // Set up the master status section.
+        Q_ASSERT(!m_masterStatusLayout);  // Pointer should still be assigned to 0.
         Q_ASSERT(!m_masterIconLabel);  // Pointer should still be assigned to 0.
+        Q_ASSERT(!m_masterStatusMessageLabel);  // Pointer should still be assigned to 0.
+
+        m_masterStatusLayout = new QHBoxLayout(m_widget);
+
         m_masterIconLabel = new QLabel;
+        m_masterStatusMessageLabel = new QLabel;
+
+        m_masterStatusLayout->addWidget(m_masterIconLabel);
+        m_masterStatusLayout->addWidget(m_masterStatusMessageLabel);
+
         iconChanged();
 
         // Set up the rest of the view/layout etc. stuff.
@@ -128,15 +140,16 @@ PresenceApplet::widget()
         Q_ASSERT(!m_layout);  // Pointer should still be assigned to 0.
         m_widget = new QWidget();
         m_layout = new QVBoxLayout(m_widget);
-        m_layout->addWidget(m_masterIconLabel);
+        m_layout->addLayout(m_masterStatusLayout);
         m_layout->addWidget(m_accountsView);
         m_layout->addWidget(m_messageEdit);
         m_widget->setLayout(m_layout);
 
         // Apply the theme's color scheme to the widget.
+        Q_ASSERT(m_colorScheme);
         QPalette editPalette = m_widget->palette();
-        editPalette.setColor(QPalette::Window,
-                             m_colorScheme->background().color());
+        editPalette.setBrush(QPalette::Window,
+                             m_colorScheme->background());
         m_widget->setPalette(editPalette);
     }
 
@@ -280,11 +293,11 @@ PresenceApplet::updateMasterPresence()
 
     if(statusMessagesAllTheSame)
     {
-        // TODO: Set the master presence status message.
+        masterStatusMessageChanged(previousStatusMessage);
     }
     else
     {
-        // TODO: Set the master presence status message to be QString();
+        masterStatusMessageChanged(QString());
     }
 
     // Next, we work out the overall presence status.
@@ -294,7 +307,7 @@ PresenceApplet::updateMasterPresence()
     int accountsExtendedAway = 0;
     int accountsHidden = 0;
     int accountsBusy = 0;
-    
+
     bool okOffline = true;
     bool okAvailable = true;
     bool okAway = true;
@@ -393,10 +406,19 @@ PresenceApplet::iconChanged()
     // display in the main widget.
     if(m_masterIconLabel)
     {
-        m_masterIconLabel->setPixmap(m_icon->icon().pixmap(QSize(22, 22)));
+        m_masterIconLabel->setPixmap(m_icon->icon().pixmap(QSize(32, 32)));
     }
 }
 
+void
+PresenceApplet::masterStatusMessageChanged(const QString & message)
+{
+    // If m_masterStatusMessageLabel points to a valid QLabel, update it.
+    if(m_masterStatusMessageLabel)
+    {
+        m_masterStatusMessageLabel->setText(message);
+    }
+}
 
 #include "presence.moc"
 
diff --git a/presence/src/presence.h b/presence/src/presence.h
index 2721b75..0e58072 100644
--- a/presence/src/presence.h
+++ b/presence/src/presence.h
@@ -27,6 +27,7 @@
 class KColorScheme;
 class KLineEdit;
 
+class QHBoxLayout;
 class QLabel;
 class QStandardItemModel;
 class QString;
@@ -55,6 +56,7 @@ private Q_SLOTS:
 
 private:
     void iconChanged();
+    void masterStatusMessageChanged(const QString & message);
     void updateMasterPresence();
 
     Plasma::DataEngine * m_engine;
@@ -62,7 +64,9 @@ private:
     KColorScheme * m_colorScheme;
     KLineEdit * m_messageEdit;
 
+    QHBoxLayout * m_masterStatusLayout;
     QLabel * m_masterIconLabel;
+    QLabel * m_masterStatusMessageLabel;
     QStandardItemModel * m_accountsModel;
     QTreeView * m_accountsView;
     QVBoxLayout * m_layout;

-- 
ktp-contact-applet packaging