X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.h;h=5c9db1128a9d3141535566e6bdd161a41b60764a;hp=65b132f1871cf6ffdf0c40a2e033bdd9924dec8b;hb=e8a39b4c3c92e193ab861a3fea84a261bb6fbd24;hpb=c7ce9cd32c8fbbdd2d93c20da78a98f32e5b938d diff --git a/src/qtui/settingspages/networkssettingspage.h b/src/qtui/settingspages/networkssettingspage.h index 65b132f1..5c9db112 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-2018 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 +#include #include "network.h" #include "settingspage.h" +#include "clientidentity.h" #include "ui_networkssettingspage.h" #include "ui_networkadddlg.h" @@ -32,19 +33,23 @@ #include "ui_servereditdlg.h" #include "ui_saveidentitiesdlg.h" -class NetworksSettingsPage : public SettingsPage { - Q_OBJECT +class NetworksSettingsPage : public SettingsPage +{ + Q_OBJECT - public: - NetworksSettingsPage(QWidget *parent = 0); +public: + NetworksSettingsPage(QWidget *parent = nullptr); + + inline bool needsCoreConnection() const override { return true; } - bool aboutToSave(); + bool aboutToSave() override; - public slots: - void save(); - void load(); +public slots: + void save() override; + void load() override; + void bufferList_Open(NetworkId); - private slots: +private slots: void widgetHasChanged(); void setWidgetStates(); void coreConnectionStateChanged(bool); @@ -52,7 +57,27 @@ class NetworksSettingsPage : public SettingsPage { void networkConnectionError(const QString &msg); void displayNetwork(NetworkId); - void setItemState(NetworkId, QListWidgetItem *item = 0); + void setItemState(NetworkId, QListWidgetItem *item = nullptr); + + /** + * Reset the capability-dependent settings to the default unknown states + * + * For example, this updates the SASL text to indicate the status is unknown. Any actual + * information should be set by setNetworkCapStates() + * + * @see NetworksSettingsPage::setNetworkCapStates() + */ + void resetNetworkCapStates(); + + /** + * 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); @@ -62,6 +87,15 @@ class NetworksSettingsPage : public SettingsPage { 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(); @@ -77,14 +111,38 @@ class NetworksSettingsPage : public SettingsPage { void on_upServer_clicked(); void on_downServer_clicked(); - private: + /** + * Event handler for SASL status Details button + */ + void on_saslStatusDetails_clicked(); + +private: + /** + * Status of capability support + */ + enum CapSupportStatus { + Unknown, ///< Old core, or otherwise unknown, can't make assumptions + Disconnected, ///< Disconnected from network, can't determine + MaybeUnsupported, ///< Server does not advertise support at this moment + MaybeSupported ///< Server advertises support at this moment + }; + // Keep in mind networks can add, change, and remove capabilities at any time. + Ui::NetworksSettingsPage ui; NetworkId currentId; QHash networkInfos; bool _ignoreWidgetChanges; +#ifdef HAVE_SSL + CertIdentity *_cid; +#endif + + QIcon connectedIcon, connectingIcon, disconnectedIcon; + + // Status icons + QIcon infoIcon, warningIcon; - QPixmap connectedIcon, connectingIcon, disconnectedIcon; + CapSupportStatus _saslStatusSelected; /// Status of SASL support for currently-selected network void reset(); bool testHasChanged(); @@ -92,75 +150,107 @@ class NetworksSettingsPage : public SettingsPage { QListWidgetItem *insertNetwork(const NetworkInfo &info); QListWidgetItem *networkItem(NetworkId) const; void saveToNetworkInfo(NetworkInfo &); + IdentityId defaultIdentity() const; + + /** + * Update the SASL settings interface according to the given SASL state + * + * @param[in] saslStatus Current status of SASL support. + */ + void setSASLStatus(const CapSupportStatus saslStatus); }; -class NetworkAddDlg : public QDialog { - Q_OBJECT +class NetworkAddDlg : public QDialog +{ + Q_OBJECT - public: - NetworkAddDlg(const QStringList &existing = QStringList(), QWidget *parent = 0); +public: + NetworkAddDlg(const QStringList &existing = QStringList(), QWidget *parent = nullptr); NetworkInfo networkInfo() const; - private slots: +private slots: void setButtonStates(); - private: + /** + * 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; - QString networksFilePath; QStringList existing; }; -class NetworkEditDlg : public QDialog { - Q_OBJECT +class NetworkEditDlg : public QDialog +{ + Q_OBJECT - public: - NetworkEditDlg(const QString &old, const QStringList &existing = QStringList(), QWidget *parent = 0); +public: + NetworkEditDlg(const QString &old, const QStringList &existing = QStringList(), QWidget *parent = nullptr); 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 = nullptr); - Network::Server serverData() const; + Network::Server serverData() const; private slots: - void on_host_textChanged(); + 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; + Ui::ServerEditDlg ui; }; -class SaveNetworksDlg : public QDialog { - Q_OBJECT +class SaveNetworksDlg : public QDialog +{ + Q_OBJECT - public: - SaveNetworksDlg(const QList &toCreate, const QList &toUpdate, const QList &toRemove, QWidget *parent = 0); +public: + SaveNetworksDlg(const QList &toCreate, const QList &toUpdate, const QList &toRemove, QWidget *parent = nullptr); - private slots: +private slots: void clientEvent(); - private: +private: Ui::SaveIdentitiesDlg ui; int numevents, rcvevents; }; + #endif