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
=== modified file 'src/app/qml/components/NotebooksDelegate.qml'
--- src/app/qml/components/NotebooksDelegate.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/components/NotebooksDelegate.qml 2014-09-23 12:40:36 +0000
@@ -18,8 +18,8 @@
1818
19import QtQuick 2.319import QtQuick 2.3
20import QtQuick.Layouts 1.020import QtQuick.Layouts 1.0
21import Ubuntu.Components 0.121import Ubuntu.Components 1.1
22import Ubuntu.Components.ListItems 0.122import Ubuntu.Components.ListItems 1.0
23import Evernote 0.123import Evernote 0.1
2424
25Empty {25Empty {
2626
=== modified file 'src/app/qml/components/NotesDelegate.qml'
--- src/app/qml/components/NotesDelegate.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/components/NotesDelegate.qml 2014-09-23 12:40:36 +0000
@@ -18,8 +18,8 @@
1818
19import QtQuick 2.319import QtQuick 2.3
20import QtQuick.Layouts 1.020import QtQuick.Layouts 1.0
21import Ubuntu.Components 0.121import Ubuntu.Components 1.1
22import Ubuntu.Components.ListItems 0.122import Ubuntu.Components.ListItems 1.0
2323
24Empty {24Empty {
25 id: root25 id: root
2626
=== modified file 'src/app/qml/components/PageWithBottomEdge.qml'
--- src/app/qml/components/PageWithBottomEdge.qml 2014-09-23 11:16:31 +0000
+++ src/app/qml/components/PageWithBottomEdge.qml 2014-09-23 12:40:36 +0000
@@ -63,7 +63,7 @@
63*/63*/
6464
65import QtQuick 2.365import QtQuick 2.3
66import Ubuntu.Components 0.166import Ubuntu.Components 1.1
67import Evernote 0.167import Evernote 0.1
6868
69Page {69Page {
7070
=== modified file 'src/app/qml/components/PulldownListView.qml'
--- src/app/qml/components/PulldownListView.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/components/PulldownListView.qml 2014-09-23 12:40:36 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 0.120import Ubuntu.Components 1.1
2121
22ListView {22ListView {
23 id: root23 id: root
2424
=== modified file 'src/app/qml/components/RemindersDelegate.qml'
--- src/app/qml/components/RemindersDelegate.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/components/RemindersDelegate.qml 2014-09-23 12:40:36 +0000
@@ -18,10 +18,10 @@
1818
19import QtQuick 2.319import QtQuick 2.3
20import QtQuick.Layouts 1.020import QtQuick.Layouts 1.0
21import Ubuntu.Components 0.121import Ubuntu.Components 1.1
22import Ubuntu.Components.ListItems 0.122import Ubuntu.Components.ListItems 1.0
23import Ubuntu.Components.Popups 0.123import Ubuntu.Components.Popups 1.0
24import Ubuntu.Components.Pickers 0.124import Ubuntu.Components.Pickers 1.0
25import Evernote 0.125import Evernote 0.1
2626
27Base {27Base {
2828
=== modified file 'src/app/qml/components/ToolbarSpacer.qml'
--- src/app/qml/components/ToolbarSpacer.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/components/ToolbarSpacer.qml 2014-09-23 12:40:36 +0000
@@ -17,8 +17,8 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 0.120import Ubuntu.Components 1.1
21import Ubuntu.Components.Popups 0.121import Ubuntu.Components.Popups 1.0
2222
23Item {23Item {
24 id: spacerItem24 id: spacerItem
2525
=== modified file 'src/app/qml/reminders.qml'
--- src/app/qml/reminders.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/reminders.qml 2014-09-23 12:40:36 +0000
@@ -17,9 +17,9 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 0.120import Ubuntu.Components 1.1
21import Ubuntu.Components.Popups 0.121import Ubuntu.Components.Popups 1.0
22import Ubuntu.Components.ListItems 0.122import Ubuntu.Components.ListItems 1.0
23//import "components"23//import "components"
24import "ui"24import "ui"
25import Evernote 0.125import Evernote 0.1
2626
=== modified file 'src/app/qml/ui/AccountSelectorPage.qml'
--- src/app/qml/ui/AccountSelectorPage.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/ui/AccountSelectorPage.qml 2014-09-23 12:40:36 +0000
@@ -17,8 +17,8 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 0.120import Ubuntu.Components 1.1
21import Ubuntu.Components.ListItems 0.121import Ubuntu.Components.ListItems 1.0
22import Ubuntu.OnlineAccounts 0.122import Ubuntu.OnlineAccounts 0.1
23import Ubuntu.OnlineAccounts.Client 0.123import Ubuntu.OnlineAccounts.Client 0.1
24import Evernote 0.124import Evernote 0.1
2525
=== modified file 'src/app/qml/ui/CameraComponents/CameraToolbar.qml'
--- src/app/qml/ui/CameraComponents/CameraToolbar.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/ui/CameraComponents/CameraToolbar.qml 2014-09-23 12:40:36 +0000
@@ -16,7 +16,7 @@
1616
17import QtQuick 2.317import QtQuick 2.3
18import QtMultimedia 5.018import QtMultimedia 5.0
19import Ubuntu.Components 0.119import Ubuntu.Components 1.1
2020
21Item {21Item {
22 id: toolbar22 id: toolbar
2323
=== modified file 'src/app/qml/ui/CameraComponents/CameraToolbarButton.qml'
--- src/app/qml/ui/CameraComponents/CameraToolbarButton.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/ui/CameraComponents/CameraToolbarButton.qml 2014-09-23 12:40:36 +0000
@@ -15,7 +15,7 @@
15 */15 */
1616
17import QtQuick 2.317import QtQuick 2.3
18import Ubuntu.Components 0.118import Ubuntu.Components 1.1
1919
20AbstractButton {20AbstractButton {
21 property alias iconWidth: icon.width21 property alias iconWidth: icon.width
2222
=== modified file 'src/app/qml/ui/CameraComponents/CrossFadingButton.qml'
--- src/app/qml/ui/CameraComponents/CrossFadingButton.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/ui/CameraComponents/CrossFadingButton.qml 2014-09-23 12:40:36 +0000
@@ -15,7 +15,7 @@
15 */15 */
1616
17import QtQuick 2.317import QtQuick 2.3
18import Ubuntu.Components 0.118import Ubuntu.Components 1.1
19import "constants.js" as Const19import "constants.js" as Const
2020
21AbstractButton {21AbstractButton {
2222
=== modified file 'src/app/qml/ui/CameraComponents/FadingButton.qml'
--- src/app/qml/ui/CameraComponents/FadingButton.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/ui/CameraComponents/FadingButton.qml 2014-09-23 12:40:36 +0000
@@ -15,7 +15,7 @@
15 */15 */
1616
17import QtQuick 2.317import QtQuick 2.3
18import Ubuntu.Components 0.118import Ubuntu.Components 1.1
19import "constants.js" as Const19import "constants.js" as Const
2020
21AbstractButton {21AbstractButton {
2222
=== modified file 'src/app/qml/ui/CameraComponents/ThinSliderStyle.qml'
--- src/app/qml/ui/CameraComponents/ThinSliderStyle.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/ui/CameraComponents/ThinSliderStyle.qml 2014-09-23 12:40:36 +0000
@@ -15,7 +15,7 @@
15 */15 */
1616
17import QtQuick 2.317import QtQuick 2.3
18import Ubuntu.Components 0.118import Ubuntu.Components 1.1
1919
20/*20/*
21 This delegate is styled using the following properties:21 This delegate is styled using the following properties:
2222
=== modified file 'src/app/qml/ui/CameraComponents/ZoomControl.qml'
--- src/app/qml/ui/CameraComponents/ZoomControl.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/ui/CameraComponents/ZoomControl.qml 2014-09-23 12:40:36 +0000
@@ -15,7 +15,7 @@
15 */15 */
1616
17import QtQuick 2.317import QtQuick 2.3
18import Ubuntu.Components 0.118import Ubuntu.Components 1.1
1919
20Item {20Item {
21 id: zoom21 id: zoom
2222
=== modified file 'src/app/qml/ui/CameraConfirm.qml'
--- src/app/qml/ui/CameraConfirm.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/ui/CameraConfirm.qml 2014-09-23 12:40:36 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 0.120import Ubuntu.Components 1.1
21import Evernote 0.121import Evernote 0.1
2222
23Page {23Page {
2424
=== modified file 'src/app/qml/ui/CameraPage.qml'
--- src/app/qml/ui/CameraPage.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/ui/CameraPage.qml 2014-09-23 12:40:36 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 0.120import Ubuntu.Components 1.1
21import QtMultimedia 5.021import QtMultimedia 5.0
22import QtQuick.Window 2.022import QtQuick.Window 2.0
23import Evernote 0.123import Evernote 0.1
2424
=== modified file 'src/app/qml/ui/EditNotePage.qml'
--- src/app/qml/ui/EditNotePage.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/ui/EditNotePage.qml 2014-09-23 12:40:36 +0000
@@ -17,8 +17,8 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 0.120import Ubuntu.Components 1.1
21import Ubuntu.Components.ListItems 0.121import Ubuntu.Components.ListItems 1.0
22import Evernote 0.122import Evernote 0.1
23import "../components"23import "../components"
2424
2525
=== modified file 'src/app/qml/ui/EditNoteView.qml'
--- src/app/qml/ui/EditNoteView.qml 2014-09-23 11:16:31 +0000
+++ src/app/qml/ui/EditNoteView.qml 2014-09-23 12:40:36 +0000
@@ -17,8 +17,8 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 0.120import Ubuntu.Components 1.1
21import Ubuntu.Components.ListItems 0.121import Ubuntu.Components.ListItems 1.0
22import Ubuntu.Content 0.122import Ubuntu.Content 0.1
23import Evernote 0.123import Evernote 0.1
24import "../components"24import "../components"
2525
=== modified file 'src/app/qml/ui/NotePage.qml'
--- src/app/qml/ui/NotePage.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/ui/NotePage.qml 2014-09-23 12:40:36 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 0.120import Ubuntu.Components 1.1
21import Evernote 0.121import Evernote 0.1
22import "../components"22import "../components"
2323
2424
=== modified file 'src/app/qml/ui/NoteView.qml'
--- src/app/qml/ui/NoteView.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/ui/NoteView.qml 2014-09-23 12:40:36 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 0.120import Ubuntu.Components 1.1
21import com.canonical.Oxide 1.0 21import com.canonical.Oxide 1.0
22import Evernote 0.122import Evernote 0.1
23import "../components"23import "../components"
2424
=== modified file 'src/app/qml/ui/NotebooksPage.qml'
--- src/app/qml/ui/NotebooksPage.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/ui/NotebooksPage.qml 2014-09-23 12:40:36 +0000
@@ -17,8 +17,8 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 0.120import Ubuntu.Components 1.1
21import Ubuntu.Components.ListItems 0.121import Ubuntu.Components.ListItems 1.0
22import Evernote 0.122import Evernote 0.1
23import "../components"23import "../components"
2424
2525
=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml 2014-09-23 11:16:31 +0000
+++ src/app/qml/ui/NotesPage.qml 2014-09-23 12:40:36 +0000
@@ -18,8 +18,8 @@
1818
19import QtQuick 2.319import QtQuick 2.3
20import QtQuick.Layouts 1.020import QtQuick.Layouts 1.0
21import Ubuntu.Components 0.121import Ubuntu.Components 1.1
22import Ubuntu.Components.ListItems 0.122import Ubuntu.Components.ListItems 1.0
23import Evernote 0.123import Evernote 0.1
24import "../components"24import "../components"
2525
2626
=== modified file 'src/app/qml/ui/RemindersPage.qml'
--- src/app/qml/ui/RemindersPage.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/ui/RemindersPage.qml 2014-09-23 12:40:36 +0000
@@ -18,8 +18,8 @@
1818
19import QtQuick 2.319import QtQuick 2.3
20import QtQuick.Layouts 1.020import QtQuick.Layouts 1.0
21import Ubuntu.Components 0.121import Ubuntu.Components 1.1
22import Ubuntu.Components.ListItems 0.122import Ubuntu.Components.ListItems 1.0
23import Evernote 0.123import Evernote 0.1
24import "../components"24import "../components"
2525
2626
=== modified file 'src/app/qml/ui/SearchNotesPage.qml'
--- src/app/qml/ui/SearchNotesPage.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/ui/SearchNotesPage.qml 2014-09-23 12:40:36 +0000
@@ -17,8 +17,8 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 0.120import Ubuntu.Components 1.1
21import Ubuntu.Components.ListItems 0.121import Ubuntu.Components.ListItems 1.0
22import Evernote 0.122import Evernote 0.1
23import "../components"23import "../components"
2424
2525
=== modified file 'src/app/qml/ui/SetReminderPage.qml'
--- src/app/qml/ui/SetReminderPage.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/ui/SetReminderPage.qml 2014-09-23 12:40:36 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 0.120import Ubuntu.Components 1.1
21import Evernote 0.121import Evernote 0.1
22import "../components"22import "../components"
2323
2424
=== modified file 'src/app/qml/ui/SetReminderView.qml'
--- src/app/qml/ui/SetReminderView.qml 2014-09-20 10:52:20 +0000
+++ src/app/qml/ui/SetReminderView.qml 2014-09-23 12:40:36 +0000
@@ -18,8 +18,8 @@
1818
19import QtQuick 2.319import QtQuick 2.3
20import QtQuick.Layouts 1.020import QtQuick.Layouts 1.0
21import Ubuntu.Components 0.121import Ubuntu.Components 1.1
22import Ubuntu.Components.Pickers 0.122import Ubuntu.Components.Pickers 1.0
23import Evernote 0.123import Evernote 0.1
24import "../components"24import "../components"
2525

Subscribers

People subscribed via source and target branches