/***************************************************************************
- * 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 *
#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),
_lastAccountId(0),
- _lastAutoConnectId(0),
- _standalone(false)
+ _lastAutoConnectId(0)
{
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);
ui.accountView->setModel(filteredModel());
ui.autoConnectAccount->setModel(filteredModel());
- connect(filteredModel(), SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)), SLOT(rowsAboutToBeRemoved(QModelIndex, int, int)));
- connect(filteredModel(), SIGNAL(rowsInserted(QModelIndex, int, int)), SLOT(rowsInserted(QModelIndex, int, int)));
+ connect(filteredModel(), &QAbstractItemModel::rowsAboutToBeRemoved, this, &CoreAccountSettingsPage::rowsAboutToBeRemoved);
+ connect(filteredModel(), &QAbstractItemModel::rowsInserted, this, &CoreAccountSettingsPage::rowsInserted);
- connect(ui.accountView->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), SLOT(setWidgetStates()));
+ connect(ui.accountView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &CoreAccountSettingsPage::setWidgetStates);
connect(ui.autoConnectAccount, SIGNAL(currentIndexChanged(int)), SLOT(widgetHasChanged()));
setWidgetStates();
}
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);
}
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;
}
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();
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);