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-24 00:09:21 +0000
4
@@ -39,6 +39,8 @@
5
39
    // Note! applicationName needs to match the "name" field of the click manifest
39
    // Note! applicationName needs to match the "name" field of the click manifest
6
40
    applicationName: "com.ubuntu.reminders"
40
    applicationName: "com.ubuntu.reminders"
7
41
41
8
42
    useDeprecatedToolbar: false
9
43
10
42
    /*
44
    /*
11
43
     This property enables the application to change orientation
45
     This property enables the application to change orientation
12
44
     when the device is rotated. The default is false.
46
     when the device is rotated. The default is false.
13
45
47
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-24 00:09:21 +0000
17
@@ -29,35 +29,40 @@
18
29
    signal editNote(var note)
29
    signal editNote(var note)
19
30
30
20
31
    tools: ToolbarItems {
31
    tools: ToolbarItems {
50
32
        ToolbarButton {
32
       ToolbarButton {
51
33
            text: i18n.tr("Delete")
33
            action: Action {
52
34
            iconName: "delete"
34
                text: i18n.tr("Edit")
53
35
            onTriggered: {
35
                iconName: "edit"
54
36
                NotesStore.deleteNote(note.guid);
36
                onTriggered: {
55
37
                pagestack.pop();
37
                    root.editNote(root.note)
56
38
            }
38
                }
57
39
        }
39
            }
58
40
        ToolbarSpacer {}
40
        }
59
41
        ToolbarButton {
41
        ToolbarButton {
60
42
            text: note.reminder ? i18n.tr("Edit reminder") : i18n.tr("Set reminder")
42
            action: Action {
61
43
            // TODO: use this instead when the toolkit switches from using the
43
                text: note.reminder ? i18n.tr("Edit reminder") : i18n.tr("Set reminder")
62
44
            // ubuntu-mobile-icons theme to suru:
44
                // TODO: use this instead when the toolkit switches from using the
63
45
            //iconName: note.reminder ? "reminder" : "reminder-new"
45
                // ubuntu-mobile-icons theme to suru:
64
46
            iconSource: note.reminder ?
46
                //iconName: note.reminder ? "reminder" : "reminder-new"
65
47
                Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder.svg") :
47
                iconSource: note.reminder ?
66
48
                Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder-new.svg")
48
                    Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder.svg") :
67
49
            onTriggered: {
49
                    Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder-new.svg")
68
50
                pageStack.push(Qt.resolvedUrl("SetReminderPage.qml"), {title: root.title, note: root.note});
50
                onTriggered: {
69
51
            }
51
                    pageStack.push(Qt.resolvedUrl("SetReminderPage.qml"), {title: root.title, note: root.note});
70
52
        }
52
                }
71
53
        ToolbarButton {
53
            }
72
54
            text: i18n.tr("Edit")
54
        }
73
55
            iconName: "edit"
55
        ToolbarButton {
74
56
            onTriggered: {
56
            action: Action {
75
57
                root.editNote(root.note)
57
                text: i18n.tr("Delete")
76
58
            }
58
                iconName: "delete"
77
59
        }
59
                onTriggered: {
78
60
    }
60
                    NotesStore.deleteNote(note.guid);
79
61
                    pagestack.pop();
80
62
                }
81
63
            }
82
64
        }
83
65
   }
84
61
66
85
62
    NoteView {
67
    NoteView {
86
63
        id: noteView
68
        id: noteView
87
64
69
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-24 00:09:21 +0000
91
@@ -36,43 +36,48 @@
92
36
36
93
37
    tools: ToolbarItems {
37
    tools: ToolbarItems {
94
38
        ToolbarButton {
38
        ToolbarButton {
127
39
            text: i18n.tr("Search")
39
            action: Action {
128
40
            iconName: "search"
40
                objectName: "addNotebookButton"
129
41
            onTriggered: {
41
                text: i18n.tr("Add notebook")
130
42
                pagestack.push(Qt.resolvedUrl("SearchNotesPage.qml"))
42
                iconName: "add"
131
43
            }
43
                onTriggered: {
132
44
        }
44
                    contentColumn.newNotebook = true;
133
45
45
                }
134
46
        ToolbarButton {
46
            }
135
47
            text: i18n.tr("Refresh")
47
        }
136
48
            iconName: "reload"
48
137
49
            onTriggered: {
49
        ToolbarButton {
138
50
                NotesStore.refreshNotebooks();
50
            action: Action {
139
51
            }
51
                text: i18n.tr("Search")
140
52
        }
52
                iconName: "search"
141
53
53
                onTriggered: {
142
54
        ToolbarSpacer { }
54
                    pagestack.push(Qt.resolvedUrl("SearchNotesPage.qml"))
143
55
55
                }
144
56
        ToolbarButton {
56
            }
145
57
            text: i18n.tr("Accounts")
57
        }
146
58
            iconName: "contacts-app-symbolic"
58
147
59
            visible: accounts.count > 1
59
        ToolbarButton {
148
60
            onTriggered: {
60
            action: Action {
149
61
                openAccountPage(true);
61
                text: i18n.tr("Refresh")
150
62
            }
62
                iconName: "reload"
151
63
        }
63
                onTriggered: {
152
64
64
                    NotesStore.refreshNotebooks();
153
65
        ToolbarButton {
65
                }
154
66
            objectName: "addNotebookButton"
66
            }
155
67
            text: i18n.tr("Add notebook")
67
        }
156
68
            iconName: "add"
68
157
69
            onTriggered: {
69
        ToolbarButton {
158
70
                contentColumn.newNotebook = true;
70
            action: Action {
159
71
                text: i18n.tr("Accounts")
160
72
                iconName: "contacts-app-symbolic"
161
73
                visible: accounts.count > 1
162
74
                onTriggered: {
163
75
                    openAccountPage(true);
164
76
                }
165
71
            }
77
            }
166
72
        }
78
        }
167
73
    }
79
    }
168
74
80
169
75
170
76
    Notebooks {
81
    Notebooks {
171
77
        id: notebooks
82
        id: notebooks
172
78
    }
83
    }
173
@@ -148,7 +153,7 @@
174
148
                visible: !notebooks.loading && notebooks.error
153
                visible: !notebooks.loading && notebooks.error
175
149
                text: notebooks.error
154
                text: notebooks.error
176
150
            }
155
            }
178
151
            
156
179
152
        }
157
        }
180
153
158
181
154
        Item {
159
        Item {
182
155
160
183
=== modified file 'src/app/qml/ui/NotesPage.qml'
184
--- src/app/qml/ui/NotesPage.qml	2014-05-14 10:31:49 +0000
185
+++ src/app/qml/ui/NotesPage.qml	2014-06-24 00:09:21 +0000
186
@@ -41,72 +41,84 @@
187
41
41
188
42
    tools: ToolbarItems {
42
    tools: ToolbarItems {
189
43
        ToolbarButton {
43
        ToolbarButton {
256
44
            text: i18n.tr("Search")
44
            action: Action {
257
45
            iconName: "search"
45
                text: i18n.tr("Add note")
258
46
            onTriggered: {
46
                iconName: "add"
259
47
                root.openSearch();
47
                onTriggered: {
260
48
            }
48
                    NotesStore.createNote("Untitled");
261
49
        }
49
                }   
262
50
50
            }
263
51
        ToolbarButton {
51
        }
264
52
            text: i18n.tr("Refresh")
52
265
53
            iconName: "reload"
53
        ToolbarButton {
266
54
            onTriggered: {
54
            action: Action {
267
55
                NotesStore.refreshNotes();
55
                text: i18n.tr("Search")
268
56
            }
56
                iconName: "search"
269
57
        }
57
                onTriggered: {
270
58
58
                    root.openSearch();
271
59
        ToolbarButton {
59
                }
272
60
            text: i18n.tr("Accounts")
60
            }
273
61
            iconName: "contacts-app-symbolic"
61
        }
274
62
            visible: accounts.count > 1
62
275
63
            onTriggered: {
63
        ToolbarButton {
276
64
                openAccountPage(true);
64
            action: Action {
277
65
            }
65
                text: i18n.tr("Refresh")
278
66
        }
66
                iconName: "reload"
279
67
67
                onTriggered: {
280
68
        ToolbarSpacer { }
68
                    NotesStore.refreshNotes();
281
69
69
                }
282
70
        ToolbarButton {
70
            }
283
71
            text: i18n.tr("Delete")
71
        }
284
72
            iconName: "delete"
72
285
73
            visible: root.selectedNote !== null
73
        ToolbarButton {
286
74
            onTriggered: {
74
            action: Action {
287
75
                NotesStore.deleteNote(root.selectedNote.guid);
75
                text: i18n.tr("Accounts")
288
76
            }
76
                iconName: "contacts-app-symbolic"
289
77
        }
77
                visible: accounts.count > 1
290
78
        ToolbarButton {
78
                onTriggered: {
291
79
            text: root.selectedNote.reminder ? i18n.tr("Edit reminder") : i18n.tr("Set reminder")
79
                    openAccountPage(true);
292
80
            // TODO: use this instead when the toolkit switches from using the
80
                }
293
81
            // ubuntu-mobile-icons theme to suru:
81
            }
294
82
            //iconName: root.selectedNote.reminder ? "reminder" : "reminder-new"
82
        }
295
83
            iconSource: root.selectedNote.reminder ?
83
296
84
                Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder.svg") :
84
        ToolbarButton {
297
85
                Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder-new.svg")
85
            action: Action {
298
86
            visible: root.selectedNote !== null
86
                text: i18n.tr("Delete")
299
87
            onTriggered: {
87
                iconName: "delete"
300
88
                root.selectedNote.reminder = !root.selectedNote.reminder
88
                visible: root.selectedNote !== null
301
89
                NotesStore.saveNote(root.selectedNote.guid)
89
                onTriggered: {
302
90
            }
90
                    NotesStore.deleteNote(root.selectedNote.guid);
303
91
        }
91
                }
304
92
        ToolbarButton {
92
            }
305
93
            text: i18n.tr("Edit")
93
        }
306
94
            iconName: "edit"
94
        ToolbarButton {
307
95
            visible: root.selectedNote !== null
95
            action: Action {
308
96
            onTriggered: {
96
                text: root.selectedNote.reminder ? i18n.tr("Edit reminder") : i18n.tr("Set reminder")
309
97
                print("should edit note")
97
                // TODO: use this instead when the toolkit switches from using the
310
98
                root.editNote(root.selectedNote)
98
                // ubuntu-mobile-icons theme to suru:
311
99
            }
99
                //iconName: root.selectedNote.reminder ? "reminder" : "reminder-new"
312
100
        }
100
                iconSource: root.selectedNote.reminder ?
313
101
101
                    Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder.svg") :
314
102
        ToolbarButton {
102
                    Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder-new.svg")
315
103
            text: i18n.tr("Add note")
103
                visible: root.selectedNote !== null
316
104
            iconName: "add"
104
                onTriggered: {
317
105
            onTriggered: {
105
                    root.selectedNote.reminder = !root.selectedNote.reminder
318
106
                NotesStore.createNote("Untitled");
106
                    NotesStore.saveNote(root.selectedNote.guid)
319
107
            }
107
                }
320
108
        }
108
            }
321
109
    }
109
        }
322
110
        ToolbarButton {
323
111
            action: Action {
324
112
                text: i18n.tr("Edit")
325
113
                iconName: "edit"
326
114
                visible: root.selectedNote !== null
327
115
                onTriggered: {
328
116
                    print("should edit note")
329
117
                    root.editNote(root.selectedNote)
330
118
                }
331
119
            }
332
120
        }
333
121
   }
334
110
122
335
111
    Notes {
123
    Notes {
336
112
        id: notes
124
        id: notes
337
113
125
338
=== modified file 'src/app/qml/ui/RemindersPage.qml'
339
--- src/app/qml/ui/RemindersPage.qml	2014-05-08 16:30:57 +0000
340
+++ src/app/qml/ui/RemindersPage.qml	2014-06-24 00:09:21 +0000
341
@@ -30,28 +30,23 @@
342
30
30
343
31
    tools: ToolbarItems {
31
    tools: ToolbarItems {
344
32
        ToolbarButton {
32
        ToolbarButton {
367
33
            text: i18n.tr("Search")
33
            action: Action {
368
34
            iconName: "search"
34
                text: i18n.tr("Search")
369
35
            onTriggered: {
35
                iconName: "search"
370
36
                pagestack.push(Qt.resolvedUrl("SearchNotesPage.qml"))
36
                onTriggered: {
371
37
            }
37
                    pagestack.push(Qt.resolvedUrl("SearchNotesPage.qml"))
372
38
        }
38
                }
373
39
39
            }
374
40
        ToolbarSpacer { }
40
        }
375
41
41
376
42
        ToolbarButton {
42
        ToolbarButton {
377
43
            text: i18n.tr("Accounts")
43
            action: Action {
378
44
            iconName: "contacts-app-symbolic"
44
                text: i18n.tr("Accounts")
379
45
            visible: accounts.count > 1
45
                iconName: "contacts-app-symbolic"
380
46
            onTriggered: {
46
                visible: accounts.count > 1
381
47
                openAccountPage(true);
47
                onTriggered: {
382
48
            }
48
                    openAccountPage(true);
383
49
        }
49
                }
362
50
363
51
        ToolbarButton {
364
52
            text: i18n.tr("Add reminder")
365
53
            iconName: "add"
366
54
            onTriggered: {
384
55
            }
50
            }
385
56
        }
51
        }
386
57
    }
52
    }
387
58
53
388
=== modified file 'src/app/qml/ui/SearchNotesPage.qml'
389
--- src/app/qml/ui/SearchNotesPage.qml	2014-05-20 09:07:44 +0000
390
+++ src/app/qml/ui/SearchNotesPage.qml	2014-06-24 00:09:21 +0000
391
@@ -27,17 +27,7 @@
392
27
27
393
28
    signal noteSelected(var note)
28
    signal noteSelected(var note)
394
29
29
406
30
    tools: ToolbarItems {
30
    title: i18n.tr('Search notes')
396
31
        back: ToolbarButton {
397
32
            iconName: 'back' 
398
33
            text: i18n.tr("Back")
399
34
400
35
            onTriggered: {
401
36
                pagestack.pop()
402
37
                NotesStore.clearSearchResults();
403
38
            }
404
39
        }
405
40
    }
407
41
31
408
42
    Column {
32
    Column {
409
43
        anchors { fill: parent; topMargin: units.gu(2); bottomMargin: units.gu(2) }
33
        anchors { fill: parent; topMargin: units.gu(2); bottomMargin: units.gu(2) }
410
44
34
411
=== modified file 'tests/autopilot/reminders/__init__.py'
412
--- tests/autopilot/reminders/__init__.py	2014-05-23 12:28:04 +0000
413
+++ tests/autopilot/reminders/__init__.py	2014-06-24 00:09:21 +0000
414
@@ -123,7 +123,8 @@
415
123
123
416
124
        """
124
        """
417
125
        original_number_of_books = self._get_notebooks_listview().count
125
        original_number_of_books = self._get_notebooks_listview().count
419
126
        self.main_view.open_toolbar().click_button('addNotebookButton')
126
        header = self.main_view.get_header()
420
127
        header.click_action_button('addNotebookButton')
421
127
        title_textfield = self.select_single(
128
        title_textfield = self.select_single(
422
128
            ubuntuuitoolkit.TextField, objectName='newNoteTitleTextField')
129
            ubuntuuitoolkit.TextField, objectName='newNoteTitleTextField')
423
129
        title_textfield.write(title)
130
        title_textfield.write(title)
Status:	Merged
Approved by:	Nicholas Skaggs on 2014-06-24
Approved revision:	153
Merged at revision:	165
Proposed branch:	lp:~nskaggs/reminders-app/newHeader2
Merge into:	lp:reminders-app
Diff against target:	423 lines (+173/-163) 7 files modified src/app/qml/reminders.qml (+2/-0) src/app/qml/ui/NotePage.qml (+34/-29) src/app/qml/ui/NotebooksPage.qml (+39/-34) src/app/qml/ui/NotesPage.qml (+78/-66) src/app/qml/ui/RemindersPage.qml (+17/-22) src/app/qml/ui/SearchNotesPage.qml (+1/-11) tests/autopilot/reminders/__init__.py (+2/-1)
To merge this branch:	bzr merge lp:~nskaggs/reminders-app/newHeader2
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration	2014-06-24	Approve on 2014-06-24
Michael Zanetti		2014-06-24	Pending
David Planella		2014-06-24	Pending
Review via email: mp+224229@code.launchpad.net