X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fcoreconnectdlg.cpp;h=3f6d120816f7bd520ece8213a25adb3aaaea1d0d;hb=339ed024e6cf074108e39360e7db58ea0961761b;hp=ad7e68aff7d495d139b69781c8c19ddb90bcf144;hpb=4df7862b00b2113dabdf52342b2c15560313f476;p=quassel.git
diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp
index ad7e68af..3f6d1208 100644
--- a/src/qtui/coreconnectdlg.cpp
+++ b/src/qtui/coreconnectdlg.cpp
@@ -27,11 +27,17 @@
#include "clientsettings.h"
#include "clientsyncer.h"
#include "coreconfigwizard.h"
+#include "iconloader.h"
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"));
// make it look more native under Mac OS X:
setWindowFlags(Qt::Sheet);
@@ -213,7 +219,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);
@@ -229,7 +235,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);
@@ -275,7 +281,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);
@@ -336,6 +342,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);
@@ -436,6 +443,8 @@ 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());
@@ -443,7 +452,7 @@ CoreAccountEditDlg::CoreAccountEditDlg(AccountId id, const QVariantMap &acct, co
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);
@@ -457,7 +466,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