X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.h;h=73bee52c1eedbac9e9a4e0d3f75b82e852c98625;hb=HEAD;hp=b255793743ac2ded0c71ea08d569fcd255788cba;hpb=8265e0f7f750f7ae7a4a8a163b2bd42e8edb4998;p=quassel.git diff --git a/src/qtui/settingspages/networkssettingspage.h b/src/qtui/settingspages/networkssettingspage.h index b2557937..99fe92e5 100644 --- a/src/qtui/settingspages/networkssettingspage.h +++ b/src/qtui/settingspages/networkssettingspage.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 by the Quassel Project * + * Copyright (C) 2005-2022 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -23,40 +23,52 @@ #include +#include "clientidentity.h" #include "network.h" #include "settingspage.h" -#include "clientidentity.h" -#include "ui_networkssettingspage.h" +#include "ui_capseditdlg.h" #include "ui_networkadddlg.h" #include "ui_networkeditdlg.h" -#include "ui_servereditdlg.h" +#include "ui_networkssettingspage.h" #include "ui_saveidentitiesdlg.h" +#include "ui_servereditdlg.h" class NetworksSettingsPage : public SettingsPage { Q_OBJECT public: - NetworksSettingsPage(QWidget *parent = 0); + NetworksSettingsPage(QWidget* parent = nullptr); - virtual inline bool needsCoreConnection() const { return true; } + inline bool needsCoreConnection() const override { return true; } - bool aboutToSave(); + bool aboutToSave() override; public slots: - void save(); - void load(); + void save() override; + void load() override; + void bufferList_Open(NetworkId); private slots: void widgetHasChanged(); void setWidgetStates(); void coreConnectionStateChanged(bool); void networkConnectionStateChanged(Network::ConnectionState state); - void networkConnectionError(const QString &msg); + 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 @@ -81,9 +93,7 @@ private slots: */ void clientNetworkCapsUpdated(); -#ifdef HAVE_SSL void sslUpdated(); -#endif void on_networkList_itemSelectionChanged(); void on_addNetwork_clicked(); @@ -105,11 +115,22 @@ private slots: */ void on_saslStatusDetails_clicked(); + /** + * Event handler for Features status Details button + */ + void on_enableCapsStatusDetails_clicked(); + + /** + * Event handler for Features Advanced edit button + */ + void on_enableCapsAdvanced_clicked(); + private: /** * Status of capability support */ - enum CapSupportStatus { + 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 @@ -121,41 +142,47 @@ private: NetworkId currentId; QHash networkInfos; - bool _ignoreWidgetChanges; -#ifdef HAVE_SSL - CertIdentity *_cid; -#endif + bool _ignoreWidgetChanges{false}; + CertIdentity* _cid{nullptr}; QIcon connectedIcon, connectingIcon, disconnectedIcon; // Status icons - QIcon infoIcon, warningIcon; + QIcon infoIcon, successIcon, unavailableIcon, questionIcon; - CapSupportStatus _saslStatusSelected; /// Status of SASL support for currently-selected network + CapSupportStatus _capSaslStatusSelected; ///< Status of SASL support for selected network + bool _capSaslStatusUsingExternal{false}; ///< Whether SASL support status is for SASL EXTERNAL void reset(); bool testHasChanged(); - QListWidgetItem *insertNetwork(NetworkId); - QListWidgetItem *insertNetwork(const NetworkInfo &info); - QListWidgetItem *networkItem(NetworkId) const; - void saveToNetworkInfo(NetworkInfo &); + QListWidgetItem* insertNetwork(NetworkId); + QListWidgetItem* insertNetwork(const NetworkInfo& info); + QListWidgetItem* networkItem(NetworkId) const; + void saveToNetworkInfo(NetworkInfo&); IdentityId defaultIdentity() const; + /** + * Get whether or not the displayed network's identity has SSL certs associated with it + * + * @return True if the currently displayed network has SSL certs set, otherwise false + */ + bool displayedNetworkHasCertId() const; + /** * Update the SASL settings interface according to the given SASL state * - * @param[in] saslStatus Current status of SASL support. + * @param saslStatus Current status of SASL support. + * @param usingSASLExternal If true, SASL support status is for SASL EXTERNAL, else SASL PLAIN */ - void setSASLStatus(const CapSupportStatus saslStatus); + void setCapSASLStatus(const CapSupportStatus saslStatus, bool usingSASLExternal = false); }; - class NetworkAddDlg : public QDialog { Q_OBJECT public: - NetworkAddDlg(const QStringList &existing = QStringList(), QWidget *parent = 0); + NetworkAddDlg(QStringList existing = QStringList(), QWidget* parent = nullptr); NetworkInfo networkInfo() const; @@ -178,18 +205,17 @@ private: QStringList existing; }; - class NetworkEditDlg : public QDialog { Q_OBJECT public: - NetworkEditDlg(const QString &old, const QStringList &existing = QStringList(), QWidget *parent = 0); + NetworkEditDlg(const QString& old, QStringList existing = QStringList(), QWidget* parent = nullptr); QString networkName() const; private slots: - void on_networkEdit_textChanged(const QString &); + void on_networkEdit_textChanged(const QString&); private: Ui::NetworkEditDlg ui; @@ -197,13 +223,12 @@ private: QStringList existing; }; - 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; @@ -224,13 +249,34 @@ private: Ui::ServerEditDlg ui; }; +class CapsEditDlg : public QDialog +{ + Q_OBJECT + +public: + CapsEditDlg(const QString& oldSkipCapsString, QWidget* parent = nullptr); + + QString skipCapsString() const; + +private slots: + void defaultSkipCaps(); + void on_skipCapsEdit_textChanged(const QString&); + +private: + Ui::CapsEditDlg ui; + + QString oldSkipCapsString; +}; class SaveNetworksDlg : public QDialog { Q_OBJECT public: - SaveNetworksDlg(const QList &toCreate, const QList &toUpdate, const QList &toRemove, QWidget *parent = 0); + SaveNetworksDlg(const QList& toCreate, + const QList& toUpdate, + const QList& toRemove, + QWidget* parent = nullptr); private slots: void clientEvent(); @@ -241,5 +287,4 @@ private: int numevents, rcvevents; }; - #endif