projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Empty highlight name matches all messages
[quassel.git]
/
src
/
qtui
/
settingspages
/
coreaccountsettingspage.cpp
diff --git
a/src/qtui/settingspages/coreaccountsettingspage.cpp
b/src/qtui/settingspages/coreaccountsettingspage.cpp
index
31dd833
..
dfb7456
100644
(file)
--- a/
src/qtui/settingspages/coreaccountsettingspage.cpp
+++ b/
src/qtui/settingspages/coreaccountsettingspage.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
6
by the Quassel Project *
+ * Copyright (C) 2005-201
8
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-20,11
+20,10
@@
#include "coreaccountsettingspage.h"
#include "coreaccountsettingspage.h"
-#include <QIcon>
-
#include "client.h"
#include "clientsettings.h"
#include "coreaccountmodel.h"
#include "client.h"
#include "clientsettings.h"
#include "coreaccountmodel.h"
+#include "icon.h"
CoreAccountSettingsPage::CoreAccountSettingsPage(QWidget *parent)
: SettingsPage(tr("Remote Cores"), QString(), parent),
CoreAccountSettingsPage::CoreAccountSettingsPage(QWidget *parent)
: SettingsPage(tr("Remote Cores"), QString(), parent),
@@
-34,9
+33,9
@@
CoreAccountSettingsPage::CoreAccountSettingsPage(QWidget *parent)
{
ui.setupUi(this);
initAutoWidgets();
{
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);
_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();
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()
{
bool CoreAccountSettingsPage::testHasChanged()
{
- if (ui.autoConnectAccount->currentIndex() != ui.autoConnectAccount->property("storedValue").toInt())
+ if (ui.autoConnectAccount->currentIndex() !=
+ ui.autoConnectAccount->property("storedValue").toInt()) {
return true;
return true;
- if (!(*model() == *Client::coreAccountModel()))
+ }
+ if (*model() != *Client::coreAccountModel()) {
return true;
return true;
+ }
return false;
}
return false;
}