Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1428248 into lp:ubuntu-docviewer-app/trunk

[Stefano Verzegnassi]

[DocumentGridDelegate] Moved file size label on a 3rd line.

[DocumentGridDelegate] Moved file size label on a 3rd line.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:91
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/180/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2228/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/77/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-vivid-amd64-ci/83/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/180/rebuild

review: Needs Fixing (continuous-integration)

[lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1428248]

92. By Stefano Verzegnassi on 2015-03-04

[DocumentGridDelegate] Fixed alignment of text

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:92
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/181/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2229/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/78/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-vivid-amd64-ci/84/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/181/rebuild

review: Needs Fixing (continuous-integration)

[lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1428248]

93. By Stefano Verzegnassi on 2015-03-04

Merge with trunk

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:93
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/182/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2231
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2231/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/79
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-vivid-amd64-ci/85

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/182/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

LGTM

review: Approve

=== modified file 'po/com.ubuntu.docviewer.pot'
--- po/com.ubuntu.docviewer.pot	2015-03-04 17:48:47 +0000
+++ po/com.ubuntu.docviewer.pot	2015-03-04 19:38:59 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-04 18:46+0100\n"
+"POT-Creation-Date: 2015-03-04 20:36+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"

=== modified file 'src/app/qml/documentPage/DocumentGridDelegate.qml'
--- src/app/qml/documentPage/DocumentGridDelegate.qml	2015-03-04 17:44:36 +0000
+++ src/app/qml/documentPage/DocumentGridDelegate.qml	2015-03-04 19:38:59 +0000
@@ -77,7 +77,7 @@
         // Document mimetype icon
         Icon {
             anchors.centerIn: parent
-            anchors.verticalCenterOffset: - units.gu(2)
+            anchors.verticalCenterOffset: - infoColumn.height * 0.3
 
             width: units.gu(8); height: width
 
@@ -127,45 +127,50 @@
                 bottom: parent.bottom
             }
 
-            height: units.gu(6)
+            height: infoColumn.height + units.gu(1)
 
             color: UbuntuColors.darkGrey
             opacity: 0.75
-        }
-
-        // Document info
-        Column {
-            anchors { fill: overlay; margins: units.gu(0.5) }
-
-            Label {
-                text: model.name
-                color: "white"
-
-                elide: Text.ElideRight
-                font.weight: Font.DemiBold
-                fontSize: "small"
-
-                anchors { left: parent.left; right: parent.right }
-            }
-
-            RowLayout {
-                anchors { left: parent.left; right: parent.right }
+            layer.enabled: true
+
+            // Document info
+            Column {
+                id: infoColumn
+                anchors {
+                    left: parent.left;
+                    right: parent.right
+                    verticalCenter: parent.verticalCenter
+                    margins: units.gu(0.5)
+                }
+
+                Label {
+                    text: model.name
+                    color: "white"
+
+                    elide: Text.ElideRight
+                    font.weight: Font.DemiBold
+                    fontSize: "small"
+
+                    anchors { left: parent.left; right: parent.right }
+                }
 
                 Label {
                     text: formattedDateTime()
-                    color: "white"                  
+                    color: "white"
                     fontSize: "small"
 
-                    Layout.fillWidth: true
+                    anchors { left: parent.left; right: parent.right }
                 }
 
                 Label {
                     text: Utils.printSize(i18n, model.size)
                     color: "white"
                     fontSize: "small"
+
+                    anchors { left: parent.left; right: parent.right }
                 }
-            }
-        }   // Document info end
+            }   // Document info end
+        }
 
         states: [
             State {