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

Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 24
Merged at revision: 23
Proposed branch: lp:~nik90/ubuntu-clock-app/diff-clock-markers
Merge into: lp:ubuntu-clock-app/saucy
Diff against target: 34 lines (+14/-3)
1 file modified
common/AnalogClockFace.qml (+14/-3)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/diff-clock-markers
Reviewer Review Type Date Requested Status
Nekhelesh Ramananthan Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Juha Ristolainen Pending
Nick Leppänen Larsson Pending
Review via email: mp+157145@code.launchpad.net

Commit message

Description of the change

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

To post a comment you must log in.
23. By Nekhelesh Ramananthan

Merge from master

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
24. By Nekhelesh Ramananthan

Merge from master

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'common/AnalogClockFace.qml'
2--- common/AnalogClockFace.qml 2013-04-05 21:27:48 +0000
3+++ common/AnalogClockFace.qml 2013-04-09 10:19:26 +0000
4@@ -20,6 +20,7 @@
5
6 import QtQuick 2.0
7 import Ubuntu.Components 0.1
8+import "../common/Constants.js" as Constants
9
10 AnalogFaceBase {
11 id: clockRoot
12@@ -75,9 +76,19 @@
13 }
14
15 Repeater {
16- model: 12
17- delegate: AnalogClockMarker {
18- number: index
19+ model: ["1", "2", "4", "5", "7", "8", "10", "11"]
20+ delegate: AnalogClockMarker {
21+ number: modelData
22+ size:0.7
23+ }
24+ }
25+
26+ Repeater {
27+ model: ["3", "6", "9", "12"]
28+ delegate: AnalogClockMarker {
29+ number: modelData
30+ size: 1
31+ color: Constants.pitchBlack
32 }
33 }
34 }

Subscribers

People subscribed via source and target branches