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

[Stefano Verzegnassi]

Apply new style for empty state everywhere

Apply new style for empty state everywhere

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

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

[Roman Shchekin (mrqtros)]

LGTM

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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)

[Nicholas Skaggs (nskaggs)]

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

[Alan Pope 🍺🐧🐱 🦄 (popey)]

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

review: Needs Fixing

[lp:~verzegnassi-stefano/ubuntu-docviewer-app/new-empty-state]

280. By Stefano Verzegnassi on 2016-02-02

Merged trunk, updated .pot

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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

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

review: Approve (continuous-integration)

=== modified file 'po/com.ubuntu.docviewer.pot'
--- po/com.ubuntu.docviewer.pot	2016-01-29 12:23:24 +0000
+++ po/com.ubuntu.docviewer.pot	2016-02-02 11:34:49 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-29 13:22+0100\n"
+"POT-Creation-Date: 2016-02-02 12:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -178,14 +178,14 @@
 msgid "Share"
 msgstr ""
 
-#: ../src/app/qml/documentPage/DocumentEmptyState.qml:75
-msgid "No document found"
+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:27
+msgid "No documents found"
 msgstr ""
 
-#: ../src/app/qml/documentPage/DocumentEmptyState.qml:84
+#: ../src/app/qml/documentPage/DocumentEmptyState.qml:28
 msgid ""
 "Connect your device to any computer and simply drag files to the Documents "
-"folder or insert removable media with documents."
+"folder or insert removable media containing documents."
 msgstr ""
 
 #. TRANSLATORS: %1 refers to a time formatted as Locale.ShortFormat (e.g. hh:mm). It depends on system settings.
@@ -216,7 +216,7 @@
 msgstr ""
 
 #: ../src/app/qml/documentPage/DocumentPage.qml:23
-#: /tmp/uitk-bottom-edge-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
+#: /tmp/new-empty-state-build/po/com.ubuntu.docviewer.desktop.in.in.h:3
 msgid "Documents"
 msgstr ""
 
@@ -449,10 +449,10 @@
 msgid "copy %1"
 msgstr ""
 
-#: /tmp/uitk-bottom-edge-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
+#: /tmp/new-empty-state-build/po/com.ubuntu.docviewer.desktop.in.in.h:1
 msgid "Document Viewer"
 msgstr ""
 
-#: /tmp/uitk-bottom-edge-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /tmp/new-empty-state-build/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr ""

=== modified file 'src/app/qml/common/EmptyState.qml'
--- src/app/qml/common/EmptyState.qml	2015-11-01 16:50:23 +0000
+++ src/app/qml/common/EmptyState.qml	2016-02-02 11:34:49 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014, 2015, 2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
@@ -24,39 +24,51 @@
  icon, title and subtitle to describe the empty state.
 */
 
-Item {
+Column {
     id: emptyState
+    spacing: units.gu(4)
+    width: units.gu(36)
 
     // Public APIs
+    default property alias iconPlaceholder: iconContainer.data
     property alias iconName: emptyIcon.name
     property alias title: emptyLabel.text
     property alias subTitle: emptySublabel.text
 
-    height: childrenRect.height
-
-    Icon {
-        id: emptyIcon
-        anchors.horizontalCenter: parent.horizontalCenter
-        height: units.gu(10)
-        width: height
-        color: "#BBBBBB"
+    Item {
+        width: childrenRect.width
+        height: childrenRect.height
+        Icon {
+            id: emptyIcon
+            height: visible ? units.gu(10) : 0
+            width: visible ? height : 0
+            color: "#BBBBBB"
+            visible: name || source
+        }
+        Row {
+            id: iconContainer
+            anchors.horizontalCenter: parent.horizontalCenter
+        }
     }
 
     Label {
         id: emptyLabel
-        anchors.top: emptyIcon.bottom
-        anchors.topMargin: units.gu(5)
-        anchors.horizontalCenter: parent.horizontalCenter
+        width: parent.width
+        horizontalAlignment: Text.AlignLeft
+        textSize: Label.XLarge
+
+        elide: Text.ElideRight
+        wrapMode: Text.WordWrap
+        maximumLineCount: 2
+    }
+
+    Label {
+        id: emptySublabel
+        width: parent.width
+        horizontalAlignment: Text.AlignLeft
         textSize: Label.Large
-        font.bold: true
-    }
-
-    Label {
-        id: emptySublabel
-        anchors.top: emptyLabel.bottom
-
-        width: parent.width
-        wrapMode: Text.Wrap
-        horizontalAlignment: Text.AlignHCenter
+
+        elide: Text.ElideRight
+        wrapMode: Text.WordWrap
     }
 }

=== modified file 'src/app/qml/documentPage/DocumentEmptyState.qml'
--- src/app/qml/documentPage/DocumentEmptyState.qml	2015-12-10 16:53:39 +0000
+++ src/app/qml/documentPage/DocumentEmptyState.qml	2016-02-02 11:34:49 +0000
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2015 Stefano Verzegnassi
+  Copyright (C) 2015, 2016 Stefano Verzegnassi
 
     This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License 3 as published by
@@ -17,73 +17,52 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 
+import "../common"
+
 Item {
     anchors.fill: parent
 
-    Column {
+    EmptyState {
         anchors.centerIn: parent
-        spacing: units.gu(4)
-        width: units.gu(36)
-
-        Row {
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            Item {
-                height: parent.height
-                width: imageEmptyDownload.width + units.gu(2)
-
-                Image {
-                    id: imageEmptyDownload
-                    anchors.centerIn: parent
-                    antialiasing: true
-                    fillMode: Image.PreserveAspectFit
-                    height: units.gu(10)
-                    smooth: true
-                    source: Qt.resolvedUrl("graphics/document_download_icon.png")
-                }
-            }
-
-            Item {
-                height: parent.height
-                width: units.gu(7)
-
-                Image {
-                    anchors.centerIn: parent
-                    antialiasing: true
-                    fillMode: Image.PreserveAspectFit
-                    height: units.gu(6)
-                    smooth: true
-                    source: Qt.resolvedUrl("graphics/div.png")
-                }
-            }
-
-            Image {
-                anchors.verticalCenter: parent.verticalCenter
-                antialiasing: true
-                fillMode: Image.PreserveAspectFit
-                height: units.gu(7)
-                smooth: true
-                source: Qt.resolvedUrl("graphics/sd_phone_icon.png")
-            }
-        }
-
-        Label {
-            elide: Text.ElideRight
-            fontSize: "x-large"
-            horizontalAlignment: Text.AlignLeft
-            maximumLineCount: 2
-            text: i18n.tr("No document found")
-            width: parent.width
-            wrapMode: Text.WordWrap
-        }
-
-        Label {
-            elide: Text.ElideRight
-            fontSize: "large"
-            horizontalAlignment: Text.AlignLeft
-            text: i18n.tr("Connect your device to any computer and simply drag files to the Documents folder or insert removable media with documents.")
-            width: parent.width
-            wrapMode: Text.WordWrap
+        title: i18n.tr("No documents found")
+        subTitle: i18n.tr("Connect your device to any computer and simply drag files to the Documents folder or insert removable media containing documents.")
+
+        Item {
+            height: parent.height
+            width: imageEmptyDownload.width + units.gu(2)
+
+            Image {
+                id: imageEmptyDownload
+                anchors.centerIn: parent
+                antialiasing: true
+                fillMode: Image.PreserveAspectFit
+                height: units.gu(10)
+                smooth: true
+                source: Qt.resolvedUrl("graphics/document_download_icon.png")
+            }
+        }
+
+        Item {
+            height: parent.height
+            width: units.gu(7)
+
+            Image {
+                anchors.centerIn: parent
+                antialiasing: true
+                fillMode: Image.PreserveAspectFit
+                height: units.gu(6)
+                smooth: true
+                source: Qt.resolvedUrl("graphics/div.png")
+            }
+        }
+
+        Image {
+            anchors.verticalCenter: parent.verticalCenter
+            antialiasing: true
+            fillMode: Image.PreserveAspectFit
+            height: units.gu(7)
+            smooth: true
+            source: Qt.resolvedUrl("graphics/sd_phone_icon.png")
         }
     }
 }

=== modified file 'src/app/qml/documentPage/SearchEmptyState.qml'
--- src/app/qml/documentPage/SearchEmptyState.qml	2015-11-01 16:50:23 +0000
+++ src/app/qml/documentPage/SearchEmptyState.qml	2016-02-02 11:34:49 +0000
@@ -27,6 +27,5 @@
         iconName: "search"
 
         anchors.centerIn: parent
-        width: parent.width
     }
 }