Merge lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/reboot-uitk13-listitemlayout into lp://staging/ubuntu-docviewer-app/trunk
Proposed by
Stefano Verzegnassi
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/reboot-uitk13-listitemlayout |
| Merge into: | lp://staging/ubuntu-docviewer-app/trunk |
| Diff against target: |
18377 lines (+7346/-5910) (has conflicts) 147 files modified
README (+27/-8) debian/control (+5/-2) docviewer.apparmor (+2/-2) manifest.json.in (+1/-1) po/am.po (+36/-15) po/ast.po (+32/-16) po/br.po (+36/-15) po/ca.po (+32/-16) po/com.ubuntu.docviewer.pot (+217/-144) po/cs.po (+32/-16) po/da.po (+32/-16) po/de.po (+42/-28) po/el.po (+76/-62) po/en_AU.po (+32/-16) po/en_GB.po (+44/-29) po/eo.po (+56/-40) po/es.po (+32/-16) po/eu.po (+32/-16) po/fa.po (+43/-29) po/fi.po (+33/-17) po/fr.po (+44/-30) po/gd.po (+32/-16) po/gl.po (+37/-16) po/hu.po (+32/-16) po/id.po (+32/-16) po/it.po (+33/-17) po/lo.po (+32/-16) po/lv.po (+32/-16) po/nb.po (+37/-15) po/nl.po (+33/-17) po/ny.po (+32/-16) po/pa.po (+43/-29) po/pl.po (+41/-22) po/pt.po (+34/-18) po/pt_BR.po (+32/-16) po/ru.po (+32/-16) po/sl.po (+62/-58) po/tr.po (+32/-16) po/uk.po (+32/-16) po/uz.po (+395/-0) po/zh_CN.po (+32/-16) po/zh_TW.po (+32/-16) src/app/CMakeLists.txt (+11/-11) src/app/command-line-parser.cpp (+0/-134) src/app/command-line-parser.h (+0/-60) src/app/config.h.in (+45/-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 (+149/-0) src/app/qml/common/DetailsPage.qml (+15/-11) src/app/qml/common/FileNotFoundDialog.qml (+3/-3) src/app/qml/common/NightModeShader.qml (+1/-1) src/app/qml/common/PickImportedDialog.qml (+15/-9) src/app/qml/common/RejectedImportDialog.qml (+7/-7) src/app/qml/common/SubtitledListItem.qml (+34/-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/loadComponent.js (+10/-0) src/app/qml/common/utils.js (+28/-0) src/app/qml/documentPage/DeleteFileDialog.qml (+49/-36) src/app/qml/documentPage/DocumentDelegateActions.qml (+14/-5) src/app/qml/documentPage/DocumentEmptyState.qml (+2/-5) src/app/qml/documentPage/DocumentGridDelegate.qml (+0/-113) src/app/qml/documentPage/DocumentGridView.qml (+0/-84) src/app/qml/documentPage/DocumentListDelegate.qml (+100/-111) src/app/qml/documentPage/DocumentListView.qml (+71/-152) src/app/qml/documentPage/DocumentPage.qml (+25/-15) src/app/qml/documentPage/DocumentPageDefaultHeader.qml (+7/-9) src/app/qml/documentPage/DocumentPagePickModeHeader.qml (+15/-8) src/app/qml/documentPage/DocumentPageSearchHeader.qml (+2/-2) src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml (+40/-60) src/app/qml/documentPage/SearchEmptyState.qml (+1/-1) src/app/qml/documentPage/SectionHeader.qml (+29/-0) src/app/qml/documentPage/SharePage.qml (+56/-0) src/app/qml/documentPage/SortSettingsDialog.qml (+4/-3) src/app/qml/documentPage/TileBase.qml (+0/-369) src/app/qml/loView/KeybHelper.js (+144/-0) src/app/qml/loView/LOViewDefaultHeader.qml (+136/-0) src/app/qml/loView/LOViewGotoDialog.qml (+75/-0) src/app/qml/loView/LOViewPage.qml (+296/-0) src/app/qml/loView/PanelButton.qml (+31/-0) src/app/qml/loView/PartsView.qml (+92/-0) src/app/qml/loView/SlideControllerPanel.qml (+87/-0) src/app/qml/loView/ZoomSelector.qml (+259/-0) src/app/qml/pdfView/PdfContentsPage.qml (+58/-54) src/app/qml/pdfView/PdfView.qml (+4/-4) src/app/qml/pdfView/PdfViewDefaultHeader.qml (+6/-4) src/app/qml/pdfView/PdfViewDelegate.qml (+2/-2) src/app/qml/pdfView/PdfViewGotoDialog.qml (+26/-15) src/app/qml/textView/TextView.qml (+4/-4) src/app/qml/textView/TextViewDefaultHeader.qml (+6/-4) src/app/qml/ubuntu-docviewer-app.qml (+52/-129) src/app/qml/upstreamComponents/EmptyState.qml (+3/-3) 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 (+4/-4) 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 (+5/-6) src/plugin/file-qml-plugin/backend.cpp (+12/-0) src/plugin/file-qml-plugin/documentmodel.cpp (+3/-6) src/plugin/file-qml-plugin/docviewerutils.cpp (+169/-0) src/plugin/file-qml-plugin/docviewerutils.h (+42/-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 (+54/-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 (+38/-0) src/plugin/libreofficetoolkit-qml-plugin/lodocument.cpp (+233/-0) src/plugin/libreofficetoolkit-qml-plugin/lodocument.h (+93/-0) src/plugin/libreofficetoolkit-qml-plugin/lopartsimageprovider.cpp (+54/-0) src/plugin/libreofficetoolkit-qml-plugin/lopartsimageprovider.h (+40/-0) src/plugin/libreofficetoolkit-qml-plugin/lopartsmodel.cpp (+126/-0) src/plugin/libreofficetoolkit-qml-plugin/lopartsmodel.h (+81/-0) src/plugin/libreofficetoolkit-qml-plugin/loview.cpp (+396/-0) src/plugin/libreofficetoolkit-qml-plugin/loview.h (+113/-0) src/plugin/libreofficetoolkit-qml-plugin/plugin.cpp (+39/-0) src/plugin/libreofficetoolkit-qml-plugin/plugin.h (+33/-0) src/plugin/libreofficetoolkit-qml-plugin/qml/Viewer.qml (+109/-0) src/plugin/libreofficetoolkit-qml-plugin/qmldir (+4/-0) src/plugin/libreofficetoolkit-qml-plugin/renderengine.cpp (+120/-0) src/plugin/libreofficetoolkit-qml-plugin/renderengine.h (+58/-0) src/plugin/libreofficetoolkit-qml-plugin/rendertask.cpp (+1/-0) src/plugin/libreofficetoolkit-qml-plugin/rendertask.h (+81/-0) src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.cpp (+87/-0) src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.h (+44/-0) src/plugin/libreofficetoolkit-qml-plugin/twips.h (+59/-0) Text conflict in po/am.po Contents conflict in po/ar.po Text conflict in po/ast.po Text conflict in po/br.po Contents conflict in po/bs.po Text conflict in po/ca.po Text conflict in po/cs.po Contents conflict in po/cy.po 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 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 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 Text conflict in po/ru.po Text conflict in po/sl.po Text conflict in po/tr.po 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/~verzegnassi-stefano/ubuntu-docviewer-app/reboot-uitk13-listitemlayout |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Roman Shchekin | Pending | ||
|
Review via email:
|
|||
Commit message
Use UITK 1.3 ListItemLayout
Description of the change
Use ListItemLayout to provide a proper layouting inside ListItem.
*** REFERENCES
ListItemLayout example:
http://
UI/UX ListItem slots specifications: (Ask James for the authorization to view the document)
https:/
To post a comment you must log in.
Unmerged revisions
- 203. By Stefano Verzegnassi
-
Merged prerequisite branch
- 202. By Stefano Verzegnassi
-
Merged prerequisite 'reboot-uitk13' branch
- 201. By Stefano Verzegnassi
-
Reverted Autopilot tests fixes - they have been moved in another branch
- 200. By Stefano Verzegnassi
-
Added a comment about PDFView's 'GoToPage' dialog test failing
- 199. By Stefano Verzegnassi
-
Fixed Autopilot 'test_toc' test
- 198. By Stefano Verzegnassi
-
Fixing ZoomSelector pt.1
- 197. By Stefano Verzegnassi
-
Updated to ListItemLayout. Still some TODO/FIXME task.
- 196. By Stefano Verzegnassi
-
Updated framework version in the manifest file
- 195. By Stefano Verzegnassi
-
Removed usage of deprecated 'Theme' singleton. Use 'theme' instead.
- 194. By Stefano Verzegnassi
-
[UITK13-Labels] Use 'textSize' enum property instead of 'fontSize' string one
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
