Merge lp:~mikemc/ubuntuone-credentials/fix-tabloop into lp:ubuntuone-credentials

[Mike McCracken]

- Fix key focus handling.

- Fix key focus handling.

Fixes initial key focus on email text field
Fixes tab loop between text fields
Fixes focus switching when changing between login/register modes.

NOTE: this just always sets the focus to the first field below the switch when you change the switch.
that might be annoying if you haven't finished typing your email yet, but I think if you've hit the switch you're probably done with the email.
I'm open to dissenting opinions...

[Roberto Alsina (ralsina)]

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'online-accounts-provider/LoginForm.qml'
--- online-accounts-provider/LoginForm.qml	2013-09-06 16:55:47 +0000
+++ online-accounts-provider/LoginForm.qml	2013-09-13 18:34:16 +0000
@@ -5,6 +5,10 @@
     id: loginFormColumn
     spacing: units.gu(2)
 
+    /* export two aliases for KeyNavigation access*/
+    property alias passwordTextField: passwordTextField  
+    property alias twoFactorTextField: twoFactorTextField
+
     property alias password: passwordTextField.text
     property alias twoFactorVisible: twoFactorUI.visible
     property alias twoFactorCode: twoFactorTextField.text
@@ -21,6 +25,8 @@
         width: main.width - (2 * main.anchors.margins)
 
         Keys.onReturnPressed: main.processForm();
+        KeyNavigation.tab: twoFactorUI.visible ? twoFactorTextField : emailTextField /* from main */
+        KeyNavigation.backtab: emailTextField /* from main */
     }
 
     Label {
@@ -50,11 +56,12 @@
             id: twoFactorTextField
             placeholderText: "2-factor device code"
             echoMode: TextInput.Password
-            focus: true
             width: main.width - (2 * main.anchors.margins)
             Keys.onReturnPressed: {
                 main.processForm();
             }
+            KeyNavigation.tab: emailTextField
+            KeyNavigation.backtab: passwordTextField
         }
 
         Label {

=== modified file 'online-accounts-provider/Main.qml'
--- online-accounts-provider/Main.qml	2013-09-12 14:59:06 +0000
+++ online-accounts-provider/Main.qml	2013-09-13 18:34:16 +0000
@@ -50,13 +50,12 @@
                This will not be necessary once Bug #1221845 is fixed.
              */
             rootFlickable.parent.parent.flickable = rootFlickable;
-
         }
 
         Connections {
             target: account
             onSynced: {
-                console.debug("Account id " + account.accountId + "synced. account.displayName: " + account.displayName)
+                console.debug("Account id " + account.accountId + " synced. account.displayName: " + account.displayName)
             }
         }
         

=== modified file 'online-accounts-provider/NewAccount.qml'
--- online-accounts-provider/NewAccount.qml	2013-09-12 14:59:06 +0000
+++ online-accounts-provider/NewAccount.qml	2013-09-13 18:34:16 +0000
@@ -76,12 +76,13 @@
     TextField {
         id: emailTextField
         placeholderText: "Your email"
-        focus: true;
-
         width: main.width - (2 * main.anchors.margins)
         anchors.left: parent.left
         anchors.margins: parent.anchors.margins
         validator: RegExpValidator { regExp: /.+@.+/ }
+        focus: true
+        KeyNavigation.tab: loginForm.visible ? loginForm.passwordTextField : registerForm.nameTextField
+        KeyNavigation.backtab: loginForm.visible ? ( loginForm.twoFactorVisible ? loginForm.twoFactorTextField : loginForm.passwordTextField) : registerForm.confirmPasswordTextField
     }
 
     Row {
@@ -154,6 +155,7 @@
         state = "login";
         switchTo(loginForm);
         formValid = false;
+        emailTextField.forceActiveFocus();
     }
 
     function showError(message) {
@@ -172,9 +174,11 @@
         if(state == "login") {
             switchTo(registerForm)
             state = "register";
+            registerForm.nameTextField.focus = true;
         } else if(state == "register") {
             switchTo(loginForm)
             state = "login";
+            loginForm.passwordTextField.focus = true;
         } else {
             console.debug("unexpected state" + state + "in toggleNewUser");
         }

=== modified file 'online-accounts-provider/RegisterForm.qml'
--- online-accounts-provider/RegisterForm.qml	2013-09-06 16:55:47 +0000
+++ online-accounts-provider/RegisterForm.qml	2013-09-13 18:34:16 +0000
@@ -5,6 +5,10 @@
     id: registerFormColumn
     spacing: units.gu(2)
 
+    /* export two aliases for KeyNavigation access*/
+    property alias nameTextField: nameTextField
+    property alias confirmPasswordTextField: confirmPasswordTextField
+
     property alias password: passwordTextField.text
     property alias display_name: nameTextField.text
 
@@ -17,6 +21,8 @@
         id: nameTextField
         placeholderText: "Your name"
         width: main.width - (2 * main.anchors.margins)
+        KeyNavigation.tab: passwordTextField
+        KeyNavigation.backtab: emailTextField /* from main */
     }
 
     TextField {
@@ -24,6 +30,8 @@
         placeholderText: "Password with at least 8 characters"
         echoMode: TextInput.Password
         width: main.width - (2 * main.anchors.margins)
+        KeyNavigation.tab: confirmPasswordTextField
+        KeyNavigation.backtab: nameTextField
     }
 
     TextField {
@@ -31,6 +39,8 @@
         placeholderText: "Re-type password"
         echoMode: TextInput.Password
         width: main.width - (2 * main.anchors.margins)
+        KeyNavigation.tab: emailTextField /* from main */
+        KeyNavigation.backtab: passwordTextField
     }
 
     Row {