[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=6e222c1

The following commit has been merged in the master branch:
commit 6e222c10784de8f2e0888dbf4158edf7329ab9cd
Author: Abner Silva <abner.silva at kdemail.net>
Date:   Mon Aug 3 14:49:56 2009 +0000

    Using the new global presence widget.
    
    svn path=/trunk/playground/base/plasma/applets/presence/; revision=1006355
---
 presence/CMakeLists.txt   |  3 ++-
 presence/src/presence.cpp | 31 ++++++++++++++++++++++++++++---
 presence/src/presence.h   |  4 ++++
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/presence/CMakeLists.txt b/presence/CMakeLists.txt
index 21a8b21..b3fa636 100644
--- a/presence/CMakeLists.txt
+++ b/presence/CMakeLists.txt
@@ -15,7 +15,8 @@ set(presence_SRCS
 	presence.cpp
     accountimage.cpp
     accountwidget.cpp
-    presencewidget.cpp)
+    presencewidget.cpp
+    globalpresencewidget.cpp)
 
 kde4_add_plugin(plasma_applet_presence ${presence_SRCS})
 target_link_libraries(plasma_applet_presence
diff --git a/presence/src/presence.cpp b/presence/src/presence.cpp
index f2d67ed..0289f2a 100644
--- a/presence/src/presence.cpp
+++ b/presence/src/presence.cpp
@@ -23,6 +23,7 @@
 // Own
 #include "presence.h"
 #include "accountwidget.h"
+#include "globalpresencewidget.h"
 
 // Plasma
 #include <Plasma/Theme>
@@ -45,7 +46,10 @@ PresenceApplet::PresenceApplet(QObject *parent, const QVariantList &args)
       m_engine(0),
       m_widget(0),
       m_layout(0),
-      m_colorScheme(0)
+      m_colorScheme(0),
+      m_global(0),
+      m_globalWidget(0),
+      m_globalLayout(0)
 {
     KGlobal::locale()->insertCatalog("plasma_applet_presence");
     setBackgroundHints(StandardBackground);
@@ -70,6 +74,13 @@ void PresenceApplet::init()
             KColorScheme::View,
             Plasma::Theme::defaultTheme()->colorScheme());
 
+    // Create a new extender item for global presence
+    if (!extender()->hasItem("Global")) {
+        ExtenderItem *item = new ExtenderItem(extender());
+        item->setName("Global");
+        initExtenderItem(item);
+    }
+
     // Create a new extender item for accounts
     if (!extender()->hasItem("Accounts")) {
         ExtenderItem *item = new ExtenderItem(extender());
@@ -94,6 +105,20 @@ void PresenceApplet::init()
 
 void PresenceApplet::initExtenderItem(Plasma::ExtenderItem *item)
 {
+    // Set up global presence
+    if (item->name() == "Global") {
+        m_globalWidget = new QGraphicsWidget(item);
+        m_globalLayout = new QGraphicsLinearLayout(Qt::Vertical, m_globalWidget);
+        m_globalLayout->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+        m_globalWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+        m_globalWidget->setLayout (m_globalLayout);
+
+        m_global = new GlobalPresenceWidget(this);
+        m_globalLayout->addItem(m_global);
+        item->setWidget(m_globalWidget);
+        item->setTitle(i18n("Global Presence"));
+    }
+
     // Set up user accounts
     if (item->name() == "Accounts") {
         m_widget = new QGraphicsWidget(item);
@@ -103,7 +128,7 @@ void PresenceApplet::initExtenderItem(Plasma::ExtenderItem *item)
         m_widget->setLayout (m_layout);
 
         item->setWidget(m_widget);
-        item->setTitle(i18n("User accounts"));
+        item->setTitle(i18n("User Accounts"));
     }
 }
 
@@ -112,7 +137,7 @@ void PresenceApplet::onSourceAdded(const QString &source)
     kDebug() << "PresenceApplet::onSourceAdded: source:" << source;
 
     if (!m_accounts.contains(source)) {
-        AccountWidget *account = new AccountWidget();
+        AccountWidget *account = new AccountWidget(this);
         account->setId(source);
         connect(account, SIGNAL(presenceChanged(const QString&, const QString&)),
                 this, SLOT(onPresenceChanged(const QString&, const QString&)));
diff --git a/presence/src/presence.h b/presence/src/presence.h
index d28b08b..d2bbf7b 100644
--- a/presence/src/presence.h
+++ b/presence/src/presence.h
@@ -38,6 +38,7 @@ namespace Plasma {
 class KColorScheme;
 
 class AccountWidget;
+class GlobalPresenceWidget;
 
 class PresenceApplet : public Plasma::PopupApplet
 {
@@ -71,6 +72,9 @@ private:
     QGraphicsLinearLayout *m_layout;
     KColorScheme *m_colorScheme;
     QHash<QString, AccountWidget*> m_accounts;
+    GlobalPresenceWidget *m_global;
+    QGraphicsWidget *m_globalWidget;
+    QGraphicsLinearLayout *m_globalLayout;
 };
 
 K_EXPORT_PLASMA_APPLET(presence, PresenceApplet)

-- 
ktp-contact-applet packaging