git.iko.soy/unity8
on xenial help sign in
turn KeymapSwitcher back into a QtObject
6ea7fadLukáš Tinkl
qml/Components/KeymapSwitcher.qml+5−6
compare with xenial
unifiedsplit
@@ -20,16 +20,16 @@ import GlobalShortcut 1.0
20import QMenuModel 0.1
20import QMenuModel 0.1
21import Unity.Application 0.1
21import Unity.Application 0.1
22
22
23−Item {
23+QtObject {
24 id: root
24 id: root
25
25
26− GlobalShortcut {
26+ property GlobalShortcut shortcutNext: GlobalShortcut {
27 shortcut: Qt.MetaModifier|Qt.Key_Space
27 shortcut: Qt.MetaModifier|Qt.Key_Space
28 onTriggered: root.nextKeymap()
28 onTriggered: root.nextKeymap()
29 active: root.keymapCount > 1
29 active: root.keymapCount > 1
30 }
30 }
31
31
32− GlobalShortcut {
32+ property GlobalShortcut shortcutPrevious: GlobalShortcut {
33 shortcut: Qt.MetaModifier|Qt.ShiftModifier|Qt.Key_Space
33 shortcut: Qt.MetaModifier|Qt.ShiftModifier|Qt.Key_Space
34 onTriggered: root.previousKeymap()
34 onTriggered: root.previousKeymap()
35 active: root.keymapCount > 1
35 active: root.keymapCount > 1
@@ -59,15 +59,14 @@ Item {
59 currentKeymapIndex = prevIndex;
59 currentKeymapIndex = prevIndex;
60 }
60 }
61
61
62− Binding {
62+ property Binding surfaceKeymapBinding: Binding {
63 target: MirFocusController.focusedSurface
63 target: MirFocusController.focusedSurface
64 property: "keymap"
64 property: "keymap"
65 value: root.currentKeymap
65 value: root.currentKeymap
66 }
66 }
67
67
68 // indicator
68 // indicator
69− QDBusActionGroup {
69+ property QDBusActionGroup actionGroup: QDBusActionGroup {
70− id: actionGroup
71 busType: DBus.SessionBus
70 busType: DBus.SessionBus
72 busName: "com.canonical.indicator.keyboard"
71 busName: "com.canonical.indicator.keyboard"
73 objectPath: "/com/canonical/indicator/keyboard"
72 objectPath: "/com/canonical/indicator/keyboard"