Fix default button behavior in CoreConnectDlg.

diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp
index b9f498a..5d71aad 100644 (file)
--- a/src/qtui/coreconnectdlg.cpp
+++ b/src/qtui/coreconnectdlg.cpp
@@ -55,9 +55,8 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect) : QDialog(pare
   else ui.accountList->setCurrentRow(0);
 
   setAccountWidgetStates();
   else ui.accountList->setCurrentRow(0);
 
   setAccountWidgetStates();

-  //ui.accountButtonBox->setFocus();
-  ui.accountButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
-  //ui.accountButtonBox->button(QDialogButtonBox::Ok)->setAutoDefault(true);
+
+  ui.accountButtonBox->button(QDialogButtonBox::Ok)->setFocus();

 
   connect(clientSyncer, SIGNAL(socketStateChanged(QAbstractSocket::SocketState)),this, SLOT(initPhaseSocketState(QAbstractSocket::SocketState)));
   connect(clientSyncer, SIGNAL(connectionError(const QString &)), this, SLOT(initPhaseError(const QString &)));
 
   connect(clientSyncer, SIGNAL(socketStateChanged(QAbstractSocket::SocketState)),this, SLOT(initPhaseSocketState(QAbstractSocket::SocketState)));
   connect(clientSyncer, SIGNAL(connectionError(const QString &)), this, SLOT(initPhaseError(const QString &)));


@@ -110,7 +109,8 @@ void CoreConnectDlg::setAccountWidgetStates() {
     ui.autoConnect->setChecked(selectedItems[0]->data(Qt::UserRole).value<AccountId>() == autoConnectAccount);
   }
   ui.accountButtonBox->button(QDialogButtonBox::Ok)->setEnabled(ui.accountList->count());
     ui.autoConnect->setChecked(selectedItems[0]->data(Qt::UserRole).value<AccountId>() == autoConnectAccount);
   }
   ui.accountButtonBox->button(QDialogButtonBox::Ok)->setEnabled(ui.accountList->count());

-  ui.accountButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
+  //ui.accountButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
+  //ui.accountButtonBox->button(QDialogButtonBox::Ok)->setFocus();

 }
 
 void CoreConnectDlg::on_autoConnect_clicked(bool state) {
 }
 
 void CoreConnectDlg::on_autoConnect_clicked(bool state) {


@@ -229,7 +229,8 @@ void CoreConnectDlg::initPhaseError(const QString &error) {
   ui.connectLabel->setText(tr("<div style=color:red;>Connection to %1 failed!</div>").arg(accountData["Host"].toString()));
   ui.coreInfoLabel->setText(error);
   ui.loginButtonBox->setStandardButtons(QDialogButtonBox::Retry|QDialogButtonBox::Cancel);
   ui.connectLabel->setText(tr("<div style=color:red;>Connection to %1 failed!</div>").arg(accountData["Host"].toString()));
   ui.coreInfoLabel->setText(error);
   ui.loginButtonBox->setStandardButtons(QDialogButtonBox::Retry|QDialogButtonBox::Cancel);

-  ui.loginButtonBox->button(QDialogButtonBox::Retry)->setDefault(true);
+  //ui.loginButtonBox->button(QDialogButtonBox::Retry)->setDefault(true);
+  ui.loginButtonBox->button(QDialogButtonBox::Retry)->setFocus();

   disconnect(ui.loginButtonBox, 0, this, 0);
   connect(ui.loginButtonBox, SIGNAL(accepted()), this, SLOT(restartPhaseNull()));
   connect(ui.loginButtonBox, SIGNAL(rejected()), this, SLOT(reject()));
   disconnect(ui.loginButtonBox, 0, this, 0);
   connect(ui.loginButtonBox, SIGNAL(accepted()), this, SLOT(restartPhaseNull()));
   connect(ui.loginButtonBox, SIGNAL(rejected()), this, SLOT(reject()));


@@ -268,12 +269,13 @@ void CoreConnectDlg::startLogin() {
   //ui.loginStack->setMinimumSize(ui.loginStack->sizeHint()); ui.loginStack->updateGeometry();
   ui.loginButtonBox->setStandardButtons(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
   ui.loginButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
   //ui.loginStack->setMinimumSize(ui.loginStack->sizeHint()); ui.loginStack->updateGeometry();
   ui.loginButtonBox->setStandardButtons(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
   ui.loginButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);

+  ui.loginButtonBox->button(QDialogButtonBox::Ok)->setFocus();

   if(!accountData["User"].toString().isEmpty()) {
     ui.user->setText(accountData["User"].toString());
     if(accountData["RememberPasswd"].toBool()) {
       ui.password->setText(accountData["Password"].toString());
       ui.rememberPasswd->setChecked(true);
   if(!accountData["User"].toString().isEmpty()) {
     ui.user->setText(accountData["User"].toString());
     if(accountData["RememberPasswd"].toBool()) {
       ui.password->setText(accountData["Password"].toString());
       ui.rememberPasswd->setChecked(true);

-      ui.loginButtonBox->setFocus();
+      ui.loginButtonBox->button(QDialogButtonBox::Ok)->setFocus();

     } else {
       ui.rememberPasswd->setChecked(false);
       ui.password->setFocus();
     } else {
       ui.rememberPasswd->setChecked(false);
       ui.password->setFocus();

diff --git a/src/qtui/ui/coreconnectdlg.ui b/src/qtui/ui/coreconnectdlg.ui
index 14196d8..23ec4b6 100644 (file)
--- a/src/qtui/ui/coreconnectdlg.ui
+++ b/src/qtui/ui/coreconnectdlg.ui
@@ -28,7 +28,7 @@
       </sizepolicy>
      </property>
      <property name="currentIndex" >
       </sizepolicy>
      </property>
      <property name="currentIndex" >

-      <number>1</number>
+      <number>0</number>

      </property>
      <widget class="QWidget" name="accountPage" >
       <layout class="QVBoxLayout" >
      </property>
      <widget class="QWidget" name="accountPage" >
       <layout class="QVBoxLayout" >


@@ -218,7 +218,7 @@ space</string>
              </sizepolicy>
             </property>
             <property name="currentIndex" >
              </sizepolicy>
             </property>
             <property name="currentIndex" >

-             <number>0</number>
+             <number>1</number>

             </property>
             <widget class="QWidget" name="loginCredentialsPage" >
              <layout class="QVBoxLayout" >
             </property>
             <widget class="QWidget" name="loginCredentialsPage" >
              <layout class="QVBoxLayout" >


@@ -555,16 +555,18 @@ space</string>
   </layout>
  </widget>
  <tabstops>
   </layout>
  </widget>
  <tabstops>

-  <tabstop>accountButtonBox</tabstop>

   <tabstop>accountList</tabstop>
   <tabstop>editAccount</tabstop>
   <tabstop>addAccount</tabstop>
   <tabstop>deleteAccount</tabstop>
   <tabstop>autoConnect</tabstop>
   <tabstop>accountList</tabstop>
   <tabstop>editAccount</tabstop>
   <tabstop>addAccount</tabstop>
   <tabstop>deleteAccount</tabstop>
   <tabstop>autoConnect</tabstop>

-  <tabstop>user</tabstop>
+  <tabstop>accountButtonBox</tabstop>

   <tabstop>password</tabstop>
   <tabstop>password</tabstop>

+  <tabstop>user</tabstop>

   <tabstop>rememberPasswd</tabstop>
   <tabstop>rememberPasswd</tabstop>

+  <tabstop>loginButtonBox</tabstop>

   <tabstop>syncButtonBox</tabstop>
   <tabstop>syncButtonBox</tabstop>

+  <tabstop>launchCoreConfigWizard</tabstop>

  </tabstops>
  <resources>
   <include location="../../icons/icons.qrc" />
  </tabstops>
  <resources>
   <include location="../../icons/icons.qrc" />