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
1=== added file 'components/RemindersModel.qml'
2--- components/RemindersModel.qml 1970-01-01 00:00:00 +0000
3+++ components/RemindersModel.qml 2013-11-21 13:47:09 +0000
4@@ -0,0 +1,17 @@
5+import QtQuick 2.0
6+
7+ListModel {
8+ ListElement {
9+ name: "Buy Milk"
10+ date: "2013-11-18"
11+ }
12+ ListElement {
13+ name: "Pick Up Kids"
14+ date: "2013-11-19"
15+ }
16+ ListElement {
17+ name: "Take Over World"
18+ date: "2013-11-20"
19+ }
20+
21+}
22
23=== modified file 'manifest.json'
24--- manifest.json 2013-11-20 21:56:49 +0000
25+++ manifest.json 2013-11-21 13:47:09 +0000
26@@ -11,4 +11,4 @@
27 "name": "com.ubuntu.reminders-app",
28 "title": "reminders-app",
29 "version": "0.1"
30-}
31+}
32\ No newline at end of file
33
34=== modified file 'ui/Reminders.qml'
35--- ui/Reminders.qml 2013-11-20 21:00:20 +0000
36+++ ui/Reminders.qml 2013-11-21 13:47:09 +0000
37@@ -1,5 +1,6 @@
38 import QtQuick 2.0
39 import Ubuntu.Components 0.1
40+import Ubuntu.Components.ListItems 0.1
41
42 Page {
43 id: remindersPage
44@@ -9,4 +10,18 @@
45 anchors.centerIn: parent
46 text: i18n.tr("This page is still in development")
47 }
48+
49+ ListView {
50+
51+ width: parent.width; height: parent.height
52+
53+ delegate: Subtitled {
54+ text: '<b>Name:</b> ' + model.name
55+ subText: '<b>Date:</b> ' + model.date
56+ }
57+
58+ model: RemindersModel {}
59+
60+ }
61+
62 }

Subscribers

People subscribed via source and target branches