diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,7 @@ ) find_package(LibKWorkspace CONFIG REQUIRED) -find_package(LibTaskManager CONFIG REQUIRED) +find_package(LibLegacyTaskManager CONFIG REQUIRED) find_package(KWinDBusInterface CONFIG REQUIRED) find_package(ScreenSaverDBusInterface CONFIG REQUIRED) find_package(KRunnerAppDBusInterface CONFIG REQUIRED) diff --git a/applets/CMakeLists.txt b/applets/CMakeLists.txt --- a/applets/CMakeLists.txt +++ b/applets/CMakeLists.txt @@ -2,9 +2,9 @@ add_subdirectory(kickoff) add_subdirectory(trash) -# tasks and windowlist depend on libs/taskmanager -add_subdirectory(taskmanager) -add_subdirectory(icontasks) +# tasks and windowlist depend on libs/legacytaskmanager +add_subdirectory(legacytaskmanager) +add_subdirectory(legacyicontasks) plasma_install_package(window-list org.kde.plasma.windowlist) if(KF5Activities_FOUND) diff --git a/applets/icontasks/CMakeLists.txt b/applets/legacyicontasks/CMakeLists.txt rename from applets/icontasks/CMakeLists.txt rename to applets/legacyicontasks/CMakeLists.txt --- a/applets/icontasks/CMakeLists.txt +++ b/applets/legacyicontasks/CMakeLists.txt @@ -1,2 +1,2 @@ -install(FILES metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-applet-org.kde.plasma.icontasks.desktop) -install(FILES metadata.desktop DESTINATION ${PLASMA_DATA_INSTALL_DIR}/plasmoids/org.kde.plasma.icontasks ) +install(FILES metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-applet-org.kde.plasma.legacyicontasks.desktop) +install(FILES metadata.desktop DESTINATION ${PLASMA_DATA_INSTALL_DIR}/plasmoids/org.kde.plasma.legacyicontasks ) diff --git a/applets/icontasks/metadata.desktop b/applets/legacyicontasks/metadata.desktop rename from applets/icontasks/metadata.desktop rename to applets/legacyicontasks/metadata.desktop --- a/applets/icontasks/metadata.desktop +++ b/applets/legacyicontasks/metadata.desktop @@ -125,11 +125,11 @@ X-Plasma-API=declarativeappletscript X-Plasma-MainScript=ui/main.qml X-Plasma-Provides=org.kde.plasma.multitasking -X-Plasma-RootPath=org.kde.plasma.taskmanager +X-Plasma-RootPath=org.kde.plasma.legacytaskmanager X-KDE-PluginInfo-Author=Eike Hein X-KDE-PluginInfo-Email=hein@kde.org -X-KDE-PluginInfo-Name=org.kde.plasma.icontasks +X-KDE-PluginInfo-Name=org.kde.plasma.legacyicontasks X-KDE-PluginInfo-Version=2.0 X-KDE-PluginInfo-Website=http://userbase.kde.org/Plasma/Tasks X-KDE-PluginInfo-Category=Windows and Tasks diff --git a/applets/taskmanager/CMakeLists.txt b/applets/legacytaskmanager/CMakeLists.txt rename from applets/taskmanager/CMakeLists.txt rename to applets/legacytaskmanager/CMakeLists.txt --- a/applets/taskmanager/CMakeLists.txt +++ b/applets/legacytaskmanager/CMakeLists.txt @@ -1,23 +1,23 @@ -add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.taskmanager\") +add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.legacytaskmanager\") -plasma_install_package(package org.kde.plasma.taskmanager) +plasma_install_package(package org.kde.plasma.legacytaskmanager) -set(taskmanagerplugin_SRCS +set(legacytaskmanagerplugin_SRCS plugin/backend.cpp plugin/draghelper.cpp - plugin/taskmanagerplugin.cpp + plugin/legacytaskmanagerplugin.cpp plugin/textlabel.cpp plugin/smartlaunchers/smartlauncherbackend.cpp plugin/smartlaunchers/smartlauncheritem.cpp ) -install(FILES plugin/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/taskmanager) +install(FILES plugin/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/legacytaskmanager) -add_library(taskmanagerplugin SHARED ${taskmanagerplugin_SRCS}) +add_library(legacytaskmanagerplugin SHARED ${legacytaskmanagerplugin_SRCS}) -target_link_libraries(taskmanagerplugin - PW::LibTaskManager +target_link_libraries(legacytaskmanagerplugin + PW::LibLegacyTaskManager Qt5::Core Qt5::DBus Qt5::Qml @@ -32,4 +32,4 @@ KF5::Service KF5::WindowSystem) -install(TARGETS taskmanagerplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/taskmanager) +install(TARGETS legacytaskmanagerplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/legacytaskmanager) diff --git a/applets/taskmanager/Messages.sh b/applets/legacytaskmanager/Messages.sh rename from applets/taskmanager/Messages.sh rename to applets/legacytaskmanager/Messages.sh --- a/applets/taskmanager/Messages.sh +++ b/applets/legacytaskmanager/Messages.sh @@ -1,4 +1,4 @@ #! /usr/bin/env bash $EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp -$XGETTEXT `find . -name \*.js -o -name \*.qml -o -name \*.cpp` -o $podir/plasma_applet_org.kde.plasma.taskmanager.pot +$XGETTEXT `find . -name \*.js -o -name \*.qml -o -name \*.cpp` -o $podir/plasma_applet_org.kde.plasma.legacytaskmanager.pot rm -f rc.cpp diff --git a/applets/taskmanager/package/contents/code/layout.js b/applets/legacytaskmanager/package/contents/code/layout.js rename from applets/taskmanager/package/contents/code/layout.js rename to applets/legacytaskmanager/package/contents/code/layout.js diff --git a/applets/taskmanager/package/contents/code/tools.js b/applets/legacytaskmanager/package/contents/code/tools.js rename from applets/taskmanager/package/contents/code/tools.js rename to applets/legacytaskmanager/package/contents/code/tools.js diff --git a/applets/taskmanager/package/contents/config/config.qml b/applets/legacytaskmanager/package/contents/config/config.qml rename from applets/taskmanager/package/contents/config/config.qml rename to applets/legacytaskmanager/package/contents/config/config.qml diff --git a/applets/taskmanager/package/contents/config/main.xml b/applets/legacytaskmanager/package/contents/config/main.xml rename from applets/taskmanager/package/contents/config/main.xml rename to applets/legacytaskmanager/package/contents/config/main.xml diff --git a/applets/taskmanager/package/contents/ui/ConfigGeneral.qml b/applets/legacytaskmanager/package/contents/ui/ConfigGeneral.qml rename from applets/taskmanager/package/contents/ui/ConfigGeneral.qml rename to applets/legacytaskmanager/package/contents/ui/ConfigGeneral.qml --- a/applets/taskmanager/package/contents/ui/ConfigGeneral.qml +++ b/applets/legacytaskmanager/package/contents/ui/ConfigGeneral.qml @@ -124,7 +124,7 @@ title: i18n("Grouping and Sorting") flat: true - visible: (plasmoid.pluginName != "org.kde.plasma.icontasks") + visible: (plasmoid.pluginName != "org.kde.plasma.legacyicontasks") ColumnLayout { GridLayout { @@ -196,7 +196,7 @@ CheckBox { id: showOnlyMinimized - visible: (plasmoid.pluginName != "org.kde.plasma.icontasks") + visible: (plasmoid.pluginName != "org.kde.plasma.legacyicontasks") text: i18n("Show only tasks that are minimized") } diff --git a/applets/taskmanager/package/contents/ui/GroupDialog.qml b/applets/legacytaskmanager/package/contents/ui/GroupDialog.qml rename from applets/taskmanager/package/contents/ui/GroupDialog.qml rename to applets/legacytaskmanager/package/contents/ui/GroupDialog.qml diff --git a/applets/taskmanager/package/contents/ui/GroupExpanderOverlay.qml b/applets/legacytaskmanager/package/contents/ui/GroupExpanderOverlay.qml rename from applets/taskmanager/package/contents/ui/GroupExpanderOverlay.qml rename to applets/legacytaskmanager/package/contents/ui/GroupExpanderOverlay.qml diff --git a/applets/taskmanager/package/contents/ui/MouseHandler.qml b/applets/legacytaskmanager/package/contents/ui/MouseHandler.qml rename from applets/taskmanager/package/contents/ui/MouseHandler.qml rename to applets/legacytaskmanager/package/contents/ui/MouseHandler.qml --- a/applets/taskmanager/package/contents/ui/MouseHandler.qml +++ b/applets/legacytaskmanager/package/contents/ui/MouseHandler.qml @@ -46,7 +46,7 @@ var above = target.childAt(event.x, event.y); // HACK: plasmoid.configuration.sortingStrategy is an integer representation - // of the TaskManager::GroupManager::TaskSortingStrategy enum. + // of the LegacyTaskManager::GroupManager::TaskSortingStrategy enum. if (tasks.dragSource && backend.sortingStrategy == 1) { if (tasks.dragSource != above) { itemMove(tasks.dragSource.itemId, diff --git a/applets/taskmanager/package/contents/ui/Task.qml b/applets/legacytaskmanager/package/contents/ui/Task.qml rename from applets/taskmanager/package/contents/ui/Task.qml rename to applets/legacytaskmanager/package/contents/ui/Task.qml --- a/applets/taskmanager/package/contents/ui/Task.qml +++ b/applets/legacytaskmanager/package/contents/ui/Task.qml @@ -23,7 +23,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.draganddrop 2.0 -import org.kde.plasma.private.taskmanager 0.1 as TaskManager +import org.kde.plasma.private.legacytaskmanager 0.1 as LegacyTaskManager import "../code/layout.js" as LayoutManager import "../code/tools.js" as TaskTools @@ -108,9 +108,9 @@ onReleased: { if (pressed) { if (mouse.button == Qt.MidButton) { - if (plasmoid.configuration.middleClickAction == TaskManager.Backend.NewInstance) { + if (plasmoid.configuration.middleClickAction == LegacyTaskManager.Backend.NewInstance) { tasks.launchNewInstance(model.Id); - } else if (plasmoid.configuration.middleClickAction == TaskManager.Backend.Close) { + } else if (plasmoid.configuration.middleClickAction == LegacyTaskManager.Backend.Close) { tasks.closeByItemId(model.Id); } } else if (mouse.button == Qt.LeftButton) { @@ -158,8 +158,8 @@ onSmartLauncherEnabledChanged: { if (smartLauncherEnabled && !smartLauncherItem) { var smartLauncher = Qt.createQmlObject(" - import org.kde.plasma.private.taskmanager 0.1 as TaskManager; - TaskManager.SmartLauncherItem { }", task); + import org.kde.plasma.private.legacytaskmanager 0.1 as LegacyTaskManager; + LegacyTaskManager.SmartLauncherItem { }", task); smartLauncher.launcherUrl = Qt.binding(function() { return model.LauncherUrl; }); @@ -342,7 +342,7 @@ ] } - TaskManager.TextLabel { + LegacyTaskManager.TextLabel { id: label anchors { diff --git a/applets/taskmanager/package/contents/ui/TaskBadgeOverlay.qml b/applets/legacytaskmanager/package/contents/ui/TaskBadgeOverlay.qml rename from applets/taskmanager/package/contents/ui/TaskBadgeOverlay.qml rename to applets/legacytaskmanager/package/contents/ui/TaskBadgeOverlay.qml diff --git a/applets/taskmanager/package/contents/ui/TaskList.qml b/applets/legacytaskmanager/package/contents/ui/TaskList.qml rename from applets/taskmanager/package/contents/ui/TaskList.qml rename to applets/legacytaskmanager/package/contents/ui/TaskList.qml diff --git a/applets/taskmanager/package/contents/ui/TaskProgressOverlay.qml b/applets/legacytaskmanager/package/contents/ui/TaskProgressOverlay.qml rename from applets/taskmanager/package/contents/ui/TaskProgressOverlay.qml rename to applets/legacytaskmanager/package/contents/ui/TaskProgressOverlay.qml diff --git a/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml b/applets/legacytaskmanager/package/contents/ui/ToolTipDelegate.qml rename from applets/taskmanager/package/contents/ui/ToolTipDelegate.qml rename to applets/legacytaskmanager/package/contents/ui/ToolTipDelegate.qml diff --git a/applets/taskmanager/package/contents/ui/ToolTipWindowMouseArea.qml b/applets/legacytaskmanager/package/contents/ui/ToolTipWindowMouseArea.qml rename from applets/taskmanager/package/contents/ui/ToolTipWindowMouseArea.qml rename to applets/legacytaskmanager/package/contents/ui/ToolTipWindowMouseArea.qml diff --git a/applets/taskmanager/package/contents/ui/main.qml b/applets/legacytaskmanager/package/contents/ui/main.qml rename from applets/taskmanager/package/contents/ui/main.qml rename to applets/legacytaskmanager/package/contents/ui/main.qml --- a/applets/taskmanager/package/contents/ui/main.qml +++ b/applets/legacytaskmanager/package/contents/ui/main.qml @@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.private.taskmanager 0.1 as TaskManager +import org.kde.plasma.private.legacytaskmanager 0.1 as LegacyTaskManager import "../code/layout.js" as LayoutManager import "../code/tools.js" as TaskTools @@ -34,7 +34,7 @@ anchors.fill: parent property bool vertical: (plasmoid.formFactor == PlasmaCore.Types.Vertical) - property bool iconsOnly: (plasmoid.pluginName == "org.kde.plasma.icontasks") + property bool iconsOnly: (plasmoid.pluginName == "org.kde.plasma.legacyicontasks") Plasmoid.preferredRepresentation: Plasmoid.fullRepresentation @@ -79,7 +79,7 @@ taskList.height = LayoutManager.layoutHeight(); } - TaskManager.Backend { + LegacyTaskManager.Backend { id: backend taskManagerItem: tasks @@ -185,7 +185,7 @@ value: !iconsOnly } - TaskManager.DragHelper { + LegacyTaskManager.DragHelper { id: dragHelper dragIconSize: units.iconSizes.medium diff --git a/applets/taskmanager/package/metadata.desktop b/applets/legacytaskmanager/package/metadata.desktop rename from applets/taskmanager/package/metadata.desktop rename to applets/legacytaskmanager/package/metadata.desktop --- a/applets/taskmanager/package/metadata.desktop +++ b/applets/legacytaskmanager/package/metadata.desktop @@ -163,7 +163,7 @@ X-KDE-PluginInfo-Author=Eike Hein X-KDE-PluginInfo-Email=hein@kde.org -X-KDE-PluginInfo-Name=org.kde.plasma.taskmanager +X-KDE-PluginInfo-Name=org.kde.plasma.legacytaskmanager X-KDE-PluginInfo-Version=3.0 X-KDE-PluginInfo-Website=http://userbase.kde.org/Plasma/Tasks X-KDE-PluginInfo-Category=Windows and Tasks diff --git a/applets/taskmanager/plugin/backend.h b/applets/legacytaskmanager/plugin/backend.h rename from applets/taskmanager/plugin/backend.h rename to applets/legacytaskmanager/plugin/backend.h --- a/applets/taskmanager/plugin/backend.h +++ b/applets/legacytaskmanager/plugin/backend.h @@ -29,7 +29,7 @@ class QQuickItem; class QQuickWindow; -namespace TaskManager { +namespace LegacyTaskManager { class BasicMenu; class LauncherItem; } @@ -44,7 +44,7 @@ Q_PROPERTY(QObject* groupManager READ groupManager CONSTANT) Q_PROPERTY(QObject* tasksModel READ tasksModel CONSTANT) - Q_PROPERTY(QQuickItem* taskManagerItem READ taskManagerItem WRITE setTaskManagerItem NOTIFY taskManagerItemChanged) + Q_PROPERTY(QQuickItem* taskManagerItem READ taskManagerItem WRITE setLegacyTaskManagerItem NOTIFY taskManagerItemChanged) Q_PROPERTY(QQuickItem* toolTipItem READ toolTipItem WRITE setToolTipItem NOTIFY toolTipItemChanged) Q_PROPERTY(bool anyTaskNeedsAttention READ anyTaskNeedsAttention) Q_PROPERTY(bool showingContextMenu READ showingContextMenu NOTIFY showingContextMenuChanged) @@ -64,11 +64,11 @@ Backend(QObject *parent = 0); ~Backend(); - TaskManager::GroupManager *groupManager() const; - TaskManager::TasksModel *tasksModel() const; + LegacyTaskManager::GroupManager *groupManager() const; + LegacyTaskManager::TasksModel *tasksModel() const; QQuickItem* taskManagerItem() const; - void setTaskManagerItem(QQuickItem *item); + void setLegacyTaskManagerItem(QQuickItem *item); QQuickItem* toolTipItem() const; void setToolTipItem(QQuickItem *item); @@ -120,14 +120,14 @@ void launchersChanged(); private: - void addJumpListActions(const QUrl &launcherUrl, TaskManager::BasicMenu *menu) const; - void addRecentDocumentActions(TaskManager::LauncherItem *launcher, - TaskManager::BasicMenu *menu) const; + void addJumpListActions(const QUrl &launcherUrl, LegacyTaskManager::BasicMenu *menu) const; + void addRecentDocumentActions(LegacyTaskManager::LauncherItem *launcher, + LegacyTaskManager::BasicMenu *menu) const; void updateWindowHighlight(); - TaskManager::GroupManager *m_groupManager; - TaskManager::TasksModel *m_tasksModel; - QPointer m_contextMenu; + LegacyTaskManager::GroupManager *m_groupManager; + LegacyTaskManager::TasksModel *m_tasksModel; + QPointer m_contextMenu; QQuickItem* m_taskManagerItem; QPointer m_toolTipItem; WId m_panelWinId; diff --git a/applets/taskmanager/plugin/backend.cpp b/applets/legacytaskmanager/plugin/backend.cpp rename from applets/taskmanager/plugin/backend.cpp rename to applets/legacytaskmanager/plugin/backend.cpp --- a/applets/taskmanager/plugin/backend.cpp +++ b/applets/legacytaskmanager/plugin/backend.cpp @@ -53,8 +53,8 @@ using namespace KAStats::Terms; Backend::Backend(QObject* parent) : QObject(parent), - m_groupManager(new TaskManager::GroupManager(this)), - m_tasksModel(new TaskManager::TasksModel(m_groupManager, this)), + m_groupManager(new LegacyTaskManager::GroupManager(this)), + m_tasksModel(new LegacyTaskManager::TasksModel(m_groupManager, this)), m_contextMenu(0), m_taskManagerItem(0), m_toolTipItem(0), @@ -70,12 +70,12 @@ delete m_contextMenu; } -TaskManager::GroupManager* Backend::groupManager() const +LegacyTaskManager::GroupManager* Backend::groupManager() const { return m_groupManager; } -TaskManager::TasksModel* Backend::tasksModel() const +LegacyTaskManager::TasksModel* Backend::tasksModel() const { return m_tasksModel; } @@ -85,7 +85,7 @@ return m_taskManagerItem; } -void Backend::setTaskManagerItem(QQuickItem* item) +void Backend::setLegacyTaskManagerItem(QQuickItem* item) { if (item != m_taskManagerItem) { m_taskManagerItem = item; @@ -150,7 +150,7 @@ void Backend::setGroupingStrategy(int groupingStrategy) { // FIXME TODO: This is fucking terrible. - m_groupManager->setGroupingStrategy(static_cast(groupingStrategy)); + m_groupManager->setGroupingStrategy(static_cast(groupingStrategy)); } int Backend::sortingStrategy() const @@ -161,7 +161,7 @@ void Backend::setSortingStrategy(int sortingStrategy) { // FIXME TODO: This is fucking terrible. - m_groupManager->setSortingStrategy(static_cast(sortingStrategy)); + m_groupManager->setSortingStrategy(static_cast(sortingStrategy)); } void Backend::updateLaunchersCache() @@ -210,22 +210,22 @@ void Backend::activateItem(int id, bool toggle) { - TaskManager::AbstractGroupableItem* item = m_groupManager->rootGroup()->getMemberById(id); + LegacyTaskManager::AbstractGroupableItem* item = m_groupManager->rootGroup()->getMemberById(id); if (!item) { return; } - if (item->itemType() == TaskManager::TaskItemType && !item->isStartupItem()) { - TaskManager::TaskItem* taskItem = static_cast(item); + if (item->itemType() == LegacyTaskManager::TaskItemType && !item->isStartupItem()) { + LegacyTaskManager::TaskItem* taskItem = static_cast(item); if (toggle) { taskItem->task()->activateRaiseOrIconify(); } else { taskItem->task()->activate(); } - } else if (item->itemType() == TaskManager::LauncherItemType) { - static_cast(item)->launch(); + } else if (item->itemType() == LegacyTaskManager::LauncherItemType) { + static_cast(item)->launch(); } } @@ -236,34 +236,34 @@ void Backend::closeByWinId(int winId) { - TaskManager::AbstractGroupableItem *item = m_groupManager->rootGroup()->getMemberByWId(winId); + LegacyTaskManager::AbstractGroupableItem *item = m_groupManager->rootGroup()->getMemberByWId(winId); if (item) { item->close(); } } void Backend::closeByItemId(int itemId) { - TaskManager::AbstractGroupableItem *item = m_groupManager->rootGroup()->getMemberById(itemId); + LegacyTaskManager::AbstractGroupableItem *item = m_groupManager->rootGroup()->getMemberById(itemId); if (item) { item->close(); } } void Backend::launchNewInstance(int id) { - TaskManager::AbstractGroupableItem* item = m_groupManager->rootGroup()->getMemberById(id); + LegacyTaskManager::AbstractGroupableItem* item = m_groupManager->rootGroup()->getMemberById(id); if (item) { item->launchNewInstance(); } } void Backend::itemContextMenu(QQuickItem *item, QObject *configAction) { - TaskManager::AbstractGroupableItem* agItem = m_groupManager->rootGroup()->getMemberById(item->property("itemId").toInt()); + LegacyTaskManager::AbstractGroupableItem* agItem = m_groupManager->rootGroup()->getMemberById(item->property("itemId").toInt()); if (!KAuthorized::authorizeKAction("kwin_rmb") || !item || !item->window() || !agItem) { return; @@ -279,18 +279,18 @@ actionList << action; } - if (agItem->itemType() == TaskManager::TaskItemType && !agItem->isStartupItem()) { - TaskManager::TaskItem* taskItem = static_cast(agItem); - m_contextMenu = new TaskManager::BasicMenu(0, taskItem, m_groupManager, actionList); + if (agItem->itemType() == LegacyTaskManager::TaskItemType && !agItem->isStartupItem()) { + LegacyTaskManager::TaskItem* taskItem = static_cast(agItem); + m_contextMenu = new LegacyTaskManager::BasicMenu(0, taskItem, m_groupManager, actionList); addJumpListActions(taskItem->launcherUrl(), m_contextMenu); - } else if (agItem->itemType() == TaskManager::GroupItemType) { - TaskManager::TaskGroup* taskGroup = static_cast(agItem); + } else if (agItem->itemType() == LegacyTaskManager::GroupItemType) { + LegacyTaskManager::TaskGroup* taskGroup = static_cast(agItem); const int maxWidth = 0.8 * (window ? window->screen()->size().width() : 1.0); - m_contextMenu = new TaskManager::BasicMenu(0, taskGroup, m_groupManager, actionList, QList (), maxWidth); + m_contextMenu = new LegacyTaskManager::BasicMenu(0, taskGroup, m_groupManager, actionList, QList (), maxWidth); addJumpListActions(taskGroup->launcherUrl(), m_contextMenu); - } else if (agItem->itemType() == TaskManager::LauncherItemType) { - TaskManager::LauncherItem *launcher = static_cast(agItem); - m_contextMenu = new TaskManager::BasicMenu(0, launcher, m_groupManager, actionList); + } else if (agItem->itemType() == LegacyTaskManager::LauncherItemType) { + LegacyTaskManager::LauncherItem *launcher = static_cast(agItem); + m_contextMenu = new LegacyTaskManager::BasicMenu(0, launcher, m_groupManager, actionList); addRecentDocumentActions(launcher, m_contextMenu); addJumpListActions(launcher->launcherUrl(), m_contextMenu); } @@ -339,7 +339,7 @@ } // Close menu when the delegate is destroyed. - connect(item, &QQuickItem::destroyed, m_contextMenu.data(), &TaskManager::BasicMenu::deleteLater); + connect(item, &QQuickItem::destroyed, m_contextMenu.data(), &LegacyTaskManager::BasicMenu::deleteLater); if (m_windowsToHighlight.count()) { m_windowsToHighlight.clear(); @@ -358,7 +358,7 @@ emit showingContextMenuChanged(); - QPointer guard(m_contextMenu); + QPointer guard(m_contextMenu); m_contextMenu->exec(pos); if (!guard) { return; @@ -370,7 +370,7 @@ }); } -void Backend::addJumpListActions(const QUrl &launcherUrl, TaskManager::BasicMenu *menu) const +void Backend::addJumpListActions(const QUrl &launcherUrl, LegacyTaskManager::BasicMenu *menu) const { if (!menu || !launcherUrl.isValid() || !launcherUrl.isLocalFile() || !KDesktopFile::isDesktopFile(launcherUrl.toLocalFile())) { return; @@ -420,7 +420,7 @@ } } -void Backend::addRecentDocumentActions(TaskManager::LauncherItem *launcher, TaskManager::BasicMenu* menu) const +void Backend::addRecentDocumentActions(LegacyTaskManager::LauncherItem *launcher, LegacyTaskManager::BasicMenu* menu) const { if (!launcher || !menu || !launcher->launcherUrl().isLocalFile()) { return; @@ -557,7 +557,7 @@ { m_windowsToHighlight.clear(); - TaskManager::AbstractGroupableItem* item = m_groupManager->rootGroup()->getMemberById(id); + LegacyTaskManager::AbstractGroupableItem* item = m_groupManager->rootGroup()->getMemberById(id); if (item && hovered) { m_windowsToHighlight = QList::fromSet(item->winIds()); @@ -606,23 +606,23 @@ void Backend::itemMove(int id, int newIndex) { - TaskManager::AbstractGroupableItem *item = m_groupManager->rootGroup()->getMemberById(id); + LegacyTaskManager::AbstractGroupableItem *item = m_groupManager->rootGroup()->getMemberById(id); if (item) { m_groupManager->manualSortingRequest(item, newIndex); } } void Backend::itemGeometryChanged(QQuickItem *item, int id) { - TaskManager:: AbstractGroupableItem *agItem = m_groupManager->rootGroup()->getMemberById(id); + LegacyTaskManager:: AbstractGroupableItem *agItem = m_groupManager->rootGroup()->getMemberById(id); - if (!item || !item->window() || !agItem || agItem->itemType() != TaskManager::TaskItemType) + if (!item || !item->window() || !agItem || agItem->itemType() != LegacyTaskManager::TaskItemType) { return; } - TaskManager::TaskItem *taskItem = static_cast(agItem); + LegacyTaskManager::TaskItem *taskItem = static_cast(agItem); if (!taskItem->task()) { return; @@ -652,7 +652,7 @@ void Backend::presentWindows(int groupParentId) { - TaskManager::AbstractGroupableItem *item = m_groupManager->rootGroup()->getMemberById(groupParentId); + LegacyTaskManager::AbstractGroupableItem *item = m_groupManager->rootGroup()->getMemberById(groupParentId); if (item && m_taskManagerItem && m_taskManagerItem->window()) { if (m_windowsToHighlight.count()) { diff --git a/applets/taskmanager/plugin/blur.cpp b/applets/legacytaskmanager/plugin/blur.cpp rename from applets/taskmanager/plugin/blur.cpp rename to applets/legacytaskmanager/plugin/blur.cpp diff --git a/applets/taskmanager/plugin/draghelper.h b/applets/legacytaskmanager/plugin/draghelper.h rename from applets/taskmanager/plugin/draghelper.h rename to applets/legacytaskmanager/plugin/draghelper.h diff --git a/applets/taskmanager/plugin/draghelper.cpp b/applets/legacytaskmanager/plugin/draghelper.cpp rename from applets/taskmanager/plugin/draghelper.cpp rename to applets/legacytaskmanager/plugin/draghelper.cpp diff --git a/applets/taskmanager/plugin/taskmanagerplugin.h b/applets/legacytaskmanager/plugin/legacytaskmanagerplugin.h rename from applets/taskmanager/plugin/taskmanagerplugin.h rename to applets/legacytaskmanager/plugin/legacytaskmanagerplugin.h --- a/applets/taskmanager/plugin/taskmanagerplugin.h +++ b/applets/legacytaskmanager/plugin/legacytaskmanagerplugin.h @@ -23,7 +23,7 @@ #include #include -class TaskManagerPlugin : public QQmlExtensionPlugin +class LegacyTaskManagerPlugin : public QQmlExtensionPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") diff --git a/applets/taskmanager/plugin/taskmanagerplugin.cpp b/applets/legacytaskmanager/plugin/legacytaskmanagerplugin.cpp rename from applets/taskmanager/plugin/taskmanagerplugin.cpp rename to applets/legacytaskmanager/plugin/legacytaskmanagerplugin.cpp --- a/applets/taskmanager/plugin/taskmanagerplugin.cpp +++ b/applets/legacytaskmanager/plugin/legacytaskmanagerplugin.cpp @@ -35,18 +35,18 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "taskmanagerplugin.h" +#include "legacytaskmanagerplugin.h" #include "backend.h" #include "draghelper.h" #include "textlabel.h" #include "smartlaunchers/smartlauncheritem.h" #include -void TaskManagerPlugin::registerTypes(const char *uri) +void LegacyTaskManagerPlugin::registerTypes(const char *uri) { - Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.taskmanager")); + Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.legacytaskmanager")); qmlRegisterType(uri, 0, 1, "Backend"); qmlRegisterType(uri, 0, 1, "DragHelper"); qmlRegisterType(uri, 0, 1, "TextLabel"); diff --git a/applets/legacytaskmanager/plugin/qmldir b/applets/legacytaskmanager/plugin/qmldir new file mode 100644 --- /dev/null +++ b/applets/legacytaskmanager/plugin/qmldir @@ -0,0 +1,2 @@ +module org.kde.plasma.private.legacytaskmanager +plugin legacytaskmanagerplugin diff --git a/applets/taskmanager/plugin/smartlaunchers/smartlauncherbackend.h b/applets/legacytaskmanager/plugin/smartlaunchers/smartlauncherbackend.h rename from applets/taskmanager/plugin/smartlaunchers/smartlauncherbackend.h rename to applets/legacytaskmanager/plugin/smartlaunchers/smartlauncherbackend.h --- a/applets/taskmanager/plugin/smartlaunchers/smartlauncherbackend.h +++ b/applets/legacytaskmanager/plugin/smartlaunchers/smartlauncherbackend.h @@ -112,7 +112,7 @@ QDBusServiceWatcher *m_watcher; QHash m_dbusServiceToLauncherUrl; QHash m_launcherUrlToStorageId; - // these rules can be configured in the taskmanagerrulesrc in the "Unity Launcher Mapping" section + // these rules can be configured in the legacytaskmanagerrulesrc in the "Unity Launcher Mapping" section // key is the actual desktop file name of the application (some-broken-app-beta.desktop) // vaue is how it actually announces itself on the Unity API (some-broken-app.desktop) QHash m_unityMappingRules; diff --git a/applets/taskmanager/plugin/smartlaunchers/smartlauncherbackend.cpp b/applets/legacytaskmanager/plugin/smartlaunchers/smartlauncherbackend.cpp rename from applets/taskmanager/plugin/smartlaunchers/smartlauncherbackend.cpp rename to applets/legacytaskmanager/plugin/smartlaunchers/smartlauncherbackend.cpp --- a/applets/taskmanager/plugin/smartlaunchers/smartlauncherbackend.cpp +++ b/applets/legacytaskmanager/plugin/smartlaunchers/smartlauncherbackend.cpp @@ -67,7 +67,7 @@ return false; } - KConfig cfg(QStringLiteral("taskmanagerrulesrc")); + KConfig cfg(QStringLiteral("legacytaskmanagerrulesrc")); KConfigGroup grp(&cfg, QStringLiteral("Unity Launcher Mapping")); foreach (const QString &key, grp.keyList()) { diff --git a/applets/taskmanager/plugin/smartlaunchers/smartlauncheritem.h b/applets/legacytaskmanager/plugin/smartlaunchers/smartlauncheritem.h rename from applets/taskmanager/plugin/smartlaunchers/smartlauncheritem.h rename to applets/legacytaskmanager/plugin/smartlaunchers/smartlauncheritem.h diff --git a/applets/taskmanager/plugin/smartlaunchers/smartlauncheritem.cpp b/applets/legacytaskmanager/plugin/smartlaunchers/smartlauncheritem.cpp rename from applets/taskmanager/plugin/smartlaunchers/smartlauncheritem.cpp rename to applets/legacytaskmanager/plugin/smartlaunchers/smartlauncheritem.cpp diff --git a/applets/taskmanager/plugin/textlabel.h b/applets/legacytaskmanager/plugin/textlabel.h rename from applets/taskmanager/plugin/textlabel.h rename to applets/legacytaskmanager/plugin/textlabel.h diff --git a/applets/taskmanager/plugin/textlabel.cpp b/applets/legacytaskmanager/plugin/textlabel.cpp rename from applets/taskmanager/plugin/textlabel.cpp rename to applets/legacytaskmanager/plugin/textlabel.cpp diff --git a/applets/pager/CMakeLists.txt b/applets/pager/CMakeLists.txt --- a/applets/pager/CMakeLists.txt +++ b/applets/pager/CMakeLists.txt @@ -18,7 +18,7 @@ Qt5::Qml Qt5::Quick Qt5::DBus - PW::LibTaskManager) + PW::LibLegacyTaskManager) if (X11_FOUND) target_link_libraries(pagerplugin Qt5::X11Extras) diff --git a/applets/pager/plugin/pager.cpp b/applets/pager/plugin/pager.cpp --- a/applets/pager/plugin/pager.cpp +++ b/applets/pager/plugin/pager.cpp @@ -589,7 +589,7 @@ } bool ok; - const QList &ids = TaskManager::Task::idsFromMimeData(mimeData, &ok); + const QList &ids = LegacyTaskManager::Task::idsFromMimeData(mimeData, &ok); if (ok) { foreach (const WId &id, ids) { KWindowSystem::setOnDesktop(id, desktopId + 1); diff --git a/applets/taskmanager/plugin/qmldir b/applets/taskmanager/plugin/qmldir deleted file mode 100644 --- a/applets/taskmanager/plugin/qmldir +++ /dev/null @@ -1,2 +0,0 @@ -module org.kde.plasma.private.taskmanager -plugin taskmanagerplugin