git.iko.soy/unity8
on xenial help sign in
new conditions to show the map, > GU 110
360e0eeLukáš Tinkl
qml/Wizard/Page.qml+1−2
compare with xenial
unifiedsplit
@@ -190,6 +190,7 @@ Item {
190 }
190 }
191 height: buttonBarHeight
191 height: buttonBarHeight
192 color: "#f5f5f5"
192 color: "#f5f5f5"
193+ z: content.z + 1
193
194
194 StackButton {
195 StackButton {
195 id: backButton
196 id: backButton
@@ -201,7 +202,6 @@ Item {
201 leftMargin: staticMargin
202 leftMargin: staticMargin
202 verticalCenter: parent.verticalCenter
203 verticalCenter: parent.verticalCenter
203 }
204 }
204− z: 1
205 text: backButtonText
205 text: backButtonText
206 visible: pageStack.depth > 1 && hasBackButton
206 visible: pageStack.depth > 1 && hasBackButton
207 backArrow: true
207 backArrow: true
@@ -219,7 +219,6 @@ Item {
219 rightMargin: staticMargin
219 rightMargin: staticMargin
220 verticalCenter: parent.verticalCenter
220 verticalCenter: parent.verticalCenter
221 }
221 }
222− z: 1
223 }
222 }
224 }
223 }
225
224
qml/Wizard/Pages/50-timezone.qml+9−7
@@ -31,6 +31,7 @@ LocalComponents.Page {
31 forwardButtonSourceComponent: forwardButton
31 forwardButtonSourceComponent: forwardButton
32
32
33 property string selectedTimeZone: ""
33 property string selectedTimeZone: ""
34+ readonly property bool showingMap: desktopLook && width >= units.gu(110)
34
35
35 // for testing
36 // for testing
36 readonly property alias tdModule: timeDatePanel
37 readonly property alias tdModule: timeDatePanel
@@ -161,9 +162,9 @@ LocalComponents.Page {
161 left: content.left
162 left: content.left
162 top: content.top
163 top: content.top
163 bottom: content.bottom
164 bottom: content.bottom
164− right: !desktopLook ? content.right : undefined
165+ right: !showingMap ? content.right : undefined
165− leftMargin: desktopLook ? staticMargin : 0
166+ leftMargin: showingMap ? staticMargin : (desktopLook ? tzPage.leftMargin : 0)
166− rightMargin: desktopLook ? staticMargin : 0
167+ rightMargin: showingMap ? staticMargin : (desktopLook ? tzPage.rightMargin : 0)
167 topMargin: customMargin
168 topMargin: customMargin
168 }
169 }
169
170
@@ -174,8 +175,8 @@ LocalComponents.Page {
174 objectName: "tzFilter"
175 objectName: "tzFilter"
175 anchors.left: parent.left
176 anchors.left: parent.left
176 anchors.right: parent.right
177 anchors.right: parent.right
177− anchors.leftMargin: !desktopLook ? staticMargin : 0
178+ anchors.leftMargin: !showingMap && !desktopLook ? staticMargin : undefined
178− anchors.rightMargin: !desktopLook ? staticMargin : 0
179+ anchors.rightMargin: !showingMap && !desktopLook ? staticMargin : undefined
179 placeholderText: i18n.tr("Enter your city")
180 placeholderText: i18n.tr("Enter your city")
180 inputMethodHints: Qt.ImhNoPredictiveText
181 inputMethodHints: Qt.ImhNoPredictiveText
181 onTextChanged: resetViews();
182 onTextChanged: resetViews();
@@ -183,10 +184,11 @@ LocalComponents.Page {
183
184
184 ListView {
185 ListView {
185 Layout.fillHeight: true
186 Layout.fillHeight: true
186− Layout.fillWidth: true
187 id: tzList
187 id: tzList
188 objectName: "tzList"
188 objectName: "tzList"
189 clip: true
189 clip: true
190+ anchors.left: parent.left
191+ anchors.right: parent.right
190 currentIndex: -1
192 currentIndex: -1
191 model: TimeZoneModel {
193 model: TimeZoneModel {
192 id: timeZoneModel
194 id: timeZoneModel
@@ -207,7 +209,7 @@ LocalComponents.Page {
207
209
208 Item {
210 Item {
209 id: mapContainer
211 id: mapContainer
210− visible: desktopLook && !contentAnimationRunning
212+ visible: showingMap && !contentAnimationRunning
211 enabled: visible
213 enabled: visible
212
214
213 anchors {
215 anchors {