X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.h;h=e88f281df09f15ec6509e16a70e0702b26a7cb08;hp=a6588842322ec4b06c11c69f17d5241d0409dd2d;hb=d5b5dab4ffbdbf30612f49cb77e000ad07b800c2;hpb=5b686746c880e5cda6d5de3e08180ea4332ff222

diff --git a/src/qtui/settingspages/networkssettingspage.h b/src/qtui/settingspages/networkssettingspage.h
index a6588842..e88f281d 100644
--- a/src/qtui/settingspages/networkssettingspage.h
+++ b/src/qtui/settingspages/networkssettingspage.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2012 by the Quassel Project                        *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,10 +21,11 @@
 #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"
@@ -57,6 +58,16 @@ private slots:
     void displayNetwork(NetworkId);
     void setItemState(NetworkId, QListWidgetItem *item = 0);
 
+    /**
+     * Update the capability-dependent settings according to what the server supports
+     *
+     * For example, this updates the SASL text for when the server advertises support.  This should
+     * only be called on the currently displayed network.
+     *
+     * @param[in] id  NetworkId referencing network used to update settings user interface.
+     */
+    void setNetworkCapStates(NetworkId id);
+
     void clientNetworkAdded(NetworkId);
     void clientNetworkRemoved(NetworkId);
     void clientNetworkUpdated();
@@ -65,6 +76,15 @@ private slots:
     void clientIdentityRemoved(IdentityId);
     void clientIdentityUpdated();
 
+    /**
+     * Update the settings user interface according to capabilities advertised by the IRC server
+     */
+    void clientNetworkCapsUpdated();
+
+#ifdef HAVE_SSL
+    void sslUpdated();
+#endif
+
     void on_networkList_itemSelectionChanged();
     void on_addNetwork_clicked();
     void on_deleteNetwork_clicked();
@@ -86,8 +106,11 @@ private:
     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();
@@ -111,6 +134,16 @@ public:
 private slots:
     void setButtonStates();
 
+    /**
+     * Update the default server port according to isChecked
+     *
+     * Connect with useSSL->toggled() in order to keep the port number in sync.  This only modifies
+     * the port if it's not been changed from defaults.
+     *
+     * @param isChecked If true and port unchanged, set port to 6697, else set port to 6667.
+     */
+    void updateSslPort(bool isChecked);
+
 private:
     Ui::NetworkAddDlg ui;
 
@@ -149,6 +182,16 @@ public:
 private slots:
     void on_host_textChanged();
 
+    /**
+     * Update the default server port according to isChecked
+     *
+     * Connect with useSSL->toggled() in order to keep the port number in sync.  This only modifies
+     * the port if it's not been changed from defaults.
+     *
+     * @param isChecked If true and port unchanged, set port to 6697, else set port to 6667.
+     */
+    void updateSslPort(bool isChecked);
+
 private:
     Ui::ServerEditDlg ui;
 };