Merge lp:~nik90/ubuntu-clock-app/stopwatch-remove-easteregg into lp:ubuntu-clock-app/saucy

Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 66
Merged at revision: 67
Proposed branch: lp:~nik90/ubuntu-clock-app/stopwatch-remove-easteregg
Merge into: lp:ubuntu-clock-app/saucy
Diff against target: 61 lines (+0/-52)
1 file modified
stopwatch/AnalogStopwatch.qml (+0/-52)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/stopwatch-remove-easteregg
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Clock Developers Pending
Review via email: mp+163157@code.launchpad.net

Commit message

Removes the stopwatch easter egg from the stopwatch code base

Description of the change

This MP removes the stopwatch easteregg as requested by design.

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stopwatch/AnalogStopwatch.qml'
2--- stopwatch/AnalogStopwatch.qml 2013-05-08 20:10:39 +0000
3+++ stopwatch/AnalogStopwatch.qml 2013-05-09 15:02:23 +0000
4@@ -188,57 +188,5 @@
5 radius: width / 2
6 z: parent.z + 1
7 antialiasing: true
8-
9- states:[
10- State {
11- name: "NORMAL"
12-
13- PropertyChanges { target: point15; text: i18n.tr("15") }
14- PropertyChanges { target: point30; text: i18n.tr("30") }
15- PropertyChanges { target: point45; text: i18n.tr("45") }
16- PropertyChanges { target: point60; text: i18n.tr("60") }
17- PropertyChanges { target: minutsPoint60; visible: false; }
18- PropertyChanges { target: analogStopwatch; minuteHandValue: minutes; }
19- PropertyChanges { target: analogStopwatch; secondHandValue: seconds; }
20- PropertyChanges { target: analogStopwatch; perRadius: 6; }
21- PropertyChanges { target: stopwatchMarkers; model: ["1", "2", "4", "5", "7", "8", "10", "11"]; }
22- },
23-
24- State {
25- name: "EGG"
26-
27- PropertyChanges { target: point15; text: i18n.tr("25") }
28- PropertyChanges { target: point30; text: i18n.tr("50") }
29- PropertyChanges { target: point45; text: i18n.tr("75") }
30- PropertyChanges { target: point60; text: i18n.tr("100")}
31- PropertyChanges { target: minutsPoint60; visible: true; }
32- PropertyChanges { target: analogStopwatch; minuteHandValue: seconds; }
33- PropertyChanges { target: analogStopwatch; secondHandValue: decimals; }
34- PropertyChanges { target: analogStopwatch; perRadius: 36; }
35- PropertyChanges { target: stopwatchMarkers; model: []; }
36- }
37- ]
38- }
39-
40- Label {
41- id: minutsPoint60
42-
43- anchors {
44- horizontalCenter: circleMinutes.horizontalCenter
45- top: circleMinutes.top
46- topMargin: 6
47- }
48-
49- visible: false
50-
51- fontSize: "medium"
52- text: i18n.tr("60")
53- }
54-
55- MouseArea {
56- anchors.fill: parent
57- z: circleMinutes.z + 1
58-
59- onClicked: circleMinutes.state == "NORMAL" ? circleMinutes.state = "EGG" : circleMinutes.state = "NORMAL";
60 }
61 }

Subscribers

People subscribed via source and target branches