File 2001-ui.patch of Package plasma6-systemmonitor
diff --git a/src/faces/applicationstable/contents/ui/FullRepresentation.qml b/src/faces/applicationstable/contents/ui/FullRepresentation.qml
index 511ebb16a2860cc5498076651a80c54eb10e5002..a8e5c313c39c86aceba8e1a1ab33dc126c71253e 100644
--- a/src/faces/applicationstable/contents/ui/FullRepresentation.qml
+++ b/src/faces/applicationstable/contents/ui/FullRepresentation.qml
@@ -26,6 +26,13 @@ Faces.SensorFace {
readonly property var config: controller.faceConfiguration
actions: [
+ Kirigami.Action {
+ icon.name: "application-exit"
+ text: i18nc("@action", "Quit Application")
+ displayHint: Kirigami.DisplayHint.KeepVisible
+ onTriggered: processHelper.sendSignalToSelection(Process.ProcessController.TerminateSignal)
+ visible: table.selection.hasSelection
+ },
Kirigami.Action {
icon.name: "search"
text: i18nc("@action", "Search")
@@ -37,17 +44,11 @@ Faces.SensorFace {
Component.onCompleted: forceActiveFocus()
}
},
- Kirigami.Action {
- icon.name: "application-exit"
- text: i18nc("@action", "Quit Application")
- displayHint: Kirigami.DisplayHint.KeepVisible
- onTriggered: processHelper.sendSignalToSelection(Process.ProcessController.TerminateSignal)
- enabled: table.selection.hasSelection
- },
Kirigami.Action {
id: showDetailsAction
icon.name: "documentinfo"
text: i18nc("@action", "Show Details Sidebar")
+ displayHint: Kirigami.DisplayHint.AlwaysHide
checkable: true
checked: root.config.showDetails
onToggled: root.config.showDetails = checked
@@ -56,6 +57,7 @@ Faces.SensorFace {
id: configureColumnsAction
icon.name: "configure"
text: i18nc("@action", "Configure Columns…")
+ displayHint: Kirigami.DisplayHint.AlwaysHide
onTriggered: columnDialog.open()
}
]
diff --git a/src/faces/processtable/contents/ui/FullRepresentation.qml b/src/faces/processtable/contents/ui/FullRepresentation.qml
index a2e1bda3b4a6fb00e329d0f69fd8abc8ae410667..a2f32c20909fee9c31379fdcb992b96012271dd3 100644
--- a/src/faces/processtable/contents/ui/FullRepresentation.qml
+++ b/src/faces/processtable/contents/ui/FullRepresentation.qml
@@ -27,6 +27,14 @@ Faces.SensorFace {
readonly property var config: controller.faceConfiguration
actions: [
+ Kirigami.Action {
+ icon.name: "process-stop"
+ text: i18nc("@action", "End Process")
+ displayHint: Kirigami.DisplayHint.KeepVisible
+ onTriggered: processHelper.sendSignalToSelection(Process.ProcessController.TerminateSignal)
+ visible: table.selection.hasSelection
+ },
+
Kirigami.Action {
icon.name: "search"
text: i18nc("@action", "Search")
@@ -39,13 +47,6 @@ Faces.SensorFace {
}
},
- Kirigami.Action {
- icon.name: "process-stop"
- text: i18nc("@action", "End Process")
- onTriggered: processHelper.sendSignalToSelection(Process.ProcessController.TerminateSignal)
- enabled: table.selection.hasSelection
- },
-
// Note: can't use ActionGroup there because of https://bugreports.qt.io/browse/QTBUG-86860
Kirigami.Action {
id: listAction
@@ -55,7 +56,7 @@ Faces.SensorFace {
visible: table.treeModeSupported
text: i18nc("@action", "Display as List")
- displayHint: Kirigami.DisplayHint.IconOnly
+ displayHint: Kirigami.DisplayHint.AlwaysHide
property int mode: 0
onTriggered: {
root.config.viewMode = mode
@@ -71,7 +72,7 @@ Faces.SensorFace {
checked: root.config.viewMode === mode
visible: table.treeModeSupported
text: i18nc("@action", "Display as Tree")
- displayHint: Kirigami.DisplayHint.IconOnly
+ displayHint: Kirigami.DisplayHint.AlwaysHide
property int mode: 1
onTriggered: {
root.config.viewMode = mode;
@@ -83,6 +84,7 @@ Faces.SensorFace {
Kirigami.Action {
icon.name: showGroup.checkedAction.icon.name
text: i18nc("@action %1 is view type", "Show: %1", showGroup.checkedAction.text)
+ displayHint: Kirigami.DisplayHint.AlwaysHide
Kirigami.Action {
text: i18nc("@item:inmenu", "Own Processes")
@@ -125,6 +127,7 @@ Faces.SensorFace {
id: configureColumnsAction
icon.name: "configure"
text: i18nc("@action", "Configure Columns…")
+ displayHint: Kirigami.DisplayHint.AlwaysHide
onTriggered: columnDialog.open()
}
]
diff --git a/src/page/EditablePage.qml b/src/page/EditablePage.qml
index e0d4b81c2e6329752be5c92fff07662d4065170d..4b19b662258991f3ed38310bf33c7815419bd2bd 100644
--- a/src/page/EditablePage.qml
+++ b/src/page/EditablePage.qml
@@ -87,7 +87,7 @@ Kirigami.ScrollablePage {
icon.name: "document-edit"
visible: !page.edit
- displayHint: page.actionsFace ? Kirigami.DisplayHint.AlwaysHide : Kirigami.DisplayHint.NoPreference
+ displayHint: Kirigami.DisplayHint.AlwaysHide
onTriggered: page.edit = !page.edit
}
@@ -220,7 +220,7 @@ Kirigami.ScrollablePage {
id: contentLoader
width: page.width
- height: item ? Math.max(item.Layout.minimumHeight, page.heightForContent) : page.heightForContent
+ height: page.heightForContent
property real availableHeight: page.heightForContent
property real rowSpacing: page.pageData.margin * Kirigami.Units.smallSpacing
diff --git a/src/table/BaseCellDelegate.qml b/src/table/BaseCellDelegate.qml
index 92bf2e8c0a441eedc9dee87379f567df1d085155..0bfe686990b361ca319ed093adb29a34add85c51 100644
--- a/src/table/BaseCellDelegate.qml
+++ b/src/table/BaseCellDelegate.qml
@@ -16,8 +16,6 @@ TreeViewDelegate
{
id: root
- readonly property bool rowHovered: root.TableView.view.hoveredRow == row
-
text: model.display
// Important: Don't remove this until QTBUG-84858 is resolved properly.
@@ -29,22 +27,5 @@ TreeViewDelegate
background: Rectangle {
color: (row % 2 == 0 || selected) ? Kirigami.Theme.backgroundColor : Kirigami.Theme.alternateBackgroundColor
-
- Rectangle {
- anchors.fill: parent
- Kirigami.Theme.inherit: false
- Kirigami.Theme.colorSet: Kirigami.Theme.Selection
- color: Kirigami.Theme.backgroundColor
- opacity: 0.3
- visible: root.rowHovered
- }
}
-
- onHoveredChanged: {
- if (hovered) {
- root.TableView.view.hoveredRow = root.row
- }
- }
-
- hoverEnabled: true
}
diff --git a/src/table/BaseTableView.qml b/src/table/BaseTableView.qml
index 53388e4431762ad5c1348133ecce423a186c0392..8187df02e8c6b021c3d3b35d1d0db5b47aa0c81f 100644
--- a/src/table/BaseTableView.qml
+++ b/src/table/BaseTableView.qml
@@ -88,7 +88,6 @@ FocusScope {
id: selectionModel
model: tableView.model
}
- property int hoveredRow: -1
property int sortColumn: root.sortColumn
// FIXME Until Tableview correctly reverses its columns, see QTBUG-90547