X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fcoreconnectdlg.cpp;h=3f6d120816f7bd520ece8213a25adb3aaaea1d0d;hp=6591edea6b725b1f234d3c4a56f18851c3d0a4ba;hb=e1f500a5f5b510d16e9eaf76a24a9aea98fac86c;hpb=b34c7676d2080b313420f5b1472152e8339eb436 diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp index 6591edea..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(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")); // make it look more native under Mac OS X: setWindowFlags(Qt::Sheet); @@ -39,8 +45,6 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect) clientSyncer = new ClientSyncer(this); wizard = 0; - setAttribute(Qt::WA_DeleteOnClose); - doingAutoConnect = false; ui.stackedWidget->setCurrentWidget(ui.accountPage); @@ -215,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); @@ -231,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("