Differential D28744 Diff 80553 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: Item {
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​ implicitHeight: itemLayout.implicitHeight
53​ RowLayout {
54​ id: itemLayout
55​ width: parent.width
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​ spacing: Kirigami.Units.smallSpacing
57​ QQC2.Label {
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​ Layout.alignment: Qt.AlignTop
59​ Layout.preferredHeight: expandButton.height
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​ text: i18nc("%1 is the name action that is triggered by the key sequences following after :", "%1:", model.display)
61​ }
62​ QQC2.Label {
63​ Layout.alignment: Qt.AlignTop
64​ Layout.preferredHeight: expandButton.height
65​ Layout.fillWidth: true
66​ color: model.activeShortcuts.length != 0 ? Kirigami.Theme.textColor : Kirigami.Theme.disabledTextColor
67​ elide: Text.ElideRight
68​ horizontalAlignment: Text.AlignRight
ngrahamUnsubmitted
Done

use expand

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

use collapse

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

This isn't accurate; it actually deletes the shortcut

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

This tooltip is not working for me

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