Merge lp:~nik90/ubuntu-clock-app/diff-clock-markers into lp:ubuntu-clock-app/saucy

[Nekhelesh Ramananthan]

Fixes bug #1163852

This MP changes the colour of the clock markers around 3,6,9 and 12 mark for better readability.

[lp:~nik90/ubuntu-clock-app/diff-clock-markers]

23. By Nekhelesh Ramananthan on 2013-04-04

Merge from master

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

PASSED: Continuous integration, rev:23
http://91.189.93.125:8080/job/ubuntu-clock-app-ci/4/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-clock-app-quantal-amd64-ci/4
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-clock-app-raring-amd64-ci/4

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

review: Approve (continuous-integration)

[lp:~nik90/ubuntu-clock-app/diff-clock-markers]

24. By Nekhelesh Ramananthan on 2013-04-09

Merge from master

[Nekhelesh Ramananthan (nik90)]

Trivial change. Got approval from design using the G+ Hangout. Hence approving this MP.

review: Approve

=== modified file 'common/AnalogClockFace.qml'
--- common/AnalogClockFace.qml	2013-04-05 21:27:48 +0000
+++ common/AnalogClockFace.qml	2013-04-09 10:19:26 +0000
@@ -20,6 +20,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import "../common/Constants.js" as Constants
 
 AnalogFaceBase {
     id: clockRoot
@@ -75,9 +76,19 @@
     }
 
     Repeater {
-        model: 12
-        delegate: AnalogClockMarker {
-            number: index
+        model: ["1", "2", "4", "5", "7", "8", "10", "11"]
+        delegate: AnalogClockMarker {
+            number: modelData
+            size:0.7
+        }
+    }
+
+    Repeater {
+        model: ["3", "6", "9", "12"]
+        delegate: AnalogClockMarker {
+            number: modelData
+            size: 1
+            color: Constants.pitchBlack
         }
     }
 }