Merge lp:~vthompson/ubuntu-weather-app/finish-ota10-updates-weather into lp:ubuntu-weather-app

Proposed by Victor Thompson on 2016-03-26
Status: Merged
Approved by: Andrew Hayzen on 2016-03-27
Approved revision: 233
Merged at revision: 233
Proposed branch: lp:~vthompson/ubuntu-weather-app/finish-ota10-updates-weather
Merge into: lp:ubuntu-weather-app
Diff against target: 103 lines (+10/-9)
5 files modified
app/components/FastScroll.qml (+2/-2)
app/ui/LocationsPage.qml (+2/-2)
app/ui/settings/DataProviderPage.qml (+1/-1)
debian/changelog (+1/-0)
po/com.ubuntu.weather.pot (+4/-4)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/finish-ota10-updates-weather
Reviewer Review Type Date Requested Status
Andrew Hayzen 2016-03-26 Approve on 2016-03-27
Jenkins Bot continuous-integration Approve on 2016-03-26
Review via email: mp+290169@code.launchpad.net

Commit message

Finish OTA10 SDK updates

Description of the change

Finish OTA10 SDK theming updates.
1. Fix fastscroll.
2. Fix label in LocationsPage
3. Fix selected item indicator in Data Provider settings (probably not SDK related)

To post a comment you must log in.
review: Approve (continuous-integration)
Andrew Hayzen (ahayzen) wrote :

LGTM, but once we move to the new palette stuff we will be moving back to Theme.palette.*.* :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/components/FastScroll.qml'
2--- app/components/FastScroll.qml 2015-11-02 21:28:34 +0000
3+++ app/components/FastScroll.qml 2016-03-26 17:03:27 +0000
4@@ -119,7 +119,7 @@
5 radius: pinSize * 0.3
6 height: pinSize
7 width: height
8- color: Theme.palette.normal.foreground
9+ color: UbuntuColors.orange
10 opacity: rail.opacity
11 x: rail.x
12 y: {
13@@ -180,7 +180,7 @@
14 horizontalAlignment: Text.AlignHCenter
15 text: modelData
16 fontSize: "x-small"
17- color: cursor.y === y ? "white" : Theme.palette.selected.backgroundText
18+ color: cursor.y === y ? UbuntuColors.porcelain : UbuntuColors.jet
19 opacity: !internal.modelDirty && Sections.contains(text) ? 1.0 : 0.5
20 }
21 }
22
23=== modified file 'app/ui/LocationsPage.qml'
24--- app/ui/LocationsPage.qml 2015-11-02 21:28:34 +0000
25+++ app/ui/LocationsPage.qml 2016-03-26 17:03:27 +0000
26@@ -117,7 +117,7 @@
27 leftMargin: units.gu(2)
28 }
29
30- color: UbuntuColors.lightGrey
31+ color: UbuntuColors.graphite
32 elide: Text.ElideRight
33 fontSize: "small"
34 font.weight: Font.Light
35@@ -213,7 +213,7 @@
36 }
37 Label {
38 id: locationName2
39- color: UbuntuColors.lightGrey
40+ color: UbuntuColors.graphite
41 elide: Text.ElideRight
42 fontSize: "small"
43 font.weight: Font.Light
44
45=== modified file 'app/ui/settings/DataProviderPage.qml'
46--- app/ui/settings/DataProviderPage.qml 2016-02-28 22:49:32 +0000
47+++ app/ui/settings/DataProviderPage.qml 2016-03-26 17:03:27 +0000
48@@ -45,7 +45,7 @@
49 delegate: StandardListItem {
50 title.text: model.text
51 icon.name: "ok"
52- icon.visible: dataProviderSetting.subText === model.text
53+ icon.visible: dataProviderSetting.subText.text === model.text
54 onClicked: {
55 if (model.text === "The Weather Channel") {
56 settings.service = "weatherchannel"
57
58=== modified file 'debian/changelog'
59--- debian/changelog 2016-03-26 03:19:29 +0000
60+++ debian/changelog 2016-03-26 17:03:27 +0000
61@@ -9,6 +9,7 @@
62
63 [ Victor Thompson ]
64 * Change translatable string from "rain" to "precipitation" (LP: #1521701)
65+ * Add further fixes for SDK palette issues (LP: #1550507)
66
67 [ Nekhelesh Ramananthan ]
68 * Update frameworks to ubuntu-sdk-15.04.3-qml
69
70=== modified file 'po/com.ubuntu.weather.pot'
71--- po/com.ubuntu.weather.pot 2016-02-28 22:53:13 +0000
72+++ po/com.ubuntu.weather.pot 2016-03-26 17:03:27 +0000
73@@ -1,6 +1,6 @@
74 # SOME DESCRIPTIVE TITLE.
75 # Copyright (C) YEAR Canonical Ltd.
76-# This file is distributed under the same license as the PACKAGE package.
77+# This file is distributed under the same license as the ubuntu-weather-app package.
78 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
79 #
80 #, fuzzy
81@@ -8,7 +8,7 @@
82 msgstr ""
83 "Project-Id-Version: ubuntu-weather-app\n"
84 "Report-Msgid-Bugs-To: \n"
85-"POT-Creation-Date: 2016-02-29 04:21+0530\n"
86+"POT-Creation-Date: 2016-03-26 11:43-0500\n"
87 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
88 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
89 "Language-Team: LANGUAGE <LL@li.org>\n"
90@@ -94,11 +94,11 @@
91 msgid "Retry"
92 msgstr ""
93
94-#: ../app/components/NoAPIKeyErrorStateComponent.qml:48
95+#: ../app/components/NoAPIKeyErrorStateComponent.qml:47
96 msgid "No API Keys Found"
97 msgstr ""
98
99-#: ../app/components/NoAPIKeyErrorStateComponent.qml:57
100+#: ../app/components/NoAPIKeyErrorStateComponent.qml:56
101 msgid ""
102 "If you are a developer, please see the README file for instructions on how "
103 "to obtain your own Open Weather Map API key."

Subscribers

People subscribed via source and target branches

to all changes: