@@ -72,10 +72,16 @@ LocalComponents.Page {
7272
7373 anchors {
7474 fill: content
75− leftMargin: wideMode ? parent.leftMargin : 0
76− rightMargin: wideMode ? parent.rightMargin : 0
77− topMargin: wideMode ? parent.customMargin : 0
78− bottomMargin: units.gu(2)
75+ leftMargin: wideMode ? parent.leftMargin : staticMargin
76+ rightMargin: wideMode ? parent.rightMargin : staticMargin
77+ topMargin: staticMargin
78+ }
79+
80+ Label {
81+ anchors.left: parent.left
82+ anchors.right: parent.right
83+ text: i18n.tr("Keyboard language")
84+ font.weight: Font.Normal
7985 }
8086
8187 ItemSelector {
@@ -88,10 +94,17 @@ LocalComponents.Page {
8894 onSelectedIndexChanged: {
8995 keyboardListView.currentIndex = -1;
9096 selectedKeymap = "";
91− tester.text = "";
97+ //tester.text = "";
9298 }
9399 }
94100
101+ Label {
102+ anchors.left: parent.left
103+ anchors.right: parent.right
104+ text: i18n.tr("Keyboard layout")
105+ font.weight: Font.Normal
106+ }
107+
95108 ListView {
96109 Layout.fillHeight: true
97110 id: keyboardListView
@@ -111,11 +124,16 @@ LocalComponents.Page {
111124 objectName: "kbdDelegate" + index
112125 height: layout.height + (divider.visible ? divider.height : 0)
113126 readonly property bool isCurrent: index === ListView.view.currentIndex
127+ highlightColor: backgroundColor
128+ divider.colorFrom: dividerColor
129+ divider.colorTo: backgroundColor
114130
115131 ListItemLayout {
116132 id: layout
117133 title.text: displayName
118134 subtitle.text: layoutId
135+ padding.leading: -units.gu(1)
136+ padding.trailing: -units.gu(1)
119137 Image {
120138 SlotsLayout.position: SlotsLayout.Trailing
121139 SlotsLayout.overrideVerticalPositioning: true
@@ -130,24 +148,24 @@ LocalComponents.Page {
130148 onClicked: {
131149 keyboardListView.currentIndex = index;
132150 selectedKeymap = layoutId;
133− if (topLevelSurfaceList.count > 0) {
134− print("Setting wizard keymap to:", selectedKeymap)
135− var surface = topLevelSurfaceList.surfaceAt(0);
136− surface.keymap = selectedKeymap;
137− }
151+// if (topLevelSurfaceList.count > 0) {
152+// print("Setting wizard keymap to:", selectedKeymap)
153+// var surface = topLevelSurfaceList.surfaceAt(0);
154+// surface.keymap = selectedKeymap;
155+// }
138156 }
139157 }
140158 }
141159
142− TextField {
143− id: tester
144− anchors.left: parent.left
145− anchors.leftMargin: column.anchors.leftMargin == 0 ? units.gu(2) : 0
146− anchors.right: parent.right
147− anchors.rightMargin: column.anchors.rightMargin == 0 ? units.gu(2) : 0
148− placeholderText: i18n.tr("Type here to test your keyboard")
149− enabled: keyboardListView.currentIndex != -1
150− }
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+// }
151169 }
152170
153171 Component {