X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fcoreconnectdlg.cpp;h=4811e2e0ad2bbcf6e4e54887c03376e150d43053;hp=b4225efc2d9e3f36339dcaa87c046135239d337b;hb=f2e4609f070221a010eef8be98524c5ce88d228b;hpb=b79832bf9c4c21b05629cfd2fdbd008ad690572f

diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp
index b4225efc..4811e2e0 100644
--- a/src/qtui/coreconnectdlg.cpp
+++ b/src/qtui/coreconnectdlg.cpp
@@ -28,9 +28,14 @@
 #include "clientsyncer.h"
 #include "coreconfigwizard.h"
 
-CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect) : QDialog(parent) {
+CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect)
+  : QDialog(parent)
+{
   ui.setupUi(this);
 
+  // make it look more native under Mac OS X:
+  setWindowFlags(Qt::Sheet);
+
   clientSyncer = new ClientSyncer(this);
   wizard = 0;
 
@@ -459,35 +464,35 @@ void CoreConnectDlg::syncFinished() {
 /*****************************************************************************************
  * CoreAccountEditDlg
  *****************************************************************************************/
-
-CoreAccountEditDlg::CoreAccountEditDlg(AccountId id, const QVariantMap &acct, const QStringList &_existing, QWidget *parent) : QDialog(parent) {
+CoreAccountEditDlg::CoreAccountEditDlg(AccountId id, const QVariantMap &acct, const QStringList &_existing, QWidget *parent)
+  : QDialog(parent)
+{
   ui.setupUi(this);
   existing = _existing;
-  account = acct;
   if(id.isValid()) {
-    // add new settings
-    if(!acct.contains("useProxy")) {
-      account["useProxy"] = false;
-      account["proxyHost"] = "localhost";
-      account["proxyPort"] = 8080;
-      account["proxyType"] = QNetworkProxy::Socks5Proxy;
-      account["proxyUser"] = "";
-      account["proxyPassword"] = "";
-    }
     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());
-    ui.useSsl->setChecked(account["useSsl"].toBool());
-    ui.useProxy->setChecked(account["useProxy"].toBool());
-    ui.proxyHost->setText(account["proxyHost"].toString());
-    ui.proxyPort->setValue(account["proxyPort"].toUInt());
-    ui.proxyType->setCurrentIndex(account["proxyType"].toInt() == QNetworkProxy::Socks5Proxy ? 0 : 1);
-    ui.proxyHost->setText(account["proxyUser"].toString());
-    ui.proxyHost->setText(account["proxyPassword"].toString());
+#ifndef QT_NO_OPENSSL
+    ui.useSsl->setChecked(acct["useSsl"].toBool());
+#else
+    ui.useSsl->setChecked(false);
+    ui.useSsl->setEnabled(false);
+#endif
+    ui.useProxy->setChecked(acct["useProxy"].toBool());
+    ui.proxyHost->setText(acct["proxyHost"].toString());
+    ui.proxyPort->setValue(acct["proxyPort"].toUInt());
+    ui.proxyType->setCurrentIndex(acct["proxyType"].toInt() == QNetworkProxy::Socks5Proxy ? 0 : 1);
+    ui.proxyUser->setText(acct["proxyUser"].toString());
+    ui.proxyPassword->setText(acct["proxyPassword"].toString());
   } else {
     setWindowTitle(tr("Add Core Account"));
+#ifdef QT_NO_OPENSSL
+    ui.useSsl->setChecked(false);
+    ui.useSsl->setEnabled(false);
+#endif
   }
 }