f3ece29 · unity8 · git.iko.soy

git.iko.soy/unity8

integrate new timezone map assets

commitf3ece2934f7659106f8a2c4d7f718e9f9606318c authorLukáš Tinkl <lukas.tinkl@canonical.com> dateFri 12 Feb 2016, 15:49 (11 years ago) parent3370734

39 files changed+7−5

compare with xenial

unifiedsplit

qml/Wizard/Pages/50-timezone.qml+7−5

@@ -35,7 +35,7 @@ LocalComponents.Page {

3535 readonly property alias tdModule: timeDatePanel

3636

3737 function highlightTimezone(offset) {

38− highlightImage.source = "file:/usr/share/libtimezonemap/ui/timezone_" + offset + ".png";

38+ highlightImage.source = "data/timezonemap/timezone_" + offset + ".png";

3939 }

4040

4141 // geo coords conversion functions (adapted from libtimezonemap)

@@ -146,8 +146,8 @@ LocalComponents.Page {

146146 selectedTimeZone = timeZone;

147147 print("Clicked at city with coords:", longitude, latitude);

148148 print("Highlight at (x,y):", longitudeToX(longitude, map.width), latitudeToY(latitude, map.height));

149− pinImage.x = longitudeToX(longitude, map.width) - 8;

150− pinImage.y = latitudeToY(latitude, map.height) - 16;

149+ pinImage.x = longitudeToX(longitude, map.width) - pinImage.width / 2;

150+ pinImage.y = latitudeToY(latitude, map.height) - pinImage.height;

151151 }

152152 }

153153 }

@@ -227,7 +227,7 @@ LocalComponents.Page {

227227

228228 Image {

229229 id: backgroundImage

230− source: "file:/usr/share/libtimezonemap/ui/bg.png"

230+ source: "data/timezonemap/map.png"

231231 sourceSize: Qt.size(map.width, map.height)

232232 fillMode: Image.PreserveAspectFit

233233 smooth: true

@@ -251,8 +251,10 @@ LocalComponents.Page {

251251

252252 Image {

253253 id: pinImage

254− source: "file:/usr/share/libtimezonemap/ui/pin.png"

254+ source: "data/timezonemap/pin.png"

255255 visible: selectedTimeZone != ""

256+ width: units.dp(8)

257+ height: units.dp(16)

256258 z: map.z + 1

257259 }

258260 }

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.