Ubuntu Weather App

Merge lp:~ahayzen/ubuntu-weather-app/reboot-use-suru-theme into lp:ubuntu-weather-app

  1. reboot-use-suru-theme
  2. Merge into reboot
Proposed by Andrew Hayzen
Status: Merged
Approved by: Martin Borho
Approved revision: 25
Merged at revision: 25
Proposed branch: lp:~ahayzen/ubuntu-weather-app/reboot-use-suru-theme
Merge into: lp:ubuntu-weather-app
Diff against target: 466 lines (+41/-279)
16 files modified
app/components/DayDelegate.qml (+2/-2)
app/components/HomeHourly.qml (+6/-10)
app/graphics/clouds.svg (+0/-22)
app/graphics/cloudy-night.svg (+0/-38)
app/graphics/cloudy.svg (+0/-12)
app/graphics/fog.svg (+0/-13)
app/graphics/partly-cloudy.svg (+0/-21)
app/graphics/rain.svg (+0/-22)
app/graphics/snow.svg (+0/-21)
app/graphics/starry.svg (+0/-22)
app/graphics/sunny.svg (+0/-13)
app/graphics/thunder.svg (+0/-14)
app/graphics/windy-snow.svg (+0/-42)
app/ui/HomePage.qml (+12/-12)
app/ui/LocationsPage.qml (+20/-14)
po/com.ubuntu.weather.pot (+1/-1)
To merge this branch: bzr merge lp:~ahayzen/ubuntu-weather-app/reboot-use-suru-theme
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Martin Borho Approve
Review via email: mp+253299@code.launchpad.net

Commit message

* Use suru theme for icons instead of embedded
* Fix errors with using right/left in a Row in the LocationsPage.qml

Description of the change

* Use suru theme for icons instead of embedded
* Fix errors with using right/left in a Row in the LocationsPage.qml

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:24
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/51/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/21
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/51

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/51/rebuild

review: Approve (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

Here's a mashup of the change. http://i.imgur.com/nsuWZ7R.png The order goes before, after, before, after. The changes here (after) is a bit thick (thicker than the spec), but they still look OK, IMO. I would personally say the orange icons looked better before, however.

Revision history for this message
Martin Borho (martin-borho) wrote :

Looks also OK for me, thanks!

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-autolanding/24/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-autolanding/15/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-autolanding/24/console

review: Needs Fixing (continuous-integration)
lp:~ahayzen/ubuntu-weather-app/reboot-use-suru-theme updated
25. By Andrew Hayzen

* Merge of lp:ubuntu-weather-app/reboot

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:25
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/53/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/23
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/53

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/53/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/components/DayDelegate.qml'
2--- app/components/DayDelegate.qml 2015-02-08 22:06:05 +0000
3+++ app/components/DayDelegate.qml 2015-03-19 10:21:35 +0000
4@@ -26,7 +26,7 @@
5 // TODO: will expand when clicked to reveal more info
6
7 property alias day: dayLabel.text
8- property alias image: weatherImage.source
9+ property alias image: weatherImage.name
10 property alias high: highLabel.text
11 property alias low: lowLabel.text
12
13@@ -52,7 +52,7 @@
14 fontSize: "medium"
15 }
16
17- Image {
18+ Icon {
19 id: weatherImage
20 anchors {
21 horizontalCenter: parent.horizontalCenter
22
23=== modified file 'app/components/HomeHourly.qml'
24--- app/components/HomeHourly.qml 2015-03-19 04:26:49 +0000
25+++ app/components/HomeHourly.qml 2015-03-19 10:21:35 +0000
26@@ -62,17 +62,13 @@
27 width: units.gu(7)
28 height: units.gu(7)
29 anchors.horizontalCenter: parent.horizontalCenter
30- Image {
31- id: iconImage
32- fillMode: Image.PreserveAspectFit
33- anchors.fill: parent
34- source: (hourData.icon !== undefined && iconMap[hourData.icon] !== undefined) ? iconMap[hourData.icon] : ""
35- }
36- ColorOverlay {
37- anchors.fill: iconImage
38- source: iconImage
39+ Icon {
40+ anchors {
41+ fill: parent
42+ margins: units.gu(0.5)
43+ }
44 color: UbuntuColors.orange
45- anchors.horizontalCenter: parent.horizontalCenter
46+ name: (hourData.icon !== undefined && iconMap[hourData.icon] !== undefined) ? iconMap[hourData.icon] : ""
47 }
48 }
49 Label {
50
51=== removed file 'app/graphics/clouds.svg'
52--- app/graphics/clouds.svg 2015-02-08 22:06:05 +0000
53+++ app/graphics/clouds.svg 1970-01-01 00:00:00 +0000
54@@ -1,22 +0,0 @@
55-<?xml version="1.0" encoding="utf-8"?>
56-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
57-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
58-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
59- width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
60-<path fill="#818181" d="M59.975,15.531c-6.848,0.01-13.273,3.294-17.295,8.844l-0.411,0.567l-0.671-0.19
61- c-1.473-0.416-2.996-0.631-4.526-0.637c-9.091,0.014-16.524,7.214-16.842,16.316l-0.031,0.855l-0.849,0.102
62- c-6.084,0.731-10.651,5.881-10.661,12.02v0.002c0.001,6.707,5.407,12.121,12.102,12.121h3.322c0.589-1.477,1.377-2.828,2.297-4.092
63- l-5.6,0.092H20.8c-4.47,0-8.115-3.646-8.115-8.115c0-3.366,1.763-5.854,4.17-7.211c2.048-1.154,4.522-1.433,6.938-1.211
64- c-0.458-4.202,0.209-8.238,2.176-11.357c2.15-3.412,5.85-5.666,10.734-5.666c2.806,0,5.319,1.063,7.457,2.701
65- c2.545-6.614,8.791-11.138,15.965-11.141c9.521,0.001,17.26,7.74,17.26,17.26v0.002v0.002c-0.005,1.498-0.358,2.956-0.745,4.399
66- c5.03,0.398,9.048,4.506,9.048,9.638c0.001,4.139-2.635,7.588-6.279,9.016c0.326,1.08,0.611,2.18,0.791,3.318
67- c0.511,0.35,0.987,0.742,1.451,1.146c5.283-2.223,9.037-7.371,9.037-13.481c0-5.812-3.426-11.069-8.73-13.424l-0.58-0.257
68- l-0.014-0.636C81.113,24.848,71.623,15.539,59.975,15.531 M57.005,48.5c-7.043,0-13.026,4.346-15.889,10.567l-0.246,0.537
69- l-0.59,0.043c-6.467,0.471-11.592,6.07-11.592,12.9c0,7.137,5.573,12.984,12.455,12.984h15.861H71.79
70- c5.129,0,9.283-4.365,9.283-9.666c0-4.021-2.406-7.385-5.82-8.838l-0.58-0.246l-0.027-0.629C74.202,56.361,66.522,48.5,57.005,48.5
71- M57.079,52.549h0.002c6.954,0,12.623,5.336,13.289,12.119l0.105-0.105l-0.01,1.07c0.003,0.113,0.033,0.221,0.033,0.336v0.002
72- c0,0.309-0.021,0.602-0.043,0.895v0.141c0,0.033-0.009,0.041-0.01,0.074c0,0.004,0,0.004,0,0.008
73- c-0.02,0.967-0.148,1.457-0.273,2.15c0.313-0.035,0.307-0.07,0.711-0.076h0.01h0.01c3.422,0,6.217,2.797,6.217,6.219
74- s-2.795,6.217-6.217,6.219l-29.236,0.012c-4.991,0-9.058-4.066-9.059-9.057c0-4.992,4.066-9.059,9.059-9.059
75- c0.797,0,1.559,0.252,2.324,0.459C44.999,57.496,50.432,52.555,57.079,52.549"/>
76-</svg>
77
78=== removed file 'app/graphics/cloudy-night.svg'
79--- app/graphics/cloudy-night.svg 2015-02-08 22:06:05 +0000
80+++ app/graphics/cloudy-night.svg 1970-01-01 00:00:00 +0000
81@@ -1,38 +0,0 @@
82-<?xml version="1.0" encoding="utf-8"?>
83-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
84-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
85-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
86- width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
87-<path fill="#818181" d="M22.384,58.326c0.157,0.785,0.342,1.566,0.555,2.34C22.726,59.893,22.541,59.111,22.384,58.326"/>
88-<path fill="#818181" d="M33.675,14.738v0.007h-0.012c-1.445,2.071-2.622,4.172-3.442,5.757c-1.776,0.263-4.07,0.684-6.311,1.341
89- v0.007c0,0.003,0.012,0,0.012,0v0.007c1.472,2.028,3.06,3.815,4.286,5.108c-0.262,1.768-0.519,4.046-0.54,6.352
90- c0,0.003,0.012,0,0.012,0c0,0.003,0.012,0,0.012,0c2.334-0.807,4.47-1.787,6.056-2.578c1.612,0.814,3.758,1.801,6,2.564
91- c0-0.002,0.012,0.003,0.012,0c0-0.002,0-0.006,0-0.006c0-0.003,0-0.007,0-0.007c-0.037-2.434-0.288-4.731-0.539-6.477
92- c1.256-1.303,2.847-3.076,4.244-5.004c0-0.003,0,0-0.012,0l-0.013-0.007c-2.329-0.681-4.598-1.122-6.338-1.396
93- c-0.836-1.613-2.019-3.708-3.415-5.668C33.687,14.738,33.675,14.735,33.675,14.738z"/>
94-<path fill="#818181" d="M14.458,35.462v0.005c-0.91,1.304-1.652,2.628-2.169,3.627c-1.119,0.166-2.563,0.431-3.976,0.845v0.004
95- c0,0.003,0,0,0,0v0.005c0.928,1.278,1.928,2.404,2.7,3.218c-0.165,1.114-0.326,2.549-0.34,4.002c0,0.001,0,0,0,0c0,0.001,0,0,0,0
96- c1.47-0.509,2.815-1.126,3.814-1.624c1.016,0.513,2.367,1.135,3.779,1.615c0-0.001,0,0.001,0,0s0-0.004,0-0.004
97- c0-0.001,0-0.004,0-0.005c-0.021-1.533-0.181-2.98-0.339-4.08c0.791-0.821,1.794-1.938,2.673-3.153c0-0.001,0,0,0,0v-0.005
98- c-1.468-0.429-2.896-0.706-3.993-0.879C16.083,38.018,15.338,36.698,14.458,35.462C14.458,35.462,14.458,35.461,14.458,35.462"/>
99-<path fill="#818181" d="M67.917,53.49c-6.222,0-11.51,3.842-14.033,9.324v0.004l-0.133,0.291l-0.322,0.021
100- c-5.765,0.422-10.324,5.414-10.324,11.483c0,6.342,4.962,11.556,11.098,11.556h13.719h12.787c4.62,0,8.354-3.929,8.354-8.685
101- c0-3.607-2.164-6.637-5.232-7.942v-0.004l-0.311-0.132l-0.02-0.338v-0.002c-0.392-8.631-7.17-15.576-15.579-15.576H67.917z
102- M67.987,57.638L67.987,57.638h0.264v0.056c6.099,0.145,11.026,5.094,11.026,11.228c0,0.206-0.015,0.397-0.026,0.58v0.015v0.301
103- v0.002c-0.011,0.988-0.195,1.824-0.291,2.295c0.228-0.043,0.428-0.098,0.99-0.108c2.786,0.001,5.051,2.272,5.051,5.058
104- c0,2.784-2.267,5.053-5.051,5.055l-25.287,0.009c-4.142,0.001-7.514-3.366-7.515-7.507c0-4.143,3.372-7.514,7.515-7.512
105- c0.78,0,1.523,0.201,2.246,0.44c0.699-5.594,5.373-9.894,11.073-9.905v-0.005H67.987z M67.987,57.645l-0.248,0.248v0.012
106- c0,0,0.01,0,0.014,0v-0.017l0.016,0.017c0.073-0.002,0.145-0.012,0.218-0.012v-0.002L67.987,57.645L67.987,57.645z"/>
107-<path fill="#818181" d="M67.329,20.841c4.776,7.285,6.465,16.21,4.197,24.725v0.002c-1.296,4.837-3.683,9.09-6.816,12.581
108- c1.036-0.322,2.132-0.504,3.273-0.506v-0.005h0.004h0.264v0.056c0.62,0.015,1.223,0.09,1.814,0.201
109- c2.396-3.314,4.242-7.105,5.361-11.284v-0.008c1.096-4.116,1.181-8.337,0.744-12.537l-0.354-3.391h0.002l2.129,2.662
110- c5.514,6.899,7.812,16.207,5.35,25.422v0.002c-0.878,3.277-2.283,6.265-4.094,8.904c0.047,0.413,0.074,0.831,0.074,1.256
111- c0,0.206-0.016,0.397-0.027,0.58v0.015v0.301v0.002c-0.012,0.987-0.195,1.824-0.291,2.295c0.228-0.043,0.428-0.098,0.991-0.108
112- c0.324,0,0.642,0.035,0.95,0.095c2.86-3.5,5.048-7.642,6.295-12.294c4.364-16.322-4.422-32.944-19.865-38.965H67.329z
113- M24.888,63.143c3.756,9.717,11.88,17.168,22.051,19.907v-0.002c6.843,1.834,13.753,1.362,19.92-0.926l-12.195,0.004
114- c-2.345,0.001-4.441-1.08-5.82-2.767c-0.287-0.068-0.574-0.133-0.861-0.209v-0.002c-3.729-1.006-6.977-2.896-9.885-5.123
115- l-2.717-2.08l3.408,0.291c3.014,0.256,6.002,0.108,8.9-0.396c1.107-2.771,3.814-4.735,6.975-4.733c0.78,0,1.523,0.201,2.245,0.44
116- c0.174-1.376,0.589-2.672,1.198-3.847c-7.001,4.381-15.729,5.963-24.326,3.66v-0.002C30.58,66.49,27.638,64.969,24.888,63.143"/>
117-<path fill="#818181" d="M67.987,57.645l-0.248,0.248v0.012c0,0,0.01,0,0.014,0v-0.017l0.017,0.017
118- c0.072-0.002,0.144-0.012,0.217-0.012v-0.002L67.987,57.645L67.987,57.645z"/>
119-</svg>
120
121=== removed file 'app/graphics/cloudy.svg'
122--- app/graphics/cloudy.svg 2015-02-08 22:06:05 +0000
123+++ app/graphics/cloudy.svg 1970-01-01 00:00:00 +0000
124@@ -1,12 +0,0 @@
125-<?xml version="1.0" encoding="utf-8"?>
126-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
127-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
128-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
129- width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
130-<path fill="#818285" d="M53.295,21.823c-11.104,0-20.535,6.845-25.036,16.612l-0.246,0.534l-0.59,0.043
131- c-10.279,0.748-18.41,9.636-18.41,20.439c0,11.291,8.845,20.57,19.783,20.57h24.499H76.13c8.231,0,14.883-6.986,14.883-15.449
132- c0-6.416-3.855-11.809-9.324-14.13l-0.58-0.246l-0.028-0.629C80.383,34.195,68.294,21.823,53.295,21.823 M53.524,25.834h0.008
133- c12.847,0,23.281,10.436,23.281,23.281v0.002v0.004c-0.008,1.425-0.246,2.832-0.512,4.232c5.966,0.365,10.747,5.225,10.746,11.279
134- c0.001,6.295-5.123,11.418-11.418,11.418L29.604,75.91c-9.086-0.002-16.473-7.389-16.473-16.475c0-9.089,7.389-16.478,16.477-16.478
135- c0.507,0.004,1.011,0.07,1.517,0.121C33.848,32.968,42.981,25.844,53.524,25.834"/>
136-</svg>
137
138=== removed file 'app/graphics/fog.svg'
139--- app/graphics/fog.svg 2015-02-08 22:06:05 +0000
140+++ app/graphics/fog.svg 1970-01-01 00:00:00 +0000
141@@ -1,13 +0,0 @@
142-<?xml version="1.0" encoding="utf-8"?>
143-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
144-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
145-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
146- width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
147-<path fill="#818181" d="M52.593,12.922c-10.004,0.005-18.5,6.132-22.555,14.873l-0.246,0.536l-0.588,0.043
148- c-9.254,0.669-16.569,8.611-16.568,18.269v1.711v0.568v4h4.169v-4v-0.568v-1.635c0-7.826,6.401-14.187,14.268-14.186
149- c0.548,0.004,1.09,0.09,1.633,0.154c2.178-9.186,10.397-15.778,19.969-15.783c11.354,0,20.587,9.168,20.586,20.459v0.002v0.005
150- c-0.008,1.419-0.303,2.811-0.602,4.198c0.026,0,0.053-0.006,0.08-0.006c5.362,0,9.737,4.343,9.737,9.683
151- c0,5.338-4.375,9.68-9.737,9.68l-60.115-0.004v4h60.631c7.406,0,13.369-6.129,13.369-13.676c0-5.726-3.46-10.533-8.375-12.607
152- l-0.582-0.246l-0.028-0.631c-0.627-13.758-11.518-24.833-25.035-24.84H52.593z M12.624,76.922h74v-4h-74V76.922z M12.624,88.922h74
153- v-4h-74V88.922z"/>
154-</svg>
155
156=== removed file 'app/graphics/partly-cloudy.svg'
157--- app/graphics/partly-cloudy.svg 2015-02-08 22:06:05 +0000
158+++ app/graphics/partly-cloudy.svg 1970-01-01 00:00:00 +0000
159@@ -1,21 +0,0 @@
160-<?xml version="1.0" encoding="utf-8"?>
161-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
162-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
163-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
164- width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
165-<path fill="#818285" d="M52.013,12.326l-4,1.332v7.279h4V12.326z M31.745,17.295l-3.465,2l4,6.929l3.465-2L31.745,17.295z
166- M68.28,17.295l-4,6.929l3.465,2l4-6.929L68.28,17.295z M50.013,26.937c-14.371,0-26,11.629-26,26
167- c0.008,11.83,7.988,22.154,19.436,25.141l0.131,0.033c0.488,5.753,5.141,10.326,10.828,10.326h13.412h12.498
168- c4.533,0,8.195-3.854,8.195-8.518c0-3.537-2.122-6.509-5.132-7.789l-0.289-0.125l-0.015-0.312
169- c-0.255-5.624-3.288-10.506-7.711-13.15l0.039-0.172c0.394-1.785,0.596-3.609,0.607-5.438
170- C76.011,38.564,64.383,26.937,50.013,26.937 M50.013,30.937c12.139,0,22,9.862,22,22v0.004v0.004
171- c-0.01,1.154-0.109,2.306-0.298,3.445l-0.095,0.564c-1.216-0.326-2.483-0.518-3.801-0.518c-6.097,0-11.277,3.765-13.748,9.135
172- l-0.123,0.268l-0.295,0.021c-4.655,0.339-8.502,3.721-9.717,8.225l-0.468-0.146c-9.189-2.863-15.455-11.379-15.456-21.002
173- C28.013,40.799,37.874,30.937,50.013,30.937 M16.37,31.205l-2,3.465l6.931,4l2-3.465L16.37,31.205z M83.655,31.205l-6.932,4
174- l2.002,3.465l6.93-4L83.655,31.205z M10.013,54.938h8v-4h-8V54.938z M82.013,54.938h8v-4h-8V54.938z M67.872,60.551h0.002h0.009
175- c6.065,0.004,10.993,4.935,10.993,11.002c0,0.201-0.018,0.392-0.029,0.586v0.287c-0.011,0.986-0.192,1.777-0.291,2.279
176- c0.302-0.049,0.428-0.098,1.002-0.107h0.012c2.706,0,4.91,2.203,4.91,4.91s-2.203,4.914-4.91,4.914l-24.717,0.01
177- c-4.032,0-7.314-3.28-7.314-7.312c-0.001-4.033,3.281-7.312,7.314-7.312c0.759,0,1.493,0.205,2.213,0.438
178- C57.735,64.773,62.304,60.562,67.872,60.551 M21.301,67.205l-6.931,4l2,3.465l6.931-4L21.301,67.205z M32.28,79.65l-4,6.93l3.465,2
179- l4-6.93L32.28,79.65z"/>
180-</svg>
181
182=== removed file 'app/graphics/rain.svg'
183--- app/graphics/rain.svg 2015-02-08 22:06:05 +0000
184+++ app/graphics/rain.svg 1970-01-01 00:00:00 +0000
185@@ -1,22 +0,0 @@
186-<?xml version="1.0" encoding="utf-8"?>
187-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
188-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
189-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
190- width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
191-<path fill="#818181" d="M67.463,68.004c-2.34,5.406-4.102,10.639-4.219,11.028l-0.016,0.043l-0.014,0.043
192- c0.009-0.024-0.006,0.019-0.043,0.132c-0.15,0.455-0.232,0.928-0.232,1.418c0,2.518,2.01,4.526,4.527,4.526
193- c2.513-0.006,4.516-2.013,4.516-4.526c0-0.496-0.08-0.969-0.229-1.418l-0.01-0.021l-0.01-0.022
194- C71.734,79.207,69.963,73.832,67.463,68.004 M32.829,69.213c-2.008,4.703-3.531,9.19-3.633,9.53l-0.016,0.046l-0.017,0.045
195- c0.017-0.043,0.003-0.002-0.034,0.11v0.002c-0.129,0.392-0.199,0.796-0.199,1.22c0,2.174,1.73,3.903,3.905,3.903
196- c2.167-0.007,3.892-1.733,3.892-3.903c0-0.427-0.069-0.834-0.197-1.222l-0.01-0.022l-0.01-0.021
197- C36.51,78.901,34.975,74.278,32.829,69.213 M50.146,70.35c-2.967,6.725-5.175,13.365-5.322,13.855l-0.012,0.041l-0.018,0.038
198- c0.012-0.034-0.003,0.028-0.052,0.175v0.002c-0.189,0.571-0.293,1.168-0.293,1.785c0,3.166,2.535,5.7,5.703,5.7
199- c3.161-0.007,5.687-2.538,5.687-5.7c0-0.625-0.102-1.223-0.287-1.787l-0.01-0.021l-0.01-0.022
200- C55.533,84.416,53.318,77.611,50.146,70.35"/>
201-<path fill="#818181" d="M52.523,8.96c-9.938,0-18.38,6.125-22.41,14.871l-0.246,0.537l-0.59,0.043
202- C20.092,25.08,12.825,33.02,12.825,42.68c0,10.095,7.905,18.386,17.679,18.386h22.02h20.525c7.342,0,13.275-6.232,13.275-13.784
203- c0-5.727-3.439-10.535-8.318-12.608l-0.58-0.246l-0.027-0.629C76.775,20.033,65.949,8.96,52.523,8.96 M52.6,12.942h0.012
204- c11.287,0,20.457,9.172,20.457,20.459v0.002v0.002c-0.004,1.421-0.3,2.814-0.598,4.201c0.023,0,0.048-0.006,0.072-0.006
205- c5.336,0,9.682,4.347,9.682,9.682s-4.346,9.681-9.682,9.681l-41.402-0.021c-7.823,0-14.186-6.362-14.186-14.185
206- c0-7.822,6.363-14.185,14.186-14.185c0.543,0.003,1.079,0.089,1.617,0.154C34.922,19.542,43.085,12.947,52.6,12.942"/>
207-</svg>
208
209=== removed file 'app/graphics/snow.svg'
210--- app/graphics/snow.svg 2015-02-08 22:06:05 +0000
211+++ app/graphics/snow.svg 1970-01-01 00:00:00 +0000
212@@ -1,21 +0,0 @@
213-<?xml version="1.0" encoding="utf-8"?>
214-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
215-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
216-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
217- width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
218-<path fill="#818181" d="M52.523,10.719c-9.938,0-18.379,6.125-22.41,14.871l-0.246,0.537l-0.59,0.043
219- c-9.186,0.669-16.453,8.609-16.453,18.269c0,10.094,7.905,18.387,17.679,18.387h22.02h20.525c7.342,0,13.275-6.232,13.275-13.786
220- c0-5.727-3.439-10.535-8.318-12.607l-0.58-0.246l-0.027-0.629C76.775,21.792,65.949,10.719,52.523,10.719 M52.6,14.701h0.012
221- c11.287,0,20.457,9.172,20.457,20.459v0.002v0.002c-0.004,1.421-0.299,2.814-0.598,4.201c0.024,0,0.049-0.006,0.072-0.006
222- c5.336,0,9.682,4.347,9.682,9.682c0,5.334-4.346,9.682-9.682,9.682l-41.402-0.021c-7.823,0-14.186-6.363-14.186-14.186
223- c0-7.822,6.363-14.186,14.186-14.186c0.543,0.003,1.079,0.089,1.617,0.154C34.922,21.301,43.085,14.706,52.6,14.701"/>
224-<polygon fill="#818181" points="51.199,73.178 47.95,73.828 47.95,79.105 43.092,76.301 41.467,79.113 46.325,81.92 41.467,84.725
225- 43.092,87.537 47.95,84.732 47.95,90.344 51.199,90.344 51.199,84.732 56.057,87.537 57.682,84.725 52.824,81.92 57.682,79.113
226- 56.057,76.301 51.199,79.105 "/>
227-<polygon fill="#818181" points="34.26,68.629 32.006,69.078 32.006,72.705 28.666,70.777 27.539,72.73 30.879,74.658 27.539,76.586
228- 28.666,78.539 32.006,76.611 32.006,80.469 34.26,80.469 34.26,76.611 37.602,78.539 38.729,76.586 35.389,74.658 38.729,72.73
229- 37.602,70.777 34.26,72.705 "/>
230-<polygon fill="#818181" points="68.324,66.795 65.662,67.326 65.662,71.455 61.852,69.256 60.52,71.561 64.332,73.762 60.52,75.963
231- 61.852,78.268 65.662,76.066 65.662,80.469 68.324,80.469 68.324,76.066 72.138,78.268 73.467,75.963 69.654,73.762 73.467,71.561
232- 72.138,69.256 68.324,71.455 "/>
233-</svg>
234
235=== removed file 'app/graphics/starry.svg'
236--- app/graphics/starry.svg 2015-02-08 22:06:05 +0000
237+++ app/graphics/starry.svg 1970-01-01 00:00:00 +0000
238@@ -1,22 +0,0 @@
239-<?xml version="1.0" encoding="utf-8"?>
240-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
241-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
242-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
243- width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
244-<path fill="#818181" d="M67.59,20.306c4.775,7.285,6.465,16.21,4.197,24.726v0.002C67.385,61.461,50.47,71.227,34.041,66.826v-0.002
245- c-3.2-0.867-6.142-2.391-8.893-4.217c3.757,9.717,11.88,17.166,22.051,19.908v-0.002c17.547,4.701,35.555-5.697,40.258-23.242
246- c4.365-16.322-4.422-32.944-19.865-38.965H67.59z M76.08,30.14h0.002l2.129,2.662c5.514,6.899,7.812,16.207,5.35,25.422v0.002
247- C79.425,73.662,63.679,82.75,48.244,78.615v-0.002c-3.729-1.006-6.977-2.896-9.885-5.123l-2.717-2.08l3.409,0.291
248- c16.48,1.4,32.213-9.111,36.639-25.625v-0.009c1.097-4.115,1.181-8.337,0.744-12.536L76.08,30.14z"/>
249-<path fill="#818181" d="M33.936,14.203v0.007h-0.012c-1.445,2.071-2.622,4.173-3.442,5.758c-1.777,0.263-4.07,0.684-6.311,1.341
250- v0.007c0,0.004,0.012,0,0.012,0v0.007c1.472,2.028,3.06,3.815,4.286,5.108c-0.262,1.768-0.518,4.046-0.54,6.352
251- c0,0.003,0.012,0,0.012,0c0,0.003,0.012,0,0.012,0c2.333-0.807,4.469-1.787,6.055-2.578c1.612,0.814,3.758,1.802,6,2.564
252- c0-0.002,0.012,0.003,0.012,0c0-0.002,0-0.006,0-0.006c0-0.003,0-0.008,0-0.008c-0.037-2.434-0.288-4.73-0.539-6.477
253- c1.256-1.303,2.847-3.076,4.244-5.004c0-0.003,0,0-0.012,0l-0.012-0.007c-2.33-0.682-4.598-1.122-6.338-1.396
254- c-0.836-1.612-2.019-3.708-3.415-5.668C33.947,14.203,33.936,14.201,33.936,14.203z"/>
255-<path fill="#818181" d="M14.719,34.928v0.005c-0.91,1.304-1.652,2.628-2.169,3.627c-1.119,0.166-2.563,0.431-3.975,0.845v0.004
256- c0,0.003,0,0,0,0v0.005c0.927,1.278,1.927,2.404,2.7,3.219c-0.165,1.113-0.326,2.549-0.34,4.002c1.47-0.51,2.815-1.126,3.814-1.624
257- c1.016,0.513,2.368,1.135,3.78,1.614c0-0.001,0,0.001,0,0s0-0.004,0-0.004c0-0.001,0-0.004,0-0.005
258- c-0.022-1.533-0.181-2.979-0.339-4.08c0.791-0.821,1.794-1.938,2.673-3.152c0-0.001,0,0,0,0v-0.006
259- c-1.468-0.429-2.896-0.706-3.993-0.879C16.344,37.483,15.599,36.163,14.719,34.928C14.719,34.928,14.719,34.927,14.719,34.928z"/>
260-</svg>
261
262=== removed file 'app/graphics/sunny.svg'
263--- app/graphics/sunny.svg 2015-02-08 22:06:05 +0000
264+++ app/graphics/sunny.svg 1970-01-01 00:00:00 +0000
265@@ -1,13 +0,0 @@
266-<?xml version="1.0" encoding="utf-8"?>
267-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
268-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
269-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
270- width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
271-<path fill="#818285" d="M52.013,10.225l-4,1.332v7.279h4V10.225z M31.745,15.194l-3.464,2l4,6.93l3.464-2L31.745,15.194z
272- M68.281,15.194l-4,6.93l3.464,2l4-6.93L68.281,15.194z M50.013,24.836c-14.371,0-26,11.629-26,26c0,14.373,11.629,26,26,26
273- s26-11.627,26-26C76.013,36.465,64.384,24.836,50.013,24.836 M50.013,28.836c12.139,0,22,9.862,22,22c0,12.138-9.861,22-22,22
274- c-12.138,0-22-9.861-22-22C28.013,38.698,37.875,28.836,50.013,28.836 M16.37,29.104l-2,3.465l6.93,4l2-3.465L16.37,29.104z
275- M83.656,29.104l-6.933,4l2.002,3.465l6.931-4L83.656,29.104z M10.013,52.836h8v-4h-8V52.836z M82.013,52.836h8v-4h-8V52.836z
276- M21.3,65.104l-6.93,4l2,3.465l6.93-4L21.3,65.104z M78.726,65.104l-2.002,3.465l6.933,4l2-3.465L78.726,65.104z M32.281,77.549
277- l-4,6.93l3.464,2l4-6.93L32.281,77.549z M67.745,77.549l-3.464,2l4,6.93l3.464-2L67.745,77.549z M48.013,90.836h4v-8h-4V90.836z"/>
278-</svg>
279
280=== removed file 'app/graphics/thunder.svg'
281--- app/graphics/thunder.svg 2015-02-08 22:06:05 +0000
282+++ app/graphics/thunder.svg 1970-01-01 00:00:00 +0000
283@@ -1,14 +0,0 @@
284-<?xml version="1.0" encoding="utf-8"?>
285-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
286-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
287-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
288- width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
289-<path fill="#818181" d="M52.573,8.953c-9.938,0-18.38,6.125-22.41,14.871l-0.246,0.537l-0.59,0.043
290- c-9.186,0.669-16.453,8.609-16.453,18.269c0,10.094,7.905,18.387,17.679,18.387h22.02h20.524c7.343,0,13.276-6.233,13.276-13.785
291- c0-5.727-3.44-10.535-8.319-12.608l-0.58-0.246l-0.026-0.629C76.824,20.026,65.999,8.953,52.573,8.953 M52.649,12.935h0.012
292- c11.287,0,20.457,9.172,20.457,20.459v0.002v0.002c-0.005,1.421-0.3,2.814-0.599,4.201c0.024,0,0.049-0.006,0.072-0.006
293- c5.336,0,9.683,4.347,9.683,9.682s-4.347,9.682-9.683,9.682L31.19,56.936c-7.823,0-14.186-6.363-14.186-14.186
294- c0-7.822,6.363-14.185,14.186-14.185c0.543,0.003,1.079,0.089,1.617,0.154C34.971,19.535,43.134,12.94,52.649,12.935"/>
295-<polygon fill="#818181" points="43.806,56.953 42.515,74.045 50.502,74.045 48.624,91.953 62.321,66.953 52.867,66.953
296- 54.472,56.953 "/>
297-</svg>
298
299=== removed file 'app/graphics/windy-snow.svg'
300--- app/graphics/windy-snow.svg 2015-02-08 22:06:05 +0000
301+++ app/graphics/windy-snow.svg 1970-01-01 00:00:00 +0000
302@@ -1,42 +0,0 @@
303-<?xml version="1.0" encoding="utf-8"?>
304-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
305-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
306-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
307- width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
308-<path fill="#818181" d="M51.571,15.195c-0.906,0-1.818,0.151-2.74,0.459l-0.018,0.006l-0.02,0.007
309- c-0.888,0.258-1.664,0.676-2.365,1.267v0.002v0.002c-0.644,0.536-1.198,1.251-1.652,2.199v0.008v0.008
310- c-0.04,0.08-0.075,0.247-0.113,0.355l2.098,1.209c0.027-0.074,0.007-0.116,0.041-0.193l0.01-0.016l0.01-0.014
311- c0.312-0.624,0.756-1.17,1.326-1.572c0.501-0.393,1.048-0.687,1.635-0.85c0.592-0.193,1.179-0.293,1.746-0.293
312- c1.209,0,2.363,0.473,3.348,1.299c1.135,0.872,1.715,2.258,1.715,3.824c0,1.649-0.584,3.115-1.771,4.039
313- c-1.13,0.909-2.661,1.297-4.494,1.297H49.43h-5.028H41.47H25.175v3.912h23.486c3.466,0,6.062-0.713,7.869-2.031
314- c1.718-1.253,2.631-3.407,2.641-6.805v-0.025c0-1.669-0.282-2.966-0.782-3.924v-0.008v-0.008c-0.534-1.075-1.18-1.872-1.933-2.445
315- l-0.012-0.008l-0.012-0.01c-0.794-0.643-1.605-1.058-2.471-1.273l-0.025-0.006l-0.023-0.008c-0.908-0.276-1.685-0.404-2.317-0.404
316- H51.571z M81.45,26.9c-0.922,0-1.849,0.154-2.787,0.467l-0.018,0.006l-0.021,0.007c-0.903,0.263-1.695,0.688-2.408,1.291v0.001
317- v0.002c-0.654,0.546-1.218,1.272-1.68,2.238v0.009v0.007c-0.044,0.088-0.08,0.259-0.121,0.375l2.16,1.244
318- c0.03-0.082,0.006-0.129,0.045-0.215l0.01-0.016l0.012-0.014c0.314-0.63,0.763-1.183,1.34-1.589c0.509-0.399,1.062-0.695,1.657-0.86
319- c0.597-0.196,1.191-0.299,1.769-0.299c1.224,0,2.393,0.479,3.391,1.316c1.149,0.884,1.734,2.286,1.734,3.873
320- c0,1.672-0.591,3.153-1.793,4.088c-1.145,0.921-2.695,1.314-4.555,1.314h-0.906h-5.109h-2.977H18.825v0.004h-1
321- c-1.016,0.001-2.016,0.159-2.939,0.488v0.002v0.002c-0.942,0.327-1.824,0.867-2.525,1.567v0.002v0.002
322- c-0.729,0.717-1.272,1.624-1.627,2.606v0.002c-0.373,1.025-0.529,2.134-0.529,3.332c0,1.2,0.157,2.315,0.529,3.348l0.01,0.029
323- c0.357,0.967,0.894,1.863,1.607,2.578l0.012,0.012v0.004c0.699,0.684,1.567,1.215,2.496,1.551l0.01,0.002l0.041,0.016
324- c0.923,0.316,1.915,0.467,2.932,0.467h1v0.002h40.344h2.98h5.115h0.908c1.861,0,3.414,0.396,4.559,1.316
325- c1.203,0.934,1.797,2.418,1.797,4.092c0,1.588-0.587,2.99-1.736,3.875c-0.998,0.838-2.169,1.318-3.395,1.318
326- c-0.578,0-1.173-0.104-1.771-0.299c-0.595-0.166-1.149-0.463-1.658-0.861c-0.577-0.408-1.026-0.961-1.342-1.592l-0.01-0.016
327- l-0.01-0.016c-0.035-0.084-0.016-0.133-0.045-0.213l-2.166,1.248c0.04,0.115,0.078,0.289,0.121,0.375v0.008v0.008
328- c0.463,0.965,1.028,1.695,1.684,2.242v0.002v0.002c0.714,0.604,1.509,1.029,2.412,1.293l0.018,0.006l0.02,0.006
329- c0.939,0.312,1.867,0.467,2.791,0.467c0.645,0,1.438-0.131,2.361-0.412l0.021-0.008l0.025-0.006c0.883-0.221,1.71-0.643,2.518-1.297
330- l0.012-0.01l0.014-0.008c0.768-0.584,1.425-1.396,1.971-2.492v-0.008v-0.008c0.508-0.979,0.797-2.299,0.797-3.998
331- c0-3.477-0.94-5.678-2.697-6.959c-1.842-1.342-4.482-2.068-8.01-2.068H18.812v0.01h-1c-0.629,0-1.163-0.094-1.611-0.244
332- l-0.016-0.004l-0.014-0.006c-0.402-0.148-0.757-0.377-1.016-0.627l-0.01-0.01l-0.01-0.01c-0.242-0.248-0.49-0.62-0.67-1.104v-0.014
333- c-0.002-0.004-0.003-0.011-0.004-0.015l-0.053-0.14v-0.076c-0.139-0.466-0.234-1.025-0.234-1.758c0-0.723,0.092-1.27,0.227-1.725
334- v-0.088l0.059-0.164c0.185-0.511,0.439-0.89,0.676-1.121v-0.004l0.012-0.011c0.256-0.258,0.629-0.49,1.021-0.625l0.025-0.011v-0.002
335- c0.456-0.164,0.99-0.254,1.613-0.254h60.67c3.522,0,6.161-0.725,8-2.065c1.755-1.28,2.693-3.479,2.693-6.95
336- c0-1.696-0.288-3.017-0.795-3.992v-0.008v-0.007c-0.545-1.095-1.202-1.905-1.969-2.489l-0.012-0.008l-0.012-0.01
337- c-0.807-0.652-1.632-1.074-2.514-1.295l-0.025-0.006l-0.023-0.008c-0.923-0.281-1.717-0.412-2.359-0.412H81.45z"/>
338-<polygon fill="#818181" points="51.683,69.762 48.683,70.361 48.683,75.754 43.746,72.902 42.244,75.5 47.183,78.352 42.244,81.201
339- 43.746,83.799 48.683,80.947 48.683,86.65 51.683,86.65 51.683,80.947 56.619,83.799 58.119,81.201 53.183,78.352 58.119,75.5
340- 56.619,72.902 51.683,75.754 "/>
341-<polygon fill="#818181" points="30.938,63.518 28.558,63.994 28.558,68.199 24.702,65.975 23.513,68.037 27.368,70.262
342- 23.513,72.486 24.702,74.549 28.558,72.324 28.558,76.775 30.938,76.775 30.938,72.324 34.793,74.549 35.983,72.486 32.13,70.262
343- 35.983,68.037 34.793,65.975 30.938,68.199 "/>
344-</svg>
345
346=== modified file 'app/ui/HomePage.qml'
347--- app/ui/HomePage.qml 2015-03-13 15:47:11 +0000
348+++ app/ui/HomePage.qml 2015-03-19 10:21:35 +0000
349@@ -32,18 +32,18 @@
350 tipLabelColor: "#FFF"
351
352 property var iconMap: {
353- "sun": Qt.resolvedUrl("../graphics/sunny.svg"),
354- "moon": Qt.resolvedUrl("../graphics/starry.svg"),
355- "cloud_sun": Qt.resolvedUrl("../graphics/partly-cloudy.svg"),
356- "cloud_moon": Qt.resolvedUrl("../graphics/cloudy-night.svg"),
357- "cloud": Qt.resolvedUrl("../graphics/cloudy.svg"),
358- "rain": Qt.resolvedUrl("../graphics/rain.svg"),
359- "thunder": Qt.resolvedUrl("../graphics/thunder.svg"),
360- "snow_shower": Qt.resolvedUrl("../graphics/snow.svg"),
361- "fog": Qt.resolvedUrl("../graphics/fog.svg"),
362- "snow_rain": Qt.resolvedUrl("../graphics/snow.svg"),
363- "scattered": Qt.resolvedUrl("../graphics/rain.svg"),
364- "overcast": Qt.resolvedUrl("../graphics/cloudy.svg")
365+ "sun": "weather-clear-symbolic",
366+ "moon": "weather-clear-night-symbolic",
367+ "cloud_sun": "weather-few-clouds-symbolic",
368+ "cloud_moon": "weather-few-clouds-night-symbolic",
369+ "cloud": "weather-clouds-symbolic",
370+ "rain": "weather-showers-symbolic",
371+ "thunder": "weather-storm-symbolic",
372+ "snow_shower": "weather-snow-symbolic",
373+ "fog": "weather-fog-symbolic",
374+ "snow_rain": "weather-snow-symbolic",
375+ "scattered": "weather-showers-scattered-symbolic",
376+ "overcast": "weather-overcast-symbolic"
377 }
378
379 property var imageMap: {
380
381=== modified file 'app/ui/LocationsPage.qml'
382--- app/ui/LocationsPage.qml 2015-03-14 20:08:13 +0000
383+++ app/ui/LocationsPage.qml 2015-03-19 10:21:35 +0000
384@@ -80,33 +80,36 @@
385 storage.moveLocation(from, to);
386 }
387
388- Row {
389- anchors{
390- top: parent.top
391+ Item {
392+ anchors {
393+ bottom: parent.bottom
394 left: parent.left
395 leftMargin: units.gu(2)
396 right: parent.right
397 rightMargin: units.gu(2)
398- bottom: parent.bottom
399+ top: parent.top
400 }
401- spacing: units.gu(2)
402
403 Label {
404+ id: nameLabel
405+ anchors {
406+ left: parent.left
407+ right: weatherImage.visible ? weatherImage.left : parent.right
408+ rightMargin: units.gu(1)
409+ verticalCenter: parent.verticalCenter
410+ }
411 elide: Text.ElideRight
412- height: locationsListItem.height
413 text: model.location.name
414- verticalAlignment: Text.AlignVCenter
415- width: weatherImage.visible ? (locationsListItem.width / 2) - units.gu(4)
416- : locationsListItem.width - units.gu(16)
417 }
418
419- Image {
420+ Icon {
421 id: weatherImage
422 anchors {
423- centerIn: parent
424+ horizontalCenter: parent.horizontalCenter
425+ verticalCenter: parent.verticalCenter
426 }
427 height: units.gu(3)
428- source: locationPage.iconMap[locationPages.contentItem.children[index].iconName] || ""
429+ name: locationPage.iconMap[locationPages.contentItem.children[index].iconName] || ""
430 visible: locationsPage.state === "default"
431 width: units.gu(3)
432 }
433@@ -114,15 +117,18 @@
434 Label {
435 id: nowLabel
436 anchors {
437+ left: weatherImage.right
438+ leftMargin: units.gu(1)
439 right: parent.right
440+ verticalCenter: parent.verticalCenter
441 }
442 color: UbuntuColors.orange
443+ elide: Text.ElideRight
444 font.pixelSize: units.gu(4)
445 font.weight: Font.Light
446- height: units.gu(6)
447+ horizontalAlignment: Text.AlignRight
448 text: locationPages.contentItem.children[index].currentTemp ? locationPages.contentItem.children[index].currentTemp + settings.tempScale[1]
449 : ""
450- verticalAlignment: Text.AlignVCenter
451 visible: locationsPage.state === "default"
452 }
453 }
454
455=== modified file 'po/com.ubuntu.weather.pot'
456--- po/com.ubuntu.weather.pot 2015-03-19 04:26:49 +0000
457+++ po/com.ubuntu.weather.pot 2015-03-19 10:21:35 +0000
458@@ -8,7 +8,7 @@
459 msgstr ""
460 "Project-Id-Version: ubuntu-weather-app\n"
461 "Report-Msgid-Bugs-To: \n"
462-"POT-Creation-Date: 2015-03-18 23:24-0500\n"
463+"POT-Creation-Date: 2015-03-19 10:21+0000\n"
464 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
465 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
466 "Language-Team: LANGUAGE <LL@li.org>\n"

Subscribers

People subscribed via source and target branches

to all changes: