diff --git a/applets/taskmanager/package/contents/code/layout.js b/applets/taskmanager/package/contents/code/layout.js --- a/applets/taskmanager/package/contents/code/layout.js +++ b/applets/taskmanager/package/contents/code/layout.js @@ -192,7 +192,7 @@ adjustedWidth = width; if (!tasks.vertical && !tasks.iconsOnly && (plasmoid.configuration.separateLaunchers || stripes == 1)) { - if (item.isLauncher) { + if (item.m.IsLauncher === true) { adjustedWidth = launcherWidth(); } else if (stripes > 1 && i == tasksModel.launcherCount) { adjustedWidth += launcherLayoutWidthDiff(); diff --git a/applets/taskmanager/package/contents/code/tools.js b/applets/taskmanager/package/contents/code/tools.js --- a/applets/taskmanager/package/contents/code/tools.js +++ b/applets/taskmanager/package/contents/code/tools.js @@ -48,8 +48,8 @@ var task = taskList.children[i]; var modelIndex = task.modelIndex(i); - if (!task.isLauncher && !task.isStartup) { - if (task.isGroupParent) { + if (task.m.IsLauncher !== true && task.m.IsStartup !== true) { + if (task.m.IsGroupParent === true) { for (var j = 0; j < tasksModel.rowCount(modelIndex); ++j) { taskIndexList.push(tasksModel.makeModelIndex(i, j)); } @@ -105,7 +105,7 @@ for (var i = 0; i < taskItems.length - 1; ++i) { var task = taskItems[i]; - if (!task.isLauncher && !task.isStartup) { + if (task.IsLauncher !== true && task.m.IsStartup !== true) { tasksModel.requestPublishDelegateGeometry(tasksModel.makeModelIndex(task.itemIndex), backend.globalRect(task), task); } diff --git a/applets/taskmanager/package/contents/ui/ContextMenu.qml b/applets/taskmanager/package/contents/ui/ContextMenu.qml --- a/applets/taskmanager/package/contents/ui/ContextMenu.qml +++ b/applets/taskmanager/package/contents/ui/ContextMenu.qml @@ -40,15 +40,15 @@ minimumWidth: visualParent.width onStatusChanged: { - if (visualParent && visualParent.launcherUrlWithoutIcon != null && status == PlasmaComponents.DialogStatus.Open) { - launcherToggleAction.checked = (tasksModel.launcherPosition(visualParent.launcherUrlWithoutIcon) != -1); + if (visualParent && visualParent.m.LauncherUrlWithoutIcon != null && status == PlasmaComponents.DialogStatus.Open) { + launcherToggleAction.checked = (tasksModel.launcherPosition(visualParent.m.LauncherUrlWithoutIcon) != -1); } else if (status == PlasmaComponents.DialogStatus.Closed) { menu.destroy(); } } function show() { - loadDynamicLaunchActions(visualParent.launcherUrlWithoutIcon); + loadDynamicLaunchActions(visualParent.m.LauncherUrlWithoutIcon); openRelative(); } @@ -96,8 +96,9 @@ id: virtualDesktopsMenuItem visible: virtualDesktopInfo.numberOfDesktops > 1 - && (visualParent && !visualParent.isLauncher - && !visualParent.isStartup && visualParent.isVirtualDesktopChangeable) + && (visualParent && visualParent.m.IsLauncher !== true + && visualParent.m.IsStartup !== true + && visualParent.m.IsVirtualDesktopChangeable === true) enabled: visible @@ -125,7 +126,7 @@ var menuItem = menu.newMenuItem(virtualDesktopsMenu); menuItem.text = i18n("Move To Current Desktop"); menuItem.enabled = Qt.binding(function() { - return menu.visualParent && menu.visualParent.virtualDesktop != virtualDesktopInfo.currentDesktop; + return menu.visualParent && menu.visualParent.m.VirtualDesktop != virtualDesktopInfo.currentDesktop; }); menuItem.clicked.connect(function() { tasksModel.requestVirtualDesktop(menu.visualParent.modelIndex(), 0); @@ -135,7 +136,7 @@ menuItem.text = i18n("All Desktops"); menuItem.checkable = true; menuItem.checked = Qt.binding(function() { - return menu.visualParent && menu.visualParent.isOnAllVirtualDesktops; + return menu.visualParent && menu.visualParent.m.IsOnAllVirtualDesktops === true; }); menuItem.clicked.connect(function() { tasksModel.requestVirtualDesktop(menu.visualParent.modelIndex(), 0); @@ -149,7 +150,7 @@ menuItem.text = i18nc("1 = number of desktop, 2 = desktop name", "%1 Desktop %2", i + 1, virtualDesktopInfo.desktopNames[i]); menuItem.checkable = true; menuItem.checked = Qt.binding((function(i) { - return function() { return menu.visualParent && menu.visualParent.virtualDesktop == (i + 1) }; + return function() { return menu.visualParent && menu.visualParent.m.VirtualDesktop == (i + 1) }; })(i)); menuItem.clicked.connect((function(i) { return function() { return tasksModel.requestVirtualDesktop(menu.visualParent.modelIndex(), i + 1); }; @@ -171,35 +172,35 @@ } PlasmaComponents.MenuItem { - visible: (visualParent && !visualParent.isLauncher && !visualParent.isStartup) + visible: (visualParent && visualParent.m.IsLauncher !== true && visualParent.m.IsStartup !== true) - enabled: visualParent && visualParent.isMinimizable + enabled: visualParent && visualParent.m.IsMinimizable === true checkable: true - checked: visualParent && visualParent.isMinimized + checked: visualParent && visualParent.m.IsMinimized === true text: i18n("Minimize") onClicked: tasksModel.requestToggleMinimized(visualParent.modelIndex()) } PlasmaComponents.MenuItem { - visible: (visualParent && !visualParent.isLauncher && !visualParent.isStartup) + visible: (visualParent && visualParent.m.IsLauncher !== true && visualParent.m.IsStartup !== true) - enabled: visualParent && visualParent.isMaximizable + enabled: visualParent && visualParent.m.IsMaximizable === true checkable: true - checked: visualParent && visualParent.isMaximized + checked: visualParent && visualParent.m.IsMaximized === true text: i18n("Maximize") onClicked: tasksModel.requestToggleMaximized(visualParent.modelIndex()) } PlasmaComponents.MenuItem { - visible: (visualParent && !visualParent.isLauncher && !visualParent.isStartup) + visible: (visualParent && visualParent.m.IsLauncher !== true && visualParent.m.IsStartup !== true) - enabled: visualParent && visualParent.launcherUrlWithoutIcon != null + enabled: visualParent && visualParent.m.LauncherUrlWithoutIcon != null text: i18n("Start New Instance") icon: "system-run" @@ -210,36 +211,36 @@ PlasmaComponents.MenuItem { id: launcherToggleAction - visible: (visualParent && !visualParent.isLauncher && !visualParent.isStartup) + visible: (visualParent && visualParent.m.IsLauncher !== true && visualParent.m.IsStartup !== true) - enabled: visualParent && visualParent.launcherUrlWithoutIcon != null + enabled: visualParent && visualParent.m.LauncherUrlWithoutIcon != null checkable: true text: i18n("Show A Launcher When Not Running") onClicked: { - if (tasksModel.launcherPosition(visualParent.launcherUrlWithoutIcon) != -1) { - tasksModel.requestRemoveLauncher(visualParent.launcherUrlWithoutIcon); + if (tasksModel.launcherPosition(visualParent.m.LauncherUrlWithoutIcon) != -1) { + tasksModel.requestRemoveLauncher(visualParent.m.LauncherUrlWithoutIcon); } else { - tasksModel.requestAddLauncher(visualParent.launcherUrl()); + tasksModel.requestAddLauncher(visualParent.m.LauncherUrl); } } } PlasmaComponents.MenuItem { - visible: (visualParent && visualParent.isLauncher) + visible: (visualParent && visualParent.m.IsLauncher === true) text: i18n("Remove Launcher") - onClicked: tasksModel.requestRemoveLauncher(visualParent.launcherUrlWithoutIcon); + onClicked: tasksModel.requestRemoveLauncher(visualParent.m.LauncherUrlWithoutIcon); } PlasmaComponents.MenuItem { id: moreActionsMenuItem - visible: (visualParent && !visualParent.isLauncher && !visualParent.isStartup) + visible: (visualParent && visualParent.m.IsLauncher !== true && visualParent.m.IsStartup !== true) enabled: visible @@ -249,25 +250,25 @@ visualParent: moreActionsMenuItem.action PlasmaComponents.MenuItem { - enabled: menu.visualParent && menu.visualParent.isMovable + enabled: menu.visualParent && menu.visualParent.m.IsMovable === true text: i18n("Move") icon: "transform-move" onClicked: tasksModel.requestMove(menu.visualParent.modelIndex()) } PlasmaComponents.MenuItem { - enabled: menu.visualParent && menu.visualParent.isResizable + enabled: menu.visualParent && menu.visualParent.m.IsResizable === true text: i18n("Resize") onClicked: tasksModel.requestResize(menu.visualParent.modelIndex()) } PlasmaComponents.MenuItem { checkable: true - checked: menu.visualParent && menu.visualParent.isKeepAbove + checked: menu.visualParent && menu.visualParent.m.IsKeepAbove === true text: i18n("Keep Above Others") icon: "go-up" @@ -277,31 +278,31 @@ PlasmaComponents.MenuItem { checkable: true - checked: menu.visualParent && menu.visualParent.isKeepBelow + checked: menu.visualParent && menu.visualParent.m.IsKeepBelow === true text: i18n("Keep Below Others") icon: "go-down" onClicked: tasksModel.requestToggleKeepBelow(menu.visualParent.modelIndex()) } PlasmaComponents.MenuItem { - enabled: menu.visualParent && menu.visualParent.isFullScreenable + enabled: menu.visualParent && menu.visualParent.m.IsFullScreenable === true checkable: true - checked: menu.visualParent && menu.visualParent.isFullScreen + checked: menu.visualParent && menu.visualParent.m.IsFullScreen === true text: i18n("Fullscreen") icon: "view-fullscreen" onClicked: tasksModel.requestToggleFullScreen(menu.visualParent.modelIndex()) } PlasmaComponents.MenuItem { - enabled: menu.visualParent && menu.visualParent.isShadeable + enabled: menu.visualParent && menu.visualParent.m.IsShadeable === true checkable: true - checked: menu.visualParent && menu.visualParent.isShaded + checked: menu.visualParent && menu.visualParent.m.IsShaded === true text: i18n("Shade") @@ -313,10 +314,10 @@ } PlasmaComponents.MenuItem { - visible: (plasmoid.configuration.groupingStrategy != 0) && menu.visualParent.isWindow + visible: (plasmoid.configuration.groupingStrategy != 0) && menu.visualParent.m.IsWindow === true checkable: true - checked: menu.visualParent && menu.visualParent.isGroupable + checked: menu.visualParent && menu.visualParent.m.IsGroupable === true text: i18n("Allow this program to be grouped") @@ -343,9 +344,9 @@ } PlasmaComponents.MenuItem { - visible: (visualParent && !visualParent.isLauncher && !visualParent.isStartup) + visible: (visualParent && visualParent.m.IsLauncher !== true && visualParent.m.IsStartup !== true) - enabled: visualParent && visualParent.isClosable + enabled: visualParent && visualParent.m.IsClosable === true text: i18n("Close") icon: "window-close" diff --git a/applets/taskmanager/package/contents/ui/GroupExpanderOverlay.qml b/applets/taskmanager/package/contents/ui/GroupExpanderOverlay.qml --- a/applets/taskmanager/package/contents/ui/GroupExpanderOverlay.qml +++ b/applets/taskmanager/package/contents/ui/GroupExpanderOverlay.qml @@ -29,7 +29,7 @@ horizontalCenter: iconBox.horizontalCenter } - visible: parent.isGroupParent + visible: parent.m.IsGroupParent === true states: [ State { diff --git a/applets/taskmanager/package/contents/ui/MouseHandler.qml b/applets/taskmanager/package/contents/ui/MouseHandler.qml --- a/applets/taskmanager/package/contents/ui/MouseHandler.qml +++ b/applets/taskmanager/package/contents/ui/MouseHandler.qml @@ -81,8 +81,8 @@ // by tracking the cursor movement vector and allowing the drag if // the movement direction has reversed, etablishing user intent to // move back. - if (!plasmoid.configuration.separateLaunchers && tasks.dragSource.isLauncher - && above != null && !above.isLauncher && above == ignoredItem) { + if (!plasmoid.configuration.separateLaunchers && tasks.dragSource.m.IsLauncher === true + && above != null && above.m.IsLauncher !== true && above == ignoredItem) { return; } else { ignoredItem = null; @@ -128,10 +128,10 @@ repeat: false onTriggered: { - if (parent.hoveredItem.isGroupParent) { + if (parent.hoveredItem.m.IsGroupParent === true) { groupDialog.visualParent = parent.hoveredItem; groupDialog.visible = true; - } else if (!parent.hoveredItem.isLauncher) { + } else if (parent.hoveredItem.m.IsLauncher !== true) { tasksModel.requestActivate(parent.hoveredItem.modelIndex()); } } diff --git a/applets/taskmanager/package/contents/ui/Task.qml b/applets/taskmanager/package/contents/ui/Task.qml --- a/applets/taskmanager/package/contents/ui/Task.qml +++ b/applets/taskmanager/package/contents/ui/Task.qml @@ -39,58 +39,27 @@ LayoutMirroring.enabled: (Qt.application.layoutDirection == Qt.RightToLeft) LayoutMirroring.childrenInherit: (Qt.application.layoutDirection == Qt.RightToLeft) + readonly property var m: model + property int itemIndex: index + property bool isLauncher: model.isLauncher === IsLauncher // For onIsLauncherChanged. property bool inPopup: false property bool initialGeometryExported: false - property bool isGroupParent: model.IsGroupParent === true - property bool isActive: model.IsActive === true - property bool isWindow: model.IsWindow === true - property bool isLauncher: model.IsLauncher === true - property bool isStartup: model.IsStartup === true - property bool isGroupable: model.IsGroupable === true - property bool demandsAttention: model.IsDemandingAttention === true property int textWidth: label.implicitWidth property bool pressed: false property int pressX: -1 property int pressY: -1 property Item busyIndicator property QtObject contextMenu: null property int wheelDelta: 0 - - // FIXME Clean up all these props. - property variant launcherUrlWithoutIcon: model.LauncherUrlWithoutIcon - - property bool isClosable: model.IsClosable === true - property bool isMovable: model.IsMovable === true - property bool isResizable: model.IsResizable === true - - property bool isMaximizable: model.IsMaximizable === true - property bool isMaximized: model.IsMaximized === true - - property bool isMinimizable: model.IsMinimizable === true - property bool isMinimized: model.IsMinimized === true - - property bool isKeepAbove: model.IsKeepAbove === true - property bool isKeepBelow: model.IsKeepBelow === true - - property bool isFullScreenable: model.IsFullScreenable === true - property bool isFullScreen: model.IsFullScreen === true - - property bool isShadeable: model.IsShadeable === true - property bool isShaded: model.IsShaded === true - - property bool isVirtualDesktopChangeable: model.IsVirtualDesktopChangeable === true - property int virtualDesktop: model.VirtualDesktop != undefined ? model.VirtualDesktop : -1 - property int isOnAllVirtualDesktops: model.IsOnAllVirtualDesktops === true - - readonly property bool smartLauncherEnabled: plasmoid.configuration.smartLaunchersEnabled && !inPopup && !isStartup + readonly property bool smartLauncherEnabled: plasmoid.configuration.smartLaunchersEnabled && !inPopup && model.IsStartup !== true property QtObject smartLauncherItem: null acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MidButton hoverEnabled: true onVisibleChanged: { - if (visible && isWindow && itemIndex == 0) { + if (visible && model.IsWindow === true && itemIndex == 0) { tasksModel.requestPublishDelegateGeometry(modelIndex(), backend.globalRect(task), task); initialGeometryExported = true; } @@ -153,7 +122,7 @@ } else if (mouse.button == Qt.LeftButton) { if (mouse.modifiers & Qt.ShiftModifier) { tasksModel.requestNewInstance(index); - } else if (isGroupParent) { + } else if (model.IsGroupParent === true) { if ((iconsOnly || mouse.modifiers == Qt.ControlModifier) && backend.canPresentWindows()) { toolTip.hideToolTip(); tasks.presentWindows(model.LegacyWinIdList); @@ -164,11 +133,11 @@ groupDialog.visible = true; } } else { - if (model.IsMinimized) { + if (model.IsMinimized === true) { var i = modelIndex(); tasksModel.requestToggleMinimized(i); tasksModel.requestActivate(i); - } else if (model.IsActive) { + } else if (model.IsActive === true) { tasksModel.requestToggleMinimized(modelIndex()); } else { tasksModel.requestActivate(modelIndex()); @@ -218,10 +187,6 @@ : tasksModel.makeModelIndex(index)); } - function launcherUrl() { - return model.LauncherUrl; - } - PlasmaCore.FrameSvgItem { id: frame @@ -265,7 +230,7 @@ return model.decoration; }); toolTipDelegate.subText = Qt.binding(function() { - return model.IsLauncher ? model.GenericName : toolTip.generateSubText(model); + return model.IsLauncher === true ? model.GenericName : toolTip.generateSubText(model); }); toolTipDelegate.launcherUrl = Qt.binding(function() { return model.LauncherUrlWithoutIcon; @@ -278,7 +243,7 @@ if (!plasmoid.configuration.showOnlyCurrentDesktop && virtualDesktopInfo.numberOfDesktops > 1 - && !model.IsOnAllVirtualDesktops + && !model.IsOnAllVirtualDesktops === true && model.VirtualDesktop != -1 && model.VirtualDesktop != undefined) { subTextEntries.push(i18n("On %1", virtualDesktopInfo.desktopNames[model.VirtualDesktop - 1])); @@ -421,7 +386,7 @@ bottomMargin: taskFrame.margins.bottom } - visible: (inPopup || !iconsOnly && !model.IsLauncher && (parent.width - LayoutManager.horizontalMargins()) >= (theme.mSize(theme.defaultFont).width * 7)) + visible: (inPopup || !iconsOnly && model.IsLauncher !== true && (parent.width - LayoutManager.horizontalMargins()) >= (theme.mSize(theme.defaultFont).width * 7)) enabled: true @@ -433,7 +398,7 @@ states: [ State { name: "launcher" - when: model.IsLauncher + when: model.IsLauncher === true PropertyChanges { target: frame @@ -451,25 +416,25 @@ }, State { name: "attention" - when: model.IsDemandingAttention || (task.smartLauncherItem && task.smartLauncherItem.urgent) + when: model.IsDemandingAttention === true || (task.smartLauncherItem && task.smartLauncherItem.urgent) PropertyChanges { target: frame basePrefix: "attention" } }, State { name: "minimized" - when: model.IsMinimized && !(groupDialog.visible && groupDialog.target == task) + when: model.IsMinimized === true && !(groupDialog.visible && groupDialog.target == task) PropertyChanges { target: frame basePrefix: "minimized" } }, State { name: "active" - when: model.IsActive || groupDialog.visible && groupDialog.target == task + when: model.IsActive === true || groupDialog.visible && groupDialog.target == task PropertyChanges { target: frame