Merge lp:~martin-borho/ubuntu-weather-app/1363023-header-overlay-textcolor into lp:ubuntu-weather-app/obsolete.trunk

Proposed by Martin Borho on 2014-08-29
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„ on 2014-09-05
Approved revision: 344
Merged at revision: 358
Proposed branch: lp:~martin-borho/ubuntu-weather-app/1363023-header-overlay-textcolor
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Prerequisite: lp:~martin-borho/ubuntu-weather-app/pagestack
Diff against target: 99 lines (+9/-11)
4 files modified
components/LocationManagerPage.qml (+0/-4)
components/LocationTab.qml (+1/-1)
components/SettingsPage.qml (+0/-3)
ubuntu-weather-app.qml (+8/-3)
To merge this branch: bzr merge lp:~martin-borho/ubuntu-weather-app/1363023-header-overlay-textcolor
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2014-09-05
Ubuntu Weather Developers 2014-08-29 Pending
Review via email: mp+232698@code.launchpad.net

Commit message

Fixed text color of the header overlay menus.

Description of the change

Fixed text color of the header overlay menus.

To post a comment you must log in.

Looks like we need a merge to trunk..

343. By Martin Borho on 2014-09-05

merged from parent branch

344. By Martin Borho on 2014-09-05

merged from trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'components/LocationManagerPage.qml'
--- components/LocationManagerPage.qml 2014-09-04 17:20:53 +0000
+++ components/LocationManagerPage.qml 2014-09-05 10:04:44 +0000
@@ -66,8 +66,6 @@
66 lookupItemAddButton.visible = true66 lookupItemAddButton.visible = true
67 mainView.shortCutsLimited = false;67 mainView.shortCutsLimited = false;
68 if(locationModel.count > 0) {68 if(locationModel.count > 0) {
69 // reset text color
70 Theme.palette.selected.backgroundText = "#f4f4e8"
71 popFromStack(refresh)69 popFromStack(refresh)
72 }70 }
73 }71 }
@@ -77,13 +75,11 @@
77 mainView.shortCutsLimited = true;75 mainView.shortCutsLimited = true;
78 locationsRemoved.clear();76 locationsRemoved.clear();
79 loadData();77 loadData();
80 Theme.palette.selected.backgroundText = "#656565"
81 }78 }
8279
83 Connections { target: mainView; onEscapeKey: popFromStack()}80 Connections { target: mainView; onEscapeKey: popFromStack()}
8481
85 function popFromStack(refresh) {82 function popFromStack(refresh) {
86 Theme.palette.selected.backgroundText = "#f3f3e7"
87 pageStack.pop()83 pageStack.pop()
88 // refresh at least from storage, to prevent header content from disapearing84 // refresh at least from storage, to prevent header content from disapearing
89 refreshData(!refresh, refresh);85 refreshData(!refresh, refresh);
9086
=== modified file 'components/LocationTab.qml'
--- components/LocationTab.qml 2014-09-02 07:21:28 +0000
+++ components/LocationTab.qml 2014-09-05 10:04:44 +0000
@@ -127,7 +127,7 @@
127 isLeaf: true127 isLeaf: true
128 anchors.fill: parent128 anchors.fill: parent
129 anchors.topMargin: units.gu(9.5)129 anchors.topMargin: units.gu(9.5)
130130 head.foregroundColor: "#FFFFFF"
131 head.actions: [131 head.actions: [
132 Action {132 Action {
133 id: refreshAction133 id: refreshAction
134134
=== modified file 'components/SettingsPage.qml'
--- components/SettingsPage.qml 2014-08-16 18:15:01 +0000
+++ components/SettingsPage.qml 2014-09-05 10:04:44 +0000
@@ -49,7 +49,6 @@
49 Connections { target: mainView; onEscapeKey: popFromStack()}49 Connections { target: mainView; onEscapeKey: popFromStack()}
5050
51 function popFromStack() {51 function popFromStack() {
52 Theme.palette.selected.backgroundText = "#f3f3e7"
53 pageStack.pop()52 pageStack.pop()
54 }53 }
5554
@@ -78,8 +77,6 @@
78 fillWindSelector();77 fillWindSelector();
79 fillPrecipSelector();78 fillPrecipSelector();
80 mainView.shortCutsLimited = true;79 mainView.shortCutsLimited = true;
81 Theme.palette.selected.backgroundText = "#656565"
82 //Theme.palette.selected.background = "#656565"
83 }80 }
8481
85 Rectangle {82 Rectangle {
8683
=== modified file 'ubuntu-weather-app.qml'
--- ubuntu-weather-app.qml 2014-09-04 20:26:16 +0000
+++ ubuntu-weather-app.qml 2014-09-05 10:04:44 +0000
@@ -167,12 +167,15 @@
167 locBeforeLen = locationsList.length,167 locBeforeLen = locationsList.length,
168 focusToLast = (locBeforeLen > 0 && locLength > locBeforeLen) ? true : false;168 focusToLast = (locBeforeLen > 0 && locLength > locBeforeLen) ? true : false;
169 refresh.visible = false;169 refresh.visible = false;
170
171 // assure the right color is set again after reload, see refresh()
172 Theme.palette.selected.backgroundText = "#656565";
173
170 // show locationmanager when no location is added174 // show locationmanager when no location is added
171 if(locLength === 0) {175 if(locLength === 0) {
172 showLocationManager()176 showLocationManager()
173 return;177 return;
174 }178 }
175
176 locationsList = locations; 179 locationsList = locations;
177 if(tabsObject !== null) {180 if(tabsObject !== null) {
178 tabsObject.destroy()181 tabsObject.destroy()
@@ -200,6 +203,8 @@
200 storage.getLocations(buildTabs);203 storage.getLocations(buildTabs);
201 } else { 204 } else {
202 storage.getLocations(function(locations) {205 storage.getLocations(function(locations) {
206 // set this color temporary to white, to keep sandwich icon white until tabs are rebuild
207 Theme.palette.selected.backgroundText = "#FFFFFF";
203 WeatherApi.sendRequest({208 WeatherApi.sendRequest({
204 action: "updateData",209 action: "updateData",
205 params: {210 params: {
@@ -226,7 +231,7 @@
226 //storage.clearDB();231 //storage.clearDB();
227 //storage.clearSetting('units');232 //storage.clearSetting('units');
228233
229 //Theme.palette.selected.backgroundText = "#000000";234 Theme.palette.selected.backgroundText = "#656565";
230 Theme.palette.normal.backgroundText = "#FFFFFF";235 Theme.palette.normal.backgroundText = "#FFFFFF";
231 Theme.palette.normal.background = "#ECECEC"236 Theme.palette.normal.background = "#ECECEC"
232237

Subscribers

People subscribed via source and target branches