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
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-13 10:35:57 +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-13 10:35:57 +0000
91
@@ -36,43 +36,47 @@
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
                text: i18n.tr("Add notebook")
129
41
            onTriggered: {
41
                iconName: "add"
130
42
                pagestack.push(Qt.resolvedUrl("SearchNotesPage.qml"))
42
                onTriggered: {
131
43
            }
43
                    contentColumn.newNotebook = true;
132
44
        }
44
                }
133
45
45
            }
134
46
        ToolbarButton {
46
        }
135
47
            text: i18n.tr("Refresh")
47
 
136
48
            iconName: "reload"
48
        ToolbarButton {
137
49
            onTriggered: {
49
            action: Action {
138
50
                NotesStore.refreshNotebooks();
50
                text: i18n.tr("Search")
139
51
            }
51
                iconName: "search"
140
52
        }
52
                onTriggered: {
141
53
53
                    pagestack.push(Qt.resolvedUrl("SearchNotesPage.qml"))
142
54
        ToolbarSpacer { }
54
                }
143
55
55
            }
144
56
        ToolbarButton {
56
        }
145
57
            text: i18n.tr("Accounts")
57
146
58
            iconName: "contacts-app-symbolic"
58
        ToolbarButton {
147
59
            visible: accounts.count > 1
59
            action: Action {
148
60
            onTriggered: {
60
                text: i18n.tr("Refresh")
149
61
                openAccountPage(true);
61
                iconName: "reload"
150
62
            }
62
                onTriggered: {
151
63
        }
63
                    NotesStore.refreshNotebooks();
152
64
64
                }
153
65
        ToolbarButton {
65
            }
154
66
            objectName: "addNotebookButton"
66
        }
155
67
            text: i18n.tr("Add notebook")
67
156
68
            iconName: "add"
68
        ToolbarButton {
157
69
            onTriggered: {
69
            action: Action {
158
70
                contentColumn.newNotebook = true;
70
                text: i18n.tr("Accounts")
159
71
                iconName: "contacts-app-symbolic"
160
72
                visible: accounts.count > 1
161
73
                onTriggered: {
162
74
                    openAccountPage(true);
163
75
                }
164
71
            }
76
            }
165
72
        }
77
        }
166
73
    }
78
    }
167
74
79
168
75
169
76
    Notebooks {
80
    Notebooks {
170
77
        id: notebooks
81
        id: notebooks
171
78
    }
82
    }
172
79
83
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
41
41
178
42
    tools: ToolbarItems {
42
    tools: ToolbarItems {
179
43
        ToolbarButton {
43
        ToolbarButton {
246
44
            text: i18n.tr("Search")
44
            action: Action {
247
45
            iconName: "search"
45
                text: i18n.tr("Add note")
248
46
            onTriggered: {
46
                iconName: "add"
249
47
                root.openSearch();
47
                onTriggered: {
250
48
            }
48
                    NotesStore.createNote("Untitled");
251
49
        }
49
                }   
252
50
50
            }
253
51
        ToolbarButton {
51
        }
254
52
            text: i18n.tr("Refresh")
52
255
53
            iconName: "reload"
53
        ToolbarButton {
256
54
            onTriggered: {
54
            action: Action {
257
55
                NotesStore.refreshNotes();
55
                text: i18n.tr("Search")
258
56
            }
56
                iconName: "search"
259
57
        }
57
                onTriggered: {
260
58
58
                    root.openSearch();
261
59
        ToolbarButton {
59
                }
262
60
            text: i18n.tr("Accounts")
60
            }
263
61
            iconName: "contacts-app-symbolic"
61
        }
264
62
            visible: accounts.count > 1
62
265
63
            onTriggered: {
63
        ToolbarButton {
266
64
                openAccountPage(true);
64
            action: Action {
267
65
            }
65
                text: i18n.tr("Refresh")
268
66
        }
66
                iconName: "reload"
269
67
67
                onTriggered: {
270
68
        ToolbarSpacer { }
68
                    NotesStore.refreshNotes();
271
69
69
                }
272
70
        ToolbarButton {
70
            }
273
71
            text: i18n.tr("Delete")
71
        }
274
72
            iconName: "delete"
72
275
73
            visible: root.selectedNote !== null
73
        ToolbarButton {
276
74
            onTriggered: {
74
            action: Action {
277
75
                NotesStore.deleteNote(root.selectedNote.guid);
75
                text: i18n.tr("Accounts")
278
76
            }
76
                iconName: "contacts-app-symbolic"
279
77
        }
77
                visible: accounts.count > 1
280
78
        ToolbarButton {
78
                onTriggered: {
281
79
            text: root.selectedNote.reminder ? i18n.tr("Edit reminder") : i18n.tr("Set reminder")
79
                    openAccountPage(true);
282
80
            // TODO: use this instead when the toolkit switches from using the
80
                }
283
81
            // ubuntu-mobile-icons theme to suru:
81
            }
284
82
            //iconName: root.selectedNote.reminder ? "reminder" : "reminder-new"
82
        }
285
83
            iconSource: root.selectedNote.reminder ?
83
286
84
                Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder.svg") :
84
        ToolbarButton {
287
85
                Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder-new.svg")
85
            action: Action {
288
86
            visible: root.selectedNote !== null
86
                text: i18n.tr("Delete")
289
87
            onTriggered: {
87
                iconName: "delete"
290
88
                root.selectedNote.reminder = !root.selectedNote.reminder
88
                visible: root.selectedNote !== null
291
89
                NotesStore.saveNote(root.selectedNote.guid)
89
                onTriggered: {
292
90
            }
90
                    NotesStore.deleteNote(root.selectedNote.guid);
293
91
        }
91
                }
294
92
        ToolbarButton {
92
            }
295
93
            text: i18n.tr("Edit")
93
        }
296
94
            iconName: "edit"
94
        ToolbarButton {
297
95
            visible: root.selectedNote !== null
95
            action: Action {
298
96
            onTriggered: {
96
                text: root.selectedNote.reminder ? i18n.tr("Edit reminder") : i18n.tr("Set reminder")
299
97
                print("should edit note")
97
                // TODO: use this instead when the toolkit switches from using the
300
98
                root.editNote(root.selectedNote)
98
                // ubuntu-mobile-icons theme to suru:
301
99
            }
99
                //iconName: root.selectedNote.reminder ? "reminder" : "reminder-new"
302
100
        }
100
                iconSource: root.selectedNote.reminder ?
303
101
101
                    Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder.svg") :
304
102
        ToolbarButton {
102
                    Qt.resolvedUrl("/usr/share/icons/suru/actions/scalable/reminder-new.svg")
305
103
            text: i18n.tr("Add note")
103
                visible: root.selectedNote !== null
306
104
            iconName: "add"
104
                onTriggered: {
307
105
            onTriggered: {
105
                    root.selectedNote.reminder = !root.selectedNote.reminder
308
106
                NotesStore.createNote("Untitled");
106
                    NotesStore.saveNote(root.selectedNote.guid)
309
107
            }
107
                }
310
108
        }
108
            }
311
109
    }
109
        }
312
110
        ToolbarButton {
313
111
            action: Action {
314
112
                text: i18n.tr("Edit")
315
113
                iconName: "edit"
316
114
                visible: root.selectedNote !== null
317
115
                onTriggered: {
318
116
                    print("should edit note")
319
117
                    root.editNote(root.selectedNote)
320
118
                }
321
119
            }
322
120
        }
323
121
   }
324
110
122
325
111
    Notes {
123
    Notes {
326
112
        id: notes
124
        id: notes
327
113
125
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
30
30
333
31
    tools: ToolbarItems {
31
    tools: ToolbarItems {
334
32
        ToolbarButton {
32
        ToolbarButton {
357
33
            text: i18n.tr("Search")
33
            action: Action {
358
34
            iconName: "search"
34
                text: i18n.tr("Search")
359
35
            onTriggered: {
35
                iconName: "search"
360
36
                pagestack.push(Qt.resolvedUrl("SearchNotesPage.qml"))
36
                onTriggered: {
361
37
            }
37
                    pagestack.push(Qt.resolvedUrl("SearchNotesPage.qml"))
362
38
        }
38
                }
363
39
39
            }
364
40
        ToolbarSpacer { }
40
        }
365
41
41
366
42
        ToolbarButton {
42
        ToolbarButton {
367
43
            text: i18n.tr("Accounts")
43
            action: Action {
368
44
            iconName: "contacts-app-symbolic"
44
                text: i18n.tr("Accounts")
369
45
            visible: accounts.count > 1
45
                iconName: "contacts-app-symbolic"
370
46
            onTriggered: {
46
                visible: accounts.count > 1
371
47
                openAccountPage(true);
47
                onTriggered: {
372
48
            }
48
                    openAccountPage(true);
373
49
        }
49
                }
352
50
353
51
        ToolbarButton {
354
52
            text: i18n.tr("Add reminder")
355
53
            iconName: "add"
356
54
            onTriggered: {
374
55
            }
50
            }
375
56
        }
51
        }
376
57
    }
52
    }
377
58
53
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
27
27
383
28
    signal noteSelected(var note)
28
    signal noteSelected(var note)
384
29
29
396
30
    tools: ToolbarItems {
30
    title: i18n.tr('Search notes')
386
31
        back: ToolbarButton {
387
32
            iconName: 'back' 
388
33
            text: i18n.tr("Back")
389
34
390
35
            onTriggered: {
391
36
                pagestack.pop()
392
37
                NotesStore.clearSearchResults();
393
38
            }
394
39
        }
395
40
    }
397
41
31
398
42
    Column {
32
    Column {
399
43
        anchors { fill: parent; topMargin: units.gu(2); bottomMargin: units.gu(2) }
33
        anchors { fill: parent; topMargin: units.gu(2); bottomMargin: units.gu(2) }
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Needs Fixing on 2014-06-23
David Planella			Approve on 2014-06-13
Michael Zanetti (community)		2014-05-20	Needs Information on 2014-06-03
Review via email: mp+220291@code.launchpad.net