Merge lp:~jkeyes0/reminders-app/reminders-tab into lp:reminders-app

Proposed by Jordan Keyes
Status: Superseded
Proposed branch: lp:~jkeyes0/reminders-app/reminders-tab
Merge into: lp:reminders-app
Diff against target: 62 lines (+33/-1)
3 files modified
components/RemindersModel.qml (+17/-0)
manifest.json (+1/-1)
ui/Reminders.qml (+15/-0)
To merge this branch: bzr merge lp:~jkeyes0/reminders-app/reminders-tab
Reviewer Review Type Date Requested Status
Nekhelesh Ramananthan (community) Needs Fixing
Review via email: mp+196037@code.launchpad.net

This proposal has been superseded by a proposal from 2013-11-21.

Description of the change

Added a ListView with sample ListElements for the Reminders tab.

To post a comment you must log in.
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Hey Jordan, that looks much better. Some small things which need fixing,

8 - "maintainer": "Ubuntu Reminders app developers <email address hidden>",
9 + "maintainer": "",

Can you revert this alone. It would be best for the reminders app dev to be the maintainer in the manifest.json file.

44 === added file 'ui/RemindersModel.qml'

Would you mind moving this file to the components folder since the UI folder is primarily for pages, tabs and other UI elements.

Otherwise the code looks good.

review: Needs Fixing
6. By Jordan Keyes

Reverted change to manifest.json, moved RemindersModel to components directory

Revision history for this message
Jordan Keyes (jkeyes0) wrote :

Sure, no problem! I had the RemindersModel in the ui directory after seeing a comment dpm made about possibly removing the components directory, but I agree that it makes more sense to have the individual pieces in the components directory, leaving the ui directory for pages/tabs/etc.

7. By Jordan Keyes

Added reference to components for RemindersModel

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'components/RemindersModel.qml'
--- components/RemindersModel.qml 1970-01-01 00:00:00 +0000
+++ components/RemindersModel.qml 2013-11-21 13:47:09 +0000
@@ -0,0 +1,17 @@
1import QtQuick 2.0
2
3ListModel {
4 ListElement {
5 name: "Buy Milk"
6 date: "2013-11-18"
7 }
8 ListElement {
9 name: "Pick Up Kids"
10 date: "2013-11-19"
11 }
12 ListElement {
13 name: "Take Over World"
14 date: "2013-11-20"
15 }
16
17}
018
=== modified file 'manifest.json'
--- manifest.json 2013-11-20 21:56:49 +0000
+++ manifest.json 2013-11-21 13:47:09 +0000
@@ -11,4 +11,4 @@
11 "name": "com.ubuntu.reminders-app",11 "name": "com.ubuntu.reminders-app",
12 "title": "reminders-app",12 "title": "reminders-app",
13 "version": "0.1"13 "version": "0.1"
14}14}
15\ No newline at end of file15\ No newline at end of file
1616
=== modified file 'ui/Reminders.qml'
--- ui/Reminders.qml 2013-11-20 21:00:20 +0000
+++ ui/Reminders.qml 2013-11-21 13:47:09 +0000
@@ -1,5 +1,6 @@
1import QtQuick 2.01import QtQuick 2.0
2import Ubuntu.Components 0.12import Ubuntu.Components 0.1
3import Ubuntu.Components.ListItems 0.1
34
4Page {5Page {
5 id: remindersPage6 id: remindersPage
@@ -9,4 +10,18 @@
9 anchors.centerIn: parent10 anchors.centerIn: parent
10 text: i18n.tr("This page is still in development")11 text: i18n.tr("This page is still in development")
11 }12 }
13
14 ListView {
15
16 width: parent.width; height: parent.height
17
18 delegate: Subtitled {
19 text: '<b>Name:</b> ' + model.name
20 subText: '<b>Date:</b> ' + model.date
21 }
22
23 model: RemindersModel {}
24
25 }
26
12}27}

Subscribers

People subscribed via source and target branches