Ubuntu Notes app

Merge lp:~rpadovani/reminders-app/newHeader into lp:reminders-app

  1. newHeader
  2. Merge into trunk
Proposed by Riccardo Padovani
Status: Superseded
Proposed branch: lp:~rpadovani/reminders-app/newHeader
Merge into: lp:reminders-app
Diff against target: 399 lines (+169/-161)
6 files modified
src/app/qml/reminders.qml (+2/-0)
src/app/qml/ui/NotePage.qml (+34/-29)
src/app/qml/ui/NotebooksPage.qml (+37/-33)
src/app/qml/ui/NotesPage.qml (+78/-66)
src/app/qml/ui/RemindersPage.qml (+17/-22)
src/app/qml/ui/SearchNotesPage.qml (+1/-11)
To merge this branch: bzr merge lp:~rpadovani/reminders-app/newHeader
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing
David Planella Approve
Michael Zanetti (community) Needs Information
Review via email: mp+220291@code.launchpad.net

This proposal has been superseded by a proposal from 2014-06-24.

Commit message

Implementation of the new header

Description of the change

First implementation of the new header.

All works well, but I had to add the title to the search page to have the back button.

Also, the shape in the new toolbar actions is ugly in our design. I'll look for remove it

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

PASSED: Continuous integration, rev:147
http://91.189.93.70:8080/job/reminders-app-ci/364/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2719
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2719/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/256
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/256/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/365
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/59

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/364/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

Works well! 2 comments:

* I think "Search notes" would be better for the search page title

* can we change the order of the actions so that "add note" is always visible instead of "search"? I think that's more important.

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

FAILED: Continuous integration, rev:148
http://91.189.93.70:8080/job/reminders-app-ci/380/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2882/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/381/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/75/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/380/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

> Works well! 2 comments:
>
> * I think "Search notes" would be better for the search page title

Agree!

> * can we change the order of the actions so that "add note" is always visible
> instead of "search"? I think that's more important.

Done, but it will change again in next weeks: t1mp is working to have search bar in the header.

But you're right, so I changed it

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

FAILED: Continuous integration, rev:149
http://91.189.93.70:8080/job/reminders-app-ci/381/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2883/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2883/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/382
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/76

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/381/rebuild

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

FAILED: Continuous integration, rev:149
http://91.189.93.70:8080/job/reminders-app-ci/384/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2926
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2926/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/385
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/79

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/384/rebuild

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

FAILED: Continuous integration, rev:149
http://91.189.93.70:8080/job/reminders-app-ci/385/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/494
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/494/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/80

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/385/rebuild

review: Needs Fixing (continuous-integration)
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/reminders-app-autolanding/152/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/502
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/502/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/44

review: Needs Fixing (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

Looks good to me, just a small thing:
- When viewing a note, the default action shown on the right of the header is "Delete". I think it would make more sense for it to be "Edit" (or perhaps even "Add reminder")

review: Needs Fixing
Revision history for this message
David Planella (dpm) wrote :

Looks good to me: it works as expected and addresses all previous comments.

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

FAILED: Continuous integration, rev:151
http://91.189.93.70:8080/job/reminders-app-ci/386/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/517
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/517/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/81

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/386/rebuild

review: Needs Fixing (continuous-integration)
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/reminders-app-autolanding/154/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/518
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/518/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/46

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

FAILED: Continuous integration, rev:152
http://91.189.93.70:8080/job/reminders-app-ci/387/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/519
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/519/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/82

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/387/rebuild

review: Needs Fixing (continuous-integration)
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/reminders-app-autolanding/155/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/530
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/530/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/47

review: Needs Fixing (continuous-integration)
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/reminders-app-autolanding/157/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/563
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/563/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/49

review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Seems trunk has some trouble with the 2 tests invovling using an account, reminders.tests.test_reminders.RemindersTestCaseWithAccount. I'll try and fix so this can land.

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/reminders-app-autolanding/159/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/607
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/607/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/51

review: Needs Fixing (continuous-integration)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/qml/reminders.qml'
2--- src/app/qml/reminders.qml 2014-05-16 08:53:45 +0000
3+++ src/app/qml/reminders.qml 2014-06-13 10:35:57 +0000
4@@ -39,6 +39,8 @@
5 // Note! applicationName needs to match the "name" field of the click manifest
6 applicationName: "com.ubuntu.reminders"
7
8+ useDeprecatedToolbar: false
9+
10 /*
11 This property enables the application to change orientation
12 when the device is rotated. The default is false.
13
14=== modified file 'src/app/qml/ui/NotePage.qml'
15--- src/app/qml/ui/NotePage.qml 2014-05-12 11:12:06 +0000
16+++ src/app/qml/ui/NotePage.qml 2014-06-13 10:35:57 +0000
17@@ -29,35 +29,40 @@
18 signal editNote(var note)
19
20 tools: ToolbarItems {
21- ToolbarButton {
22- text: i18n.tr("Delete")
23- iconName: "delete"
24- onTriggered: {
25- NotesStore.deleteNote(note.guid);
26- pagestack.pop();
27- }
28- }
29- ToolbarSpacer {}
30- ToolbarButton {
31- text: note.reminder ? i18n.tr("Edit reminder") : i18n.tr("Set reminder")
32- // TODO: use this instead when the toolkit switches from using the
33- // ubuntu-mobile-icons theme to suru:
34- //iconName: note.reminder ? "reminder" : "reminder-new"
35- iconSource: note.reminder ?
36- Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder.svg") :
37- Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder-new.svg")
38- onTriggered: {
39- pageStack.push(Qt.resolvedUrl("SetReminderPage.qml"), {title: root.title, note: root.note});
40- }
41- }
42- ToolbarButton {
43- text: i18n.tr("Edit")
44- iconName: "edit"
45- onTriggered: {
46- root.editNote(root.note)
47- }
48- }
49- }
50+ ToolbarButton {
51+ action: Action {
52+ text: i18n.tr("Edit")
53+ iconName: "edit"
54+ onTriggered: {
55+ root.editNote(root.note)
56+ }
57+ }
58+ }
59+ ToolbarButton {
60+ action: Action {
61+ text: note.reminder ? i18n.tr("Edit reminder") : i18n.tr("Set reminder")
62+ // TODO: use this instead when the toolkit switches from using the
63+ // ubuntu-mobile-icons theme to suru:
64+ //iconName: note.reminder ? "reminder" : "reminder-new"
65+ iconSource: note.reminder ?
66+ Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder.svg") :
67+ Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder-new.svg")
68+ onTriggered: {
69+ pageStack.push(Qt.resolvedUrl("SetReminderPage.qml"), {title: root.title, note: root.note});
70+ }
71+ }
72+ }
73+ ToolbarButton {
74+ action: Action {
75+ text: i18n.tr("Delete")
76+ iconName: "delete"
77+ onTriggered: {
78+ NotesStore.deleteNote(note.guid);
79+ pagestack.pop();
80+ }
81+ }
82+ }
83+ }
84
85 NoteView {
86 id: noteView
87
88=== modified file 'src/app/qml/ui/NotebooksPage.qml'
89--- src/app/qml/ui/NotebooksPage.qml 2014-05-14 17:50:23 +0000
90+++ src/app/qml/ui/NotebooksPage.qml 2014-06-13 10:35:57 +0000
91@@ -36,43 +36,47 @@
92
93 tools: ToolbarItems {
94 ToolbarButton {
95- text: i18n.tr("Search")
96- iconName: "search"
97- onTriggered: {
98- pagestack.push(Qt.resolvedUrl("SearchNotesPage.qml"))
99- }
100- }
101-
102- ToolbarButton {
103- text: i18n.tr("Refresh")
104- iconName: "reload"
105- onTriggered: {
106- NotesStore.refreshNotebooks();
107- }
108- }
109-
110- ToolbarSpacer { }
111-
112- ToolbarButton {
113- text: i18n.tr("Accounts")
114- iconName: "contacts-app-symbolic"
115- visible: accounts.count > 1
116- onTriggered: {
117- openAccountPage(true);
118- }
119- }
120-
121- ToolbarButton {
122- objectName: "addNotebookButton"
123- text: i18n.tr("Add notebook")
124- iconName: "add"
125- onTriggered: {
126- contentColumn.newNotebook = true;
127+ action: Action {
128+ text: i18n.tr("Add notebook")
129+ iconName: "add"
130+ onTriggered: {
131+ contentColumn.newNotebook = true;
132+ }
133+ }
134+ }
135+
136+ ToolbarButton {
137+ action: Action {
138+ text: i18n.tr("Search")
139+ iconName: "search"
140+ onTriggered: {
141+ pagestack.push(Qt.resolvedUrl("SearchNotesPage.qml"))
142+ }
143+ }
144+ }
145+
146+ ToolbarButton {
147+ action: Action {
148+ text: i18n.tr("Refresh")
149+ iconName: "reload"
150+ onTriggered: {
151+ NotesStore.refreshNotebooks();
152+ }
153+ }
154+ }
155+
156+ ToolbarButton {
157+ action: Action {
158+ text: i18n.tr("Accounts")
159+ iconName: "contacts-app-symbolic"
160+ visible: accounts.count > 1
161+ onTriggered: {
162+ openAccountPage(true);
163+ }
164 }
165 }
166 }
167
168-
169 Notebooks {
170 id: notebooks
171 }
172
173=== modified file 'src/app/qml/ui/NotesPage.qml'
174--- src/app/qml/ui/NotesPage.qml 2014-05-14 10:31:49 +0000
175+++ src/app/qml/ui/NotesPage.qml 2014-06-13 10:35:57 +0000
176@@ -41,72 +41,84 @@
177
178 tools: ToolbarItems {
179 ToolbarButton {
180- text: i18n.tr("Search")
181- iconName: "search"
182- onTriggered: {
183- root.openSearch();
184- }
185- }
186-
187- ToolbarButton {
188- text: i18n.tr("Refresh")
189- iconName: "reload"
190- onTriggered: {
191- NotesStore.refreshNotes();
192- }
193- }
194-
195- ToolbarButton {
196- text: i18n.tr("Accounts")
197- iconName: "contacts-app-symbolic"
198- visible: accounts.count > 1
199- onTriggered: {
200- openAccountPage(true);
201- }
202- }
203-
204- ToolbarSpacer { }
205-
206- ToolbarButton {
207- text: i18n.tr("Delete")
208- iconName: "delete"
209- visible: root.selectedNote !== null
210- onTriggered: {
211- NotesStore.deleteNote(root.selectedNote.guid);
212- }
213- }
214- ToolbarButton {
215- text: root.selectedNote.reminder ? i18n.tr("Edit reminder") : i18n.tr("Set reminder")
216- // TODO: use this instead when the toolkit switches from using the
217- // ubuntu-mobile-icons theme to suru:
218- //iconName: root.selectedNote.reminder ? "reminder" : "reminder-new"
219- iconSource: root.selectedNote.reminder ?
220- Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder.svg") :
221- Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder-new.svg")
222- visible: root.selectedNote !== null
223- onTriggered: {
224- root.selectedNote.reminder = !root.selectedNote.reminder
225- NotesStore.saveNote(root.selectedNote.guid)
226- }
227- }
228- ToolbarButton {
229- text: i18n.tr("Edit")
230- iconName: "edit"
231- visible: root.selectedNote !== null
232- onTriggered: {
233- print("should edit note")
234- root.editNote(root.selectedNote)
235- }
236- }
237-
238- ToolbarButton {
239- text: i18n.tr("Add note")
240- iconName: "add"
241- onTriggered: {
242- NotesStore.createNote("Untitled");
243- }
244- }
245- }
246+ action: Action {
247+ text: i18n.tr("Add note")
248+ iconName: "add"
249+ onTriggered: {
250+ NotesStore.createNote("Untitled");
251+ }
252+ }
253+ }
254+
255+ ToolbarButton {
256+ action: Action {
257+ text: i18n.tr("Search")
258+ iconName: "search"
259+ onTriggered: {
260+ root.openSearch();
261+ }
262+ }
263+ }
264+
265+ ToolbarButton {
266+ action: Action {
267+ text: i18n.tr("Refresh")
268+ iconName: "reload"
269+ onTriggered: {
270+ NotesStore.refreshNotes();
271+ }
272+ }
273+ }
274+
275+ ToolbarButton {
276+ action: Action {
277+ text: i18n.tr("Accounts")
278+ iconName: "contacts-app-symbolic"
279+ visible: accounts.count > 1
280+ onTriggered: {
281+ openAccountPage(true);
282+ }
283+ }
284+ }
285+
286+ ToolbarButton {
287+ action: Action {
288+ text: i18n.tr("Delete")
289+ iconName: "delete"
290+ visible: root.selectedNote !== null
291+ onTriggered: {
292+ NotesStore.deleteNote(root.selectedNote.guid);
293+ }
294+ }
295+ }
296+ ToolbarButton {
297+ action: Action {
298+ text: root.selectedNote.reminder ? i18n.tr("Edit reminder") : i18n.tr("Set reminder")
299+ // TODO: use this instead when the toolkit switches from using the
300+ // ubuntu-mobile-icons theme to suru:
301+ //iconName: root.selectedNote.reminder ? "reminder" : "reminder-new"
302+ iconSource: root.selectedNote.reminder ?
303+ Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder.svg") :
304+ Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder-new.svg")
305+ visible: root.selectedNote !== null
306+ onTriggered: {
307+ root.selectedNote.reminder = !root.selectedNote.reminder
308+ NotesStore.saveNote(root.selectedNote.guid)
309+ }
310+ }
311+ }
312+ ToolbarButton {
313+ action: Action {
314+ text: i18n.tr("Edit")
315+ iconName: "edit"
316+ visible: root.selectedNote !== null
317+ onTriggered: {
318+ print("should edit note")
319+ root.editNote(root.selectedNote)
320+ }
321+ }
322+ }
323+ }
324
325 Notes {
326 id: notes
327
328=== modified file 'src/app/qml/ui/RemindersPage.qml'
329--- src/app/qml/ui/RemindersPage.qml 2014-05-08 16:30:57 +0000
330+++ src/app/qml/ui/RemindersPage.qml 2014-06-13 10:35:57 +0000
331@@ -30,28 +30,23 @@
332
333 tools: ToolbarItems {
334 ToolbarButton {
335- text: i18n.tr("Search")
336- iconName: "search"
337- onTriggered: {
338- pagestack.push(Qt.resolvedUrl("SearchNotesPage.qml"))
339- }
340- }
341-
342- ToolbarSpacer { }
343-
344- ToolbarButton {
345- text: i18n.tr("Accounts")
346- iconName: "contacts-app-symbolic"
347- visible: accounts.count > 1
348- onTriggered: {
349- openAccountPage(true);
350- }
351- }
352-
353- ToolbarButton {
354- text: i18n.tr("Add reminder")
355- iconName: "add"
356- onTriggered: {
357+ action: Action {
358+ text: i18n.tr("Search")
359+ iconName: "search"
360+ onTriggered: {
361+ pagestack.push(Qt.resolvedUrl("SearchNotesPage.qml"))
362+ }
363+ }
364+ }
365+
366+ ToolbarButton {
367+ action: Action {
368+ text: i18n.tr("Accounts")
369+ iconName: "contacts-app-symbolic"
370+ visible: accounts.count > 1
371+ onTriggered: {
372+ openAccountPage(true);
373+ }
374 }
375 }
376 }
377
378=== modified file 'src/app/qml/ui/SearchNotesPage.qml'
379--- src/app/qml/ui/SearchNotesPage.qml 2014-05-20 09:07:44 +0000
380+++ src/app/qml/ui/SearchNotesPage.qml 2014-06-13 10:35:57 +0000
381@@ -27,17 +27,7 @@
382
383 signal noteSelected(var note)
384
385- tools: ToolbarItems {
386- back: ToolbarButton {
387- iconName: 'back'
388- text: i18n.tr("Back")
389-
390- onTriggered: {
391- pagestack.pop()
392- NotesStore.clearSearchResults();
393- }
394- }
395- }
396+ title: i18n.tr('Search notes')
397
398 Column {
399 anchors { fill: parent; topMargin: units.gu(2); bottomMargin: units.gu(2) }

Subscribers

People subscribed via source and target branches