Merge lp:~renatofilho/ubuntu-docviewer-app/update-debian into lp:ubuntu-docviewer-app

Proposed by Renato Araujo Oliveira Filho on 2017-03-30
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
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve on 2017-04-04
Ubuntu Document Viewer Developers 2017-03-30 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.

To post a comment you must log in.
review: Approve (continuous-integration)
365. By Renato Araujo Oliveira Filho on 2017-04-04

Added apparmor rule.

review: Approve (continuous-integration)

Unmerged revisions

365. By Renato Araujo Oliveira Filho on 2017-04-04

Added apparmor rule.

364. By Renato Araujo Oliveira Filho on 2017-03-30

[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 on 2017-03-29

Fixed pep8 syntax.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== renamed file 'COPYING' => 'COPYING.GPL'
=== added file 'COPYING.LGPL'
--- COPYING.LGPL 1970-01-01 00:00:00 +0000
+++ COPYING.LGPL 2017-04-04 12:49:52 +0000
@@ -0,0 +1,165 @@
1 GNU LESSER GENERAL PUBLIC LICENSE
2 Version 3, 29 June 2007
3
4 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
5 Everyone is permitted to copy and distribute verbatim copies
6 of this license document, but changing it is not allowed.
7
8
9 This version of the GNU Lesser General Public License incorporates
10the terms and conditions of version 3 of the GNU General Public
11License, supplemented by the additional permissions listed below.
12
13 0. Additional Definitions.
14
15 As used herein, "this License" refers to version 3 of the GNU Lesser
16General Public License, and the "GNU GPL" refers to version 3 of the GNU
17General Public License.
18
19 "The Library" refers to a covered work governed by this License,
20other than an Application or a Combined Work as defined below.
21
22 An "Application" is any work that makes use of an interface provided
23by the Library, but which is not otherwise based on the Library.
24Defining a subclass of a class defined by the Library is deemed a mode
25of using an interface provided by the Library.
26
27 A "Combined Work" is a work produced by combining or linking an
28Application with the Library. The particular version of the Library
29with which the Combined Work was made is also called the "Linked
30Version".
31
32 The "Minimal Corresponding Source" for a Combined Work means the
33Corresponding Source for the Combined Work, excluding any source code
34for portions of the Combined Work that, considered in isolation, are
35based on the Application, and not on the Linked Version.
36
37 The "Corresponding Application Code" for a Combined Work means the
38object code and/or source code for the Application, including any data
39and utility programs needed for reproducing the Combined Work from the
40Application, but excluding the System Libraries of the Combined Work.
41
42 1. Exception to Section 3 of the GNU GPL.
43
44 You may convey a covered work under sections 3 and 4 of this License
45without being bound by section 3 of the GNU GPL.
46
47 2. Conveying Modified Versions.
48
49 If you modify a copy of the Library, and, in your modifications, a
50facility refers to a function or data to be supplied by an Application
51that uses the facility (other than as an argument passed when the
52facility is invoked), then you may convey a copy of the modified
53version:
54
55 a) under this License, provided that you make a good faith effort to
56 ensure that, in the event an Application does not supply the
57 function or data, the facility still operates, and performs
58 whatever part of its purpose remains meaningful, or
59
60 b) under the GNU GPL, with none of the additional permissions of
61 this License applicable to that copy.
62
63 3. Object Code Incorporating Material from Library Header Files.
64
65 The object code form of an Application may incorporate material from
66a header file that is part of the Library. You may convey such object
67code under terms of your choice, provided that, if the incorporated
68material is not limited to numerical parameters, data structure
69layouts and accessors, or small macros, inline functions and templates
70(ten or fewer lines in length), you do both of the following:
71
72 a) Give prominent notice with each copy of the object code that the
73 Library is used in it and that the Library and its use are
74 covered by this License.
75
76 b) Accompany the object code with a copy of the GNU GPL and this license
77 document.
78
79 4. Combined Works.
80
81 You may convey a Combined Work under terms of your choice that,
82taken together, effectively do not restrict modification of the
83portions of the Library contained in the Combined Work and reverse
84engineering for debugging such modifications, if you also do each of
85the following:
86
87 a) Give prominent notice with each copy of the Combined Work that
88 the Library is used in it and that the Library and its use are
89 covered by this License.
90
91 b) Accompany the Combined Work with a copy of the GNU GPL and this license
92 document.
93
94 c) For a Combined Work that displays copyright notices during
95 execution, include the copyright notice for the Library among
96 these notices, as well as a reference directing the user to the
97 copies of the GNU GPL and this license document.
98
99 d) Do one of the following:
100
101 0) Convey the Minimal Corresponding Source under the terms of this
102 License, and the Corresponding Application Code in a form
103 suitable for, and under terms that permit, the user to
104 recombine or relink the Application with a modified version of
105 the Linked Version to produce a modified Combined Work, in the
106 manner specified by section 6 of the GNU GPL for conveying
107 Corresponding Source.
108
109 1) Use a suitable shared library mechanism for linking with the
110 Library. A suitable mechanism is one that (a) uses at run time
111 a copy of the Library already present on the user's computer
112 system, and (b) will operate properly with a modified version
113 of the Library that is interface-compatible with the Linked
114 Version.
115
116 e) Provide Installation Information, but only if you would otherwise
117 be required to provide such information under section 6 of the
118 GNU GPL, and only to the extent that such information is
119 necessary to install and execute a modified version of the
120 Combined Work produced by recombining or relinking the
121 Application with a modified version of the Linked Version. (If
122 you use option 4d0, the Installation Information must accompany
123 the Minimal Corresponding Source and Corresponding Application
124 Code. If you use option 4d1, you must provide the Installation
125 Information in the manner specified by section 6 of the GNU GPL
126 for conveying Corresponding Source.)
127
128 5. Combined Libraries.
129
130 You may place library facilities that are a work based on the
131Library side by side in a single library together with other library
132facilities that are not Applications and are not covered by this
133License, and convey such a combined library under terms of your
134choice, if you do both of the following:
135
136 a) Accompany the combined library with a copy of the same work based
137 on the Library, uncombined with any other library facilities,
138 conveyed under the terms of this License.
139
140 b) Give prominent notice with the combined library that part of it
141 is a work based on the Library, and explaining where to find the
142 accompanying uncombined form of the same work.
143
144 6. Revised Versions of the GNU Lesser General Public License.
145
146 The Free Software Foundation may publish revised and/or new versions
147of the GNU Lesser General Public License from time to time. Such new
148versions will be similar in spirit to the present version, but may
149differ in detail to address new problems or concerns.
150
151 Each version is given a distinguishing version number. If the
152Library as you received it specifies that a certain numbered version
153of the GNU Lesser General Public License "or any later version"
154applies to it, you have the option of following the terms and
155conditions either of that published version or of any later version
156published by the Free Software Foundation. If the Library as you
157received it does not specify a version number of the GNU Lesser
158General Public License, you may choose any version of the GNU Lesser
159General Public License ever published by the Free Software Foundation.
160
161 If the Library as you received it specifies that a proxy can decide
162whether future versions of the GNU Lesser General Public License shall
163apply, that proxy's public statement of acceptance of any version is
164permanent authorization for you to choose that version for the
165Library.
0166
=== modified file 'cmake/modules/Click.cmake'
--- cmake/modules/Click.cmake 2016-12-09 15:31:01 +0000
+++ cmake/modules/Click.cmake 2017-04-04 12:49:52 +0000
@@ -63,18 +63,6 @@
63 MESSAGE("Installing LibreOffice from ${UPSTREAM_LIBS_DIR}/opt/libreoffice/lib/libreoffice to ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice")63 MESSAGE("Installing LibreOffice from ${UPSTREAM_LIBS_DIR}/opt/libreoffice/lib/libreoffice to ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice")
64 INSTALL( DIRECTORY ${UPSTREAM_LIBS_DIR}/opt/libreoffice/lib/libreoffice/ DESTINATION ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice )64 INSTALL( DIRECTORY ${UPSTREAM_LIBS_DIR}/opt/libreoffice/lib/libreoffice/ DESTINATION ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice )
65else(CLICK_MODE)65else(CLICK_MODE)
66 execute_process(66 set(QT_IMPORTS_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/${APP_NAME}/qml")
67 COMMAND qmake -query QT_INSTALL_QML67 set(DATA_DIR "${CMAKE_INSTALL_DATADIR}/${APP_NAME}")
68 OUTPUT_VARIABLE QT_IMPORTS_DIR
69 OUTPUT_STRIP_TRAILING_WHITESPACE
70 )
71
72 if (QT_IMPORTS_DIR STREQUAL "")
73 set(QT_IMPORTS_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/qt5/qml")
74 message(STATUS "QT_IMPORTS_DIR is empty using default one: ${QT_IMPORTS_DIR}")
75 else()
76 message(STATUS "QT_IMPORTS_DIR set to ${QT_IMPORTS_DIR}")
77 endif()
78
79 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
80endif(CLICK_MODE)68endif(CLICK_MODE)
8169
=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt 2015-12-04 10:47:19 +0000
+++ data/CMakeLists.txt 2017-04-04 12:49:52 +0000
@@ -7,8 +7,8 @@
7 set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE}")7 set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE}")
8 set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)8 set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
99
10 install(DIRECTORY icons/hicolor DESTINATION ${CMAKE_INSTALL_DATADIR}/icons10 install(FILES ${ICON_FILE}
11 FILES_MATCHING PATTERN *.png11 DESTINATION ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/
12 )12 )
13endif(CLICK_MODE)13endif(CLICK_MODE)
1414
1515
=== added directory 'debian/apparmor'
=== modified file 'debian/control'
--- debian/control 2016-01-14 21:33:47 +0000
+++ debian/control 2017-04-04 12:49:52 +0000
@@ -18,7 +18,7 @@
18 qtdeclarative5-private-dev,18 qtdeclarative5-private-dev,
19 qtbase5-private-dev,19 qtbase5-private-dev,
20 qtdeclarative5-test-plugin20 qtdeclarative5-test-plugin
21Standards-Version: 3.9.621Standards-Version: 3.9.7
22Section: misc22Section: misc
23Homepage: https://launchpad.net/ubuntu-docviewer-app23Homepage: https://launchpad.net/ubuntu-docviewer-app
24Vcs-Bzr: https://code.launchpad.net/~ubuntu-docviewer-dev/ubuntu-docviewer-app/reboot24Vcs-Bzr: https://code.launchpad.net/~ubuntu-docviewer-dev/ubuntu-docviewer-app/reboot
@@ -26,46 +26,15 @@
26Package: ubuntu-docviewer-app26Package: ubuntu-docviewer-app
27Architecture: any27Architecture: any
28Depends: ${misc:Depends},28Depends: ${misc:Depends},
29 qtdeclarative5-documentviewer-common (= ${source:Version}),29 qml-module-qtquick2,
30 qtdeclarative5-documentviewer-libreoffice (= ${source:Version}),30 qml-module-ubuntu-components,
31 qtdeclarative5-documentviewer-pdf (= ${source:Version}), 31 qml-module-qtquick-layouts,
32 suru-icon-theme (>= 14.04+15.10.20150707-0ubuntu1),32 qml-module-qtquick-window2,
33 qtdeclarative5-qtquick2-plugin,
34 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1676) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1676),
35 qtdeclarative5-ubuntu-content1,33 qtdeclarative5-ubuntu-content1,
36 qtdeclarative5-quicklayouts-plugin,34 suru-icon-theme (>= 14.04+15.10.20150707-0ubuntu1)
37 qtdeclarative5-window-plugin
38Description: Document Viewer application35Description: Document Viewer application
39 Core Document Viewer application36 Core Document Viewer application. This package contains a plugin that enables
4037 QML apps to read and display any LibreOffice or PDF document.
41Package: qtdeclarative5-documentviewer-common
42Architecture: any
43Depends: ${misc:Depends},
44 ${shlibs:Depends},
45 ${misc:Pre-Depends},
46Description: Document Viewer QML plugin
47 This package contains a plugin with some helper functions for the Ubuntu
48 Document Viewer.
49
50Package: qtdeclarative5-documentviewer-libreoffice
51Architecture: any
52Depends: ${misc:Depends},
53 ${shlibs:Depends},
54 ${misc:Pre-Depends},
55 libreoffice-vanilla (>= 5.0.0) | libreoffice (>= 5.0.0)
56Description: LibreOffice QML plugin
57 This package contains a plugin that enables QML apps to read
58 and display any LibreOffice document.
59
60Package: qtdeclarative5-documentviewer-pdf
61Architecture: any
62Depends: ${misc:Depends},
63 ${shlibs:Depends},
64 ${misc:Pre-Depends},
65 libpoppler-qt5-1
66Description: Poppler PDF QML plugin
67 This package contains a plugin that enables QML apps to read
68 and display any PDF document, via the Poppler Qt5 bindings.
6938
70Package: ubuntu-docviewer-app-autopilot39Package: ubuntu-docviewer-app-autopilot
71Architecture: all40Architecture: all
7241
=== removed file 'debian/qtdeclarative5-documentviewer-common.install'
--- debian/qtdeclarative5-documentviewer-common.install 2015-10-27 18:47:09 +0000
+++ debian/qtdeclarative5-documentviewer-common.install 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1usr/lib/*/qt5/qml/DocumentViewer/qmldir
2usr/lib/*/qt5/qml/DocumentViewer/libfileqmlplugin.so
30
=== removed file 'debian/qtdeclarative5-documentviewer-libreoffice.install'
--- debian/qtdeclarative5-documentviewer-libreoffice.install 2015-10-27 18:47:09 +0000
+++ debian/qtdeclarative5-documentviewer-libreoffice.install 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1usr/lib/*/qt5/qml/DocumentViewer/LibreOffice
20
=== removed file 'debian/qtdeclarative5-documentviewer-pdf.install'
--- debian/qtdeclarative5-documentviewer-pdf.install 2015-10-27 18:47:09 +0000
+++ debian/qtdeclarative5-documentviewer-pdf.install 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1usr/lib/*/qt5/qml/DocumentViewer/PDF
20
=== modified file 'debian/rules'
--- debian/rules 2015-10-27 19:08:13 +0000
+++ debian/rules 2017-04-04 12:49:52 +0000
@@ -16,3 +16,4 @@
1616
17override_dh_install:17override_dh_install:
18 dh_install --fail-missing18 dh_install --fail-missing
19 dh_apparmor -pubuntu-docviewer-app --profile-name=ubuntu-docviewer-app
1920
=== modified file 'debian/ubuntu-docviewer-app.install'
--- debian/ubuntu-docviewer-app.install 2015-10-27 18:47:09 +0000
+++ debian/ubuntu-docviewer-app.install 2017-04-04 12:49:52 +0000
@@ -2,3 +2,11 @@
2usr/share/applications2usr/share/applications
3usr/share/locale3usr/share/locale
4usr/share/ubuntu-docviewer-app4usr/share/ubuntu-docviewer-app
5debian/apparmor/ubuntu-docviewer-app etc/apparmor.d
6#commom
7usr/lib/*/ubuntu-docviewer-app/qml/DocumentViewer/qmldir
8usr/lib/*/ubuntu-docviewer-app/qml/DocumentViewer/libfileqmlplugin.so
9#PDF
10usr/lib/*/ubuntu-docviewer-app/qml/DocumentViewer/PDF
11#libreOffice
12usr/lib/*/ubuntu-docviewer-app/qml/DocumentViewer/LibreOffice
513
=== modified file 'po/com.ubuntu.docviewer.pot'
--- po/com.ubuntu.docviewer.pot 2016-02-05 22:42:13 +0000
+++ po/com.ubuntu.docviewer.pot 2017-04-04 12:49:52 +0000
@@ -1,6 +1,6 @@
1# SOME DESCRIPTIVE TITLE.1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR Canonical Ltd.2# Copyright (C) YEAR Canonical Ltd.
3# This file is distributed under the same license as the PACKAGE package.3# This file is distributed under the same license as the package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#5#
6#, fuzzy6#, fuzzy
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: \n"9"Project-Id-Version: \n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2016-02-05 23:40+0100\n"11"POT-Creation-Date: 2017-03-29 19:13-0300\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,10 +40,10 @@
40"The path must exist prior to running ubuntu-docviewer-app"40"The path must exist prior to running ubuntu-docviewer-app"
41msgstr ""41msgstr ""
4242
43#: ../src/app/qml/common/DetailsPage.qml:2643#: ../src/app/qml/common/DetailsPage.qml:29
44#: ../src/app/qml/loView/LOViewDefaultHeader.qml:10744#: ../src/app/qml/loView/LOViewDefaultHeader.qml:93
45#: ../src/app/qml/pdfView/PdfView.qml:23545#: ../src/app/qml/pdfView/PdfView.qml:234
46#: ../src/app/qml/textView/TextViewDefaultHeader.qml:6946#: ../src/app/qml/textView/TextViewDefaultHeader.qml:55
47msgid "Details"47msgid "Details"
48msgstr ""48msgstr ""
4949
@@ -78,7 +78,7 @@
78#: ../src/app/qml/common/ErrorDialog.qml:2678#: ../src/app/qml/common/ErrorDialog.qml:26
79#: ../src/app/qml/common/PickImportedDialog.qml:5479#: ../src/app/qml/common/PickImportedDialog.qml:54
80#: ../src/app/qml/common/RejectedImportDialog.qml:3880#: ../src/app/qml/common/RejectedImportDialog.qml:38
81#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:3181#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:33
82#: ../src/app/qml/documentPage/SortSettingsDialog.qml:5382#: ../src/app/qml/documentPage/SortSettingsDialog.qml:53
83msgid "Close"83msgid "Close"
84msgstr ""84msgstr ""
@@ -103,6 +103,12 @@
103msgstr[0] ""103msgstr[0] ""
104msgstr[1] ""104msgstr[1] ""
105105
106#: ../src/app/qml/common/TextualButtonStyle.qml:48
107#: ../src/app/qml/common/TextualButtonStyle.qml:51
108#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:54
109msgid "Pick"
110msgstr ""
111
106#: ../src/app/qml/common/UnknownTypeDialog.qml:27112#: ../src/app/qml/common/UnknownTypeDialog.qml:27
107msgid "Unknown file type"113msgid "Unknown file type"
108msgstr ""114msgstr ""
@@ -115,9 +121,10 @@
115121
116#: ../src/app/qml/common/UnknownTypeDialog.qml:38122#: ../src/app/qml/common/UnknownTypeDialog.qml:38
117#: ../src/app/qml/documentPage/DeleteFileDialog.qml:55123#: ../src/app/qml/documentPage/DeleteFileDialog.qml:55
118#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28124#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:34
125#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:33
119#: ../src/app/qml/loView/LOViewGotoDialog.qml:55126#: ../src/app/qml/loView/LOViewGotoDialog.qml:55
120#: ../src/app/qml/pdfView/PdfView.qml:180127#: ../src/app/qml/pdfView/PdfView.qml:188
121#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51128#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51
122msgid "Cancel"129msgid "Cancel"
123msgstr ""130msgstr ""
@@ -170,7 +177,7 @@
170177
171#: ../src/app/qml/documentPage/DeleteFileDialog.qml:61178#: ../src/app/qml/documentPage/DeleteFileDialog.qml:61
172#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25179#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25
173#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:53180#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:58
174msgid "Delete"181msgid "Delete"
175msgstr ""182msgstr ""
176183
@@ -188,71 +195,59 @@
188"folder or insert removable media containing documents."195"folder or insert removable media containing documents."
189msgstr ""196msgstr ""
190197
198#: ../src/app/qml/documentPage/DocumentListDelegate.qml:75
199msgid "SD card"
200msgstr ""
201
191#. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.202#. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
192#. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum203#. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
193#: ../src/app/qml/documentPage/DocumentListDelegate.qml:103204#: ../src/app/qml/documentPage/DocumentListDelegate.qml:100
194#, qt-format205#, qt-format
195msgid "Today, %1"206msgid "Today, %1"
196msgstr ""207msgstr ""
197208
198#. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.209#. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
199#. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum210#. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
200#: ../src/app/qml/documentPage/DocumentListDelegate.qml:108211#: ../src/app/qml/documentPage/DocumentListDelegate.qml:105
201#, qt-format212#, qt-format
202msgid "Yesterday, %1"213msgid "Yesterday, %1"
203msgstr ""214msgstr ""
204215
205#. TRANSLATORS: this is a datetime formatting string,216#. TRANSLATORS: this is a datetime formatting string,
206#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.217#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
207#: ../src/app/qml/documentPage/DocumentListDelegate.qml:115218#: ../src/app/qml/documentPage/DocumentListDelegate.qml:112
208#: ../src/app/qml/documentPage/DocumentListDelegate.qml:134219#: ../src/app/qml/documentPage/DocumentListDelegate.qml:131
209msgid "yyyy/MM/dd hh:mm"220msgid "yyyy/MM/dd hh:mm"
210msgstr ""221msgstr ""
211222
212#. TRANSLATORS: this is a datetime formatting string,223#. TRANSLATORS: this is a datetime formatting string,
213#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.224#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
214#: ../src/app/qml/documentPage/DocumentListDelegate.qml:128225#: ../src/app/qml/documentPage/DocumentListDelegate.qml:125
215msgid "dddd, hh:mm"226msgid "dddd, hh:mm"
216msgstr ""227msgstr ""
217228
218#: ../src/app/qml/documentPage/DocumentPage.qml:23229#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:27
219#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:3230#: /home/renato/projects/phablet/doc-viewer/debian/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:3
220msgid "Documents"231msgid "Documents"
221msgstr ""232msgstr ""
222233
223#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:29234#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:35
224msgid "Search..."235msgid "Search..."
225msgstr ""236msgstr ""
226237
227#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:36238#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:42
228msgid "Sorting settings..."239msgid "Sorting settings..."
229msgstr ""240msgstr ""
230241
231#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41242#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:56
232msgid "Switch to single column list"
233msgstr ""
234
235#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
236msgid "Switch to grid"
237msgstr ""
238
239#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49
240msgid "Pick"
241msgstr ""
242
243#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
244msgid "Back"
245msgstr ""
246
247#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:47
248msgid "search in documents..."243msgid "search in documents..."
249msgstr ""244msgstr ""
250245
251#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40246#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:46
252msgid "Select None"247msgid "Select None"
253msgstr ""248msgstr ""
254249
255#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40250#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:46
256msgid "Select All"251msgid "Select All"
257msgstr ""252msgstr ""
258253
@@ -265,27 +260,27 @@
265"Please ensure that your query is not misspelled and/or try a different query."260"Please ensure that your query is not misspelled and/or try a different query."
266msgstr ""261msgstr ""
267262
268#: ../src/app/qml/documentPage/SectionHeader.qml:13263#: ../src/app/qml/documentPage/SectionHeader.qml:30
269msgid "Today"264msgid "Today"
270msgstr ""265msgstr ""
271266
272#: ../src/app/qml/documentPage/SectionHeader.qml:16267#: ../src/app/qml/documentPage/SectionHeader.qml:33
273msgid "Yesterday"268msgid "Yesterday"
274msgstr ""269msgstr ""
275270
276#: ../src/app/qml/documentPage/SectionHeader.qml:19271#: ../src/app/qml/documentPage/SectionHeader.qml:36
277msgid "Earlier this week"272msgid "Earlier this week"
278msgstr ""273msgstr ""
279274
280#: ../src/app/qml/documentPage/SectionHeader.qml:22275#: ../src/app/qml/documentPage/SectionHeader.qml:39
281msgid "Earlier this month"276msgid "Earlier this month"
282msgstr ""277msgstr ""
283278
284#: ../src/app/qml/documentPage/SectionHeader.qml:24279#: ../src/app/qml/documentPage/SectionHeader.qml:41
285msgid "Even earlier..."280msgid "Even earlier..."
286msgstr ""281msgstr ""
287282
288#: ../src/app/qml/documentPage/SharePage.qml:23283#: ../src/app/qml/documentPage/SharePage.qml:28
289msgid "Share to"284msgid "Share to"
290msgstr ""285msgstr ""
291286
@@ -309,48 +304,48 @@
309msgid "Reverse order"304msgid "Reverse order"
310msgstr ""305msgstr ""
311306
312#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51307#: ../src/app/qml/loView/LOViewDefaultHeader.qml:41
313#: ../src/app/qml/textView/TextView.qml:43308#: ../src/app/qml/textView/TextView.qml:49
314msgid "Loading..."309msgid "Loading..."
315msgstr ""310msgstr ""
316311
317#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55312#: ../src/app/qml/loView/LOViewDefaultHeader.qml:45
318msgid "LibreOffice text document"313msgid "LibreOffice text document"
319msgstr ""314msgstr ""
320315
321#: ../src/app/qml/loView/LOViewDefaultHeader.qml:57316#: ../src/app/qml/loView/LOViewDefaultHeader.qml:47
322msgid "LibreOffice spread sheet"317msgid "LibreOffice spread sheet"
323msgstr ""318msgstr ""
324319
325#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59320#: ../src/app/qml/loView/LOViewDefaultHeader.qml:49
326msgid "LibreOffice presentation"321msgid "LibreOffice presentation"
327msgstr ""322msgstr ""
328323
329#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61324#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51
330msgid "LibreOffice Draw document"325msgid "LibreOffice Draw document"
331msgstr ""326msgstr ""
332327
333#: ../src/app/qml/loView/LOViewDefaultHeader.qml:63328#: ../src/app/qml/loView/LOViewDefaultHeader.qml:53
334msgid "Unknown LibreOffice document"329msgid "Unknown LibreOffice document"
335msgstr ""330msgstr ""
336331
337#: ../src/app/qml/loView/LOViewDefaultHeader.qml:65332#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55
338msgid "Unknown type document"333msgid "Unknown type document"
339msgstr ""334msgstr ""
340335
341#: ../src/app/qml/loView/LOViewDefaultHeader.qml:85336#: ../src/app/qml/loView/LOViewDefaultHeader.qml:72
342msgid "Go to position..."337msgid "Go to position..."
343msgstr ""338msgstr ""
344339
345#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100340#: ../src/app/qml/loView/LOViewDefaultHeader.qml:86
346#: ../src/app/qml/pdfView/PdfView.qml:228341#: ../src/app/qml/pdfView/PdfView.qml:227
347#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63342#: ../src/app/qml/textView/TextViewDefaultHeader.qml:49
348msgid "Disable night mode"343msgid "Disable night mode"
349msgstr ""344msgstr ""
350345
351#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100346#: ../src/app/qml/loView/LOViewDefaultHeader.qml:86
352#: ../src/app/qml/pdfView/PdfView.qml:228347#: ../src/app/qml/pdfView/PdfView.qml:227
353#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63348#: ../src/app/qml/textView/TextViewDefaultHeader.qml:49
354msgid "Enable night mode"349msgid "Enable night mode"
355msgstr ""350msgstr ""
356351
@@ -367,21 +362,21 @@
367msgid "GO!"362msgid "GO!"
368msgstr ""363msgstr ""
369364
370#: ../src/app/qml/loView/LOViewPage.qml:167365#: ../src/app/qml/loView/LOViewPage.qml:173
371msgid "LibreOffice binaries not found."366msgid "LibreOffice binaries not found."
372msgstr ""367msgstr ""
373368
374#: ../src/app/qml/loView/LOViewPage.qml:170369#: ../src/app/qml/loView/LOViewPage.qml:176
375msgid "Error while loading LibreOffice."370msgid "Error while loading LibreOffice."
376msgstr ""371msgstr ""
377372
378#: ../src/app/qml/loView/LOViewPage.qml:173373#: ../src/app/qml/loView/LOViewPage.qml:179
379msgid ""374msgid ""
380"Document not loaded.\n"375"Document not loaded.\n"
381"The requested document may be corrupt or protected by a password."376"The requested document may be corrupt or protected by a password."
382msgstr ""377msgstr ""
383378
384#: ../src/app/qml/loView/LOViewPage.qml:228379#: ../src/app/qml/loView/LOViewPage.qml:231
385msgid "This sheet has no content."380msgid "This sheet has no content."
386msgstr ""381msgstr ""
387382
@@ -413,7 +408,7 @@
413408
414#. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.409#. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
415#: ../src/app/qml/pdfView/PdfContentsPage.qml:31410#: ../src/app/qml/pdfView/PdfContentsPage.qml:31
416#: ../src/app/qml/pdfView/PdfView.qml:153411#: ../src/app/qml/pdfView/PdfView.qml:157
417msgid "Contents"412msgid "Contents"
418msgstr ""413msgstr ""
419414
@@ -425,15 +420,11 @@
425msgid "Page %1 of %2"420msgid "Page %1 of %2"
426msgstr ""421msgstr ""
427422
428#: ../src/app/qml/pdfView/PdfView.qml:203423#: ../src/app/qml/pdfView/PdfView.qml:212
429msgid "Search"
430msgstr ""
431
432#: ../src/app/qml/pdfView/PdfView.qml:213
433msgid "Go to page..."424msgid "Go to page..."
434msgstr ""425msgstr ""
435426
436#: ../src/app/qml/pdfView/PdfView.qml:221427#: ../src/app/qml/pdfView/PdfView.qml:220
437msgid "Presentation"428msgid "Presentation"
438msgstr ""429msgstr ""
439430
@@ -446,7 +437,7 @@
446msgid "Choose a page between 1 and %1"437msgid "Choose a page between 1 and %1"
447msgstr ""438msgstr ""
448439
449#: ../src/app/qml/ubuntu-docviewer-app.qml:114440#: ../src/app/qml/ubuntu-docviewer-app.qml:134
450msgid "File does not exist."441msgid "File does not exist."
451msgstr ""442msgstr ""
452443
@@ -464,10 +455,10 @@
464msgid "copy %1"455msgid "copy %1"
465msgstr ""456msgstr ""
466457
467#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:1458#: /home/renato/projects/phablet/doc-viewer/debian/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1
468msgid "Document Viewer"459msgid "Document Viewer"
469msgstr ""460msgstr ""
470461
471#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:2462#: /home/renato/projects/phablet/doc-viewer/debian/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2
472msgid "documents;viewer;pdf;reader;"463msgid "documents;viewer;pdf;reader;"
473msgstr ""464msgstr ""
474465
=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt 2015-12-12 10:06:55 +0000
+++ src/app/CMakeLists.txt 2017-04-04 12:49:52 +0000
@@ -37,7 +37,7 @@
37 DEPENDS ${QMLFILES}37 DEPENDS ${QMLFILES}
38)38)
39endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")39endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
4040message(status "DATA DIR: ${DATA_DIR}")
41install(DIRECTORY qml DESTINATION ${DATA_DIR})41install(DIRECTORY qml DESTINATION ${DATA_DIR})
4242
43if(CLICK_MODE)43if(CLICK_MODE)
4444
=== modified file 'src/app/config.h.in'
--- src/app/config.h.in 2016-12-09 12:36:26 +0000
+++ src/app/config.h.in 2017-04-04 12:49:52 +0000
@@ -22,6 +22,7 @@
22#include <QtCore/QString>22#include <QtCore/QString>
2323
24static QString SNAP_ENV = qgetenv("SNAP");24static QString SNAP_ENV = qgetenv("SNAP");
25static QString QT_IMPORTS_DIR = QString("@QT_IMPORTS_DIR@");
2526
26inline bool isClick() {27inline bool isClick() {
27 static bool click = (QCoreApplication::applicationDirPath().contains("click.ubuntu.com"));28 static bool click = (QCoreApplication::applicationDirPath().contains("click.ubuntu.com"));
2829
=== modified file 'src/app/main.cpp'
--- src/app/main.cpp 2015-10-17 15:47:22 +0000
+++ src/app/main.cpp 2017-04-04 12:49:52 +0000
@@ -61,6 +61,7 @@
61 if (!isRunningInstalled())61 if (!isRunningInstalled())
62 view.engine()->addImportPath(QCoreApplication::applicationDirPath() + "/../plugin/");62 view.engine()->addImportPath(QCoreApplication::applicationDirPath() + "/../plugin/");
6363
64 view.engine()->addImportPath(QT_IMPORTS_DIR);
64 view.setSource(QUrl::fromLocalFile(docviewerDirectory() + "/qml/ubuntu-docviewer-app.qml"));65 view.setSource(QUrl::fromLocalFile(docviewerDirectory() + "/qml/ubuntu-docviewer-app.qml"));
65 view.setResizeMode(QQuickView::SizeRootObjectToView);66 view.setResizeMode(QQuickView::SizeRootObjectToView);
6667
6768
=== modified file 'tests/autopilot/ubuntu_docviewer_app/__init__.py'
--- tests/autopilot/ubuntu_docviewer_app/__init__.py 2016-03-08 16:41:43 +0000
+++ tests/autopilot/ubuntu_docviewer_app/__init__.py 2017-04-04 12:49:52 +0000
@@ -43,4 +43,4 @@
4343
44 def __init__(self, *args):44 def __init__(self, *args):
45 super(MainView, self).__init__(*args)45 super(MainView, self).__init__(*args)
46 self.visible.wait_for(True)
47\ No newline at end of file46\ No newline at end of file
47 self.visible.wait_for(True)
4848
=== modified file 'tests/autopilot/ubuntu_docviewer_app/tests/__init__.py'
--- tests/autopilot/ubuntu_docviewer_app/tests/__init__.py 2016-03-08 20:51:37 +0000
+++ tests/autopilot/ubuntu_docviewer_app/tests/__init__.py 2017-04-04 12:49:52 +0000
@@ -37,11 +37,10 @@
3737
38 """38 """
3939
40
41 local_build_location = os.path.dirname(os.path.dirname(os.getcwd()))40 local_build_location = os.path.dirname(os.path.dirname(os.getcwd()))
42 sdk_build_location = os.path.join(os.path.dirname(local_build_location),41 sdk_build_location = os.path.join(os.path.dirname(local_build_location),
43 os.path.basename(local_build_location)42 os.path.basename(local_build_location) +
44 + '-build')43 '-build')
4544
46 local_build_location_qml = os.path.join(local_build_location, 'src', 'app',45 local_build_location_qml = os.path.join(local_build_location, 'src', 'app',
47 'qml', 'ubuntu-docviewer-app.qml')46 'qml', 'ubuntu-docviewer-app.qml')
4847
=== modified file 'tests/autopilot/ubuntu_docviewer_app/tests/test_docviewer.py'
--- tests/autopilot/ubuntu_docviewer_app/tests/test_docviewer.py 2016-03-08 20:50:48 +0000
+++ tests/autopilot/ubuntu_docviewer_app/tests/test_docviewer.py 2017-04-04 12:49:52 +0000
@@ -17,4 +17,4 @@
17 self.launch_app()17 self.launch_app()
1818
19 main_view = self.app.main_view19 main_view = self.app.main_view
20 self.assertTrue(main_view)
21\ No newline at end of file20\ No newline at end of file
21 self.assertTrue(main_view)

Subscribers

People subscribed via source and target branches