Commit 4cf5247c authored by Nate Graham's avatar Nate Graham
Browse files

Show all actions on the main Kirigami toolbar and use the secondary one only for status

This is an alternative to D11214 and D11215, and a different method of fixing I rather prefer it.

The patches moves the {nav Update All} button onto the main Kirigami Toolbar, next to {nav Check for Updates}. This allows the secondary white-background toolbar to be used solely for communicating status information, so there is no longer any possibility of an overlap. It also improves the design IMHO, by putting all the action buttons in one place, and all the status information in another.

BUG: 391632

Test Plan:
All updates selected:

Some updates not selected:

Reviewers: apol, #discover_software_store, #vdg

Reviewed By: apol, #discover_software_store

Subscribers: plasma-devel

Tags: #plasma

Differential Revision:
parent c7e4720f
......@@ -89,6 +89,7 @@ Kirigami.ApplicationWindow
id: refreshAction
readonly property QtObject action: ResourcesModel.updateAction
text: action.text "view-refresh"
onTriggered: action.trigger()
enabled: action.enabled
tooltip: shortcut
......@@ -60,7 +60,7 @@ DiscoverPage
readonly property int unselected: (updateModel.totalUpdatesCount - updateModel.toUpdateCount)
readonly property QtObject currentAction: resourcesUpdatesModel.isProgressing ? cancelUpdateAction : updateAction
actions.main: applicationWindow().wideScreen ? null : currentAction
actions.main: currentAction
header: QQC2.ToolBar {
visible: (updateModel.totalUpdatesCount > 0 && resourcesUpdatesModel.isProgressing) || updateModel.hasUpdates
......@@ -83,18 +83,9 @@ DiscoverPage
text: i18n("updates not selected")
visible: unselectedItem.visible
Item {
Layout.fillWidth: true
Button {
Layout.minimumWidth: Kirigami.Units.gridUnit * 6
Layout.rightMargin: Kirigami.Units.gridUnit
text: page.currentAction.text
visible: !page.actions.main
onClicked: page.currentAction.trigger()
Supports Markdown
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