Merge lp:~nik90/ubuntu-clock-app/differentiate-clock-faces into lp:ubuntu-clock-app/saucy

[Nekhelesh Ramananthan]

Added visual hints to the different clocks to help differentiate between them. Removed unnecessary image assets and rectangular timer glow.

Added visual hints to the different clocks to help differentiate between them. Removed unnecessary image assets and rectangular timer glow.

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

FAILED: Continuous integration, rev:341
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~nik90/ubuntu-clock-app/differentiate-clock-faces/+merge/205507/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-clock-app-ci/219/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1206
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/219
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/219
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/137

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/219/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/differentiate-clock-faces]

342. By Nekhelesh Ramananthan on 2014-02-10

Added timer hint animation

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

PASSED: Continuous integration, rev:342
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/220/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1214
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/220
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/220
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/138

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/220/rebuild

review: Approve (continuous-integration)

[lp:~nik90/ubuntu-clock-app/differentiate-clock-faces]

343. By Nekhelesh Ramananthan on 2014-02-10

Removed unnecessary trash icon asset

344. By Nekhelesh Ramananthan on 2014-02-10

Increased speed of timer animation

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

FAILED: Continuous integration, rev:343
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/223/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1220
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/223
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/223
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/141

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/223/rebuild

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:344
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/224/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1221
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/224
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/224
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/142

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/224/rebuild

review: Approve (continuous-integration)

[lp:~nik90/ubuntu-clock-app/differentiate-clock-faces]

345. By Nekhelesh Ramananthan on 2014-02-11

removed timer animation as it was too distracting

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

PASSED: Continuous integration, rev:345
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/226/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1231
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/226
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/226
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/144

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/226/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

64 + Label {
65 + id: nextAlarmText
66 + text: i18n.tr("Next Alarm")
67 + fontSize: "small"
68 + parent: alarmFace.centerItem
69 + visible: modelCount === 0 ? false : true

Mhh, when an alarm is saved but is not active the label is visible, so you have "Next alarm: 00:00" that is a bit confusing imo

 when: (totalTime == -1 && timerOn == false)
360 + PropertyChanges { target: analogTimer; timerHintImage: Qt.resolvedUrl("../images/timer_green.png") }

The target becomes green a second after timer reaches 00:00, I think is better if it becomes green when timer reaches 00:00

review: Needs Fixing

[Nekhelesh Ramananthan (nik90)]

>
> when: (totalTime == -1 && timerOn == false)
> 360 + PropertyChanges { target: analogTimer; timerHintImage:
> Qt.resolvedUrl("../images/timer_green.png") }
>
> The target becomes green a second after timer reaches 00:00, I think is better
> if it becomes green when timer reaches 00:00
>

I agree however I am not sure how to implement that. Currently the "DONE" state is automatically triggered when totalTime is -1. If I change that to 0, then the "DONE" state will be triggered all the time when the timer is not running since the condition is true.

If you have a solution for this, let me know. But this bug has been present since the implementation of the timer itself.

[lp:~nik90/ubuntu-clock-app/differentiate-clock-faces]

346. By Nekhelesh Ramananthan on 2014-02-11

Fix alarm message when there are no active alarms

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

PASSED: Continuous integration, rev:346
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/230/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1242
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/230
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/230
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/148

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/230/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Tested both on PC and mako, works as expected!

=== modified file 'alarm/AddAlarmPage.qml'
--- alarm/AddAlarmPage.qml	2014-02-10 10:40:25 +0000
+++ alarm/AddAlarmPage.qml	2014-02-11 15:38:53 +0000
@@ -288,6 +288,15 @@
                     }
                 ]
 
+                Image {
+                    id: alarmHintImage
+                    smooth: true
+                    width: units.gu(40)
+                    anchors.centerIn: parent
+                    fillMode: Image.PreserveAspectFit
+                    source: Qt.resolvedUrl("../images/alarm_black.png")
+                }
+
                 centerContent: [
                     Column {
                         id: alarmLabelColumn

=== modified file 'alarm/AlarmFace.qml'
--- alarm/AlarmFace.qml	2014-02-01 15:30:26 +0000
+++ alarm/AlarmFace.qml	2014-02-11 15:38:53 +0000
@@ -28,10 +28,20 @@
     property string timeFormat: appSetting.contents.timeFormat
 
     showSecondHand: false
+    enableMouseArea: setupMessage.visible
 
     innerLabel.visible: !setupMessage.visible
     innerLabel.font.pixelSize: timeFormat === "12-hour" ? units.dp(31): units.dp(41)
 
+    Image {
+        id: alarmHintImage
+        smooth: true
+        width: units.gu(40)
+        fillMode: Image.PreserveAspectFit
+        source: Qt.resolvedUrl("../images/alarm_black.png")
+        anchors.centerIn: parent
+    }
+
     Label {
         id: setupMessage
         objectName: "labelAlarmSetup"

=== modified file 'alarm/AlarmPage.qml'
--- alarm/AlarmPage.qml	2014-02-03 13:25:27 +0000
+++ alarm/AlarmPage.qml	2014-02-11 15:38:53 +0000
@@ -27,6 +27,7 @@
     objectName: "alarmPage"
 
     property alias modelCount: listSavedAlarm.count
+    property int enabledAlarmCount: 0
     property var nextAlarm
     property real tempPosition
 
@@ -51,17 +52,19 @@
 
     function get_next_active_alarm()
     {
+        enabledAlarmCount = 0
         var tempAlarm;
 
         for(var i=0; i<alarmModel.count; i++) {
             tempAlarm = alarmModel.get(i)
             if (tempAlarm.enabled) {
+                enabledAlarmCount += 1
                 nextAlarm = alarmModel.get(i)
                 break;
             }
         }
 
-        if (nextAlarm != undefined) {
+        if (enabledAlarmCount !== 0) {
             for (var i=0; i<alarmModel.count; i++) {
                 tempAlarm = alarmModel.get(i)
                 if (tempAlarm.enabled)
@@ -113,24 +116,40 @@
         clip: true
         anchors.fill: parent
         contentWidth: parent.width
+        interactive: modelCount == 0 ? false : true
         contentHeight: alarmFace.height + alarmFace.anchors.topMargin + nameAlarm.height + nameAlarm.anchors.topMargin + listAlarm.height + listAlarm.anchors.topMargin + units.gu(2)
-        interactive: modelCount == 0 ? false : true
-
-        Label {
-            fontSize: "x-large"
-            text: i18n.tr("Next Alarm")
-            color: Theme.palette.normal.baseText
-            horizontalAlignment: Text.AlignHCenter
-            visible: modelCount === 0 ? false : true
-            anchors { bottom: alarmFace.top; bottomMargin: units.gu(3); horizontalCenter: parent.horizontalCenter }
-        }
 
         AlarmFace {
             id: alarmFace
 
+            states: [
+                State {
+                    name: "NOACTIVEALARMS"
+                    when: enabledAlarmCount === 0 && modelCount !== 0
+                    PropertyChanges { target: nextAlarmText; text: i18n.tr("No Active Alarms"); fontSize: "large"; anchors.verticalCenterOffset: 0 }
+                    PropertyChanges { target: alarmFace.innerLabel; visible: false }
+                }
+            ]
+
+            Label {
+                id: nextAlarmText
+                fontSize: "small"
+                visible: modelCount !== 0
+                text: i18n.tr("Next Alarm")
+                parent: alarmFace.centerItem
+                width: parent.width; height: width;
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+                wrapMode: Text.WordWrap
+                anchors {
+                    horizontalCenter: parent.horizontalCenter
+                    verticalCenter: parent.verticalCenter
+                    verticalCenterOffset: units.gu(-3.5)
+                }
+            }
+
             anchors { top: parent.top; topMargin: units.gu(10); horizontalCenter: parent.horizontalCenter }
-            showSetupMessage: modelCount == 0 ? true : false
-            enableMouseArea: showSetupMessage
+            showSetupMessage: modelCount === 0
             onTimeFormatChanged: get_next_active_alarm()
             onPressAndHold: pagestack.push(Qt.resolvedUrl("AddAlarmPage.qml"), {"isNewAlarm": true})
 

=== removed file 'common/AnalogGlowEffect.qml'
--- common/AnalogGlowEffect.qml	2014-02-01 15:43:50 +0000
+++ common/AnalogGlowEffect.qml	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Juha Ristolainen <[e-mail]>
- *              Nick Leppänen Larsson <[e-mail]>
- */
-
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
-
-RectangularGlow {
-    id: glowEffect
-
-    property QtObject fillRectangle: null
-
-    anchors.fill: fillRectangle
-    glowRadius: 10
-    spread: 0.8
-    color: "orange"
-    cornerRadius: fillRectangle.size
-    z: fillRectangle - 1
-}

=== removed file 'images/[e-mail]'
Binary files images/[e-mail]	2013-04-29 19:54:31 +0000 and images/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== added file 'images/alarm_black.png'
Binary files images/alarm_black.png	1970-01-01 00:00:00 +0000 and images/alarm_black.png	2014-02-11 15:38:53 +0000 differ
=== removed file 'images/[e-mail]'
--- images/[e-mail]	2013-09-06 17:57:43 +0000
+++ images/[e-mail]	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="40"
-   height="32"
-   sodipodi:docname="[e-mail]">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       id="linearGradient4265">
-      <stop
-         style="stop-color:#333333;stop-opacity:1;"
-         offset="0"
-         id="stop4267" />
-      <stop
-         id="stop4273"
-         offset="0.5"
-         style="stop-color:#333333;stop-opacity:0.24855492;" />
-      <stop
-         style="stop-color:#333333;stop-opacity:0;"
-         offset="1"
-         id="stop4269" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1855"
-     inkscape:window-height="1056"
-     id="namedview4"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="45.254834"
-     inkscape:cx="12.76993"
-     inkscape:cy="14.390292"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:snap-bbox="false">
-    <sodipodi:guide
-       orientation="0,1"
-       position="53.5,37.5"
-       id="guide3007" />
-  </sodipodi:namedview>
-  <rect
-     style="fill:#d05164;fill-opacity:1;stroke:none"
-     id="rect2982-5"
-     width="8.0715103"
-     height="31.993458"
-     x="1.6336422"
-     y="0.0012737503"
-     ry="0" />
-  <rect
-     style="fill:#d05164;fill-opacity:1;stroke:none"
-     id="rect2982"
-     width="36.046421"
-     height="31.998526"
-     x="1.6873904"
-     y="0.0084995022"
-     ry="8.0643663" />
-  <path
-     id="path2987-23-0-9-7-5"
-     style="fill:#ffffff;fill-opacity:1;stroke-width:1.5406878;stroke-miterlimit:4;stroke-dasharray:1.5406878, 6.1627512;stroke-dashoffset:0.7703439"
-     d="m 20.969828,18.441773 c 0,0.888623 -0.720412,1.608978 -1.609035,1.608978 -0.888622,0 -1.608979,-0.720355 -1.608979,-1.608978 0,-0.888624 0.720357,-1.609036 1.608979,-1.609036 0.888623,0 1.609035,0.720412 1.609035,1.609036 z m 2.380792,-3.519786 c 0,0.888623 -0.720356,1.609033 -1.608978,1.609033 -0.888624,0 -1.609036,-0.72041 -1.609036,-1.609033 0,-0.888623 0.720412,-1.60898 1.609036,-1.60898 0.888622,0 1.608978,0.720357 1.608978,1.60898 z m -4.715156,-9.78e-4 c 0,0.888623 -0.720355,1.608978 -1.608978,1.608978 -0.888624,0 -1.608979,-0.720355 -1.608979,-1.608978 0,-0.888623 0.720355,-1.609035 1.608979,-1.609035 0.888623,0 1.608978,0.720412 1.608978,1.609035 z m 7.24089,-3.684795 c 0,0.979475 -0.794056,1.773531 -1.773588,1.773531 -0.979531,0 -1.773586,-0.794056 -1.773586,-1.773531 0,-0.979531 0.794055,-1.7735855 1.773586,-1.7735855 0.979532,0 1.773588,0.7940545 1.773588,1.7735855 z m -4.708009,0.01713 c 0,0.979531 -0.794056,1.773586 -1.773532,1.773586 -0.979531,0 -1.773586,-0.794055 -1.773586,-1.773586 0,-0.979531 0.794055,-1.7735296 1.773586,-1.7735296 0.979476,0 1.773532,0.7939986 1.773532,1.7735296 z m -4.760671,-0.01713 c 0,0.979531 -0.794056,1.773586 -1.773587,1.773586 -0.979531,-1.5e-5 -1.773586,-0.794069 -1.773586,-1.7736 0,-0.979476 0.794055,-1.7735311 1.773586,-1.7735311 0.979531,0 1.773587,0.7940551 1.773587,1.7735311 z"
-     inkscape:connector-curvature="0" />
-  <rect
-     style="fill:#323232;fill-opacity:1;stroke:none"
-     id="rect4263"
-     width="1.6118982"
-     height="32.040779"
-     x="1.6351844"
-     y="0.0034180922"
-     ry="0" />
-</svg>

=== added file 'images/stopwatch_black.png'
Binary files images/stopwatch_black.png	1970-01-01 00:00:00 +0000 and images/stopwatch_black.png	2014-02-11 15:38:53 +0000 differ
=== added file 'images/timer_black.png'
Binary files images/timer_black.png	1970-01-01 00:00:00 +0000 and images/timer_black.png	2014-02-11 15:38:53 +0000 differ
=== added file 'images/timer_green.png'
Binary files images/timer_green.png	1970-01-01 00:00:00 +0000 and images/timer_green.png	2014-02-11 15:38:53 +0000 differ
=== removed file 'images/[e-mail]'
Binary files images/[e-mail]	2013-07-20 09:09:51 +0000 and images/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== modified file 'stopwatch/StopwatchFace.qml'
--- stopwatch/StopwatchFace.qml	2014-02-01 15:30:26 +0000
+++ stopwatch/StopwatchFace.qml	2014-02-11 15:38:53 +0000
@@ -40,6 +40,9 @@
     // Retrieves the status of the stopwatch timer
     property bool timerStatus: stopwatchUIUpdate.running
 
+    // Property to start the stopwatch hint animation
+    property alias stopwatchAnimationHint: _stopwatchAnimationHint
+
     innerLabel.font.pixelSize: hours > 0 ? units.dp(28) : units.dp(41)
 
     function reset() {
@@ -78,6 +81,23 @@
         id: blipFist
     }
 
+    // Image to display a bar over the stopwatch to differentiate it from other tabs
+    Image {
+        id: _stopwatchHintImage
+
+        smooth: true
+        width: units.gu(40)
+        anchors.centerIn: parent
+        fillMode: Image.PreserveAspectFit
+        source: Qt.resolvedUrl("../images/stopwatch_black.png")
+
+        SequentialAnimation on anchors.verticalCenterOffset {
+            id: _stopwatchAnimationHint
+            UbuntuNumberAnimation { from: units.gu(0); to: units.gu(2) }
+            UbuntuNumberAnimation { from: units.gu(2); to: units.gu(0) }
+        }
+    }
+
     Repeater {
         id:stopwatchMarkers
 

=== modified file 'stopwatch/StopwatchPage.qml'
--- stopwatch/StopwatchPage.qml	2014-02-01 15:30:26 +0000
+++ stopwatch/StopwatchPage.qml	2014-02-11 15:38:53 +0000
@@ -43,6 +43,7 @@
 
     // Function to start/stop a stopwatch
     function start_stop_stopwatch() {
+        analogStopwatch.stopwatchAnimationHint.start()
         if(analogStopwatch.timerStatus == false) {
             analogStopwatch.start()
             stopWatchLabelUpdate.start()
@@ -63,6 +64,7 @@
 
     // Function to reset stopwatch
     function reset_stopwatch() {
+        analogStopwatch.stopwatchAnimationHint.start()
         analogStopwatch.stop()
         analogStopwatch.reset();
         analogStopwatch.innerLabel.text = SScript.timeToString(0, 0, 0, 0);
@@ -104,6 +106,7 @@
         StopwatchFace {
             id: analogStopwatch
             objectName: "stopwatchFace"
+            visible: true
 
             anchors {
                 top: parent.top

=== modified file 'timer/TimerFace.qml'
--- timer/TimerFace.qml	2014-02-01 15:30:26 +0000
+++ timer/TimerFace.qml	2014-02-11 15:38:53 +0000
@@ -18,6 +18,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import QtGraphicalEffects 1.0
 import "../common"
 
 ClockBase {
@@ -33,8 +34,8 @@
     property bool timerOn: false;
     property bool inProgressFlag
 
-    // Property to expose the timer outer glow effect to outside objects
-    property alias glowEffect: _glowEffect
+    // Property to expose the timer visual hint
+    property alias timerHintImage: _timerHintImage.source
 
     showHourHand: false
     draggable: !inProgressFlag
@@ -81,11 +82,14 @@
         minutes = seconds = totalTime = 0;
     }
 
-    AnalogGlowEffect {
-        id: _glowEffect
-        z: parent.z - 1
-        visible: false;
-        fillRectangle: parent
+    // Image to display the side bars to differentiate it from other tabs
+    Image {
+        id: _timerHintImage
+        smooth: true
+        width: units.gu(40)
+        anchors.centerIn: parent
+        fillMode: Image.PreserveAspectFit
+        source: Qt.resolvedUrl("../images/timer_black.png")
     }
 
     Repeater {

=== modified file 'timer/TimerPage.qml'
--- timer/TimerPage.qml	2014-02-04 23:54:48 +0000
+++ timer/TimerPage.qml	2014-02-11 15:38:53 +0000
@@ -215,8 +215,7 @@
                 State {
                     name: "DONE"
                     when: (totalTime == -1 && timerOn == false)
-                    PropertyChanges { target: analogTimer.glowEffect; visible: true }
-                    PropertyChanges { target: analogTimer.glowEffect; color: "#03CB4A" }
+                    PropertyChanges { target: analogTimer; timerHintImage: Qt.resolvedUrl("../images/timer_green.png") }
                 }
             ]