X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fcoreconnectdlg.cpp;h=953b8da225391f0dc0e954e87645efd4f009d95d;hb=641905d97d6858e3adb59bebf177b6964dd9066a;hp=7490cb41f514f9fbbd91fc8e207f99a69f61f0be;hpb=2ccedbc06565f046269493baf4b113bcad9f940a;p=quassel.git

diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp
index 7490cb41..953b8da2 100644
--- a/src/qtui/coreconnectdlg.cpp
+++ b/src/qtui/coreconnectdlg.cpp
@@ -24,22 +24,35 @@
 
 #include "coreconnectdlg.h"
 
+#include "client.h"
 #include "clientsettings.h"
 #include "clientsyncer.h"
 #include "coreconfigwizard.h"
+#include "iconloader.h"
+#include "quassel.h"
 
-CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect)
+CoreConnectDlg::CoreConnectDlg(bool autoconnect, QWidget *parent)
   : QDialog(parent)
 {
   ui.setupUi(this);
+  ui.editAccount->setIcon(SmallIcon("document-properties"));
+  ui.addAccount->setIcon(SmallIcon("list-add"));
+  ui.deleteAccount->setIcon(SmallIcon("list-remove"));
+  ui.connectIcon->setPixmap(BarIcon("network-disconnect"));
+  ui.secureConnection->setPixmap(SmallIcon("document-encrypt"));
+
+  if(Quassel::runMode() != Quassel::Monolithic) {
+    ui.useInternalCore->hide();
+  }
 
   // make it look more native under Mac OS X:
   setWindowFlags(Qt::Sheet);
 
   clientSyncer = new ClientSyncer(this);
-  wizard = 0;
+  connect(this, SIGNAL(newClientSyncer(ClientSyncer *)), Client::instance(), SIGNAL(newClientSyncer(ClientSyncer *)));
+  emit newClientSyncer(clientSyncer); // announce the new client syncer via the client.
 
-  setAttribute(Qt::WA_DeleteOnClose);
+  wizard = 0;
 
   doingAutoConnect = false;
 
@@ -76,8 +89,6 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect)
   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(syncFinished()));
 
   connect(ui.user, SIGNAL(textChanged(const QString &)), this, SLOT(setLoginWidgetStates()));
@@ -209,6 +220,11 @@ void CoreConnectDlg::on_accountButtonBox_accepted() {
   connectToCore();
 }
 
+void CoreConnectDlg::on_useInternalCore_clicked() {
+  clientSyncer->useInternalCore();
+  startSync();
+}
+
 /*****************************************************
  * Connecting to the Core
  ****************************************************/
@@ -217,7 +233,7 @@ void CoreConnectDlg::on_accountButtonBox_accepted() {
 
 void CoreConnectDlg::connectToCore() {
   ui.secureConnection->hide();
-  ui.connectIcon->setPixmap(QPixmap::fromImage(QImage(":/22x22/actions/network-disconnect")));
+  ui.connectIcon->setPixmap(BarIcon("network-disconnect"));
   ui.connectLabel->setText(tr("Connect to %1").arg(accountData["Host"].toString()));
   ui.coreInfoLabel->setText("");
   ui.loginStack->setCurrentWidget(ui.loginEmptyPage);
@@ -233,7 +249,7 @@ void CoreConnectDlg::connectToCore() {
 void CoreConnectDlg::initPhaseError(const QString &error) {
   doingAutoConnect = false;
   ui.secureConnection->hide();
-  ui.connectIcon->setPixmap(QPixmap::fromImage(QImage(":/22x22/status/dialog-error")));
+  ui.connectIcon->setPixmap(BarIcon("dialog-error"));
   //ui.connectLabel->setBrush(QBrush("red"));
   ui.connectLabel->setText(tr("<div style=color:red;>Connection to %1 failed!</div>").arg(accountData["Host"].toString()));
   ui.coreInfoLabel->setText(error);
@@ -279,7 +295,7 @@ void CoreConnectDlg::restartPhaseNull() {
  *********************************************************/
 
 void CoreConnectDlg::startLogin() {
-  ui.connectIcon->setPixmap(QPixmap::fromImage(QImage(":/22x22/actions/network-connect")));
+  ui.connectIcon->setPixmap(BarIcon("network-connect"));
   ui.loginStack->setCurrentWidget(ui.loginCredentialsPage);
   //ui.loginStack->setMinimumSize(ui.loginStack->sizeHint()); ui.loginStack->updateGeometry();
   ui.loginButtonBox->setStandardButtons(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
@@ -340,6 +356,7 @@ void CoreConnectDlg::loginFailed(const QString &error) {
   if(wizard) {
     wizard->reject();
   }
+  ui.connectIcon->setPixmap(BarIcon("dialog-error"));
   ui.loginStack->setCurrentWidget(ui.loginCredentialsPage);
   ui.loginGroup->setTitle(tr("Login"));
   ui.user->setEnabled(true);
@@ -396,10 +413,6 @@ void CoreConnectDlg::startSync() {
   ui.sessionProgress->setValue(0);
   ui.networksProgress->setRange(0, 1);
   ui.networksProgress->setValue(0);
-  ui.channelsProgress->setRange(0, 1);
-  ui.channelsProgress->setValue(0);
-  ui.ircUsersProgress->setRange(0, 1);
-  ui.ircUsersProgress->setValue(0);
 
   ui.stackedWidget->setCurrentWidget(ui.syncPage);
   // clean up old page
@@ -428,31 +441,6 @@ void CoreConnectDlg::coreNetworksProgress(quint32 val, quint32 max) {
   }
 }
 
-void CoreConnectDlg::coreChannelsProgress(quint32 val, quint32 max) {
-  if(max == 0) {
-    ui.channelsProgress->setFormat("0/0");
-    ui.channelsProgress->setRange(0, 1);
-    ui.channelsProgress->setValue(1);
-  } else {
-    ui.channelsProgress->setFormat("%v/%m");
-    ui.channelsProgress->setRange(0, max);
-    ui.channelsProgress->setValue(val);
-  }
-}
-
-void CoreConnectDlg::coreIrcUsersProgress(quint32 val, quint32 max) {
-  if(max == 0) {
-    ui.ircUsersProgress->setFormat("0/0");
-    ui.ircUsersProgress->setRange(0, 1);
-    ui.ircUsersProgress->setValue(1);
-  } else {
-    if(val % 100) return;
-    ui.ircUsersProgress->setFormat("%v/%m");
-    ui.ircUsersProgress->setRange(0, max);
-    ui.ircUsersProgress->setValue(val);
-  }
-}
-
 void CoreConnectDlg::syncFinished() {
   if(!wizard) accept();
   else {
@@ -469,14 +457,15 @@ CoreAccountEditDlg::CoreAccountEditDlg(AccountId id, const QVariantMap &acct, co
   : QDialog(parent)
 {
   ui.setupUi(this);
+  ui.useSsl->setIcon(SmallIcon("document-encrypt"));
+
   existing = _existing;
   if(id.isValid()) {
     existing.removeAll(acct["AccountName"].toString());
     ui.host->setText(acct["Host"].toString());
     ui.port->setValue(acct["Port"].toUInt());
-    ui.useInternal->setChecked(acct["UseInternal"].toBool());
     ui.accountName->setText(acct["AccountName"].toString());
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
     ui.useSsl->setChecked(acct["useSsl"].toBool());
 #else
     ui.useSsl->setChecked(false);
@@ -490,7 +479,7 @@ CoreAccountEditDlg::CoreAccountEditDlg(AccountId id, const QVariantMap &acct, co
     ui.proxyPassword->setText(acct["proxyPassword"].toString());
   } else {
     setWindowTitle(tr("Add Core Account"));
-#ifdef QT_NO_OPENSSL
+#ifndef HAVE_SSL
     ui.useSsl->setChecked(false);
     ui.useSsl->setEnabled(false);
 #endif
@@ -501,7 +490,6 @@ QVariantMap CoreAccountEditDlg::accountData() {
   account["AccountName"] = ui.accountName->text().trimmed();
   account["Host"] = ui.host->text().trimmed();
   account["Port"] = ui.port->value();
-  account["UseInternal"] = ui.useInternal->isChecked();
   account["useSsl"] = ui.useSsl->isChecked();
   account["useProxy"] = ui.useProxy->isChecked();
   account["proxyHost"] = ui.proxyHost->text().trimmed();
@@ -513,7 +501,7 @@ QVariantMap CoreAccountEditDlg::accountData() {
 }
 
 void CoreAccountEditDlg::setWidgetStates() {
-  bool ok = !ui.accountName->text().trimmed().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.host->text().isEmpty();
   ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(ok);
 }
 
@@ -526,8 +514,3 @@ void CoreAccountEditDlg::on_accountName_textChanged(const QString &text) {
   Q_UNUSED(text);
   setWidgetStates();
 }
-
-void CoreAccountEditDlg::on_useRemote_toggled(bool state) {
-  Q_UNUSED(state);
-  setWidgetStates();
-}