git.iko.soy/unity8
on xenial help sign in
visual tweaks (option 1)
ab2277bLukáš Tinkl
qml/Wizard/Pages/20-keyboard.qml+37−19
compare with xenial
unifiedsplit
@@ -72,10 +72,16 @@ LocalComponents.Page {
72
72
73 anchors {
73 anchors {
74 fill: content
74 fill: content
75− leftMargin: wideMode ? parent.leftMargin : 0
75+ leftMargin: wideMode ? parent.leftMargin : staticMargin
76− rightMargin: wideMode ? parent.rightMargin : 0
76+ rightMargin: wideMode ? parent.rightMargin : staticMargin
77− topMargin: wideMode ? parent.customMargin : 0
77+ topMargin: staticMargin
78− bottomMargin: units.gu(2)
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
79 }
85 }
80
86
81 ItemSelector {
87 ItemSelector {
@@ -88,10 +94,17 @@ LocalComponents.Page {
88 onSelectedIndexChanged: {
94 onSelectedIndexChanged: {
89 keyboardListView.currentIndex = -1;
95 keyboardListView.currentIndex = -1;
90 selectedKeymap = "";
96 selectedKeymap = "";
91− tester.text = "";
97+ //tester.text = "";
92 }
98 }
93 }
99 }
94
100
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+
95 ListView {
108 ListView {
96 Layout.fillHeight: true
109 Layout.fillHeight: true
97 id: keyboardListView
110 id: keyboardListView
@@ -111,11 +124,16 @@ LocalComponents.Page {
111 objectName: "kbdDelegate" + index
124 objectName: "kbdDelegate" + index
112 height: layout.height + (divider.visible ? divider.height : 0)
125 height: layout.height + (divider.visible ? divider.height : 0)
113 readonly property bool isCurrent: index === ListView.view.currentIndex
126 readonly property bool isCurrent: index === ListView.view.currentIndex
127+ highlightColor: backgroundColor
128+ divider.colorFrom: dividerColor
129+ divider.colorTo: backgroundColor
114
130
115 ListItemLayout {
131 ListItemLayout {
116 id: layout
132 id: layout
117 title.text: displayName
133 title.text: displayName
118 subtitle.text: layoutId
134 subtitle.text: layoutId
135+ padding.leading: -units.gu(1)
136+ padding.trailing: -units.gu(1)
119 Image {
137 Image {
120 SlotsLayout.position: SlotsLayout.Trailing
138 SlotsLayout.position: SlotsLayout.Trailing
121 SlotsLayout.overrideVerticalPositioning: true
139 SlotsLayout.overrideVerticalPositioning: true
@@ -130,24 +148,24 @@ LocalComponents.Page {
130 onClicked: {
148 onClicked: {
131 keyboardListView.currentIndex = index;
149 keyboardListView.currentIndex = index;
132 selectedKeymap = layoutId;
150 selectedKeymap = layoutId;
133− if (topLevelSurfaceList.count > 0) {
151+// if (topLevelSurfaceList.count > 0) {
134− print("Setting wizard keymap to:", selectedKeymap)
152+// print("Setting wizard keymap to:", selectedKeymap)
135− var surface = topLevelSurfaceList.surfaceAt(0);
153+// var surface = topLevelSurfaceList.surfaceAt(0);
136− surface.keymap = selectedKeymap;
154+// surface.keymap = selectedKeymap;
137− }
155+// }
138 }
156 }
139 }
157 }
140 }
158 }
141
159
142− TextField {
160+// TextField {
143− id: tester
161+// id: tester
144− anchors.left: parent.left
162+// anchors.left: parent.left
145− anchors.leftMargin: column.anchors.leftMargin == 0 ? units.gu(2) : 0
163+// anchors.leftMargin: column.anchors.leftMargin == 0 ? units.gu(2) : 0
146− anchors.right: parent.right
164+// anchors.right: parent.right
147− anchors.rightMargin: column.anchors.rightMargin == 0 ? units.gu(2) : 0
165+// anchors.rightMargin: column.anchors.rightMargin == 0 ? units.gu(2) : 0
148− placeholderText: i18n.tr("Type here to test your keyboard")
166+// placeholderText: i18n.tr("Type here to test your keyboard")
149− enabled: keyboardListView.currentIndex != -1
167+// enabled: keyboardListView.currentIndex != -1
150− }
168+// }
151 }
169 }
152
170
153 Component {
171 Component {