Ubuntu Document Viewer App

Merge lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/new-empty-state into lp://staging/ubuntu-docviewer-app

new-empty-state
Merge into lo-viewer

Proposed by Stefano Verzegnassi on 2016-01-25

Status:	Merged
Approved by:	Nicholas Skaggs on 2016-02-02
Approved revision:	280
Merged at revision:	286
Proposed branch:	lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/new-empty-state
Merge into:	lp://staging/ubuntu-docviewer-app
Diff against target:	276 lines (+86/-96) 4 files modified po/com.ubuntu.docviewer.pot (+8/-8) src/app/qml/common/EmptyState.qml (+35/-23) src/app/qml/documentPage/DocumentEmptyState.qml (+43/-64) src/app/qml/documentPage/SearchEmptyState.qml (+0/-1)
To merge this branch:	bzr merge lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/new-empty-state
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Jenkins Bot	continuous-integration		Approve on 2016-02-02
Alan Pope 🍺🐧🐱 🦄 (community)		2016-01-25	Needs Fixing on 2016-02-02
Nicholas Skaggs (community)			Needs Fixing on 2016-02-02
Roman Shchekin			Approve on 2016-01-29
Review via email: mp+283802@code.staging.launchpad.net

Commit message

Apply new style for empty state everywhere

Description of the change

Apply new style for empty state everywhere

Revision history for this message

Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote on 2016-01-25:

PASSED: Continuous integration, rev:278
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/171/
Executed test runs:
None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/455/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/171/rebuild

review: Approve (continuous-integration)

Revision history for this message

Alan Pope 🍺🐧🐱 🦄 (popey) wrote on 2016-01-29:

http://people.canonical.com/~alan/screenshots/device-2016-01-29-124151.png

Looks great.

One minor nitpick on the wording, I'd probably go with:-

"No documents found" (plural)

and

"... insert removable media containing documents." (rather than 'with').

review: Approve

Revision history for this message

Roman Shchekin (mrqtros) wrote on 2016-01-29:

LGTM

review: Approve

Revision history for this message

Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote on 2016-01-29:

FAILED: Autolanding.
Merging failed. More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-autolanding/821/
Executed test runs:
None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1523/console

review: Needs Fixing (continuous-integration)

Revision history for this message

Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote on 2016-01-29:

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-autolanding/140/
Executed test runs:
None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1529/console

review: Needs Fixing (continuous-integration)

Revision history for this message

Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote on 2016-01-29:

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-autolanding/143/
Executed test runs:
None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1534/console

review: Needs Fixing (continuous-integration)

Revision history for this message

Nicholas Skaggs (nskaggs) wrote on 2016-02-02:

Merging 'lp:ubuntu-docviewer-app/reboot' in to 'build_dir'.
Text conflict in po/com.ubuntu.docviewer.pot
1 conflicts encountered.
bzr: ERROR: Conflicts from merge

review: Needs Fixing

Revision history for this message

Alan Pope 🍺🐧🐱 🦄 (popey) wrote on 2016-02-02:

Text conflict...

Building tree.
Retrieving 'lp:~verzegnassi-stefano/ubuntu-docviewer-app/new-empty-state' to put at 'build_dir'.
Merging 'lp:ubuntu-docviewer-app/reboot' in to 'build_dir'.
Text conflict in po/com.ubuntu.docviewer.pot
1 conflicts encountered.
bzr: ERROR: Conflicts from merge
Build step 'Execute shell' marked build as failure