projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce QtUiStyleSettings and make highlight color configurable again
[quassel.git]
/
src
/
qtui
/
settingspages
/
networkssettingspage.h
diff --git
a/src/qtui/settingspages/networkssettingspage.h
b/src/qtui/settingspages/networkssettingspage.h
index
0c10a57
..
22a9e33
100644
(file)
--- a/
src/qtui/settingspages/networkssettingspage.h
+++ b/
src/qtui/settingspages/networkssettingspage.h
@@
-25,8
+25,8
@@
#include "settingspage.h"
#include "ui_networkssettingspage.h"
#include "settingspage.h"
#include "ui_networkssettingspage.h"
-#include "ui_networkeditdlg
new
.h"
-#include "ui_servereditdlg
new
.h"
+#include "ui_networkeditdlg.h"
+#include "ui_servereditdlg.h"
#include "ui_saveidentitiesdlg.h"
#include "network.h"
#include "ui_saveidentitiesdlg.h"
#include "network.h"
@@
-81,6
+81,7
@@
class NetworksSettingsPage : public SettingsPage {
NetworkId currentId;
QHash<NetworkId, NetworkInfo> networkInfos;
NetworkId currentId;
QHash<NetworkId, NetworkInfo> networkInfos;
+ bool _ignoreWidgetChanges;
QIcon connectedIcon, connectingIcon, disconnectedIcon;
QIcon connectedIcon, connectingIcon, disconnectedIcon;
@@
-92,11
+93,11
@@
class NetworksSettingsPage : public SettingsPage {
void saveToNetworkInfo(NetworkInfo &);
};
void saveToNetworkInfo(NetworkInfo &);
};
-class NetworkEditDlg
New
: public QDialog {
+class NetworkEditDlg : public QDialog {
Q_OBJECT
public:
Q_OBJECT
public:
- NetworkEditDlg
New
(const QString &old, const QStringList &existing = QStringList(), QWidget *parent = 0);
+ NetworkEditDlg(const QString &old, const QStringList &existing = QStringList(), QWidget *parent = 0);
QString networkName() const;
QString networkName() const;
@@
-104,18
+105,18
@@
class NetworkEditDlgNew : public QDialog {
void on_networkEdit_textChanged(const QString &);
private:
void on_networkEdit_textChanged(const QString &);
private:
- Ui::NetworkEditDlg
New
ui;
+ Ui::NetworkEditDlg ui;
QStringList existing;
};
QStringList existing;
};
-class ServerEditDlg
New
: public QDialog {
+class ServerEditDlg : public QDialog {
Q_OBJECT
public:
Q_OBJECT
public:
- ServerEditDlg
New
(const QVariant &serverData = QVariant(), QWidget *parent = 0);
+ ServerEditDlg(const QVariant &serverData = QVariant(), QWidget *parent = 0);
QVariant serverData() const;
QVariant serverData() const;
@@
-123,7
+124,7
@@
class ServerEditDlgNew : public QDialog {
void on_host_textChanged();
private:
void on_host_textChanged();
private:
- Ui::ServerEditDlg
New
ui;
+ Ui::ServerEditDlg ui;
};
};