[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace
From:       Ivan Čukić <ivan.cukic () kde ! org>
Date:       2010-11-03 19:02:57
Message-ID: 20101103190257.D4055AC89B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1192693 by ivan:

signal rename: changed -> infoChanged

 M  +2 -2      libs/kworkspace/kactivityinfo.cpp  
 M  +2 -2      libs/kworkspace/kactivityinfo.h  
 M  +1 -1      libs/kworkspace/kactivityinfo_p.h  
 M  +9 -0      libs/kworkspace/kactivitymanager_p.cpp  
 M  +11 -0     libs/kworkspace/kactivitymanager_p.h  
 M  +3 -3      plasma/desktop/shell/activity.cpp  
 M  +1 -1      plasma/desktop/shell/activity.h  
 M  +1 -1      plasma/desktop/shell/activitymanager/activityicon.cpp  


--- trunk/KDE/kdebase/workspace/libs/kworkspace/kactivityinfo.cpp #1192692:1192693
@@ -71,7 +71,7 @@
 IMPLEMENT_SIGNAL_HANDLER(ActivityRemoved, removed)
 IMPLEMENT_SIGNAL_HANDLER(ActivityStarted, started)
 IMPLEMENT_SIGNAL_HANDLER(ActivityStopped, stopped)
-IMPLEMENT_SIGNAL_HANDLER(ActivityChanged, changed)
+IMPLEMENT_SIGNAL_HANDLER(ActivityChanged, infoChanged)
 
 #undef IMPLEMENT_SIGNAL_HANDLER
 
@@ -92,7 +92,7 @@
             this, SLOT(activityStateChanged(const QString &, int)));
 
     connect(KActivityManager::self(), SIGNAL(ActivityChanged(const QString &)),
-            this, SLOT(changed(const QString &)));
+            this, SLOT(infoChanged(const QString &)));
 
     connect(KActivityManager::self(), SIGNAL(ActivityAdded(const QString &)),
             this, SLOT(added(const QString &)));
--- trunk/KDE/kdebase/workspace/libs/kworkspace/kactivityinfo.h #1192692:1192693
@@ -182,7 +182,7 @@
     /**
      * Emitted when the activity's name, icon or description is changed
      */
-    void changed();
+    void infoChanged();
 
     /**
      * Emitted when the activity is added
@@ -219,7 +219,7 @@
     Q_PRIVATE_SLOT(d, void removed(const QString &))
     Q_PRIVATE_SLOT(d, void started(const QString &))
     Q_PRIVATE_SLOT(d, void stopped(const QString &))
-    Q_PRIVATE_SLOT(d, void changed(const QString &))
+    Q_PRIVATE_SLOT(d, void infoChanged(const QString &))
 };
 
 #endif // ACTIVITY_INFO_H
--- trunk/KDE/kdebase/workspace/libs/kworkspace/kactivityinfo_p.h #1192692:1192693
@@ -33,7 +33,7 @@
     void removed(const QString &) const;
     void started(const QString &) const;
     void stopped(const QString &) const;
-    void changed(const QString &) const;
+    void infoChanged(const QString &) const;
 
     KActivityInfo *q;
     QString id;
--- trunk/KDE/kdebase/workspace/libs/kworkspace/kactivitymanager_p.cpp \
#1192692:1192693 @@ -37,6 +37,8 @@
             QDBusConnection::sessionBus()
             )
 {
+    connect(&m_watcher, SIGNAL(serviceOwnerChanged(const QString &, const QString &, \
const QString &)), +            this, SLOT(serviceOwnerChanged(const QString &, const \
QString &, const QString &)));  }
 
 KActivityManager * KActivityManager::self()
@@ -72,3 +74,10 @@
     return QDBusConnection::sessionBus().interface()->isServiceRegistered(ACTIVITY_MANAGER_DBUS_PATH);
  }
 
+void KActivityManager::serviceOwnerChanged(const QString & serviceName, const \
QString & oldOwner, const QString & newOwner) +{
+    if (serviceName == ACTIVITY_MANAGER_DBUS_PATH) {
+        emit presenceChanged(!newOwner.isEmpty());
+    }
+}
+
--- trunk/KDE/kdebase/workspace/libs/kworkspace/kactivitymanager_p.h #1192692:1192693
@@ -22,15 +22,26 @@
 
 #include "activitymanager_interface.h"
 
+#include <QDBusServiceWatcher>
+
 class KActivityManager: public org::kde::ActivityManager {
+    Q_OBJECT
 public:
     static KActivityManager * self();
 
     static bool isActivityServiceRunning();
 
+public Q_SLOTS:
+    void serviceOwnerChanged(const QString & serviceName, const QString & oldOwner, \
const QString & newOwner); +
+Q_SIGNALS:
+    void presenceChanged(bool present);
+
 private:
     KActivityManager();
 
+    QDBusServiceWatcher m_watcher;
+
     static KActivityManager * s_instance;
 };
 
--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/activity.cpp #1192692:1192693
@@ -47,7 +47,7 @@
       m_id(id),
       m_info(new KActivityInfo(id, this))
 {
-    connect(m_info, SIGNAL(changed()), this, SLOT(activityChanged()));
+    connect(m_info, SIGNAL(infoChanged()), this, SLOT(activityChanged()));
 
     if (m_info) {
         m_name = m_info->name();
@@ -206,7 +206,7 @@
 
     m_name = name;
     KActivityController().setActivityName(m_id, name);
-    emit changed();
+    emit infoChanged();
 
     foreach (Plasma::Containment *c, m_containments) {
         c->context()->setCurrentActivity(name);
@@ -222,7 +222,7 @@
     m_icon = icon;
 
     KActivityController().setActivityIcon(m_id, icon);
-    emit changed();
+    emit infoChanged();
 }
 
 void Activity::updateActivityName(Plasma::Context *context)
--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/activity.h #1192692:1192693
@@ -89,7 +89,7 @@
     const KActivityInfo * info() const;
 
 signals:
-    void changed();
+    void infoChanged();
 
     void opened();
     void closed();
--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/activitymanager/activityicon.cpp \
#1192692:1192693 @@ -98,7 +98,7 @@
     connect(this, SIGNAL(clicked(Plasma::AbstractIcon*)), m_activity, \
SLOT(activate()));  connect(m_activity, SIGNAL(opened()), this, \
SLOT(updateButtons()));  connect(m_activity, SIGNAL(closed()), this, \
                SLOT(updateButtons()));
-    connect(m_activity, SIGNAL(changed()), this, SLOT(updateContents()));
+    connect(m_activity, SIGNAL(infoChanged()), this, SLOT(updateContents()));
     setName(m_activity->name());
 
     setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));


[prev in list] [next in list] [prev in thread] [next in thread]