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
=== modified file 'stopwatch/AnalogStopwatch.qml'
--- stopwatch/AnalogStopwatch.qml 2013-05-08 20:10:39 +0000
+++ stopwatch/AnalogStopwatch.qml 2013-05-09 15:02:23 +0000
@@ -188,57 +188,5 @@
188 radius: width / 2188 radius: width / 2
189 z: parent.z + 1189 z: parent.z + 1
190 antialiasing: true190 antialiasing: true
191
192 states:[
193 State {
194 name: "NORMAL"
195
196 PropertyChanges { target: point15; text: i18n.tr("15") }
197 PropertyChanges { target: point30; text: i18n.tr("30") }
198 PropertyChanges { target: point45; text: i18n.tr("45") }
199 PropertyChanges { target: point60; text: i18n.tr("60") }
200 PropertyChanges { target: minutsPoint60; visible: false; }
201 PropertyChanges { target: analogStopwatch; minuteHandValue: minutes; }
202 PropertyChanges { target: analogStopwatch; secondHandValue: seconds; }
203 PropertyChanges { target: analogStopwatch; perRadius: 6; }
204 PropertyChanges { target: stopwatchMarkers; model: ["1", "2", "4", "5", "7", "8", "10", "11"]; }
205 },
206
207 State {
208 name: "EGG"
209
210 PropertyChanges { target: point15; text: i18n.tr("25") }
211 PropertyChanges { target: point30; text: i18n.tr("50") }
212 PropertyChanges { target: point45; text: i18n.tr("75") }
213 PropertyChanges { target: point60; text: i18n.tr("100")}
214 PropertyChanges { target: minutsPoint60; visible: true; }
215 PropertyChanges { target: analogStopwatch; minuteHandValue: seconds; }
216 PropertyChanges { target: analogStopwatch; secondHandValue: decimals; }
217 PropertyChanges { target: analogStopwatch; perRadius: 36; }
218 PropertyChanges { target: stopwatchMarkers; model: []; }
219 }
220 ]
221 }
222
223 Label {
224 id: minutsPoint60
225
226 anchors {
227 horizontalCenter: circleMinutes.horizontalCenter
228 top: circleMinutes.top
229 topMargin: 6
230 }
231
232 visible: false
233
234 fontSize: "medium"
235 text: i18n.tr("60")
236 }
237
238 MouseArea {
239 anchors.fill: parent
240 z: circleMinutes.z + 1
241
242 onClicked: circleMinutes.state == "NORMAL" ? circleMinutes.state = "EGG" : circleMinutes.state = "NORMAL";
243 }191 }
244}192}

Subscribers

People subscribed via source and target branches