← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~mcintire-evan/ubuntu-terminal-app/auto-focus-auth into lp:ubuntu-terminal-app

 

Evan McIntire has proposed merging lp:~mcintire-evan/ubuntu-terminal-app/auto-focus-auth into lp:ubuntu-terminal-app.

Commit message:
Autofocus the authentication popup at app launch

Requested reviews:
  Ubuntu Terminal Developers (ubuntu-terminal-dev)
Related bugs:
  Bug #1488481 in Ubuntu Terminal App: "BQ (r24): terminal-app shows terminal data when asking for password"
  https://bugs.launchpad.net/ubuntu-terminal-app/+bug/1488481
  Bug #1499994 in Ubuntu Terminal App: "When prompting for password, focus is not set to password entry box"
  https://bugs.launchpad.net/ubuntu-terminal-app/+bug/1499994

For more details, see:
https://code.launchpad.net/~mcintire-evan/ubuntu-terminal-app/auto-focus-auth/+merge/284502

Autofocus the authentication popup at app launch
-- 
Your team Ubuntu Terminal Developers is requested to review the proposed merge of lp:~mcintire-evan/ubuntu-terminal-app/auto-focus-auth into lp:ubuntu-terminal-app.
=== modified file 'po/com.ubuntu.terminal.pot'
--- po/com.ubuntu.terminal.pot	2016-01-20 01:24:35 +0000
+++ po/com.ubuntu.terminal.pot	2016-02-02 21:34:13 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-19 20:23-0500\n"
+"POT-Creation-Date: 2016-02-02 16:26-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -49,10 +49,14 @@
 msgid "Cancel"
 msgstr ""
 
-#: ../src/app/qml/AuthenticationService.qml:55
+#: ../src/app/qml/AuthenticationService.qml:58
 msgid "Authentication failed"
 msgstr ""
 
+#: ../src/app/qml/ColorSchemePage.qml:26 ../src/app/qml/SettingsPage.qml:124
+msgid "Color Scheme"
+msgstr ""
+
 #: ../src/app/qml/KeyboardBar.qml:174
 msgid "Change Keyboard"
 msgstr ""
@@ -149,39 +153,35 @@
 msgid "ENTER"
 msgstr ""
 
-#: ../src/app/qml/LayoutsPage.qml:27 ../src/app/qml/SettingsPage.qml:36
+#: ../src/app/qml/LayoutsPage.qml:26 ../src/app/qml/SettingsPage.qml:42
 msgid "Layouts"
 msgstr ""
 
-#: ../src/app/qml/SettingsPage.qml:27
+#: ../src/app/qml/SettingsPage.qml:26
 msgid "Settings"
 msgstr ""
 
-#: ../src/app/qml/SettingsPage.qml:42
+#: ../src/app/qml/SettingsPage.qml:57
 msgid "Show Keyboard Bar"
 msgstr ""
 
-#: ../src/app/qml/SettingsPage.qml:50
+#: ../src/app/qml/SettingsPage.qml:73
 msgid "Show Keyboard Button"
 msgstr ""
 
-#: ../src/app/qml/SettingsPage.qml:60
+#: ../src/app/qml/SettingsPage.qml:91
 msgid "Font Size:"
 msgstr ""
 
-#: ../src/app/qml/SettingsPage.qml:93
-msgid "Color Scheme"
-msgstr ""
-
-#: ../src/app/qml/TabsPage.qml:8
+#: ../src/app/qml/TabsPage.qml:7
 msgid "Tabs"
 msgstr ""
 
-#: ../src/app/qml/TabsPage.qml:14
+#: ../src/app/qml/TabsPage.qml:13
 msgid "New tab"
 msgstr ""
 
-#: ../src/app/qml/TerminalPage.qml:164
+#: ../src/app/qml/TerminalPage.qml:170
 msgid "Selection Mode"
 msgstr ""
 

=== modified file 'src/app/qml/AuthenticationService.qml'
--- src/app/qml/AuthenticationService.qml	2016-01-09 01:47:56 +0000
+++ src/app/qml/AuthenticationService.qml	2016-02-02 21:34:13 +0000
@@ -32,6 +32,8 @@
     Component.onCompleted: {
         if ( systemAuthentication.requireAuthentication() && !noAuthentication) {
             displayLoginDialog();
+        } else {
+            tabsModel.selectTab(0);
         }
     }
 
@@ -43,12 +45,13 @@
     function displayLoginDialog() {
         var authentication_dialog =
             PopupUtils.open( Qt.resolvedUrl( "AuthenticationDialog.qml" ),
-                             authenticationService );
+                            authenticationService );
 
         var verify_password = function( password ) {
             if ( systemAuthentication.validatePasswordToken( password ) ) {
                 granted();
                 PopupUtils.close( authentication_dialog );
+                tabsModel.selectTab(0);
             }
             else {
                 var dialog_options = {

=== modified file 'src/app/qml/ubuntu-terminal-app.qml'
--- src/app/qml/ubuntu-terminal-app.qml	2016-01-29 02:16:38 +0000
+++ src/app/qml/ubuntu-terminal-app.qml	2016-02-02 21:34:13 +0000
@@ -125,8 +125,4 @@
             model: ["GreenOnBlack","WhiteOnBlack","BlackOnWhite","BlackOnRandomLight","Linux","cool-retro-term","DarkPastels","BlackOnLightYellow", "Ubuntu"]
         }
     }
-
-    Component.onCompleted: {
-        tabsModel.selectTab(0);
-    }
 }


Follow ups