Merge lp:~renatofilho/ubuntu-docviewer-app/update-debian into lp:ubuntu-docviewer-app
- update-debian
- Merge into lo-viewer
Proposed by
Renato Araujo Oliveira Filho
Status: | Needs review |
---|---|
Proposed branch: | lp:~renatofilho/ubuntu-docviewer-app/update-debian |
Merge into: | lp:ubuntu-docviewer-app |
Diff against target: |
740 lines (+257/-138) 16 files modified
COPYING.LGPL (+165/-0) cmake/modules/Click.cmake (+2/-14) data/CMakeLists.txt (+2/-2) debian/control (+8/-39) debian/qtdeclarative5-documentviewer-common.install (+0/-2) debian/qtdeclarative5-documentviewer-libreoffice.install (+0/-1) debian/qtdeclarative5-documentviewer-pdf.install (+0/-1) debian/rules (+1/-0) debian/ubuntu-docviewer-app.install (+8/-0) po/com.ubuntu.docviewer.pot (+64/-73) src/app/CMakeLists.txt (+1/-1) src/app/config.h.in (+1/-0) src/app/main.cpp (+1/-0) tests/autopilot/ubuntu_docviewer_app/__init__.py (+1/-1) tests/autopilot/ubuntu_docviewer_app/tests/__init__.py (+2/-3) tests/autopilot/ubuntu_docviewer_app/tests/test_docviewer.py (+1/-1) |
To merge this branch: | bzr merge lp:~renatofilho/ubuntu-docviewer-app/update-debian |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jenkins Bot | continuous-integration | Approve | |
Ubuntu Document Viewer Developers | Pending | ||
Review via email: mp+321452@code.launchpad.net |
Commit message
[debian] Update debian package
Use only one package for apps and plugin.
Install plugins on a private app dir.
Fix icon installation
Added missing LGL COPYING file.
Description of the change
To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
review:
Approve
(continuous-integration)
- 365. By Renato Araujo Oliveira Filho
-
Added apparmor rule.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:365
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
review:
Approve
(continuous-integration)
Unmerged revisions
- 365. By Renato Araujo Oliveira Filho
-
Added apparmor rule.
- 364. By Renato Araujo Oliveira Filho
-
[debian] Update debian package
Use only one package for apps and plugin.
Install plugins on a private app dir.
Fix icon installation
Added missing LGL COPYING file. - 363. By Renato Araujo Oliveira Filho
-
Fixed pep8 syntax.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === renamed file 'COPYING' => 'COPYING.GPL' |
2 | === added file 'COPYING.LGPL' |
3 | --- COPYING.LGPL 1970-01-01 00:00:00 +0000 |
4 | +++ COPYING.LGPL 2017-04-04 12:49:52 +0000 |
5 | @@ -0,0 +1,165 @@ |
6 | + GNU LESSER GENERAL PUBLIC LICENSE |
7 | + Version 3, 29 June 2007 |
8 | + |
9 | + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> |
10 | + Everyone is permitted to copy and distribute verbatim copies |
11 | + of this license document, but changing it is not allowed. |
12 | + |
13 | + |
14 | + This version of the GNU Lesser General Public License incorporates |
15 | +the terms and conditions of version 3 of the GNU General Public |
16 | +License, supplemented by the additional permissions listed below. |
17 | + |
18 | + 0. Additional Definitions. |
19 | + |
20 | + As used herein, "this License" refers to version 3 of the GNU Lesser |
21 | +General Public License, and the "GNU GPL" refers to version 3 of the GNU |
22 | +General Public License. |
23 | + |
24 | + "The Library" refers to a covered work governed by this License, |
25 | +other than an Application or a Combined Work as defined below. |
26 | + |
27 | + An "Application" is any work that makes use of an interface provided |
28 | +by the Library, but which is not otherwise based on the Library. |
29 | +Defining a subclass of a class defined by the Library is deemed a mode |
30 | +of using an interface provided by the Library. |
31 | + |
32 | + A "Combined Work" is a work produced by combining or linking an |
33 | +Application with the Library. The particular version of the Library |
34 | +with which the Combined Work was made is also called the "Linked |
35 | +Version". |
36 | + |
37 | + The "Minimal Corresponding Source" for a Combined Work means the |
38 | +Corresponding Source for the Combined Work, excluding any source code |
39 | +for portions of the Combined Work that, considered in isolation, are |
40 | +based on the Application, and not on the Linked Version. |
41 | + |
42 | + The "Corresponding Application Code" for a Combined Work means the |
43 | +object code and/or source code for the Application, including any data |
44 | +and utility programs needed for reproducing the Combined Work from the |
45 | +Application, but excluding the System Libraries of the Combined Work. |
46 | + |
47 | + 1. Exception to Section 3 of the GNU GPL. |
48 | + |
49 | + You may convey a covered work under sections 3 and 4 of this License |
50 | +without being bound by section 3 of the GNU GPL. |
51 | + |
52 | + 2. Conveying Modified Versions. |
53 | + |
54 | + If you modify a copy of the Library, and, in your modifications, a |
55 | +facility refers to a function or data to be supplied by an Application |
56 | +that uses the facility (other than as an argument passed when the |
57 | +facility is invoked), then you may convey a copy of the modified |
58 | +version: |
59 | + |
60 | + a) under this License, provided that you make a good faith effort to |
61 | + ensure that, in the event an Application does not supply the |
62 | + function or data, the facility still operates, and performs |
63 | + whatever part of its purpose remains meaningful, or |
64 | + |
65 | + b) under the GNU GPL, with none of the additional permissions of |
66 | + this License applicable to that copy. |
67 | + |
68 | + 3. Object Code Incorporating Material from Library Header Files. |
69 | + |
70 | + The object code form of an Application may incorporate material from |
71 | +a header file that is part of the Library. You may convey such object |
72 | +code under terms of your choice, provided that, if the incorporated |
73 | +material is not limited to numerical parameters, data structure |
74 | +layouts and accessors, or small macros, inline functions and templates |
75 | +(ten or fewer lines in length), you do both of the following: |
76 | + |
77 | + a) Give prominent notice with each copy of the object code that the |
78 | + Library is used in it and that the Library and its use are |
79 | + covered by this License. |
80 | + |
81 | + b) Accompany the object code with a copy of the GNU GPL and this license |
82 | + document. |
83 | + |
84 | + 4. Combined Works. |
85 | + |
86 | + You may convey a Combined Work under terms of your choice that, |
87 | +taken together, effectively do not restrict modification of the |
88 | +portions of the Library contained in the Combined Work and reverse |
89 | +engineering for debugging such modifications, if you also do each of |
90 | +the following: |
91 | + |
92 | + a) Give prominent notice with each copy of the Combined Work that |
93 | + the Library is used in it and that the Library and its use are |
94 | + covered by this License. |
95 | + |
96 | + b) Accompany the Combined Work with a copy of the GNU GPL and this license |
97 | + document. |
98 | + |
99 | + c) For a Combined Work that displays copyright notices during |
100 | + execution, include the copyright notice for the Library among |
101 | + these notices, as well as a reference directing the user to the |
102 | + copies of the GNU GPL and this license document. |
103 | + |
104 | + d) Do one of the following: |
105 | + |
106 | + 0) Convey the Minimal Corresponding Source under the terms of this |
107 | + License, and the Corresponding Application Code in a form |
108 | + suitable for, and under terms that permit, the user to |
109 | + recombine or relink the Application with a modified version of |
110 | + the Linked Version to produce a modified Combined Work, in the |
111 | + manner specified by section 6 of the GNU GPL for conveying |
112 | + Corresponding Source. |
113 | + |
114 | + 1) Use a suitable shared library mechanism for linking with the |
115 | + Library. A suitable mechanism is one that (a) uses at run time |
116 | + a copy of the Library already present on the user's computer |
117 | + system, and (b) will operate properly with a modified version |
118 | + of the Library that is interface-compatible with the Linked |
119 | + Version. |
120 | + |
121 | + e) Provide Installation Information, but only if you would otherwise |
122 | + be required to provide such information under section 6 of the |
123 | + GNU GPL, and only to the extent that such information is |
124 | + necessary to install and execute a modified version of the |
125 | + Combined Work produced by recombining or relinking the |
126 | + Application with a modified version of the Linked Version. (If |
127 | + you use option 4d0, the Installation Information must accompany |
128 | + the Minimal Corresponding Source and Corresponding Application |
129 | + Code. If you use option 4d1, you must provide the Installation |
130 | + Information in the manner specified by section 6 of the GNU GPL |
131 | + for conveying Corresponding Source.) |
132 | + |
133 | + 5. Combined Libraries. |
134 | + |
135 | + You may place library facilities that are a work based on the |
136 | +Library side by side in a single library together with other library |
137 | +facilities that are not Applications and are not covered by this |
138 | +License, and convey such a combined library under terms of your |
139 | +choice, if you do both of the following: |
140 | + |
141 | + a) Accompany the combined library with a copy of the same work based |
142 | + on the Library, uncombined with any other library facilities, |
143 | + conveyed under the terms of this License. |
144 | + |
145 | + b) Give prominent notice with the combined library that part of it |
146 | + is a work based on the Library, and explaining where to find the |
147 | + accompanying uncombined form of the same work. |
148 | + |
149 | + 6. Revised Versions of the GNU Lesser General Public License. |
150 | + |
151 | + The Free Software Foundation may publish revised and/or new versions |
152 | +of the GNU Lesser General Public License from time to time. Such new |
153 | +versions will be similar in spirit to the present version, but may |
154 | +differ in detail to address new problems or concerns. |
155 | + |
156 | + Each version is given a distinguishing version number. If the |
157 | +Library as you received it specifies that a certain numbered version |
158 | +of the GNU Lesser General Public License "or any later version" |
159 | +applies to it, you have the option of following the terms and |
160 | +conditions either of that published version or of any later version |
161 | +published by the Free Software Foundation. If the Library as you |
162 | +received it does not specify a version number of the GNU Lesser |
163 | +General Public License, you may choose any version of the GNU Lesser |
164 | +General Public License ever published by the Free Software Foundation. |
165 | + |
166 | + If the Library as you received it specifies that a proxy can decide |
167 | +whether future versions of the GNU Lesser General Public License shall |
168 | +apply, that proxy's public statement of acceptance of any version is |
169 | +permanent authorization for you to choose that version for the |
170 | +Library. |
171 | |
172 | === modified file 'cmake/modules/Click.cmake' |
173 | --- cmake/modules/Click.cmake 2016-12-09 15:31:01 +0000 |
174 | +++ cmake/modules/Click.cmake 2017-04-04 12:49:52 +0000 |
175 | @@ -63,18 +63,6 @@ |
176 | MESSAGE("Installing LibreOffice from ${UPSTREAM_LIBS_DIR}/opt/libreoffice/lib/libreoffice to ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice") |
177 | INSTALL( DIRECTORY ${UPSTREAM_LIBS_DIR}/opt/libreoffice/lib/libreoffice/ DESTINATION ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice ) |
178 | else(CLICK_MODE) |
179 | - execute_process( |
180 | - COMMAND qmake -query QT_INSTALL_QML |
181 | - OUTPUT_VARIABLE QT_IMPORTS_DIR |
182 | - OUTPUT_STRIP_TRAILING_WHITESPACE |
183 | - ) |
184 | - |
185 | - if (QT_IMPORTS_DIR STREQUAL "") |
186 | - set(QT_IMPORTS_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/qt5/qml") |
187 | - message(STATUS "QT_IMPORTS_DIR is empty using default one: ${QT_IMPORTS_DIR}") |
188 | - else() |
189 | - message(STATUS "QT_IMPORTS_DIR set to ${QT_IMPORTS_DIR}") |
190 | - endif() |
191 | - |
192 | - set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME}) |
193 | + set(QT_IMPORTS_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/${APP_NAME}/qml") |
194 | + set(DATA_DIR "${CMAKE_INSTALL_DATADIR}/${APP_NAME}") |
195 | endif(CLICK_MODE) |
196 | |
197 | === modified file 'data/CMakeLists.txt' |
198 | --- data/CMakeLists.txt 2015-12-04 10:47:19 +0000 |
199 | +++ data/CMakeLists.txt 2017-04-04 12:49:52 +0000 |
200 | @@ -7,8 +7,8 @@ |
201 | set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE}") |
202 | set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications) |
203 | |
204 | - install(DIRECTORY icons/hicolor DESTINATION ${CMAKE_INSTALL_DATADIR}/icons |
205 | - FILES_MATCHING PATTERN *.png |
206 | + install(FILES ${ICON_FILE} |
207 | + DESTINATION ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/ |
208 | ) |
209 | endif(CLICK_MODE) |
210 | |
211 | |
212 | === added directory 'debian/apparmor' |
213 | === modified file 'debian/control' |
214 | --- debian/control 2016-01-14 21:33:47 +0000 |
215 | +++ debian/control 2017-04-04 12:49:52 +0000 |
216 | @@ -18,7 +18,7 @@ |
217 | qtdeclarative5-private-dev, |
218 | qtbase5-private-dev, |
219 | qtdeclarative5-test-plugin |
220 | -Standards-Version: 3.9.6 |
221 | +Standards-Version: 3.9.7 |
222 | Section: misc |
223 | Homepage: https://launchpad.net/ubuntu-docviewer-app |
224 | Vcs-Bzr: https://code.launchpad.net/~ubuntu-docviewer-dev/ubuntu-docviewer-app/reboot |
225 | @@ -26,46 +26,15 @@ |
226 | Package: ubuntu-docviewer-app |
227 | Architecture: any |
228 | Depends: ${misc:Depends}, |
229 | - qtdeclarative5-documentviewer-common (= ${source:Version}), |
230 | - qtdeclarative5-documentviewer-libreoffice (= ${source:Version}), |
231 | - qtdeclarative5-documentviewer-pdf (= ${source:Version}), |
232 | - suru-icon-theme (>= 14.04+15.10.20150707-0ubuntu1), |
233 | - qtdeclarative5-qtquick2-plugin, |
234 | - qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1676) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1676), |
235 | + qml-module-qtquick2, |
236 | + qml-module-ubuntu-components, |
237 | + qml-module-qtquick-layouts, |
238 | + qml-module-qtquick-window2, |
239 | qtdeclarative5-ubuntu-content1, |
240 | - qtdeclarative5-quicklayouts-plugin, |
241 | - qtdeclarative5-window-plugin |
242 | + suru-icon-theme (>= 14.04+15.10.20150707-0ubuntu1) |
243 | Description: Document Viewer application |
244 | - Core Document Viewer application |
245 | - |
246 | -Package: qtdeclarative5-documentviewer-common |
247 | -Architecture: any |
248 | -Depends: ${misc:Depends}, |
249 | - ${shlibs:Depends}, |
250 | - ${misc:Pre-Depends}, |
251 | -Description: Document Viewer QML plugin |
252 | - This package contains a plugin with some helper functions for the Ubuntu |
253 | - Document Viewer. |
254 | - |
255 | -Package: qtdeclarative5-documentviewer-libreoffice |
256 | -Architecture: any |
257 | -Depends: ${misc:Depends}, |
258 | - ${shlibs:Depends}, |
259 | - ${misc:Pre-Depends}, |
260 | - libreoffice-vanilla (>= 5.0.0) | libreoffice (>= 5.0.0) |
261 | -Description: LibreOffice QML plugin |
262 | - This package contains a plugin that enables QML apps to read |
263 | - and display any LibreOffice document. |
264 | - |
265 | -Package: qtdeclarative5-documentviewer-pdf |
266 | -Architecture: any |
267 | -Depends: ${misc:Depends}, |
268 | - ${shlibs:Depends}, |
269 | - ${misc:Pre-Depends}, |
270 | - libpoppler-qt5-1 |
271 | -Description: Poppler PDF QML plugin |
272 | - This package contains a plugin that enables QML apps to read |
273 | - and display any PDF document, via the Poppler Qt5 bindings. |
274 | + Core Document Viewer application. This package contains a plugin that enables |
275 | + QML apps to read and display any LibreOffice or PDF document. |
276 | |
277 | Package: ubuntu-docviewer-app-autopilot |
278 | Architecture: all |
279 | |
280 | === removed file 'debian/qtdeclarative5-documentviewer-common.install' |
281 | --- debian/qtdeclarative5-documentviewer-common.install 2015-10-27 18:47:09 +0000 |
282 | +++ debian/qtdeclarative5-documentviewer-common.install 1970-01-01 00:00:00 +0000 |
283 | @@ -1,2 +0,0 @@ |
284 | -usr/lib/*/qt5/qml/DocumentViewer/qmldir |
285 | -usr/lib/*/qt5/qml/DocumentViewer/libfileqmlplugin.so |
286 | |
287 | === removed file 'debian/qtdeclarative5-documentviewer-libreoffice.install' |
288 | --- debian/qtdeclarative5-documentviewer-libreoffice.install 2015-10-27 18:47:09 +0000 |
289 | +++ debian/qtdeclarative5-documentviewer-libreoffice.install 1970-01-01 00:00:00 +0000 |
290 | @@ -1,1 +0,0 @@ |
291 | -usr/lib/*/qt5/qml/DocumentViewer/LibreOffice |
292 | |
293 | === removed file 'debian/qtdeclarative5-documentviewer-pdf.install' |
294 | --- debian/qtdeclarative5-documentviewer-pdf.install 2015-10-27 18:47:09 +0000 |
295 | +++ debian/qtdeclarative5-documentviewer-pdf.install 1970-01-01 00:00:00 +0000 |
296 | @@ -1,1 +0,0 @@ |
297 | -usr/lib/*/qt5/qml/DocumentViewer/PDF |
298 | |
299 | === modified file 'debian/rules' |
300 | --- debian/rules 2015-10-27 19:08:13 +0000 |
301 | +++ debian/rules 2017-04-04 12:49:52 +0000 |
302 | @@ -16,3 +16,4 @@ |
303 | |
304 | override_dh_install: |
305 | dh_install --fail-missing |
306 | + dh_apparmor -pubuntu-docviewer-app --profile-name=ubuntu-docviewer-app |
307 | |
308 | === modified file 'debian/ubuntu-docviewer-app.install' |
309 | --- debian/ubuntu-docviewer-app.install 2015-10-27 18:47:09 +0000 |
310 | +++ debian/ubuntu-docviewer-app.install 2017-04-04 12:49:52 +0000 |
311 | @@ -2,3 +2,11 @@ |
312 | usr/share/applications |
313 | usr/share/locale |
314 | usr/share/ubuntu-docviewer-app |
315 | +debian/apparmor/ubuntu-docviewer-app etc/apparmor.d |
316 | +#commom |
317 | +usr/lib/*/ubuntu-docviewer-app/qml/DocumentViewer/qmldir |
318 | +usr/lib/*/ubuntu-docviewer-app/qml/DocumentViewer/libfileqmlplugin.so |
319 | |
320 | +usr/lib/*/ubuntu-docviewer-app/qml/DocumentViewer/PDF |
321 | +#libreOffice |
322 | +usr/lib/*/ubuntu-docviewer-app/qml/DocumentViewer/LibreOffice |
323 | |
324 | === modified file 'po/com.ubuntu.docviewer.pot' |
325 | --- po/com.ubuntu.docviewer.pot 2016-02-05 22:42:13 +0000 |
326 | +++ po/com.ubuntu.docviewer.pot 2017-04-04 12:49:52 +0000 |
327 | @@ -1,6 +1,6 @@ |
328 | # SOME DESCRIPTIVE TITLE. |
329 | # Copyright (C) YEAR Canonical Ltd. |
330 | -# This file is distributed under the same license as the PACKAGE package. |
331 | +# This file is distributed under the same license as the package. |
332 | # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. |
333 | # |
334 | #, fuzzy |
335 | @@ -8,7 +8,7 @@ |
336 | msgstr "" |
337 | "Project-Id-Version: \n" |
338 | "Report-Msgid-Bugs-To: \n" |
339 | -"POT-Creation-Date: 2016-02-05 23:40+0100\n" |
340 | +"POT-Creation-Date: 2017-03-29 19:13-0300\n" |
341 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
342 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
343 | "Language-Team: LANGUAGE <LL@li.org>\n" |
344 | @@ -40,10 +40,10 @@ |
345 | "The path must exist prior to running ubuntu-docviewer-app" |
346 | msgstr "" |
347 | |
348 | -#: ../src/app/qml/common/DetailsPage.qml:26 |
349 | -#: ../src/app/qml/loView/LOViewDefaultHeader.qml:107 |
350 | -#: ../src/app/qml/pdfView/PdfView.qml:235 |
351 | -#: ../src/app/qml/textView/TextViewDefaultHeader.qml:69 |
352 | +#: ../src/app/qml/common/DetailsPage.qml:29 |
353 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:93 |
354 | +#: ../src/app/qml/pdfView/PdfView.qml:234 |
355 | +#: ../src/app/qml/textView/TextViewDefaultHeader.qml:55 |
356 | msgid "Details" |
357 | msgstr "" |
358 | |
359 | @@ -78,7 +78,7 @@ |
360 | #: ../src/app/qml/common/ErrorDialog.qml:26 |
361 | #: ../src/app/qml/common/PickImportedDialog.qml:54 |
362 | #: ../src/app/qml/common/RejectedImportDialog.qml:38 |
363 | -#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:31 |
364 | +#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:33 |
365 | #: ../src/app/qml/documentPage/SortSettingsDialog.qml:53 |
366 | msgid "Close" |
367 | msgstr "" |
368 | @@ -103,6 +103,12 @@ |
369 | msgstr[0] "" |
370 | msgstr[1] "" |
371 | |
372 | +#: ../src/app/qml/common/TextualButtonStyle.qml:48 |
373 | +#: ../src/app/qml/common/TextualButtonStyle.qml:51 |
374 | +#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:54 |
375 | +msgid "Pick" |
376 | +msgstr "" |
377 | + |
378 | #: ../src/app/qml/common/UnknownTypeDialog.qml:27 |
379 | msgid "Unknown file type" |
380 | msgstr "" |
381 | @@ -115,9 +121,10 @@ |
382 | |
383 | #: ../src/app/qml/common/UnknownTypeDialog.qml:38 |
384 | #: ../src/app/qml/documentPage/DeleteFileDialog.qml:55 |
385 | -#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28 |
386 | +#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:34 |
387 | +#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:33 |
388 | #: ../src/app/qml/loView/LOViewGotoDialog.qml:55 |
389 | -#: ../src/app/qml/pdfView/PdfView.qml:180 |
390 | +#: ../src/app/qml/pdfView/PdfView.qml:188 |
391 | #: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51 |
392 | msgid "Cancel" |
393 | msgstr "" |
394 | @@ -170,7 +177,7 @@ |
395 | |
396 | #: ../src/app/qml/documentPage/DeleteFileDialog.qml:61 |
397 | #: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25 |
398 | -#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:53 |
399 | +#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:58 |
400 | msgid "Delete" |
401 | msgstr "" |
402 | |
403 | @@ -188,71 +195,59 @@ |
404 | "folder or insert removable media containing documents." |
405 | msgstr "" |
406 | |
407 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:75 |
408 | +msgid "SD card" |
409 | +msgstr "" |
410 | + |
411 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
412 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
413 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:103 |
414 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:100 |
415 | #, qt-format |
416 | msgid "Today, %1" |
417 | msgstr "" |
418 | |
419 | #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings. |
420 | #. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum |
421 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:108 |
422 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:105 |
423 | #, qt-format |
424 | msgid "Yesterday, %1" |
425 | msgstr "" |
426 | |
427 | #. TRANSLATORS: this is a datetime formatting string, |
428 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
429 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:115 |
430 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:134 |
431 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:112 |
432 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:131 |
433 | msgid "yyyy/MM/dd hh:mm" |
434 | msgstr "" |
435 | |
436 | #. TRANSLATORS: this is a datetime formatting string, |
437 | #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
438 | -#: ../src/app/qml/documentPage/DocumentListDelegate.qml:128 |
439 | +#: ../src/app/qml/documentPage/DocumentListDelegate.qml:125 |
440 | msgid "dddd, hh:mm" |
441 | msgstr "" |
442 | |
443 | -#: ../src/app/qml/documentPage/DocumentPage.qml:23 |
444 | -#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:3 |
445 | +#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:27 |
446 | +#: /home/renato/projects/phablet/doc-viewer/debian/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:3 |
447 | msgid "Documents" |
448 | msgstr "" |
449 | |
450 | -#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:29 |
451 | +#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:35 |
452 | msgid "Search..." |
453 | msgstr "" |
454 | |
455 | -#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:36 |
456 | +#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:42 |
457 | msgid "Sorting settings..." |
458 | msgstr "" |
459 | |
460 | -#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41 |
461 | -msgid "Switch to single column list" |
462 | -msgstr "" |
463 | - |
464 | -#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41 |
465 | -msgid "Switch to grid" |
466 | -msgstr "" |
467 | - |
468 | -#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49 |
469 | -msgid "Pick" |
470 | -msgstr "" |
471 | - |
472 | -#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27 |
473 | -msgid "Back" |
474 | -msgstr "" |
475 | - |
476 | -#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:47 |
477 | +#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:56 |
478 | msgid "search in documents..." |
479 | msgstr "" |
480 | |
481 | -#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40 |
482 | +#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:46 |
483 | msgid "Select None" |
484 | msgstr "" |
485 | |
486 | -#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40 |
487 | +#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:46 |
488 | msgid "Select All" |
489 | msgstr "" |
490 | |
491 | @@ -265,27 +260,27 @@ |
492 | "Please ensure that your query is not misspelled and/or try a different query." |
493 | msgstr "" |
494 | |
495 | -#: ../src/app/qml/documentPage/SectionHeader.qml:13 |
496 | +#: ../src/app/qml/documentPage/SectionHeader.qml:30 |
497 | msgid "Today" |
498 | msgstr "" |
499 | |
500 | -#: ../src/app/qml/documentPage/SectionHeader.qml:16 |
501 | +#: ../src/app/qml/documentPage/SectionHeader.qml:33 |
502 | msgid "Yesterday" |
503 | msgstr "" |
504 | |
505 | -#: ../src/app/qml/documentPage/SectionHeader.qml:19 |
506 | +#: ../src/app/qml/documentPage/SectionHeader.qml:36 |
507 | msgid "Earlier this week" |
508 | msgstr "" |
509 | |
510 | -#: ../src/app/qml/documentPage/SectionHeader.qml:22 |
511 | +#: ../src/app/qml/documentPage/SectionHeader.qml:39 |
512 | msgid "Earlier this month" |
513 | msgstr "" |
514 | |
515 | -#: ../src/app/qml/documentPage/SectionHeader.qml:24 |
516 | +#: ../src/app/qml/documentPage/SectionHeader.qml:41 |
517 | msgid "Even earlier..." |
518 | msgstr "" |
519 | |
520 | -#: ../src/app/qml/documentPage/SharePage.qml:23 |
521 | +#: ../src/app/qml/documentPage/SharePage.qml:28 |
522 | msgid "Share to" |
523 | msgstr "" |
524 | |
525 | @@ -309,48 +304,48 @@ |
526 | msgid "Reverse order" |
527 | msgstr "" |
528 | |
529 | -#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51 |
530 | -#: ../src/app/qml/textView/TextView.qml:43 |
531 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:41 |
532 | +#: ../src/app/qml/textView/TextView.qml:49 |
533 | msgid "Loading..." |
534 | msgstr "" |
535 | |
536 | -#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55 |
537 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:45 |
538 | msgid "LibreOffice text document" |
539 | msgstr "" |
540 | |
541 | -#: ../src/app/qml/loView/LOViewDefaultHeader.qml:57 |
542 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:47 |
543 | msgid "LibreOffice spread sheet" |
544 | msgstr "" |
545 | |
546 | -#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59 |
547 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:49 |
548 | msgid "LibreOffice presentation" |
549 | msgstr "" |
550 | |
551 | -#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61 |
552 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51 |
553 | msgid "LibreOffice Draw document" |
554 | msgstr "" |
555 | |
556 | -#: ../src/app/qml/loView/LOViewDefaultHeader.qml:63 |
557 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:53 |
558 | msgid "Unknown LibreOffice document" |
559 | msgstr "" |
560 | |
561 | -#: ../src/app/qml/loView/LOViewDefaultHeader.qml:65 |
562 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55 |
563 | msgid "Unknown type document" |
564 | msgstr "" |
565 | |
566 | -#: ../src/app/qml/loView/LOViewDefaultHeader.qml:85 |
567 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:72 |
568 | msgid "Go to position..." |
569 | msgstr "" |
570 | |
571 | -#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100 |
572 | -#: ../src/app/qml/pdfView/PdfView.qml:228 |
573 | -#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63 |
574 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:86 |
575 | +#: ../src/app/qml/pdfView/PdfView.qml:227 |
576 | +#: ../src/app/qml/textView/TextViewDefaultHeader.qml:49 |
577 | msgid "Disable night mode" |
578 | msgstr "" |
579 | |
580 | -#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100 |
581 | -#: ../src/app/qml/pdfView/PdfView.qml:228 |
582 | -#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63 |
583 | +#: ../src/app/qml/loView/LOViewDefaultHeader.qml:86 |
584 | +#: ../src/app/qml/pdfView/PdfView.qml:227 |
585 | +#: ../src/app/qml/textView/TextViewDefaultHeader.qml:49 |
586 | msgid "Enable night mode" |
587 | msgstr "" |
588 | |
589 | @@ -367,21 +362,21 @@ |
590 | msgid "GO!" |
591 | msgstr "" |
592 | |
593 | -#: ../src/app/qml/loView/LOViewPage.qml:167 |
594 | +#: ../src/app/qml/loView/LOViewPage.qml:173 |
595 | msgid "LibreOffice binaries not found." |
596 | msgstr "" |
597 | |
598 | -#: ../src/app/qml/loView/LOViewPage.qml:170 |
599 | +#: ../src/app/qml/loView/LOViewPage.qml:176 |
600 | msgid "Error while loading LibreOffice." |
601 | msgstr "" |
602 | |
603 | -#: ../src/app/qml/loView/LOViewPage.qml:173 |
604 | +#: ../src/app/qml/loView/LOViewPage.qml:179 |
605 | msgid "" |
606 | "Document not loaded.\n" |
607 | "The requested document may be corrupt or protected by a password." |
608 | msgstr "" |
609 | |
610 | -#: ../src/app/qml/loView/LOViewPage.qml:228 |
611 | +#: ../src/app/qml/loView/LOViewPage.qml:231 |
612 | msgid "This sheet has no content." |
613 | msgstr "" |
614 | |
615 | @@ -413,7 +408,7 @@ |
616 | |
617 | #. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document. |
618 | #: ../src/app/qml/pdfView/PdfContentsPage.qml:31 |
619 | -#: ../src/app/qml/pdfView/PdfView.qml:153 |
620 | +#: ../src/app/qml/pdfView/PdfView.qml:157 |
621 | msgid "Contents" |
622 | msgstr "" |
623 | |
624 | @@ -425,15 +420,11 @@ |
625 | msgid "Page %1 of %2" |
626 | msgstr "" |
627 | |
628 | -#: ../src/app/qml/pdfView/PdfView.qml:203 |
629 | -msgid "Search" |
630 | -msgstr "" |
631 | - |
632 | -#: ../src/app/qml/pdfView/PdfView.qml:213 |
633 | +#: ../src/app/qml/pdfView/PdfView.qml:212 |
634 | msgid "Go to page..." |
635 | msgstr "" |
636 | |
637 | -#: ../src/app/qml/pdfView/PdfView.qml:221 |
638 | +#: ../src/app/qml/pdfView/PdfView.qml:220 |
639 | msgid "Presentation" |
640 | msgstr "" |
641 | |
642 | @@ -446,7 +437,7 @@ |
643 | msgid "Choose a page between 1 and %1" |
644 | msgstr "" |
645 | |
646 | -#: ../src/app/qml/ubuntu-docviewer-app.qml:114 |
647 | +#: ../src/app/qml/ubuntu-docviewer-app.qml:134 |
648 | msgid "File does not exist." |
649 | msgstr "" |
650 | |
651 | @@ -464,10 +455,10 @@ |
652 | msgid "copy %1" |
653 | msgstr "" |
654 | |
655 | -#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
656 | +#: /home/renato/projects/phablet/doc-viewer/debian/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1 |
657 | msgid "Document Viewer" |
658 | msgstr "" |
659 | |
660 | -#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
661 | +#: /home/renato/projects/phablet/doc-viewer/debian/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2 |
662 | msgid "documents;viewer;pdf;reader;" |
663 | msgstr "" |
664 | |
665 | === modified file 'src/app/CMakeLists.txt' |
666 | --- src/app/CMakeLists.txt 2015-12-12 10:06:55 +0000 |
667 | +++ src/app/CMakeLists.txt 2017-04-04 12:49:52 +0000 |
668 | @@ -37,7 +37,7 @@ |
669 | DEPENDS ${QMLFILES} |
670 | ) |
671 | endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") |
672 | - |
673 | +message(status "DATA DIR: ${DATA_DIR}") |
674 | install(DIRECTORY qml DESTINATION ${DATA_DIR}) |
675 | |
676 | if(CLICK_MODE) |
677 | |
678 | === modified file 'src/app/config.h.in' |
679 | --- src/app/config.h.in 2016-12-09 12:36:26 +0000 |
680 | +++ src/app/config.h.in 2017-04-04 12:49:52 +0000 |
681 | @@ -22,6 +22,7 @@ |
682 | #include <QtCore/QString> |
683 | |
684 | static QString SNAP_ENV = qgetenv("SNAP"); |
685 | +static QString QT_IMPORTS_DIR = QString("@QT_IMPORTS_DIR@"); |
686 | |
687 | inline bool isClick() { |
688 | static bool click = (QCoreApplication::applicationDirPath().contains("click.ubuntu.com")); |
689 | |
690 | === modified file 'src/app/main.cpp' |
691 | --- src/app/main.cpp 2015-10-17 15:47:22 +0000 |
692 | +++ src/app/main.cpp 2017-04-04 12:49:52 +0000 |
693 | @@ -61,6 +61,7 @@ |
694 | if (!isRunningInstalled()) |
695 | view.engine()->addImportPath(QCoreApplication::applicationDirPath() + "/../plugin/"); |
696 | |
697 | + view.engine()->addImportPath(QT_IMPORTS_DIR); |
698 | view.setSource(QUrl::fromLocalFile(docviewerDirectory() + "/qml/ubuntu-docviewer-app.qml")); |
699 | view.setResizeMode(QQuickView::SizeRootObjectToView); |
700 | |
701 | |
702 | === modified file 'tests/autopilot/ubuntu_docviewer_app/__init__.py' |
703 | --- tests/autopilot/ubuntu_docviewer_app/__init__.py 2016-03-08 16:41:43 +0000 |
704 | +++ tests/autopilot/ubuntu_docviewer_app/__init__.py 2017-04-04 12:49:52 +0000 |
705 | @@ -43,4 +43,4 @@ |
706 | |
707 | def __init__(self, *args): |
708 | super(MainView, self).__init__(*args) |
709 | - self.visible.wait_for(True) |
710 | \ No newline at end of file |
711 | + self.visible.wait_for(True) |
712 | |
713 | === modified file 'tests/autopilot/ubuntu_docviewer_app/tests/__init__.py' |
714 | --- tests/autopilot/ubuntu_docviewer_app/tests/__init__.py 2016-03-08 20:51:37 +0000 |
715 | +++ tests/autopilot/ubuntu_docviewer_app/tests/__init__.py 2017-04-04 12:49:52 +0000 |
716 | @@ -37,11 +37,10 @@ |
717 | |
718 | """ |
719 | |
720 | - |
721 | local_build_location = os.path.dirname(os.path.dirname(os.getcwd())) |
722 | sdk_build_location = os.path.join(os.path.dirname(local_build_location), |
723 | - os.path.basename(local_build_location) |
724 | - + '-build') |
725 | + os.path.basename(local_build_location) + |
726 | + '-build') |
727 | |
728 | local_build_location_qml = os.path.join(local_build_location, 'src', 'app', |
729 | 'qml', 'ubuntu-docviewer-app.qml') |
730 | |
731 | === modified file 'tests/autopilot/ubuntu_docviewer_app/tests/test_docviewer.py' |
732 | --- tests/autopilot/ubuntu_docviewer_app/tests/test_docviewer.py 2016-03-08 20:50:48 +0000 |
733 | +++ tests/autopilot/ubuntu_docviewer_app/tests/test_docviewer.py 2017-04-04 12:49:52 +0000 |
734 | @@ -17,4 +17,4 @@ |
735 | self.launch_app() |
736 | |
737 | main_view = self.app.main_view |
738 | - self.assertTrue(main_view) |
739 | \ No newline at end of file |
740 | + self.assertTrue(main_view) |
PASSED: Continuous integration, rev:364 /core-apps- jenkins. ubuntu. com/job/ docviewer- app-ci/ 280/ /core-apps- jenkins. ubuntu. com/job/ generic- update- mp/1032/ console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /core-apps- jenkins. ubuntu. com/job/ docviewer- app-ci/ 280/rebuild
https:/