Merge lp:~pkunal-parmar/ubuntu-calendar-app/NoDefaultSelection_Week into lp:ubuntu-calendar-app

[Kunal Parmar]

By default no selection in weekview, this is current implementation in MonthView as well

By default no selection in weekview, this is current implementation in MonthView as well

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

PASSED: Continuous integration, rev:699
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1219/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/216

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1219/rebuild

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good to me !!

Thanks Kunal

review: Approve

=== modified file 'EventListModel.qml'
--- EventListModel.qml	2015-05-14 13:03:02 +0000
+++ EventListModel.qml	2015-07-25 05:21:13 +0000
@@ -69,7 +69,6 @@
         var collections = eventModel.collections;
         for(var i = 0 ; i < collections.length ; ++i) {
             var cal = collections[i];
-            //print(cal.name + " ---- " + cal.extendedMetaData("collection-readonly"));
             if( cal.extendedMetaData("collection-type") === "Calendar" ) {
                 cals.push(cal);
             }

=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml	2015-06-04 14:13:32 +0000
+++ TimeLineBaseComponent.qml	2015-07-25 05:21:13 +0000
@@ -66,12 +66,10 @@
         var diff = weekDay - Qt.locale().firstDayOfWeek
         diff = diff < 0 ? 6 : diff
 
-        print(diff + ", " + Qt.locale().firstDayOfWeek + "--" + weekDay)
         if( startOfWeek.isSameDay(startDay) && diff > 2) {
             timeLineView.contentX = (diff * timeLineView.delegateWidth);
             if( timeLineView.contentX  > (timeLineView.contentWidth - timeLineView.width) ) {
                 timeLineView.contentX = timeLineView.contentWidth - timeLineView.width
-                print(timeLineView.contentX +"----" + (timeLineView.contentWidth - timeLineView.width) )
             }
         } else {
             timeLineView.contentX = 0;
@@ -140,6 +138,7 @@
             startDay: root.startDay
             contentX: timeLineView.contentX
             type: root.type
+            isActive: root.isActive
 
             onDateSelected: {
                 root.dateSelected(date);

=== modified file 'TimeLineHeader.qml'
--- TimeLineHeader.qml	2015-04-29 12:30:15 +0000
+++ TimeLineHeader.qml	2015-07-25 05:21:13 +0000
@@ -29,6 +29,7 @@
     property date startDay;
     property double contentX;
     property int firstDayOfWeek: Qt.locale().firstDayOfWeek
+    property bool isActive: false;
 
     signal dateSelected(var date);
 
@@ -153,6 +154,7 @@
                     type: ViewType.ViewTypeWeek
                     width: parent.width
                     height: units.gu(5)
+                    isCurrentItem: root.isActive
 
                     onDateSelected: {
                         root.dateSelected(date);

=== modified file 'TimeLineHeaderComponent.qml'
--- TimeLineHeaderComponent.qml	2015-05-28 12:37:54 +0000
+++ TimeLineHeaderComponent.qml	2015-07-25 05:21:13 +0000
@@ -37,8 +37,8 @@
     width: parent.width
     height: units.gu(4)
 
-    onStartDayChanged: {
-        highlightedIndex = 0
+    onIsCurrentItemChanged: {
+        highlightedIndex = -1
     }
 
     Repeater{