Ubuntu Clock App

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

  1. 5-finish-alarm-migration
  2. Merge into trunk
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 280
Merged at revision: 313
Proposed branch: lp:~ubuntu-clock-dev/ubuntu-clock-app/5-finish-alarm-migration
Merge into: lp:ubuntu-clock-app
Prerequisite: lp:~ubuntu-clock-dev/ubuntu-clock-app/4-migrate-alarm-listitems
Diff against target: 130 lines (+16/-11)
5 files modified
app/alarm/AlarmRepeat.qml (+4/-4)
app/alarm/AlarmSound.qml (+8/-3)
app/alarm/EditAlarmPage.qml (+0/-1)
debian/changelog (+1/-0)
po/com.ubuntu.clock.pot (+3/-3)
To merge this branch: bzr merge lp:~ubuntu-clock-dev/ubuntu-clock-app/5-finish-alarm-migration
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Bartosz Kosiorek Approve
Review via email: mp+263890@code.launchpad.net

Commit message

Finishes alarm lists migrations

Description of the change

Finishes alarm lists migrations

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Bartosz Kosiorek (gang65) wrote :

It's works perfectly

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1818
19import QtQuick 2.419import QtQuick 2.4
20import Ubuntu.Components 1.220import Ubuntu.Components 1.2
21import Ubuntu.Components.ListItems 1.0 as ListItem
2221
23Page {22Page {
24 id: _alarmRepeatPage23 id: _alarmRepeatPage
@@ -109,7 +108,7 @@
109108
110 model: daysModel109 model: daysModel
111110
112 ListItem.Standard {111 ListItem {
113 id: _alarmDayHolder112 id: _alarmDayHolder
114 objectName: "alarmDayHolder" + index113 objectName: "alarmDayHolder" + index
115114
@@ -129,13 +128,14 @@
129 text: day128 text: day
130 }129 }
131130
132 control: CheckBox {131 CheckBox {
133 id: daySwitch132 id: daySwitch
134 objectName: 'daySwitch' + index133 objectName: 'daySwitch' + index
135134
136 anchors {135 anchors {
137 right: parent.right136 right: parent.right
138 rightMargin: units.gu(-0.2)137 rightMargin: units.gu(2)
138 verticalCenter: parent.verticalCenter
139 }139 }
140140
141 checked: (alarm.daysOfWeek & flag) == flag141 checked: (alarm.daysOfWeek & flag) == flag
142142
=== 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 @@
19import QtQuick 2.419import QtQuick 2.4
20import QtMultimedia 5.020import QtMultimedia 5.0
21import Ubuntu.Components 1.221import Ubuntu.Components 1.2
22import Ubuntu.Components.ListItems 1.0 as ListItem
2322
24Page {23Page {
25 id: _alarmSoundPage24 id: _alarmSoundPage
@@ -67,7 +66,7 @@
6766
68 model: soundModel67 model: soundModel
6968
70 ListItem.Standard {69 ListItem {
71 id: _alarmSoundDelegate70 id: _alarmSoundDelegate
7271
73 property alias isChecked: _soundStatus.checked72 property alias isChecked: _soundStatus.checked
@@ -89,10 +88,16 @@
89 text: fileBaseName88 text: fileBaseName
90 }89 }
9190
92 control: CheckBox {91 CheckBox {
93 id: _soundStatus92 id: _soundStatus
94 objectName: "soundStatus" + index93 objectName: "soundStatus" + index
9594
95 anchors {
96 right: parent.right
97 rightMargin: units.gu(2)
98 verticalCenter: parent.verticalCenter
99 }
100
96 checked: alarmSound.subText === _soundName.text ? true101 checked: alarmSound.subText === _soundName.text ? true
97 : false102 : false
98 onCheckedChanged: {103 onCheckedChanged: {
99104
=== 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 @@
21import Ubuntu.Components 1.221import Ubuntu.Components 1.2
22import Qt.labs.folderlistmodel 2.122import Qt.labs.folderlistmodel 2.1
23import Ubuntu.Components.Pickers 1.023import Ubuntu.Components.Pickers 1.0
24import Ubuntu.Components.ListItems 1.0 as ListItem
25import "../components"24import "../components"
2625
27Page {26Page {
2827
=== 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 @@
3 [ Nekhelesh Ramananthan ]3 [ Nekhelesh Ramananthan ]
4 * Fixed bottom edge title showing incorrect status on app startup (LP: #1381432)4 * Fixed bottom edge title showing incorrect status on app startup (LP: #1381432)
5 * Migrate to Ubuntu 15.04 SDK Framework and QtQuick 2.4.5 * Migrate to Ubuntu 15.04 SDK Framework and QtQuick 2.4.
6 * Migrated add-city, settings, main alarm page to the new list items.
67
7 [ Nicholas Skaggs ]8 [ Nicholas Skaggs ]
8 * Update testing layout.9 * Update testing layout.
910
=== 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 @@
46msgid "Select None"46msgid "Select None"
47msgstr ""47msgstr ""
4848
49#: ../app/alarm/AlarmPage.qml:76 ../app/alarm/AlarmRepeat.qml:3849#: ../app/alarm/AlarmPage.qml:76 ../app/alarm/AlarmRepeat.qml:37
50msgid "Select All"50msgid "Select All"
51msgstr ""51msgstr ""
5252
@@ -58,7 +58,7 @@
58msgid "Tap the + icon to add an alarm"58msgid "Tap the + icon to add an alarm"
59msgstr ""59msgstr ""
6060
61#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:28161#: ../app/alarm/AlarmRepeat.qml:33 ../app/alarm/EditAlarmPage.qml:281
62msgid "Repeat"62msgid "Repeat"
63msgstr ""63msgstr ""
6464
@@ -100,7 +100,7 @@
100msgid "Change time and date"100msgid "Change time and date"
101msgstr ""101msgstr ""
102102
103#: ../app/alarm/AlarmSound.qml:28 ../app/alarm/EditAlarmPage.qml:304103#: ../app/alarm/AlarmSound.qml:27 ../app/alarm/EditAlarmPage.qml:304
104msgid "Sound"104msgid "Sound"
105msgstr ""105msgstr ""
106106

Subscribers

People subscribed via source and target branches

to all changes: