Merge into lo-viewer : uitk-theming-silo-50 : Code : Ubuntu Document Viewer App

Status:

Merged

Approved by:

Roman Shchekin on 2016-03-31

Approved revision:

314

Merged at revision:

327

Proposed branch:

lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/uitk-theming-silo-50

Merge into:

lp://staging/ubuntu-docviewer-app

Diff against target:

289 lines (+75/-64)

7 files modified

src/app/qml/common/ResizeableSidebar.qml (+4/-6)
src/app/qml/common/SubtitledListItem.qml (+2/-7)
src/app/qml/documentPage/DocumentListDelegate.qml (+2/-6)
src/app/qml/documentPage/SectionHeader.qml (+49/-23)
src/app/qml/loView/PartsView.qml (+7/-7)
src/app/qml/loView/SpreadsheetSelector.qml (+3/-2)
src/app/qml/pdfView/PdfContentsPage.qml (+8/-13)

To merge this branch:

bzr merge lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/uitk-theming-silo-50

High

Fix Released

Link a bug report

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

Commit message

* Updated copyright
* Removed usage of deprecated colors (e.g. UbuntuColors.midAubergine)
* Align to the latest clock-app specs (i.e. don't use purple as accent color)
* Use the section divider from the latest calendar-app specs
* Don't use DemiBold in PDF ToC
* Fixed font color broken after UITK theming changes in Silo 50 (OTA 10)
* ResizeableSidebar: fixed vertical divider margins

Description of the change

* Updated copyright
* Removed usage of deprecated colors (e.g. UbuntuColors.midAubergine)
* Align to the latest clock-app specs (i.e. don't use purple as accent color)
* Use the section divider from the latest calendar-app specs
* Don't use DemiBold in PDF ToC
* Fixed font color broken after UITK theming changes in Silo 50 (OTA 10)
* ResizeableSidebar: fixed vertical divider margins

Revision history for this message

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

#

FAILED: Continuous integration, rev:313
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/236/
Executed test runs:
None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/733/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

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

review: Approve (continuous-integration)

Revision history for this message

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

#

See inline question.

review: Needs Information

Revision history for this message

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

#

> Should you remove FIXME? Is it wrapping itself now?
Yes, it wraps the text by default (it's limited to maximum one line of text though).

I kept the comment because we may want to reserve two lines for the document name in future, however the visual result is not so good (i.e. text is - of course - not aligned with other ListItemLayout which use only one line for title).

See https://imgur.com/bpf6cnE

Anyway, that bug in UITK has been fixed now, so I'm going to update that comment.

Thanks Roman for pointing it out! :)

lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/uitk-theming-silo-50 updated on 2016-03-30