Fix initial widget focus in credential dialog

m-kuhn · m-kuhn · commit 73bf82f74f1f · 2016-07-11T15:18:31.000+02:00
diff --git a/src/gui/qgscredentialdialog.cpp b/src/gui/qgscredentialdialog.cpp
@@ -43,6 +43,7 @@ QgsCredentialDialog::QgsCredentialDialog( QWidget *parent, const Qt::WindowFlags
            Qt::BlockingQueuedConnection );
   mOkButton = buttonBox->button( QDialogButtonBox::Ok );
   leMasterPass->setPlaceholderText( tr( "Required" ) );
+  leUsername->setFocus();
 }
 
 QgsCredentialDialog::~QgsCredentialDialog()
@@ -119,6 +120,7 @@ void QgsCredentialDialog::requestCredentialsMasterPassword( QString * password,
 {
   QgsDebugMsg( "Entering." );
   stackedWidget->setCurrentIndex( 1 );
+  leMasterPass->setFocus();
 
   QString titletxt( stored ? tr( "Enter CURRENT master authentication password" ) : tr( "Set NEW master authentication password" ) );
   lblPasswordTitle->setText( titletxt );
diff --git a/src/ui/qgscredentialdialog.ui b/src/ui/qgscredentialdialog.ui
@@ -220,6 +220,14 @@ font-style: italic;
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>leUsername</tabstop>
+  <tabstop>lePassword</tabstop>
+  <tabstop>leMasterPass</tabstop>
+  <tabstop>leMasterPassVerify</tabstop>
+  <tabstop>chkMasterPassShow</tabstop>
+  <tabstop>chkbxEraseAuthDb</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ QgsCredentialDialog::QgsCredentialDialog( QWidget *parent, const Qt::WindowFlags`
`43`	`43`	`Qt::BlockingQueuedConnection );`
`44`	`44`	`mOkButton = buttonBox->button( QDialogButtonBox::Ok );`
`45`	`45`	`leMasterPass->setPlaceholderText( tr( "Required" ) );`
	`46`	`+ leUsername->setFocus();`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`QgsCredentialDialog::~QgsCredentialDialog()`
`@@ -119,6 +120,7 @@ void QgsCredentialDialog::requestCredentialsMasterPassword( QString * password,`
`119`	`120`	`{`
`120`	`121`	`QgsDebugMsg( "Entering." );`
`121`	`122`	`stackedWidget->setCurrentIndex( 1 );`
	`123`	`+ leMasterPass->setFocus();`
`122`	`124`
`123`	`125`	`QString titletxt( stored ? tr( "Enter CURRENT master authentication password" ) : tr( "Set NEW master authentication password" ) );`
`124`	`126`	`lblPasswordTitle->setText( titletxt );`