X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fcoreconnectdlg.cpp;h=953b8da225391f0dc0e954e87645efd4f009d95d;hb=5cc01948319761863c121a74dc1e7b1c182beaa6;hp=d7d52de2344cdc7db3d81c9e72d69ff2f402f39b;hpb=a33e42aee121185f479667b2104a15fc2033762e;p=quassel.git
diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp
index d7d52de2..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;
@@ -207,6 +220,11 @@ void CoreConnectDlg::on_accountButtonBox_accepted() {
connectToCore();
}
+void CoreConnectDlg::on_useInternalCore_clicked() {
+ clientSyncer->useInternalCore();
+ startSync();
+}
+
/*****************************************************
* Connecting to the Core
****************************************************/
@@ -215,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);
@@ -231,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("
Connection to %1 failed!
").arg(accountData["Host"].toString()));
ui.coreInfoLabel->setText(error);
@@ -277,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);
@@ -338,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);
@@ -438,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);
@@ -459,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
@@ -470,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();
@@ -482,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);
}
@@ -495,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();
-}