Ubuntu Notes app

Merge lp:~kill-animals/reminders-app/update-ubuntu-components-1.1 into lp:reminders-app

  1. update-ubuntu-components-1.1
  2. Merge into trunk
Proposed by Kill Animals
Status: Merged
Approved by: David Planella
Approved revision: 256
Merged at revision: 256
Proposed branch: lp:~kill-animals/reminders-app/update-ubuntu-components-1.1
Merge into: lp:reminders-app
Diff against target: 368 lines (+42/-42)
26 files modified
src/app/qml/components/NotebooksDelegate.qml (+2/-2)
src/app/qml/components/NotesDelegate.qml (+2/-2)
src/app/qml/components/PageWithBottomEdge.qml (+1/-1)
src/app/qml/components/PulldownListView.qml (+1/-1)
src/app/qml/components/RemindersDelegate.qml (+4/-4)
src/app/qml/components/ToolbarSpacer.qml (+2/-2)
src/app/qml/reminders.qml (+3/-3)
src/app/qml/ui/AccountSelectorPage.qml (+2/-2)
src/app/qml/ui/CameraComponents/CameraToolbar.qml (+1/-1)
src/app/qml/ui/CameraComponents/CameraToolbarButton.qml (+1/-1)
src/app/qml/ui/CameraComponents/CrossFadingButton.qml (+1/-1)
src/app/qml/ui/CameraComponents/FadingButton.qml (+1/-1)
src/app/qml/ui/CameraComponents/ThinSliderStyle.qml (+1/-1)
src/app/qml/ui/CameraComponents/ZoomControl.qml (+1/-1)
src/app/qml/ui/CameraConfirm.qml (+1/-1)
src/app/qml/ui/CameraPage.qml (+1/-1)
src/app/qml/ui/EditNotePage.qml (+2/-2)
src/app/qml/ui/EditNoteView.qml (+2/-2)
src/app/qml/ui/NotePage.qml (+1/-1)
src/app/qml/ui/NoteView.qml (+1/-1)
src/app/qml/ui/NotebooksPage.qml (+2/-2)
src/app/qml/ui/NotesPage.qml (+2/-2)
src/app/qml/ui/RemindersPage.qml (+2/-2)
src/app/qml/ui/SearchNotesPage.qml (+2/-2)
src/app/qml/ui/SetReminderPage.qml (+1/-1)
src/app/qml/ui/SetReminderView.qml (+2/-2)
To merge this branch: bzr merge lp:~kill-animals/reminders-app/update-ubuntu-components-1.1
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
David Planella Approve
Michael Zanetti (community) Needs Information
Review via email: mp+232970@code.launchpad.net

Commit message

Upgraded ubuntu.components to 1.1
Upgraded ubuntu.components.xxxx to 1.0

Description of the change

merged with trunk

To post a comment you must log in.
Revision history for this message
Michael Zanetti (mzanetti) wrote :

Hmm... This prevents it to work on trusty while not being really required... What's the reason for this bump?

review: Needs Information
Revision history for this message
Kill Animals (kill-animals) wrote :

> Hmm... This prevents it to work on trusty while not being really required...
> What's the reason for this bump?

http://askubuntu.com/questions/518912/should-we-be-upgrading-away-from-ubuntu-components-0-1

Use your best discretion. Have you tested this on trusty though? I am a bit surprised that it doesnt work on that platform, although when I used it, I believe I had the SDK ppa and all that jazz.

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

FAILED: Continuous integration, rev:233
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~akiva/reminders-app/update-ubuntu-components-1.1/+merge/232970/+edit-commit-message

http://91.189.93.70:8080/job/reminders-app-ci/497/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1874/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/193/console

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

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

> > Hmm... This prevents it to work on trusty while not being really required...
> > What's the reason for this bump?
>
> http://askubuntu.com/questions/518912/should-we-be-upgrading-away-from-ubuntu-
> components-0-1
>
> Use your best discretion. Have you tested this on trusty though?

No, I haven't. I'm running Utopic here but I often had to revert such changes again because someone on trusty couldn't run it any more... I'll leave it up to David to decide.

> I am a bit
> surprised that it doesnt work on that platform, although when I used it, I
> believe I had the SDK ppa and all that jazz.

Yeah, I think it works with a ppa. Not sure what the requirements are though...

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

We've been migrating all core apps to 1.1, so it's just consistent that we do the same for Reminders.

This will mean, though, that it will not run on Trusty, as Ubuntu.Components 1.1 depend on Qt 5.3, which will not be backported to Trusty.

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/262/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/483/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/154/console

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

Could you please merge from trunk and re-push? Thanks!

review: Needs Fixing
lp:~kill-animals/reminders-app/update-ubuntu-components-1.1 updated
256. By Kill Animals

Merged with Trunk

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

LGTM, thanks!

Revision history for this message
David Planella (dpm) :
review: Approve
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 'src/app/qml/components/NotebooksDelegate.qml'
2--- src/app/qml/components/NotebooksDelegate.qml 2014-09-20 10:52:20 +0000
3+++ src/app/qml/components/NotebooksDelegate.qml 2014-09-23 12:40:36 +0000
4@@ -18,8 +18,8 @@
5
6 import QtQuick 2.3
7 import QtQuick.Layouts 1.0
8-import Ubuntu.Components 0.1
9-import Ubuntu.Components.ListItems 0.1
10+import Ubuntu.Components 1.1
11+import Ubuntu.Components.ListItems 1.0
12 import Evernote 0.1
13
14 Empty {
15
16=== modified file 'src/app/qml/components/NotesDelegate.qml'
17--- src/app/qml/components/NotesDelegate.qml 2014-09-20 10:52:20 +0000
18+++ src/app/qml/components/NotesDelegate.qml 2014-09-23 12:40:36 +0000
19@@ -18,8 +18,8 @@
20
21 import QtQuick 2.3
22 import QtQuick.Layouts 1.0
23-import Ubuntu.Components 0.1
24-import Ubuntu.Components.ListItems 0.1
25+import Ubuntu.Components 1.1
26+import Ubuntu.Components.ListItems 1.0
27
28 Empty {
29 id: root
30
31=== modified file 'src/app/qml/components/PageWithBottomEdge.qml'
32--- src/app/qml/components/PageWithBottomEdge.qml 2014-09-23 11:16:31 +0000
33+++ src/app/qml/components/PageWithBottomEdge.qml 2014-09-23 12:40:36 +0000
34@@ -63,7 +63,7 @@
35 */
36
37 import QtQuick 2.3
38-import Ubuntu.Components 0.1
39+import Ubuntu.Components 1.1
40 import Evernote 0.1
41
42 Page {
43
44=== modified file 'src/app/qml/components/PulldownListView.qml'
45--- src/app/qml/components/PulldownListView.qml 2014-09-20 10:52:20 +0000
46+++ src/app/qml/components/PulldownListView.qml 2014-09-23 12:40:36 +0000
47@@ -17,7 +17,7 @@
48 */
49
50 import QtQuick 2.3
51-import Ubuntu.Components 0.1
52+import Ubuntu.Components 1.1
53
54 ListView {
55 id: root
56
57=== modified file 'src/app/qml/components/RemindersDelegate.qml'
58--- src/app/qml/components/RemindersDelegate.qml 2014-09-20 10:52:20 +0000
59+++ src/app/qml/components/RemindersDelegate.qml 2014-09-23 12:40:36 +0000
60@@ -18,10 +18,10 @@
61
62 import QtQuick 2.3
63 import QtQuick.Layouts 1.0
64-import Ubuntu.Components 0.1
65-import Ubuntu.Components.ListItems 0.1
66-import Ubuntu.Components.Popups 0.1
67-import Ubuntu.Components.Pickers 0.1
68+import Ubuntu.Components 1.1
69+import Ubuntu.Components.ListItems 1.0
70+import Ubuntu.Components.Popups 1.0
71+import Ubuntu.Components.Pickers 1.0
72 import Evernote 0.1
73
74 Base {
75
76=== modified file 'src/app/qml/components/ToolbarSpacer.qml'
77--- src/app/qml/components/ToolbarSpacer.qml 2014-09-20 10:52:20 +0000
78+++ src/app/qml/components/ToolbarSpacer.qml 2014-09-23 12:40:36 +0000
79@@ -17,8 +17,8 @@
80 */
81
82 import QtQuick 2.3
83-import Ubuntu.Components 0.1
84-import Ubuntu.Components.Popups 0.1
85+import Ubuntu.Components 1.1
86+import Ubuntu.Components.Popups 1.0
87
88 Item {
89 id: spacerItem
90
91=== modified file 'src/app/qml/reminders.qml'
92--- src/app/qml/reminders.qml 2014-09-20 10:52:20 +0000
93+++ src/app/qml/reminders.qml 2014-09-23 12:40:36 +0000
94@@ -17,9 +17,9 @@
95 */
96
97 import QtQuick 2.3
98-import Ubuntu.Components 0.1
99-import Ubuntu.Components.Popups 0.1
100-import Ubuntu.Components.ListItems 0.1
101+import Ubuntu.Components 1.1
102+import Ubuntu.Components.Popups 1.0
103+import Ubuntu.Components.ListItems 1.0
104 //import "components"
105 import "ui"
106 import Evernote 0.1
107
108=== modified file 'src/app/qml/ui/AccountSelectorPage.qml'
109--- src/app/qml/ui/AccountSelectorPage.qml 2014-09-20 10:52:20 +0000
110+++ src/app/qml/ui/AccountSelectorPage.qml 2014-09-23 12:40:36 +0000
111@@ -17,8 +17,8 @@
112 */
113
114 import QtQuick 2.3
115-import Ubuntu.Components 0.1
116-import Ubuntu.Components.ListItems 0.1
117+import Ubuntu.Components 1.1
118+import Ubuntu.Components.ListItems 1.0
119 import Ubuntu.OnlineAccounts 0.1
120 import Ubuntu.OnlineAccounts.Client 0.1
121 import Evernote 0.1
122
123=== modified file 'src/app/qml/ui/CameraComponents/CameraToolbar.qml'
124--- src/app/qml/ui/CameraComponents/CameraToolbar.qml 2014-09-20 10:52:20 +0000
125+++ src/app/qml/ui/CameraComponents/CameraToolbar.qml 2014-09-23 12:40:36 +0000
126@@ -16,7 +16,7 @@
127
128 import QtQuick 2.3
129 import QtMultimedia 5.0
130-import Ubuntu.Components 0.1
131+import Ubuntu.Components 1.1
132
133 Item {
134 id: toolbar
135
136=== modified file 'src/app/qml/ui/CameraComponents/CameraToolbarButton.qml'
137--- src/app/qml/ui/CameraComponents/CameraToolbarButton.qml 2014-09-20 10:52:20 +0000
138+++ src/app/qml/ui/CameraComponents/CameraToolbarButton.qml 2014-09-23 12:40:36 +0000
139@@ -15,7 +15,7 @@
140 */
141
142 import QtQuick 2.3
143-import Ubuntu.Components 0.1
144+import Ubuntu.Components 1.1
145
146 AbstractButton {
147 property alias iconWidth: icon.width
148
149=== modified file 'src/app/qml/ui/CameraComponents/CrossFadingButton.qml'
150--- src/app/qml/ui/CameraComponents/CrossFadingButton.qml 2014-09-20 10:52:20 +0000
151+++ src/app/qml/ui/CameraComponents/CrossFadingButton.qml 2014-09-23 12:40:36 +0000
152@@ -15,7 +15,7 @@
153 */
154
155 import QtQuick 2.3
156-import Ubuntu.Components 0.1
157+import Ubuntu.Components 1.1
158 import "constants.js" as Const
159
160 AbstractButton {
161
162=== modified file 'src/app/qml/ui/CameraComponents/FadingButton.qml'
163--- src/app/qml/ui/CameraComponents/FadingButton.qml 2014-09-20 10:52:20 +0000
164+++ src/app/qml/ui/CameraComponents/FadingButton.qml 2014-09-23 12:40:36 +0000
165@@ -15,7 +15,7 @@
166 */
167
168 import QtQuick 2.3
169-import Ubuntu.Components 0.1
170+import Ubuntu.Components 1.1
171 import "constants.js" as Const
172
173 AbstractButton {
174
175=== modified file 'src/app/qml/ui/CameraComponents/ThinSliderStyle.qml'
176--- src/app/qml/ui/CameraComponents/ThinSliderStyle.qml 2014-09-20 10:52:20 +0000
177+++ src/app/qml/ui/CameraComponents/ThinSliderStyle.qml 2014-09-23 12:40:36 +0000
178@@ -15,7 +15,7 @@
179 */
180
181 import QtQuick 2.3
182-import Ubuntu.Components 0.1
183+import Ubuntu.Components 1.1
184
185 /*
186 This delegate is styled using the following properties:
187
188=== modified file 'src/app/qml/ui/CameraComponents/ZoomControl.qml'
189--- src/app/qml/ui/CameraComponents/ZoomControl.qml 2014-09-20 10:52:20 +0000
190+++ src/app/qml/ui/CameraComponents/ZoomControl.qml 2014-09-23 12:40:36 +0000
191@@ -15,7 +15,7 @@
192 */
193
194 import QtQuick 2.3
195-import Ubuntu.Components 0.1
196+import Ubuntu.Components 1.1
197
198 Item {
199 id: zoom
200
201=== modified file 'src/app/qml/ui/CameraConfirm.qml'
202--- src/app/qml/ui/CameraConfirm.qml 2014-09-20 10:52:20 +0000
203+++ src/app/qml/ui/CameraConfirm.qml 2014-09-23 12:40:36 +0000
204@@ -17,7 +17,7 @@
205 */
206
207 import QtQuick 2.3
208-import Ubuntu.Components 0.1
209+import Ubuntu.Components 1.1
210 import Evernote 0.1
211
212 Page {
213
214=== modified file 'src/app/qml/ui/CameraPage.qml'
215--- src/app/qml/ui/CameraPage.qml 2014-09-20 10:52:20 +0000
216+++ src/app/qml/ui/CameraPage.qml 2014-09-23 12:40:36 +0000
217@@ -17,7 +17,7 @@
218 */
219
220 import QtQuick 2.3
221-import Ubuntu.Components 0.1
222+import Ubuntu.Components 1.1
223 import QtMultimedia 5.0
224 import QtQuick.Window 2.0
225 import Evernote 0.1
226
227=== modified file 'src/app/qml/ui/EditNotePage.qml'
228--- src/app/qml/ui/EditNotePage.qml 2014-09-20 10:52:20 +0000
229+++ src/app/qml/ui/EditNotePage.qml 2014-09-23 12:40:36 +0000
230@@ -17,8 +17,8 @@
231 */
232
233 import QtQuick 2.3
234-import Ubuntu.Components 0.1
235-import Ubuntu.Components.ListItems 0.1
236+import Ubuntu.Components 1.1
237+import Ubuntu.Components.ListItems 1.0
238 import Evernote 0.1
239 import "../components"
240
241
242=== modified file 'src/app/qml/ui/EditNoteView.qml'
243--- src/app/qml/ui/EditNoteView.qml 2014-09-23 11:16:31 +0000
244+++ src/app/qml/ui/EditNoteView.qml 2014-09-23 12:40:36 +0000
245@@ -17,8 +17,8 @@
246 */
247
248 import QtQuick 2.3
249-import Ubuntu.Components 0.1
250-import Ubuntu.Components.ListItems 0.1
251+import Ubuntu.Components 1.1
252+import Ubuntu.Components.ListItems 1.0
253 import Ubuntu.Content 0.1
254 import Evernote 0.1
255 import "../components"
256
257=== modified file 'src/app/qml/ui/NotePage.qml'
258--- src/app/qml/ui/NotePage.qml 2014-09-20 10:52:20 +0000
259+++ src/app/qml/ui/NotePage.qml 2014-09-23 12:40:36 +0000
260@@ -17,7 +17,7 @@
261 */
262
263 import QtQuick 2.3
264-import Ubuntu.Components 0.1
265+import Ubuntu.Components 1.1
266 import Evernote 0.1
267 import "../components"
268
269
270=== modified file 'src/app/qml/ui/NoteView.qml'
271--- src/app/qml/ui/NoteView.qml 2014-09-20 10:52:20 +0000
272+++ src/app/qml/ui/NoteView.qml 2014-09-23 12:40:36 +0000
273@@ -17,7 +17,7 @@
274 */
275
276 import QtQuick 2.3
277-import Ubuntu.Components 0.1
278+import Ubuntu.Components 1.1
279 import com.canonical.Oxide 1.0
280 import Evernote 0.1
281 import "../components"
282
283=== modified file 'src/app/qml/ui/NotebooksPage.qml'
284--- src/app/qml/ui/NotebooksPage.qml 2014-09-20 10:52:20 +0000
285+++ src/app/qml/ui/NotebooksPage.qml 2014-09-23 12:40:36 +0000
286@@ -17,8 +17,8 @@
287 */
288
289 import QtQuick 2.3
290-import Ubuntu.Components 0.1
291-import Ubuntu.Components.ListItems 0.1
292+import Ubuntu.Components 1.1
293+import Ubuntu.Components.ListItems 1.0
294 import Evernote 0.1
295 import "../components"
296
297
298=== modified file 'src/app/qml/ui/NotesPage.qml'
299--- src/app/qml/ui/NotesPage.qml 2014-09-23 11:16:31 +0000
300+++ src/app/qml/ui/NotesPage.qml 2014-09-23 12:40:36 +0000
301@@ -18,8 +18,8 @@
302
303 import QtQuick 2.3
304 import QtQuick.Layouts 1.0
305-import Ubuntu.Components 0.1
306-import Ubuntu.Components.ListItems 0.1
307+import Ubuntu.Components 1.1
308+import Ubuntu.Components.ListItems 1.0
309 import Evernote 0.1
310 import "../components"
311
312
313=== modified file 'src/app/qml/ui/RemindersPage.qml'
314--- src/app/qml/ui/RemindersPage.qml 2014-09-20 10:52:20 +0000
315+++ src/app/qml/ui/RemindersPage.qml 2014-09-23 12:40:36 +0000
316@@ -18,8 +18,8 @@
317
318 import QtQuick 2.3
319 import QtQuick.Layouts 1.0
320-import Ubuntu.Components 0.1
321-import Ubuntu.Components.ListItems 0.1
322+import Ubuntu.Components 1.1
323+import Ubuntu.Components.ListItems 1.0
324 import Evernote 0.1
325 import "../components"
326
327
328=== modified file 'src/app/qml/ui/SearchNotesPage.qml'
329--- src/app/qml/ui/SearchNotesPage.qml 2014-09-20 10:52:20 +0000
330+++ src/app/qml/ui/SearchNotesPage.qml 2014-09-23 12:40:36 +0000
331@@ -17,8 +17,8 @@
332 */
333
334 import QtQuick 2.3
335-import Ubuntu.Components 0.1
336-import Ubuntu.Components.ListItems 0.1
337+import Ubuntu.Components 1.1
338+import Ubuntu.Components.ListItems 1.0
339 import Evernote 0.1
340 import "../components"
341
342
343=== modified file 'src/app/qml/ui/SetReminderPage.qml'
344--- src/app/qml/ui/SetReminderPage.qml 2014-09-20 10:52:20 +0000
345+++ src/app/qml/ui/SetReminderPage.qml 2014-09-23 12:40:36 +0000
346@@ -17,7 +17,7 @@
347 */
348
349 import QtQuick 2.3
350-import Ubuntu.Components 0.1
351+import Ubuntu.Components 1.1
352 import Evernote 0.1
353 import "../components"
354
355
356=== modified file 'src/app/qml/ui/SetReminderView.qml'
357--- src/app/qml/ui/SetReminderView.qml 2014-09-20 10:52:20 +0000
358+++ src/app/qml/ui/SetReminderView.qml 2014-09-23 12:40:36 +0000
359@@ -18,8 +18,8 @@
360
361 import QtQuick 2.3
362 import QtQuick.Layouts 1.0
363-import Ubuntu.Components 0.1
364-import Ubuntu.Components.Pickers 0.1
365+import Ubuntu.Components 1.1
366+import Ubuntu.Components.Pickers 1.0
367 import Evernote 0.1
368 import "../components"
369

Subscribers

People subscribed via source and target branches