Differential D28744 Diff 81607 kcms/keys/package/contents/ui/ShortcutActionDelegate.qml

Changeset View

Standalone View

View Options

kcms/keys/package/contents/ui/ShortcutActionDelegate.qml

  • This file was added.
1​/*
2​ * Copyright (C) 2020 David Redondo <david@david-redondo.de>
3​ *
4​ * This program is free software; you can redistribute it and/or modify
5​ * it under the terms of the GNU General Public License as published by
6​ * the Free Software Foundation; either version 2 of the License, or
7​ * (at your option) any later version.
8​ *
9​ * This program is distributed in the hope that it will be useful,
10​ * but WITHOUT ANY WARRANTY; without even the implied warranty of
11​ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12​ * GNU General Public License for more details.
13​ *
14​ * You should have received a copy of the GNU General Public License along
15​ * with this program; if not, write to the Free Software Foundation, Inc.,
16​ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17​ */
18​
19​import QtQuick 2.12
20​import QtQuick.Layouts 1.3
21​import QtQuick.Controls 2.3 as QQC2
22​
23​import org.kde.kirigami 2.10 as Kirigami
24​import org.kde.kquickcontrols 2.0
25​import org.kde.kcm 1.2 as KCM
26​
27​Kirigami.AbstractListItem {
28​ id: root
nicolasfellaUnsubmitted
Done

space before {

nicolasfella: space before {
29​ highlighted: false
30​ hoverEnabled: true
31​ width: shortcutsList.width
broulikUnsubmitted
Not Done

I find the transition between editing and display state somewhat jarring

broulik: I find the transition between editing and display state somewhat jarring
32​ onClicked: shortcutsList.selectedIndex = index
33​ contentItem: ColumnLayout {
34​ clip: true
35​ Item {
36​ Layout.alignment: Qt.AlignTop
37​ Layout.preferredHeight: topRow.implicitHeight
38​ Layout.fillWidth: true
39​ RowLayout {
40​ id: topRow
41​ anchors.fill: parent
42​ Kirigami.Heading {
43​ id: displayLabel
44​ text: i18nc("%1 is the name action that is triggered by the key sequences following after :", "%1:", model.display)
45​ level: 5
46​ }
47​ QQC2.Label {
48​ id: keySequenceList
49​ Layout.fillWidth: true
50​ color: model.activeShortcuts.length != 0 ? Kirigami.Theme.textColor : Kirigami.Theme.disabledTextColor
51​ elide: Text.ElideRight
ngrahamUnsubmitted
Done

should should display the pointing hand cursor when hovered so people know the whole thing will expand when clicked as with the ExpandableListItem.

ngraham: should should display the pointing hand cursor when hovered so people know the whole thing will…
52​ horizontalAlignment: Text.AlignRight
53​ text: {
54​ if (model.activeShortcuts.length != 0) {
55​ return model.activeShortcuts.map(s => kcm.keySequenceToString(s)).join(", ")
ngrahamUnsubmitted
Done

I might right-align the text for improved visual parse-ability

ngraham: I might right-align the text for improved visual parse-ability
56​ } else {
57​ return i18n("No active shortcuts")
ngrahamUnsubmitted
Done

The way you're (ab)using xi18n() to change the text weight of different parts of the string, it feels like this text would prefer to be two labels. This would facilitate right-aligning the right-most part too.

ngraham: The way you're (ab)using `xi18n()` to change the text weight of different parts of the string…
58​ }
59​ }
broulikUnsubmitted
Done

Please use i18n

broulik: Please use `i18n`
davidreAuthorUnsubmitted
Done

Shouldn't QKeySequence::NativeText take care of that or because of the list format?

davidre: Shouldn't QKeySequence::NativeText take care of that or because of the list format?
60​ }
61​ QQC2.ToolButton {
62​ Layout.alignment: Qt.AlignRight
63​ id: expandButton
64​ icon.name: "expand"
65​ onClicked: {
66​ root.state == 'expanded' ? shortcutsList.selectedIndex = -1 : shortcutsList.selectedIndex = index
67​ }
68​ }
ngrahamUnsubmitted
Done

use expand

ngraham: use `expand`
69​ }
70​ MouseArea {
71​ id: handMouseArea
72​ anchors.fill: topRow
73​ cursorShape: Qt.PointingHandCursor
74​ acceptedButtons: Qt.NoButton
75​ }
76​ }
77​ Loader {
78​ id: editLoader
79​ active: false
80​ visible: false
81​ Layout.fillWidth: true
82​ sourceComponent: RowLayout {
83​ readonly property var originalIndex : kcm.filteredModel.mapToSource(dm.modelIndex(index))
84​ spacing: 0
85​ ColumnLayout {
86​ Layout.alignment: Qt.AlignTop
87​ Layout.preferredWidth: parent.width * 0.5
88​ Kirigami.Heading {
89​ level: 4
90​ text: model.defaultShortcuts && model.defaultShortcuts.length != 0 ?
91​ i18ncp("%1 decides if singular or plural will be used", "Default shortcut",
92​ "Default shortcuts", model.defaultShortcuts.length) :
93​ i18n("No default shortcuts")
94​ }
ngrahamUnsubmitted
Done

Align top-right so it doesn't jump around vertically when the list item is collapsed

ngraham: Align top-right so it doesn't jump around vertically when the list item is collapsed
95​ Kirigami.Separator {
ngrahamUnsubmitted
Done

use collapse

ngraham: use `collapse`
96​ Layout.fillWidth: true
97​ }
98​ Repeater {
99​ model: defaultShortcuts
100​ QQC2.CheckBox {
101​ checked: activeShortcuts.indexOf(modelData) != -1
102​ text: modelData
103​ onToggled: kcm.shortcutsModel.toggleDefaultShortcut(originalIndex, modelData, checked)
104​ }
105​ }
106​ }
107​ ColumnLayout {
108​ Layout.preferredWidth: parent.width * 0.5
109​ Layout.alignment: Qt.AlignTop
110​ Kirigami.Heading {
111​ level: 4
112​ text: i18n("Custom shortcuts")
113​ }
114​ Kirigami.Separator {
115​ Layout.fillWidth: true
116​ }
117​ Repeater {
118​ model: customShortcuts
119​ RowLayout {
120​ KeySequenceItem {
121​ keySequence: modelData
122​ showClearButton: false
123​ onCaptureFinished: {
124​ kcm.shortcutsModel.changeShortcut(originalIndex, modelData, keySequence)
125​ }
126​ }
127​ QQC2.Button {
128​ icon.name: "edit-delete"
129​ onClicked: kcm.shortcutsModel.disableShortcut(originalIndex, modelData)
130​ QQC2.ToolTip {
131​ text: i18n("Delete this shortcut")
132​ }
133​ }
134​ }
135​ }
136​ QQC2.Button {
137​ text: i18n("Add custom shortcut")
138​ icon.name: "list-add"
139​ onClicked: {
140​ this.visible = false
141​ var newKeySequenceItem = newKeySequenceComponent.createObject(parent)
142​ for (var i = 0; i < newKeySequenceItem.children.length; i++) {
143​ if (newKeySequenceItem.children[i] instanceof KeySequenceItem) {
144​ var keySequenceItem = newKeySequenceItem.children[i]
145​ }
ngrahamUnsubmitted
Done

Since this actually removes a shortcut, I'd probably make use the trashcan icon (edit-delete)

ngraham: Since this actually removes a shortcut, I'd probably make use the trashcan icon (`edit-delete`)
146​ }
147​ newKeySequenceItem.finished.connect(() => {
148​ newKeySequenceItem.destroy()
ngrahamUnsubmitted
Done

This isn't accurate; it actually deletes the shortcut

ngraham: This isn't accurate; it actually deletes the shortcut
149​ this.visible = true
150​ })
151​ keySequenceItem.startCapturing()
152​ }
153​ }
154​ Component {
155​ id: newKeySequenceComponent
156​ RowLayout {
157​ signal finished
158​ KeySequenceItem {
159​ showClearButton: false
160​ onCaptureFinished: {
161​ kcm.shortcutsModel.addShortcut(originalIndex, keySequence)
162​ parent.finished()
163​ }
164​ }
165​ QQC2.Button {
166​ icon.name: "dialog-cancel"
ngrahamUnsubmitted
Done

This tooltip is not working for me

ngraham: This tooltip is not working for me
167​ onClicked: parent.finished()
168​ QQC2.ToolTip {
169​ text: i18n("Cancel capturing of new shortcut")
170​ }
171​ }
172​ }
173​ }
174​ }
175​ }
176​ }
177​ }
178​ states: [
179​ State {
180​ name: "expanded"
181​ when: shortcutsList.selectedIndex == index || shortcutsList.count == 1
182​ PropertyChanges {
183​ target: root
184​ hoverEnabled: false
185​ }
186​ PropertyChanges {
187​ target: displayLabel
188​ level: 3
189​ Layout.fillWidth: true
190​ }
191​ PropertyChanges {
192​ target: keySequenceList
193​ visible: false
194​ }
195​ PropertyChanges {
196​ target: expandButton
197​ icon.name: "collapse"
198​ }
199​ PropertyChanges {
200​ target: handMouseArea
201​ cursorShape: Qt.ArrowCursor
202​ }
203​ PropertyChanges {
204​ target: editLoader
205​ active: true
206​ visible: true
207​ }
208​ }
209​ ]
210​ Behavior on height {
211​ NumberAnimation {
212​ properties: "height"
213​ duration: Kirigami.Units.shortDuration
214​ }
215​ }
216​}