Merge lp:~neokore/ubuntu-weather-app/AddRefreshAction into lp:ubuntu-weather-app/obsolete.trunk

Proposed by Raúl Yeguas on 2013-04-24
Status: Merged
Approved by: Martin Borho on 2013-04-25
Approved revision: 11
Merged at revision: 11
Proposed branch: lp:~neokore/ubuntu-weather-app/AddRefreshAction
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Diff against target: 23 lines (+10/-0)
1 file modified
components/LocationTab.qml (+10/-0)
To merge this branch: bzr merge lp:~neokore/ubuntu-weather-app/AddRefreshAction
Reviewer Review Type Date Requested Status
Martin Borho 2013-04-24 Approve on 2013-04-25
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2013-04-24
Review via email: mp+160724@code.launchpad.net

Commit message

Added the refresh action and a temp icon for it.

Description of the change

Added the refresh action and a temp icon for it.

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'components/LocationTab.qml'
2--- components/LocationTab.qml 2013-04-21 18:05:01 +0000
3+++ components/LocationTab.qml 2013-04-24 17:40:42 +0000
4@@ -84,6 +84,16 @@
5 mainView.removeLocation(locationData.db.id)
6 }
7 }
8+
9+ Action {
10+ id: refreshAction
11+ iconSource: Qt.resolvedUrl("../resources/images/refresh_icon.png")
12+ text: i18n.tr("Refresh")
13+
14+ onTriggered: {
15+ mainView.refreshData();
16+ }
17+ }
18 }
19 }
20
21
22=== added file 'resources/images/refresh_icon@8.png'
23Binary files resources/images/refresh_icon@8.png 1970-01-01 00:00:00 +0000 and resources/images/refresh_icon@8.png 2013-04-24 17:40:42 +0000 differ

Subscribers

People subscribed via source and target branches