From 74c583413e3c903d37fe7279bfbb0895b82ff60a Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 30 Nov 2020 12:26:04 +0100 Subject: [PATCH] Move feeds authentication to standard plugin. --- src/librssguard/librssguard.pro | 3 + .../services/abstract/gui/formfeeddetails.cpp | 47 ------------ .../services/abstract/gui/formfeeddetails.h | 3 - .../services/abstract/gui/formfeeddetails.ui | 60 --------------- .../standard/gui/authenticationdetails.cpp | 47 ++++++++++++ .../standard/gui/authenticationdetails.h | 27 +++++++ .../standard/gui/authenticationdetails.ui | 76 +++++++++++++++++++ .../standard/gui/formstandardfeeddetails.cpp | 23 ++++-- .../standard/gui/formstandardfeeddetails.h | 2 + 9 files changed, 170 insertions(+), 118 deletions(-) create mode 100755 src/librssguard/services/standard/gui/authenticationdetails.cpp create mode 100755 src/librssguard/services/standard/gui/authenticationdetails.h create mode 100755 src/librssguard/services/standard/gui/authenticationdetails.ui diff --git a/src/librssguard/librssguard.pro b/src/librssguard/librssguard.pro index 3cb5aa27f..714c40b31 100644 --- a/src/librssguard/librssguard.pro +++ b/src/librssguard/librssguard.pro @@ -160,6 +160,7 @@ HEADERS += core/feeddownloader.h \ services/owncloud/owncloudserviceroot.h \ services/standard/atomparser.h \ services/standard/feedparser.h \ + services/standard/gui/authenticationdetails.h \ services/standard/gui/formstandardcategorydetails.h \ services/standard/gui/formstandardfeeddetails.h \ services/standard/gui/formstandardimportexport.h \ @@ -307,6 +308,7 @@ SOURCES += core/feeddownloader.cpp \ services/owncloud/owncloudserviceroot.cpp \ services/standard/atomparser.cpp \ services/standard/feedparser.cpp \ + services/standard/gui/authenticationdetails.cpp \ services/standard/gui/formstandardcategorydetails.cpp \ services/standard/gui/formstandardfeeddetails.cpp \ services/standard/gui/formstandardimportexport.cpp \ @@ -361,6 +363,7 @@ FORMS += gui/dialogs/formabout.ui \ services/gmail/gui/formeditgmailaccount.ui \ services/inoreader/gui/formeditinoreaderaccount.ui \ services/owncloud/gui/formeditowncloudaccount.ui \ + services/standard/gui/authenticationdetails.ui \ services/standard/gui/formstandardcategorydetails.ui \ services/standard/gui/formstandardimportexport.ui \ services/standard/gui/standardfeeddetails.ui \ diff --git a/src/librssguard/services/abstract/gui/formfeeddetails.cpp b/src/librssguard/services/abstract/gui/formfeeddetails.cpp index b313778fd..bf6b54cd0 100644 --- a/src/librssguard/services/abstract/gui/formfeeddetails.cpp +++ b/src/librssguard/services/abstract/gui/formfeeddetails.cpp @@ -27,10 +27,6 @@ FormFeedDetails::FormFeedDetails(ServiceRoot* service_root, QWidget* parent) m_serviceRoot(service_root) { initialize(); createConnections(); - - // Initialize that shit. - onUsernameChanged(QString()); - onPasswordChanged(QString()); } int FormFeedDetails::editBaseFeed(Feed* input_feed) { @@ -52,9 +48,6 @@ void FormFeedDetails::apply() { Feed new_feed; // Setup data for new_feed. - new_feed.setPasswordProtected(m_ui->m_gbAuthentication->isChecked()); - new_feed.setUsername(m_ui->m_txtUsername->lineEdit()->text()); - new_feed.setPassword(m_ui->m_txtPassword->lineEdit()->text()); new_feed.setAutoUpdateType(static_cast(m_ui->m_cmbAutoUpdateType->itemData( m_ui->m_cmbAutoUpdateType->currentIndex()).toInt())); new_feed.setAutoUpdateInitialInterval(int(m_ui->m_spinAutoUpdateInterval->value())); @@ -77,33 +70,6 @@ void FormFeedDetails::apply() { } } -void FormFeedDetails::onUsernameChanged(const QString& new_username) { - bool is_username_ok = !m_ui->m_gbAuthentication->isChecked() || !new_username.simplified().isEmpty(); - - m_ui->m_txtUsername->setStatus(is_username_ok ? - LineEditWithStatus::StatusType::Ok : - LineEditWithStatus::StatusType::Warning, - is_username_ok ? - tr("Username is ok or it is not needed.") : - tr("Username is empty.")); -} - -void FormFeedDetails::onPasswordChanged(const QString& new_password) { - bool is_password_ok = !m_ui->m_gbAuthentication->isChecked() || !new_password.simplified().isEmpty(); - - m_ui->m_txtPassword->setStatus(is_password_ok ? - LineEditWithStatus::StatusType::Ok : - LineEditWithStatus::StatusType::Warning, - is_password_ok ? - tr("Password is ok or it is not needed.") : - tr("Password is empty.")); -} - -void FormFeedDetails::onAuthenticationSwitched() { - onUsernameChanged(m_ui->m_txtUsername->lineEdit()->text()); - onPasswordChanged(m_ui->m_txtPassword->lineEdit()->text()); -} - void FormFeedDetails::onAutoUpdateTypeChanged(int new_index) { Feed::AutoUpdateType auto_update_type = static_cast(m_ui->m_cmbAutoUpdateType->itemData(new_index).toInt()); @@ -121,9 +87,6 @@ void FormFeedDetails::onAutoUpdateTypeChanged(int new_index) { void FormFeedDetails::createConnections() { // General connections. connect(m_ui->m_buttonBox, &QDialogButtonBox::accepted, this, &FormFeedDetails::apply); - connect(m_ui->m_txtUsername->lineEdit(), &BaseLineEdit::textChanged, this, &FormFeedDetails::onUsernameChanged); - connect(m_ui->m_txtPassword->lineEdit(), &BaseLineEdit::textChanged, this, &FormFeedDetails::onPasswordChanged); - connect(m_ui->m_gbAuthentication, &QGroupBox::toggled, this, &FormFeedDetails::onAuthenticationSwitched); connect(m_ui->m_cmbAutoUpdateType, static_cast(&QComboBox::currentIndexChanged), this, &FormFeedDetails::onAutoUpdateTypeChanged); } @@ -133,10 +96,6 @@ void FormFeedDetails::setEditableFeed(Feed* editable_feed) { m_editableFeed = editable_feed; - m_ui->m_gbAuthentication->setChecked(editable_feed->passwordProtected()); - m_ui->m_txtUsername->lineEdit()->setText(editable_feed->username()); - m_ui->m_txtPassword->lineEdit()->setText(editable_feed->password()); - m_ui->m_cmbAutoUpdateType->setCurrentIndex(m_ui->m_cmbAutoUpdateType->findData(QVariant::fromValue((int) editable_feed->autoUpdateType()))); m_ui->m_spinAutoUpdateInterval->setValue(editable_feed->autoUpdateInitialInterval()); } @@ -149,12 +108,6 @@ void FormFeedDetails::initialize() { setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint | Qt::WindowTitleHint); setWindowIcon(qApp->icons()->fromTheme(QSL("application-rss+xml"))); - // Set text boxes. - m_ui->m_txtUsername->lineEdit()->setPlaceholderText(tr("Username")); - m_ui->m_txtUsername->lineEdit()->setToolTip(tr("Set username to access the feed.")); - m_ui->m_txtPassword->lineEdit()->setPlaceholderText(tr("Password")); - m_ui->m_txtPassword->lineEdit()->setToolTip(tr("Set password to access the feed.")); - // Setup auto-update options. m_ui->m_spinAutoUpdateInterval->setValue(DEFAULT_AUTO_UPDATE_INTERVAL); m_ui->m_cmbAutoUpdateType->addItem(tr("Auto-update using global interval"), diff --git a/src/librssguard/services/abstract/gui/formfeeddetails.h b/src/librssguard/services/abstract/gui/formfeeddetails.h index 15345b832..245080778 100644 --- a/src/librssguard/services/abstract/gui/formfeeddetails.h +++ b/src/librssguard/services/abstract/gui/formfeeddetails.h @@ -35,9 +35,6 @@ class FormFeedDetails : public QDialog { // base implementation must be called first. virtual void apply(); - void onUsernameChanged(const QString& new_username); - void onPasswordChanged(const QString& new_password); - void onAuthenticationSwitched(); void onAutoUpdateTypeChanged(int new_index); protected: diff --git a/src/librssguard/services/abstract/gui/formfeeddetails.ui b/src/librssguard/services/abstract/gui/formfeeddetails.ui index a73d022bc..c04c0a4a6 100644 --- a/src/librssguard/services/abstract/gui/formfeeddetails.ui +++ b/src/librssguard/services/abstract/gui/formfeeddetails.ui @@ -54,60 +54,6 @@ - - - Network - - - - - - Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported. - - - Requires HTTP authentication - - - false - - - true - - - false - - - - - - Username - - - m_txtUsername - - - - - - - - - - Password - - - m_txtPassword - - - - - - - - - - - @@ -126,12 +72,6 @@ - - LineEditWithStatus - QWidget -
lineeditwithstatus.h
- 1 - TimeSpinBox QDoubleSpinBox diff --git a/src/librssguard/services/standard/gui/authenticationdetails.cpp b/src/librssguard/services/standard/gui/authenticationdetails.cpp new file mode 100755 index 000000000..08bf3cd4f --- /dev/null +++ b/src/librssguard/services/standard/gui/authenticationdetails.cpp @@ -0,0 +1,47 @@ +// For license of this file, see /LICENSE.md. + +#include "services/standard/gui/authenticationdetails.h" + +AuthenticationDetails::AuthenticationDetails(QWidget* parent) : QWidget(parent) { + ui.setupUi(this); + + // Set text boxes. + ui.m_txtUsername->lineEdit()->setPlaceholderText(tr("Username")); + ui.m_txtUsername->lineEdit()->setToolTip(tr("Set username to access the feed.")); + ui.m_txtPassword->lineEdit()->setPlaceholderText(tr("Password")); + ui.m_txtPassword->lineEdit()->setToolTip(tr("Set password to access the feed.")); + + connect(ui.m_txtUsername->lineEdit(), &BaseLineEdit::textChanged, this, &AuthenticationDetails::onUsernameChanged); + connect(ui.m_txtPassword->lineEdit(), &BaseLineEdit::textChanged, this, &AuthenticationDetails::onPasswordChanged); + connect(ui.m_gbAuthentication, &QGroupBox::toggled, this, &AuthenticationDetails::onAuthenticationSwitched); + + onUsernameChanged(QString()); + onPasswordChanged(QString()); +} + +void AuthenticationDetails::onUsernameChanged(const QString& new_username) { + bool is_username_ok = !ui.m_gbAuthentication->isChecked() || !new_username.simplified().isEmpty(); + + ui.m_txtUsername->setStatus(is_username_ok ? + LineEditWithStatus::StatusType::Ok : + LineEditWithStatus::StatusType::Warning, + is_username_ok ? + tr("Username is ok or it is not needed.") : + tr("Username is empty.")); +} + +void AuthenticationDetails::onPasswordChanged(const QString& new_password) { + bool is_password_ok = !ui.m_gbAuthentication->isChecked() || !new_password.simplified().isEmpty(); + + ui.m_txtPassword->setStatus(is_password_ok ? + LineEditWithStatus::StatusType::Ok : + LineEditWithStatus::StatusType::Warning, + is_password_ok ? + tr("Password is ok or it is not needed.") : + tr("Password is empty.")); +} + +void AuthenticationDetails::onAuthenticationSwitched() { + onUsernameChanged(ui.m_txtUsername->lineEdit()->text()); + onPasswordChanged(ui.m_txtPassword->lineEdit()->text()); +} diff --git a/src/librssguard/services/standard/gui/authenticationdetails.h b/src/librssguard/services/standard/gui/authenticationdetails.h new file mode 100755 index 000000000..788ec28df --- /dev/null +++ b/src/librssguard/services/standard/gui/authenticationdetails.h @@ -0,0 +1,27 @@ +// For license of this file, see /LICENSE.md. + +#ifndef AUTHENTICATIONDETAILS_H +#define AUTHENTICATIONDETAILS_H + +#include + +#include "ui_authenticationdetails.h" + +class AuthenticationDetails : public QWidget { + Q_OBJECT + + friend class FormStandardFeedDetails; + + public: + explicit AuthenticationDetails(QWidget* parent = nullptr); + + private slots: + void onUsernameChanged(const QString& new_username); + void onPasswordChanged(const QString& new_password); + void onAuthenticationSwitched(); + + private: + Ui::AuthenticationDetails ui; +}; + +#endif // AUTHENTICATIONDETAILS_H diff --git a/src/librssguard/services/standard/gui/authenticationdetails.ui b/src/librssguard/services/standard/gui/authenticationdetails.ui new file mode 100755 index 000000000..e25245d80 --- /dev/null +++ b/src/librssguard/services/standard/gui/authenticationdetails.ui @@ -0,0 +1,76 @@ + + + AuthenticationDetails + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + + Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported. + + + Requires HTTP authentication + + + false + + + true + + + false + + + + + + Username + + + m_txtUsername + + + + + + + + + + Password + + + m_txtPassword + + + + + + + + + + + + + + LineEditWithStatus + QWidget +
lineeditwithstatus.h
+ 1 + + + + + diff --git a/src/librssguard/services/standard/gui/formstandardfeeddetails.cpp b/src/librssguard/services/standard/gui/formstandardfeeddetails.cpp index b9173750a..0a2d68447 100644 --- a/src/librssguard/services/standard/gui/formstandardfeeddetails.cpp +++ b/src/librssguard/services/standard/gui/formstandardfeeddetails.cpp @@ -7,6 +7,7 @@ #include "network-web/networkfactory.h" #include "services/abstract/category.h" #include "services/abstract/serviceroot.h" +#include "services/standard/gui/authenticationdetails.h" #include "services/standard/gui/standardfeeddetails.h" #include "services/standard/standardfeed.h" @@ -14,8 +15,10 @@ #include FormStandardFeedDetails::FormStandardFeedDetails(ServiceRoot* service_root, QWidget* parent) - : FormFeedDetails(service_root, parent), m_standardFeedDetails(new StandardFeedDetails(this)) { + : FormFeedDetails(service_root, parent), m_standardFeedDetails(new StandardFeedDetails(this)), + m_authDetails(new AuthenticationDetails(this)) { insertCustomTab(m_standardFeedDetails, tr("General"), 0); + insertCustomTab(m_authDetails, tr("Network"), 2); activateTab(0); connect(m_standardFeedDetails->ui.m_btnFetchMetadata, &QPushButton::clicked, this, &FormStandardFeedDetails::guessFeed); @@ -41,14 +44,14 @@ int FormStandardFeedDetails::addEditFeed(Feed* input_feed, RootItem* parent_to_s void FormStandardFeedDetails::guessFeed() { m_standardFeedDetails->guessFeed(m_standardFeedDetails->ui.m_txtUrl->lineEdit()->text(), - m_ui->m_txtUsername->lineEdit()->text(), - m_ui->m_txtPassword->lineEdit()->text()); + m_authDetails->ui.m_txtUsername->lineEdit()->text(), + m_authDetails->ui.m_txtPassword->lineEdit()->text()); } void FormStandardFeedDetails::guessIconOnly() { m_standardFeedDetails->guessIconOnly(m_standardFeedDetails->ui.m_txtUrl->lineEdit()->text(), - m_ui->m_txtUsername->lineEdit()->text(), - m_ui->m_txtPassword->lineEdit()->text()); + m_authDetails->ui.m_txtUsername->lineEdit()->text(), + m_authDetails->ui.m_txtPassword->lineEdit()->text()); } void FormStandardFeedDetails::apply() { @@ -68,9 +71,9 @@ void FormStandardFeedDetails::apply() { new_feed->setEncoding(m_standardFeedDetails->ui.m_cmbEncoding->currentText()); new_feed->setType(type); new_feed->setUrl(m_standardFeedDetails->ui.m_txtUrl->lineEdit()->text()); - new_feed->setPasswordProtected(m_ui->m_gbAuthentication->isChecked()); - new_feed->setUsername(m_ui->m_txtUsername->lineEdit()->text()); - new_feed->setPassword(m_ui->m_txtPassword->lineEdit()->text()); + new_feed->setPasswordProtected(m_authDetails->ui.m_gbAuthentication->isChecked()); + new_feed->setUsername(m_authDetails->ui.m_txtUsername->lineEdit()->text()); + new_feed->setPassword(m_authDetails->ui.m_txtPassword->lineEdit()->text()); new_feed->setAutoUpdateType(static_cast(m_ui->m_cmbAutoUpdateType->itemData( m_ui->m_cmbAutoUpdateType->currentIndex()).toInt())); new_feed->setAutoUpdateInitialInterval(int(m_ui->m_spinAutoUpdateInterval->value())); @@ -110,5 +113,9 @@ void FormStandardFeedDetails::apply() { void FormStandardFeedDetails::setEditableFeed(Feed* editable_feed) { FormFeedDetails::setEditableFeed(editable_feed); + m_standardFeedDetails->setExistingFeed(qobject_cast(editable_feed)); + m_authDetails->ui.m_gbAuthentication->setChecked(editable_feed->passwordProtected()); + m_authDetails->ui.m_txtUsername->lineEdit()->setText(editable_feed->username()); + m_authDetails->ui.m_txtPassword->lineEdit()->setText(editable_feed->password()); } diff --git a/src/librssguard/services/standard/gui/formstandardfeeddetails.h b/src/librssguard/services/standard/gui/formstandardfeeddetails.h index 3edfa031e..b47db73e2 100644 --- a/src/librssguard/services/standard/gui/formstandardfeeddetails.h +++ b/src/librssguard/services/standard/gui/formstandardfeeddetails.h @@ -6,6 +6,7 @@ #include "services/abstract/gui/formfeeddetails.h" class StandardFeedDetails; +class AuthenticationDetails; class FormStandardFeedDetails : public FormFeedDetails { Q_OBJECT @@ -27,6 +28,7 @@ class FormStandardFeedDetails : public FormFeedDetails { private: StandardFeedDetails* m_standardFeedDetails; + AuthenticationDetails* m_authDetails; }; #endif // FORMSSFEEDDETAILS_H