Merge lp://qastaging/~verzegnassi-stefano/ubuntu-docviewer-app/libreoffice-splashscreen into lp://qastaging/ubuntu-docviewer-app
Proposed by
Stefano Verzegnassi
| Status: | Merged |
|---|---|
| Approved by: | Stefano Verzegnassi |
| Approved revision: | 218 |
| Merged at revision: | 217 |
| Proposed branch: | lp://qastaging/~verzegnassi-stefano/ubuntu-docviewer-app/libreoffice-splashscreen |
| Merge into: | lp://qastaging/ubuntu-docviewer-app |
| Diff against target: |
868 lines (+318/-273) 11 files modified
po/com.ubuntu.docviewer.pot (+23/-16) src/app/CMakeLists.txt (+0/-9) src/app/qml/common/ViewerPage.qml (+53/-0) src/app/qml/loView/KeybHelper.js (+1/-1) src/app/qml/loView/LOViewDefaultHeader.qml (+39/-39) src/app/qml/loView/LOViewGotoDialog.qml (+4/-2) src/app/qml/loView/LOViewPage.qml (+138/-160) src/app/qml/loView/PanelButton.qml (+0/-31) src/app/qml/loView/Splashscreen.qml (+48/-0) src/app/qml/loView/ZoomSelector.qml (+9/-15) src/app/qml/ubuntu-docviewer-app.qml (+3/-0) |
| To merge this branch: | bzr merge lp://qastaging/~verzegnassi-stefano/ubuntu-docviewer-app/libreoffice-splashscreen |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Roman Shchekin | Approve | ||
| Alan Pope 🍺🐧🐱 🦄 (community) | Approve | ||
| Jenkins Bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
* Added splashscreen for loViewer
* Moved the async logic that loads loViewer in another component
* Removed 'PanelButton' component - no longer used
* Changed the behaviour of the header in the loViewer: if (textDocument) hideableHeader = true
* Don't use a global 'graphics' folder. Assets are now placed in the module which uses them.
Description of the change
* Added splashscreen for loViewer
* Moved the async logic that loads loViewer in another component
* Removed 'PanelButton' component - no longer used
* Changed the behaviour of the header in the loViewer: if (textDocument) hideableHeader = true
* Don't use a global 'graphics' folder. Assets are now placed in the module which uses them.
P.S. Part of the diff is just trash (i.e. indentation changed).
To post a comment you must log in.
Revision history for this message
| Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:218
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/