Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-24 02:42:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

more activities cleanup in taskmanager library

Browse source
This commit is contained in:
Ivailo Monev 2014-12-09 01:27:18 +00:00
parent 7aae5c141b
commit 3d36cf07f2
2 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/taskmanager/groupmanager.cpp
View file

@ -84,7 +84,6 @@ public:
* Keep track of changes in Taskmanager * Keep track of changes in Taskmanager
*/ */
void currentDesktopChanged(int); void currentDesktopChanged(int);
void currentActivityChanged(QString);
void taskChanged(::TaskManager::Task *, ::TaskManager::TaskChanges); void taskChanged(::TaskManager::Task *, ::TaskManager::TaskChanges);
void checkScreenChange(); void checkScreenChange();
void taskDestroyed(QObject *item); void taskDestroyed(QObject *item);
@ -575,7 +574,6 @@ void GroupManager::reconnect()
{ {
//kDebug(); //kDebug();
disconnect(TaskManager::self(), SIGNAL(desktopChanged(int)), this, SLOT(currentDesktopChanged(int))); disconnect(TaskManager::self(), SIGNAL(desktopChanged(int)), this, SLOT(currentDesktopChanged(int)));
disconnect(TaskManager::self(), SIGNAL(activityChanged(QString)), this, SLOT(currentActivityChanged(QString)));
disconnect(TaskManager::self(), SIGNAL(windowChanged(::TaskManager::Task *, ::TaskManager::TaskChanges)), disconnect(TaskManager::self(), SIGNAL(windowChanged(::TaskManager::Task *, ::TaskManager::TaskChanges)),
this, SLOT(taskChanged(::TaskManager::Task *, ::TaskManager::TaskChanges))); this, SLOT(taskChanged(::TaskManager::Task *, ::TaskManager::TaskChanges)));
@ -585,10 +583,6 @@ void GroupManager::reconnect()
connect(TaskManager::self(), SIGNAL(desktopChanged(int)), connect(TaskManager::self(), SIGNAL(desktopChanged(int)),
this, SLOT(currentDesktopChanged(int))); this, SLOT(currentDesktopChanged(int)));
} }
if (d->showOnlyCurrentActivity) {
connect(TaskManager::self(), SIGNAL(activityChanged(QString)),
this, SLOT(currentActivityChanged(QString)));
}
connect(TaskManager::self(), SIGNAL(windowChanged(::TaskManager::Task *, ::TaskManager::TaskChanges)), connect(TaskManager::self(), SIGNAL(windowChanged(::TaskManager::Task *, ::TaskManager::TaskChanges)),
this, SLOT(taskChanged(::TaskManager::Task *, ::TaskManager::TaskChanges))); this, SLOT(taskChanged(::TaskManager::Task *, ::TaskManager::TaskChanges)));

26
libs/taskmanager/tasksmodel.h
View file

@ -53,20 +53,18 @@ public:
Desktop = Qt::UserRole + 6, Desktop = Qt::UserRole + 6,
DesktopName = Qt::UserRole + 7, DesktopName = Qt::UserRole + 7,
OnAllActivities = Qt::UserRole + 8, OnAllActivities = Qt::UserRole + 8,
ActivityNames = Qt::UserRole + 9, Shaded = Qt::UserRole + 9,
OtherActivityNames = Qt::UserRole + 10, Maximized = Qt::UserRole + 10,
Shaded = Qt::UserRole + 11, Minimized = Qt::UserRole + 11,
Maximized = Qt::UserRole + 12, FullScreen = Qt::UserRole + 12,
Minimized = Qt::UserRole + 13, BelowOthers = Qt::UserRole + 13,
FullScreen = Qt::UserRole + 14, AlwaysOnTop = Qt::UserRole + 14,
BelowOthers = Qt::UserRole + 15, Active = Qt::UserRole + 15,
AlwaysOnTop = Qt::UserRole + 16, DemandsAttention = Qt::UserRole + 16,
Active = Qt::UserRole + 17, LauncherUrl = Qt::UserRole + 17,
DemandsAttention = Qt::UserRole + 18, WindowList = Qt::UserRole + 18,
LauncherUrl = Qt::UserRole + 19, MimeType = Qt::UserRole + 19,
WindowList = Qt::UserRole + 20, MimeData = Qt::UserRole + 20
MimeType = Qt::UserRole + 21,
MimeData = Qt::UserRole + 22
}; };
explicit TasksModel(GroupManager *groupManager, QObject *parent = 0); explicit TasksModel(GroupManager *groupManager, QObject *parent = 0);