Merge lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/reboot-uitk13 into lp://staging/ubuntu-docviewer-app
| Status: | Merged | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Roman Shchekin | ||||||||||||
| Approved revision: | 220 | ||||||||||||
| Merged at revision: | 210 | ||||||||||||
| Proposed branch: | lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/reboot-uitk13 | ||||||||||||
| Merge into: | lp://staging/ubuntu-docviewer-app | ||||||||||||
| Diff against target: |
2460 lines (+798/-709) 47 files modified
debian/control (+1/-1) po/com.ubuntu.docviewer.pot (+33/-76) src/app/qml/common/CommandLineProxy.qml (+2/-2) src/app/qml/common/DetailsPage.qml (+1/-1) src/app/qml/common/EmptyState.qml (+2/-2) src/app/qml/common/ErrorDialog.qml (+2/-2) src/app/qml/common/HorizontalDivider.qml (+28/-0) src/app/qml/common/PageWithBottomEdge.qml (+33/-43) src/app/qml/common/PickImportedDialog.qml (+2/-2) src/app/qml/common/RejectedImportDialog.qml (+2/-2) src/app/qml/common/ResizeableSidebar.qml (+98/-0) src/app/qml/common/SubtitledListItem.qml (+2/-2) src/app/qml/common/TextFieldButtonPopover.qml (+58/-0) src/app/qml/common/TextFieldWithButton.qml (+84/-0) src/app/qml/common/UnknownTypeDialog.qml (+2/-2) src/app/qml/common/VerticalDivider.qml (+35/-0) src/app/qml/documentPage/DeleteFileDialog.qml (+2/-2) src/app/qml/documentPage/DocumentDelegateActions.qml (+2/-2) src/app/qml/documentPage/DocumentEmptyState.qml (+1/-1) src/app/qml/documentPage/DocumentListDelegate.qml (+3/-3) src/app/qml/documentPage/DocumentListView.qml (+1/-3) src/app/qml/documentPage/DocumentPage.qml (+2/-2) src/app/qml/documentPage/DocumentPageDefaultHeader.qml (+2/-2) src/app/qml/documentPage/DocumentPagePickModeHeader.qml (+1/-1) src/app/qml/documentPage/DocumentPageSearchHeader.qml (+1/-1) src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml (+2/-4) src/app/qml/documentPage/SearchEmptyState.qml (+1/-1) src/app/qml/documentPage/SectionHeader.qml (+2/-2) src/app/qml/documentPage/SharePage.qml (+1/-1) src/app/qml/documentPage/SortSettingsDialog.qml (+2/-2) src/app/qml/loView/LOViewDefaultHeader.qml (+31/-30) src/app/qml/loView/LOViewGotoDialog.qml (+2/-2) src/app/qml/loView/LOViewPage.qml (+39/-95) src/app/qml/loView/LOViewZoomHeader.qml (+0/-59) src/app/qml/loView/PanelButton.qml (+1/-1) src/app/qml/loView/PartsView.qml (+112/-58) src/app/qml/loView/SlideControllerPanel.qml (+0/-87) src/app/qml/loView/ZoomSelector.qml (+129/-114) src/app/qml/pdfView/PdfContentsPage.qml (+3/-8) src/app/qml/pdfView/PdfView.qml (+28/-19) src/app/qml/pdfView/PdfViewDefaultHeader.qml (+5/-19) src/app/qml/pdfView/PdfViewDelegate.qml (+1/-1) src/app/qml/pdfView/PdfViewGotoDialog.qml (+2/-2) src/app/qml/textView/TextView.qml (+3/-3) src/app/qml/textView/TextViewDefaultHeader.qml (+5/-19) src/app/qml/ubuntu-docviewer-app.qml (+14/-29) src/plugin/libreofficetoolkit-qml-plugin/qml/Viewer.qml (+15/-1) |
||||||||||||
| To merge this branch: | bzr merge lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/reboot-uitk13 | ||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Roman Shchekin | Approve | ||
| Jenkins Bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
* Switch to Ubuntu Toolkit 1.3
* UI updated
* Improved support for zoom on desktop
* Updated framework to 14.04.1
* Moved components in the 'upstreamCompon
* Use the new BottomEdgeHint component in order to provide mouse/keyb controls for the bottom edge.
* Changed Header behaviour to default in the PDF viewer
* Use an horizontal PartsView for switching slides in portrait, small-width mode, instead of using the SlideController
* Removed some obsolete code
Description of the change
This MP may become very huge since there are big changes with ListItem(s), because of the introduction of ListItemLayout.
For that reason I will ask multiple reviews in order to split the diff into small parts.
The version of the toolkit we target is 1.3.1676+
Link: http://
Changes:
* Updated all the 'Ubuntu.*' imports to verstion 1.3
* New ZoomSelector UI
* Usage of the new enum 'textSize' property instead of string 'fontSize' in Labels
* Better support for zoom on desktop
* Usage of 'theme' singleton instead of deprecated 'Theme'
* Updated framework to 14.04.1
* Moved components in the 'upstreamCompon
* Use BottomEdgeHint in order to provide mouse/keyb controls for the bottom edge.
* Changed Header behaviour to default in the PDF viewer (the way we did the 'tap to show/hide' is broken with the upcoming UITK release)
* Use an horizontal PartsView for switching slides in portrait, small-width mode, instead of using the SlideController
WILL COME WITH SEPARATE MPs:
* Move all async logic used in LoViewPage in another component
* Fix broken Autopilot tests: it will be done in a following MP
| Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote | # |
| Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote | # |
| Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote | # |
| Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote | # |
| Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote | # |
FAILED: Continuous integration, rev:216
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/