on xenial help sign in
integrate new timezone map assets
f3ece29Lukáš Tinkl
qml/Wizard/Pages/50-timezone.qml+7−5
@@ -35,7 +35,7 @@ LocalComponents.Page {
35 readonly property alias tdModule: timeDatePanel
35 readonly property alias tdModule: timeDatePanel
36
36
37 function highlightTimezone(offset) {
37 function highlightTimezone(offset) {
38− highlightImage.source = "file:/usr/share/libtimezonemap/ui/timezone_" + offset + ".png";
38+ highlightImage.source = "data/timezonemap/timezone_" + offset + ".png";
39 }
39 }
40
40
41 // geo coords conversion functions (adapted from libtimezonemap)
41 // geo coords conversion functions (adapted from libtimezonemap)
@@ -146,8 +146,8 @@ LocalComponents.Page {
146 selectedTimeZone = timeZone;
146 selectedTimeZone = timeZone;
147 print("Clicked at city with coords:", longitude, latitude);
147 print("Clicked at city with coords:", longitude, latitude);
148 print("Highlight at (x,y):", longitudeToX(longitude, map.width), latitudeToY(latitude, map.height));
148 print("Highlight at (x,y):", longitudeToX(longitude, map.width), latitudeToY(latitude, map.height));
149− pinImage.x = longitudeToX(longitude, map.width) - 8;
149+ pinImage.x = longitudeToX(longitude, map.width) - pinImage.width / 2;
150− pinImage.y = latitudeToY(latitude, map.height) - 16;
150+ pinImage.y = latitudeToY(latitude, map.height) - pinImage.height;
151 }
151 }
152 }
152 }
153 }
153 }
@@ -227,7 +227,7 @@ LocalComponents.Page {
227
227
228 Image {
228 Image {
229 id: backgroundImage
229 id: backgroundImage
230− source: "file:/usr/share/libtimezonemap/ui/bg.png"
230+ source: "data/timezonemap/map.png"
231 sourceSize: Qt.size(map.width, map.height)
231 sourceSize: Qt.size(map.width, map.height)
232 fillMode: Image.PreserveAspectFit
232 fillMode: Image.PreserveAspectFit
233 smooth: true
233 smooth: true
@@ -251,8 +251,10 @@ LocalComponents.Page {
251
251
252 Image {
252 Image {
253 id: pinImage
253 id: pinImage
254− source: "file:/usr/share/libtimezonemap/ui/pin.png"
254+ source: "data/timezonemap/pin.png"
255 visible: selectedTimeZone != ""
255 visible: selectedTimeZone != ""
256+ width: units.dp(8)
257+ height: units.dp(16)
256 z: map.z + 1
258 z: map.z + 1
257 }
259 }
258 }
260 }
qml/Wizard/Pages/data/timezonemap/map.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/pin.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-1.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-10.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-11.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-2.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-3.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-3.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-4.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-4.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-6.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-7.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-8.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-9.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-9.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_0.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_1.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_10.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_10.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_11.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_12.75.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_12.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_13.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_2.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_3.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_3.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_4.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_4.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_5.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_5.75.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_6.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_6.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_7.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_8.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_8.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_9.pngnew file

Binary file not shown.