git.iko.soy/unity8
on xenial help sign in
drop the tester
410302fLukáš Tinkl
qml/Wizard/Pages/20-keyboard.qml−23
compare with xenial
unifiedsplit
@@ -23,7 +23,6 @@ import Wizard 0.1
23import AccountsService 0.1
23import AccountsService 0.1
24import Unity.InputInfo 0.1
24import Unity.InputInfo 0.1
25import Unity.Application 0.1
25import Unity.Application 0.1
26−import WindowManager 0.1
27import ".." as LocalComponents
26import ".." as LocalComponents
28
27
29LocalComponents.Page {
28LocalComponents.Page {
@@ -60,12 +59,6 @@ LocalComponents.Page {
60
59
61 property string selectedKeymap: ""
60 property string selectedKeymap: ""
62
61
63− TopLevelSurfaceList {
64− id: topLevelSurfaceList
65− objectName: "topLevelSurfaceList"
66− applicationsModel: ApplicationManager
67− }
68−
69 ColumnLayout {
62 ColumnLayout {
70 id: column
63 id: column
71 spacing: units.gu(2)
64 spacing: units.gu(2)
@@ -94,7 +87,6 @@ LocalComponents.Page {
94 onSelectedIndexChanged: {
87 onSelectedIndexChanged: {
95 keyboardListView.currentIndex = -1;
88 keyboardListView.currentIndex = -1;
96 selectedKeymap = "";
89 selectedKeymap = "";
97− //tester.text = "";
98 }
90 }
99 }
91 }
100
92
@@ -148,24 +140,9 @@ LocalComponents.Page {
148 onClicked: {
140 onClicked: {
149 keyboardListView.currentIndex = index;
141 keyboardListView.currentIndex = index;
150 selectedKeymap = layoutId;
142 selectedKeymap = layoutId;
151−// if (topLevelSurfaceList.count > 0) {
152−// print("Setting wizard keymap to:", selectedKeymap)
153−// var surface = topLevelSurfaceList.surfaceAt(0);
154−// surface.keymap = selectedKeymap;
155−// }
156 }
143 }
157 }
144 }
158 }
145 }
159−
160−// TextField {
161−// id: tester
162−// anchors.left: parent.left
163−// anchors.leftMargin: column.anchors.leftMargin == 0 ? units.gu(2) : 0
164−// anchors.right: parent.right
165−// anchors.rightMargin: column.anchors.rightMargin == 0 ? units.gu(2) : 0
166−// placeholderText: i18n.tr("Type here to test your keyboard")
167−// enabled: keyboardListView.currentIndex != -1
168−// }
169 }
146 }
170
147
171 Component {
148 Component {