Merge lp:~nik90/ubuntu-clock-app/fix-volume-slider into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Increased the size of the alarm volume slider listitem in the settings page and simplified the alarm duration listmodel.

Increased the size of the alarm volume slider listitem in the settings page and simplified the alarm duration listmodel.

[Nekhelesh Ramananthan (nik90)]

Approved by design. Just requires a code sign off.

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

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

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:80
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/439/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/163
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/163/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/86

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-clock-app-autolanding/50/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/350/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-clock-app-utopic-amd64-autolanding/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/548/console

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/fix-volume-slider]

81. By Nekhelesh Ramananthan on 2014-09-04

Fixed debian changelog conflict

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'app/alarm/AlarmSettingsPage.qml'
--- app/alarm/AlarmSettingsPage.qml	2014-08-24 12:47:50 +0000
+++ app/alarm/AlarmSettingsPage.qml	2014-09-04 19:58:40 +0000
@@ -46,34 +46,13 @@
 
     ListModel {
         id: durationModel
-        ListElement {
-            duration: 10
-        }
-
-        ListElement {
-            duration: 20
-        }
-
-        ListElement {
-            duration: 30
-        }
-
-        ListElement {
-            duration: 60
-        }
-
-        function title(index) {
-            if (title["text"] === undefined) {
-		// TRANSLATORS: this refers to either 10, 20, 30 or 60 minutes
-                title.text =
-                        [
-                            i18n.tr("%1 minutes").arg(10),
-                            i18n.tr("%1 minutes").arg(20),
-                            i18n.tr("%1 minutes").arg(30),
-                            i18n.tr("%1 minutes").arg(60)
-                        ]
-            }
-            return title.text[index]
+        Component.onCompleted: initialise()
+
+        function initialise() {
+            durationModel.append({ "duration": 10, "text": i18n.tr("%1 minutes").arg(10) })
+            durationModel.append({ "duration": 20, "text": i18n.tr("%1 minutes").arg(20) })
+            durationModel.append({ "duration": 30, "text": i18n.tr("%1 minutes").arg(30) })
+            durationModel.append({ "duration": 60, "text": i18n.tr("%1 minutes").arg(60) })
         }
     }
 
@@ -83,29 +62,25 @@
         anchors.fill: parent
 
         ListItem.Base {
-            Column {
+            height: 2 * implicitHeight
+
+            Label {
+                color: UbuntuColors.midAubergine
+                text: i18n.tr("Alarm volume")
+                anchors.top: parent.top
+                anchors.topMargin: units.gu(1)
+            }
+
+            Slider {
+                anchors.centerIn: parent
                 width: parent.width
-                height: childrenRect.height
-                anchors.verticalCenter: parent.verticalCenter
-
-                Label {
-                    color: UbuntuColors.midAubergine
-                    text: i18n.tr("Alarm volume")
-                }
-
-                Slider {
-                    id: _volumeSlider
-
-                    height: units.gu(2)
-                    width: parent.width
-
-                    minimumValue: 1
-                    maximumValue: 100
-                    value: alarmSettings.volume
-
-                    onValueChanged: {
-                        alarmSettings.volume = formatValue(value)
-                    }
+
+                minimumValue: 1
+                maximumValue: 100
+                value: alarmSettings.volume
+
+                onValueChanged: {
+                    alarmSettings.volume = formatValue(value)
                 }
             }
         }
@@ -162,7 +137,7 @@
                     width: parent.width
                     height: units.gu(24)
                     delegate: ListItem.Standard {
-                        text: _resultsList.model.title(index)
+                        text: model.text
                         onClicked: {
                             alarmSettings.duration = duration
                             _alarmDuration.expanded = false
@@ -220,7 +195,7 @@
                             localTimeSource.localTimeString.split(":")[1],
                             localTimeSource.localTimeString.split(":")[2],
                             localTimeSource.localTimeString.split(":")[3]
-                        )
+                            )
                 return localTime.toLocaleString()
             }
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-09-04 16:24:24 +0000
+++ debian/changelog	2014-09-04 19:58:40 +0000
@@ -23,6 +23,7 @@
     next alarm when enabling an alarm.
   * Enabled one-time alarms in the UI (LP: #1358320)
   * Fixed the transition animation to alarms to be more smoother (LP: #1362081)
+  * Increase size of alarm volume listitem and simplified alarm duration list model.
   * Added pressed visual state to the settings button (LP: #1364553)
 
   [Zsombor Egri]