Differential D28744 Diff 79907 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​Loader{
28​ id: loader
nicolasfellaUnsubmitted
Done

space before {

nicolasfella: space before {
29​ property int oldHeight: height
30​ sourceComponent: ListView.isCurrentItem ? editRepresentation : compactRepresentation
31​ ListView.onIsCurrentItemChanged: {
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​ oldHeight = height
33​ }
34​ clip: true
35​ onSourceComponentChanged: {
36​ animation.running = true
37​ }
38​ NumberAnimation {
39​ target: loader.item
40​ id: animation
41​ property: "height"
42​ from: oldHeight
43​ to: loader.height
44​ duration: Kirigami.Units.shortDuration
45​ }
46​ Component {
47​ id:compactRepresentation
48​ Kirigami.AbstractListItem {
49​ width: shortcutsList.width
50​ onClicked: shortcutsList.currentIndex = index
51​ contentItem: RowLayout {
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​ Layout.alignment: Qt.AlignTop
53​ spacing: Kirigami.Units.smallSpacing
54​ QQC2.Label {
55​ Layout.fillWidth: true
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​ text: {
57​ if (model.activeShortcuts.length != 0) {
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​ return model.display + ": " + model.activeShortcuts.map(s => kcm.keySequenceToString(s)).join(", ")
59​ } else {
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​ return model.display + ": " + "<font color=\"%1\">".arg(Kirigami.Theme.disabledTextColor)+i18n("No active shortcuts")+"</font>"
61​ }
62​ }
63​ elide: Text.ElideRight
64​ }
65​ QQC2.ToolButton {
66​ Layout.alignment: Qt.AlignRight
67​ icon.name: "arrow-down"
68​ onClicked: {
ngrahamUnsubmitted
Done

use expand

ngraham: use `expand`
69​ shortcutsList.currentIndex = index
70​ }
71​ }
72​ }
73​ }
74​ }
75​ Component {
76​ id: editRepresentation
77​ Kirigami.AbstractListItem {
78​ hoverEnabled: false
79​ width: shortcutsList.width
80​ readonly property var originalIndex : kcm.filteredModel.mapToSource(dm.modelIndex(index))
81​ contentItem: ColumnLayout {
82​ spacing: 0
83​ RowLayout {
84​ Kirigami.Heading {
85​ Layout.alignment: Qt.AlignTop
86​ level: 3
87​ text: model.display
88​ }
89​ Item {
90​ Layout.fillWidth: true
91​ }
92​ QQC2.ToolButton {
93​ Layout.alignment: Qt.AlignRight
94​ icon.name: "arrow-up"
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​ onClicked: {
ngrahamUnsubmitted
Done

use collapse

ngraham: use `collapse`
96​ shortcutsList.currentIndex = -1
97​ }
98​ }
99​ }
100​ RowLayout {
101​ spacing: 0
102​ ColumnLayout {
103​ Layout.alignment: Qt.AlignTop
104​ Layout.preferredWidth: parent.width * 0.5
105​ Kirigami.Heading {
106​ level: 4
107​ text: defaultShortcuts.length == 0 ? i18n("No default shortcuts") :
108​ i18ncp("%1 decides if singular or plural will be used", "Default shortcut",
109​ "Default shortcuts", defaultShortcuts.length)
110​ }
111​ Kirigami.Separator {
112​ Layout.fillWidth: true
113​ }
114​ Repeater {
115​ model: defaultShortcuts
116​ QQC2.CheckBox {
117​ checked: activeShortcuts.indexOf(modelData) != -1
118​ text: modelData
119​ onToggled: kcm.shortcutsModel.toggleDefaultShortcut(originalIndex, modelData, checked)
120​ }
121​ }
122​ }
123​ ColumnLayout {
124​ Layout.preferredWidth: parent.width * 0.5
125​ Layout.alignment: Qt.AlignTop
126​ Kirigami.Heading {
127​ level: 4
128​ text: i18n("Custom shortcuts")
129​ }
130​ Kirigami.Separator {
131​ Layout.fillWidth: true
132​ }
133​ Repeater {
134​ model: customShortcuts
135​ RowLayout {
136​ KeySequenceItem {
137​ keySequence: modelData
138​ showClearButton: false
139​ onCaptureFinished: {
140​ kcm.shortcutsModel.changeShortcut(originalIndex, modelData, keySequence)
141​ }
142​ }
143​ QQC2.Button {
144​ icon.name: "list-remove"
145​ onClicked: kcm.shortcutsModel.disableShortcut(originalIndex, modelData)
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​ QQC2.ToolTip {
147​ text: i18n("Disable this shortcut")
148​ }
ngrahamUnsubmitted
Done

This isn't accurate; it actually deletes the shortcut

ngraham: This isn't accurate; it actually deletes the shortcut
149​ }
150​ }
151​ }
152​ QQC2.Button {
153​ text: i18n("Add custom shortcut")
154​ icon.name: "list-add"
155​ onClicked: {
156​ this.visible = false
157​ var newKeySequenceItem = newKeySequenceComponent.createObject(parent)
158​ for (var i = 0; i < newKeySequenceItem.children.length; i++) {
159​ if (newKeySequenceItem.children[i] instanceof KeySequenceItem) {
160​ var keySequenceItem = newKeySequenceItem.children[i]
161​ }
162​ }
163​ newKeySequenceItem.finished.connect(() => {
164​ newKeySequenceItem.destroy()
165​ this.visible = true
166​ })
ngrahamUnsubmitted
Done

This tooltip is not working for me

ngraham: This tooltip is not working for me
167​ keySequenceItem.startCapturing()
168​ }
169​ }
170​
171​ Component {
172​ id: newKeySequenceComponent
173​ RowLayout {
174​ id: newKeySequenceLayout
175​ signal finished
176​ KeySequenceItem {
177​ showClearButton: false
178​ onCaptureFinished: {
179​ kcm.shortcutsModel.addShortcut(originalIndex, keySequence)
180​ parent.finished()
181​ }
182​ }
183​ QQC2.Button {
184​ icon.name: "dialog-cancel"
185​ onClicked: parent.finished()
186​ QQC2.ToolTip {
187​ text: i18n("Cancel capturing of new shortcut")
188​ }
189​ }
190​ }
191​ }
192​ }
193​ }
194​ }
195​ }
196​ }
197​ }