Merge lp:~rpadovani/ubuntu-clock-app/09Oct2013 into lp:ubuntu-clock-app/saucy

[Riccardo Padovani]

Added arguments on startup: for now, only alarm:/// but it's ready to have also other arguments

Added arguments on startup: for now, only alarm:/// but it's ready to have also other arguments

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

PASSED: Continuous integration, rev:228
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/70/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/847
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-precise-amd64-ci/70
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-ci/70
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/70
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/70

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

review: Approve (continuous-integration)

[lp:~rpadovani/ubuntu-clock-app/09Oct2013]

229. By Riccardo Padovani on 2013-10-09

Added %u in .desktop Exec entry, before app command due bug #1231136

[Riccardo Padovani (rpadovani)]

Typo: bug #1231558

[Ted Gould (ted)]

Not sure about the QML, but the desktop file looks correct.

review: Approve

[Nekhelesh Ramananthan (nik90)]

lgtm. I tested it by running qmlscene alarm ubuntu-clock-app.qml and it correctly opened the alarm tab. Any argument which starts with alarm like alarm:/// etc should properly.

review: Approve

=== modified file 'ubuntu-clock-app.desktop'
--- ubuntu-clock-app.desktop	2013-10-09 08:26:48 +0000
+++ ubuntu-clock-app.desktop	2013-10-09 19:42:14 +0000
@@ -2,7 +2,7 @@
 Version=1.0
 Type=Application
 Terminal=false
-Exec=qmlscene /usr/share/ubuntu-clock-app/ubuntu-clock-app.qml
+Exec=qmlscene %u /usr/share/ubuntu-clock-app/ubuntu-clock-app.qml
 Icon=/usr/share/ubuntu-clock-app/clock64.png
 Name=Clock
 X-Ubuntu-Touch=true

=== modified file 'ubuntu-clock-app.qml'
--- ubuntu-clock-app.qml	2013-10-09 08:20:41 +0000
+++ ubuntu-clock-app.qml	2013-10-09 19:42:14 +0000
@@ -30,6 +30,27 @@
 
 MainView {
     id: root
+
+    // 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");
+
+        if (alarmPattern.test(url))
+            return "alarm";
+    }
+
     // objectName for functional testing purposes (autopilot-qt5)
     objectName: "clock"
 
@@ -51,6 +72,10 @@
     Component.onCompleted: {
         // Any init here
         Utils.log("MainView loaded");
+
+        // If alarm has been invoked on startup
+        if (parseArgument(args.defaultArgument.at(0)) === "alarm")
+            rootTabs.selectedTabIndex = 1;
     }
 
     // Timer that runs our app