Ubuntu Clock App

Merge lp:~nik90/ubuntu-clock-app/change-toolbar-icons into lp:ubuntu-clock-app/saucy

  1. change-toolbar-icons
  2. Merge into saucy
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 51
Merged at revision: 51
Proposed branch: lp:~nik90/ubuntu-clock-app/change-toolbar-icons
Merge into: lp:ubuntu-clock-app/saucy
Diff against target: 52 lines (+5/-5)
3 files modified
alarm/AlarmPage.qml (+1/-1)
clock/ClockPage.qml (+2/-2)
timer/TimerPage.qml (+2/-2)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/change-toolbar-icons
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Clock Developers Pending
Review via email: mp+162075@code.launchpad.net

Commit message

Replaces add and delete toolbar icons with those used by the ubuntu-weather-app project.

Description of the change

This MP adds new toolbar icons for Add and Delete actions. We can use this until we receive the official icons for the ubuntu touch core apps. These icons were obtained from the ubuntu-weather-app project.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'alarm/AlarmPage.qml'
2--- alarm/AlarmPage.qml 2013-04-30 13:29:00 +0000
3+++ alarm/AlarmPage.qml 2013-05-02 11:52:29 +0000
4@@ -754,7 +754,7 @@
5 id: addAlarm
6 objectName: "add-alarm"
7
8- iconSource: Qt.resolvedUrl("../images/add.png")
9+ iconSource: Qt.resolvedUrl("../images/add_icon.png")
10 text: i18n.tr("Add Alarm")
11
12 onTriggered: {
13
14=== modified file 'clock/ClockPage.qml'
15--- clock/ClockPage.qml 2013-05-01 13:15:30 +0000
16+++ clock/ClockPage.qml 2013-05-02 11:52:29 +0000
17@@ -122,8 +122,8 @@
18 id: locationAction
19 objectName: "changeSubredditAction"
20
21- iconSource: Qt.resolvedUrl("../images/add.png")
22- text: i18n.tr("Location")
23+ iconSource: Qt.resolvedUrl("../images/add_icon.png")
24+ text: i18n.tr("Add Location")
25
26 onTriggered: {
27 PopupUtils.open(locationDialogComponent, locationAction.itemHint)
28
29=== added file 'images/add_icon@8.png'
30Binary files images/add_icon@8.png 1970-01-01 00:00:00 +0000 and images/add_icon@8.png 2013-05-02 11:52:29 +0000 differ
31=== added file 'images/remove_icon@8.png'
32Binary files images/remove_icon@8.png 1970-01-01 00:00:00 +0000 and images/remove_icon@8.png 2013-05-02 11:52:29 +0000 differ
33=== modified file 'timer/TimerPage.qml'
34--- timer/TimerPage.qml 2013-04-30 12:46:12 +0000
35+++ timer/TimerPage.qml 2013-05-02 11:52:29 +0000
36@@ -796,7 +796,7 @@
37 id: addPreset
38 objectName: "add-preset"
39
40- iconSource: Qt.resolvedUrl("../images/add.png")
41+ iconSource: Qt.resolvedUrl("../images/add_icon.png")
42 text: i18n.tr("Add Preset")
43
44 onTriggered: {
45@@ -841,7 +841,7 @@
46 Action {
47 id: deletePreset
48
49- iconSource: Qt.resolvedUrl("../images/add.png")
50+ iconSource: Qt.resolvedUrl("../images/remove_icon.png")
51 text: i18n.tr("Delete")
52 visible: false
53

Subscribers

People subscribed via source and target branches