Ubuntu Notes app

Merge lp:~mzanetti/reminders-app/uitk-1.3 into lp:reminders-app

  1. uitk-1.3
  2. Merge into trunk
Proposed by Michael Zanetti
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 475
Merged at revision: 476
Proposed branch: lp:~mzanetti/reminders-app/uitk-1.3
Merge into: lp:reminders-app
Diff against target: 685 lines (+80/-99)
34 files modified
manifest.json.in (+1/-1)
reminders.apparmor (+1/-1)
src/app/qml/components/BouncingProgressBar.qml (+1/-1)
src/app/qml/components/ConflictDelegate.qml (+1/-1)
src/app/qml/components/EditTagsDialog.qml (+1/-1)
src/app/qml/components/Header.qml (+1/-1)
src/app/qml/components/ListItemWithActions.qml (+1/-1)
src/app/qml/components/ListItemWithActionsCheckBox.qml (+1/-1)
src/app/qml/components/NotebooksDelegate.qml (+1/-1)
src/app/qml/components/NotesDelegate.qml (+1/-1)
src/app/qml/components/PageWithBottomEdge.qml (+1/-1)
src/app/qml/components/PulldownListView.qml (+1/-1)
src/app/qml/components/RemindersDelegate.qml (+1/-1)
src/app/qml/components/ResolveConflictConfirmationDialog.qml (+1/-1)
src/app/qml/components/RtfButton.qml (+1/-1)
src/app/qml/components/SortingDialog.qml (+1/-1)
src/app/qml/components/StatusBar.qml (+1/-1)
src/app/qml/components/TagsDelegate.qml (+1/-1)
src/app/qml/components/ToolbarSpacer.qml (+1/-1)
src/app/qml/reminders.qml (+2/-13)
src/app/qml/ui/AccountSelectorPage.qml (+1/-1)
src/app/qml/ui/EditNotePage.qml (+4/-3)
src/app/qml/ui/EditNoteView.qml (+9/-6)
src/app/qml/ui/NoteConflictPage.qml (+1/-1)
src/app/qml/ui/NoteConflictView.qml (+1/-1)
src/app/qml/ui/NotePage.qml (+7/-3)
src/app/qml/ui/NoteView.qml (+1/-1)
src/app/qml/ui/NotebooksPage.qml (+7/-10)
src/app/qml/ui/NotesPage.qml (+15/-28)
src/app/qml/ui/RemindersPage.qml (+5/-5)
src/app/qml/ui/SearchNotesPage.qml (+1/-1)
src/app/qml/ui/SetReminderPage.qml (+1/-1)
src/app/qml/ui/SetReminderView.qml (+1/-1)
src/app/qml/ui/TagsPage.qml (+5/-5)
To merge this branch: bzr merge lp:~mzanetti/reminders-app/uitk-1.3
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Riccardo Padovani Approve
Review via email: mp+265886@code.launchpad.net

Commit message

update to Ubuntu.Components 1.3

this allows us to use uitk's TextArea and finally enable copy/paste

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

FAILED: Continuous integration, rev:474
http://91.189.93.70:8080/job/reminders-app-ci/770/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3124
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3124/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/372
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/192

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/770/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:475
http://91.189.93.70:8080/job/reminders-app-ci/773/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3127
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3127/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/375
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/195

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

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

Works like a charm, thanks :-)

review: Approve
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/457/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3151
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3151/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/235
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-autolanding/179

review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

We should disable the utopic jenkins builder. It's causing this to fail incorrectly.

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Ack, disabling and re-running.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'manifest.json.in'
2--- manifest.json.in 2015-07-20 20:47:01 +0000
3+++ manifest.json.in 2015-07-25 03:01:57 +0000
4@@ -1,6 +1,6 @@
5 {
6 "description": "Ubuntu Notes app, powered by Evernote",
7- "framework": "ubuntu-sdk-14.10",
8+ "framework": "ubuntu-sdk-15.04",
9 "architecture": "@CLICK_ARCH@",
10 "hooks": {
11 "reminders": {
12
13=== modified file 'reminders.apparmor'
14--- reminders.apparmor 2015-02-16 21:57:16 +0000
15+++ reminders.apparmor 2015-07-25 03:01:57 +0000
16@@ -10,5 +10,5 @@
17 "connectivity",
18 "content_exchange_source"
19 ],
20- "policy_version": 1.2
21+ "policy_version": 1.3
22 }
23\ No newline at end of file
24
25=== modified file 'src/app/qml/components/BouncingProgressBar.qml'
26--- src/app/qml/components/BouncingProgressBar.qml 2014-10-07 18:03:48 +0000
27+++ src/app/qml/components/BouncingProgressBar.qml 2015-07-25 03:01:57 +0000
28@@ -17,7 +17,7 @@
29 */
30
31 import QtQuick 2.3
32-import Ubuntu.Components 1.1
33+import Ubuntu.Components 1.3
34
35 Item {
36 height: units.dp(3)
37
38=== modified file 'src/app/qml/components/ConflictDelegate.qml'
39--- src/app/qml/components/ConflictDelegate.qml 2015-03-30 19:00:04 +0000
40+++ src/app/qml/components/ConflictDelegate.qml 2015-07-25 03:01:57 +0000
41@@ -18,7 +18,7 @@
42
43 import QtQuick 2.2
44 import QtQuick.Layouts 1.1
45-import Ubuntu.Components 1.1
46+import Ubuntu.Components 1.3
47 import Evernote 0.1
48
49 ColumnLayout {
50
51=== modified file 'src/app/qml/components/EditTagsDialog.qml'
52--- src/app/qml/components/EditTagsDialog.qml 2015-06-16 23:43:54 +0000
53+++ src/app/qml/components/EditTagsDialog.qml 2015-07-25 03:01:57 +0000
54@@ -18,7 +18,7 @@
55
56 import QtQuick 2.3
57 import QtQuick.Layouts 1.1
58-import Ubuntu.Components 1.1
59+import Ubuntu.Components 1.3
60 import Ubuntu.Components.Popups 1.0
61 import Ubuntu.Components.ListItems 1.0
62 import Evernote 0.1
63
64=== modified file 'src/app/qml/components/Header.qml'
65--- src/app/qml/components/Header.qml 2015-06-22 08:07:07 +0000
66+++ src/app/qml/components/Header.qml 2015-07-25 03:01:57 +0000
67@@ -1,6 +1,6 @@
68 import QtQuick 2.2
69 import QtQuick.Layouts 1.1
70-import Ubuntu.Components 1.1
71+import Ubuntu.Components 1.3
72 import Ubuntu.Components.ListItems 1.0
73 import Ubuntu.Components.Themes.Ambiance 1.1
74 import Evernote 0.1
75
76=== modified file 'src/app/qml/components/ListItemWithActions.qml'
77--- src/app/qml/components/ListItemWithActions.qml 2015-03-31 14:28:05 +0000
78+++ src/app/qml/components/ListItemWithActions.qml 2015-07-25 03:01:57 +0000
79@@ -16,7 +16,7 @@
80
81 import QtQuick 2.3
82 import QtFeedback 5.0
83-import Ubuntu.Components 1.1
84+import Ubuntu.Components 1.3
85 import Ubuntu.Components.ListItems 1.0 as ListItem
86
87 Item {
88
89=== modified file 'src/app/qml/components/ListItemWithActionsCheckBox.qml'
90--- src/app/qml/components/ListItemWithActionsCheckBox.qml 2015-03-31 12:35:28 +0000
91+++ src/app/qml/components/ListItemWithActionsCheckBox.qml 2015-07-25 03:01:57 +0000
92@@ -15,7 +15,7 @@
93 */
94
95 import QtQuick 2.3
96-import Ubuntu.Components 1.1
97+import Ubuntu.Components 1.3
98 import "../Theme"
99
100 AbstractButton {
101
102=== modified file 'src/app/qml/components/NotebooksDelegate.qml'
103--- src/app/qml/components/NotebooksDelegate.qml 2015-06-11 18:55:24 +0000
104+++ src/app/qml/components/NotebooksDelegate.qml 2015-07-25 03:01:57 +0000
105@@ -18,7 +18,7 @@
106
107 import QtQuick 2.3
108 import QtQuick.Layouts 1.0
109-import Ubuntu.Components 1.1
110+import Ubuntu.Components 1.3
111 import Ubuntu.Components.ListItems 1.0
112 import Evernote 0.1
113
114
115=== modified file 'src/app/qml/components/NotesDelegate.qml'
116--- src/app/qml/components/NotesDelegate.qml 2015-06-14 23:34:29 +0000
117+++ src/app/qml/components/NotesDelegate.qml 2015-07-25 03:01:57 +0000
118@@ -18,7 +18,7 @@
119
120 import QtQuick 2.3
121 import QtQuick.Layouts 1.0
122-import Ubuntu.Components 1.1
123+import Ubuntu.Components 1.3
124 import Ubuntu.Components.ListItems 1.0
125 import Evernote 0.1
126
127
128=== modified file 'src/app/qml/components/PageWithBottomEdge.qml'
129--- src/app/qml/components/PageWithBottomEdge.qml 2015-02-12 22:04:50 +0000
130+++ src/app/qml/components/PageWithBottomEdge.qml 2015-07-25 03:01:57 +0000
131@@ -63,7 +63,7 @@
132 */
133
134 import QtQuick 2.3
135-import Ubuntu.Components 1.1
136+import Ubuntu.Components 1.3
137 import Evernote 0.1
138
139 Page {
140
141=== modified file 'src/app/qml/components/PulldownListView.qml'
142--- src/app/qml/components/PulldownListView.qml 2014-11-06 19:11:35 +0000
143+++ src/app/qml/components/PulldownListView.qml 2015-07-25 03:01:57 +0000
144@@ -17,7 +17,7 @@
145 */
146
147 import QtQuick 2.3
148-import Ubuntu.Components 1.1
149+import Ubuntu.Components 1.3
150
151 ListView {
152 id: root
153
154=== modified file 'src/app/qml/components/RemindersDelegate.qml'
155--- src/app/qml/components/RemindersDelegate.qml 2015-03-15 20:00:21 +0000
156+++ src/app/qml/components/RemindersDelegate.qml 2015-07-25 03:01:57 +0000
157@@ -18,7 +18,7 @@
158
159 import QtQuick 2.3
160 import QtQuick.Layouts 1.0
161-import Ubuntu.Components 1.1
162+import Ubuntu.Components 1.3
163 import Ubuntu.Components.ListItems 1.0
164 import Ubuntu.Components.Popups 1.0
165 import Ubuntu.Components.Pickers 1.0
166
167=== modified file 'src/app/qml/components/ResolveConflictConfirmationDialog.qml'
168--- src/app/qml/components/ResolveConflictConfirmationDialog.qml 2015-03-15 20:00:21 +0000
169+++ src/app/qml/components/ResolveConflictConfirmationDialog.qml 2015-07-25 03:01:57 +0000
170@@ -17,7 +17,7 @@
171 */
172
173 import QtQuick 2.2
174-import Ubuntu.Components 1.1
175+import Ubuntu.Components 1.3
176 import Ubuntu.Components.Popups 1.0
177
178 Dialog {
179
180=== modified file 'src/app/qml/components/RtfButton.qml'
181--- src/app/qml/components/RtfButton.qml 2015-04-27 17:24:33 +0000
182+++ src/app/qml/components/RtfButton.qml 2015-07-25 03:01:57 +0000
183@@ -18,7 +18,7 @@
184
185 import QtQuick 2.3
186 import QtQuick.Layouts 1.1
187-import Ubuntu.Components 1.1
188+import Ubuntu.Components 1.3
189
190 Item {
191 id: root
192
193=== modified file 'src/app/qml/components/SortingDialog.qml'
194--- src/app/qml/components/SortingDialog.qml 2015-03-17 23:32:45 +0000
195+++ src/app/qml/components/SortingDialog.qml 2015-07-25 03:01:57 +0000
196@@ -1,5 +1,5 @@
197 import QtQuick 2.2
198-import Ubuntu.Components 1.0
199+import Ubuntu.Components 1.3
200 import Ubuntu.Components.Popups 1.0
201 import Ubuntu.Components.ListItems 1.0
202 import reminders 1.0
203
204=== modified file 'src/app/qml/components/StatusBar.qml'
205--- src/app/qml/components/StatusBar.qml 2015-06-14 23:34:29 +0000
206+++ src/app/qml/components/StatusBar.qml 2015-07-25 03:01:57 +0000
207@@ -1,6 +1,6 @@
208 import QtQuick 2.3
209 import QtQuick.Layouts 1.1
210-import Ubuntu.Components 1.1
211+import Ubuntu.Components 1.3
212 import Evernote 0.1
213
214 Rectangle {
215
216=== modified file 'src/app/qml/components/TagsDelegate.qml'
217--- src/app/qml/components/TagsDelegate.qml 2015-06-11 18:55:24 +0000
218+++ src/app/qml/components/TagsDelegate.qml 2015-07-25 03:01:57 +0000
219@@ -18,7 +18,7 @@
220
221 import QtQuick 2.3
222 import QtQuick.Layouts 1.0
223-import Ubuntu.Components 1.1
224+import Ubuntu.Components 1.3
225 import Ubuntu.Components.ListItems 1.0
226 import Evernote 0.1
227
228
229=== modified file 'src/app/qml/components/ToolbarSpacer.qml'
230--- src/app/qml/components/ToolbarSpacer.qml 2014-09-23 12:39:27 +0000
231+++ src/app/qml/components/ToolbarSpacer.qml 2015-07-25 03:01:57 +0000
232@@ -17,7 +17,7 @@
233 */
234
235 import QtQuick 2.3
236-import Ubuntu.Components 1.1
237+import Ubuntu.Components 1.3
238 import Ubuntu.Components.Popups 1.0
239
240 Item {
241
242=== modified file 'src/app/qml/reminders.qml'
243--- src/app/qml/reminders.qml 2015-06-22 10:53:02 +0000
244+++ src/app/qml/reminders.qml 2015-07-25 03:01:57 +0000
245@@ -18,7 +18,7 @@
246
247 import QtQuick 2.3
248 import QtQuick.Layouts 1.1
249-import Ubuntu.Components 1.1
250+import Ubuntu.Components 1.3
251 import Ubuntu.Components.Popups 1.0
252 import Ubuntu.Components.ListItems 1.0
253 import Ubuntu.Connectivity 1.0
254@@ -33,20 +33,9 @@
255 MainView {
256 id: root
257
258- // objectName for functional testing purposes (autopilot-qt5)
259 objectName: "mainView"
260-
261- // Note! applicationName needs to match the "name" field of the click manifest
262 applicationName: "com.ubuntu.reminders"
263
264- useDeprecatedToolbar: false
265-
266- /*
267- This property enables the application to change orientation
268- when the device is rotated. The default is false.
269- */
270- automaticOrientation: true
271-
272 property bool narrowMode: root.width < units.gu(80)
273 property var uri: undefined
274
275@@ -501,7 +490,7 @@
276
277 Column {
278 id: statusBar
279- anchors { left: parent.left; right: parent.right; top: parent.top; topMargin: units.gu(9) }
280+ anchors { left: parent.left; right: parent.right; top: parent.top; topMargin: units.gu(6)}
281
282 StatusBar {
283 anchors { left: parent.left; right: parent.right }
284
285=== modified file 'src/app/qml/ui/AccountSelectorPage.qml'
286--- src/app/qml/ui/AccountSelectorPage.qml 2015-05-27 22:45:53 +0000
287+++ src/app/qml/ui/AccountSelectorPage.qml 2015-07-25 03:01:57 +0000
288@@ -17,7 +17,7 @@
289 */
290
291 import QtQuick 2.3
292-import Ubuntu.Components 1.1
293+import Ubuntu.Components 1.3
294 import Ubuntu.Components.ListItems 1.0
295 import Ubuntu.OnlineAccounts 0.1
296 import Ubuntu.OnlineAccounts.Client 0.1
297
298=== modified file 'src/app/qml/ui/EditNotePage.qml'
299--- src/app/qml/ui/EditNotePage.qml 2015-03-16 00:44:20 +0000
300+++ src/app/qml/ui/EditNotePage.qml 2015-07-25 03:01:57 +0000
301@@ -17,7 +17,7 @@
302 */
303
304 import QtQuick 2.3
305-import Ubuntu.Components 1.1
306+import Ubuntu.Components 1.3
307 import Ubuntu.Components.ListItems 1.0
308 import Evernote 0.1
309 import "../components"
310@@ -28,9 +28,10 @@
311
312 signal exitEditMode(var note)
313
314- tools: ToolbarItems {
315+ head {
316+ visible: false
317 locked: true
318- opened: false
319+ backAction: Action {visible: false}
320 }
321
322 EditNoteView {
323
324=== modified file 'src/app/qml/ui/EditNoteView.qml'
325--- src/app/qml/ui/EditNoteView.qml 2015-06-21 16:51:58 +0000
326+++ src/app/qml/ui/EditNoteView.qml 2015-07-25 03:01:57 +0000
327@@ -18,7 +18,7 @@
328
329 import QtQuick 2.3
330 import QtQuick.Layouts 1.1
331-import Ubuntu.Components 1.1
332+import Ubuntu.Components 1.3
333 import Ubuntu.Components.Popups 1.0
334 import Ubuntu.Components.ListItems 1.0
335 import Ubuntu.Content 0.1
336@@ -143,18 +143,21 @@
337 }
338 }
339
340- TextEdit {
341+ TextArea {
342 id: noteTextArea
343 width: flick.width
344- height: Math.max(flick.height - header.height, paintedHeight)
345+// height: Math.max(flick.height - header.height, paintedHeight + units.gu(2))
346+ autoSize: true
347+ maximumLineCount: 0
348 focus: true
349 wrapMode: TextEdit.Wrap
350 textFormat: TextEdit.RichText
351 text: root.note ? root.note.richTextContent : ""
352 onCursorRectangleChanged: flick.ensureVisible(cursorRectangle)
353- selectByMouse: toolbox.charFormatExpanded
354- textMargin: units.gu(1)
355- selectionColor: UbuntuColors.blue
356+
357+ style: TextAreaStyle {
358+ background: null
359+ }
360
361 property int lastCursorPos: -1
362 onCursorPositionChanged: {
363
364=== modified file 'src/app/qml/ui/NoteConflictPage.qml'
365--- src/app/qml/ui/NoteConflictPage.qml 2015-03-15 20:00:21 +0000
366+++ src/app/qml/ui/NoteConflictPage.qml 2015-07-25 03:01:57 +0000
367@@ -17,7 +17,7 @@
368 */
369
370 import QtQuick 2.3
371-import Ubuntu.Components 1.1
372+import Ubuntu.Components 1.3
373 import Evernote 0.1
374 import "../components"
375
376
377=== modified file 'src/app/qml/ui/NoteConflictView.qml'
378--- src/app/qml/ui/NoteConflictView.qml 2015-03-15 20:00:21 +0000
379+++ src/app/qml/ui/NoteConflictView.qml 2015-07-25 03:01:57 +0000
380@@ -17,7 +17,7 @@
381 */
382
383 import QtQuick 2.3
384-import Ubuntu.Components 1.1
385+import Ubuntu.Components 1.3
386 import Ubuntu.Components.ListItems 1.0
387 import QtQuick.Layouts 1.1
388 import Evernote 0.1
389
390=== modified file 'src/app/qml/ui/NotePage.qml'
391--- src/app/qml/ui/NotePage.qml 2015-06-17 21:22:25 +0000
392+++ src/app/qml/ui/NotePage.qml 2015-07-25 03:01:57 +0000
393@@ -17,19 +17,23 @@
394 */
395
396 import QtQuick 2.3
397-import Ubuntu.Components 1.1
398+import Ubuntu.Components 1.3
399 import Evernote 0.1
400 import "../components"
401
402 Page {
403 id: root
404- title: noteView.title
405 property alias note: noteView.note
406 property bool readOnly: false
407
408+ head {
409+ visible: false
410+ locked: true
411+ backAction: Action {visible: false}
412+ }
413+
414 signal editNote(var note)
415
416-
417 NoteView {
418 id: noteView
419 anchors.fill: parent
420
421=== modified file 'src/app/qml/ui/NoteView.qml'
422--- src/app/qml/ui/NoteView.qml 2015-06-21 16:56:53 +0000
423+++ src/app/qml/ui/NoteView.qml 2015-07-25 03:01:57 +0000
424@@ -18,7 +18,7 @@
425
426 import QtQuick 2.3
427 import QtQuick.Layouts 1.1
428-import Ubuntu.Components 1.1
429+import Ubuntu.Components 1.3
430 import Ubuntu.Components.ListItems 1.0
431 import Ubuntu.Components.Popups 1.0
432 import com.canonical.Oxide 1.5
433
434=== modified file 'src/app/qml/ui/NotebooksPage.qml'
435--- src/app/qml/ui/NotebooksPage.qml 2015-03-15 20:00:21 +0000
436+++ src/app/qml/ui/NotebooksPage.qml 2015-07-25 03:01:57 +0000
437@@ -17,7 +17,7 @@
438 */
439
440 import QtQuick 2.3
441-import Ubuntu.Components 1.1
442+import Ubuntu.Components 1.3
443 import Ubuntu.Components.ListItems 1.0
444 import Ubuntu.Components.Popups 1.0
445 import Evernote 0.1
446@@ -38,27 +38,24 @@
447 }
448 }
449
450- tools: ToolbarItems {
451- ToolbarButton {
452- action: Action {
453+ head {
454+ actions: [
455+ Action {
456 objectName: "addNotebookButton"
457 text: i18n.tr("Add notebook")
458 iconName: "add"
459 onTriggered: {
460 contentColumn.newNotebook = true;
461 }
462- }
463- }
464-
465- ToolbarButton {
466- action: Action {
467+ },
468+ Action {
469 text: i18n.tr("Search")
470 iconName: "search"
471 onTriggered: {
472 root.openSearch();
473 }
474 }
475- }
476+ ]
477 }
478
479 Notebooks {
480
481=== modified file 'src/app/qml/ui/NotesPage.qml'
482--- src/app/qml/ui/NotesPage.qml 2015-06-14 23:34:29 +0000
483+++ src/app/qml/ui/NotesPage.qml 2015-07-25 03:01:57 +0000
484@@ -18,7 +18,7 @@
485
486 import QtQuick 2.3
487 import QtQuick.Layouts 1.0
488-import Ubuntu.Components 1.1
489+import Ubuntu.Components 1.3
490 import Ubuntu.Components.ListItems 1.0
491 import Ubuntu.Components.Popups 1.0
492 import Evernote 0.1
493@@ -56,20 +56,17 @@
494 signal openSearch()
495 signal editNote(var note)
496
497- tools: ToolbarItems {
498- ToolbarButton {
499- action: Action {
500+ head {
501+ actions: [
502+ Action {
503 visible: !narrowMode
504 text: i18n.tr("Add note")
505 iconName: "add"
506 onTriggered: {
507 NotesStore.createNote(i18n.tr("Untitled"), filterNotebookGuid);
508 }
509- }
510- }
511-
512- ToolbarButton {
513- action: Action {
514+ },
515+ Action {
516 iconSource: "../images/sorting.svg"
517 text: i18n.tr("Sorting")
518 onTriggered: {
519@@ -81,31 +78,23 @@
520 })
521 popup.sortOrder = notes.sortOrder;
522 }
523- }
524- }
525-
526- ToolbarButton {
527- action: Action {
528+ },
529+ Action {
530 text: i18n.tr("Search")
531 iconName: "search"
532 onTriggered: {
533 root.openSearch();
534 }
535- }
536- }
537-
538- ToolbarButton {
539- action: Action {
540+ },
541+ Action {
542 text: i18n.tr("Delete")
543 iconName: "delete"
544 visible: root.selectedNote !== null && !root.readOnly
545 onTriggered: {
546 NotesStore.deleteNote(root.selectedNote.guid);
547 }
548- }
549- }
550- ToolbarButton {
551- action: Action {
552+ },
553+ Action {
554 text: root.selectedNote.reminder ? i18n.tr("Edit reminder") : i18n.tr("Set reminder")
555 // TODO: use this instead when the toolkit switches from using the
556 // ubuntu-mobile-icons theme to suru:
557@@ -118,10 +107,8 @@
558 root.selectedNote.reminder = !root.selectedNote.reminder
559 NotesStore.saveNote(root.selectedNote.guid)
560 }
561- }
562- }
563- ToolbarButton {
564- action: Action {
565+ },
566+ Action {
567 text: i18n.tr("Edit")
568 iconName: "edit"
569 visible: root.selectedNote !== null && !root.readOnly
570@@ -130,7 +117,7 @@
571 root.editNote(root.selectedNote)
572 }
573 }
574- }
575+ ]
576 }
577
578 Settings {
579
580=== modified file 'src/app/qml/ui/RemindersPage.qml'
581--- src/app/qml/ui/RemindersPage.qml 2015-03-30 19:01:49 +0000
582+++ src/app/qml/ui/RemindersPage.qml 2015-07-25 03:01:57 +0000
583@@ -18,7 +18,7 @@
584
585 import QtQuick 2.3
586 import QtQuick.Layouts 1.0
587-import Ubuntu.Components 1.1
588+import Ubuntu.Components 1.3
589 import Ubuntu.Components.ListItems 1.0
590 import Evernote 0.1
591 import "../components"
592@@ -30,16 +30,16 @@
593
594 signal openSearch();
595
596- tools: ToolbarItems {
597- ToolbarButton {
598- action: Action {
599+ head {
600+ actions: [
601+ Action {
602 text: i18n.tr("Search")
603 iconName: "search"
604 onTriggered: {
605 root.openSearch();
606 }
607 }
608- }
609+ ]
610 }
611
612 Notes {
613
614=== modified file 'src/app/qml/ui/SearchNotesPage.qml'
615--- src/app/qml/ui/SearchNotesPage.qml 2015-03-15 20:00:21 +0000
616+++ src/app/qml/ui/SearchNotesPage.qml 2015-07-25 03:01:57 +0000
617@@ -17,7 +17,7 @@
618 */
619
620 import QtQuick 2.3
621-import Ubuntu.Components 1.1
622+import Ubuntu.Components 1.3
623 import Ubuntu.Components.ListItems 1.0
624 import Ubuntu.Components.Popups 1.0
625 import Evernote 0.1
626
627=== modified file 'src/app/qml/ui/SetReminderPage.qml'
628--- src/app/qml/ui/SetReminderPage.qml 2015-06-16 23:43:54 +0000
629+++ src/app/qml/ui/SetReminderPage.qml 2015-07-25 03:01:57 +0000
630@@ -17,7 +17,7 @@
631 */
632
633 import QtQuick 2.3
634-import Ubuntu.Components 1.1
635+import Ubuntu.Components 1.3
636 import Evernote 0.1
637 import "../components"
638
639
640=== modified file 'src/app/qml/ui/SetReminderView.qml'
641--- src/app/qml/ui/SetReminderView.qml 2014-12-08 10:25:48 +0000
642+++ src/app/qml/ui/SetReminderView.qml 2015-07-25 03:01:57 +0000
643@@ -18,7 +18,7 @@
644
645 import QtQuick 2.3
646 import QtQuick.Layouts 1.0
647-import Ubuntu.Components 1.1
648+import Ubuntu.Components 1.3
649 import Ubuntu.Components.Pickers 1.0
650 import Evernote 0.1
651 import "../components"
652
653=== modified file 'src/app/qml/ui/TagsPage.qml'
654--- src/app/qml/ui/TagsPage.qml 2015-06-17 19:33:55 +0000
655+++ src/app/qml/ui/TagsPage.qml 2015-07-25 03:01:57 +0000
656@@ -17,7 +17,7 @@
657 */
658
659 import QtQuick 2.3
660-import Ubuntu.Components 1.1
661+import Ubuntu.Components 1.3
662 import Ubuntu.Components.ListItems 1.0
663 import Ubuntu.Components.Popups 1.0
664 import Evernote 0.1
665@@ -46,16 +46,16 @@
666 }
667 }
668
669- tools: ToolbarItems {
670- ToolbarButton {
671- action: Action {
672+ head {
673+ actions: [
674+ Action {
675 text: i18n.tr("Search")
676 iconName: "search"
677 onTriggered: {
678 root.openSearch();
679 }
680 }
681- }
682+ ]
683 }
684
685 Tags {

Subscribers

People subscribed via source and target branches