Ubuntu Document Viewer App

Merge lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/uitk13-documents-page into lp://staging/ubuntu-docviewer-app

uitk13-documents-page
Merge into lo-viewer

Proposed by Stefano Verzegnassi on 2016-03-26

Status:

Merged

Approved by:

Stefano Verzegnassi on 2016-03-31

Approved revision:

317

Merged at revision:

329

Proposed branch:

lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/uitk13-documents-page

Merge into:

lp://staging/ubuntu-docviewer-app

Diff against target:

705 lines (+250/-200)

11 files modified

src/app/qml/common/ContentHubProxy.qml (+1/-1)
src/app/qml/common/TextualButtonStyle.qml (+58/-0)
src/app/qml/documentPage/DeleteFileDialog.qml (+6/-6)
src/app/qml/documentPage/DocumentListDelegate.qml (+6/-5)
src/app/qml/documentPage/DocumentListView.qml (+4/-9)
src/app/qml/documentPage/DocumentPage.qml (+45/-55)
src/app/qml/documentPage/DocumentPageDefaultHeader.qml (+15/-18)
src/app/qml/documentPage/DocumentPagePickModeHeader.qml (+45/-40)
src/app/qml/documentPage/DocumentPageSearchHeader.qml (+27/-18)
src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml (+37/-45)
src/app/qml/documentPage/SharePage.qml (+6/-3)

To merge this branch:

bzr merge lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/uitk13-documents-page

Low

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Roman Shchekin		2016-03-26	Approve on 2016-03-31
Jenkins Bot	continuous-integration		Approve on 2016-03-30
Review via email: mp+290170@code.staging.launchpad.net

Commit message

* Use PageHeader and ScrollView in documents page

* Removed width limitation of units.gu(80) from documents page

* Code refactoring

* Use a 'Label' instead of the SD card icon.
Sure, it's a bit ugly but it has no alignment issue. In any case, we should replace the current documents view soon.

* Fixed a few typos in the pickMode header (i.e. we were pushing the wrong file through content-hub)

* UI changes to headers:
--- Search header: use search header style recently introduced in unity8-dash
--- Pick mode header: use textual buttons

Description of the change

* Use PageHeader and ScrollView in documents page

* Removed width limitation of units.gu(80) from documents page

* Code refactoring

* Use a 'Label' instead of the SD card icon.
Sure, it's a bit ugly but it has no alignment issue. In any case, we should replace the current documents view soon.

* Fixed a few typos in the pickMode header (i.e. we were pushing the wrong file through content-hub)

* UI changes to headers:
--- Search header: use search header style recently introduced in unity8-dash
--- Pick mode header: use textual buttons

Revision history for this message

Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote on 2016-03-26:

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

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

review: Approve (continuous-integration)

lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/uitk13-documents-page updated on 2016-03-26

316. By Stefano Verzegnassi on 2016-03-26: Updated copyright

Revision history for this message

Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote on 2016-03-26:

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

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

review: Approve (continuous-integration)

Revision history for this message

Roman Shchekin (mrqtros) wrote on 2016-03-30:

See inline comments.

Overall feeling - so much logic is located in headers. I know that you only rewriting some staff to UITK 1.3, just wanted to note that.
Can't w8 that time when I will be able to refactor some QML code ;)

review: Needs Fixing

Revision history for this message

Stefano Verzegnassi (verzegnassi-stefano) wrote on 2016-03-30:

> Should you extract this component to separate file since it is declared twice?

Done! (also, TextualButtonWithIcon has been merged into TextualButton)

> Overall feeling - so much logic is located in headers.
> I know that you only rewriting some staff to UITK 1.3, just wanted to note that.
> Can't w8 that time when I will be able to refactor some QML code ;)

True. Anyway I'm thinking at having the four headers into the document that declares the whole DocumentsPage... as you have already seen, I'm not the guy who likes 400+ lines stored into a single QML file (especially when there's much JS logic).
UITK Headers works much as individual entities that are replaced on the fly, therefore I've declared them in separate files.

However, we need to refactor those stuff (and think at a different solution), that's for sure! :)

lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/uitk13-documents-page updated on 2016-03-30