Merge lp://staging/ubuntu-docviewer-app into lp://staging/ubuntu-docviewer-app/trunk
Status: | Work in progress |
---|---|
Proposed branch: | lp://staging/ubuntu-docviewer-app |
Merge into: | lp://staging/ubuntu-docviewer-app/trunk |
Diff against target: |
46923 lines (+26566/-11743) (has conflicts) 225 files modified
.bzrignore (+1/-1) CMakeLists.txt (+31/-100) README (+0/-20) README-Autopilot.md (+81/-0) README-Developers.md (+43/-0) README-Mergeproposal.md (+36/-0) README-Translations.md (+37/-0) README.md (+30/-0) README.translations (+0/-36) click/CMakeLists.txt (+18/-0) click/com.ubuntu.docviewer.url-dispatcher (+5/-0) click/disable-file-locking.xcd (+11/-0) click/disable-lo-features.sh (+14/-0) click/disable-spell-check.xcd (+23/-0) click/docviewer-content.json (+8/-0) click/docviewer-libs.json (+94/-0) click/docviewer.apparmor (+18/-0) click/manifest.json.in (+25/-0) cmake/modules/Click.cmake (+80/-0) com.ubuntu.docviewer.url-dispatcher (+0/-5) data/CMakeLists.txt (+27/-0) data/com.ubuntu.docviewer.desktop.in.in (+1/-1) debian/changelog (+53/-0) debian/control (+42/-6) 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.apparmor (+0/-16) manifest.json.in (+0/-25) po/CMakeLists.txt (+11/-2) po/am.po (+304/-93) po/ar.po (+507/-0) po/ast.po (+284/-136) po/be.po (+486/-0) po/br.po (+289/-134) po/bs.po (+499/-0) po/ca.po (+282/-134) po/com.ubuntu.docviewer.pot (+251/-152) po/cs.po (+263/-130) po/cy.po (+493/-0) po/da.po (+316/-184) po/de.po (+278/-136) po/el.po (+278/-136) po/en_AU.po (+267/-135) po/en_GB.po (+275/-135) po/eo.po (+272/-142) po/es.po (+284/-142) po/eu.po (+263/-130) po/fa.po (+276/-134) po/fi.po (+273/-135) po/fo.po (+484/-0) po/fr.po (+279/-136) po/fr_CA.po (+488/-0) po/gd.po (+278/-159) po/gl.po (+285/-102) po/hr.po (+474/-0) po/hu.po (+278/-134) po/id.po (+287/-142) po/it.po (+280/-134) po/ja.po (+473/-0) po/lo.po (+263/-130) po/lv.po (+316/-174) po/nb.po (+276/-114) po/nl.po (+275/-137) po/ny.po (+264/-135) po/pa.po (+267/-135) po/pl.po (+303/-100) po/pt.po (+278/-137) po/pt_BR.po (+264/-135) po/ro.po (+474/-0) po/ru.po (+270/-136) po/shn.po (+473/-0) po/sk.po (+486/-0) po/sl.po (+275/-137) po/sr.po (+497/-0) po/sv.po (+484/-0) po/tr.po (+264/-135) po/ug.po (+479/-0) po/uk.po (+267/-136) po/uz.po (+488/-0) po/zh_CN.po (+261/-131) po/zh_TW.po (+277/-149) setup/gui/ubuntu-docviewer-app.desktop (+135/-0) snapcraft.yaml (+76/-0) src/CMakeLists.txt (+0/-4) src/app/CMakeLists.txt (+17/-19) src/app/command-line-parser.cpp (+0/-134) src/app/command-line-parser.h (+0/-60) src/app/config.h.in (+49/-0) src/app/content-communicator.cpp (+0/-251) src/app/content-communicator.h (+0/-74) src/app/docviewer-application.cpp (+0/-351) src/app/docviewer-application.h (+0/-100) src/app/graphics/select-none.svg (+0/-153) src/app/graphics/select.svg (+0/-158) src/app/graphics/settings_alt.svg (+0/-138) src/app/main.cpp (+54/-16) src/app/qml/common/CommandLineProxy.qml (+82/-0) src/app/qml/common/ContentHubProxy.qml (+150/-0) src/app/qml/common/DetailsPage.qml (+50/-33) src/app/qml/common/EmptyState.qml (+33/-21) src/app/qml/common/ErrorDialog.qml (+3/-5) src/app/qml/common/HorizontalDivider.qml (+28/-0) src/app/qml/common/NightModeShader.qml (+6/-6) src/app/qml/common/PickImportedDialog.qml (+16/-9) src/app/qml/common/RejectedImportDialog.qml (+7/-7) src/app/qml/common/ResizeableSidebar.qml (+96/-0) src/app/qml/common/ScalingMouseArea.qml (+104/-0) src/app/qml/common/ScalingPinchArea.qml (+59/-0) src/app/qml/common/SubtitledListItem.qml (+37/-0) src/app/qml/common/TextFieldButtonPopover.qml (+58/-0) src/app/qml/common/TextFieldWithButton.qml (+84/-0) src/app/qml/common/TextualButtonStyle.qml (+58/-0) src/app/qml/common/Toast.qml (+0/-82) src/app/qml/common/ToastWithAction.qml (+0/-117) src/app/qml/common/UnknownTypeDialog.qml (+29/-17) src/app/qml/common/VerticalDivider.qml (+35/-0) src/app/qml/common/ViewerPage.qml (+82/-0) src/app/qml/common/loadComponent.js (+10/-0) src/app/qml/common/utils.js (+26/-2) src/app/qml/documentPage/DeleteFileDialog.qml (+53/-40) src/app/qml/documentPage/DocumentDelegateActions.qml (+14/-5) src/app/qml/documentPage/DocumentEmptyState.qml (+45/-11) src/app/qml/documentPage/DocumentGridDelegate.qml (+0/-113) src/app/qml/documentPage/DocumentGridView.qml (+0/-84) src/app/qml/documentPage/DocumentListDelegate.qml (+103/-112) src/app/qml/documentPage/DocumentListView.qml (+76/-164) src/app/qml/documentPage/DocumentPage.qml (+53/-49) src/app/qml/documentPage/DocumentPageDefaultHeader.qml (+20/-25) src/app/qml/documentPage/DocumentPagePickModeHeader.qml (+63/-39) src/app/qml/documentPage/DocumentPageSearchHeader.qml (+30/-21) src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml (+35/-65) src/app/qml/documentPage/SearchEmptyState.qml (+2/-3) src/app/qml/documentPage/SectionHeader.qml (+55/-0) src/app/qml/documentPage/SharePage.qml (+60/-0) src/app/qml/documentPage/SortSettingsDialog.qml (+4/-3) src/app/qml/documentPage/TileBase.qml (+0/-369) src/app/qml/loView/KeybHelper.js (+120/-0) src/app/qml/loView/LOViewDefaultHeader.qml (+99/-0) src/app/qml/loView/LOViewGotoDialog.qml (+77/-0) src/app/qml/loView/LOViewPage.qml (+288/-0) src/app/qml/loView/PartsView.qml (+215/-0) src/app/qml/loView/Splashscreen.qml (+48/-0) src/app/qml/loView/SpreadsheetSelector.qml (+85/-0) src/app/qml/loView/ZoomSelector.qml (+196/-0) src/app/qml/loView/graphics/dropshadow@27.sci (+5/-0) src/app/qml/pdfView/PdfContentsPage.qml (+69/-84) src/app/qml/pdfView/PdfPresentation.qml (+120/-0) src/app/qml/pdfView/PdfView.qml (+194/-79) src/app/qml/pdfView/PdfViewDefaultHeader.qml (+0/-102) src/app/qml/pdfView/PdfViewDelegate.qml (+9/-3) src/app/qml/pdfView/PdfViewGotoDialog.qml (+28/-17) src/app/qml/textView/TextView.qml (+15/-18) src/app/qml/textView/TextViewDefaultHeader.qml (+25/-53) src/app/qml/ubuntu-docviewer-app.qml (+97/-166) src/app/qml/upstreamComponents/HeaderButton.qml (+0/-65) src/app/qml/upstreamComponents/ListItemWithActions.qml (+0/-453) src/app/qml/upstreamComponents/ListItemWithActionsCheckBox.qml (+0/-25) src/app/qml/upstreamComponents/MultipleSelectionGridView.qml (+0/-199) src/app/qml/upstreamComponents/MultipleSelectionListView.qml (+0/-199) src/app/qml/upstreamComponents/MultipleSelectionVisualModel.qml (+0/-31) src/app/qml/upstreamComponents/PageWithBottomEdge.qml (+0/-407) src/app/renderengine.cpp (+97/-0) src/app/renderengine.h (+60/-0) src/app/rendertask.cpp (+1/-0) src/app/rendertask.h (+42/-0) src/app/urlhandler.cpp (+0/-70) src/app/urlhandler.h (+0/-43) src/plugin/CMakeLists.txt (+1/-0) src/plugin/file-qml-plugin/CMakeLists.txt (+9/-6) src/plugin/file-qml-plugin/backend.cpp (+12/-0) src/plugin/file-qml-plugin/documentmodel.cpp (+4/-6) src/plugin/file-qml-plugin/docviewerutils.cpp (+184/-0) src/plugin/file-qml-plugin/docviewerutils.h (+45/-0) src/plugin/file-qml-plugin/qstorageinfo.cpp (+0/-378) src/plugin/file-qml-plugin/qstorageinfo.h (+0/-102) src/plugin/file-qml-plugin/qstorageinfo_p.h (+0/-84) src/plugin/file-qml-plugin/qstorageinfo_unix.cpp (+0/-442) src/plugin/libreofficetoolkit-qml-plugin/CMakeLists.txt (+62/-0) src/plugin/libreofficetoolkit-qml-plugin/LibreOfficeKit/LibreOfficeKit.h (+171/-0) src/plugin/libreofficetoolkit-qml-plugin/LibreOfficeKit/LibreOfficeKit.hxx (+310/-0) src/plugin/libreofficetoolkit-qml-plugin/LibreOfficeKit/LibreOfficeKitEnums.h (+229/-0) src/plugin/libreofficetoolkit-qml-plugin/LibreOfficeKit/LibreOfficeKitGtk.h (+86/-0) src/plugin/libreofficetoolkit-qml-plugin/LibreOfficeKit/LibreOfficeKitInit.h (+257/-0) src/plugin/libreofficetoolkit-qml-plugin/LibreOfficeKit/LibreOfficeKitTypes.h (+30/-0) src/plugin/libreofficetoolkit-qml-plugin/config.h (+97/-0) src/plugin/libreofficetoolkit-qml-plugin/lodocument.cpp (+251/-0) src/plugin/libreofficetoolkit-qml-plugin/lodocument.h (+88/-0) src/plugin/libreofficetoolkit-qml-plugin/loerror.h (+37/-0) src/plugin/libreofficetoolkit-qml-plugin/lopartsimageprovider.cpp (+56/-0) src/plugin/libreofficetoolkit-qml-plugin/lopartsimageprovider.h (+41/-0) src/plugin/libreofficetoolkit-qml-plugin/lopartsimageresponse.cpp (+54/-0) src/plugin/libreofficetoolkit-qml-plugin/lopartsimageresponse.h (+41/-0) src/plugin/libreofficetoolkit-qml-plugin/lopartsmodel.cpp (+106/-0) src/plugin/libreofficetoolkit-qml-plugin/lopartsmodel.h (+73/-0) src/plugin/libreofficetoolkit-qml-plugin/lorendertask.cpp (+25/-0) src/plugin/libreofficetoolkit-qml-plugin/lorendertask.h (+57/-0) src/plugin/libreofficetoolkit-qml-plugin/loview.cpp (+431/-0) src/plugin/libreofficetoolkit-qml-plugin/loview.h (+120/-0) src/plugin/libreofficetoolkit-qml-plugin/lozoom.cpp (+254/-0) src/plugin/libreofficetoolkit-qml-plugin/lozoom.h (+103/-0) src/plugin/libreofficetoolkit-qml-plugin/plugin.cpp (+43/-0) src/plugin/libreofficetoolkit-qml-plugin/plugin.h (+33/-0) src/plugin/libreofficetoolkit-qml-plugin/qml/Viewer.qml (+149/-0) src/plugin/libreofficetoolkit-qml-plugin/qmldir (+4/-0) src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.cpp (+82/-0) src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.h (+46/-0) src/plugin/libreofficetoolkit-qml-plugin/twips.h (+86/-0) src/plugin/libreofficetoolkit-qml-plugin/ucunits.cpp (+241/-0) src/plugin/libreofficetoolkit-qml-plugin/ucunits.h (+60/-0) src/plugin/poppler-qml-plugin/CMakeLists.txt (+8/-0) tests/CMakeLists.txt (+0/-1) tests/autopilot/CMakeLists.txt (+0/-10) tests/autopilot/ubuntu_docviewer_app/CMakeLists.txt (+0/-9) tests/autopilot/ubuntu_docviewer_app/CMakePluginParser.py (+0/-120) tests/autopilot/ubuntu_docviewer_app/__init__.py (+0/-183) tests/autopilot/ubuntu_docviewer_app/tests/CMakeLists.txt (+0/-6) tests/autopilot/ubuntu_docviewer_app/tests/__init__.py (+0/-167) tests/autopilot/ubuntu_docviewer_app/tests/test_docviewer.py (+0/-69) tests/autopilot/ubuntu_docviewer_app/tests/test_toc.py (+0/-47) tools/get-click-deps (+451/-0) tools/run-pep8 (+1/-1) Text conflict in po/am.po Conflict adding file po/ar.po. Moved existing file to po/ar.po.moved. Text conflict in po/ast.po Text conflict in po/br.po Conflict adding file po/bs.po. Moved existing file to po/bs.po.moved. Text conflict in po/ca.po Text conflict in po/cs.po Conflict adding file po/cy.po. Moved existing file to po/cy.po.moved. Text conflict in po/da.po Text conflict in po/de.po Text conflict in po/el.po Text conflict in po/en_AU.po Text conflict in po/en_GB.po Text conflict in po/eo.po Text conflict in po/es.po Text conflict in po/eu.po Text conflict in po/fa.po Text conflict in po/fi.po Conflict adding file po/fo.po. Moved existing file to po/fo.po.moved. Text conflict in po/fr.po Text conflict in po/gd.po Text conflict in po/gl.po Text conflict in po/hu.po Text conflict in po/id.po Text conflict in po/it.po Conflict adding file po/ja.po. Moved existing file to po/ja.po.moved. Text conflict in po/lo.po Text conflict in po/lv.po Text conflict in po/nb.po Text conflict in po/nl.po Text conflict in po/ny.po Text conflict in po/pa.po Text conflict in po/pl.po Text conflict in po/pt.po Text conflict in po/pt_BR.po Conflict adding file po/ro.po. Moved existing file to po/ro.po.moved. Text conflict in po/ru.po Conflict adding file po/shn.po. Moved existing file to po/shn.po.moved. Text conflict in po/sl.po Conflict adding file po/sr.po. Moved existing file to po/sr.po.moved. Conflict adding file po/sv.po. Moved existing file to po/sv.po.moved. Text conflict in po/tr.po Conflict adding file po/ug.po. Moved existing file to po/ug.po.moved. Text conflict in po/uk.po Conflict adding file po/uz.po. Moved existing file to po/uz.po.moved. Text conflict in po/zh_CN.po Text conflict in po/zh_TW.po |
To merge this branch: | bzr merge lp://staging/ubuntu-docviewer-app |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Document Viewer Developers | Pending | ||
Review via email: mp+262686@code.staging.launchpad.net |
Description of the change
Added sample code as the first step to the LibreOffice viewer feature of docviewer. The code was provided by Bjoern Michaelsen, the Ubuntu LO maintaner, as a way to use the LO Toolkit API.
Right now the sample code uses the LO Toolkit API to read a given document into a buffer and then it writes a .png file using libpng.
For docviewer, we can probably convert the C++ code to Qt and assess whether it's needed to do the .png writing (I guess docviewer can use the buffer directly?), and create a QML plugin.
The requirement for this to work is to have LibreOffice 5.0 installed (easily available from a PPA as described in the .cxx's file comments).
I believe the easiest way to start experimenting is to develop on the desktop, prove that it works for Qt/QML and then we can worry about converting it to a .click once we've done that step.
## Build requirements
Please install prerequisites if you havent done so:
sudo apt install libreofficekit-dev libreoffice libpng12-dev
Note that you need LibreOffice 5.0 -- a prerelease is currently available at the prereleases ppa:
sudo add-apt-repository ppa:libreoffice
## Additional documentation
- Readme at:
https:/
- An example of a reader with more features:
https:/
Unmerged revisions
- 365. By Launchpad Translations on behalf of ubuntu-docviewer-dev
-
Launchpad automatic translations update.
- 364. By Launchpad Translations on behalf of ubuntu-docviewer-dev
-
Launchpad automatic translations update.
- 363. By Launchpad Translations on behalf of ubuntu-docviewer-dev
-
Launchpad automatic translations update.
- 362. By Renato Araujo Oliveira Filho
-
[snap] Connect with mir-libs content share.
Approved by Pat McGowan, Jenkins Bot.
- 361. By Launchpad Translations on behalf of ubuntu-docviewer-dev
-
Launchpad automatic translations update.
- 360. By Renato Araujo Oliveira Filho
-
[snap] Added "mir" interface on plug list
Remove desktop_file_hint flag.
Approved by Jenkins Bot.
- 359. By Launchpad Translations on behalf of ubuntu-docviewer-dev
-
Launchpad automatic translations update.
- 358. By Launchpad Translations on behalf of ubuntu-docviewer-dev
-
Launchpad automatic translations update.
- 357. By Renato Araujo Oliveira Filho
-
Added snap metadata.
Approved by Jenkins Bot, Andrew Hayzen, Gustavo Pichorim Boiko.
- 356. By Renato Araujo Oliveira Filho
-
Create snapcract package.
Approved by Jenkins Bot, Pat McGowan.
I had a play with this on my amd64 wily laptop.
The ultimate goal being to have a fully-enclosed click package containing the necessary libreoffice binaries, rather than debian packages. So rather than install the debs from the ppa as Bjoern suggested, I grabbed the tarball directly from libreoffice.org
Followed these instructions:- https:/ /wiki.documentf oundation. org/Installing_ in_parallel/ Linux building/ LibreOffice_ 5.0.0.1_ Linux_x86- 64_deb/ DEBS/install so I edited line 71 in the attached code:-
Steps 1-3 and 7 only, omitting the optional parts. I ended up with an unpackaged install of Libreoffice 5.x in ~/libreoffice/
std::unique_ ptr<lok: :Office> pOffice( lok::lok_ cpp_init( "/usr/lib/ libreoffice/ program/ "));
To be:-
std::unique_ ptr<lok: :Office> pOffice( lok::lok_ cpp_init( "/home/ alan/libreoffic e/building/ LibreOffice_ 5.0.0.1_ Linux_x86- 64_deb/ DEBS/install/ opt/libreoffice 5.0/program/ "));
Just to prove that this works with a libreoffice install which isn't installed in the usual places expected with a debian install.
This also means you don't need to replace the 4.x libreoffice shipped in ubuntu with the pre-release from a ppa, just for testing this.