Merge lp:~dpm/reminders-app/clarify-reminders-take2 into lp:reminders-app

[David Planella]

Specified reminder actions explicitly, and update icons accordingly

Specified reminder actions explicitly, and update icons accordingly

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:135
http://91.189.93.70:8080/job/reminders-app-ci/331/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2579
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2579/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/116
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/116/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/332
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/26

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/331/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Seems reasonable. Thanks :-)

review: Approve

[David Planella (dpm)]

So to add some more context, I've found out why the icon name cannot be set. It seems that the reminder icon is only available in the suru theme.

Both suru and ubuntu-mobile-icons are installed by default on the phone, but the toolkit has not switched to suru yet and is still looking for the icons only on the ubuntu-mobile-icons theme. I'd suggest to leave the hardcoded path for now and fix it to an icon name once the toolkit switches to suru.

[Michael Zanetti (mzanetti)]

> So to add some more context, I've found out why the icon name cannot be set.
> It seems that the reminder icon is only available in the suru theme.
>
> Both suru and ubuntu-mobile-icons are installed by default on the phone, but
> the toolkit has not switched to suru yet and is still looking for the icons
> only on the ubuntu-mobile-icons theme. I'd suggest to leave the hardcoded path
> for now and fix it to an icon name once the toolkit switches to suru.

please mark the comment with the string "TODO:" or "FIXME:" so we can find those things later.

[David Planella (dpm)]

Done: updated comment with TODO

[Michael Zanetti (mzanetti)]

lgtm

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:136
http://91.189.93.70:8080/job/reminders-app-ci/337/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2599
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2599/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/138/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/138/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/338
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/32

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/337/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/124/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2600
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2600/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/139/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/139/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-autolanding/124
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/16

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'src/app/qml/ui/NotePage.qml'
--- src/app/qml/ui/NotePage.qml	2014-05-09 09:02:54 +0000
+++ src/app/qml/ui/NotePage.qml	2014-05-12 11:12:18 +0000
@@ -39,8 +39,13 @@
         }
         ToolbarSpacer {}
         ToolbarButton {
-            text: note.reminder ? "Reminder (set)" : "Reminder"
-            iconName: "alarm-clock"
+            text: note.reminder ? i18n.tr("Edit reminder") : i18n.tr("Set reminder")
+            // TODO: use this instead when the toolkit switches from using the
+            // ubuntu-mobile-icons theme to suru:
+            //iconName: note.reminder ? "reminder" : "reminder-new"
+            iconSource: note.reminder ?
+                Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder.svg") :
+                Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder-new.svg")
             onTriggered: {
                 pageStack.push(Qt.resolvedUrl("SetReminderPage.qml"), {title: root.title, note: root.note});
             }

=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml	2014-05-09 09:05:32 +0000
+++ src/app/qml/ui/NotesPage.qml	2014-05-12 11:12:18 +0000
@@ -76,8 +76,13 @@
             }
         }
         ToolbarButton {
-            text: root.selectedNote.reminder ? "Reminder (set)" : "Reminder"
-            iconName: "alarm-clock"
+            text: root.selectedNote.reminder ? i18n.tr("Edit reminder") : i18n.tr("Set reminder")
+            // TODO: use this instead when the toolkit switches from using the
+            // ubuntu-mobile-icons theme to suru:
+            //iconName: root.selectedNote.reminder ? "reminder" : "reminder-new"
+            iconSource: root.selectedNote.reminder ?
+                Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder.svg") :
+                Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder-new.svg")
             visible: root.selectedNote !== null
             onTriggered: {
                 root.selectedNote.reminder = !root.selectedNote.reminder