@@ -154,107 +154,113 @@ LocalComponents.Page {
154154 }
155155 }
156156
157− GridLayout {
158− id: masterLayout
159− columns: 2
160− rows: 1
161− flow: GridLayout.TopToBottom
162− columnSpacing: units.gu(2)
157+
158+ ColumnLayout {
159+ id: leftColumn
163160 anchors {
164− fill: content
161+ left: content.left
162+ top: content.top
163+ bottom: content.bottom
164+ right: !desktopLook ? content.right : undefined
165165 leftMargin: desktopLook ? staticMargin : 0
166166 rightMargin: desktopLook ? staticMargin : 0
167167 topMargin: customMargin
168168 }
169169
170− ColumnLayout {
171− Layout.fillHeight: true
172− Layout.maximumWidth: maximumContentWidth
170+ width: Math.min(parent.width, units.gu(34))
173171
174− LocalComponents.WizardTextField {
175− id: searchField
176− objectName: "tzFilter"
177− anchors.left: parent.left
178− anchors.right: parent.right
179− anchors.leftMargin: !desktopLook ? staticMargin : 0
180− anchors.rightMargin: !desktopLook ? staticMargin : 0
181− placeholderText: i18n.tr("Enter your city")
182− inputMethodHints: Qt.ImhNoPredictiveText
183− onTextChanged: resetViews();
184− }
172+ LocalComponents.WizardTextField {
173+ id: searchField
174+ objectName: "tzFilter"
175+ anchors.left: parent.left
176+ anchors.right: parent.right
177+ anchors.leftMargin: !desktopLook ? staticMargin : 0
178+ anchors.rightMargin: !desktopLook ? staticMargin : 0
179+ placeholderText: i18n.tr("Enter your city")
180+ inputMethodHints: Qt.ImhNoPredictiveText
181+ onTextChanged: resetViews();
182+ }
185183
186− ListView {
187− Layout.fillHeight: true
188− Layout.fillWidth: true
189− id: tzList
190− objectName: "tzList"
191− clip: true
192− currentIndex: -1
193− model: TimeZoneModel {
194− id: timeZoneModel
195− filter: searchField.text
196− country: i18n.language.split('_')[1].split('.')[0]
197− }
198− delegate: tzComponent
184+ ListView {
185+ Layout.fillHeight: true
186+ Layout.fillWidth: true
187+ id: tzList
188+ objectName: "tzList"
189+ clip: true
190+ currentIndex: -1
191+ model: TimeZoneModel {
192+ id: timeZoneModel
193+ filter: searchField.text
194+ country: i18n.language.split('_')[1].split('.')[0]
199195 }
196+ delegate: tzComponent
197+ }
200198
201− ActivityIndicator {
202− anchors.centerIn: tzList
203− running: tzList.count == 0 &&
204− searchField.length > 0 &&
205− timeZoneModel.listUpdating
206− visible: running
207− }
199+ ActivityIndicator {
200+ anchors.centerIn: tzList
201+ running: tzList.count == 0 &&
202+ searchField.length > 0 &&
203+ timeZoneModel.listUpdating
204+ visible: running
205+ }
206+ }
207+
208+ Item {
209+ id: mapContainer
210+ visible: desktopLook && !contentAnimationRunning
211+ enabled: visible
212+
213+ anchors {
214+ left: leftColumn.right
215+ leftMargin: units.gu(2)
216+ right: content.right
217+ rightMargin: staticMargin
218+ top: content.top
219+ topMargin: customMargin
220+ bottom: parent.bottom
221+ bottomMargin: buttonBarHeight
208222 }
209223
210224 Item {
211− Layout.fillWidth: desktopLook
212− Layout.fillHeight: true
213− id: mapContainer
214− visible: desktopLook && !contentAnimationRunning
215− enabled: visible
216−
217− Item {
218− id: map
219− width: Math.min(parent.width, height * 1.95) // keep our aspect ratio
220− height: parent.height
221− anchors {
222− centerIn: parent
223− }
225+ id: map
226+ width: Math.min(parent.width, height * 1.95) // keep our aspect ratio
227+ height: parent.height
228+ anchors {
229+ centerIn: parent
230+ }
224231
225− Image {
226− id: backgroundImage
227− source: "data/timezonemap/map.png"
228− sourceSize: Qt.size(map.width, map.height)
229− fillMode: Image.PreserveAspectFit
230− smooth: false
231− visible: false
232− asynchronous: true
233− }
232+ Image {
233+ id: backgroundImage
234+ source: "data/timezonemap/map.png"
235+ sourceSize: Qt.size(map.width, map.height)
236+ fillMode: Image.PreserveAspectFit
237+ smooth: false
238+ visible: false
239+ asynchronous: true
240+ }
234241
235− Image {
236− id: highlightImage
237− sourceSize: Qt.size(map.width, map.height)
238− fillMode: Image.PreserveAspectFit
239− smooth: false
240− visible: false
241− asynchronous: true
242− }
242+ Image {
243+ id: highlightImage
244+ sourceSize: Qt.size(map.width, map.height)
245+ fillMode: Image.PreserveAspectFit
246+ smooth: false
247+ visible: false
248+ asynchronous: true
249+ }
243250
244− Blend {
245− anchors.fill: map
246− source: backgroundImage
247− foregroundSource: highlightImage
248− }
251+ Blend {
252+ anchors.fill: map
253+ source: backgroundImage
254+ foregroundSource: highlightImage
255+ }
249256
250− Image {
251− id: pinImage
252− source: "data/timezonemap/pin.png"
253− visible: x != 0 && y != 0
254− width: units.dp(12)
255− height: units.dp(20)
256− z: map.z + 1
257− }
257+ Image {
258+ id: pinImage
259+ source: "data/timezonemap/pin.png"
260+ visible: x != 0 && y != 0
261+ width: units.dp(12)
262+ height: units.dp(20)
263+ z: map.z + 1
258264 }
259265 }
260266 }