Merge lp:~nik90/ubuntu-clock-app/fix-for-1271736 into lp:ubuntu-clock-app/saucy

[Nekhelesh Ramananthan]

Update world clock times when app is brought from background or sleep

The world clock are generally updated every minute. However sometimes when the app is suspended, the world clock can show old time until the next minute. This MP forces the clock app to update the world time when the clock app is brought from the background or sleep.

[lp:~nik90/ubuntu-clock-app/fix-for-1271736]

311. By Nekhelesh Ramananthan on 2014-01-29

improved comment

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

PASSED: Continuous integration, rev:311
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/168/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/856
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/168
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/168
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/86

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Tested on mako, works as expected!
Thanks!

review: Approve

=== modified file 'clock/ClockPage.qml'
--- clock/ClockPage.qml	2014-01-29 12:09:13 +0000
+++ clock/ClockPage.qml	2014-01-29 21:18:22 +0000
@@ -78,6 +78,16 @@
         currentUTCTime = now.getTime();
     }
 
+    Connections {
+        target: root
+        onApplicationStateChanged: {
+            // Update world time immediately when the clock app is brought from suspend
+            // instead of waiting for the next minute to update.
+            if(root.applicationState)
+                updateTime()
+        }
+    }
+
     GeoIPModel {
         id: geoIP
         onStatusChanged: {
 
=== modified file 'ubuntu-clock-app.qml'
--- ubuntu-clock-app.qml	2014-01-29 17:27:47 +0000
+++ ubuntu-clock-app.qml	2014-01-29 21:18:22 +0000
@@ -49,9 +49,14 @@
     backgroundColor: "#A55263"
     footerColor: "#D75669"
 
-    // New properties of this page
+    // Property to store the default application dimensions
     readonly property real minimumWidth: units.gu(50)
     readonly property real minimumHeight: units.gu(75)
+
+    // Property to store the state of an application (active or suspended)
+    property bool applicationState: Qt.application.active
+
+    // Property to store the current time
     property var now
 
     // Initialization after page has loaded
@@ -228,4 +233,4 @@
             }
         }
     }
-}
 \ No newline at end of file
+}