Merge lp:~rpadovani/ubuntu-clock-app/17Feb2014 into lp:ubuntu-clock-app/saucy

[Riccardo Padovani]

Added support for arguments

Added support for arguments.
Now if "alarm" is passed the "Alarm" tab is opened

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

FAILED: Continuous integration, rev:345
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/252/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1338
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/252
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/252
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/170

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:345
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/291/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1501/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/291/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/291/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/209/console

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

345. By Riccardo Padovani on 2014-02-17

Added arguments support

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-12 23:36:09 +0000
+++ CMakeLists.txt	2014-02-17 11:42:51 +0000
@@ -23,7 +23,7 @@
     set(CMAKE_INSTALL_PREFIX /)
     set(CMAKE_INSTALL_BINDIR /)
     set(DATA_DIR /)
-    set(EXEC "qmlscene ${MAIN_QML}")
+    set(EXEC "qmlscene %u ${MAIN_QML}")
     set(DESKTOP_DIR ${DATA_DIR})
     set(URLS_DIR ${DATA_DIR})
 else(CLICK_MODE)

=== modified file 'ubuntu-clock-app.qml'
--- ubuntu-clock-app.qml	2014-02-11 13:54:38 +0000
+++ ubuntu-clock-app.qml	2014-02-17 11:42:51 +0000
@@ -73,6 +73,10 @@
             root.width = minimumWidth
             root.height = minimumHeight
         }
+
+        // If alarm has been invoked on startup
+        if (parseArgument(args.defaultArgument.at(0)) === "alarm")
+            rootTabs.selectedTabIndex = 1;
     }
 
     actions: [
@@ -87,6 +91,31 @@
         }
     ]
 
+    // Argument during startup
+    Arguments {
+        id: args;
+
+        // IMPORTANT
+        // Due to bug #1231558 you have to pass arguments BEFORE app:
+        // qmlscene alarm:/// ubuntu-clock-app.qml
+
+        defaultArgument.valueNames: ["URL"];
+        defaultArgument.help: i18n.tr("Clock app accepts only one argument: alarm:/// to switch to Alarm Page");
+    }
+
+     // Function to parse arguments that are invoked on start
+     function parseArgument(url) {
+        var alarmPattern = new RegExp ("alarm");
+        console.log('url ' + url)
+        console.log('alarmPattern ' + alarmPattern)
+        if (alarmPattern.test(url))
+        {
+            console.log('test true')
+            return "alarm";
+        }
+        console.log('test false')
+    }
+
     // Timer that runs our app
     Timer {
         id: updateTimer