ubuntu-touch-coreapps-reviewers team mailing list archive

[Stefano Verzegnassi <stefano92.100@xxxxxxxxx>]

Stefano Verzegnassi has proposed merging lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1428248 into lp:ubuntu-docviewer-app.

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

Requested reviews:
  Ubuntu Document Viewer Developers (ubuntu-docviewer-dev)
Related bugs:
  Bug #1428248 in Ubuntu Document Viewer App: "Grid view date/size overflow"
  https://bugs.launchpad.net/ubuntu-docviewer-app/+bug/1428248

For more details, see:
https://code.launchpad.net/~verzegnassi-stefano/ubuntu-docviewer-app/fix-1428248/+merge/251811

[DocumentGridDelegate] Moved file size label on a 3rd line.
-- 
Your team Ubuntu Document Viewer Developers is requested to review the proposed merge of lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1428248 into lp:ubuntu-docviewer-app.

=== 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:16:07 +0000
@@ -8,7 +8,11 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< TREE
 "POT-Creation-Date: 2015-03-04 18:46+0100\n"
+=======
+"POT-Creation-Date: 2015-03-04 20:10+0100\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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:16:07 +0000
@@ -77,7 +77,7 @@
         // Document mimetype icon
         Icon {
             anchors.centerIn: parent
-            anchors.verticalCenterOffset: - units.gu(2)
+            anchors.verticalCenterOffset: - units.gu(3)
 
             width: units.gu(8); height: width
 
@@ -127,7 +127,7 @@
                 bottom: parent.bottom
             }
 
-            height: units.gu(6)
+            height: units.gu(8)
 
             color: UbuntuColors.darkGrey
             opacity: 0.75
@@ -148,6 +148,7 @@
                 anchors { left: parent.left; right: parent.right }
             }
 
+<<<<<<< TREE
             RowLayout {
                 anchors { left: parent.left; right: parent.right }
 
@@ -164,6 +165,22 @@
                     color: "white"
                     fontSize: "small"
                 }
+=======
+            Label {
+                text: formattedDateTime()
+                color: "white"
+                fontSize: "small"
+
+                anchors { left: parent.left; right: parent.right }
+            }
+
+            Label {
+                text: Utils.printSize(model.size)
+                color: "white"
+                fontSize: "small"
+
+                anchors { left: parent.left; right: parent.right }
+>>>>>>> MERGE-SOURCE
             }
         }   // Document info end