Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/no-docs-empty-state into lp:ubuntu-docviewer-app

Proposed by Stefano Verzegnassi
Status: Merged
Approved by: Stefano Verzegnassi
Approved revision: 232
Merged at revision: 232
Proposed branch: lp:~verzegnassi-stefano/ubuntu-docviewer-app/no-docs-empty-state
Merge into: lp:ubuntu-docviewer-app
Diff against target: 94 lines (+65/-7)
1 file modified
src/app/qml/documentPage/DocumentEmptyState.qml (+65/-7)
To merge this branch: bzr merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/no-docs-empty-state
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Approve
Review via email: mp+280171@code.launchpad.net

Commit message

Align 'no document found' empty state design to music-app

Description of the change

Align 'no document found' empty state design to music-app.
New graphics are taken from music-app and appropriately edited with GIMP.

Result: https://imgur.com/e0M7aad

To post a comment you must log in.
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

Looks great!

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/qml/documentPage/DocumentEmptyState.qml'
2--- src/app/qml/documentPage/DocumentEmptyState.qml 2015-11-01 16:50:23 +0000
3+++ src/app/qml/documentPage/DocumentEmptyState.qml 2015-12-10 16:55:45 +0000
4@@ -15,17 +15,75 @@
5 */
6
7 import QtQuick 2.4
8-import "../common"
9+import Ubuntu.Components 1.3
10
11 Item {
12 anchors.fill: parent
13
14- EmptyState {
15- title: i18n.tr("No document found")
16- subTitle: i18n.tr("Connect your device to any computer and simply drag files to the Documents folder or insert removable media with documents.")
17- iconName: "edit-copy"
18-
19+ Column {
20 anchors.centerIn: parent
21- width: parent.width
22+ spacing: units.gu(4)
23+ width: units.gu(36)
24+
25+ Row {
26+ anchors.horizontalCenter: parent.horizontalCenter
27+
28+ Item {
29+ height: parent.height
30+ width: imageEmptyDownload.width + units.gu(2)
31+
32+ Image {
33+ id: imageEmptyDownload
34+ anchors.centerIn: parent
35+ antialiasing: true
36+ fillMode: Image.PreserveAspectFit
37+ height: units.gu(10)
38+ smooth: true
39+ source: Qt.resolvedUrl("graphics/document_download_icon.png")
40+ }
41+ }
42+
43+ Item {
44+ height: parent.height
45+ width: units.gu(7)
46+
47+ Image {
48+ anchors.centerIn: parent
49+ antialiasing: true
50+ fillMode: Image.PreserveAspectFit
51+ height: units.gu(6)
52+ smooth: true
53+ source: Qt.resolvedUrl("graphics/div.png")
54+ }
55+ }
56+
57+ Image {
58+ anchors.verticalCenter: parent.verticalCenter
59+ antialiasing: true
60+ fillMode: Image.PreserveAspectFit
61+ height: units.gu(7)
62+ smooth: true
63+ source: Qt.resolvedUrl("graphics/sd_phone_icon.png")
64+ }
65+ }
66+
67+ Label {
68+ elide: Text.ElideRight
69+ fontSize: "x-large"
70+ horizontalAlignment: Text.AlignLeft
71+ maximumLineCount: 2
72+ text: i18n.tr("No document found")
73+ width: parent.width
74+ wrapMode: Text.WordWrap
75+ }
76+
77+ Label {
78+ elide: Text.ElideRight
79+ fontSize: "large"
80+ horizontalAlignment: Text.AlignLeft
81+ text: i18n.tr("Connect your device to any computer and simply drag files to the Documents folder or insert removable media with documents.")
82+ width: parent.width
83+ wrapMode: Text.WordWrap
84+ }
85 }
86 }
87
88=== added directory 'src/app/qml/documentPage/graphics'
89=== added file 'src/app/qml/documentPage/graphics/div@27.png'
90Binary files src/app/qml/documentPage/graphics/div@27.png 1970-01-01 00:00:00 +0000 and src/app/qml/documentPage/graphics/div@27.png 2015-12-10 16:55:45 +0000 differ
91=== added file 'src/app/qml/documentPage/graphics/document_download_icon@27.png'
92Binary files src/app/qml/documentPage/graphics/document_download_icon@27.png 1970-01-01 00:00:00 +0000 and src/app/qml/documentPage/graphics/document_download_icon@27.png 2015-12-10 16:55:45 +0000 differ
93=== added file 'src/app/qml/documentPage/graphics/sd_phone_icon@27.png'
94Binary files src/app/qml/documentPage/graphics/sd_phone_icon@27.png 1970-01-01 00:00:00 +0000 and src/app/qml/documentPage/graphics/sd_phone_icon@27.png 2015-12-10 16:55:45 +0000 differ

Subscribers

People subscribed via source and target branches