Merge lp:~ubuntu-clock-dev/ubuntu-clock-app/5-finish-alarm-migration into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Finishes alarm lists migrations

Finishes alarm lists migrations

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

FAILED: Continuous integration, rev:278
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/682/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/28/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:280
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/704/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/49

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

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

It's works perfectly

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-app-autolanding/268/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-autolanding/25/console

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'app/alarm/AlarmRepeat.qml'
--- app/alarm/AlarmRepeat.qml	2015-05-27 16:03:23 +0000
+++ app/alarm/AlarmRepeat.qml	2015-07-24 13:36:33 +0000
@@ -18,7 +18,6 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Page {
     id: _alarmRepeatPage
@@ -109,7 +108,7 @@
 
             model: daysModel
 
-            ListItem.Standard {
+            ListItem {
                 id: _alarmDayHolder
                 objectName: "alarmDayHolder" + index
 
@@ -129,13 +128,14 @@
                     text: day
                 }
 
-                control: CheckBox {
+                CheckBox {
                     id: daySwitch
                     objectName: 'daySwitch' + index
 
                     anchors {
                         right: parent.right
-                        rightMargin: units.gu(-0.2)
+                        rightMargin: units.gu(2)
+                        verticalCenter: parent.verticalCenter
                     }
 
                     checked: (alarm.daysOfWeek & flag) == flag

=== modified file 'app/alarm/AlarmSound.qml'
--- app/alarm/AlarmSound.qml	2015-05-27 16:03:23 +0000
+++ app/alarm/AlarmSound.qml	2015-07-24 13:36:33 +0000
@@ -19,7 +19,6 @@
 import QtQuick 2.4
 import QtMultimedia 5.0
 import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Page {
     id: _alarmSoundPage
@@ -67,7 +66,7 @@
 
                 model: soundModel
 
-                ListItem.Standard {
+                ListItem {
                     id: _alarmSoundDelegate
 
                     property alias isChecked: _soundStatus.checked
@@ -89,10 +88,16 @@
                         text: fileBaseName
                     }
 
-                    control: CheckBox {
+                    CheckBox {
                         id: _soundStatus
                         objectName: "soundStatus" + index
 
+                        anchors {
+                            right: parent.right
+                            rightMargin: units.gu(2)
+                            verticalCenter: parent.verticalCenter
+                        }
+
                         checked: alarmSound.subText === _soundName.text ? true
                                                                         : false
                         onCheckedChanged: {

=== modified file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml	2015-05-27 16:03:23 +0000
+++ app/alarm/EditAlarmPage.qml	2015-07-24 13:36:33 +0000
@@ -21,7 +21,6 @@
 import Ubuntu.Components 1.2
 import Qt.labs.folderlistmodel 2.1
 import Ubuntu.Components.Pickers 1.0
-import Ubuntu.Components.ListItems 1.0 as ListItem
 import "../components"
 
 Page {

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-21 11:40:58 +0000
+++ debian/changelog	2015-07-24 13:36:33 +0000
@@ -3,6 +3,7 @@
   [ Nekhelesh Ramananthan ]
   * Fixed bottom edge title showing incorrect status on app startup (LP: #1381432)
   * Migrate to Ubuntu 15.04 SDK Framework and QtQuick 2.4.
+  * Migrated add-city, settings, main alarm page to the new list items.
 
   [ Nicholas Skaggs ]
   * Update testing layout.

=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot	2015-07-24 13:36:33 +0000
+++ po/com.ubuntu.clock.pot	2015-07-24 13:36:33 +0000
@@ -46,7 +46,7 @@
 msgid "Select None"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:76 ../app/alarm/AlarmRepeat.qml:38
+#: ../app/alarm/AlarmPage.qml:76 ../app/alarm/AlarmRepeat.qml:37
 msgid "Select All"
 msgstr ""
 
@@ -58,7 +58,7 @@
 msgid "Tap the + icon to add an alarm"
 msgstr ""
 
-#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:281
+#: ../app/alarm/AlarmRepeat.qml:33 ../app/alarm/EditAlarmPage.qml:281
 msgid "Repeat"
 msgstr ""
 
@@ -100,7 +100,7 @@
 msgid "Change time and date"
 msgstr ""
 
-#: ../app/alarm/AlarmSound.qml:28 ../app/alarm/EditAlarmPage.qml:304
+#: ../app/alarm/AlarmSound.qml:27 ../app/alarm/EditAlarmPage.qml:304
 msgid "Sound"
 msgstr ""