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

Proposed by Raúl Yeguas
Status: Merged
Approved by: Martin Borho
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 Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
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.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Martin Borho (martin-borho) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'components/LocationTab.qml'
--- components/LocationTab.qml 2013-04-21 18:05:01 +0000
+++ components/LocationTab.qml 2013-04-24 17:40:42 +0000
@@ -84,6 +84,16 @@
84 mainView.removeLocation(locationData.db.id)84 mainView.removeLocation(locationData.db.id)
85 }85 }
86 }86 }
87
88 Action {
89 id: refreshAction
90 iconSource: Qt.resolvedUrl("../resources/images/refresh_icon.png")
91 text: i18n.tr("Refresh")
92
93 onTriggered: {
94 mainView.refreshData();
95 }
96 }
87 }97 }
88 }98 }
8999
90100
=== added file 'resources/images/refresh_icon@8.png'
91Binary 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 differ101Binary 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