Merge lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1554610 into lp:ubuntu-calendar-app

[Arthur Mello]

Add support to set a default reminder value time from settings page

Add support to set a default reminder value time from settings page

[Renato Araujo Oliveira Filho (renatofilho)]

Chekc my inline comments. I have some suggestion how to implement it in a better way.

[Renato Araujo Oliveira Filho (renatofilho)]

code looks good.
Works as expected.

review: Approve

[Renato Araujo Oliveira Filho (renatofilho)]

agenda view still not using the configured value.

[Renato Araujo Oliveira Filho (renatofilho)]

works nice.

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1554610/+merge/288969/+edit-commit-message

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Added commit message to fix failed autolanding.

=== modified file 'EventActions.qml'
--- EventActions.qml	2016-03-04 16:10:56 +0000
+++ EventActions.qml	2016-03-14 20:38:42 +0000
@@ -19,6 +19,7 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.SyncMonitor 0.1
+import Qt.labs.settings 1.0
 
 Item {
     id: actionPool
@@ -26,6 +27,7 @@
     property alias showCalendarAction: _showCalendarAction
     property alias syncCalendarAction: _syncCalendarAction
     property alias settingsAction: _settingsAction
+    property Settings settings
     readonly property bool syncInProgress: (syncMonitor.state === "syncing")
 
     Action {
@@ -62,8 +64,6 @@
         name: "calendarsbutton"
         iconName: "settings"
         text: i18n.tr("Settings")
-        onTriggered: {
-            pageStack.push(Qt.resolvedUrl("Settings.qml"));
-        }
+        onTriggered: pageStack.push(Qt.resolvedUrl("SettingsPage.qml"),{"settings": actionPool.settings});
     }
 }

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2016-03-07 17:57:04 +0000
+++ NewEvent.qml	2016-03-14 20:38:42 +0000
@@ -42,6 +42,8 @@
 
     property var startDate;
     property var endDate;
+    //default reminder time = 15 min
+    property int reminderValue: 900;
 
     property alias scrollY: flickable.contentY
     property bool isEdit: false
@@ -245,13 +247,11 @@
 
     VisualReminder{
         id: visualReminder
-        //default reminder time = 15 min
-        secondsBeforeStart: 900
+        secondsBeforeStart: root.reminderValue
     }
     AudibleReminder{
         id: audibleReminder
-        //default reminder time = 15 min
-        secondsBeforeStart: 900
+        secondsBeforeStart: root.reminderValue
     }
 
     function getDaysOfWeek(){

=== modified file 'NewEventBottomEdge.qml'
--- NewEventBottomEdge.qml	2016-03-07 17:57:04 +0000
+++ NewEventBottomEdge.qml	2016-03-14 20:38:42 +0000
@@ -26,6 +26,7 @@
     property var pageStack: null
     property var eventModel: null
     property var date: new Date()
+    property int reminderValue
 
     // WORKAROUND: BottomEdge component loads the page async while draging it
     // this cause a very bad visual.
@@ -93,6 +94,7 @@
 
             implicitWidth: bottomEdge.width
             implicitHeight: bottomEdge.height
+            reminderValue: bottomEdge.reminderValue
             model: bottomEdge.eventModel
             date: bottomEdge.date
             enabled: bottomEdge.status === BottomEdge.Committed

=== modified file 'PageWithBottomEdge.qml'
--- PageWithBottomEdge.qml	2016-03-07 17:57:04 +0000
+++ PageWithBottomEdge.qml	2016-03-14 20:38:42 +0000
@@ -23,6 +23,7 @@
 
     property alias model: bottomEdge.eventModel
     property alias createEventAt: bottomEdge.date
+    property alias reminderValue: bottomEdge.reminderValue
     property bool bootomEdgeEnabled: bottomEdge.enabled
 
     signal bottomEdgeCommitStarted()

=== modified file 'RemindersModel.qml'
--- RemindersModel.qml	2016-01-25 13:20:32 +0000
+++ RemindersModel.qml	2016-03-14 20:38:42 +0000
@@ -20,9 +20,10 @@
 
 ListModel {
     id: reminderModel
-    Component.onCompleted: initialise()
-
-    function initialise() {
+
+    signal loaded()
+
+    Component.onCompleted: {
         reminderModel.append({ "label": i18n.tr("No Reminder"), "value": -1 })
         // TRANSLATORS: this refers to when a reminder should be shown as a notification
         // in the indicators. "On Event" means that it will be shown right at the time
@@ -37,6 +38,7 @@
         reminderModel.append({ "label": i18n.tr("2 days"), "value": 172800 })
         reminderModel.append({ "label": i18n.tr("1 week"), "value": 604800 })
         reminderModel.append({ "label": i18n.tr("2 weeks"), "value": 1209600 })
+        reminderModel.loaded()
     }
 }
 

=== renamed file 'Settings.qml' => 'SettingsPage.qml'
--- Settings.qml	2016-03-02 19:55:52 +0000
+++ SettingsPage.qml	2016-03-14 20:38:42 +0000
@@ -18,11 +18,28 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
+import Qt.labs.settings 1.0
 
 Page {
     id: settingsPage
     objectName: "settings"
 
+    property Settings settings: undefined
+
+    Binding {
+        target: settingsPage.settings
+        property: "showWeekNumber"
+        value: weekCheckBox.checked
+        when: settings
+    }
+
+    Binding {
+        target: settingsPage.settings
+        property: "showLunarCalendar"
+        value: lunarCalCheckBox.checked
+        when: settings
+    }
+
     visible: false
 
     header: PageHeader {
@@ -30,15 +47,12 @@
         leadingActionBar.actions: Action {
             text: i18n.tr("Back")
             iconName: "back"
-            onTriggered: {
-                pop()
-            }
+            onTriggered: pop()
         }
     }
 
-    Component.onCompleted: {
-        weekCheckBox.checked = mainView.displayWeekNumber
-        lunarCalCheckBox.checked = mainView.displayLunarCalendar
+    RemindersModel {
+        id: remindersModel
     }
 
     Column {
@@ -57,9 +71,7 @@
                     id: weekCheckBox
                     objectName: "weekCheckBox"
                     SlotsLayout.position: SlotsLayout.Last
-                    onCheckedChanged: {
-                        mainView.displayWeekNumber = weekCheckBox.checked
-                    }
+                    checked: settings ? settings.showWeekNumber : false
                 }
             }
         }
@@ -73,8 +85,55 @@
                     id: lunarCalCheckBox
                     objectName: "lunarCalCheckbox"
                     SlotsLayout.position: SlotsLayout.Last
-                    onCheckedChanged: {
-                        mainView.displayLunarCalendar = lunarCalCheckBox.checked
+                    checked: settings ? settings.showLunarCalendar : false
+                }
+            }
+        }
+
+        ListItem {
+            id: defaultReminderItem
+
+            visible: defaultReminderOptionSelector.model && defaultReminderOptionSelector.model.count > 0
+            height: visible ? defaultReminderLayout.height + divider.height : 0
+
+            Connections {
+                target: remindersModel
+                onLoaded: {
+                    if (!defaultReminderOptionSelector.model) {
+                        return
+                    }
+
+                    for (var i=0; i<defaultReminderOptionSelector.model.count; ++i) {
+                        var reminder = defaultReminderOptionSelector.model.get(i)
+                        if (reminder.value === settings.reminderDefaultValue) {
+                            defaultReminderOptionSelector.selectedIndex = i
+                            return
+                        }
+                    }
+
+                    defaultReminderOptionSelector.selectedIndex = 0
+                }
+            }
+
+            SlotsLayout {
+                id: defaultReminderLayout
+
+                mainSlot: Item {
+                    height: defaultReminderOptionSelector.height
+
+                    OptionSelector {
+                        id: defaultReminderOptionSelector
+
+                        text: i18n.tr("Default reminder")
+                        model: remindersModel
+                        containerHeight: itemHeight * 4
+
+                        delegate: OptionSelectorDelegate {
+                            text: label
+                            height: units.gu(4)
+                        }
+
+                       onDelegateClicked: settings.reminderDefaultValue = model.get(index).value
                     }
                 }
             }

=== modified file 'calendar.qml'
--- calendar.qml	2016-03-07 15:58:43 +0000
+++ calendar.qml	2016-03-14 20:38:42 +0000
@@ -28,6 +28,7 @@
 
     property bool displayWeekNumber: false;
     property bool displayLunarCalendar: false;
+    property int reminderDefaultValue: 900;
     readonly property bool syncInProgress: commonHeaderActions.syncInProgress
 
     // Work-around until this branch lands:
@@ -259,12 +260,15 @@
 
         EventActions {
             id: commonHeaderActions
+            settings: settings
         }
 
         Settings {
             id: settings
             property alias defaultViewIndex: tabs.selectedTabIndex
             property alias showWeekNumber: mainView.displayWeekNumber
+            property alias showLunarCalendar: mainView.displayLunarCalendar
+            property alias reminderDefaultValue: mainView.reminderDefaultValue
         }
 
         Tabs{
@@ -570,6 +574,7 @@
         YearView {
             readonly property bool tabSelected: tabs.selectedTabIndex === yearTab.index
 
+            reminderValue: mainView.reminderDefaultValue
             model: eventModel.isReady ? eventModel : null
             bootomEdgeEnabled: tabSelected
             displayLunarCalendar: mainView.displayLunarCalendar
@@ -603,6 +608,7 @@
         MonthView {
             readonly property bool tabSelected: tabs.selectedTabIndex === monthTab.index
 
+            reminderValue: mainView.reminderDefaultValue
             model: eventModel.isReady ? eventModel : null
             bootomEdgeEnabled: tabSelected
             displayLunarCalendar: mainView.displayLunarCalendar
@@ -640,6 +646,7 @@
         WeekView {
             readonly property bool tabSelected: tabs.selectedTab === weekTab
 
+            reminderValue: mainView.reminderDefaultValue
             model: eventModel.isReady ? eventModel : null
             bootomEdgeEnabled: tabSelected
             displayLunarCalendar: mainView.displayLunarCalendar
@@ -687,6 +694,7 @@
         DayView {
             readonly property bool tabSelected: tabs.selectedTabIndex === dayTab.index
 
+            reminderValue: mainView.reminderDefaultValue
             model: eventModel.isReady ? eventModel : null
             bootomEdgeEnabled: tabSelected
             displayLunarCalendar: mainView.displayLunarCalendar
@@ -724,6 +732,7 @@
         id: agendaViewComp
 
         AgendaView {
+            reminderValue: mainView.reminderDefaultValue
             model: eventModel.isReady ? eventModel : null
             bootomEdgeEnabled: tabs.selectedTabIndex === agendaTab.index