X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.h;h=1162a63a60092dd997b4ba5df1044677f7b3341b;hp=624ca9a3944d7cd497ede668bfe5545479abe9f4;hb=e50ae7a06fc4e5d3a911c361d30953410deab609;hpb=eb5efce4b040e37a4d8fbabae37c63528b253744

diff --git a/src/qtui/settingspages/networkssettingspage.h b/src/qtui/settingspages/networkssettingspage.h
index 624ca9a3..1162a63a 100644
--- a/src/qtui/settingspages/networkssettingspage.h
+++ b/src/qtui/settingspages/networkssettingspage.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,16 +15,17 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #ifndef NETWORKSSETTINGSPAGE_H
 #define NETWORKSSETTINGSPAGE_H
 
-#include <QPixmap>
+#include <QIcon>
 
 #include "network.h"
 #include "settingspage.h"
+#include "clientidentity.h"
 
 #include "ui_networkssettingspage.h"
 #include "ui_networkadddlg.h"
@@ -32,19 +33,22 @@
 #include "ui_servereditdlg.h"
 #include "ui_saveidentitiesdlg.h"
 
-class NetworksSettingsPage : public SettingsPage {
-  Q_OBJECT
+class NetworksSettingsPage : public SettingsPage
+{
+    Q_OBJECT
 
-  public:
+public:
     NetworksSettingsPage(QWidget *parent = 0);
 
+    virtual inline bool needsCoreConnection() const { return true; }
+
     bool aboutToSave();
 
-  public slots:
+public slots:
     void save();
     void load();
 
-  private slots:
+private slots:
     void widgetHasChanged();
     void setWidgetStates();
     void coreConnectionStateChanged(bool);
@@ -62,12 +66,17 @@ class NetworksSettingsPage : public SettingsPage {
     void clientIdentityRemoved(IdentityId);
     void clientIdentityUpdated();
 
+#ifdef HAVE_SSL
+    void sslUpdated();
+#endif
+
     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_connectNow_clicked();
 
     void on_serverList_itemSelectionChanged();
     void on_addServer_clicked();
@@ -76,14 +85,17 @@ class NetworksSettingsPage : public SettingsPage {
     void on_upServer_clicked();
     void on_downServer_clicked();
 
-  private:
+private:
     Ui::NetworksSettingsPage ui;
 
     NetworkId currentId;
     QHash<NetworkId, NetworkInfo> networkInfos;
     bool _ignoreWidgetChanges;
+#ifdef HAVE_SSL
+    CertIdentity *_cid;
+#endif
 
-    QPixmap connectedIcon, connectingIcon, disconnectedIcon;
+    QIcon connectedIcon, connectingIcon, disconnectedIcon;
 
     void reset();
     bool testHasChanged();
@@ -91,75 +103,80 @@ class NetworksSettingsPage : public SettingsPage {
     QListWidgetItem *insertNetwork(const NetworkInfo &info);
     QListWidgetItem *networkItem(NetworkId) const;
     void saveToNetworkInfo(NetworkInfo &);
+    IdentityId defaultIdentity() const;
 };
 
 
-class NetworkAddDlg : public QDialog {
-  Q_OBJECT
+class NetworkAddDlg : public QDialog
+{
+    Q_OBJECT
 
-  public:
+public:
     NetworkAddDlg(const QStringList &existing = QStringList(), QWidget *parent = 0);
 
     NetworkInfo networkInfo() const;
 
-  private slots:
+private slots:
     void setButtonStates();
 
-  private:
+private:
     Ui::NetworkAddDlg ui;
 
-    QString networksFilePath;
     QStringList existing;
 };
 
 
-class NetworkEditDlg : public QDialog {
-  Q_OBJECT
+class NetworkEditDlg : public QDialog
+{
+    Q_OBJECT
 
-  public:
+public:
     NetworkEditDlg(const QString &old, const QStringList &existing = QStringList(), QWidget *parent = 0);
 
     QString networkName() const;
 
-  private slots:
+private slots:
     void on_networkEdit_textChanged(const QString &);
 
-  private:
+private:
     Ui::NetworkEditDlg ui;
 
     QStringList existing;
 };
 
 
-class ServerEditDlg : public QDialog {
-  Q_OBJECT
+class ServerEditDlg : public QDialog
+{
+    Q_OBJECT
 
 public:
-  ServerEditDlg(const Network::Server &server = Network::Server(), QWidget *parent = 0);
+    ServerEditDlg(const Network::Server &server = Network::Server(), QWidget *parent = 0);
 
-  Network::Server serverData() const;
+    Network::Server serverData() const;
 
 private slots:
-  void on_host_textChanged();
+    void on_host_textChanged();
 
 private:
-  Ui::ServerEditDlg ui;
+    Ui::ServerEditDlg ui;
 };
 
 
-class SaveNetworksDlg : public QDialog {
-  Q_OBJECT
+class SaveNetworksDlg : public QDialog
+{
+    Q_OBJECT
 
-  public:
+public:
     SaveNetworksDlg(const QList<NetworkInfo> &toCreate, const QList<NetworkInfo> &toUpdate, const QList<NetworkId> &toRemove, QWidget *parent = 0);
 
-  private slots:
+private slots:
     void clientEvent();
 
-  private:
+private:
     Ui::SaveIdentitiesDlg ui;
 
     int numevents, rcvevents;
 };
 
+
 #endif