X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fcoreaccountsettingspage.cpp;h=dfb745612088ae002bdfafd209eff827e1b4e38f;hb=17c39210b1bce04795046657642de66292518fe6;hp=b8b09fef66a60557f1409a3fd5616aedaaeeb5c4;hpb=9ddb5712b16b3219338871d346765bc649007de0;p=quassel.git

diff --git a/src/qtui/settingspages/coreaccountsettingspage.cpp b/src/qtui/settingspages/coreaccountsettingspage.cpp
index b8b09fef..dfb74561 100644
--- a/src/qtui/settingspages/coreaccountsettingspage.cpp
+++ b/src/qtui/settingspages/coreaccountsettingspage.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,11 +20,10 @@
 
 #include "coreaccountsettingspage.h"
 
-#include <QIcon>
-
 #include "client.h"
 #include "clientsettings.h"
 #include "coreaccountmodel.h"
+#include "icon.h"
 
 CoreAccountSettingsPage::CoreAccountSettingsPage(QWidget *parent)
     : SettingsPage(tr("Remote Cores"), QString(), parent),
@@ -34,9 +33,9 @@ CoreAccountSettingsPage::CoreAccountSettingsPage(QWidget *parent)
 {
     ui.setupUi(this);
     initAutoWidgets();
-    ui.addAccountButton->setIcon(QIcon::fromTheme("list-add"));
-    ui.editAccountButton->setIcon(QIcon::fromTheme("document-edit"));
-    ui.deleteAccountButton->setIcon(QIcon::fromTheme("edit-delete"));
+    ui.addAccountButton->setIcon(icon::get("list-add"));
+    ui.editAccountButton->setIcon(icon::get("document-edit"));
+    ui.deleteAccountButton->setIcon(icon::get("edit-delete"));
 
     _model = new CoreAccountModel(Client::coreAccountModel(), this);
     _filteredModel = new FilteredCoreAccountModel(_model, this);
@@ -82,6 +81,8 @@ void CoreAccountSettingsPage::load()
     ui.autoConnectAccount->setCurrentIndex(idx.isValid() ? idx.row() : 0);
     ui.autoConnectAccount->setProperty("storedValue", ui.autoConnectAccount->currentIndex());
     setWidgetStates();
+    // Mark as no changes made, we just loaded settings
+    setChangedState(false);
 }
 
 
@@ -225,10 +226,13 @@ void CoreAccountSettingsPage::widgetHasChanged()
 
 bool CoreAccountSettingsPage::testHasChanged()
 {
-    if (ui.autoConnectAccount->currentIndex() != ui.autoConnectAccount->property("storedValue").toInt())
+    if (ui.autoConnectAccount->currentIndex() !=
+            ui.autoConnectAccount->property("storedValue").toInt()) {
         return true;
-    if (!(*model() == *Client::coreAccountModel()))
+    }
+    if (*model() != *Client::coreAccountModel()) {
         return true;
+    }
 
     return false;
 }
@@ -294,6 +298,13 @@ CoreAccountEditDlg::CoreAccountEditDlg(const CoreAccount &acct, QWidget *parent)
 
 CoreAccount CoreAccountEditDlg::account()
 {
+    _account.setAccountName(ui.accountName->text().trimmed());
+    _account.setHostName(ui.hostName->text().trimmed());
+    _account.setPort(ui.port->value());
+    _account.setUser(ui.user->text().trimmed());
+    _account.setPassword(ui.password->text());
+    _account.setStorePassword(ui.rememberPassword->isChecked());
+
     QNetworkProxy::ProxyType proxyType = QNetworkProxy::NoProxy;
     int checkedId = ui.buttonGroupProxyType->checkedId();
 
@@ -310,12 +321,6 @@ CoreAccount CoreAccountEditDlg::account()
         proxyType = ui.proxyType->currentIndex() == 0 ?
                     QNetworkProxy::Socks5Proxy : QNetworkProxy::HttpProxy;
         QNetworkProxyFactory::setUseSystemConfiguration(false);
-        _account.setAccountName(ui.accountName->text().trimmed());
-        _account.setHostName(ui.hostName->text().trimmed());
-        _account.setPort(ui.port->value());
-        _account.setUser(ui.user->text().trimmed());
-        _account.setPassword(ui.password->text());
-        _account.setStorePassword(ui.rememberPassword->isChecked());
         _account.setProxyHostName(ui.proxyHostName->text().trimmed());
         _account.setProxyPort(ui.proxyPort->value());
         _account.setProxyType(proxyType);