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

Proposed by Renato Araujo Oliveira Filho on 2016-12-02
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄 on 2016-12-05
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 🍺🐧🐱 🦄 2016-12-02 Approve on 2016-12-05
Jenkins Bot continuous-integration Approve on 2016-12-05
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.
review: Approve (continuous-integration)
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

LGTM

review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches