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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/generic/dataengines/tasks
From:       Chani Armitage <chanika () gmail ! com>
Date:       2010-11-11 14:12:14
Message-ID: 20101111141214.92717AC8A3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1195563 by chani:

add activity info

 M  +1 -0      tasksengine.cpp  
 M  +17 -0     tasksource.cpp  
 M  +1 -0      tasksource.h  


--- trunk/KDE/kdebase/workspace/plasma/generic/dataengines/tasks/tasksengine.cpp \
#1195562:1195563 @@ -107,6 +107,7 @@
     TaskSource *taskSource = new TaskSource(task, this);
     connect(task.constData(), SIGNAL(changed(::TaskManager::TaskChanges)), \
                taskSource, SLOT(updateTask(::TaskManager::TaskChanges)));
     connect(TaskManager::TaskManager::self(), SIGNAL(desktopChanged(int)), \
taskSource, SLOT(updateDesktop(int))); +    connect(TaskManager::TaskManager::self(), \
SIGNAL(activityChanged(QString)), taskSource, SLOT(updateActivity()));  \
addSource(taskSource);  }
 
--- trunk/KDE/kdebase/workspace/plasma/generic/dataengines/tasks/tasksource.cpp \
#1195562:1195563 @@ -97,6 +97,9 @@
             setData("onCurrentDesktop", m_task->isOnCurrentDesktop());
             setData("onAllDesktops", m_task->isOnAllDesktops());
             setData("desktop", m_task->desktop());
+            setData("onCurrentActivity", m_task->isOnCurrentActivity());
+            setData("onAllActivities", m_task->isOnAllActivities());
+            setData("activities", m_task->activities());
             setData("icon", m_task->icon());
             setData("actionMinimize", \
                m_task->info().actionSupported(NET::ActionMinimize));
             setData("actionMaximize", \
m_task->info().actionSupported(NET::ActionMax)); @@ -131,6 +134,11 @@
             setData("onAllDesktops", m_task->isOnAllDesktops());
             setData("desktop", m_task->desktop());
             break;
+            break;
+        case TaskManager::ActivitiesChanged:
+            setData("onCurrentActivity", m_task->isOnCurrentActivity());
+            setData("onAllActivities", m_task->isOnAllActivities());
+            setData("activities", m_task->activities());
         case TaskManager::ActionsChanged:
             setData("actionMinimize", \
                m_task->info().actionSupported(NET::ActionMinimize));
             setData("actionMaximize", \
m_task->info().actionSupported(NET::ActionMax)); @@ -157,4 +165,13 @@
     }
 }
 
+void TaskSource::updateActivity()
+{
+    const bool onCurrentActivity = m_task->isOnCurrentActivity();
+    if (data()["onCurrentActivity"].toBool() != onCurrentActivity) {
+        setData("onCurrentActivity", onCurrentActivity);
+        checkForUpdate();
+    }
+}
+
 #include "tasksource.moc"
--- trunk/KDE/kdebase/workspace/plasma/generic/dataengines/tasks/tasksource.h \
#1195562:1195563 @@ -53,6 +53,7 @@
         void updateStartup(::TaskManager::TaskChanges startupChanges);
         void updateTask(::TaskManager::TaskChanges taskChanges);
         void updateDesktop(int desktop);
+        void updateActivity();
 
     private:
         friend class TasksEngine;


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