ubuntu-touch-coreapps-reviewers team mailing list archive
-
ubuntu-touch-coreapps-reviewers team
-
Mailing list archive
-
Message #10321
[Merge] lp:~renatofilho/ubuntu-docviewer-app/update-debian into lp:ubuntu-docviewer-app
Renato Araujo Oliveira Filho has proposed merging lp:~renatofilho/ubuntu-docviewer-app/update-debian into lp:ubuntu-docviewer-app.
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.
Requested reviews:
Jenkins Bot (ubuntu-core-apps-jenkins-bot): continuous-integration
Ubuntu Document Viewer Developers (ubuntu-docviewer-dev)
For more details, see:
https://code.launchpad.net/~renatofilho/ubuntu-docviewer-app/update-debian/+merge/321452
--
Your team Ubuntu Document Viewer Developers is requested to review the proposed merge of lp:~renatofilho/ubuntu-docviewer-app/update-debian into lp:ubuntu-docviewer-app.
=== renamed file 'COPYING' => 'COPYING.GPL'
=== added file 'COPYING.LGPL'
--- COPYING.LGPL 1970-01-01 00:00:00 +0000
+++ COPYING.LGPL 2017-03-30 13:42:29 +0000
@@ -0,0 +1,165 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
=== modified file 'cmake/modules/Click.cmake'
--- cmake/modules/Click.cmake 2016-12-09 15:31:01 +0000
+++ cmake/modules/Click.cmake 2017-03-30 13:42:29 +0000
@@ -63,18 +63,6 @@
MESSAGE("Installing LibreOffice from ${UPSTREAM_LIBS_DIR}/opt/libreoffice/lib/libreoffice to ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice")
INSTALL( DIRECTORY ${UPSTREAM_LIBS_DIR}/opt/libreoffice/lib/libreoffice/ DESTINATION ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice )
else(CLICK_MODE)
- execute_process(
- COMMAND qmake -query QT_INSTALL_QML
- OUTPUT_VARIABLE QT_IMPORTS_DIR
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
-
- if (QT_IMPORTS_DIR STREQUAL "")
- set(QT_IMPORTS_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/qt5/qml")
- message(STATUS "QT_IMPORTS_DIR is empty using default one: ${QT_IMPORTS_DIR}")
- else()
- message(STATUS "QT_IMPORTS_DIR set to ${QT_IMPORTS_DIR}")
- endif()
-
- set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
+ set(QT_IMPORTS_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/${APP_NAME}/qml")
+ set(DATA_DIR "${CMAKE_INSTALL_DATADIR}/${APP_NAME}")
endif(CLICK_MODE)
=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt 2015-12-04 10:47:19 +0000
+++ data/CMakeLists.txt 2017-03-30 13:42:29 +0000
@@ -7,8 +7,8 @@
set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE}")
set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
- install(DIRECTORY icons/hicolor DESTINATION ${CMAKE_INSTALL_DATADIR}/icons
- FILES_MATCHING PATTERN *.png
+ install(FILES ${ICON_FILE}
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/
)
endif(CLICK_MODE)
=== modified file 'debian/control'
--- debian/control 2016-01-14 21:33:47 +0000
+++ debian/control 2017-03-30 13:42:29 +0000
@@ -18,7 +18,7 @@
qtdeclarative5-private-dev,
qtbase5-private-dev,
qtdeclarative5-test-plugin
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
Section: misc
Homepage: https://launchpad.net/ubuntu-docviewer-app
Vcs-Bzr: https://code.launchpad.net/~ubuntu-docviewer-dev/ubuntu-docviewer-app/reboot
@@ -26,46 +26,15 @@
Package: ubuntu-docviewer-app
Architecture: any
Depends: ${misc:Depends},
- qtdeclarative5-documentviewer-common (= ${source:Version}),
- qtdeclarative5-documentviewer-libreoffice (= ${source:Version}),
- qtdeclarative5-documentviewer-pdf (= ${source:Version}),
- suru-icon-theme (>= 14.04+15.10.20150707-0ubuntu1),
- qtdeclarative5-qtquick2-plugin,
- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1676) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1676),
+ qml-module-qtquick2,
+ qml-module-ubuntu-components,
+ qml-module-qtquick-layouts,
+ qml-module-qtquick-window2,
qtdeclarative5-ubuntu-content1,
- qtdeclarative5-quicklayouts-plugin,
- qtdeclarative5-window-plugin
+ suru-icon-theme (>= 14.04+15.10.20150707-0ubuntu1)
Description: Document Viewer application
- Core Document Viewer application
-
-Package: qtdeclarative5-documentviewer-common
-Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends},
- ${misc:Pre-Depends},
-Description: Document Viewer QML plugin
- This package contains a plugin with some helper functions for the Ubuntu
- Document Viewer.
-
-Package: qtdeclarative5-documentviewer-libreoffice
-Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends},
- ${misc:Pre-Depends},
- libreoffice-vanilla (>= 5.0.0) | libreoffice (>= 5.0.0)
-Description: LibreOffice QML plugin
- This package contains a plugin that enables QML apps to read
- and display any LibreOffice document.
-
-Package: qtdeclarative5-documentviewer-pdf
-Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends},
- ${misc:Pre-Depends},
- libpoppler-qt5-1
-Description: Poppler PDF QML plugin
- This package contains a plugin that enables QML apps to read
- and display any PDF document, via the Poppler Qt5 bindings.
+ Core Document Viewer application. This package contains a plugin that enables
+ QML apps to read and display any LibreOffice or PDF document.
Package: ubuntu-docviewer-app-autopilot
Architecture: all
=== 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 @@
-usr/lib/*/qt5/qml/DocumentViewer/qmldir
-usr/lib/*/qt5/qml/DocumentViewer/libfileqmlplugin.so
=== 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 @@
-usr/lib/*/qt5/qml/DocumentViewer/LibreOffice
=== 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 @@
-usr/lib/*/qt5/qml/DocumentViewer/PDF
=== 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-03-30 13:42:29 +0000
@@ -2,3 +2,10 @@
usr/share/applications
usr/share/locale
usr/share/ubuntu-docviewer-app
+#commom
+usr/lib/*/ubuntu-docviewer-app/qml/DocumentViewer/qmldir
+usr/lib/*/ubuntu-docviewer-app/qml/DocumentViewer/libfileqmlplugin.so
+#PDF
+usr/lib/*/ubuntu-docviewer-app/qml/DocumentViewer/PDF
+#libreOffice
+usr/lib/*/ubuntu-docviewer-app/qml/DocumentViewer/LibreOffice
=== 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-03-30 13:42:29 +0000
@@ -1,6 +1,6 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR Canonical Ltd.
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-05 23:40+0100\n"
+"POT-Creation-Date: 2017-03-29 19:13-0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -40,10 +40,10 @@
"The path must exist prior to running ubuntu-docviewer-app"
msgstr ""
-#: ../src/app/qml/common/DetailsPage.qml:26
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:107
-#: ../src/app/qml/pdfView/PdfView.qml:235
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:69
+#: ../src/app/qml/common/DetailsPage.qml:29
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:93
+#: ../src/app/qml/pdfView/PdfView.qml:234
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:55
msgid "Details"
msgstr ""
@@ -78,7 +78,7 @@
#: ../src/app/qml/common/ErrorDialog.qml:26
#: ../src/app/qml/common/PickImportedDialog.qml:54
#: ../src/app/qml/common/RejectedImportDialog.qml:38
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:31
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:33
#: ../src/app/qml/documentPage/SortSettingsDialog.qml:53
msgid "Close"
msgstr ""
@@ -103,6 +103,12 @@
msgstr[0] ""
msgstr[1] ""
+#: ../src/app/qml/common/TextualButtonStyle.qml:48
+#: ../src/app/qml/common/TextualButtonStyle.qml:51
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:54
+msgid "Pick"
+msgstr ""
+
#: ../src/app/qml/common/UnknownTypeDialog.qml:27
msgid "Unknown file type"
msgstr ""
@@ -115,9 +121,10 @@
#: ../src/app/qml/common/UnknownTypeDialog.qml:38
#: ../src/app/qml/documentPage/DeleteFileDialog.qml:55
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:28
+#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:34
+#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:33
#: ../src/app/qml/loView/LOViewGotoDialog.qml:55
-#: ../src/app/qml/pdfView/PdfView.qml:180
+#: ../src/app/qml/pdfView/PdfView.qml:188
#: ../src/app/qml/pdfView/PdfViewGotoDialog.qml:51
msgid "Cancel"
msgstr ""
@@ -170,7 +177,7 @@
#: ../src/app/qml/documentPage/DeleteFileDialog.qml:61
#: ../src/app/qml/documentPage/DocumentDelegateActions.qml:25
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:53
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:58
msgid "Delete"
msgstr ""
@@ -188,71 +195,59 @@
"folder or insert removable media containing documents."
msgstr ""
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:75
+msgid "SD card"
+msgstr ""
+
#. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
#. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:103
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:100
#, qt-format
msgid "Today, %1"
msgstr ""
#. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
#. http://qt-project.org/doc/qt-4.8/qlocale.html#FormatType-enum
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:108
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:105
#, qt-format
msgid "Yesterday, %1"
msgstr ""
#. TRANSLATORS: this is a datetime formatting string,
#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:115
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:134
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:112
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:131
msgid "yyyy/MM/dd hh:mm"
msgstr ""
#. TRANSLATORS: this is a datetime formatting string,
#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
-#: ../src/app/qml/documentPage/DocumentListDelegate.qml:128
+#: ../src/app/qml/documentPage/DocumentListDelegate.qml:125
msgid "dddd, hh:mm"
msgstr ""
-#: ../src/app/qml/documentPage/DocumentPage.qml:23
-#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:27
+#: /home/renato/projects/phablet/doc-viewer/debian/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:3
msgid "Documents"
msgstr ""
-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:29
+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:35
msgid "Search..."
msgstr ""
-#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:36
+#: ../src/app/qml/documentPage/DocumentPageDefaultHeader.qml:42
msgid "Sorting settings..."
msgstr ""
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
-msgid "Switch to single column list"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:41
-msgid "Switch to grid"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPagePickModeHeader.qml:49
-msgid "Pick"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
-msgid "Back"
-msgstr ""
-
-#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:47
+#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:56
msgid "search in documents..."
msgstr ""
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:46
msgid "Select None"
msgstr ""
-#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:40
+#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:46
msgid "Select All"
msgstr ""
@@ -265,27 +260,27 @@
"Please ensure that your query is not misspelled and/or try a different query."
msgstr ""
-#: ../src/app/qml/documentPage/SectionHeader.qml:13
+#: ../src/app/qml/documentPage/SectionHeader.qml:30
msgid "Today"
msgstr ""
-#: ../src/app/qml/documentPage/SectionHeader.qml:16
+#: ../src/app/qml/documentPage/SectionHeader.qml:33
msgid "Yesterday"
msgstr ""
-#: ../src/app/qml/documentPage/SectionHeader.qml:19
+#: ../src/app/qml/documentPage/SectionHeader.qml:36
msgid "Earlier this week"
msgstr ""
-#: ../src/app/qml/documentPage/SectionHeader.qml:22
+#: ../src/app/qml/documentPage/SectionHeader.qml:39
msgid "Earlier this month"
msgstr ""
-#: ../src/app/qml/documentPage/SectionHeader.qml:24
+#: ../src/app/qml/documentPage/SectionHeader.qml:41
msgid "Even earlier..."
msgstr ""
-#: ../src/app/qml/documentPage/SharePage.qml:23
+#: ../src/app/qml/documentPage/SharePage.qml:28
msgid "Share to"
msgstr ""
@@ -309,48 +304,48 @@
msgid "Reverse order"
msgstr ""
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51
-#: ../src/app/qml/textView/TextView.qml:43
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:41
+#: ../src/app/qml/textView/TextView.qml:49
msgid "Loading..."
msgstr ""
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:45
msgid "LibreOffice text document"
msgstr ""
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:57
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:47
msgid "LibreOffice spread sheet"
msgstr ""
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:59
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:49
msgid "LibreOffice presentation"
msgstr ""
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:61
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:51
msgid "LibreOffice Draw document"
msgstr ""
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:63
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:53
msgid "Unknown LibreOffice document"
msgstr ""
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:65
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:55
msgid "Unknown type document"
msgstr ""
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:85
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:72
msgid "Go to position..."
msgstr ""
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
-#: ../src/app/qml/pdfView/PdfView.qml:228
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:86
+#: ../src/app/qml/pdfView/PdfView.qml:227
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:49
msgid "Disable night mode"
msgstr ""
-#: ../src/app/qml/loView/LOViewDefaultHeader.qml:100
-#: ../src/app/qml/pdfView/PdfView.qml:228
-#: ../src/app/qml/textView/TextViewDefaultHeader.qml:63
+#: ../src/app/qml/loView/LOViewDefaultHeader.qml:86
+#: ../src/app/qml/pdfView/PdfView.qml:227
+#: ../src/app/qml/textView/TextViewDefaultHeader.qml:49
msgid "Enable night mode"
msgstr ""
@@ -367,21 +362,21 @@
msgid "GO!"
msgstr ""
-#: ../src/app/qml/loView/LOViewPage.qml:167
+#: ../src/app/qml/loView/LOViewPage.qml:173
msgid "LibreOffice binaries not found."
msgstr ""
-#: ../src/app/qml/loView/LOViewPage.qml:170
+#: ../src/app/qml/loView/LOViewPage.qml:176
msgid "Error while loading LibreOffice."
msgstr ""
-#: ../src/app/qml/loView/LOViewPage.qml:173
+#: ../src/app/qml/loView/LOViewPage.qml:179
msgid ""
"Document not loaded.\n"
"The requested document may be corrupt or protected by a password."
msgstr ""
-#: ../src/app/qml/loView/LOViewPage.qml:228
+#: ../src/app/qml/loView/LOViewPage.qml:231
msgid "This sheet has no content."
msgstr ""
@@ -413,7 +408,7 @@
#. TRANSLATORS: "Contents" refers to the "Table of Contents" of a PDF document.
#: ../src/app/qml/pdfView/PdfContentsPage.qml:31
-#: ../src/app/qml/pdfView/PdfView.qml:153
+#: ../src/app/qml/pdfView/PdfView.qml:157
msgid "Contents"
msgstr ""
@@ -425,15 +420,11 @@
msgid "Page %1 of %2"
msgstr ""
-#: ../src/app/qml/pdfView/PdfView.qml:203
-msgid "Search"
-msgstr ""
-
-#: ../src/app/qml/pdfView/PdfView.qml:213
+#: ../src/app/qml/pdfView/PdfView.qml:212
msgid "Go to page..."
msgstr ""
-#: ../src/app/qml/pdfView/PdfView.qml:221
+#: ../src/app/qml/pdfView/PdfView.qml:220
msgid "Presentation"
msgstr ""
@@ -446,7 +437,7 @@
msgid "Choose a page between 1 and %1"
msgstr ""
-#: ../src/app/qml/ubuntu-docviewer-app.qml:114
+#: ../src/app/qml/ubuntu-docviewer-app.qml:134
msgid "File does not exist."
msgstr ""
@@ -464,10 +455,10 @@
msgid "copy %1"
msgstr ""
-#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
+#: /home/renato/projects/phablet/doc-viewer/debian/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:1
msgid "Document Viewer"
msgstr ""
-#: /tmp/lok-qml-async-imageprovider-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/renato/projects/phablet/doc-viewer/debian/obj-x86_64-linux-gnu/po/com.ubuntu.docviewer.desktop.in.in.h:2
msgid "documents;viewer;pdf;reader;"
msgstr ""
=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt 2015-12-12 10:06:55 +0000
+++ src/app/CMakeLists.txt 2017-03-30 13:42:29 +0000
@@ -37,7 +37,7 @@
DEPENDS ${QMLFILES}
)
endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-
+message(status "DATA DIR: ${DATA_DIR}")
install(DIRECTORY qml DESTINATION ${DATA_DIR})
if(CLICK_MODE)
=== 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-03-30 13:42:29 +0000
@@ -22,6 +22,7 @@
#include <QtCore/QString>
static QString SNAP_ENV = qgetenv("SNAP");
+static QString QT_IMPORTS_DIR = QString("@QT_IMPORTS_DIR@");
inline bool isClick() {
static bool click = (QCoreApplication::applicationDirPath().contains("click.ubuntu.com"));
=== modified file 'src/app/main.cpp'
--- src/app/main.cpp 2015-10-17 15:47:22 +0000
+++ src/app/main.cpp 2017-03-30 13:42:29 +0000
@@ -61,6 +61,7 @@
if (!isRunningInstalled())
view.engine()->addImportPath(QCoreApplication::applicationDirPath() + "/../plugin/");
+ view.engine()->addImportPath(QT_IMPORTS_DIR);
view.setSource(QUrl::fromLocalFile(docviewerDirectory() + "/qml/ubuntu-docviewer-app.qml"));
view.setResizeMode(QQuickView::SizeRootObjectToView);
=== 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-03-30 13:42:29 +0000
@@ -43,4 +43,4 @@
def __init__(self, *args):
super(MainView, self).__init__(*args)
- self.visible.wait_for(True)
\ No newline at end of file
+ self.visible.wait_for(True)
=== 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-03-30 13:42:29 +0000
@@ -37,11 +37,10 @@
"""
-
local_build_location = os.path.dirname(os.path.dirname(os.getcwd()))
sdk_build_location = os.path.join(os.path.dirname(local_build_location),
- os.path.basename(local_build_location)
- + '-build')
+ os.path.basename(local_build_location) +
+ '-build')
local_build_location_qml = os.path.join(local_build_location, 'src', 'app',
'qml', 'ubuntu-docviewer-app.qml')
=== 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-03-30 13:42:29 +0000
@@ -17,4 +17,4 @@
self.launch_app()
main_view = self.app.main_view
- self.assertTrue(main_view)
\ No newline at end of file
+ self.assertTrue(main_view)
References
