Merge lp:~ajalkane/ubuntu-filemanager-app/unlock-to-header into lp:ubuntu-filemanager-app

[Arto Jalkanen]

Bug 1386254: move unlock button to header action. Added short explanation
to unlock dialog.

Bug 1386254: move unlock button to header action. Added short explanation
to unlock dialog.

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

PASSED: Continuous integration, rev:316
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/372/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1359
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1359/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/170

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

review: Approve (continuous-integration)

[David Planella (dpm)]

LGTM, passes tests, tested it to work with the emulator.

review: Approve

=== modified file 'src/app/qml/ui/AuthenticationDialog.qml'
--- src/app/qml/ui/AuthenticationDialog.qml	2014-09-20 10:49:51 +0000
+++ src/app/qml/ui/AuthenticationDialog.qml	2014-10-28 22:30:13 +0000
@@ -24,7 +24,7 @@
 
     title: i18n.tr("Authentication required")
 
-    text: i18n.tr("Enter password:")
+    text: i18n.tr("Password is required to access all files")
 
     signal passwordEntered(string password)
 
 
=== modified file 'src/app/qml/ui/FolderListPage.qml'
--- src/app/qml/ui/FolderListPage.qml	2014-10-24 23:41:57 +0000
+++ src/app/qml/ui/FolderListPage.qml	2014-10-28 22:30:13 +0000
@@ -108,6 +108,31 @@
             iconName: "find"
             text: i18n.tr("Go To")
             onTriggered: PopupUtils.open(Qt.resolvedUrl("GoToDialog.qml"), parent)
+        },
+        Action {
+            id: unlockButton
+            iconName: "lock"
+            text: i18n.tr("Unlock full access")
+            visible: pageModel.onlyMTPPaths
+            onTriggered: {
+                console.log("Full access clicked")
+                var authDialog = PopupUtils.open(Qt.resolvedUrl("AuthenticationDialog.qml"),
+                                                 folderListPage)
+
+                authDialog.passwordEntered.connect(function(password) {
+                    if (pamAuthentication.validatePasswordToken(password)) {
+                        console.log("Authenticated for full access")
+                        pageModel.onlyMTPPaths = false
+                    } else {
+                        PopupUtils.open(Qt.resolvedUrl("NotifyDialog.qml"), folderListPage,
+                                        {
+                                            title: i18n.tr("Authentication failed")
+                                        })
+
+                        console.log("Could not authenticate")
+                    }
+                })
+            }
         }
     ]
     flickable: !sidebar.expanded ?
@@ -308,29 +333,6 @@
                 cancelFileSelector()
             }
         }
-        Button {
-            text: i18n.tr("Unlock full access")
-            visible: pageModel.onlyMTPPaths
-            onClicked: {
-                console.log("Full access clicked")
-                var authDialog = PopupUtils.open(Qt.resolvedUrl("AuthenticationDialog.qml"),
-                                                 folderListPage)
-
-                authDialog.passwordEntered.connect(function(password) {
-                    if (pamAuthentication.validatePasswordToken(password)) {
-                        console.log("Authenticated for full access")
-                        pageModel.onlyMTPPaths = false
-                    } else {
-                        PopupUtils.open(Qt.resolvedUrl("NotifyDialog.qml"), folderListPage,
-                                        {
-                                            title: i18n.tr("Authentication failed")
-                                        })
-
-                        console.log("Could not authenticate")
-                    }
-                })
-            }
-        }
     }
 
     FolderIconView {