From b942e203c5fb52d18c69e53e4c9fbedcbb046b74 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 8 Dec 2014 21:47:07 +0000 Subject: [PATCH] activities cleanup --- libs/kworkspace/README | 6 - libs/kworkspace/org.kde.ActivityManager.xml | 127 ------------------ plasma/desktop/applets/pager/pager.cpp | 23 ---- plasma/desktop/applets/pager/pager.h | 2 - .../tasks/package/contents/ui/main.qml | 16 --- plasma/desktop/applets/tasks/tasks.cpp | 10 -- plasma/desktop/applets/tasks/tasksConfig.ui | 33 ++--- .../contents/layout.js | 1 - .../generic/dataengines/tasks/tasksource.cpp | 18 --- plasma/generic/dataengines/tasks/tasksource.h | 1 - 10 files changed, 8 insertions(+), 229 deletions(-) delete mode 100644 libs/kworkspace/README delete mode 100644 libs/kworkspace/org.kde.ActivityManager.xml diff --git a/libs/kworkspace/README b/libs/kworkspace/README deleted file mode 100644 index 77c87f12..00000000 --- a/libs/kworkspace/README +++ /dev/null @@ -1,6 +0,0 @@ -Until the KActivity* classes go to kdelibs, the -following files in kdebase need to be synced - -workspace/libs/kworkspace/org.kde.ActivityManager.xml -runtime/activitymanager/org.kde.ActivityManager.xml - diff --git a/libs/kworkspace/org.kde.ActivityManager.xml b/libs/kworkspace/org.kde.ActivityManager.xml deleted file mode 100644 index b03e8262..00000000 --- a/libs/kworkspace/org.kde.ActivityManager.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plasma/desktop/applets/pager/pager.cpp b/plasma/desktop/applets/pager/pager.cpp index 21d9aca3..0e4a3b1f 100644 --- a/plasma/desktop/applets/pager/pager.cpp +++ b/plasma/desktop/applets/pager/pager.cpp @@ -48,8 +48,6 @@ #include #include -#include - #include const int FAST_UPDATE_DELAY = 100; @@ -133,10 +131,6 @@ void Pager::init() recalculateGridSizes(m_rows); setCurrentDesktop(KWindowSystem::currentDesktop()); - - KActivities::Consumer *act = new KActivities::Consumer(this); - connect(act, SIGNAL(currentActivityChanged(QString)), this, SLOT(currentActivityChanged(QString))); - m_currentActivity = act->currentActivity(); } void Pager::updatePagerStyle() @@ -576,17 +570,6 @@ void Pager::recalculateWindowRects() continue; } - //check activity - unsigned long properties[] = { 0, NET::WM2Activities }; - NETWinInfo netInfo(QX11Info::display(), window, QX11Info::appRootWindow(), properties, 2); - QString result(netInfo.activities()); - if (!result.isEmpty() && result != "00000000-0000-0000-0000-000000000000") { - QStringList activities = result.split(','); - if (!activities.contains(m_currentActivity)) { - continue; - } - } - for (int i = 0; i < m_desktopCount; i++) { if (!info.isOnDesktop(i+1)) { continue; @@ -659,12 +642,6 @@ void Pager::currentDesktopChanged(int desktop) startTimerFast(); } -void Pager::currentActivityChanged(const QString &activity) -{ - m_currentActivity = activity; - startTimerFast(); -} - void Pager::numberOfDesktopsChanged(int num) { if (num < 1) { diff --git a/plasma/desktop/applets/pager/pager.h b/plasma/desktop/applets/pager/pager.h index 0450fc17..ce194890 100644 --- a/plasma/desktop/applets/pager/pager.h +++ b/plasma/desktop/applets/pager/pager.h @@ -96,7 +96,6 @@ class Pager : public Plasma::Applet void configAccepted(); void currentDesktopChanged(int desktop); - void currentActivityChanged(const QString &activity); void desktopsSizeChanged(); void numberOfDesktopsChanged(int num); void desktopNamesChanged(); @@ -146,7 +145,6 @@ class Pager : public Plasma::Applet int m_columns; int m_desktopCount; int m_currentDesktop; - QString m_currentActivity; qreal m_widthScaleFactor; qreal m_heightScaleFactor; QSizeF m_size; diff --git a/plasma/desktop/applets/tasks/package/contents/ui/main.qml b/plasma/desktop/applets/tasks/package/contents/ui/main.qml index 3f3669a8..fc31a7fa 100644 --- a/plasma/desktop/applets/tasks/package/contents/ui/main.qml +++ b/plasma/desktop/applets/tasks/package/contents/ui/main.qml @@ -37,7 +37,6 @@ Item { property int maxStripes: 2 property bool forceStripes: false property bool showOnlyCurrentDesktop: false - property bool showOnlyCurrentActivity: false property bool showOnlyMinimized: false property bool showToolTip: true property bool highlightWindows: false @@ -113,21 +112,6 @@ Item { subTextEntries.push(i18n("On %1", task.DesktopName)); } - if (task.OnAllActivities) { - subTextEntries.push(i18nc("Which virtual desktop a window is currently on", - "Available on all activities")); - } else if (tasks.showOnlyCurrentActivity) { - if (task.OtherActivityNames.length > 0) { - subTextEntries.push(i18nc("Activities a window is currently on (apart from the current one)", - "Also available on %1", - task.OtherActivityNames.join(", "))); - } - } else if (task.ActivityNames.length > 0) { - subTextEntries.push(i18nc("Which activities a window is currently on", - "Available on %1", - task.ActivityNames.join(", "))); - } - return subTextEntries.join("
"); } } diff --git a/plasma/desktop/applets/tasks/tasks.cpp b/plasma/desktop/applets/tasks/tasks.cpp index a881e164..f55fa6a3 100644 --- a/plasma/desktop/applets/tasks/tasks.cpp +++ b/plasma/desktop/applets/tasks/tasks.cpp @@ -399,13 +399,6 @@ void Tasks::configChanged() changed = true; } - const bool showOnlyCurrentActivity = cg.readEntry("showOnlyCurrentActivity", true); - if (showOnlyCurrentActivity != m_groupManager->showOnlyCurrentActivity()) { - m_groupManager->setShowOnlyCurrentActivity(showOnlyCurrentActivity); - m_declarativeWidget->rootObject()->setProperty("showOnlyCurrentActivity", showOnlyCurrentActivity); - changed = true; - } - const bool showOnlyCurrentScreen = cg.readEntry("showOnlyCurrentScreen", false); if (showOnlyCurrentScreen != m_groupManager->showOnlyCurrentScreen()) { m_groupManager->setShowOnlyCurrentScreen(showOnlyCurrentScreen); @@ -500,7 +493,6 @@ void Tasks::createConfigurationInterface(KConfigDialog *parent) m_ui.showTooltip->setChecked(m_declarativeWidget->rootObject()->property("showToolTip").toBool()); m_ui.highlightWindows->setChecked(m_highlightWindows); m_ui.showOnlyCurrentDesktop->setChecked(m_groupManager->showOnlyCurrentDesktop()); - m_ui.showOnlyCurrentActivity->setChecked(m_groupManager->showOnlyCurrentActivity()); m_ui.showOnlyCurrentScreen->setChecked(m_groupManager->showOnlyCurrentScreen()); m_ui.showOnlyMinimized->setChecked(m_groupManager->showOnlyMinimized()); m_ui.fillRows->setChecked(m_declarativeWidget->rootObject()->property("forceStripes").toBool()); @@ -567,7 +559,6 @@ void Tasks::createConfigurationInterface(KConfigDialog *parent) connect(m_ui.sortingStrategy, SIGNAL(currentIndexChanged(int)), parent, SLOT(settingsModified())); connect(m_ui.showOnlyCurrentScreen, SIGNAL(toggled(bool)), parent, SLOT(settingsModified())); connect(m_ui.showOnlyCurrentDesktop, SIGNAL(toggled(bool)), parent, SLOT(settingsModified())); - connect(m_ui.showOnlyCurrentActivity, SIGNAL(toggled(bool)), parent, SLOT(settingsModified())); connect(m_ui.showOnlyMinimized, SIGNAL(toggled(bool)), parent, SLOT(settingsModified())); } @@ -581,7 +572,6 @@ void Tasks::configAccepted() KConfigGroup cg = config(); cg.writeEntry("showOnlyCurrentDesktop", m_ui.showOnlyCurrentDesktop->isChecked()); - cg.writeEntry("showOnlyCurrentActivity", m_ui.showOnlyCurrentActivity->isChecked()); cg.writeEntry("showOnlyCurrentScreen", m_ui.showOnlyCurrentScreen->isChecked()); cg.writeEntry("showOnlyMinimized", m_ui.showOnlyMinimized->isChecked()); diff --git a/plasma/desktop/applets/tasks/tasksConfig.ui b/plasma/desktop/applets/tasks/tasksConfig.ui index 129f93de..3ef9e77e 100644 --- a/plasma/desktop/applets/tasks/tasksConfig.ui +++ b/plasma/desktop/applets/tasks/tasksConfig.ui @@ -6,11 +6,14 @@ 0 0 - 479 - 366 + 483 + 324 + + QFormLayout::ExpandingFieldsGrow + @@ -232,7 +235,7 @@ - + 200 0 @@ -315,26 +318,6 @@ - - - Only show tasks from the current activity - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - showOnlyCurrentActivity - - - - - - - - - - - Only show tasks that are minimized @@ -347,14 +330,14 @@ - + - + Qt::Vertical diff --git a/plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/contents/layout.js b/plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/contents/layout.js index 9d857a2a..8f28c1ce 100644 --- a/plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/contents/layout.js +++ b/plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/contents/layout.js @@ -27,7 +27,6 @@ if (freeEdges["bottom"] == true) { panel.height = screenGeometry(panel.screen).height > 1024 ? 35 : 27 panel.addWidget("launcher") -panel.addWidget("org.kde.showActivityManager") pager = panel.addWidget("pager") pager.writeConfig("hideWhenSingleDesktop", "true") tasks = panel.addWidget("tasks") diff --git a/plasma/generic/dataengines/tasks/tasksource.cpp b/plasma/generic/dataengines/tasks/tasksource.cpp index ff377c84..fa2fef7a 100644 --- a/plasma/generic/dataengines/tasks/tasksource.cpp +++ b/plasma/generic/dataengines/tasks/tasksource.cpp @@ -98,8 +98,6 @@ void TaskSource::updateTask(::TaskManager::TaskChanges taskChanges) setData("onCurrentDesktop", taskPtr->isOnCurrentDesktop()); setData("onAllDesktops", taskPtr->isOnAllDesktops()); setData("desktop", taskPtr->desktop()); - setData("onCurrentActivity", taskPtr->isOnCurrentActivity()); - setData("onAllActivities", taskPtr->isOnAllActivities()); setData("activities", taskPtr->activities()); setData("icon", taskPtr->icon()); setData("actionMinimize", taskPtr->info().actionSupported(NET::ActionMinimize)); @@ -135,10 +133,6 @@ void TaskSource::updateTask(::TaskManager::TaskChanges taskChanges) setData("onAllDesktops", taskPtr->isOnAllDesktops()); setData("desktop", taskPtr->desktop()); break; - case TaskManager::ActivitiesChanged: - setData("onCurrentActivity", taskPtr->isOnCurrentActivity()); - setData("onAllActivities", taskPtr->isOnAllActivities()); - setData("activities", taskPtr->activities()); case TaskManager::ActionsChanged: setData("actionMinimize", taskPtr->info().actionSupported(NET::ActionMinimize)); setData("actionMaximize", taskPtr->info().actionSupported(NET::ActionMax)); @@ -168,17 +162,5 @@ void TaskSource::updateDesktop() } } -void TaskSource::updateActivity() -{ - if (!m_task) { - return; - } - - const bool onCurrentActivity = m_task.data()->isOnCurrentActivity(); - if (data()["onCurrentActivity"].toBool() != onCurrentActivity) { - setData("onCurrentActivity", onCurrentActivity); - checkForUpdate(); - } -} #include "tasksource.moc" diff --git a/plasma/generic/dataengines/tasks/tasksource.h b/plasma/generic/dataengines/tasks/tasksource.h index 6f4a0e80..ade51192 100644 --- a/plasma/generic/dataengines/tasks/tasksource.h +++ b/plasma/generic/dataengines/tasks/tasksource.h @@ -49,7 +49,6 @@ class TaskSource : public Plasma::DataContainer void updateStartup(::TaskManager::TaskChanges startupChanges); void updateTask(::TaskManager::TaskChanges taskChanges); void updateDesktop(); - void updateActivity(); private: QWeakPointer< ::TaskManager::Startup > m_startup;