Differential D28744 Diff 80629 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​ readonly property bool isCurrentItem: shortcutsList.selectedIndex == index
31​ sourceComponent: isCurrentItem ? editRepresentation : compactRepresentation
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​ onIsCurrentItemChanged: {
33​ oldHeight = height
34​ }
35​ clip: true
36​ onSourceComponentChanged: {
37​ animation.running = true
38​ }
39​ NumberAnimation {
40​ target: loader.item
41​ id: animation
42​ property: "height"
43​ from: oldHeight
44​ to: loader.height
45​ duration: Kirigami.Units.shortDuration
46​ }
47​ Component {
48​ id:compactRepresentation
49​ Kirigami.AbstractListItem {
50​ width: shortcutsList.width
51​ onClicked: shortcutsList.selectedIndex = index
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​ contentItem: Item {
53​ implicitHeight: itemLayout.implicitHeight
54​ RowLayout {
55​ id: itemLayout
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​ width: parent.width
57​ spacing: Kirigami.Units.smallSpacing
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​ QQC2.Label {
59​ Layout.alignment: Qt.AlignTop
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​ Layout.preferredHeight: expandButton.height
61​ text: i18nc("%1 is the name action that is triggered by the key sequences following after :", "%1:", model.display)
62​ }
63​ QQC2.Label {
64​ Layout.alignment: Qt.AlignTop
65​ Layout.preferredHeight: expandButton.height
66​ Layout.fillWidth: true
67​ color: model.activeShortcuts.length != 0 ? Kirigami.Theme.textColor : Kirigami.Theme.disabledTextColor
68​ elide: Text.ElideRight
ngrahamUnsubmitted
Done

use expand

ngraham: use `expand`
69​ horizontalAlignment: Text.AlignRight
70​ text: {
71​ if (model.activeShortcuts.length != 0) {
72​ return model.activeShortcuts.map(s => kcm.keySequenceToString(s)).join(", ")
73​ } else {
74​ return i18n("No active shortcuts")
75​ }
76​ }
77​ }
78​ QQC2.ToolButton {
79​ id: expandButton
80​ Layout.alignment: Qt.AlignRight | Qt.AlignTop
81​ icon.name: "expand"
82​ onClicked: {
83​ shortcutsList.selectedIndex = index
84​ }
85​ }
86​ }
87​ MouseArea {
88​ cursorShape: Qt.PointingHandCursor
89​ acceptedButtons: Qt.NoButton
90​ anchors.fill: parent
91​ }
92​ }
93​ }
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​ Component {
ngrahamUnsubmitted
Done

use collapse

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

This isn't accurate; it actually deletes the shortcut

ngraham: This isn't accurate; it actually deletes the shortcut
149​ }
150​ Kirigami.Separator {
151​ Layout.fillWidth: true
152​ }
153​ Repeater {
154​ model: customShortcuts
155​ RowLayout {
156​ KeySequenceItem {
157​ keySequence: modelData
158​ showClearButton: false
159​ onCaptureFinished: {
160​ kcm.shortcutsModel.changeShortcut(originalIndex, modelData, keySequence)
161​ }
162​ }
163​ QQC2.Button {
164​ icon.name: "edit-delete"
165​ onClicked: kcm.shortcutsModel.disableShortcut(originalIndex, modelData)
166​ QQC2.ToolTip {
ngrahamUnsubmitted
Done

This tooltip is not working for me

ngraham: This tooltip is not working for me
167​ text: i18n("Delete this shortcut")
168​ }
169​ }
170​ }
171​ }
172​ QQC2.Button {
173​ text: i18n("Add custom shortcut")
174​ icon.name: "list-add"
175​ onClicked: {
176​ this.visible = false
177​ var newKeySequenceItem = newKeySequenceComponent.createObject(parent)
178​ for (var i = 0; i < newKeySequenceItem.children.length; i++) {
179​ if (newKeySequenceItem.children[i] instanceof KeySequenceItem) {
180​ var keySequenceItem = newKeySequenceItem.children[i]
181​ }
182​ }
183​ newKeySequenceItem.finished.connect(() => {
184​ newKeySequenceItem.destroy()
185​ this.visible = true
186​ })
187​ keySequenceItem.startCapturing()
188​ }
189​ }
190​
191​ Component {
192​ id: newKeySequenceComponent
193​ RowLayout {
194​ id: newKeySequenceLayout
195​ signal finished
196​ KeySequenceItem {
197​ showClearButton: false
198​ onCaptureFinished: {
199​ kcm.shortcutsModel.addShortcut(originalIndex, keySequence)
200​ parent.finished()
201​ }
202​ }
203​ QQC2.Button {
204​ icon.name: "dialog-cancel"
205​ onClicked: parent.finished()
206​ QQC2.ToolTip {
207​ text: i18n("Cancel capturing of new shortcut")
208​ }
209​ }
210​ }
211​ }
212​ }
213​ }
214​ }
215​ }
216​ }
217​ }