Differential D21815 Diff 59842 sddm-theme/KeyboardButton.qml

Changeset View

Standalone View

View Options

sddm-theme/KeyboardButton.qml

1import QtQuick 2.2 1​import QtQuick 2.6
2 2​
3import org.kde.plasma.core 2.0 as PlasmaCore 3​import org.kde.plasma.core 2.0 as PlasmaCore
4import org.kde.plasma.components 2.0 as PlasmaComponents 4​import org.kde.plasma.components 2.0 as PlasmaComponents
5 5​
6import QtQuick.Controls 1.3 as QQC 6​import QtQuick.Controls 2.5 as QQC2
7 7​
8​Item {
8PlasmaComponents.ToolButton { 9​ PlasmaComponents.ToolButton {
9 id: keyboardButton 10​ id: toolBtn
ngrahamUnsubmitted
Not Done

Prefer descriptive variable names; toolButton is better than toolBtn, but even better would be a description of what this button is actually for. The original was better and didn't need to be changed IMO.

ngraham: Prefer descriptive variable names; `toolButton` is better than `toolBtn`, but even better would…
10 11​
11 property int currentIndex: -1 12​ property int currentIndex: -1
12 13​
13 text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", instantiator.objectAt(currentIndex).shortName) 14​ text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", instantiator.objectAt(currentIndex).shortName)
14 implicitWidth: minimumWidth 15​ implicitWidth: minimumWidth
16​
15 font.pointSize: config.fontSize 17​ font.pointSize: config.fontSize
16 18​
17 visible: menu.items.length > 1 19​ visible: keyboardMenu.count > 1
18 20​
19 Component.onCompleted: currentIndex = Qt.binding(function() {return keyboard.currentLayout}); 21​ Component.onCompleted: currentIndex = Qt.binding(function() {return keyboard.currentLayout});
20 22​
21 menu: QQC.Menu { 23​// menu: QQC.Menu {
davidedmundsonUnsubmitted
Not Done

Please fix.

davidedmundson: Please fix.
24​// id: keyboardMenu
25​// style: BreezeMenuStyle {}
26​// Instantiator {
27​// id: instantiator
28​// model: keyboard.layouts
29​// onObjectAdded: keyboardMenu.insertItem(index, object)
30​// onObjectRemoved: keyboardMenu.removeItem( object )
31​// delegate: QQC.MenuItem {
32​// text: modelData.longName
33​// property string shortName: modelData.shortName
34​// onTriggered: {
35​// keyboard.currentLayout = model.index
36​// }
37​// }
38​// }
39​// }
40​
41​ onClicked: {
42​ keyboardMenu.popup(x, y)
43​ }
44​ }
45​ QQC2.Menu {
22 id: keyboardMenu 46​ id: keyboardMenu
23 style: BreezeMenuStyle {} 47​ property int largestWidth: 9999
48​
49​ Component.onCompleted: {
50​ var trueWidth = 0;
51​ for (var i = 0; i < keyboardMenu.count; i++) {
52​ trueWidth = Math.max(trueWidth, keyboardMenu.itemAt(i).textWidth)
53​ }
54​ keyboardMenu.largestWidth = trueWidth
55​ }
56​
57​ background: Rectangle {
58​ implicitHeight: 40
59​ implicitWidth: keyboardMenu.largestWidth
60​ color: PlasmaCore.ColorScope.backgroundColor
61​ border.color: Qt.tint(PlasmaCore.ColorScope.textColor, Qt.rgba(color.r, color.g, color.b, 0.7))
62​ border.width: 1
63​ }
64​
24 Instantiator { 65​ Instantiator {
25 id: instantiator 66​ id: instantiator
26 model: keyboard.layouts 67​ model: keyboard.layouts
27 onObjectAdded: keyboardMenu.insertItem(index, object) 68​ onObjectAdded: keyboardMenu.addItem( object )
28 onObjectRemoved: keyboardMenu.removeItem( object ) 69​ onObjectRemoved: keyboardMenu.removeItem( object )
29 delegate: QQC.MenuItem { 70​ delegate: QQC2.MenuItem {
30 text: modelData.longName 71​ id: menuItem
72​ property string name: modelData.longName
31 property string shortName: modelData.shortName 73​ property string shortName: modelData.shortName
32 onTriggered: { 74​
75​ property real textWidth: text.contentWidth + 20
76​ implicitWidth: text.contentWidth + 20
77​ implicitHeight: text.contentHeight * 1.6
78​
79​ contentItem: QQC2.Label {
80​ id: text
81​ text: modelData.longName
82​ font: menuItem.font
83​ color: PlasmaCore.ColorScope.textColor
84​ horizontalAlignment: Text.AlignLeft
85​ verticalAlignment: Text.AlignVCenter
86​ elide: Text.ElideRight
87​ }
88​
89​ background: Rectangle {
90​ color: menuItem.highlighted ? PlasmaCore.ColorScope.highlightColor : "transparent"
91​ MouseArea {
92​ anchors.fill: parent
93​ hoverEnabled: true
94​ onContainsMouseChanged: menuItem.highlighted = containsMouse
95​ onClicked: {
96​ keyboardMenu.dismiss()
33 keyboard.currentLayout = model.index 97​ keyboard.currentLayout = model.index
34 } 98​ }
35 } 99​ }
36 } 100​ }
37 } 101​ }
38} 102​ }
103​ }
104​}