Make the style engine fix a little less obscure by copying the string explicitely...

[quassel.git] / src / qtui / coreconnectdlg.cpp

diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp
index 250c008..3510926 100644 (file)
--- a/src/qtui/coreconnectdlg.cpp
+++ b/src/qtui/coreconnectdlg.cpp
@@ -25,19 +25,19 @@
 
 #include "clientsettings.h"
 #include "clientsyncer.h"
+#include "coreconfigwizard.h"
 
 CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect) : QDialog(parent) {
   ui.setupUi(this);
 
   clientSyncer = new ClientSyncer(this);
+  wizard = 0;
 
   setAttribute(Qt::WA_DeleteOnClose);
 
   doingAutoConnect = false;
 
   ui.stackedWidget->setCurrentWidget(ui.accountPage);
-  ui.accountButtonBox->setFocus();
-  ui.accountButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
 
   CoreAccountSettings s;
   AccountId lastacc = s.lastAccount();
@@ -56,17 +56,21 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect) : QDialog(pare
 
   setAccountWidgetStates();
 
+  ui.accountButtonBox->button(QDialogButtonBox::Ok)->setFocus();
+  //ui.accountButtonBox->button(QDialogButtonBox::Ok)->setAutoDefault(true);
+
   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(connectionMsg(const QString &)), this, SLOT(initPhaseMsg(const QString &)));
   connect(clientSyncer, SIGNAL(startLogin()), this, SLOT(startLogin()));
   connect(clientSyncer, SIGNAL(loginFailed(const QString &)), this, SLOT(loginFailed(const QString &)));
   connect(clientSyncer, SIGNAL(loginSuccess()), this, SLOT(startSync()));
+  connect(clientSyncer, SIGNAL(startCoreSetup(const QVariantList &)), this, SLOT(startCoreConfig(const QVariantList &)));
   connect(clientSyncer, SIGNAL(sessionProgress(quint32, quint32)), this, SLOT(coreSessionProgress(quint32, quint32)));
   connect(clientSyncer, SIGNAL(networksProgress(quint32, quint32)), this, SLOT(coreNetworksProgress(quint32, quint32)));
   connect(clientSyncer, SIGNAL(channelsProgress(quint32, quint32)), this, SLOT(coreChannelsProgress(quint32, quint32)));
   connect(clientSyncer, SIGNAL(ircUsersProgress(quint32, quint32)), this, SLOT(coreIrcUsersProgress(quint32, quint32)));
-  connect(clientSyncer, SIGNAL(syncFinished()), this, SLOT(accept()));
+  connect(clientSyncer, SIGNAL(syncFinished()), this, SLOT(syncFinished()));
 
   connect(ui.user, SIGNAL(textChanged(const QString &)), this, SLOT(setLoginWidgetStates()));
   connect(ui.password, SIGNAL(textChanged(const QString &)), this, SLOT(setLoginWidgetStates()));
@@ -214,8 +218,6 @@ void CoreConnectDlg::connectToCore() {
   disconnect(ui.loginButtonBox, 0, this, 0);
   connect(ui.loginButtonBox, SIGNAL(rejected()), this, SLOT(restartPhaseNull()));
 
-
-  //connect(Client::instance(), SIGNAL(coreConnectionPhaseOne(const QVariantMap &)), this, SLOT(phaseOneFinished
   clientSyncer->connectToCore(accountData);
 }
 
@@ -226,7 +228,7 @@ 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.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()));
@@ -262,15 +264,16 @@ void CoreConnectDlg::restartPhaseNull() {
 void CoreConnectDlg::startLogin() {
   ui.connectIcon->setPixmap(QPixmap::fromImage(QImage(":/22x22/actions/network-connect")));
   ui.loginStack->setCurrentWidget(ui.loginCredentialsPage);
-  ui.loginStack->setMinimumSize(ui.loginStack->sizeHint()); ui.loginStack->updateGeometry();
+  //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);
-      ui.loginButtonBox->setFocus();
+      ui.loginButtonBox->button(QDialogButtonBox::Ok)->setFocus();
     } else {
       ui.rememberPasswd->setChecked(false);
       ui.password->setFocus();
@@ -283,18 +286,33 @@ void CoreConnectDlg::startLogin() {
 }
 
 void CoreConnectDlg::doLogin() {
+  QVariantMap loginData;
+  loginData["User"] = ui.user->text();
+  loginData["Password"] = ui.password->text();
+  loginData["RememberPasswd"] = ui.rememberPasswd->isChecked();
+  doLogin(loginData);
+}
+
+void CoreConnectDlg::doLogin(const QVariantMap &loginData) {
+  disconnect(ui.loginButtonBox, 0, this, 0);
+  connect(ui.loginButtonBox, SIGNAL(accepted()), this, SLOT(doLogin()));
+  connect(ui.loginButtonBox, SIGNAL(rejected()), this, SLOT(restartPhaseNull()));
+  ui.loginStack->setCurrentWidget(ui.loginCredentialsPage);
   ui.loginGroup->setTitle(tr("Logging in..."));
   ui.user->setDisabled(true);
   ui.password->setDisabled(true);
   ui.rememberPasswd->setDisabled(true);
   ui.loginButtonBox->button(QDialogButtonBox::Ok)->setDisabled(true);
-  accountData["User"] = ui.user->text();
-  accountData["RememberPasswd"] = ui.rememberPasswd->isChecked();
-  if(ui.rememberPasswd->isChecked()) accountData["Password"] = ui.password->text();
+  accountData["User"] = loginData["User"];
+  accountData["RememberPasswd"] = loginData["RememberPasswd"];
+  if(loginData["RememberPasswd"].toBool()) accountData["Password"] = loginData["Password"];
   else accountData.remove("Password");
+  ui.user->setText(loginData["User"].toString());
+  ui.password->setText(loginData["Password"].toString());
+  ui.rememberPasswd->setChecked(loginData["RememberPasswd"].toBool());
   CoreAccountSettings s;
   s.storeAccountData(account, accountData);
-  clientSyncer->loginToCore(ui.user->text(), ui.password->text());
+  clientSyncer->loginToCore(loginData["User"].toString(), loginData["Password"].toString());
 }
 
 void CoreConnectDlg::setLoginWidgetStates() {
@@ -302,6 +320,10 @@ void CoreConnectDlg::setLoginWidgetStates() {
 }
 
 void CoreConnectDlg::loginFailed(const QString &error) {
+  if(wizard) {
+    wizard->reject();
+  }
+  ui.loginStack->setCurrentWidget(ui.loginCredentialsPage);
   ui.loginGroup->setTitle(tr("Login"));
   ui.user->setEnabled(true);
   ui.password->setEnabled(true);
@@ -312,6 +334,42 @@ void CoreConnectDlg::loginFailed(const QString &error) {
   doingAutoConnect = false;
 }
 
+void CoreConnectDlg::startCoreConfig(const QVariantList &backends) {
+  storageBackends = backends;
+  ui.loginStack->setCurrentWidget(ui.coreConfigPage);
+
+  //on_launchCoreConfigWizard_clicked();
+
+}
+
+void CoreConnectDlg::on_launchCoreConfigWizard_clicked() {
+  Q_ASSERT(!wizard);
+  wizard = new CoreConfigWizard(storageBackends, this);
+  connect(wizard, SIGNAL(setupCore(const QVariant &)), clientSyncer, SLOT(doCoreSetup(const QVariant &)));
+  connect(wizard, SIGNAL(loginToCore(const QVariantMap &)), this, SLOT(doLogin(const QVariantMap &)));
+  connect(clientSyncer, SIGNAL(coreSetupSuccess()), wizard, SLOT(coreSetupSuccess()));
+  connect(clientSyncer, SIGNAL(coreSetupFailed(const QString &)), wizard, SLOT(coreSetupFailed(const QString &)));
+  connect(wizard, SIGNAL(accepted()), this, SLOT(configWizardAccepted()));
+  connect(wizard, SIGNAL(rejected()), this, SLOT(configWizardRejected()));
+  connect(clientSyncer, SIGNAL(loginSuccess()), wizard, SLOT(loginSuccess()));
+  connect(clientSyncer, SIGNAL(syncFinished()), wizard, SLOT(syncFinished()));
+  wizard->show();
+}
+
+void CoreConnectDlg::configWizardAccepted() {
+
+  wizard->deleteLater();
+  wizard = 0;
+}
+
+void CoreConnectDlg::configWizardRejected() {
+
+  wizard->deleteLater();
+  wizard = 0;
+  //exit(1); // FIXME
+}
+
+
 /************************************************************
  * Phase Three: Syncing
  ************************************************************/
@@ -335,7 +393,6 @@ void CoreConnectDlg::startSync() {
   ui.loginButtonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
 }
 
-
 void CoreConnectDlg::coreSessionProgress(quint32 val, quint32 max) {
   ui.sessionProgress->setRange(0, max);
   ui.sessionProgress->setValue(val);
@@ -379,6 +436,15 @@ void CoreConnectDlg::coreIrcUsersProgress(quint32 val, quint32 max) {
   }
 }
 
+void CoreConnectDlg::syncFinished() {
+  if(!wizard) accept();
+  else {
+    hide();
+    disconnect(wizard, 0, this, 0);
+    connect(wizard, SIGNAL(finished(int)), this, SLOT(accept()));
+  }
+}
+
 /*****************************************************************************************
  * CoreAccountEditDlg
  *****************************************************************************************/
@@ -399,15 +465,15 @@ CoreAccountEditDlg::CoreAccountEditDlg(AccountId id, const QVariantMap &acct, co
 }
 
 QVariantMap CoreAccountEditDlg::accountData() {
-  account["AccountName"] = ui.accountName->text();
-  account["Host"] = ui.host->text();
+  account["AccountName"] = ui.accountName->text().trimmed();
+  account["Host"] = ui.host->text().trimmed();
   account["Port"] = ui.port->value();
   account["UseInternal"] = ui.useInternal->isChecked();
   return account;
 }
 
 void CoreAccountEditDlg::setWidgetStates() {
-  bool ok = !ui.accountName->text().isEmpty() && !existing.contains(ui.accountName->text()) && (ui.useInternal->isChecked() || !ui.host->text().isEmpty());
+  bool ok = !ui.accountName->text().trimmed().isEmpty() && !existing.contains(ui.accountName->text()) && (ui.useInternal->isChecked() || !ui.host->text().isEmpty());
   ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(ok);
 }