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

[Nekhelesh Ramananthan]

Increases the digital clock font size to units.dp(41) as per design spec. Fixes bug 1215334.

Increases the digital clock font size to units.dp(41) as per design spec. Fixes bug 1215334.

[Nekhelesh Ramananthan (nik90)]

@Michal, please confirm if this meets the design specs.

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

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

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

review: Approve (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/17/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/221
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-precise-amd64-autolanding/17
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-autolanding/17
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-autolanding/17
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-autolanding/17

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/18/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/223/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-precise-amd64-autolanding/18
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-autolanding/18
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-autolanding/18
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-autolanding/18

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

generic-mediumtests failed due admin error. retrying.

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

review: Approve (continuous-integration)

=== modified file 'clock/ClockPage.qml'
--- clock/ClockPage.qml	2013-09-02 17:06:34 +0000
+++ clock/ClockPage.qml	2013-09-03 21:13:27 +0000
@@ -33,7 +33,7 @@
     // Property to hold the formatted time string to show on the screen
     property string currentTimeFormatted
     property real currentTimeStamp
-    property real diff: new Date().getTimezoneOffset()    
+    property real diff: new Date().getTimezoneOffset()
 
     Component.onCompleted: {
         Utils.log("ClockPage loaded");
@@ -80,9 +80,8 @@
                 anchors.centerIn: parent
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
-                fontSize: "x-large"
                 color: Theme.palette.normal.baseText
-
+                font.pixelSize: units.dp(41)
                 text: currentTimeFormatted
             }
         }
@@ -91,7 +90,7 @@
         AnalogClockFace {
             id: clockFace
 
-            anchors { top: parent.top; topMargin: units.gu(9); horizontalCenter: parent.horizontalCenter }            
+            anchors { top: parent.top; topMargin: units.gu(9); horizontalCenter: parent.horizontalCenter }
 
             onClicked: {
                 if (easterEggCircle.isReady == XmlListModel.Ready) {
@@ -185,7 +184,7 @@
                         fontSize: "large"
                     }
 
-                    Label {                        
+                    Label {
                         text: Qt.formatTime(new Date(currentTimeStamp + (rawOffSet * 60000)), "hh:mm A")
                         anchors { verticalCenter: parent.verticalCenter; right: parent.right; rightMargin: units.gu(2) }
                         color: Theme.palette.normal.baseText