Ubuntu Clock App

Merge lp:~nik90/ubuntu-clock-app/change-confirmation-icon into lp:ubuntu-clock-app

  1. change-confirmation-icon
  2. Merge into trunk
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Bartosz Kosiorek
Approved revision: 331
Merged at revision: 331
Proposed branch: lp:~nik90/ubuntu-clock-app/change-confirmation-icon
Merge into: lp:ubuntu-clock-app
Diff against target: 38 lines (+3/-3)
3 files modified
app/alarm/AlarmLabel.qml (+1/-1)
app/alarm/AlarmRepeat.qml (+1/-1)
app/alarm/AlarmSound.qml (+1/-1)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/change-confirmation-icon
Reviewer Review Type Date Requested Status
Bartosz Kosiorek Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+267950@code.launchpad.net

Commit message

Changed confirmation icon used in AlarmLabel, AlarmRepeat and AlarmSound to be consistent with the rest of the app.

Description of the change

The EditAlarmPage uses the "ok" icon to denote confirmation. I just noticed that I used "tick" icon as confirmation in AlarmLabel, AlarmSound and AlarmRepeat pages. So I just changed them all to "ok" to maintain consistency.

No debian changelog entry required since this is just fixing a typo from the previous commit that landed.

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

PASSED: Continuous integration, rev:331
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/748/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/93

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/748/rebuild

review: Approve (continuous-integration)
Revision history for this message
Bartosz Kosiorek (gang65) wrote :

It is working perfeclty for me. Nice catch

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/alarm/AlarmLabel.qml'
2--- app/alarm/AlarmLabel.qml 2015-08-12 20:16:46 +0000
3+++ app/alarm/AlarmLabel.qml 2015-08-13 13:35:08 +0000
4@@ -45,7 +45,7 @@
5 head.actions: Action {
6 id: saveAction
7 objectName: "saveAction"
8- iconName: "tick"
9+ iconName: "ok"
10 enabled: oldAlarmLabel !== _labelEntry.text.trim() && _labelEntry.text.trim()
11 onTriggered: {
12 alarm.message = _labelEntry.text.trim()
13
14=== modified file 'app/alarm/AlarmRepeat.qml'
15--- app/alarm/AlarmRepeat.qml 2015-08-12 16:57:29 +0000
16+++ app/alarm/AlarmRepeat.qml 2015-08-13 13:35:08 +0000
17@@ -83,7 +83,7 @@
18 Action {
19 id: saveAction
20 objectName: "saveAction"
21- iconName: "tick"
22+ iconName: "ok"
23 enabled: oldAlarmDaysOfWeek !== alarm.daysOfWeek
24 onTriggered: {
25 pop()
26
27=== modified file 'app/alarm/AlarmSound.qml'
28--- app/alarm/AlarmSound.qml 2015-08-12 16:54:09 +0000
29+++ app/alarm/AlarmSound.qml 2015-08-13 13:35:08 +0000
30@@ -63,7 +63,7 @@
31 head.actions: Action {
32 id: saveAction
33 objectName: "saveAction"
34- iconName: "tick"
35+ iconName: "ok"
36 enabled: oldAlarmSoundUrl !== alarm.sound
37 onTriggered: {
38 pop()

Subscribers

People subscribed via source and target branches