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