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
=== modified file 'app/components/FastScroll.qml'
--- app/components/FastScroll.qml 2015-11-02 21:28:34 +0000
+++ app/components/FastScroll.qml 2016-03-26 17:03:27 +0000
@@ -119,7 +119,7 @@
119 radius: pinSize * 0.3119 radius: pinSize * 0.3
120 height: pinSize120 height: pinSize
121 width: height121 width: height
122 color: Theme.palette.normal.foreground122 color: UbuntuColors.orange
123 opacity: rail.opacity123 opacity: rail.opacity
124 x: rail.x124 x: rail.x
125 y: {125 y: {
@@ -180,7 +180,7 @@
180 horizontalAlignment: Text.AlignHCenter180 horizontalAlignment: Text.AlignHCenter
181 text: modelData181 text: modelData
182 fontSize: "x-small"182 fontSize: "x-small"
183 color: cursor.y === y ? "white" : Theme.palette.selected.backgroundText183 color: cursor.y === y ? UbuntuColors.porcelain : UbuntuColors.jet
184 opacity: !internal.modelDirty && Sections.contains(text) ? 1.0 : 0.5184 opacity: !internal.modelDirty && Sections.contains(text) ? 1.0 : 0.5
185 }185 }
186 }186 }
187187
=== modified file 'app/ui/LocationsPage.qml'
--- app/ui/LocationsPage.qml 2015-11-02 21:28:34 +0000
+++ app/ui/LocationsPage.qml 2016-03-26 17:03:27 +0000
@@ -117,7 +117,7 @@
117 leftMargin: units.gu(2)117 leftMargin: units.gu(2)
118 }118 }
119119
120 color: UbuntuColors.lightGrey120 color: UbuntuColors.graphite
121 elide: Text.ElideRight121 elide: Text.ElideRight
122 fontSize: "small"122 fontSize: "small"
123 font.weight: Font.Light123 font.weight: Font.Light
@@ -213,7 +213,7 @@
213 }213 }
214 Label {214 Label {
215 id: locationName2215 id: locationName2
216 color: UbuntuColors.lightGrey216 color: UbuntuColors.graphite
217 elide: Text.ElideRight217 elide: Text.ElideRight
218 fontSize: "small"218 fontSize: "small"
219 font.weight: Font.Light219 font.weight: Font.Light
220220
=== modified file 'app/ui/settings/DataProviderPage.qml'
--- app/ui/settings/DataProviderPage.qml 2016-02-28 22:49:32 +0000
+++ app/ui/settings/DataProviderPage.qml 2016-03-26 17:03:27 +0000
@@ -45,7 +45,7 @@
45 delegate: StandardListItem {45 delegate: StandardListItem {
46 title.text: model.text46 title.text: model.text
47 icon.name: "ok"47 icon.name: "ok"
48 icon.visible: dataProviderSetting.subText === model.text48 icon.visible: dataProviderSetting.subText.text === model.text
49 onClicked: {49 onClicked: {
50 if (model.text === "The Weather Channel") {50 if (model.text === "The Weather Channel") {
51 settings.service = "weatherchannel"51 settings.service = "weatherchannel"
5252
=== modified file 'debian/changelog'
--- debian/changelog 2016-03-26 03:19:29 +0000
+++ debian/changelog 2016-03-26 17:03:27 +0000
@@ -9,6 +9,7 @@
99
10 [ Victor Thompson ]10 [ Victor Thompson ]
11 * Change translatable string from "rain" to "precipitation" (LP: #1521701)11 * Change translatable string from "rain" to "precipitation" (LP: #1521701)
12 * Add further fixes for SDK palette issues (LP: #1550507)
1213
13 [ Nekhelesh Ramananthan ]14 [ Nekhelesh Ramananthan ]
14 * Update frameworks to ubuntu-sdk-15.04.3-qml15 * Update frameworks to ubuntu-sdk-15.04.3-qml
1516
=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot 2016-02-28 22:53:13 +0000
+++ po/com.ubuntu.weather.pot 2016-03-26 17:03:27 +0000
@@ -1,6 +1,6 @@
1# SOME DESCRIPTIVE TITLE.1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR Canonical Ltd.2# Copyright (C) YEAR Canonical Ltd.
3# This file is distributed under the same license as the PACKAGE package.3# This file is distributed under the same license as the ubuntu-weather-app package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#5#
6#, fuzzy6#, fuzzy
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: ubuntu-weather-app\n"9"Project-Id-Version: ubuntu-weather-app\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2016-02-29 04:21+0530\n"11"POT-Creation-Date: 2016-03-26 11:43-0500\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -94,11 +94,11 @@
94msgid "Retry"94msgid "Retry"
95msgstr ""95msgstr ""
9696
97#: ../app/components/NoAPIKeyErrorStateComponent.qml:4897#: ../app/components/NoAPIKeyErrorStateComponent.qml:47
98msgid "No API Keys Found"98msgid "No API Keys Found"
99msgstr ""99msgstr ""
100100
101#: ../app/components/NoAPIKeyErrorStateComponent.qml:57101#: ../app/components/NoAPIKeyErrorStateComponent.qml:56
102msgid ""102msgid ""
103"If you are a developer, please see the README file for instructions on how "103"If you are a developer, please see the README file for instructions on how "
104"to obtain your own Open Weather Map API key."104"to obtain your own Open Weather Map API key."

Subscribers

People subscribed via source and target branches

to all changes: