From 216ecc5214991ae52b78850ecb177d536286c8d4 Mon Sep 17 00:00:00 2001 From: Nate Graham Date: Thu, 21 Oct 2021 07:45:24 -0600 Subject: [PATCH] Improve job window buttons 1. Use more relevant text 2. Give them icons 3. Correctly disable the Send button when no device is selected BUG: 444145 FIXED-IN: 5.88 --- src/plugins/bluetooth/bluetoothplugin_config.qml | 3 +++ .../kdeconnect/kdeconnectplugin_config.qml | 3 +++ src/quick/JobView.qml | 15 ++++++++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/plugins/bluetooth/bluetoothplugin_config.qml b/src/plugins/bluetooth/bluetoothplugin_config.qml index 1c1eb39c..4052f372 100644 --- a/src/plugins/bluetooth/bluetoothplugin_config.qml +++ b/src/plugins/bluetooth/bluetoothplugin_config.qml @@ -38,6 +38,9 @@ ColumnLayout { ListView { id: list + // Don't select anything by default; make the user choose explicitly + currentIndex: -1 + clip: true model: BluezQt.DevicesModel { } diff --git a/src/plugins/kdeconnect/kdeconnectplugin_config.qml b/src/plugins/kdeconnect/kdeconnectplugin_config.qml index 164f0d6a..81e0b750 100644 --- a/src/plugins/kdeconnect/kdeconnectplugin_config.qml +++ b/src/plugins/kdeconnect/kdeconnectplugin_config.qml @@ -37,6 +37,9 @@ ColumnLayout { ListView { id: list + // Don't select anything by default; make the user choose explicitly + currentIndex: -1 + clip: true model: DevicesModel { id: connectDeviceModel diff --git a/src/quick/JobView.qml b/src/quick/JobView.qml index f53a4133..ea85453a 100644 --- a/src/quick/JobView.qml +++ b/src/quick/JobView.qml @@ -109,18 +109,27 @@ Item { : "" } + // Not using a DialogButtonBox because it doesn't let us customize + // the buttons and conditionally disable any of them, which we want RowLayout { Layout.leftMargin: Kirigami.Units.largeSpacing Layout.rightMargin: Kirigami.Units.largeSpacing Layout.bottomMargin: Kirigami.Units.largeSpacing + Layout.alignment: Qt.AlignRight + Button { - text: i18nd("libpurpose_quick", "Run") - enabled: jobController.configuration && jobController.configuration.isReady + text: i18nd("libpurpose_quick", "Send") + icon.name: "document-send" + enabled: jobController.configuration + && jobController.configuration.isReady + && configLoader.item + && configLoader.item.device != undefined onClicked: jobController.startJob() } Button { - text: i18nd("libpurpose_quick", "Back") + text: i18nd("libpurpose_quick", "Cancel") + icon.name: "dialog-cancel" onClicked: jobController.cancel() } } -- GitLab