#include "settingspage.h"
#include "ui_networkssettingspage.h"
-#include "ui_networkeditdlgnew.h"
+#include "ui_networkeditdlg.h"
+#include "ui_servereditdlg.h"
+#include "ui_saveidentitiesdlg.h"
#include "network.h"
#include "types.h"
public:
NetworksSettingsPage(QWidget *parent = 0);
- //bool aboutToSave();
+ bool aboutToSave();
public slots:
void save();
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 clientNetworkUpdated();
void clientIdentityAdded(IdentityId);
void on_networkList_itemSelectionChanged();
void on_addNetwork_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_editServer_clicked();
+ void on_upServer_clicked();
+ void on_downServer_clicked();
private:
Ui::NetworksSettingsPage ui;
NetworkId currentId;
QHash<NetworkId, NetworkInfo> networkInfos;
- QIcon connectedIcon, disconnectedIcon;
+ QIcon connectedIcon, connectingIcon, disconnectedIcon;
void reset();
bool testHasChanged();
- void insertNetwork(NetworkId);
+ QListWidgetItem *insertNetwork(NetworkId);
+ QListWidgetItem *insertNetwork(const NetworkInfo &info);
QListWidgetItem *networkItem(NetworkId) const;
+ void saveToNetworkInfo(NetworkInfo &);
};
-class NetworkEditDlgNew : public QDialog {
+class NetworkEditDlg : public QDialog {
Q_OBJECT
public:
- NetworkEditDlgNew(const QString &old, const QStringList &existing = QStringList(), QWidget *parent = 0);
+ NetworkEditDlg(const QString &old, const QStringList &existing = QStringList(), QWidget *parent = 0);
QString networkName() const;
void on_networkEdit_textChanged(const QString &);
private:
- Ui::NetworkEditDlgNew ui;
+ Ui::NetworkEditDlg ui;
QStringList existing;
};
-class ServerEditDlgNew : public QDialog {
+class ServerEditDlg : public QDialog {
Q_OBJECT
public:
- ServerEditDlgNew(const QVariantMap &serverData = QVariantMap(), QWidget *parent = 0);
+ ServerEditDlg(const QVariant &serverData = QVariant(), QWidget *parent = 0);
- QVariantMap serverData() const;
+ QVariant serverData() const;
+
+ private slots:
+ void on_host_textChanged();
private:
- QVariantMap _serverData;
+ Ui::ServerEditDlg ui;
};
+class SaveNetworksDlg : public QDialog {
+ Q_OBJECT
+
+ 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;
+
+ int numevents, rcvevents;
+};
#endif