projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing/tweaking various UIs, mostly icons
[quassel.git]
/
src
/
qtui
/
settingspages
/
networkssettingspage.h
diff --git
a/src/qtui/settingspages/networkssettingspage.h
b/src/qtui/settingspages/networkssettingspage.h
index
89ac4b2
..
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"
@@
-48,8
+48,11
@@
class NetworksSettingsPage : public SettingsPage {
void widgetHasChanged();
void setWidgetStates();
void coreConnectionStateChanged(bool);
void widgetHasChanged();
void setWidgetStates();
void coreConnectionStateChanged(bool);
+ void networkConnectionStateChanged(Network::ConnectionState state);
+ void networkConnectionError(const QString &msg);
- void displayNetwork(NetworkId, bool dontsave = false);
+ void displayNetwork(NetworkId);
+ void setItemState(NetworkId, QListWidgetItem *item = 0);
void clientNetworkAdded(NetworkId);
void clientNetworkRemoved(NetworkId);
void clientNetworkAdded(NetworkId);
void clientNetworkRemoved(NetworkId);
@@
-64,6
+67,8
@@
class NetworksSettingsPage : public SettingsPage {
void on_deleteNetwork_clicked();
void on_renameNetwork_clicked();
void on_deleteNetwork_clicked();
void on_renameNetwork_clicked();
+ void on_connectNow_clicked();
+
void on_serverList_itemSelectionChanged();
void on_addServer_clicked();
void on_deleteServer_clicked();
void on_serverList_itemSelectionChanged();
void on_addServer_clicked();
void on_deleteServer_clicked();
@@
-76,8
+81,9
@@
class NetworksSettingsPage : public SettingsPage {
NetworkId currentId;
QHash<NetworkId, NetworkInfo> networkInfos;
NetworkId currentId;
QHash<NetworkId, NetworkInfo> networkInfos;
+ bool _ignoreWidgetChanges;
- QIcon connectedIcon, disconnectedIcon;
+ QIcon connectedIcon,
connectingIcon,
disconnectedIcon;
void reset();
bool testHasChanged();
void reset();
bool testHasChanged();
@@
-87,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;
@@
-99,26
+105,26
@@
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 QVariantMap &serverData = QVariantMap
(), QWidget *parent = 0);
+ ServerEditDlg
(const QVariant &serverData = QVariant
(), QWidget *parent = 0);
- QVariant
Map
serverData() const;
+ QVariant serverData() const;
private slots:
void on_host_textChanged();
private:
private slots:
void on_host_textChanged();
private:
- Ui::ServerEditDlg
New
ui;
+ Ui::ServerEditDlg ui;
};
};
@@
-128,8
+134,13
@@
class SaveNetworksDlg : public QDialog {
public:
SaveNetworksDlg(const QList<NetworkInfo> &toCreate, const QList<NetworkInfo> &toUpdate, const QList<NetworkId> &toRemove, QWidget *parent = 0);
public:
SaveNetworksDlg(const QList<NetworkInfo> &toCreate, const QList<NetworkInfo> &toUpdate, const QList<NetworkId> &toRemove, QWidget *parent = 0);
+ private slots:
+ void clientEvent();
+
private:
Ui::SaveIdentitiesDlg ui;
private:
Ui::SaveIdentitiesDlg ui;
+
+ int numevents, rcvevents;
};
#endif
};
#endif