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

[Arto Jalkanen]

File operation progress dialog. Errors put into main text body as Ubuntu components seem not able to handle long texts in title.

File operation progress dialog. Errors put into main text body as Ubuntu components seem not able to handle long texts in title.

[Arto Jalkanen (ajalkane)]

It's good. I approve.

review: Approve

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

review: Approve (continuous-integration)

=== added file 'FileOperationProgressDialog.qml'
--- FileOperationProgressDialog.qml	1970-01-01 00:00:00 +0000
+++ FileOperationProgressDialog.qml	2013-04-16 17:00:36 +0000
@@ -0,0 +1,46 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+import org.nemomobile.folderlistmodel 1.0
+
+Dialog {
+    id: root
+    property FolderListModel folderListModel
+    property string descriptionPrepend: i18n.tr("Operation in progress")
+
+    title: "File operation"
+    text: descriptionPrepend
+
+    ProgressBar {
+        id: progress
+        minimumValue: 0.0
+        maximumValue: 100.0
+        value: 0.0
+    }
+
+    Button {
+        text: i18n.tr("Cancel")
+        onClicked: {
+            console.log("Cancelling file progress action")
+            folderListModel.cancelAction()
+            PopupUtils.close(root)
+        }
+    }
+
+    Connections {
+        target: folderListModel
+        onProgress: {
+            console.log("On progress ", curItem, totalItems, percent)
+            progress.value = percent
+            // TODO: is this a bug in backend? The first received signal is curItem=0, totalItems=0. Work around:
+            if (!(curItem == 0 && totalItems == 0)) {
+                if (curItem == totalItems) {
+                    console.log("All files processed, closing progress dialog")
+                    PopupUtils.close(root)
+                } else {
+                    root.text = descriptionPrepend + " " + curItem + "/" + totalItems
+                }
+            }
+        }
+    }
+}

=== modified file 'FolderListPage.qml'
--- FolderListPage.qml	2013-04-15 19:50:55 +0000
+++ FolderListPage.qml	2013-04-16 17:00:36 +0000
@@ -89,8 +89,10 @@
             console.log("FolderListModel Error Title/Description", errorTitle, errorMessage)
             PopupUtils.open(Qt.resolvedUrl("NotifyDialog.qml"), root,
                             {
-                                title: i18n.tr(errorTitle),
-                                text: i18n.tr(errorMessage)
+                                // Unfortunately title can not handle too long texts. TODO: bug report
+                                // title: i18n.tr(errorTitle),
+                                title: i18n.tr("File operation error"),
+                                text: errorTitle + ": " + errorMessage
                             })
         }
     }

=== modified file 'FolderListView.qml'
--- FolderListView.qml	2013-04-01 20:03:15 +0000
+++ FolderListView.qml	2013-04-16 17:00:36 +0000
@@ -21,6 +21,16 @@
             onAccepted: {
                 console.log("Delete accepted for filePath, fileName", filePath, fileName)
 
+                PopupUtils.open(Qt.resolvedUrl("FileOperationProgressDialog.qml"),
+                                root,
+                                {
+                                    title: i18n.tr("Deleting files"),
+                                    // descriptionPrepend: i18n.tr("Operation in progress"),
+                                    folderListModel: folderListModel
+                                 }
+                                )
+
+                console.log("Doing delete")
                 folderListModel.rm(filePath)
             }
         }