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

[Arthur Mello]

Add option to Settings page to set the default calendar

Add option to Settings page to set the default calendar

[Renato Araujo Oliveira Filho (renatofilho)]

just one small change

[Renato Araujo Oliveira Filho (renatofilho)]

looks good.

review: Approve

[lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1373945]

788. By Arthur Mello on 2016-03-17

Merge with trunk

789. By Arthur Mello on 2016-03-17

Make sure only selected calendars are displayed at new event screen

[Renato Araujo Oliveira Filho (renatofilho)]

works fine.

review: Approve

[Renato Araujo Oliveira Filho (renatofilho)]

You will need this patch:
http://paste.ubuntu.com/15411068/

[lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1373945]

790. By Arthur Mello on 2016-03-18

Apply patch to fix issue when creating events with a long press

791. By Arthur Mello on 2016-03-18

Merge with trunk

[Renato Araujo Oliveira Filho (renatofilho)]

looks good

review: Approve

=== modified file 'EventActions.qml'
--- EventActions.qml	2016-03-14 20:25:50 +0000
+++ EventActions.qml	2016-03-18 00:41:07 +0000
@@ -64,6 +64,7 @@
         name: "calendarsbutton"
         iconName: "settings"
         text: i18n.tr("Settings")
-        onTriggered: pageStack.push(Qt.resolvedUrl("SettingsPage.qml"),{"settings": actionPool.settings});
+        onTriggered: pageStack.push(Qt.resolvedUrl("SettingsPage.qml"), {"eventModel": eventModel,
+                                                                         "settings": actionPool.settings});
     }
 }
 
=== modified file 'EventListModel.qml'
--- EventListModel.qml	2016-03-04 16:10:56 +0000
+++ EventListModel.qml	2016-03-18 00:41:07 +0000
@@ -75,6 +75,20 @@
         return cals;
     }
 
+    function getWritableAndSelectedCollections(){
+        var cals = [];
+        var collections = eventModel.collections;
+        for(var i = 0 ; i < collections.length ; ++i) {
+            var cal = collections[i];
+            if( cal.extendedMetaData("collection-type") === "Calendar" &&
+                    cal.extendedMetaData("collection-selected") === true &&
+                    cal.extendedMetaData("collection-readonly") === false) {
+                cals.push(cal);
+            }
+        }
+        return cals;
+    }
+
     function getWritableCollections(){
         var cals = [];
         var collections = eventModel.collections;
@@ -110,9 +124,10 @@
         var cals = getCollections();
          for(var i = 0 ; i < cals.length ; ++i) {
              var cal = cals[i]
-             cal.setExtendedMetaData("X-CAL-DEFAULT-CALENDAR", false);
              if( cal.collectionId === collectionId) {
-                cal.setExtendedMetaData("X-CAL-DEFAULT-CALENDAR", true);
+                 cal.setExtendedMetaData("collection-default", true);
+                 eventModel.saveCollection(cal);
+                 return
              }
         }
     }
 
=== modified file 'NewEvent.qml'
--- NewEvent.qml	2016-03-17 21:05:05 +0000
+++ NewEvent.qml	2016-03-18 00:41:07 +0000
@@ -74,8 +74,9 @@
     }
 
     function updateEventInfo(date, allDay) {
+        selectCalendar(model.getDefaultCollection().collectionId);
+        eventReminder.reminderValue = root.reminderValue
         updateEventDate(date, allDay)
-        eventReminder.reminderValue = root.reminderValue
     }
 
     function updateEventDate(date, allDay) {
@@ -124,7 +125,6 @@
     //Data for Add events
     function addEvent() {
         event = Qt.createQmlObject("import QtOrganizer 5.0; Event { }", Qt.application,"NewEvent.qml");
-        selectCalendar(model.getDefaultCollection().collectionId);
     }
 
     //Editing Event
@@ -574,7 +574,7 @@
                     }
 
                     containerHeight: itemHeight * 4
-                    model: root.model.getWritableCollections();
+                    model: root.model.getWritableAndSelectedCollections();
 
                     delegate: OptionSelectorDelegate{
                         text: modelData.name
 
=== modified file 'NewEventBottomEdge.qml'
--- NewEventBottomEdge.qml	2016-03-17 00:24:53 +0000
+++ NewEventBottomEdge.qml	2016-03-18 00:41:07 +0000
@@ -37,7 +37,7 @@
     signal opened()
     signal eventCreated(var event)
 
-    function updateNewEventDate(date, allDay)
+    function updateNewEventInfo(date, allDay)
     {
         _realPage.updateEventInfo(date, allDay)
     }
@@ -74,7 +74,7 @@
 
     onCommitStarted: {
         bottomEdge.opened()
-        updateNewEventDate(bottomEdge.date ? bottomEdge.date : new Date(), false)
+        updateNewEventInfo(bottomEdge.date ? bottomEdge.date : new Date(), false)
     }
 
     Component.onCompleted:  {
 
=== modified file 'PageWithBottomEdge.qml'
--- PageWithBottomEdge.qml	2016-03-15 18:01:08 +0000
+++ PageWithBottomEdge.qml	2016-03-18 00:41:07 +0000
@@ -33,7 +33,7 @@
     function bottomEdgeCommit(date, allDay)
     {
         bottomEdge.commit()
-        bottomEdge.updateNewEventDate(date, allDay)
+        bottomEdge.updateNewEventInfo(date, allDay)
     }
 
     NewEventBottomEdge {
 
=== modified file 'SettingsPage.qml'
--- SettingsPage.qml	2016-03-14 20:25:50 +0000
+++ SettingsPage.qml	2016-03-18 00:41:07 +0000
@@ -24,6 +24,7 @@
     id: settingsPage
     objectName: "settings"
 
+    property EventListModel eventModel
     property Settings settings: undefined
 
     Binding {
@@ -138,5 +139,61 @@
                 }
             }
         }
+
+        ListItem {
+            visible: defaultCalendarOptionSelector.model && defaultCalendarOptionSelector.model.length > 0
+            height: visible ? defaultCalendarLayout.height + divider.height : 0
+
+            Component.onCompleted: {
+                if (!eventModel || !defaultCalendarOptionSelector.model) {
+                    return
+                }
+
+                var defaultCollectionId = eventModel.getDefaultCollection().collectionId
+                for (var i=0; i<defaultCalendarOptionSelector.model.length; ++i) {
+                    if (defaultCalendarOptionSelector.model[i].collectionId === defaultCollectionId) {
+                        defaultCalendarOptionSelector.selectedIndex = i
+                        return
+                    }
+                }
+
+                defaultCalendarOptionSelector.selectedIndex = 0
+            }
+
+            SlotsLayout {
+                id: defaultCalendarLayout
+
+                mainSlot: Item {
+                    height: defaultCalendarOptionSelector.height
+
+                    OptionSelector {
+                        id: defaultCalendarOptionSelector
+
+                        text: i18n.tr("Default calendar")
+                        model: settingsPage.eventModel ? settingsPage.eventModel.getWritableAndSelectedCollections() : null
+                        containerHeight: itemHeight * 4 
+
+                        delegate: OptionSelectorDelegate {
+                            text: modelData.name
+                            height: units.gu(4)
+
+                            UbuntuShape{
+                                anchors {
+                                    right: parent.right
+                                    rightMargin: units.gu(4)
+                                    verticalCenter: parent.verticalCenter
+                                }
+
+                                 width: height
+                                 height: parent.height - units.gu(2)
+                                 color: modelData.color
+                            }
+                        }
+
+                        onDelegateClicked: settingsPage.eventModel.setDefaultCollection(model[index].collectionId)
+                    }
+                }
+            }
+        }
     }
 }