Nekhelesh Ramananthan has proposed merging
lp:~nik90/ubuntu-clock-app/1-migrate-add-city-listitems into
lp:ubuntu-clock-app with lp:~nik90/ubuntu-clock-app/migrate-to-15.04-framework
as a prerequisite.
Commit message:
Migrate World City page listitems to the new 15.04 listitems.
Requested reviews:
Ubuntu Clock Developers (ubuntu-clock-dev)
For more details, see:
https://code.launchpad.net/~nik90/ubuntu-clock-app/1-migrate-add-city-listitems/+merge/260958
Migrate World City page listitems to the new 15.04 listitems.
--
Your team Ubuntu Clock Developers is requested to review the proposed merge of
lp:~nik90/ubuntu-clock-app/1-migrate-add-city-listitems into
lp:ubuntu-clock-app.
=== modified file 'app/worldclock/WorldCityList.qml'
--- app/worldclock/WorldCityList.qml 2015-06-03 14:35:20 +0000
+++ app/worldclock/WorldCityList.qml 2015-06-03 14:35:20 +0000
@@ -19,7 +19,7 @@
import QtQuick 2.4
import Timezone 1.0
import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.0 as ListItems
import "../components"
import "../upstreamcomponents"
@@ -304,12 +304,12 @@
section.criteria: ViewSection.FirstCharacter
section.labelPositioning: ViewSection.InlineLabels
- section.delegate: ListItem.Header {
+ section.delegate: ListItems.Header {
text: section
}
- delegate: ListItem.Empty {
- showDivider: false
+ delegate: ListItem {
+ divider.visible: false
objectName: "defaultWorldCityItem" + index
Column {
=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot 2015-06-03 14:35:20 +0000
+++ po/com.ubuntu.clock.pot 2015-06-03 14:35:20 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-27 16:05+0000\n"
+"POT-Creation-Date: 2015-05-28 02:36+0200\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"
--
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
