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

[Kunal Parmar]

Resolves Bug #1494394

Resolves Bug #1494394

[lp:~pkunal-parmar/ubuntu-calendar-app/DefView]

719. By Kunal Parmar on 2015-10-11

comment code removed

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

PASSED: Continuous integration, rev:719
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1233/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/230

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

review: Approve (continuous-integration)

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

FAILED: Continuous integration, rev:719
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/4/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/42/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/4/rebuild

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:719
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/9/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/64/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/9/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Let me know if you have further troubles. I'll be fixing the messages jenkins leaves to be a bit saner.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Nice one! Works well.

review: Approve

=== modified file 'calendar.qml'
--- calendar.qml	2015-09-05 05:30:23 +0000
+++ calendar.qml	2015-10-11 02:22:53 +0000
@@ -19,6 +19,7 @@
 import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 1.0
 import QtOrganizer 5.0
+import Qt.labs.settings 1.0
 
 import "dateExt.js" as DateExt
 
@@ -308,11 +309,11 @@
                     else {
                         // Due to bug #1231558 {if (args.defaultArgument.at(0))} is always true
                         // After the fix we can delete this else
-                        tabs.selectedTabIndex = weekTab.index;
+                        tabs.selectedTabIndex = settings.defaultViewIndex;
                     }
                 } // End of if about args.values
                 else {
-                    tabs.selectedTabIndex = weekTab.index;
+                    tabs.selectedTabIndex = settings.defaultViewIndex;
                 }
             } // End of Component.onCompleted:
 
@@ -320,6 +321,11 @@
                 id: commonHeaderActions
             }
 
+            Settings {
+                id: settings
+                property alias defaultViewIndex: tabs.selectedTabIndex
+            }
+
             Keys.onTabPressed: {
                 if( event.modifiers & Qt.ControlModifier) {
                     var currentTab = tabs.selectedTabIndex;