X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.h;h=65b132f1871cf6ffdf0c40a2e033bdd9924dec8b;hp=22a9e337ec1eabb2563f745d70299f90fb6f2b20;hb=c7ce9cd32c8fbbdd2d93c20da78a98f32e5b938d;hpb=28f1a9d9d96645757691cdea19500aefce4bcdac

diff --git a/src/qtui/settingspages/networkssettingspage.h b/src/qtui/settingspages/networkssettingspage.h
index 22a9e337..65b132f1 100644
--- a/src/qtui/settingspages/networkssettingspage.h
+++ b/src/qtui/settingspages/networkssettingspage.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,20 +18,20 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _NETWORKSSETTINGSPAGE_H_
-#define _NETWORKSSETTINGSPAGE_H_
+#ifndef NETWORKSSETTINGSPAGE_H
+#define NETWORKSSETTINGSPAGE_H
 
-#include <QIcon>
+#include <QPixmap>
 
+#include "network.h"
 #include "settingspage.h"
+
 #include "ui_networkssettingspage.h"
+#include "ui_networkadddlg.h"
 #include "ui_networkeditdlg.h"
 #include "ui_servereditdlg.h"
 #include "ui_saveidentitiesdlg.h"
 
-#include "network.h"
-#include "types.h"
-
 class NetworksSettingsPage : public SettingsPage {
   Q_OBJECT
 
@@ -66,8 +66,9 @@ class NetworksSettingsPage : public SettingsPage {
     void on_addNetwork_clicked();
     void on_deleteNetwork_clicked();
     void on_renameNetwork_clicked();
+    void on_editIdentities_clicked();
 
-    void on_connectNow_clicked();
+    // void on_connectNow_clicked();
 
     void on_serverList_itemSelectionChanged();
     void on_addServer_clicked();
@@ -83,7 +84,7 @@ class NetworksSettingsPage : public SettingsPage {
     QHash<NetworkId, NetworkInfo> networkInfos;
     bool _ignoreWidgetChanges;
 
-    QIcon connectedIcon, connectingIcon, disconnectedIcon;
+    QPixmap connectedIcon, connectingIcon, disconnectedIcon;
 
     void reset();
     bool testHasChanged();
@@ -93,6 +94,26 @@ class NetworksSettingsPage : public SettingsPage {
     void saveToNetworkInfo(NetworkInfo &);
 };
 
+
+class NetworkAddDlg : public QDialog {
+  Q_OBJECT
+
+  public:
+    NetworkAddDlg(const QStringList &existing = QStringList(), QWidget *parent = 0);
+
+    NetworkInfo networkInfo() const;
+
+  private slots:
+    void setButtonStates();
+
+  private:
+    Ui::NetworkAddDlg ui;
+
+    QString networksFilePath;
+    QStringList existing;
+};
+
+
 class NetworkEditDlg : public QDialog {
   Q_OBJECT
 
@@ -111,20 +132,19 @@ class NetworkEditDlg : public QDialog {
 };
 
 
-
 class ServerEditDlg : public QDialog {
   Q_OBJECT
 
-  public:
-    ServerEditDlg(const QVariant &serverData = QVariant(), QWidget *parent = 0);
+public:
+  ServerEditDlg(const Network::Server &server = Network::Server(), QWidget *parent = 0);
 
-    QVariant serverData() const;
+  Network::Server serverData() const;
 
-  private slots:
-    void on_host_textChanged();
+private slots:
+  void on_host_textChanged();
 
-  private:
-    Ui::ServerEditDlg ui;
+private:
+  Ui::ServerEditDlg ui;
 };