fixes #542 - show identities and network settings on first start

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

diff --git a/src/qtui/settingspages/networkssettingspage.h b/src/qtui/settingspages/networkssettingspage.h
index ef9b0db..bafc645 100644 (file)
--- a/src/qtui/settingspages/networkssettingspage.h
+++ b/src/qtui/settingspages/networkssettingspage.h
@@ -27,6 +27,7 @@
 #include "settingspage.h"
 
 #include "ui_networkssettingspage.h"
+#include "ui_networkadddlg.h"
 #include "ui_networkeditdlg.h"
 #include "ui_servereditdlg.h"
 #include "ui_saveidentitiesdlg.h"
@@ -34,64 +35,84 @@
 class NetworksSettingsPage : public SettingsPage {
   Q_OBJECT
 
-  public:
-    NetworksSettingsPage(QWidget *parent = 0);
+public:
+  NetworksSettingsPage(QWidget *parent = 0);
 
-    bool aboutToSave();
+  bool aboutToSave();
 
-  public slots:
-    void save();
-    void load();
+public slots:
+  void save();
+  void load();
 
-  private slots:
-    void widgetHasChanged();
-    void setWidgetStates();
-    void coreConnectionStateChanged(bool);
-    void networkConnectionStateChanged(Network::ConnectionState state);
-    void networkConnectionError(const QString &msg);
+private slots:
+  void widgetHasChanged();
+  void setWidgetStates();
+  void coreConnectionStateChanged(bool);
+  void networkConnectionStateChanged(Network::ConnectionState state);
+  void networkConnectionError(const QString &msg);
+
+  void displayNetwork(NetworkId);
+  void setItemState(NetworkId, QListWidgetItem *item = 0);
+
+  void clientNetworkAdded(NetworkId);
+  void clientNetworkRemoved(NetworkId);
+  void clientNetworkUpdated();
+
+  void clientIdentityAdded(IdentityId);
+  void clientIdentityRemoved(IdentityId);
+  void clientIdentityUpdated();
+
+  void on_networkList_itemSelectionChanged();
+  void on_addNetwork_clicked();
+  void on_deleteNetwork_clicked();
+  void on_renameNetwork_clicked();
+  void on_editIdentities_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();
 
-    void displayNetwork(NetworkId);
-    void setItemState(NetworkId, QListWidgetItem *item = 0);
+private:
+  Ui::NetworksSettingsPage ui;
 
-    void clientNetworkAdded(NetworkId);
-    void clientNetworkRemoved(NetworkId);
-    void clientNetworkUpdated();
+  NetworkId currentId;
+  QHash<NetworkId, NetworkInfo> networkInfos;
+  bool _ignoreWidgetChanges;
 
-    void clientIdentityAdded(IdentityId);
-    void clientIdentityRemoved(IdentityId);
-    void clientIdentityUpdated();
+  QPixmap connectedIcon, connectingIcon, disconnectedIcon;
 
-    void on_networkList_itemSelectionChanged();
-    void on_addNetwork_clicked();
-    void on_deleteNetwork_clicked();
-    void on_renameNetwork_clicked();
+  void reset();
+  bool testHasChanged();
+  QListWidgetItem *insertNetwork(NetworkId);
+  QListWidgetItem *insertNetwork(const NetworkInfo &info);
+  QListWidgetItem *networkItem(NetworkId) const;
+  void saveToNetworkInfo(NetworkInfo &);
+};
 
-    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();
+class NetworkAddDlg : public QDialog {
+  Q_OBJECT
 
-  private:
-    Ui::NetworksSettingsPage ui;
+  public:
+    NetworkAddDlg(const QStringList &existing = QStringList(), QWidget *parent = 0);
+
+    NetworkInfo networkInfo() const;
 
-    NetworkId currentId;
-    QHash<NetworkId, NetworkInfo> networkInfos;
-    bool _ignoreWidgetChanges;
+  private slots:
+    void setButtonStates();
 
-    QPixmap connectedIcon, connectingIcon, disconnectedIcon;
+  private:
+    Ui::NetworkAddDlg ui;
 
-    void reset();
-    bool testHasChanged();
-    QListWidgetItem *insertNetwork(NetworkId);
-    QListWidgetItem *insertNetwork(const NetworkInfo &info);
-    QListWidgetItem *networkItem(NetworkId) const;
-    void saveToNetworkInfo(NetworkInfo &);
+    QStringList existing;
 };
 
+
 class NetworkEditDlg : public QDialog {
   Q_OBJECT
 
@@ -110,7 +131,6 @@ class NetworkEditDlg : public QDialog {
 };
 
 
-
 class ServerEditDlg : public QDialog {
   Q_OBJECT