Merge lp:~nik90/ubuntu-clock-app/alarm-sounds into lp:ubuntu-clock-app/saucy

[Nekhelesh Ramananthan]

Added support to change alarm sounds from the UI

Adds the ability to change the alarm sounds from the Add Alarm dialog

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

FAILED: Continuous integration, rev:410
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/366/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2798
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2798/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/335
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/335/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/284
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/13

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

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/alarm-sounds]

411. By Nekhelesh Ramananthan on 2014-05-22

merge trunk

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

FAILED: Continuous integration, rev:411
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/367/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2802
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2802/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/339
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/339/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/285
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/14

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

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

#blocked on indicator-datetime

[Nekhelesh Ramananthan (nik90)]

#blocked on pending work in indicator-datetime

[Nekhelesh Ramananthan (nik90)]

#unblocked

[Alan Pope 🍺🐧🐱 🦄 (popey)]

As this is unblocked does that mean it's ready to land?

[Nekhelesh Ramananthan (nik90)]

#blocked due to upstream bug in the SDK which does not show the chosen alarm sound when editing an alarm. https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1338697

review: Needs Fixing

[Nekhelesh Ramananthan (nik90)]

#unblocked I am rejecting this branch since it requires further rework before getting it to work with the old clock app. However all my attention is now directed at the clock reboot where this bug will be fixed.

review: Disapprove

Unmerged revisions

411. By Nekhelesh Ramananthan on 2014-05-22

merge trunk

410. By Nekhelesh Ramananthan on 2014-05-21

Added ability to choose alarm sounds

=== modified file 'alarm/AddAlarmPage.qml'
--- alarm/AddAlarmPage.qml	2014-05-22 15:45:45 +0000
+++ alarm/AddAlarmPage.qml	2014-05-22 20:29:40 +0000
@@ -19,8 +19,8 @@
 import QtQuick 2.0
 import Ubuntu.Layouts 0.1
 import Ubuntu.Components 0.1
+import Qt.labs.folderlistmodel 2.1
 import Ubuntu.Components.Popups 0.1
-import Ubuntu.Components.Themes.Ambiance 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import "../common/ClockUtils.js" as Utils
 import "../common"
@@ -166,6 +166,7 @@
         alarm.daysOfWeek = temp_alarm.daysOfWeek
         alarm.enabled = temp_alarm.enabled
         alarm.date = temp_alarm.date
+        alarm.sound = temp_alarm.sound
 
         // Determining if the alarm read is set to trigger in the morning or evening
         isPm = Qt.formatTime(alarm.date, "AP") === "PM"
@@ -185,6 +186,7 @@
         temp_alarm.type = alarm.type
         temp_alarm.daysOfWeek = alarm.daysOfWeek
         temp_alarm.date = alarmTime
+        temp_alarm.sound = alarm.sound
         temp_alarm.save()
 
         if(validateAlarm(temp_alarm))
@@ -652,6 +654,46 @@
                             return occurs;
                         }
                     }
+
+                    OptionSelector {
+                        id: soundSelector
+                        objectName: "soundSelector"
+                        text: i18n.tr("Ringtone")
+                        containerHeight: itemHeight * 7
+
+                        // Function to retrieve the alarm sound index after comparing the sound filenames
+                        function getSoundIndex(chosenSoundPath) {
+                            console.log(folderModel.count + "|" + chosenSoundPath)
+                            for(var i=0; i<folderModel.count; i++) {
+                                // Goes through every sound file in the folder and compares their file path with
+                                // the alarm sound path returned by the Alarm Model
+                                if(chosenSoundPath === folderModel.get(i, "filePath"))
+                                    return i
+                            }
+                            // If no matching alarm sound is found, return the first on the list to avoid invalid results
+                            return 0
+                        }
+
+                        onSelectedIndexChanged: alarm.sound = folderModel.get(selectedIndex, "filePath")
+
+                        FolderListModel {
+                            id: folderModel
+                            folder: "/usr/share/sounds/ubuntu/ringtones"
+                            onCountChanged: {
+                                if(count > 0 && !isNewAlarm) {
+                                    soundSelector.selectedIndex = soundSelector.getSoundIndex(alarm.sound)
+                                }
+                            }
+                        }
+
+                        Component {
+                            id: fileDelegate
+                            OptionSelectorDelegate { text: fileBaseName }
+                        }
+
+                        model: folderModel
+                        delegate: fileDelegate
+                    }
                 }
             }
         }