Merge lp:~dpm/reminders-app/reminder-page-layout into lp:reminders-app

[David Planella]

Fixes layout for long translations of the buttons in the Set Reminder page.

Fixes layout for long translations of the buttons in the Set Reminder page (see bug 1379888).

Buttons are now in a column rather than a row, leaving more space for the translation. Additionally, I've marked the primary action button with lightGrey to make it stand out from the secondary action.

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

PASSED: Continuous integration, rev:274
http://91.189.93.70:8080/job/reminders-app-ci/552/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/898
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/898/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/248

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Tested on PC, works well for me and code looks good to me

review: Approve

[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/272/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/907
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/907/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/164

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/SetReminderView.qml'
--- src/app/qml/ui/SetReminderView.qml	2014-09-23 12:39:27 +0000
+++ src/app/qml/ui/SetReminderView.qml	2014-10-12 07:13:01 +0000
@@ -29,8 +29,8 @@
     property var note
 
     ColumnLayout {
-        anchors { top: parent.top; topMargin: units.gu(2); horizontalCenter: parent.horizontalCenter }
-        spacing: units.gu(2)
+        anchors { top: parent.top; topMargin: units.gu(1); horizontalCenter: parent.horizontalCenter }
+        spacing: units.gu(1)
 
         Label {
             text: i18n.tr("Select date and time for the reminder:")
@@ -48,35 +48,31 @@
             date: note.hasReminderTime ? note.reminderTime : new Date()
         }
 
-        RowLayout {
-            Layout.fillWidth: true
-
-            Button {
-                text: i18n.tr("Clear reminder")
-                Layout.fillWidth: true
-                onClicked: {
-                    note.reminder = false;
-                    NotesStore.saveNote(note.guid);
-                    pageStack.pop();
-                }
-            }
-
-            Button {
-                Layout.fillWidth: true
-                text: i18n.tr("Set reminder")
-                onClicked: {
-                    note.reminder = true;
-                    var date = datePicker.date
-                    var time = timePicker.date
-                    date.setHours(time.getHours());
-                    date.setMinutes(time.getMinutes());
-                    note.reminderTime = date;
-                    print("set reminder time to", Qt.formatDate(date))
-                    NotesStore.saveNote(note.guid)
-                    pageStack.pop();
-                }
-            }
-
+        Button {
+            Layout.fillWidth: true
+            text: i18n.tr("Set reminder")
+            color: UbuntuColors.lightGrey
+            onClicked: {
+                note.reminder = true;
+                var date = datePicker.date
+                var time = timePicker.date
+                date.setHours(time.getHours());
+                date.setMinutes(time.getMinutes());
+                note.reminderTime = date;
+                print("set reminder time to", Qt.formatDate(date))
+                NotesStore.saveNote(note.guid)
+                pageStack.pop();
+            }
+        }
+
+        Button {
+            text: i18n.tr("Clear reminder")
+            Layout.fillWidth: true
+            onClicked: {
+                note.reminder = false;
+                NotesStore.saveNote(note.guid);
+                pageStack.pop();
+            }
         }
     }
 }