From 3c4e1ea62fbbaf6f8c1d08e6279d2445d0fe489e Mon Sep 17 00:00:00 2001 From: Jacopo De Simoi Date: Sat, 2 Mar 2019 14:03:33 -0500 Subject: [PATCH] Leaner appearance --- .../contents/runcommand/RunCommand.qml | 44 ++++++++++++++----- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/lookandfeel/contents/runcommand/RunCommand.qml b/lookandfeel/contents/runcommand/RunCommand.qml index ea7ff6b94..09e26452c 100644 --- a/lookandfeel/contents/runcommand/RunCommand.qml +++ b/lookandfeel/contents/runcommand/RunCommand.qml @@ -54,13 +54,13 @@ ColumnLayout { Layout.alignment: Qt.AlignTop PlasmaComponents.ToolButton { iconSource: "configure" + visible: false onClicked: { runnerWindow.visible = false runnerWindow.displayConfiguration() } Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Configure") Accessible.description: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Configure Search Plugins") - visible: runnerWindow.canConfigure tooltip: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Configure...") } PlasmaComponents.TextField { @@ -117,16 +117,28 @@ ColumnLayout { } } Keys.onPressed: { - allowCompletion = (event.key !== Qt.Key_Backspace && event.key !== Qt.Key_Delete) + if ((length === 0) && ((event.key == Qt.Key_P) || (event.key == Qt.Key_N)) && (event.modifiers & Qt.ControlModifier)) { + root.showHistory = true; +} + allowCompletion = (event.key !== Qt.Key_Backspace && event.key !== Qt.Key_Delete); - if (event.modifiers & Qt.ControlModifier) { - if (event.key == Qt.Key_J) { - move_down() - event.accepted = true; - } else if (event.key == Qt.Key_K) { - move_up() - event.accepted = true; - } + } + Keys.onUpPressed: { + if (length === 0) { + root.showHistory = true; + listView.forceActiveFocus(); + } else if (results.count > 0) { + results.forceActiveFocus(); + results.decrementCurrentIndex(); + } + } + Keys.onDownPressed: { + if (length === 0) { + root.showHistory = true; + listView.forceActiveFocus(); + } else if (results.count > 0) { + results.forceActiveFocus(); + results.incrementCurrentIndex(); } } Keys.onUpPressed: move_up() @@ -169,6 +181,7 @@ ColumnLayout { } PlasmaComponents.ToolButton { iconSource: "window-close" + visible: false onClicked: runnerWindow.visible = false Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Close") Accessible.description: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Close Search") @@ -271,8 +284,15 @@ ColumnLayout { queryField.text += event.text; queryField.focus = true; } - } - + if ((event.key == Qt.Key_P) && (event.modifiers & Qt.ControlModifier)) { + decrementCurrentIndex(); + event.accepted=true; + } + else if ((event.key == Qt.Key_N) && (event.modifiers & Qt.ControlModifier)) { + incrementCurrentIndex(); + event.accepted=true; + } + } Keys.onUpPressed: decrementCurrentIndex() Keys.onDownPressed: incrementCurrentIndex()