ubuntu-touch-coreapps-reviewers team mailing list archive

[Kunal Parmar <pkunal.parmar@xxxxxxxxx>]

Kunal Parmar has proposed merging lp:~pkunal-parmar/ubuntu-calendar-app/DefView into lp:ubuntu-calendar-app.

Commit message:
Resolves Bug #1494394 

Requested reviews:
  Ubuntu Calendar Developers (ubuntu-calendar-dev)

For more details, see:
https://code.launchpad.net/~pkunal-parmar/ubuntu-calendar-app/DefView/+merge/274062

Resolves Bug #1494394 
-- 
Your team Ubuntu Calendar Developers is requested to review the proposed merge of lp:~pkunal-parmar/ubuntu-calendar-app/DefView into lp:ubuntu-calendar-app.

=== modified file 'calendar.qml'
--- calendar.qml	2015-09-05 05:30:23 +0000
+++ calendar.qml	2015-10-11 02:21:39 +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 //weekTab.index;
                     }
                 } // End of if about args.values
                 else {
-                    tabs.selectedTabIndex = weekTab.index;
+                    tabs.selectedTabIndex = settings.defaultViewIndex //weekTab.index;
                 }
             } // 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;