Merge lp:~dpm/reminders-app/clarify-reminders 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.

Unmerged revisions

135. By David Planella on 2014-05-09

Specified reminder actions explicitly, and update icons accordingly

134. By David Planella on 2014-05-09

Updated debian copyright with the new license exception

133. By David Planella on 2014-05-09

Updated all files with the new license exception

132. By David Planella on 2014-05-09

Initial addition of the OpenSSL linking exception

=== modified file 'src/app/qml/ui/NotePage.qml'
--- src/app/qml/ui/NotePage.qml	2014-05-09 19:55:44 +0000
+++ src/app/qml/ui/NotePage.qml	2014-05-09 19:55:44 +0000
@@ -53,8 +53,12 @@
         }
         ToolbarSpacer {}
         ToolbarButton {
-            text: note.reminder ? "Reminder (set)" : "Reminder"
-            iconName: "alarm-clock"
+            text: note.reminder ? i18n.tr("Edit reminder") : i18n.tr("Set reminder")
+            // For some reason this does not work:
+            //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 19:55:44 +0000
+++ src/app/qml/ui/NotesPage.qml	2014-05-09 19:55:44 +0000
@@ -90,8 +90,12 @@
             }
         }
         ToolbarButton {
-            text: root.selectedNote.reminder ? "Reminder (set)" : "Reminder"
-            iconName: "alarm-clock"
+            text: root.selectedNote.reminder ? i18n.tr("Edit reminder") : i18n.tr("Set reminder")
+            // For some reason this does not work:
+            //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