Ubuntu Notes app

Merge lp:~renatofilho/reminders-app/snappy-unity8 into lp:reminders-app

  1. snappy-unity8
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 596
Merged at revision: 591
Proposed branch: lp:~renatofilho/reminders-app/snappy-unity8
Merge into: lp:reminders-app
Diff against target: 218 lines (+166/-3)
5 files modified
setup/gui/ubuntu-notes-app.desktop (+97/-0)
snap/ubuntu-notes-app.wrapper (+7/-0)
snapcraft.yaml (+58/-0)
src/app/qml/Reminders.qml (+1/-1)
src/libqtevernote/notesstore.cpp (+3/-2)
To merge this branch: bzr merge lp:~renatofilho/reminders-app/snappy-unity8
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Jenkins Bot continuous-integration Approve
Review via email: mp+312393@code.launchpad.net

Commit message

Make sure that the paths used to store notes is writable.
Created snap package.

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

PASSED: Continuous integration, rev:596
https://core-apps-jenkins.ubuntu.com/job/reminders-app-ci/59/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/999/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/reminders-app-ci/59/rebuild

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

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'setup'
=== added directory 'setup/gui'
=== added file 'setup/gui/icon.png'
0Binary files setup/gui/icon.png 1970-01-01 00:00:00 +0000 and setup/gui/icon.png 2016-12-05 11:35:31 +0000 differ0Binary files setup/gui/icon.png 1970-01-01 00:00:00 +0000 and setup/gui/icon.png 2016-12-05 11:35:31 +0000 differ
=== added file 'setup/gui/ubuntu-notes-app.desktop'
--- setup/gui/ubuntu-notes-app.desktop 1970-01-01 00:00:00 +0000
+++ setup/gui/ubuntu-notes-app.desktop 2016-12-05 11:35:31 +0000
@@ -0,0 +1,97 @@
1[Desktop Entry]
2Name=Notes
3Name[am]=ማስታወሻዎች
4Name[ar]=ملاحظات
5Name[ast]=Notes
6Name[az]=Qeydlər
7Name[bem]=Utulembo
8Name[bg]=Бележки
9Name[br]=Notennoù
10Name[bs]=Bilješke
11Name[ca]=Notes
12Name[ca@valencia]=Notes
13Name[cs]=Poznámky
14Name[cy]=Nodiadau
15Name[da]=Noter
16Name[de]=Notizen
17Name[el]=Σημειώσεις
18Name[en_AU]=Notes
19Name[en_GB]=Notes
20Name[es]=Notas
21Name[eu]=Oharrak
22Name[fa]=یادداشت‌ها
23Name[fi]=Muistiinpanot
24Name[fo]=Viðmerkingar
25Name[fr]=Notes
26Name[fr_CA]=Notes
27Name[gd]=Nòtaichean
28Name[gl]=Notas
29Name[he]=פתקיות
30Name[hu]=Jegyzetek
31Name[id]=Catatan
32Name[is]=Minnispunktar
33Name[it]=Note
34Name[ja]=ノート
35Name[km]=ចំណាំ
36Name[ko]=쪽지
37Name[lv]=Piezīmes
38Name[ms]=Nota
39Name[my]=မှတ်စုများ
40Name[nb]=Notater
41Name[nl]=Notities
42Name[pa]=ਨੋਟ
43Name[pl]=Notatki
44Name[pt]=Notas
45Name[pt_BR]=Notas
46Name[ro]=Notițe
47Name[ru]=Заметки
48Name[sk]=Poznámky
49Name[sl]=Sporočilca
50Name[sq]=Shënimet
51Name[sr]=Белешке
52Name[st]=Dinoutu
53Name[sv]=Anteckningar
54Name[ta]=குறிப்புகள்
55Name[tr]=Notlar
56Name[ug]=ئىزاھ
57Name[uk]=Нотатки
58Name[zh_CN]=笔记
59Name[zh_TW]=記事
60Comment=Ubuntu Notes app, powered by Evernote
61Comment[am]=የ ኡቡንቱ ማስታወሻ መተግበሪያ በ ሁልጊዜ ማስታወሻ
62Comment[ast]=App Notes d'Ubuntu, basada n'Evernote
63Comment[br]=Arload Notennoù Ubuntu, kaset en-dro gant Evernote
64Comment[bs]=Aplikacija Ubuntu bilješke, pogonjena uz Evernote
65Comment[de]=Ubuntu-Notizenanwendung, von Evernote bereitgestellt
66Comment[el]=Εφαρμογή Σημειώσεις Ubuntu, από το Evernote
67Comment[en_AU]=Ubuntu Notes app, powered by Evernote
68Comment[en_GB]=Ubuntu Notes app, powered by Evernote
69Comment[es]=Ubuntu Notes, con Evernote
70Comment[fa]=کارهٔ یادداشت اوبونتو، قدرت‌گرفته از اورنوت
71Comment[fi]=Ubuntun muistiinpanosovellus, taustavoimana Evernote
72Comment[fo]=Ubuntu Notes appan, Evernoterikin
73Comment[fr]=Application Notes d'Ubuntu, fonctionnant avec Evernote
74Comment[fr_CA]=Appli Notes d'Ubuntu, propulsé par Evernote
75Comment[gd]=Aplacaid nòtaichean Ubuntu, le cumhachd Evernote
76Comment[gl]=Aplicativo de notas para Ubuntu, con tecnoloxía de Evernote
77Comment[hu]=Jegyzet alkalmazás Ubuntuhoz Evernote alapokon
78Comment[it]=App per le note di Ubuntu, basata su Evernote
79Comment[lv]=Ubuntu piezīmju lietotne, darbina Evernote
80Comment[nb]=Ubuntu notatprogram, drevet av Evernote
81Comment[nl]=Ubuntu Notes-app, geleverd door Evernote
82Comment[pl]=Aplikacja Ubuntu Notatki wspierająca Evernote
83Comment[pt]=Ubuntu Notes app, powered by Evernote
84Comment[sk]=Ubuntu aplikácia Poznámky, poháňaná Evernote
85Comment[sl]=Sporočilca Ubuntu s podporo Evernote
86Comment[sr]=Убунту Белешке, покреће Evernote
87Comment[sv]=Ubuntu Notes, drivet av Evernote
88Comment[tr]=Ubuntu Notlar uygulaması, Evernote desteğiyle
89Comment[uk]=Програма для роботи з нотатками Ubuntu з підтримкою Evernote
90Exec=reminders %u
91Icon=${SNAP}/meta/gui/icon.png
92Terminal=false
93Type=Application
94X-Ubuntu-Touch=true
95X-Ubuntu-Default-Department-ID=accessories
96X-Ubuntu-Splash-Show-Header=true
97X-Ubuntu-Splash-Color=#E5E3E5
098
=== added directory 'snap'
=== added directory 'snap/ubuntu-app-platform'
=== added file 'snap/ubuntu-notes-app.wrapper'
--- snap/ubuntu-notes-app.wrapper 1970-01-01 00:00:00 +0000
+++ snap/ubuntu-notes-app.wrapper 2016-12-05 11:35:31 +0000
@@ -0,0 +1,7 @@
1#!/bin/sh
2
3# Disable the chromium sandbox to work around https://launchpad.net/bugs/1599234.
4# Rely on snapd’s security policy instead.
5export OXIDE_NO_SANDBOX=1
6
7exec $SNAP/usr/bin/reminders "$@"
08
=== added file 'snapcraft.yaml'
--- snapcraft.yaml 1970-01-01 00:00:00 +0000
+++ snapcraft.yaml 2016-12-05 11:35:31 +0000
@@ -0,0 +1,58 @@
1name: ubuntu-notes-app
2version: 0.4
3summary: Notes application
4description: Note taking application powered by Evernote
5confinement: devmode # use "strict" to enforce system access only via declared interfaces
6grade: devel
7
8apps:
9 ubuntu-notes-app:
10 command: desktop-launch $SNAP/bin/ubuntu-notes-app "$@"
11 plugs: [opengl, platform, unity7, unity8]
12
13plugs:
14 platform:
15 interface: content
16 content: ubuntu-app-platform1
17 target: ubuntu-app-platform
18 default-provider: ubuntu-app-platform
19
20parts:
21 ubuntu-notes-app:
22 plugin: cmake
23 configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DCLICK_MODE=off]
24 source: .
25 build-packages:
26 - cmake
27 - gettext
28 - intltool
29 - libboost-dev
30 - liboxideqt-qmlplugin
31 - libssl-dev
32 - pkg-config
33 - qt5-default
34 - qtdeclarative5-dev
35 - qtdeclarative5-dev-tools
36 - qtpim5-dev
37 stage-packages:
38 - qtdeclarative5-evernote0.1
39 - signon-plugin-oauth2
40 snap:
41 # ubuntu-notes-app
42 - usr/bin/reminders
43 - usr/bin/push-helper
44 - usr/share/accounts/applications/*
45 - usr/share/applications/*
46 - usr/share/locale
47 - usr/share/reminders/*
48 # qtdeclarative5-evernote0.1
49 - usr/lib/*/qt5/qml/Evernote
50 # signon-plugin-oauth2
51 - usr/lib/*/signon
52 after:
53 - desktop-ubuntu-app-platform
54 environment:
55 source: snap/
56 plugin: dump
57 organize:
58 ubuntu-notes-app.wrapper: bin/ubuntu-notes-app
059
=== modified file 'src/app/qml/Reminders.qml'
--- src/app/qml/Reminders.qml 2016-05-23 12:36:49 +0000
+++ src/app/qml/Reminders.qml 2016-12-05 11:35:31 +0000
@@ -225,7 +225,7 @@
225225
226 switch (accounts.count) {226 switch (accounts.count) {
227 case 0:227 case 0:
228 PopupUtils.open(noAccountDialog, root);228 PopupUtils.open(noAccountDialog);
229 print("No account available. Please set up an account in System Settings.");229 print("No account available. Please set up an account in System Settings.");
230 break;230 break;
231 case 1:231 case 1:
232232
=== modified file 'src/libqtevernote/notesstore.cpp'
--- src/libqtevernote/notesstore.cpp 2016-04-29 07:47:14 +0000
+++ src/libqtevernote/notesstore.cpp 2016-12-05 11:35:31 +0000
@@ -72,7 +72,8 @@
7272
73 m_organizerAdapter = new OrganizerAdapter(this);73 m_organizerAdapter = new OrganizerAdapter(this);
7474
75 QDir storageDir(QStandardPaths::standardLocations(QStandardPaths::DataLocation).first());75 QDir storageDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation));
76 qCDebug(dcNotesStore) << "Notes storare dir" << storageDir;
76 if (!storageDir.exists()) {77 if (!storageDir.exists()) {
77 qCDebug(dcNotesStore) << "Creating storage directory:" << storageDir.absolutePath();78 qCDebug(dcNotesStore) << "Creating storage directory:" << storageDir.absolutePath();
78 storageDir.mkpath(storageDir.absolutePath());79 storageDir.mkpath(storageDir.absolutePath());
@@ -122,7 +123,7 @@
122123
123QString NotesStore::storageLocation()124QString NotesStore::storageLocation()
124{125{
125 return QStandardPaths::standardLocations(QStandardPaths::DataLocation).first() + "/" + m_username + "/";126 return QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/" + m_username + "/";
126}127}
127128
128void NotesStore::userStoreConnected()129void NotesStore::userStoreConnected()

Subscribers

People subscribed via source and target branches