Nekhelesh Ramananthan has proposed merging
lp:~nik90/ubuntu-clock-app/3.5-finish-alarm-migration into lp:ubuntu-clock-app
with lp:~nik90/ubuntu-clock-app/3-migrate-alarm-listitems as a prerequisite.
Commit message:
Finishes alarm lists migrations
Requested reviews:
Ubuntu Clock Developers (ubuntu-clock-dev)
For more details, see:
https://code.launchpad.net/~nik90/ubuntu-clock-app/3.5-finish-alarm-migration/+merge/261050
--
Your team Ubuntu Clock Developers is requested to review the proposed merge of
lp:~nik90/ubuntu-clock-app/3.5-finish-alarm-migration into lp:ubuntu-clock-app.
=== modified file 'app/alarm/AlarmRepeat.qml'
--- app/alarm/AlarmRepeat.qml 2015-06-03 22:54:43 +0000
+++ app/alarm/AlarmRepeat.qml 2015-06-03 22:54:43 +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-06-03 22:54:43 +0000
+++ app/alarm/AlarmSound.qml 2015-06-03 22:54:43 +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-06-03 22:54:43 +0000
+++ app/alarm/EditAlarmPage.qml 2015-06-03 22:54:43 +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 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot 2015-06-03 22:54:43 +0000
+++ po/com.ubuntu.clock.pot 2015-06-03 22:54:43 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-03 22:33+0000\n"
+"POT-Creation-Date: 2015-06-03 22:45+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
@@ -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 ""
@@ -98,7 +98,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 ""
--
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help : https://help.launchpad.net/ListHelp
