Merge lp:~nik90/ubuntu-clock-app/add-custom-sound-backend into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Add support for custom sounds

Add support for custom sounds

NOTE: Test with image #189 and higher

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

FAILED: Continuous integration, rev:36
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/14/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/905/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/14/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:37
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/15/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/907/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/15/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:38
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/16/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/909/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/16/console

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

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

#blocked due to https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1338697

review: Needs Fixing

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

FAILED: Continuous integration, rev:42
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/113/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1317/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/113/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:43
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/114/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1319/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/114/console

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

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

#unblocked

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

FAILED: Continuous integration, rev:44
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/130/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1414/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/130/console

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

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Requires https://code.launchpad.net/~zsombi/ubuntu-ui-toolkit/alarm-sound-fix/+merge/229800

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

PASSED: Continuous integration, rev:45
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/186/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/19
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/19/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/186

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:46
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/199/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/37
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/37/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/199

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:49
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/201/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/39
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/39/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/201

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:50
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/202/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/40
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/40/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/202

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

review: Approve (continuous-integration)

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

FAILED: Continuous integration, rev:51
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/203/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/41/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/203/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:52
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/204/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/42
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/42/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/204

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:53
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/205/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/43
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/43/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/205

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Code looks good to me, and the new feature works on rev 197

[Riccardo Padovani (rpadovani)]

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/20/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/60/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-autolanding/20/console

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/add-custom-sound-backend]

54. By Nekhelesh Ramananthan on 2014-08-18

merged trunk and fixed debian changelog conflict

[Nekhelesh Ramananthan (nik90)]

There was a conflict in the debian/changelog file while merging the latest trunk. I fixed that and reapproved.

[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-07-30 20:16:06 +0000
+++ app/alarm/AlarmSound.qml	2014-08-18 11:06:04 +0000
@@ -18,7 +18,6 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.1
-import Qt.labs.folderlistmodel 2.1
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Page {
@@ -31,11 +30,17 @@
     // Property to set the alarm sound in the edit alarm page
     property var alarmSound
 
-    FolderListModel {
-        id: _soundModel
-        showDirs: false
-        nameFilters: [ "*.ogg", "*.mp3" ]
-        folder: "/usr/share/sounds/ubuntu/ringtones"
+    // Property to store the alarm object
+    property var alarm
+
+    // Property to set the alarm sound model in the edit alarm page
+    property var soundModel
+
+    head.backAction: Action {
+        iconName: "back"
+        onTriggered: {
+            pop()
+        }
     }
 
     Flickable {
@@ -43,7 +48,7 @@
 
         clip: true
         anchors.fill: parent
-        contentHeight: _soundModel.count * units.gu(7)
+        contentHeight: soundModel.count * units.gu(7)
 
         Column {
             id: _alarmSoundColumn
@@ -54,9 +59,9 @@
                 id: _alarmSounds
                 objectName: "alarmSounds"
 
-                model: _soundModel
+                model: soundModel
 
-                ListItem.Base {
+                ListItem.Standard {
                     id: _alarmSoundDelegate
 
                     property alias isChecked: _soundStatus.checked
@@ -69,6 +74,7 @@
 
                         anchors {
                             left: parent.left
+                            leftMargin: units.gu(2)
                             verticalCenter: parent.verticalCenter
                         }
 
@@ -77,23 +83,19 @@
                         text: fileBaseName
                     }
 
-                    CheckBox {
+                    control: CheckBox {
                         id: _soundStatus
                         objectName: "soundStatus" + index
 
-                        anchors {
-                            right: parent.right
-                            verticalCenter: parent.verticalCenter
-                        }
-
-                        checked: alarmSound.subText === _soundName.text ? true :
-                                                                         false
+                        checked: alarmSound.subText === _soundName.text ? true
+                                                                        : false
                         onClicked: {
                             if (checked) {
                                 alarmSound.subText = _soundName.text
+                                alarm.sound = fileURL
 
                                 // Ensures only one alarm sound is selected
-                                for(var i=0; i<_soundModel.count; i++) {
+                                for(var i=0; i<soundModel.count; i++) {
                                     if(_alarmSounds.itemAt(i).isChecked &&
                                             i !== index) {
                                         _alarmSounds.itemAt(i).isChecked = false
@@ -106,15 +108,4 @@
             }
         }
     }
-
-    tools: ToolbarItems {
-        back: Button {
-            action: Action {
-                iconName: "back"
-                onTriggered: {
-                    mainStack.pop()
-                }
-            }
-        }
-    }
 }

=== modified file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml	2014-08-11 22:04:27 +0000
+++ app/alarm/EditAlarmPage.qml	2014-08-18 11:06:04 +0000
@@ -19,6 +19,7 @@
 import QtQuick 2.0
 import DateTime 1.0
 import Ubuntu.Components 1.1
+import Qt.labs.folderlistmodel 2.1
 import Ubuntu.Components.Pickers 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import "../components"
@@ -73,7 +74,10 @@
         var alarmTime = new Date()
         alarmTime.setHours(_timePicker.hours, _timePicker.minutes, 0)
 
-        _alarm.message = _alarmLabel.subText
+        /*
+          _alarm.sound, _alarm.message and _alarm.daysOfWeek have been set in
+          the respective individual pages already.
+        */
         _alarm.date = alarmTime
         _alarm.type = Alarm.Repeating
         _alarm.enabled = true
@@ -89,6 +93,7 @@
         _alarm.daysOfWeek = tempAlarm.daysOfWeek
         _alarm.enabled = tempAlarm.enabled
         _alarm.date = tempAlarm.date
+        _alarm.sound = tempAlarm.sound
     }
 
     // Function to delete a saved alarm
@@ -112,11 +117,7 @@
         tempAlarm.date = alarmTime
         tempAlarm.type = Alarm.Repeating
         tempAlarm.enabled = _alarm.enabled
-
-        /*
-          #FIXME: Sometimes the clock app crashes due to this code. Cause not
-          known yet! This has been reported at http://pad.lv/1337405.
-        */
+        tempAlarm.sound = _alarm.sound
         tempAlarm.daysOfWeek = _alarm.daysOfWeek
 
         tempAlarm.save()
@@ -137,6 +138,22 @@
         }
     }
 
+    function getSoundName(chosenSoundPath) {
+        for(var i=0; i<soundModel.count; i++) {
+            if(chosenSoundPath === Qt.resolvedUrl(soundModel.get(i, "filePath"))) {
+                return soundModel.get(i, "fileBaseName")
+            }
+        }
+    }
+
+    function getSoundPath(chosenSoundName) {
+        for(var i=0; i<soundModel.count; i++) {
+            if(chosenSoundName === soundModel.get(i, "fileBaseName")) {
+                return soundModel.get(i, "filePath")
+            }
+        }
+    }
+
     Alarm {
         id: _alarm
         onStatusChanged: {
@@ -155,6 +172,37 @@
         }
     }
 
+    FolderListModel {
+        id: soundModel
+
+        showDirs: false
+        nameFilters: [ "*.ogg", "*.mp3" ]
+        folder: "/usr/share/sounds/ubuntu/ringtones"
+
+        onCountChanged: {
+            if(count > 0) {
+                /*
+                  When folder model is completely loaded, proceed to perform
+                  the following operations,
+
+                  if new alarm, then set the sound name as "Suru arpeggio" and
+                  retrieve the sound path from the folder model to assign to
+                  the alarm model sound property.
+
+                  If it is a saved alarm, get the sound path from the alarm
+                  object and retrieve the sound name from the folder model.
+                */
+                if(isNewAlarm) {
+                    _alarm.sound = getSoundPath(_alarmSound._soundName)
+                    _alarmSound.subText = _alarmSound._soundName
+                }
+                else {
+                    _alarmSound.subText = getSoundName(_alarm.sound.toString())
+                }
+            }
+        }
+    }
+
     AlarmUtils {
         id: alarmUtils
     }
@@ -226,14 +274,16 @@
         SubtitledListItem {
             id: _alarmSound
             objectName: "alarmSound"
-            /*
-              #TODO: Add support for choosing new alarm sound when indicator-
-              datetime supports custom alarm sounds
-            */
-            text: i18n.tr("Sound (disabled)")
-            subText: "Suru arpeggio"
-            onClicked: mainStack.push(Qt.resolvedUrl("AlarmSound.qml"),
-                                      {"alarmSound": _alarmSound})
+
+            // Default Alarm Sound for new alarms
+            property string _soundName: "Suru arpeggio"
+
+            text: i18n.tr("Sound")
+            onClicked: mainStack.push(Qt.resolvedUrl("AlarmSound.qml"), {
+                                          "alarmSound": _alarmSound,
+                                          "alarm": _alarm,
+                                          "soundModel": soundModel
+                                      })
         }
     }
 

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-16 08:40:21 +0000
+++ debian/changelog	2014-08-18 11:06:04 +0000
@@ -5,6 +5,7 @@
     strings. (LP: #1355414)
   * Synced the fast scroll component with upstream changes
   * Updated inner clock texture as requested by design
+  * Added support for custom alarm sounds as per the design spec.
 
   [David Planella]
   * Added internationalization support (LP: #1354522)

=== modified file 'tests/autopilot/ubuntu_clock_app/emulators.py'
--- tests/autopilot/ubuntu_clock_app/emulators.py	2014-08-12 20:41:45 +0000
+++ tests/autopilot/ubuntu_clock_app/emulators.py	2014-08-18 11:06:04 +0000
@@ -228,8 +228,12 @@
         :param test_sound_name = new sound name
 
         """
-        self.wait_select_single("SubtitledListItem", objectName="alarmSound")\
-            .subText == test_sound_name
+        try:
+            self.wait_select_single(
+                "SubtitledListItem", objectName="alarmSound").subText.wait_for(
+                    test_sound_name)
+        except AssertionError:
+            raise ClockEmulatorException('Error! Incorrect alarm sound')
 
 
 class AlarmRepeat(Page):