Merge lp:~nik90/ubuntu-clock-app/10-alarm-change into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Moved the datetime object from clockPage.qml to ubuntu-clock-app.qml which will help in using one common datetime object for multiple purposes and improve performance when adding features in the upcoming branches.

Moves the datetime object from clockPage.qml to ubuntu-clock-app.qml which will help in using one common datetime object for multiple purposes and improve performance when adding features in the upcoming branches.

This is a pre-requisite change for the upcoming feature implementations.

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

FAILED: Continuous integration, rev:102
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/517/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/674
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/674/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/164/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:103
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/518/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/675
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/675/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/165/console

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

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

#blocked on Jenkins. This requires a patch to the Jenkins environment since the xvfb package which is used to run the clock app tests takes input focus away from the clock app when it is launched. This is causing the AP tests to be pass. Francis and Nicholas have been informed. Once jenkins is fixed, we should be good to merge this branch.

review: Needs Fixing

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

FAILED: Continuous integration, rev:104
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/536/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/794
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/794/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Riccardo Padovani (rpadovani)]

Tested, lgtm

review: Approve

[lp:~nik90/ubuntu-clock-app/10-alarm-change]

105. By Nekhelesh Ramananthan on 2014-10-09

Merged prerequisite branch

106. By Nekhelesh Ramananthan on 2014-10-09

Updated debian changelog

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

PASSED: Continuous integration, rev:106
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/540/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/806
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/806/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml	2014-10-09 16:38:10 +0000
+++ app/clock/ClockPage.qml	2014-10-09 16:38:10 +0000
@@ -22,7 +22,6 @@
 import "../components"
 import "../upstreamcomponents"
 import "../worldclock"
-import "../components/Utils.js" as Utils
 
 PageWithBottomEdge {
     id: _clockPage
@@ -31,10 +30,13 @@
     // Property to keep track of the clock mode
     property alias isDigital: clock.isDigital
 
+    // Property to keep track of the clock time
+    property alias clockTime: clock.analogTime
+
     flickable: null
 
     Component.onCompleted: {
-        Utils.log(debugMode, "Clock Page loaded")
+        console.log("[LOG] Clock Page loaded")
         _clockPage.setBottomEdgePage(Qt.resolvedUrl("../alarm/AlarmPage.qml"), {})
     }
 

=== modified file 'app/clock/MainClock.qml'
--- app/clock/MainClock.qml	2014-10-07 07:52:16 +0000
+++ app/clock/MainClock.qml	2014-10-09 16:38:10 +0000
@@ -17,7 +17,6 @@
  */
 
 import QtQuick 2.3
-import DateTime 1.0
 import Ubuntu.Components 1.1
 import "../components"
 
@@ -30,44 +29,6 @@
 
     isMainClock: true
 
-    Connections {
-        target: clockApp
-        onApplicationStateChanged: {
-            localTimeSource.update()
-        }
-    }
-
-    DateTime {
-        id: localTimeSource
-        updateInterval: 1000
-    }
-
-    /*
-     Create a new Date() object and pass the date, month, year, hour, minute
-     and second received from the DateTime plugin manually to ensure the
-     timezone info is set correctly.
-
-     Javascript Month is 0-11 while QDateTime month is 1-12. Hence the -1
-     is required.
-    */
-
-    /*
-      FIXME: When the upstream QT bug at
-      https://bugreports.qt-project.org/browse/QTBUG-40275 is fixed it will be
-      possible to receive a datetime object directly instead of using this hack.
-    */
-    analogTime: new Date
-                (
-                    localTimeSource.localDateString.split(":")[0],
-                    localTimeSource.localDateString.split(":")[1]-1,
-                    localTimeSource.localDateString.split(":")[2],
-                    localTimeSource.localTimeString.split(":")[0],
-                    localTimeSource.localTimeString.split(":")[1],
-                    localTimeSource.localTimeString.split(":")[2],
-                    localTimeSource.localTimeString.split(":")[3]
-                )
-    time: Qt.formatTime(analogTime)
-
     isDigital: clockModeDocument.contents.digitalMode ? true : false
 
     Component.onCompleted: {

=== modified file 'app/ubuntu-clock-app.qml'
--- app/ubuntu-clock-app.qml	2014-10-09 16:38:10 +0000
+++ app/ubuntu-clock-app.qml	2014-10-09 16:38:10 +0000
@@ -17,6 +17,7 @@
  */
 
 import QtQuick 2.3
+import DateTime 1.0
 import U1db 1.0 as U1db
 import Ubuntu.Components 1.1
 import "clock"
@@ -80,6 +81,15 @@
         Component.onCompleted: Utils.log(debugMode, "Alarm Database loaded")
     }
 
+    DateTime {
+        id: localTimeSource
+        updateInterval: 1000
+    }
+
+    onApplicationStateChanged: {
+        localTimeSource.update()
+    }
+
     PageStack {
         id: mainStack
 
@@ -97,6 +107,32 @@
             */
 
             /*
+             Create a new Date() object and pass the date, month, year, hour, minute
+             and second received from the DateTime plugin manually to ensure the
+             timezone info is set correctly.
+
+             Javascript Month is 0-11 while QDateTime month is 1-12. Hence the -1
+             is required.
+            */
+
+            /*
+              FIXME: When the upstream QT bug at
+              https://bugreports.qt-project.org/browse/QTBUG-40275 is fixed it will be
+              possible to receive a datetime object directly instead of using this hack.
+            */
+
+            clockTime: new Date
+                       (
+                           localTimeSource.localDateString.split(":")[0],
+                           localTimeSource.localDateString.split(":")[1]-1,
+                           localTimeSource.localDateString.split(":")[2],
+                           localTimeSource.localTimeString.split(":")[0],
+                           localTimeSource.localTimeString.split(":")[1],
+                           localTimeSource.localTimeString.split(":")[2],
+                           localTimeSource.localTimeString.split(":")[3]
+                       )
+
+            /*
               #TODO: The bottom edge title should reflect the time to the next
               alarm. For instance it should read "Next alarm in 9h23m".
             */

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-09 16:38:10 +0000
+++ debian/changelog	2014-10-09 16:38:10 +0000
@@ -3,6 +3,8 @@
   [Nekhelesh Ramananthan]
   * Fixed bottom edge hint timeout which made it possible for new users to not notice
     the bottom edge action. (LP: #1357945)
+  * Moved DateTime object to ubuntu-clock-app.qml so that it can be used in multiple
+    places and avoid the need to duplicate the object.
 
   [Akiva Shammai Avraham]
   * Improved the analog clock performance by updating the clock hands every second

=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot	2014-10-07 08:01:14 +0000
+++ po/com.ubuntu.clock.pot	2014-10-09 16:38:10 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-07 01:01-0700\n"
+"POT-Creation-Date: 2014-10-09 12:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -42,7 +42,7 @@
 msgid "Delete"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:26 ../app/ubuntu-clock-app.qml:103
+#: ../app/alarm/AlarmPage.qml:26 ../app/ubuntu-clock-app.qml:139
 msgid "Alarms"
 msgstr ""
 
@@ -141,7 +141,7 @@
 msgid "Delete alarm"
 msgstr ""
 
-#: ../app/clock/ClockPage.qml:134
+#: ../app/clock/ClockPage.qml:143
 msgid "Location"
 msgstr ""