Make button to edit identities from networks settings work

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

diff --git a/src/qtui/settingspages/networkssettingspage.h b/src/qtui/settingspages/networkssettingspage.h
index 0c10a57..65b132f 100644 (file)
--- 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  *
  *   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.             *
  ***************************************************************************/
 
  *   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 "settingspage.h"

+

 #include "ui_networkssettingspage.h"
 #include "ui_networkssettingspage.h"

-#include "ui_networkeditdlgnew.h"
-#include "ui_servereditdlgnew.h"
+#include "ui_networkadddlg.h"
+#include "ui_networkeditdlg.h"
+#include "ui_servereditdlg.h"

 #include "ui_saveidentitiesdlg.h"
 
 #include "ui_saveidentitiesdlg.h"
 

-#include "network.h"
-#include "types.h"
-

 class NetworksSettingsPage : public SettingsPage {
   Q_OBJECT
 
 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_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();
 
     void on_serverList_itemSelectionChanged();
     void on_addServer_clicked();


@@ -81,8 +82,9 @@ class NetworksSettingsPage : public SettingsPage {
 
     NetworkId currentId;
     QHash<NetworkId, NetworkInfo> networkInfos;
 
     NetworkId currentId;
     QHash<NetworkId, NetworkInfo> networkInfos;

+    bool _ignoreWidgetChanges;

 
 

-    QIcon connectedIcon, connectingIcon, disconnectedIcon;
+    QPixmap connectedIcon, connectingIcon, disconnectedIcon;

 
     void reset();
     bool testHasChanged();
 
     void reset();
     bool testHasChanged();


@@ -92,38 +94,57 @@ class NetworksSettingsPage : public SettingsPage {
     void saveToNetworkInfo(NetworkInfo &);
 };
 
     void saveToNetworkInfo(NetworkInfo &);
 };
 

-class NetworkEditDlgNew : public QDialog {
+
+class NetworkAddDlg : public QDialog {

   Q_OBJECT
 
   public:
   Q_OBJECT
 
   public:

-    NetworkEditDlgNew(const QString &old, const QStringList &existing = QStringList(), QWidget *parent = 0);
+    NetworkAddDlg(const QStringList &existing = QStringList(), QWidget *parent = 0);

 
 

-    QString networkName() const;
+    NetworkInfo networkInfo() const;

 
   private slots:
 
   private slots:

-    void on_networkEdit_textChanged(const QString &);
+    void setButtonStates();

 
   private:
 
   private:

-    Ui::NetworkEditDlgNew ui;
+    Ui::NetworkAddDlg ui;

 
 

+    QString networksFilePath;

     QStringList existing;
 };
 
 
     QStringList existing;
 };
 
 

-
-class ServerEditDlgNew : public QDialog {
+class NetworkEditDlg : public QDialog {

   Q_OBJECT
 
   public:
   Q_OBJECT
 
   public:

-    ServerEditDlgNew(const QVariant &serverData = QVariant(), QWidget *parent = 0);
+    NetworkEditDlg(const QString &old, const QStringList &existing = QStringList(), QWidget *parent = 0);

 
 

-    QVariant serverData() const;
+    QString networkName() const;

 
   private slots:
 
   private slots:

-    void on_host_textChanged();
+    void on_networkEdit_textChanged(const QString &);

 
   private:
 
   private:

-    Ui::ServerEditDlgNew ui;
+    Ui::NetworkEditDlg ui;
+
+    QStringList existing;
+};
+
+
+class ServerEditDlg : public QDialog {
+  Q_OBJECT
+
+public:
+  ServerEditDlg(const Network::Server &server = Network::Server(), QWidget *parent = 0);
+
+  Network::Server serverData() const;
+
+private slots:
+  void on_host_textChanged();
+
+private:
+  Ui::ServerEditDlg ui;

 };
 
 
 };