Merge lp:~nik90/ubuntu-clock-app/universal-clockmarker into lp:ubuntu-clock-app/saucy

[Nekhelesh Ramananthan]

Refactored AnalogClockMarker to be more universal

The AnalogClockMarker is something we need to use in Timer, Clock, Alarm and also Stopwatch. Hence made that more universal. Also refactored the Stopwatch clock marker to use the common one instead of it own marker implementation.

[Marco Biscaro (marcobiscaro2112)]

12 + property real radDistance: 0.45
13 + property string radColor: Constants.normalGrey
14 + property real radSize: 1

Why all properties have the "rad" prefix? I've only used radAngle to make clear this value is in radians (not in degrees), but I think the other properties don't need this prefix.

Also, no need to declare a new color property. You can just do:

color: Constants.normalGrey

review: Needs Fixing

[lp:~nik90/ubuntu-clock-app/universal-clockmarker]

19. By Nekhelesh Ramananthan on 2013-03-19

Fixed small mistakes

[Nekhelesh Ramananthan (nik90)]

> 12 + property real radDistance: 0.45
> 13 + property string radColor: Constants.normalGrey
> 14 + property real radSize: 1
>
> Why all properties have the "rad" prefix? I've only used radAngle to make
> clear this value is in radians (not in degrees), but I think the other
> properties don't need this prefix.

True...I was thinking along the lines of radial distance from center and so on...but fixed that.

>
> Also, no need to declare a new color property. You can just do:
>
> color: Constants.normalGrey

true..my bad..still getting used to QML.

[lp:~nik90/ubuntu-clock-app/universal-clockmarker]

20. By Nekhelesh Ramananthan on 2013-03-19

Merge with trunk

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

review: Approve (continuous-integration)

=== modified file 'common/AnalogClockMarker.qml'
--- common/AnalogClockMarker.qml	2013-03-18 18:51:11 +0000
+++ common/AnalogClockMarker.qml	2013-03-19 22:13:22 +0000
@@ -1,23 +1,26 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import "Constants.js" as Constants
 
 Rectangle {
     property int number
     property real radAngle: (number % 12 * 30) * Math.PI / 180
+    property real distance: 0.45
+    property real size: 1
 
-    width: units.gu(1)
-    height: units.gu(1)
+    width: units.gu(size)
+    height: units.gu(size)
     z: 1
 
-    color: "#D3D3D3"
+    color: Constants.normalGrey
     radius: width / 2
     antialiasing: true
 
     anchors.centerIn: parent
 
     transform: Translate {
-        x: parent.width * 0.45 * Math.sin(radAngle)
-        y: parent.height * 0.45 * Math.cos(radAngle)
+        x: parent.width * distance * Math.sin(radAngle)
+        y: parent.height * distance * Math.cos(radAngle)
     }
 
 }

=== modified file 'common/Constants.js'
--- common/Constants.js	2013-03-17 21:09:19 +0000
+++ common/Constants.js	2013-03-19 22:13:22 +0000
@@ -15,5 +15,6 @@
 var lightAubergine = "#77216F"
 var warmGrey = "#AEA79F"
 var coolGrey = "#333333"
+var normalGrey = "#D3D3D3"
 var pitchBlack = "#000000"
 var brightWhite = "#FFFFFF"

=== removed file 'stopwatch/AnalogStopwatchMarker.qml'
--- stopwatch/AnalogStopwatchMarker.qml	2013-03-17 21:09:19 +0000
+++ stopwatch/AnalogStopwatchMarker.qml	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import "../common/Constants.js" as Constants
-
-Rectangle {
-
-    property int number
-    property real radAngle: (number % 12 * 30) * Math.PI / 180
-
-    width: units.gu(0.5)
-    height: units.gu(0.5)
-    z: 1
-
-    color: Constants.pitchBlack
-    radius: width / 2
-    antialiasing: true
-
-    anchors.centerIn: parent
-
-    transform: Translate {
-        x: parent.width * 0.45 * Math.sin(radAngle)
-        y: parent.height * 0.45 * Math.cos(radAngle)
-    }
-}

=== modified file 'stopwatch/StopwatchPage.qml'
--- stopwatch/StopwatchPage.qml	2013-03-19 19:38:01 +0000
+++ stopwatch/StopwatchPage.qml	2013-03-19 22:13:22 +0000
@@ -56,8 +56,10 @@
         Repeater {
             model: ["1", "2", "4", "5", "7", "8", "10", "11"]
 
-            delegate: AnalogStopwatchMarker {
+            delegate: AnalogClockMarker {
                 number: modelData
+                size: 0.5
+                color: Constants.pitchBlack
             }
         }
     }