Merge lp:~ajalkane/ubuntu-filemanager-app/filedetails into lp:ubuntu-filemanager-app

[Arto Jalkanen]

Initial file details popover

Initial file details popover

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

PASSED: Continuous integration, rev:12
http://91.189.93.125:8080/job/ubuntu-filemanager-app-ci/3/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-filemanager-app-quantal-amd64-ci/3/console
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-filemanager-app-raring-amd64-ci/3/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-filemanager-app-ci/3/rebuild

review: Approve (continuous-integration)

[Arto Jalkanen (ajalkane)]

It's raw, but better to get in than be left out.

review: Approve

=== modified file 'FileDetailsPopover.qml'
--- FileDetailsPopover.qml	2013-03-05 20:48:28 +0000
+++ FileDetailsPopover.qml	2013-03-13 21:23:19 +0000
@@ -4,11 +4,81 @@
 
 Popover {
     id: root
-    property string filePath
+    property var model
+
+    function dateTimeFormat(dateTime) {
+        return Qt.formatDateTime(dateTime, Qt.DefaultLocaleShortDate)
+    }
+
+    function permissionsToString(model) {
+        var permissions = []
+        if (model.isReadable) {
+            permissions.push(i18n.tr("Readable"))
+        }
+        if (model.isWritable) {
+            permissions.push(i18n.tr("Writable"))
+        }
+        if (model.isExecutable) {
+            permissions.push(i18n.tr("Executable"))
+        }
+
+        // Now why does this not work?
+        // return permissions.join(", ")
+        var permStr = ""
+        for (var i = 0; i < permissions.length; ++i) {
+            if (permStr.length > 0) {
+                permStr += ", "
+            }
+            permStr += permissions[i]
+        }
+        return permStr
+    }
 
     Column {
-        Label {
-            text: "\n\nTODO file details for " + filePath + "\n\n"
+        anchors.margins: units.gu(2)
+        Row {
+            Image {
+                // TODO: how to get proper icon?
+                source: model.isDir
+                        ? "/usr/share/icons/gnome/48x48/apps/file-manager.png"
+                        : "/usr/share/icons/gnome/48x48/mimetypes/text-x-preview.png"
+            }
+            Label {
+                text: model.fileName
+                anchors.verticalCenter: parent.verticalCenter
+            }
+        }
+        Grid {
+            columns: 2
+            spacing: units.gu(1)
+            Label {
+                text: i18n.tr("Size:")
+            }
+            Label {
+                text: model.fileSize
+            }
+
+            Label {
+                text: i18n.tr("Created:")
+            }
+            Label {
+                text: dateTimeFormat(model.creationDate)
+            }
+
+            Label {
+                text: i18n.tr("Modified:")
+            }
+            Label {
+                text: dateTimeFormat(model.modifiedDate)
+            }
+
+            Label {
+                text: i18n.tr("Permissions:")
+            }
+            Label {
+                text: permissionsToString(model)
+            }
+
         }
     }
 }
 
=== modified file 'FolderListView.qml'
--- FolderListView.qml	2013-03-12 20:10:44 +0000
+++ FolderListView.qml	2013-03-13 21:23:19 +0000
@@ -12,8 +12,7 @@
 
     ActionSelectionPopover {
         id: actionSelectionPopover
-        property string filePath
-
+        property var model
         actions: ActionList {
             Action {
                 text: i18n.tr("Add as bookmark")
@@ -26,7 +25,9 @@
                     print(text)
                     PopupUtils.open(Qt.resolvedUrl("FileDetailsPopover.qml"),
                                     actionSelectionPopover.caller,
-                                    { "filePath": actionSelectionPopover.filePath } )
+                                        { "model": actionSelectionPopover.model
+                                        }
+                                    )
                 }
             }
         }
@@ -79,7 +80,7 @@
         onPressAndHold: {
             console.log("FolderListDelegate onPressAndHold")
             actionSelectionPopover.caller = delegate
-            actionSelectionPopover.filePath = filePath
+            actionSelectionPopover.model = model
             actionSelectionPopover.show();
         }
     }