Merge lp:~carlos-mazieri/ubuntu-filemanager-app/app-bug-properties-Unknown into lp:ubuntu-filemanager-app

[Carlos Jose Mazieri]

fixes bug #1198858

It was a mistake to create the properties: pathAccessedDate, pathModifiedDate, pathCreatedDate and pathIsWritable.

They should have be created as Q_INVOKABLE functions, the bug https://bugs.launchpad.net/ubuntu-filemanager-app/+bug/1198858 happens due to those properties do not have signals to notify their changes.

This change fix the problem and allows to change the plugin keeping the file manager working.

A plugin change already done can be reached at https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/model-bug-properties-Unknown

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

PASSED: Continuous integration, rev:66
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/42/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/548
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-precise-amd64-ci/42
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-quantal-amd64-ci/42
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/42
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/42

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

review: Approve (continuous-integration)

[Michael Spencer (ibelieve)]

I haven't tested this, but it looks like it should work.

review: Approve

=== modified file 'FileDetailsPopover.qml'
--- FileDetailsPopover.qml	2013-08-06 17:40:06 +0000
+++ FileDetailsPopover.qml	2013-09-28 19:05:26 +0000
@@ -36,7 +36,7 @@
         if (model.isReadable) {
             permissions.push(i18n.tr("Readable"))
         }
-        if (model.isWritable) {
+        if (pathIsWritable()) {
             permissions.push(i18n.tr("Writable"))
         }
         if (model.isExecutable) {
@@ -113,7 +113,7 @@
                 color: Theme.palette.normal.overlayText
             }
             Label {
-                text: dateTimeFormat(model.accessedDate)
+                text: dateTimeFormat(pathAccessedDate())
                 color: Theme.palette.normal.overlayText
             }
 
@@ -122,7 +122,7 @@
                 color: Theme.palette.normal.overlayText
             }
             Label {
-                text: dateTimeFormat(model.modifiedDate)
+                text: dateTimeFormat(pathModifiedDate())
                 color: Theme.palette.normal.overlayText
             }
 

=== modified file 'FolderListPage.qml'
--- FolderListPage.qml	2013-09-17 16:47:57 +0000
+++ FolderListPage.qml	2013-09-28 19:05:26 +0000
@@ -88,6 +88,47 @@
         pageModel.refresh()
     }
 
+    // For these 3 functions: pathAccessedDate(), pathModifiedDate() and pathModifiedDate()
+    // we are using a temporary construction to ask if a such property exists in the model
+    //
+    // Right now all properties exist: "pathAccessedDate", "pathModifiedDate" and "pathIsWritable"
+    // but they will be removed and the corresponding READ functions: pathAccessedDate(),
+    // pathModifiedDate() and pathIsWritable() will become Q_INVOKABLE() replacing the prefix "path" for
+    // "curPath".
+    // This construction will allow the File Manager to keep working while we change the model
+    // after changing the model, this construction can be removed
+
+    function pathAccessedDate() {
+        if ("pathAccessedDate" in pageModel) {
+            console.log("using property pathAccessedDate")
+            return pageModel.pathAccessedDate
+        }
+        else {
+            console.log("calling method pageModel.curPathAccessedDate()")
+            return pageModel.curPathAccessedDate()
+        }
+    }
+    function pathModifiedDate() {
+        if ("pathModifiedDate" in pageModel) {
+            console.log("using property pathModifiedDate")
+            return pageModel.pathModifiedDate
+        }
+        else {
+            console.log("calling method pageModel.curPathModifiedDate()")
+            return pageModel.curPathModifiedDate()
+        }
+    }
+    function pathIsWritable() {
+        if ("pathIsWritable" in pageModel) {
+            console.log("using property pathIsWritable");
+            return pageModel.pathIsWritable
+        }
+        else {
+            console.log("calling method pageModel.curPathIsWritable()")
+            return pageModel.curPathIsWritable()
+        }
+    }
+
     // FIXME: hard coded path for icon, assumes Ubuntu desktop icon available.
     // Nemo mobile has icon provider. Have to figure out what's the proper way
     // to get "system wide" icons in Ubuntu Touch, or if we have to use
@@ -181,10 +222,7 @@
         property string fileName: pathName(pageModel.path)
         property string fileSize: (folderListView.count === 1
                                    ? i18n.tr("1 file")
-                                   : i18n.tr("%1 files").arg(folderListView.count))
-        property date accessedDate: pageModel.pathAccessedDate
-        property date modifiedDate: pageModel.pathModifiedDate
-        property bool isWritable: pageModel.pathIsWritable
+                                   : i18n.tr("%1 files").arg(folderListView.count))       
         property bool isReadable: true
         property bool isExecutable: true
     }