Merge lp:~mzanetti/unity8/fix-greeter-time-update into lp:unity8

[Michael Zanetti]

make the greeter's clock update in sync with the indicators.

This gets rid of the timer in the greeter as the indicator fires signals when it's time to update.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:437
http://jenkins.qa.ubuntu.com/job/unity8-ci/1366/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4945/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2844
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2232
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/389
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1366
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1366/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1365
    ABORTED: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1121/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/820
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/820/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2846
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2846/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2366
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2406

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1366/rebuild

review: Needs Fixing (continuous-integration)

[Mirco Müller (macslow)]

Looks ok, works fine. Approved.

review: Approve

=== modified file 'Greeter/Clock.qml'
--- Greeter/Clock.qml	2013-06-05 22:03:08 +0000
+++ Greeter/Clock.qml	2013-10-11 12:16:27 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import Unity.Indicators 0.1 as Indicators
 
 Item {
     id: clock
@@ -23,17 +24,35 @@
     implicitWidth: childrenRect.width
     implicitHeight: childrenRect.height
 
-    property date __date
-    property alias __timerInterval: timer.interval
-    readonly property bool __timerRunning: timer.running
-
-    Timer {
-        id: timer
-        interval: 1000 * 60
-        running: clock.enabled && clock.visible && clock.opacity != 0
-        repeat: true
-        triggeredOnStart: true
-        onTriggered: __date = new Date
+    // Allows to set the current Date. Will be overwritten if active
+    property date currentDate
+
+    // If active, time will be updated through the indicators service
+    property bool active: clock.enabled && clock.visible
+
+    Component.onCompleted: {
+        if (active) {
+            currentDate = new Date()
+        }
+    }
+
+    Indicators.CachedUnityMenuModel {
+        id: timeModel
+        objectName: "timeModel"
+
+        busName: "com.canonical.indicator.datetime"
+        actionsObjectPath: "/com/canonical/indicator/datetime"
+        menuObjectPath: clock.active ? "/com/canonical/indicator/datetime/phone" : ""
+
+        Indicators.RootActionState {
+            menu: timeModel.model
+            onUpdated: {
+                if (timeLabel.text != rightLabel) {
+                    timeLabel.text = rightLabel;
+                    clock.currentDate = new Date();
+                }
+            }
+        }
     }
 
     Column {
@@ -47,7 +66,7 @@
             font.pixelSize: units.gu(7.5)
             color: "white"
             opacity: 0.5
-            text: Qt.formatTime(__date)
+            text: Qt.formatTime(clock.currentDate)
             font.weight: Font.Light
         }
 
@@ -59,7 +78,7 @@
             fontSize: "medium"
             color: "white"
             opacity: 0.5
-            text: Qt.formatDate(__date, Qt.DefaultLocaleLongDate)
+            text: Qt.formatDate(clock.currentDate, Qt.DefaultLocaleLongDate)
             font.weight: Font.Light
         }
     }

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2013-10-08 12:50:52 +0000
+++ tests/qmltests/CMakeLists.txt	2013-10-11 12:16:27 +0000
@@ -17,7 +17,7 @@
 add_qml_test(Components OpenEffect)
 add_qml_test(Components RatingStars)
 add_qml_test(Components TimeLocal)
-add_qml_test(Greeter Clock)
+add_qml_test(Greeter Clock IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
 add_qml_test(Panel IndicatorItem)
 add_qml_test(utils/Unity/Test UnityTest)
 

=== modified file 'tests/qmltests/Greeter/tst_Clock.qml'
--- tests/qmltests/Greeter/tst_Clock.qml	2013-08-21 09:29:44 +0000
+++ tests/qmltests/Greeter/tst_Clock.qml	2013-10-11 12:16:27 +0000
@@ -43,8 +43,7 @@
             var dateString = Qt.formatDate(dateObj, Qt.DefaultLocaleLongDate)
             var timeString = Qt.formatTime(dateObj)
 
-            clock.__timerInterval = 60000
-            clock.__date = dateObj
+            clock.currentDate = dateObj
             var dateLabel = findChild(clock, "dateLabel")
             compare(dateLabel.text, dateString, "Not the expected date")
             var timeLabel = findChild(clock, "timeLabel")
@@ -57,33 +56,20 @@
             var timeString = Qt.formatTime(dateObj)
 
             clock.enabled = false
-            compare(clock.__timerRunning, false, "Timer should not be running")
-            clock.__date = dateObj
-            clock.__timerInterval = 5
-            wait(5) // spin event loop (only that would trigger the timer and reveal eventual bugs)
+            var timeModel = findInvisibleChild(clock, "timeModel")
+
+            compare(timeModel.menuObjectPath, "", "Clock shouldn't be connected to Indicators when not active.")
+
+            clock.currentDate = dateObj
+
             var dateLabel = findChild(clock, "dateLabel")
             compare(dateLabel.text, dateString, "Not the expected date")
             var timeLabel = findChild(clock, "timeLabel")
             compare(timeLabel.text, timeString, "Not the expected time")
 
             clock.enabled = true
-            compare(clock.__timerRunning, true, "Timer should be running")
-            wait(0) // spin event loop to trigger the timer
-            verify(dateLabel.text !== dateString)
-            if (timeLabel.text.indexOf("11:13") != -1) wait(60000) // next test will fail at 11:13, wait 1 minute
-            verify(timeLabel.text !== timeString)
-        }
 
-        function test_timerRunning() {
-            // tests for clock.enabled property are already in test_dateUpdate()
-            clock.opacity = 0.0
-            compare(clock.__timerRunning, false, "Timer should not be running")
-            clock.opacity = 1.0
-            compare(clock.__timerRunning, true, "Timer should be running")
-            clock.visible = false
-            compare(clock.__timerRunning, false, "Timer should not be running")
-            clock.visible = true
-            compare(clock.__timerRunning, true, "Timer should be running")
+            verify(timeModel.menuObjectPath != "", "Should be connected to Indicators.")
         }
     }
 }