Merge lp:~ajalkane/ubuntu-filemanager-app/rename-textfield-focus into lp:ubuntu-filemanager-app

[Arto Jalkanen]

Fixed focus issue with rename dialog (or any other dialog using ConfirmDialogWithInput.qml)

Fixed focus issue with rename dialog (or any other dialog using ConfirmDialogWithInput.qml)

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

PASSED: Continuous integration, rev:264
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/313/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1725
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1725/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/111

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

review: Approve (continuous-integration)

[Carlos Jose Mazieri (carlos-mazieri)]

It looks OK to me.

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-autolanding/117/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1758/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1758/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-autolanding/47

review: Needs Fixing (continuous-integration)

[Arto Jalkanen (ajalkane)]

Okay, Jenkins suddenly fails. Just before Carlos' comment it succeeded. Can someone re-run the job, perhaps something in the testing environment?

[Alan Pope 🍺🐧🐱 🦄 (popey)]

The CI worked but autolanding didn't. We had a problem with jenkins between Friday and Wednesday so we're re-triggering on everything. Other merges will be affected too.

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

review: Approve (continuous-integration)

=== modified file 'src/app/qml/ui/ConfirmDialogWithInput.qml'
--- src/app/qml/ui/ConfirmDialogWithInput.qml	2014-02-19 00:00:15 +0000
+++ src/app/qml/ui/ConfirmDialogWithInput.qml	2014-08-28 20:06:47 +0000
@@ -27,6 +27,12 @@
     signal accepted
     signal rejected
 
+    Component.onCompleted: {
+        // Need to force active focus to input, otherwise the parent object that created this
+        // dialog will continue to have active focus.
+        input.forceActiveFocus()
+    }
+
     TextField {
         id: input
         objectName: "inputField"
 
=== modified file 'src/app/qml/ui/FolderListPage.qml'
--- src/app/qml/ui/FolderListPage.qml	2014-08-06 20:22:29 +0000
+++ src/app/qml/ui/FolderListPage.qml	2014-08-28 20:06:47 +0000
@@ -497,7 +497,7 @@
     Component {
         id: confirmRenameDialog
         ConfirmDialogWithInput {
-            // IMPROVE: this does not seem good: the backend excepts row and new name.
+            // IMPROVE: this does not seem good: the backend expects row and new name.
             // But what if new files are added/deleted in the background while user is
             // entering the new name? The indices change and wrong file is renamed.
             // Perhaps the backend should take as parameters the "old name" and "new name"?
@@ -517,7 +517,7 @@
                                         {
                                             title: i18n.tr("Could not rename"),
                                             text: i18n.tr("Insufficient permissions or name already exists?")
-                                         })
+                                        })
 
                     }
                 } else {