Commit ab42f47d authored by Ivan Čukić's avatar Ivan Čukić 👁

Remove the last traces of Activities data engine

parent 9d148c13
...@@ -25,13 +25,13 @@ import org.kde.plasma.components 2.0 as PlasmaComponents ...@@ -25,13 +25,13 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddonsComponents import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddonsComponents
import org.kde.draganddrop 2.0 import org.kde.draganddrop 2.0
import org.kde.plasma.private.pager 2.0 import org.kde.plasma.private.pager 2.0
import org.kde.plasma.activityswitcher 1.0 as ActivitySwitcher
MouseArea { MouseArea {
id: root id: root
property bool isActivityPager: (plasmoid.pluginName === "org.kde.plasma.activitypager") property bool isActivityPager: (plasmoid.pluginName === "org.kde.plasma.activitypager")
property bool vertical: (plasmoid.formFactor === PlasmaCore.Types.Vertical) property bool vertical: (plasmoid.formFactor === PlasmaCore.Types.Vertical)
property var activityDataSource: null
readonly property real aspectRatio: (((pagerModel.pagerItemSize.width * pagerItemGrid.effectiveColumns) readonly property real aspectRatio: (((pagerModel.pagerItemSize.width * pagerItemGrid.effectiveColumns)
+ ((pagerItemGrid.effectiveColumns * pagerItemGrid.spacing) - pagerItemGrid.spacing)) + ((pagerItemGrid.effectiveColumns * pagerItemGrid.spacing) - pagerItemGrid.spacing))
...@@ -47,8 +47,8 @@ MouseArea { ...@@ -47,8 +47,8 @@ MouseArea {
Plasmoid.preferredRepresentation: Plasmoid.fullRepresentation Plasmoid.preferredRepresentation: Plasmoid.fullRepresentation
Plasmoid.status: pagerModel.shouldShowPager ? PlasmaCore.Types.ActiveStatus : PlasmaCore.Types.HiddenStatus Plasmoid.status: pagerModel.shouldShowPager ? PlasmaCore.Types.ActiveStatus : PlasmaCore.Types.HiddenStatus
Layout.fillWidth: root.vertical Layout.fillWidth: root.vertical
Layout.fillHeight: !root.vertical Layout.fillHeight: !root.vertical
property bool dragging: false property bool dragging: false
property string dragId property string dragId
...@@ -86,15 +86,7 @@ MouseArea { ...@@ -86,15 +86,7 @@ MouseArea {
} }
function action_showActivityManager() { function action_showActivityManager() {
if (!activityDataSource) { ActivitySwitcher.Backend.toggleActivityManager()
activityDataSource = Qt.createQmlObject('import org.kde.plasma.core 2.0 as PlasmaCore; \
PlasmaCore.DataSource { id: dataSource; engine: "org.kde.activities"; \
connectedSources: ["Status"] }', root);
}
var service = activityDataSource.serviceForSource("Status")
var operation = service.operationDescription("toggleActivityManager")
service.startOperationCall(operation)
} }
onContainsMouseChanged: { onContainsMouseChanged: {
......
...@@ -69,12 +69,6 @@ DND.DropArea { ...@@ -69,12 +69,6 @@ DND.DropArea {
ActivitySwitcher.Backend.setDropMode(false); ActivitySwitcher.Backend.setDropMode(false);
} }
PlasmaCore.DataSource {
id: dataSource
engine: "org.kde.activities"
connectedSources: [activeSource]
}
PlasmaCore.ToolTipArea { PlasmaCore.ToolTipArea {
id: tooltip id: tooltip
mainText: i18n("Show Activity Manager") mainText: i18n("Show Activity Manager")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment