This is it, the long-awaited huge commit with the new Network handling.

[quassel.git] / src / qtui / settingspages / networkssettingspage.h

diff --git a/src/qtui/settingspages/networkssettingspage.h b/src/qtui/settingspages/networkssettingspage.h
index 00c4532..0c10a57 100644 (file)
--- a/src/qtui/settingspages/networkssettingspage.h
+++ b/src/qtui/settingspages/networkssettingspage.h
@@ -26,6 +26,8 @@
 #include "settingspage.h"
 #include "ui_networkssettingspage.h"
 #include "ui_networkeditdlgnew.h"
+#include "ui_servereditdlgnew.h"
+#include "ui_saveidentitiesdlg.h"
 
 #include "network.h"
 #include "types.h"
@@ -36,7 +38,7 @@ class NetworksSettingsPage : public SettingsPage {
   public:
     NetworksSettingsPage(QWidget *parent = 0);
 
-    //bool aboutToSave();
+    bool aboutToSave();
 
   public slots:
     void save();
@@ -46,10 +48,14 @@ class NetworksSettingsPage : public SettingsPage {
     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);
@@ -58,6 +64,17 @@ class NetworksSettingsPage : public SettingsPage {
 
     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;
@@ -65,12 +82,14 @@ class NetworksSettingsPage : public SettingsPage {
     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 {
@@ -96,14 +115,31 @@ class ServerEditDlgNew : public QDialog {
   Q_OBJECT
 
   public:
-    ServerEditDlgNew(const QVariantMap &serverData = QVariantMap(), QWidget *parent = 0);
+    ServerEditDlgNew(const QVariant &serverData = QVariant(), QWidget *parent = 0);
 
-    QVariantMap serverData() const;
+    QVariant serverData() const;
+
+  private slots:
+    void on_host_textChanged();
 
   private:
-    QVariantMap _serverData;
+    Ui::ServerEditDlgNew 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