← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

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

 

Nekhelesh Ramananthan has proposed merging lp:~nik90/ubuntu-clock-app/change-confirmation-icon into lp:ubuntu-clock-app.

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

Requested reviews:
  Ubuntu Clock Developers (ubuntu-clock-dev)

For more details, see:
https://code.launchpad.net/~nik90/ubuntu-clock-app/change-confirmation-icon/+merge/267950

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.
-- 
Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~nik90/ubuntu-clock-app/change-confirmation-icon into lp:ubuntu-clock-app.
=== modified file 'app/alarm/AlarmLabel.qml'
--- app/alarm/AlarmLabel.qml	2015-08-12 20:16:46 +0000
+++ app/alarm/AlarmLabel.qml	2015-08-13 13:35:08 +0000
@@ -45,7 +45,7 @@
     head.actions: Action {
         id: saveAction
         objectName: "saveAction"
-        iconName: "tick"
+        iconName: "ok"
         enabled: oldAlarmLabel !== _labelEntry.text.trim() && _labelEntry.text.trim()
         onTriggered: {
             alarm.message = _labelEntry.text.trim()

=== modified file 'app/alarm/AlarmRepeat.qml'
--- app/alarm/AlarmRepeat.qml	2015-08-12 16:57:29 +0000
+++ app/alarm/AlarmRepeat.qml	2015-08-13 13:35:08 +0000
@@ -83,7 +83,7 @@
         Action {
             id: saveAction
             objectName: "saveAction"
-            iconName: "tick"
+            iconName: "ok"
             enabled: oldAlarmDaysOfWeek !== alarm.daysOfWeek
             onTriggered: {
                 pop()

=== modified file 'app/alarm/AlarmSound.qml'
--- app/alarm/AlarmSound.qml	2015-08-12 16:54:09 +0000
+++ app/alarm/AlarmSound.qml	2015-08-13 13:35:08 +0000
@@ -63,7 +63,7 @@
     head.actions: Action {
         id: saveAction
         objectName: "saveAction"
-        iconName: "tick"
+        iconName: "ok"
         enabled: oldAlarmSoundUrl !== alarm.sound
         onTriggered: {
             pop()


Follow ups