Merge lp:~nik90/ubuntu-clock-app/disable-clock-hand into lp:ubuntu-clock-app/saucy

Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 400
Merged at revision: 413
Proposed branch: lp:~nik90/ubuntu-clock-app/disable-clock-hand
Merge into: lp:ubuntu-clock-app/saucy
Diff against target: 27 lines (+3/-0)
1 file modified
common/ClockBase.qml (+3/-0)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/disable-clock-hand
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+217907@code.launchpad.net

Commit message

Disabled clock hands when they are hidden

Description of the change

Disables clock hand when it is hidden. This should prevent accidental changes of minutes, when the minute hand is hidden.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

Looks good to me!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'common/ClockBase.qml'
2--- common/ClockBase.qml 2014-02-08 21:12:04 +0000
3+++ common/ClockBase.qml 2014-05-01 11:16:28 +0000
4@@ -61,6 +61,7 @@
5 z: hand.visible ? _minuteHand.z + 1 : -1
6 hand.draggable: draggable
7 hand.visible: showHourHand
8+ enabled: hand.visible
9 }
10
11 DialerHand {
12@@ -68,6 +69,7 @@
13 objectName: "minuteHand"
14 hand.draggable: draggable
15 hand.visible: showMinuteHand
16+ enabled: hand.visible
17 }
18
19 DialerHand {
20@@ -75,6 +77,7 @@
21 objectName: "secondHand"
22 hand.draggable: draggable
23 hand.visible: showSecondHand
24+ enabled: hand.visible
25 }
26
27 centerContent: [

Subscribers

People subscribed via source and target branches