#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)
- : QDialog(parent)
+CoreConnectDlg::CoreConnectDlg(bool autoconnect, QWidget *parent)
+ : QDialog(parent),
+ _internalAccountId(0)
{
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;
foreach(AccountId id, s.knownAccounts()) {
if(!id.isValid()) continue;
QVariantMap data = s.retrieveAccountData(id);
+ if(data.contains("InternalAccount") && data["InternalAccount"].toBool()) {
+ _internalAccountId = id;
+ continue;
+ }
data["AccountId"] = QVariant::fromValue<AccountId>(id);
accounts[id] = data;
QListWidgetItem *item = new QListWidgetItem(data["AccountName"].toString(), ui.accountList);
for(int i = 0; i < ui.accountList->count(); i++) existing << ui.accountList->item(i)->text();
CoreAccountEditDlg dlg(0, QVariantMap(), existing, this);
if(dlg.exec() == QDialog::Accepted) {
- // find free ID
- AccountId id = accounts.count() + 1;
- for(AccountId i = 1; i <= accounts.count(); i++) {
- if(!accounts.keys().contains(i)) {
- id = i;
- break;
- }
- }
+ AccountId id = findFreeAccountId();
QVariantMap data = dlg.accountData();
data["AccountId"] = QVariant::fromValue<AccountId>(id);
accounts[id] = data;
connectToCore();
}
+void CoreConnectDlg::on_useInternalCore_clicked() {
+ if(!_internalAccountId.isValid()) {
+ _internalAccountId = findFreeAccountId();
+ QVariantMap data;
+ data["InternalAccount"] = true;
+ CoreAccountSettings accountSettings;
+ accountSettings.storeAccountData(_internalAccountId, data);
+ }
+ clientSyncer->useInternalCore(_internalAccountId);
+ ui.loginButtonBox->setStandardButtons(QDialogButtonBox::Cancel);
+ startSync();
+}
+
/*****************************************************
* Connecting to the Core
****************************************************/
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);
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);
*********************************************************/
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);
if(wizard) {
wizard->reject();
}
+ ui.connectIcon->setPixmap(BarIcon("dialog-error"));
ui.loginStack->setCurrentWidget(ui.loginCredentialsPage);
ui.loginGroup->setTitle(tr("Login"));
ui.user->setEnabled(true);
ui.user->setEnabled(true);
ui.password->setEnabled(true);
ui.rememberPasswd->setEnabled(true);
- ui.loginButtonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
+ if(ui.loginButtonBox->standardButtons() & QDialogButtonBox::Ok) // in mono mode we don't show an Ok Button
+ ui.loginButtonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
}
void CoreConnectDlg::coreSessionProgress(quint32 val, quint32 max) {
}
}
+AccountId CoreConnectDlg::findFreeAccountId() {
+ for(AccountId i = 1;; i++) {
+ if(!accounts.contains(i) && i != _internalAccountId)
+ return i;
+ }
+}
+
/*****************************************************************************************
* CoreAccountEditDlg
*****************************************************************************************/
: QDialog(parent)
{
ui.setupUi(this);
+ ui.useSsl->setIcon(SmallIcon("document-encrypt"));
+
existing = _existing;
if(id.isValid()) {
+ account = acct;
+
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);
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
}
-
-#ifndef BUILD_MONO
- // if we don't have a mono build we hide the option to use the internal connection and force the setting to use remote host
- ui.useInternal->setChecked(false);
- ui.useInternal->hide();
- ui.useRemote->hide();
- ui.labelUseBuiltinCore->hide();
-#endif
}
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();
}
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);
}
Q_UNUSED(text);
setWidgetStates();
}
-
-void CoreAccountEditDlg::on_useRemote_toggled(bool state) {
- Q_UNUSED(state);
- setWidgetStates();
-}