Ubuntu Document Viewer App

Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/reboot-cmake-refactor into lp:ubuntu-docviewer-app

  1. reboot-cmake-refactor
  2. Merge into lo-viewer
Proposed by Stefano Verzegnassi
Status: Merged
Approved by: Stefano Verzegnassi
Approved revision: 200
Merged at revision: 207
Proposed branch: lp:~verzegnassi-stefano/ubuntu-docviewer-app/reboot-cmake-refactor
Merge into: lp:ubuntu-docviewer-app
Prerequisite: lp:~verzegnassi-stefano/ubuntu-docviewer-app/get-click-deps
Diff against target: 982 lines (+372/-300)
29 files modified
.bzrignore (+0/-1)
CMakeLists.txt (+27/-125)
click/CMakeLists.txt (+18/-0)
click/com.ubuntu.docviewer.url-dispatcher (+5/-0)
click/docviewer-content.json (+8/-0)
click/docviewer-libs.json (+94/-0)
click/docviewer.apparmor (+16/-0)
click/manifest.json.in (+25/-0)
cmake/modules/Click.cmake (+48/-0)
com.ubuntu.docviewer.url-dispatcher (+0/-5)
data/CMakeLists.txt (+29/-0)
debian/control (+37/-5)
debian/qtdeclarative5-documentviewer-common.install (+2/-0)
debian/qtdeclarative5-documentviewer-libreoffice.install (+1/-0)
debian/qtdeclarative5-documentviewer-pdf.install (+1/-0)
debian/rules (+1/-1)
debian/ubuntu-docviewer-app.install (+0/-1)
docviewer-content.json (+0/-8)
docviewer-libs.json (+0/-94)
docviewer.apparmor (+0/-16)
manifest.json.in (+0/-25)
po/CMakeLists.txt (+11/-2)
po/com.ubuntu.docviewer.pot (+25/-11)
src/CMakeLists.txt (+0/-4)
src/app/CMakeLists.txt (+6/-1)
src/plugin/file-qml-plugin/CMakeLists.txt (+4/-0)
src/plugin/libreofficetoolkit-qml-plugin/CMakeLists.txt (+5/-0)
src/plugin/poppler-qml-plugin/CMakeLists.txt (+8/-0)
tools/run-pep8 (+1/-1)
To merge this branch: bzr merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/reboot-cmake-refactor
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Document Viewer Developers Pending
Review via email: mp+275903@code.launchpad.net

This proposal supersedes a proposal from 2015-10-21.

Commit message

* Changes to the project structure
* Provide DocViewer plugins as separate .deb packages
* Added exception for '*.user.*' in .bzrignore file

Description of the change

* Changes to the project structure
* Provide DocViewer plugins as separate .deb packages
* Added exception for '*.user.*' in .bzrignore file

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

FAILED: Continuous integration, rev:195
http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-ci/52/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-vivid-amd64-ci/52/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-ci/52/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:196
http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-ci/53/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-vivid-amd64-ci/53/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-ci/53/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:197
http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-ci/54/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-vivid-amd64-ci/54

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-ci/54/rebuild

review: Approve (continuous-integration)
Revision history for this message
Roman Shchekin (mrqtros) wrote : Posted in a previous version of this proposal

I hope ypu know what you do :)

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:197
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/12/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/149/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:197
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/17/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/155/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:197
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/23/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/161/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:198
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/27/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/171/console

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

review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-autolanding/10/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/409/console

review: Needs Fixing (continuous-integration)
lp:~verzegnassi-stefano/ubuntu-docviewer-app/reboot-cmake-refactor updated
199. By Stefano Verzegnassi

Merged 'reboot' - .pot not updated

200. By Stefano Verzegnassi

Updated .pot

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:200
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/29/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/177/console

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2015-11-11 19:59:15 +0000
+++ .bzrignore 2015-11-24 16:01:42 +0000
@@ -6,7 +6,6 @@
6launcher/build-docviewer-launcher-Desktop-Debug/6launcher/build-docviewer-launcher-Desktop-Debug/
7launcher/build-docviewer-launcher-Desktop-Release/7launcher/build-docviewer-launcher-Desktop-Release/
8launcher/src/docviewer-launcher.pro.user8launcher/src/docviewer-launcher.pro.user
9*.cmake
10CMakeFiles9CMakeFiles
11*_automoc.cpp10*_automoc.cpp
12moc_*11moc_*
1312
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2015-11-19 16:01:37 +0000
+++ CMakeLists.txt 2015-11-24 16:01:42 +0000
@@ -1,16 +1,8 @@
1project(com.ubuntu.docviewer C CXX)1project(com.ubuntu.docviewer C CXX)
2cmake_minimum_required(VERSION 2.8.9)2cmake_minimum_required(VERSION 2.8.9)
33
4find_program(INTLTOOL_MERGE intltool-merge)4set(UBUNTU_MANIFEST_PATH "click/manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
5if(NOT INTLTOOL_MERGE)5set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
6 message(FATAL_ERROR "Could not find intltool-merge, please install the intltool package")
7endif(NOT INTLTOOL_MERGE)
8
9find_program(INTLTOOL_EXTRACT intltool-extract)
10if(NOT INTLTOOL_EXTRACT)
11 message(FATAL_ERROR "Could not find intltool-extract, please install the intltool package")
12endif(NOT INTLTOOL_EXTRACT)
13
14set(CMAKE_AUTOMOC ON)6set(CMAKE_AUTOMOC ON)
15set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra -fPIC")7set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra -fPIC")
168
@@ -18,20 +10,16 @@
18# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")10# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
1911
20include(FindPkgConfig)12include(FindPkgConfig)
21# Standard install paths
22include(GNUInstallDirs)13include(GNUInstallDirs)
2314
24option(INSTALL_TESTS "Install the tests on make install" on)15option(INSTALL_TESTS "Install the tests on make install" on)
25option(CLICK_MODE "Installs to a contained location" on)16option(CLICK_MODE "Installs to a contained location" on)
2617
27set(APP_NAME ubuntu-docviewer-app)18set(APP_NAME ubuntu-docviewer-app)
28set(DESKTOP_FILE "${PROJECT_NAME}.desktop")19set(DESKTOP_FILE "${PROJECT_NAME}.desktop")
29set(URLS_FILE "${PROJECT_NAME}.url-dispatcher")20set(LP_PROJECT ubuntu-docviewer-app)
30set(LP_PROJECT ubuntu-docviewer-app)21set(ICON_FILE docviewer@30.png)
31set(ICON_FILE docviewer@30.png)22set(AUTOPILOT_DIR ubuntu_docviewer_app)
32set(AUTOPILOT_DIR ubuntu_docviewer_app)
33set(EXEC "${APP_NAME}")
34set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
3523
36# Sets BZR_REVNO24# Sets BZR_REVNO
37execute_process(25execute_process(
@@ -40,112 +28,26 @@
40 OUTPUT_STRIP_TRAILING_WHITESPACE28 OUTPUT_STRIP_TRAILING_WHITESPACE
41)29)
4230
43if(CLICK_MODE)31# Find out the architecture for package building
44 if(NOT DEFINED BZR_SOURCE)32# to determine the plugin's installation path
45 set(BZR_SOURCE "lp:${LP_PROJECT}")33execute_process(
46 message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")34 COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
47 endif(NOT DEFINED BZR_SOURCE)35 OUTPUT_VARIABLE ARCH_TRIPLET
4836 OUTPUT_STRIP_TRAILING_WHITESPACE
49 if(NOT BZR_REVNO)37)
50 set(BZR_REVNO "latest")38execute_process(
51 endif(NOT BZR_REVNO)39 COMMAND dpkg-architecture -qDEB_HOST_ARCH
5240 OUTPUT_VARIABLE CLICK_ARCH
53 # Find out the architecture for package building41 OUTPUT_STRIP_TRAILING_WHITESPACE
54 # to determine the plugin's installation path42)
55 execute_process(43
56 COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH44include(Click)
57 OUTPUT_VARIABLE ARCH_TRIPLET45
58 OUTPUT_STRIP_TRAILING_WHITESPACE
59 )
60 execute_process(
61 COMMAND dpkg-architecture -qDEB_HOST_ARCH
62 OUTPUT_VARIABLE CLICK_ARCH
63 OUTPUT_STRIP_TRAILING_WHITESPACE
64 )
65 set(CMAKE_INSTALL_PREFIX /)
66 set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}")
67 set(BIN_DIR /lib/${ARCH_TRIPLET}/bin)
68 set(DATA_DIR /)
69 set(ICON ${ICON_FILE})
70 set(DESKTOP_DIR ${DATA_DIR})
71 set(URLS_DIR ${DATA_DIR})
72 configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
73 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json docviewer.apparmor docviewer-content.json ${URLS_FILE}
74 DESTINATION ${CMAKE_INSTALL_PREFIX})
75 # Make the click files visible in Qt Creator
76 file(GLOB CLICK_FILES
77 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
78 *.json *.json.in *.apparmor)
79
80 add_custom_target(com_ubuntu_docviewer_CLICKFiles ALL SOURCES ${CLICK_FILES})
81else(CLICK_MODE)
82 # components PATH
83 execute_process(
84 COMMAND qmake -query QT_INSTALL_QML
85 OUTPUT_VARIABLE QT_IMPORTS_DIR
86 OUTPUT_STRIP_TRAILING_WHITESPACE
87 )
88 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
89 set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE}")
90 set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
91 set(APPLICATION_DIR ${CMAKE_INSTALL_DATADIR}/accounts/applications)
92endif(CLICK_MODE)
93
94file(GLOB_RECURSE I18N_SRC_FILES
95 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po
96 *.qml *.js *.cpp)
97list(APPEND I18N_SRC_FILES ${CMAKE_CURRENT_BINARY_DIR}/po/${DESKTOP_FILE}.in.in.h)
98list(SORT I18N_SRC_FILES)
99message("Found ${I18N_SRC_FILES}")
100
101file(GLOB SRC_FILES
102 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
103 *.qml *.js)
104add_custom_target(ubuntu-docviewer-app_QMlFiles ALL SOURCES ${SRC_FILES})
105
106file(GLOB RESOURCE_FILES
107 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
108 *.png *.svg)
109install(FILES ${SRC_FILES} ${RESOURCE_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})
110
111configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
112
113add_custom_target(${DESKTOP_FILE} ALL
114 COMMENT "Merging translations into ${DESKTOP_FILE}"
115 COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE}
116)
117
118install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
119 DESTINATION ${DESKTOP_DIR})
120
121# Tests46# Tests
122enable_testing()47enable_testing()
12348
49add_subdirectory(po)
50add_subdirectory(click)
51add_subdirectory(data)
124add_subdirectory(src)52add_subdirectory(src)
125add_subdirectory(tests)53add_subdirectory(tests)
126add_subdirectory(po)
127
128# If running in CLICK_MODE, include binary dependencies of docviewer
129if(CLICK_MODE)
130 MESSAGE("Grabbing upstream libs to ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs")
131 execute_process(
132 COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs
133 COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/get-click-deps -d ${CMAKE_CURRENT_SOURCE_DIR}/docviewer-libs.json -c ${CMAKE_CURRENT_SOURCE_DIR}/click/disable-file-locking.sh ${CLICK_ARCH} ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs
134 )
135
136 MESSAGE("Installing upstream libs from ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs/usr/lib/${ARCH_TRIPLET}/ to ${DATA_DIR}lib/${ARCH_TRIPLET}")
137 file(GLOB_RECURSE UPSTREAM_LIBS "${CMAKE_CURRENT_BINARY_DIR}/upstream-libs/usr/lib/${ARCH_TRIPLET}/*")
138 foreach(ITEM ${UPSTREAM_LIBS})
139 IF( IS_DIRECTORY "${ITEM}" )
140 LIST( APPEND DIRS_TO_DEPLOY "${ITEM}" )
141 ELSE()
142 LIST( APPEND FILES_TO_DEPLOY "${ITEM}" )
143 ENDIF()
144 endforeach()
145 MESSAGE("Following files to install:- ${FILES_TO_DEPLOY}")
146 INSTALL( FILES ${FILES_TO_DEPLOY} DESTINATION ${DATA_DIR}lib/${ARCH_TRIPLET} )
147
148
149 MESSAGE("Installing LibreOffice from ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs/opt/libreoffice/lib/libreoffice to ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice")
150 INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs/opt/libreoffice/lib/libreoffice/ DESTINATION ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice )
151endif(CLICK_MODE)
15254
=== added file 'click/CMakeLists.txt'
--- click/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ click/CMakeLists.txt 2015-11-24 16:01:42 +0000
@@ -0,0 +1,18 @@
1if(CLICK_MODE)
2 if(NOT BZR_REVNO)
3 set(BZR_REVNO "latest")
4 endif(NOT BZR_REVNO)
5
6 configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
7 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
8 install(FILES docviewer.apparmor docviewer-content.json com.ubuntu.docviewer.url-dispatcher DESTINATION ${CMAKE_INSTALL_PREFIX})
9endif(CLICK_MODE)
10
11
12# Make the click files visible in Qt Creator
13file(GLOB CLICK_FILES
14 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
15 *.json *.json.in *.apparmor
16)
17
18add_custom_target(com_ubuntu_docviewer_CLICKFiles ALL SOURCES ${CLICK_FILES})
019
=== added file 'click/com.ubuntu.docviewer.url-dispatcher'
--- click/com.ubuntu.docviewer.url-dispatcher 1970-01-01 00:00:00 +0000
+++ click/com.ubuntu.docviewer.url-dispatcher 2015-11-24 16:01:42 +0000
@@ -0,0 +1,5 @@
1[
2 {
3 "protocol": "document"
4 }
5]
06
=== added file 'click/docviewer-content.json'
--- click/docviewer-content.json 1970-01-01 00:00:00 +0000
+++ click/docviewer-content.json 2015-11-24 16:01:42 +0000
@@ -0,0 +1,8 @@
1{
2 "destination": [
3 "documents"
4 ],
5 "source": [
6 "documents"
7 ]
8}
09
=== added file 'click/docviewer-libs.json'
--- click/docviewer-libs.json 1970-01-01 00:00:00 +0000
+++ click/docviewer-libs.json 2015-11-24 16:01:42 +0000
@@ -0,0 +1,94 @@
1{
2 "armhf": [
3 {
4 "url": "http://ports.ubuntu.com/ubuntu-ports",
5 "dist": "vivid",
6 "component": "main",
7 "packages": [
8 "libboost-date-time1.55.0",
9 "libgl1-mesa-glx",
10 "libxcb-dri3-0",
11 "libxcb-glx0",
12 "libxcb-present0",
13 "libxshmfence1",
14 "libxslt1.1",
15 "libxt6",
16 "libxxf86vm1",
17 "gconf-service",
18 "gconf-service-backend",
19 "gconf2-common",
20 "libgconf-2-4"
21 ]
22 },
23 {
24 "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu",
25 "dist": "vivid",
26 "component": "main",
27 "packages": [
28 "libreoffice-vanilla"
29 ]
30 }
31 ],
32
33 "i386": [
34 {
35 "url": "http://archive.ubuntu.com/ubuntu",
36 "dist": "vivid",
37 "component": "main",
38 "packages": [
39 "libboost-date-time1.55.0",
40 "libgl1-mesa-glx",
41 "libxcb-dri3-0",
42 "libxcb-glx0",
43 "libxcb-present0",
44 "libxshmfence1",
45 "libxslt1.1",
46 "libxt6",
47 "libxxf86vm1",
48 "gconf-service",
49 "gconf-service-backend",
50 "gconf2-common",
51 "libgconf-2-4"
52 ]
53 },
54 {
55 "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu",
56 "dist": "vivid",
57 "component": "main",
58 "packages": [
59 "libreoffice-vanilla"
60 ]
61 }
62 ],
63
64 "amd64": [
65 {
66 "url": "http://archive.ubuntu.com/ubuntu",
67 "dist": "vivid",
68 "component": "main",
69 "packages": [
70 "libboost-date-time1.55.0",
71 "libgl1-mesa-glx",
72 "libxcb-dri3-0",
73 "libxcb-glx0",
74 "libxcb-present0",
75 "libxshmfence1",
76 "libxslt1.1",
77 "libxt6",
78 "libxxf86vm1",
79 "gconf-service",
80 "gconf-service-backend",
81 "gconf2-common",
82 "libgconf-2-4"
83 ]
84 },
85 {
86 "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu",
87 "dist": "vivid",
88 "component": "main",
89 "packages": [
90 "libreoffice-vanilla"
91 ]
92 }
93 ]
94}
095
=== added file 'click/docviewer.apparmor'
--- click/docviewer.apparmor 1970-01-01 00:00:00 +0000
+++ click/docviewer.apparmor 2015-11-24 16:01:42 +0000
@@ -0,0 +1,16 @@
1{
2 "policy_groups": [
3 "content_exchange_source",
4 "content_exchange"
5 ],
6 "read_path": [
7 "@{HOME}/Documents/",
8 "/media/*/*/[Dd][Oo][Cc][Uu][Mm][Ee][Nn][Tt][Ss]/",
9 "@{PROC}/*/mounts",
10 "/dev/disk/by-label/"
11 ],
12 "write_path": [
13 "@{HOME}/Documents/"
14 ],
15 "policy_version": 1.2
16}
017
=== added file 'click/manifest.json.in'
--- click/manifest.json.in 1970-01-01 00:00:00 +0000
+++ click/manifest.json.in 2015-11-24 16:01:42 +0000
@@ -0,0 +1,25 @@
1{
2 "name": "com.ubuntu.docviewer",
3 "title": "Document Viewer",
4 "description": "Document Viewer application for Ubuntu devices",
5 "framework": "ubuntu-sdk-14.10",
6 "architecture": "@CLICK_ARCH@",
7 "icon": "@ICON@",
8 "hooks": {
9 "docviewer": {
10 "apparmor": "docviewer.apparmor",
11 "desktop": "com.ubuntu.docviewer.desktop",
12 "content-hub": "docviewer-content.json",
13 "urls": "@URLS_FILE@"
14 }
15 },
16 "version": "0.3.@BZR_REVNO@",
17 "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",
18 "x-source": {
19 "vcs-bzr": "@BZR_SOURCE@",
20 "vcs-bzr-revno": "@BZR_REVNO@"
21 },
22 "x-test": {
23 "autopilot": "@AUTOPILOT_DIR@"
24 }
25}
026
=== added directory 'cmake'
=== added directory 'cmake/modules'
=== added file 'cmake/modules/Click.cmake'
--- cmake/modules/Click.cmake 1970-01-01 00:00:00 +0000
+++ cmake/modules/Click.cmake 2015-11-24 16:01:42 +0000
@@ -0,0 +1,48 @@
1if(CLICK_MODE)
2 if(NOT DEFINED BZR_SOURCE)
3 set(BZR_SOURCE "lp:${LP_PROJECT}")
4 message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
5 endif(NOT DEFINED BZR_SOURCE)
6
7 set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}")
8 set(CMAKE_INSTALL_PREFIX /)
9 set(DATA_DIR /)
10
11 # Path for ubuntu-docviewer-app executable
12 set(BIN_DIR ${DATA_DIR}lib/${ARCH_TRIPLET}/bin)
13
14 # If running in CLICK_MODE, include binary dependencies of docviewer
15 set(GET_CLICK_DEPS_TOOL ${CMAKE_SOURCE_DIR}/tools/get-click-deps)
16 set(DEPS_MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/click/docviewer-libs.json)
17 set(CUSTOM_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/click/disable-file-locking.sh)
18 set(UPSTREAM_LIBS_DIR ${CMAKE_BINARY_DIR}/upstream-libs)
19
20 MESSAGE("Grabbing upstream libs to ${UPSTREAM_LIBS_DIR}")
21 execute_process(
22 COMMAND mkdir ${UPSTREAM_LIBS_DIR}
23 COMMAND ${GET_CLICK_DEPS_TOOL} -d ${DEPS_MANIFEST} -c ${CUSTOM_SCRIPT} ${CLICK_ARCH} ${UPSTREAM_LIBS_DIR}
24 )
25
26 MESSAGE("Installing upstream libs from ${UPSTREAM_LIBS_DIR}/usr/lib/${ARCH_TRIPLET}/ to ${DATA_DIR}lib/${ARCH_TRIPLET}")
27 file(GLOB_RECURSE UPSTREAM_LIBS "${UPSTREAM_LIBS_DIR}/usr/lib/${ARCH_TRIPLET}/*")
28 foreach(ITEM ${UPSTREAM_LIBS})
29 IF( IS_DIRECTORY "${ITEM}" )
30 LIST( APPEND DIRS_TO_DEPLOY "${ITEM}" )
31 ELSE()
32 LIST( APPEND FILES_TO_DEPLOY "${ITEM}" )
33 ENDIF()
34 endforeach()
35 MESSAGE("Following files to install:- ${FILES_TO_DEPLOY}")
36 INSTALL( FILES ${FILES_TO_DEPLOY} DESTINATION ${DATA_DIR}lib/${ARCH_TRIPLET} )
37
38 MESSAGE("Installing LibreOffice from ${UPSTREAM_LIBS_DIR}/opt/libreoffice/lib/libreoffice to ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice")
39 INSTALL( DIRECTORY ${UPSTREAM_LIBS_DIR}/opt/libreoffice/lib/libreoffice/ DESTINATION ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice )
40else(CLICK_MODE)
41 execute_process(
42 COMMAND qmake -query QT_INSTALL_QML
43 OUTPUT_VARIABLE QT_IMPORTS_DIR
44 OUTPUT_STRIP_TRAILING_WHITESPACE
45 )
46
47 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
48endif(CLICK_MODE)
049
=== removed file 'com.ubuntu.docviewer.url-dispatcher'
--- com.ubuntu.docviewer.url-dispatcher 2015-02-13 15:30:01 +0000
+++ com.ubuntu.docviewer.url-dispatcher 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
1[
2 {
3 "protocol": "document"
4 }
5]
60
=== added directory 'data'
=== added file 'data/CMakeLists.txt'
--- data/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ data/CMakeLists.txt 2015-11-24 16:01:42 +0000
@@ -0,0 +1,29 @@
1if(CLICK_MODE)
2 set(ICON ${ICON_FILE})
3 set(DESKTOP_DIR ${DATA_DIR})
4
5 install(FILES ${ICON_FILE} DESTINATION ${DATA_DIR})
6else(CLICK_MODE)
7 set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE}")
8 set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
9
10 install(DIRECTORY icons/hicolor DESTINATION ${CMAKE_INSTALL_DATADIR}/icons
11 FILES_MATCHING PATTERN *.png
12 )
13endif(CLICK_MODE)
14
15set(EXEC "${APP_NAME}")
16
17configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in @ONLY)
18
19add_custom_target(${DESKTOP_FILE} ALL
20 COMMENT "Merging translations into ${DESKTOP_FILE}"
21 COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po
22 ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in ${DESKTOP_FILE}
23)
24
25install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
26 DESTINATION ${DESKTOP_DIR}
27)
28
29install(FILES ${URLS_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX})
030
=== renamed file 'com.ubuntu.docviewer.desktop.in.in' => 'data/com.ubuntu.docviewer.desktop.in.in'
=== renamed file 'docviewer@30.png' => 'data/docviewer@30.png'
=== modified file 'debian/control'
--- debian/control 2015-09-19 14:54:11 +0000
+++ debian/control 2015-11-24 16:01:42 +0000
@@ -21,20 +21,52 @@
21Standards-Version: 3.9.621Standards-Version: 3.9.6
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/trunk24Vcs-Bzr: https://code.launchpad.net/~ubuntu-docviewer-dev/ubuntu-docviewer-app/reboot
2525
26Package: ubuntu-docviewer-app26Package: ubuntu-docviewer-app
27Architecture: any27Architecture: any
28Depends: qtdeclarative5-qtquick2-plugin,28Depends: ${misc:Depends},
29 qtdeclarative5-documentviewer-common (= ${source:Version}),
30 qtdeclarative5-documentviewer-libreoffice (= ${source:Version}),
31 qtdeclarative5-documentviewer-pdf (= ${source:Version}),
32 suru-icon-theme (>= 14.04+15.10.20150707-0ubuntu1),
33 qtdeclarative5-qtquick2-plugin,
29 qtdeclarative5-ubuntu-ui-toolkit-plugin,34 qtdeclarative5-ubuntu-ui-toolkit-plugin,
30 qtdeclarative5-ubuntu-content1,35 qtdeclarative5-ubuntu-content1,
31 qtdeclarative5-quicklayouts-plugin,36 qtdeclarative5-quicklayouts-plugin,
32 qtdeclarative5-window-plugin,37 qtdeclarative5-window-plugin
33 suru-icon-theme (>= 14.04+15.10.20150707-0ubuntu1),
34 ${misc:Depends}
35Description: Document Viewer application38Description: Document Viewer application
36 Core Document Viewer application39 Core Document Viewer application
3740
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.
69
38Package: ubuntu-docviewer-app-autopilot70Package: ubuntu-docviewer-app-autopilot
39Architecture: all71Architecture: all
40Depends: libautopilot-qt,72Depends: libautopilot-qt,
4173
=== added file 'debian/qtdeclarative5-documentviewer-common.install'
--- debian/qtdeclarative5-documentviewer-common.install 1970-01-01 00:00:00 +0000
+++ debian/qtdeclarative5-documentviewer-common.install 2015-11-24 16:01:42 +0000
@@ -0,0 +1,2 @@
1usr/lib/*/qt5/qml/DocumentViewer/qmldir
2usr/lib/*/qt5/qml/DocumentViewer/libfileqmlplugin.so
03
=== added file 'debian/qtdeclarative5-documentviewer-libreoffice.install'
--- debian/qtdeclarative5-documentviewer-libreoffice.install 1970-01-01 00:00:00 +0000
+++ debian/qtdeclarative5-documentviewer-libreoffice.install 2015-11-24 16:01:42 +0000
@@ -0,0 +1,1 @@
1usr/lib/*/qt5/qml/DocumentViewer/LibreOffice
02
=== added file 'debian/qtdeclarative5-documentviewer-pdf.install'
--- debian/qtdeclarative5-documentviewer-pdf.install 1970-01-01 00:00:00 +0000
+++ debian/qtdeclarative5-documentviewer-pdf.install 2015-11-24 16:01:42 +0000
@@ -0,0 +1,1 @@
1usr/lib/*/qt5/qml/DocumentViewer/PDF
02
=== modified file 'debian/rules'
--- debian/rules 2015-04-27 16:29:17 +0000
+++ debian/rules 2015-11-24 16:01:42 +0000
@@ -12,7 +12,7 @@
1212
13override_dh_auto_test:13override_dh_auto_test:
14 dh_auto_test14 dh_auto_test
15 ./run-pep815 ./tools/run-pep8
1616
17override_dh_install:17override_dh_install:
18 dh_install --fail-missing18 dh_install --fail-missing
1919
=== modified file 'debian/ubuntu-docviewer-app.install'
--- debian/ubuntu-docviewer-app.install 2015-01-29 19:23:09 +0000
+++ debian/ubuntu-docviewer-app.install 2015-11-24 16:01:42 +0000
@@ -1,5 +1,4 @@
1usr/bin/ubuntu-docviewer-app1usr/bin/ubuntu-docviewer-app
2usr/lib/*/qt5
3usr/share/applications2usr/share/applications
4usr/share/locale3usr/share/locale
5usr/share/ubuntu-docviewer-app4usr/share/ubuntu-docviewer-app
65
=== removed file 'docviewer-content.json'
--- docviewer-content.json 2015-02-13 15:30:01 +0000
+++ docviewer-content.json 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
1{
2 "destination": [
3 "documents"
4 ],
5 "source": [
6 "documents"
7 ]
8}
90
=== removed file 'docviewer-libs.json'
--- docviewer-libs.json 2015-10-27 13:32:23 +0000
+++ docviewer-libs.json 1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
1{
2 "armhf": [
3 {
4 "url": "http://ports.ubuntu.com/ubuntu-ports",
5 "dist": "vivid",
6 "component": "main",
7 "packages": [
8 "libboost-date-time1.55.0",
9 "libgl1-mesa-glx",
10 "libxcb-dri3-0",
11 "libxcb-glx0",
12 "libxcb-present0",
13 "libxshmfence1",
14 "libxslt1.1",
15 "libxt6",
16 "libxxf86vm1",
17 "gconf-service",
18 "gconf-service-backend",
19 "gconf2-common",
20 "libgconf-2-4"
21 ]
22 },
23 {
24 "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu",
25 "dist": "vivid",
26 "component": "main",
27 "packages": [
28 "libreoffice-vanilla"
29 ]
30 }
31 ],
32
33 "i386": [
34 {
35 "url": "http://archive.ubuntu.com/ubuntu",
36 "dist": "vivid",
37 "component": "main",
38 "packages": [
39 "libboost-date-time1.55.0",
40 "libgl1-mesa-glx",
41 "libxcb-dri3-0",
42 "libxcb-glx0",
43 "libxcb-present0",
44 "libxshmfence1",
45 "libxslt1.1",
46 "libxt6",
47 "libxxf86vm1",
48 "gconf-service",
49 "gconf-service-backend",
50 "gconf2-common",
51 "libgconf-2-4"
52 ]
53 },
54 {
55 "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu",
56 "dist": "vivid",
57 "component": "main",
58 "packages": [
59 "libreoffice-vanilla"
60 ]
61 }
62 ],
63
64 "amd64": [
65 {
66 "url": "http://archive.ubuntu.com/ubuntu",
67 "dist": "vivid",
68 "component": "main",
69 "packages": [
70 "libboost-date-time1.55.0",
71 "libgl1-mesa-glx",
72 "libxcb-dri3-0",
73 "libxcb-glx0",
74 "libxcb-present0",
75 "libxshmfence1",
76 "libxslt1.1",
77 "libxt6",
78 "libxxf86vm1",
79 "gconf-service",
80 "gconf-service-backend",
81 "gconf2-common",
82 "libgconf-2-4"
83 ]
84 },
85 {
86 "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu",
87 "dist": "vivid",
88 "component": "main",
89 "packages": [
90 "libreoffice-vanilla"
91 ]
92 }
93 ]
94}
950
=== removed file 'docviewer.apparmor'
--- docviewer.apparmor 2015-11-06 10:59:14 +0000
+++ docviewer.apparmor 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
1{
2 "policy_groups": [
3 "content_exchange_source",
4 "content_exchange"
5 ],
6 "read_path": [
7 "@{HOME}/Documents/",
8 "/media/*/*/[Dd][Oo][Cc][Uu][Mm][Ee][Nn][Tt][Ss]/",
9 "@{PROC}/*/mounts",
10 "/dev/disk/by-label/"
11 ],
12 "write_path": [
13 "@{HOME}/Documents/"
14 ],
15 "policy_version": 1.2
16}
170
=== removed file 'manifest.json.in'
--- manifest.json.in 2015-02-13 15:30:01 +0000
+++ manifest.json.in 1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
1{
2 "name": "com.ubuntu.docviewer",
3 "title": "Document Viewer",
4 "description": "Document Viewer application for Ubuntu devices",
5 "framework": "ubuntu-sdk-14.10",
6 "architecture": "@CLICK_ARCH@",
7 "icon": "@ICON@",
8 "hooks": {
9 "docviewer": {
10 "apparmor": "docviewer.apparmor",
11 "desktop": "com.ubuntu.docviewer.desktop",
12 "content-hub": "docviewer-content.json",
13 "urls": "@URLS_FILE@"
14 }
15 },
16 "version": "0.3.@BZR_REVNO@",
17 "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",
18 "x-source": {
19 "vcs-bzr": "@BZR_SOURCE@",
20 "vcs-bzr-revno": "@BZR_REVNO@"
21 },
22 "x-test": {
23 "autopilot": "@AUTOPILOT_DIR@"
24 }
25}
260
=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt 2015-04-29 16:09:12 +0000
+++ po/CMakeLists.txt 2015-11-24 16:01:42 +0000
@@ -17,12 +17,22 @@
17set(POT_FILE ${DOMAIN}.pot)17set(POT_FILE ${DOMAIN}.pot)
18file(GLOB PO_FILES *.po)18file(GLOB PO_FILES *.po)
1919
20file(GLOB_RECURSE I18N_SRC_FILES
21 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
22 ${CMAKE_SOURCE_DIR}/*.qml
23 ${CMAKE_SOURCE_DIR}/*.js
24 ${CMAKE_SOURCE_DIR}/*.cpp)
25list(APPEND I18N_SRC_FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in.in.h)
26list(SORT I18N_SRC_FILES)
27
28message("Found ${I18N_SRC_FILES}")
29
20# Creates the .pot file containing the translations template30# Creates the .pot file containing the translations template
21add_custom_target(${POT_FILE} ALL31add_custom_target(${POT_FILE} ALL
22 COMMENT "Generating translation template"32 COMMENT "Generating translation template"
23 # Extract the translatable messages from the desktop file 33 # Extract the translatable messages from the desktop file
24 COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini34 COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
25 --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE}.in.in35 --srcdir=${CMAKE_SOURCE_DIR}/data ${DESKTOP_FILE}.in.in
26 # Update the translation file36 # Update the translation file
27 COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}37 COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
28 --from-code=UTF-838 --from-code=UTF-8
@@ -47,7 +57,6 @@
47 RENAME ${DOMAIN}.mo)57 RENAME ${DOMAIN}.mo)
48endforeach(PO_FILE)58endforeach(PO_FILE)
4959
50
51# make the translation files visible on qtcreator60# make the translation files visible on qtcreator
52file(GLOB TRANSLATION_FILES61file(GLOB TRANSLATION_FILES
53 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}62 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
5463
=== modified file 'po/com.ubuntu.docviewer.pot'
--- po/com.ubuntu.docviewer.pot 2015-11-21 19:24:07 +0000
+++ po/com.ubuntu.docviewer.pot 2015-11-24 16:01:42 +0000
@@ -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: 2015-11-21 22:13+0300\n"11"POT-Creation-Date: 2015-11-24 17:00+0100\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"
@@ -68,15 +68,11 @@
68msgid "MIME type"68msgid "MIME type"
69msgstr ""69msgstr ""
7070
71#: ../src/app/qml/common/FileNotFoundDialog.qml:2471#: ../src/app/qml/common/ErrorDialog.qml:23
72msgid "Error"72msgid "Error"
73msgstr ""73msgstr ""
7474
75#: ../src/app/qml/common/FileNotFoundDialog.qml:2575#: ../src/app/qml/common/ErrorDialog.qml:26
76msgid "File does not exist"
77msgstr ""
78
79#: ../src/app/qml/common/FileNotFoundDialog.qml:28
80#: ../src/app/qml/common/PickImportedDialog.qml:5376#: ../src/app/qml/common/PickImportedDialog.qml:53
81#: ../src/app/qml/common/RejectedImportDialog.qml:3877#: ../src/app/qml/common/RejectedImportDialog.qml:38
82#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:3378#: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:33
@@ -245,7 +241,7 @@
245241
246#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27242#: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
247#: ../src/app/qml/loView/LOViewDefaultHeader.qml:70243#: ../src/app/qml/loView/LOViewDefaultHeader.qml:70
248#: ../src/app/qml/loView/LOViewPage.qml:208244#: ../src/app/qml/loView/LOViewPage.qml:233
249#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61245#: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
250#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61246#: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
251msgid "Back"247msgid "Back"
@@ -379,10 +375,24 @@
379msgstr ""375msgstr ""
380376
381#: ../src/app/qml/loView/LOViewPage.qml:35377#: ../src/app/qml/loView/LOViewPage.qml:35
382#: ../src/app/qml/loView/LOViewPage.qml:206378#: ../src/app/qml/loView/LOViewPage.qml:231
383msgid "Slides"379msgid "Slides"
384msgstr ""380msgstr ""
385381
382#: ../src/app/qml/loView/LOViewPage.qml:188
383msgid "LibreOffice binaries not found."
384msgstr ""
385
386#: ../src/app/qml/loView/LOViewPage.qml:191
387msgid "Error while loading LibreOffice."
388msgstr ""
389
390#: ../src/app/qml/loView/LOViewPage.qml:194
391msgid ""
392"Document not loaded.\n"
393"The requested document may be corrupt."
394msgstr ""
395
386#: ../src/app/qml/loView/LOViewZoomHeader.qml:42396#: ../src/app/qml/loView/LOViewZoomHeader.qml:42
387msgid "Hide zoom controls"397msgid "Hide zoom controls"
388msgstr ""398msgstr ""
@@ -444,6 +454,10 @@
444msgid "Choose a page between 1 and %1"454msgid "Choose a page between 1 and %1"
445msgstr ""455msgstr ""
446456
457#: ../src/app/qml/ubuntu-docviewer-app.qml:130
458msgid "File does not exist."
459msgstr ""
460
447#. TRANSLATORS: This string is used for renaming a copied file,461#. TRANSLATORS: This string is used for renaming a copied file,
448#. when a file with the same name already exists in user's462#. when a file with the same name already exists in user's
449#. Documents folder.463#. Documents folder.
@@ -458,10 +472,10 @@
458msgid "copy %1"472msgid "copy %1"
459msgstr ""473msgstr ""
460474
461#: /home/qtros/dev/build-ubuntu-docviewer-app-zoom-final-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_15_04_vivid-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1475#: /tmp/build-reboot-cmake-refactor-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
462msgid "Document Viewer"476msgid "Document Viewer"
463msgstr ""477msgstr ""
464478
465#: /home/qtros/dev/build-ubuntu-docviewer-app-zoom-final-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_15_04_vivid-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2479#: /tmp/build-reboot-cmake-refactor-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
466msgid "documents;viewer;pdf;reader;"480msgid "documents;viewer;pdf;reader;"
467msgstr ""481msgstr ""
468482
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2015-01-29 16:35:28 +0000
+++ src/CMakeLists.txt 2015-11-24 16:01:42 +0000
@@ -1,6 +1,2 @@
1find_package(Qt5Core)
2find_package(Qt5Qml)
3find_package(Qt5Quick)
4
5add_subdirectory(app)1add_subdirectory(app)
6add_subdirectory(plugin)2add_subdirectory(plugin)
73
=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt 2015-10-20 11:58:48 +0000
+++ src/app/CMakeLists.txt 2015-11-24 16:01:42 +0000
@@ -1,6 +1,11 @@
1file(GLOB_RECURSE QML_SRCS *.qml *.js)1file(GLOB_RECURSE QML_SRCS *.qml *.js)
2file(GLOB_RECURSE IMAGE_FILES *.qml *.js)2file(GLOB_RECURSE IMAGE_FILES *.qml *.js)
33
4find_package(Qt5Core)
5find_package(Qt5Gui)
6find_package(Qt5Qml)
7find_package(Qt5Quick)
8
4add_definitions(9add_definitions(
5 -DGETTEXT_PACKAGE=\"${PROJECT_NAME}\"10 -DGETTEXT_PACKAGE=\"${PROJECT_NAME}\"
6 -DGETTEXT_LOCALEDIR=\"${CMAKE_INSTALL_LOCALEDIR}\"11 -DGETTEXT_LOCALEDIR=\"${CMAKE_INSTALL_LOCALEDIR}\"
@@ -23,7 +28,7 @@
2328
24add_executable(ubuntu-docviewer-app ${docviewer_SRCS})29add_executable(ubuntu-docviewer-app ${docviewer_SRCS})
2530
26qt5_use_modules(ubuntu-docviewer-app Widgets Gui Qml Quick DBus Concurrent)31qt5_use_modules(ubuntu-docviewer-app Gui Qml Quick)
2732
28if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")33if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
29add_custom_target(docviewer-qmlfiles ALL34add_custom_target(docviewer-qmlfiles ALL
3035
=== modified file 'src/plugin/file-qml-plugin/CMakeLists.txt'
--- src/plugin/file-qml-plugin/CMakeLists.txt 2015-09-19 15:40:22 +0000
+++ src/plugin/file-qml-plugin/CMakeLists.txt 2015-11-24 16:01:42 +0000
@@ -1,6 +1,10 @@
1set(PLUGIN_DIR DocumentViewer)1set(PLUGIN_DIR DocumentViewer)
2include_directories(${CMAKE_CURRENT_SOURCE_DIR})2include_directories(${CMAKE_CURRENT_SOURCE_DIR})
33
4find_package(Qt5Core)
5find_package(Qt5Qml)
6find_package(Qt5Quick)
7
4#add the sources to compile8#add the sources to compile
5set(fileqmlplugin_SRCS9set(fileqmlplugin_SRCS
6 backend.cpp10 backend.cpp
711
=== modified file 'src/plugin/libreofficetoolkit-qml-plugin/CMakeLists.txt'
--- src/plugin/libreofficetoolkit-qml-plugin/CMakeLists.txt 2015-11-11 19:59:15 +0000
+++ src/plugin/libreofficetoolkit-qml-plugin/CMakeLists.txt 2015-11-24 16:01:42 +0000
@@ -1,5 +1,10 @@
1set(PLUGIN_DIR DocumentViewer/LibreOffice)1set(PLUGIN_DIR DocumentViewer/LibreOffice)
22
3find_package(Qt5Core)
4find_package(Qt5Gui)
5find_package(Qt5Qml)
6find_package(Qt5Quick)
7
3file(GLOB_RECURSE QML_SRCS8file(GLOB_RECURSE QML_SRCS
4 qml/*.qml9 qml/*.qml
5 qml/*.js10 qml/*.js
611
=== modified file 'src/plugin/poppler-qml-plugin/CMakeLists.txt'
--- src/plugin/poppler-qml-plugin/CMakeLists.txt 2015-07-14 15:43:11 +0000
+++ src/plugin/poppler-qml-plugin/CMakeLists.txt 2015-11-24 16:01:42 +0000
@@ -1,4 +1,12 @@
1set(PLUGIN_DIR DocumentViewer/PDF)1set(PLUGIN_DIR DocumentViewer/PDF)
2
3find_package(Qt5Core)
4find_package(Qt5Gui)
5find_package(Qt5Qml)
6find_package(Qt5Quick)
7find_package(Qt5Xml)
8find_package(Qt5Concurrent)
9
2include_directories(10include_directories(
3 ${CMAKE_CURRENT_SOURCE_DIR}11 ${CMAKE_CURRENT_SOURCE_DIR}
4 ${CMAKE_CURRENT_BINARY_DIR}12 ${CMAKE_CURRENT_BINARY_DIR}
513
=== added directory 'tools'
=== renamed file 'get-click-deps' => 'tools/get-click-deps'
=== renamed file 'run-pep8' => 'tools/run-pep8'
--- run-pep8 2015-04-27 16:29:17 +0000
+++ tools/run-pep8 2015-11-24 16:01:42 +0000
@@ -2,7 +2,7 @@
2set -e2set -e
33
4echo "= pep8 ="4echo "= pep8 ="
5for i in `find . -iname '*.py'` ; do 5for i in `find .. -iname '*.py'` ; do
6 echo "Checking $i"6 echo "Checking $i"
7 pep8 $i7 pep8 $i
8done8done

Subscribers

People subscribed via source and target branches