Merge lp:~nik90/ubuntu-clock-app/fix-alarm-sound-toggle-bug into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Fixed clicking on an alarm sound that is already selected causing an incorrect toggle state

Fixed clicking on an alarm sound that is already selected causing an incorrect toggle state

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

PASSED: Continuous integration, rev:66
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/249/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/100
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/100/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/249

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/249/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

I have 1 inline comment/question, but this looks good otherwise!

review: Needs Information

[Nekhelesh Ramananthan (nik90)]

> I have 1 inline comment/question, but this looks good otherwise!

Thnx. Removed that line of code. I had it to help distinguish the alarm sound that was selected from others. But I will do after confirming with designer rather than just change it in this MP.

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

PASSED: Continuous integration, rev:67
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/250/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/101
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/101/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/250

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/250/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

LGTM!

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-autolanding/32/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/102
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/102/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-autolanding/32

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'app/alarm/AlarmSound.qml'
--- app/alarm/AlarmSound.qml	2014-08-24 12:47:50 +0000
+++ app/alarm/AlarmSound.qml	2014-08-25 09:59:28 +0000
@@ -95,10 +95,10 @@
                         checked: alarmSound.subText === _soundName.text ? true
                                                                         : false
                         onClicked: {
+                            previewAlarmSound.source = fileURL
+                            previewAlarmSound.play()
+
                             if (checked) {
-                                previewAlarmSound.source = fileURL
-                                previewAlarmSound.play()
-
                                 alarmSound.subText = _soundName.text
                                 alarm.sound = fileURL
 
@@ -110,6 +110,10 @@
                                     }
                                 }
                             }
+
+                            else {
+                                checked = !checked
+                            }
                         }
                     }
                 }

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-24 12:48:27 +0000
+++ debian/changelog	2014-08-25 09:59:28 +0000
@@ -14,6 +14,8 @@
     sound page. (LP: #1355410)
   * Changed project name and neccessary support variables from com.ubuntu.devel
     to com.ubuntu.clock in the CMakeList.txt, manifest.json and autopilot files.
+  * Fixed tapping an alarm sound that is already selected toggles it
+    incorrectly (LP: #1360677)
   * Updated QtQuick library imports to v2.3
 
   [Zsombor Egri]