From c7fc631f4c3b3cd76a246cb03df58691bad7ccf1 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 6 Aug 2021 08:23:30 +0200 Subject: [PATCH] work on mergin inoreader to greader, better password text boxes --- .../desktop/com.github.rssguard.appdata.xml | 2 +- resources/icons.qrc | 11 ++++-- resources/scripts/generate-used-icons.sh | 0 src/librssguard/gui/reusable/baselineedit.cpp | 34 ++++++++++++++++++- src/librssguard/gui/reusable/baselineedit.h | 7 ++-- .../gui/reusable/networkproxydetails.cpp | 14 ++------ .../gui/reusable/networkproxydetails.h | 1 - .../gui/reusable/networkproxydetails.ui | 12 +------ .../gui/settings/settingsdatabase.cpp | 10 +++--- .../gui/settings/settingsdatabase.h | 1 - .../gui/settings/settingsdatabase.ui | 12 +------ .../abstract/gui/authenticationdetails.cpp | 1 + .../services/greader/greaderentrypoint.cpp | 4 +-- .../services/greader/greaderserviceroot.cpp | 11 ++++-- .../greader/gui/greaderaccountdetails.cpp | 10 ++---- .../greader/gui/greaderaccountdetails.h | 1 - .../greader/gui/greaderaccountdetails.ui | 8 ----- .../owncloud/gui/owncloudaccountdetails.cpp | 10 ++---- .../owncloud/gui/owncloudaccountdetails.h | 1 - .../owncloud/gui/owncloudaccountdetails.ui | 14 ++------ .../tt-rss/gui/ttrssaccountdetails.cpp | 21 +++--------- .../services/tt-rss/gui/ttrssaccountdetails.h | 2 -- .../tt-rss/gui/ttrssaccountdetails.ui | 20 ++--------- 23 files changed, 83 insertions(+), 124 deletions(-) mode change 100644 => 100755 resources/scripts/generate-used-icons.sh diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml index 1bfeefda5..3ccd069a1 100644 --- a/resources/desktop/com.github.rssguard.appdata.xml +++ b/resources/desktop/com.github.rssguard.appdata.xml @@ -30,7 +30,7 @@ https://martinrotter.github.io/donate/ - + none diff --git a/resources/icons.qrc b/resources/icons.qrc index 811907bc8..b0c0a5459 100644 --- a/resources/icons.qrc +++ b/resources/icons.qrc @@ -1,5 +1,7 @@ + ./docs/images/rssguard.png + ./docs/videos/rssguard.gif ./graphics/Faenza/actions/64/application-exit.png ./graphics/Faenza/actions/64/back.png ./graphics/Faenza/actions/64/call-start.png @@ -8,7 +10,6 @@ ./graphics/Faenza/actions/64/document-edit.png ./graphics/Faenza/actions/64/document-export.png ./graphics/Faenza/actions/64/document-import.png - ./graphics/Faenza/actions/64/document-new.png ./graphics/Faenza/actions/64/document-open.png ./graphics/Faenza/actions/64/document-properties.png ./graphics/Faenza/actions/64/document-revert.png @@ -68,6 +69,7 @@ ./graphics/Faenza/places/64/user-trash.png ./graphics/Faenza/status/64/dialog-error.png ./graphics/Faenza/status/64/dialog-information.png + ./graphics/Faenza/status/64/dialog-password.png ./graphics/Faenza/status/64/dialog-question.png ./graphics/Faenza/status/64/dialog-warning.png ./graphics/Numix/22/actions/application-exit.svg @@ -78,7 +80,6 @@ ./graphics/Numix/22/actions/document-edit.svg ./graphics/Numix/22/actions/document-export.svg ./graphics/Numix/22/actions/document-import.svg - ./graphics/Numix/22/actions/document-new.svg ./graphics/Numix/22/actions/document-open.svg ./graphics/Numix/22/actions/document-properties.svg ./graphics/Numix/22/actions/document-revert.svg @@ -140,8 +141,14 @@ ./graphics/Numix/22/places/user-trash.svg ./graphics/Numix/22/status/dialog-error.svg ./graphics/Numix/22/status/dialog-information.svg + ./graphics/Numix/22/status/dialog-password.svg ./graphics/Numix/22/status/dialog-question.svg ./graphics/Numix/22/status/dialog-warning.svg ./graphics/Numix/index.theme + ./graphics/original_sizes/rssguard.png + ./graphics/rssguard.ico + ./graphics/rssguard.png + ./macosx/rssguard.icns + ./rssguard.qrc \ No newline at end of file diff --git a/resources/scripts/generate-used-icons.sh b/resources/scripts/generate-used-icons.sh old mode 100644 new mode 100755 diff --git a/src/librssguard/gui/reusable/baselineedit.cpp b/src/librssguard/gui/reusable/baselineedit.cpp index 9f2073290..fb7bcc286 100755 --- a/src/librssguard/gui/reusable/baselineedit.cpp +++ b/src/librssguard/gui/reusable/baselineedit.cpp @@ -2,12 +2,44 @@ #include "gui/reusable/baselineedit.h" +#include "miscellaneous/application.h" +#include "miscellaneous/iconfactory.h" + +#include #include -BaseLineEdit::BaseLineEdit(QWidget* parent) : QLineEdit(parent) { +BaseLineEdit::BaseLineEdit(QWidget* parent) + : QLineEdit(parent), m_actShowPassword(new QAction(qApp->icons()->fromTheme(QSL("dialog-password")), + tr("Show/hide the password"), + this)) { + + connect(m_actShowPassword, &QAction::triggered, this, [this]() { + setEchoMode(echoMode() == QLineEdit::EchoMode::Password + ? QLineEdit::EchoMode::Normal + : QLineEdit::EchoMode::Password); + }); + connect(this, &QLineEdit::textChanged, this, [this](const QString& text) { + if (actions().contains(m_actShowPassword)) { + m_actShowPassword->setVisible(!text.isEmpty()); + } + }); + setClearButtonEnabled(true); } +void BaseLineEdit::setPasswordMode(bool is_password) { + if (is_password) { + setEchoMode(QLineEdit::EchoMode::Password); + addAction(m_actShowPassword, QLineEdit::ActionPosition::LeadingPosition); + } + else { + setEchoMode(QLineEdit::EchoMode::Normal); + removeAction(m_actShowPassword); + } + + emit textChanged(text()); +} + void BaseLineEdit::submit(const QString& text) { setText(text); emit submitted(text); diff --git a/src/librssguard/gui/reusable/baselineedit.h b/src/librssguard/gui/reusable/baselineedit.h index 2c1bc2572..a899b921b 100755 --- a/src/librssguard/gui/reusable/baselineedit.h +++ b/src/librssguard/gui/reusable/baselineedit.h @@ -12,6 +12,8 @@ class BaseLineEdit : public QLineEdit { explicit BaseLineEdit(QWidget* parent = nullptr); virtual ~BaseLineEdit() = default; + void setPasswordMode(bool is_password); + public slots: void submit(const QString& text); @@ -19,9 +21,10 @@ class BaseLineEdit : public QLineEdit { void keyPressEvent(QKeyEvent* event); signals: - - // Emitted if user hits ENTER button. void submitted(const QString& text); + + private: + QAction* m_actShowPassword; }; #endif // BASELINEEDIT_H diff --git a/src/librssguard/gui/reusable/networkproxydetails.cpp b/src/librssguard/gui/reusable/networkproxydetails.cpp index 4fbaef85c..6c93ac45f 100755 --- a/src/librssguard/gui/reusable/networkproxydetails.cpp +++ b/src/librssguard/gui/reusable/networkproxydetails.cpp @@ -10,17 +10,16 @@ NetworkProxyDetails::NetworkProxyDetails(QWidget* parent) : QWidget(parent) { m_ui.setupUi(this); GuiUtilities::setLabelAsNotice(*m_ui.m_lblProxyInfo, false); + m_ui.m_txtProxyPassword->setPasswordMode(true); + connect(m_ui.m_cmbProxyType, static_cast(&QComboBox::currentIndexChanged), this, &NetworkProxyDetails::onProxyTypeChanged); - connect(m_ui.m_checkShowPassword, &QCheckBox::stateChanged, this, &NetworkProxyDetails::displayProxyPassword); m_ui.m_cmbProxyType->addItem(tr("No proxy"), QNetworkProxy::ProxyType::NoProxy); m_ui.m_cmbProxyType->addItem(tr("System proxy"), QNetworkProxy::ProxyType::DefaultProxy); m_ui.m_cmbProxyType->addItem(tr("Socks5"), QNetworkProxy::ProxyType::Socks5Proxy); m_ui.m_cmbProxyType->addItem(tr("Http"), QNetworkProxy::ProxyType::HttpProxy); - displayProxyPassword(Qt::CheckState::Unchecked); - connect(m_ui.m_cmbProxyType, static_cast(&QComboBox::currentIndexChanged), this, &NetworkProxyDetails::changed); connect(m_ui.m_txtProxyHost, &QLineEdit::textChanged, this, &NetworkProxyDetails::changed); @@ -48,15 +47,6 @@ void NetworkProxyDetails::setProxy(const QNetworkProxy& proxy) { m_ui.m_txtProxyPassword->setText(proxy.password()); } -void NetworkProxyDetails::displayProxyPassword(int state) { - if (state == Qt::CheckState::Checked) { - m_ui.m_txtProxyPassword->setEchoMode(QLineEdit::EchoMode::Normal); - } - else { - m_ui.m_txtProxyPassword->setEchoMode(QLineEdit::EchoMode::Password); - } -} - void NetworkProxyDetails::onProxyTypeChanged(int index) { const QNetworkProxy::ProxyType selected_type = static_cast(m_ui.m_cmbProxyType->itemData(index).toInt()); const bool is_proxy_selected = selected_type != QNetworkProxy::ProxyType::NoProxy && diff --git a/src/librssguard/gui/reusable/networkproxydetails.h b/src/librssguard/gui/reusable/networkproxydetails.h index 8875042e0..a790627a3 100755 --- a/src/librssguard/gui/reusable/networkproxydetails.h +++ b/src/librssguard/gui/reusable/networkproxydetails.h @@ -22,7 +22,6 @@ class NetworkProxyDetails : public QWidget { void changed(); private slots: - void displayProxyPassword(int state); void onProxyTypeChanged(int index); private: diff --git a/src/librssguard/gui/reusable/networkproxydetails.ui b/src/librssguard/gui/reusable/networkproxydetails.ui index c57d92ffa..4d883730d 100755 --- a/src/librssguard/gui/reusable/networkproxydetails.ui +++ b/src/librssguard/gui/reusable/networkproxydetails.ui @@ -119,17 +119,7 @@ - - - - true - - - Display password - - - - + Note that these settings are applied only on newly established connections. diff --git a/src/librssguard/gui/settings/settingsdatabase.cpp b/src/librssguard/gui/settings/settingsdatabase.cpp index 500386f07..7c904c4d4 100644 --- a/src/librssguard/gui/settings/settingsdatabase.cpp +++ b/src/librssguard/gui/settings/settingsdatabase.cpp @@ -11,9 +11,13 @@ SettingsDatabase::SettingsDatabase(Settings* settings, QWidget* parent) : SettingsPanel(settings, parent), m_ui(new Ui::SettingsDatabase) { m_ui->setupUi(this); + GuiUtilities::setLabelAsNotice(*m_ui->m_lblDataStorageWarning, true); GuiUtilities::setLabelAsNotice(*m_ui->m_lblMysqlInfo, false); GuiUtilities::setLabelAsNotice(*m_ui->m_lblSqliteInMemoryWarnings, true); + + m_ui->m_txtMysqlPassword->lineEdit()->setPasswordMode(true); + connect(m_ui->m_cmbDatabaseDriver, static_cast(&QComboBox::currentIndexChanged), this, &SettingsDatabase::dirtifySettings); connect(m_ui->m_checkSqliteUseInMemoryDatabase, &QCheckBox::toggled, this, &SettingsDatabase::dirtifySettings); @@ -25,7 +29,6 @@ SettingsDatabase::SettingsDatabase(Settings* settings, QWidget* parent) connect(m_ui->m_spinMysqlPort, static_cast(&QSpinBox::valueChanged), this, &SettingsDatabase::dirtifySettings); connect(m_ui->m_cmbDatabaseDriver, static_cast(&QComboBox::currentIndexChanged), this, &SettingsDatabase::selectSqlBackend); - connect(m_ui->m_checkMysqlShowPassword, &QCheckBox::toggled, this, &SettingsDatabase::switchMysqlPasswordVisiblity); connect(m_ui->m_txtMysqlUsername->lineEdit(), &BaseLineEdit::textChanged, this, &SettingsDatabase::onMysqlUsernameChanged); connect(m_ui->m_txtMysqlHostname->lineEdit(), &BaseLineEdit::textChanged, this, &SettingsDatabase::onMysqlHostnameChanged); connect(m_ui->m_txtMysqlPassword->lineEdit(), &BaseLineEdit::textChanged, this, &SettingsDatabase::onMysqlPasswordChanged); @@ -118,10 +121,6 @@ void SettingsDatabase::selectSqlBackend(int index) { } } -void SettingsDatabase::switchMysqlPasswordVisiblity(bool visible) { - m_ui->m_txtMysqlPassword->lineEdit()->setEchoMode(visible ? QLineEdit::Normal : QLineEdit::Password); -} - void SettingsDatabase::loadSettings() { onBeginLoadSettings(); m_ui->m_checkUseTransactions->setChecked(qApp->settings()->value(GROUP(Database), SETTING(Database::UseTransactions)).toBool()); @@ -158,7 +157,6 @@ void SettingsDatabase::loadSettings() { SETTING(Database::MySQLPassword)).toString()); m_ui->m_txtMysqlDatabase->lineEdit()->setText(settings()->value(GROUP(Database), SETTING(Database::MySQLDatabase)).toString()); m_ui->m_spinMysqlPort->setValue(settings()->value(GROUP(Database), SETTING(Database::MySQLPort)).toInt()); - m_ui->m_checkMysqlShowPassword->setChecked(false); } int index_current_backend = m_ui->m_cmbDatabaseDriver->findData(settings()->value(GROUP(Database), diff --git a/src/librssguard/gui/settings/settingsdatabase.h b/src/librssguard/gui/settings/settingsdatabase.h index 91ab502b5..a5b655af9 100644 --- a/src/librssguard/gui/settings/settingsdatabase.h +++ b/src/librssguard/gui/settings/settingsdatabase.h @@ -25,7 +25,6 @@ class SettingsDatabase : public SettingsPanel { void onMysqlPasswordChanged(const QString& new_password); void onMysqlDatabaseChanged(const QString& new_database); void selectSqlBackend(int index); - void switchMysqlPasswordVisiblity(bool visible); Ui::SettingsDatabase* m_ui; }; diff --git a/src/librssguard/gui/settings/settingsdatabase.ui b/src/librssguard/gui/settings/settingsdatabase.ui index aea3c9b31..c7ae81c70 100644 --- a/src/librssguard/gui/settings/settingsdatabase.ui +++ b/src/librssguard/gui/settings/settingsdatabase.ui @@ -221,16 +221,6 @@ Authors of this application are NOT responsible for lost data. - - - &Show password - - - true - - - - @@ -257,7 +247,7 @@ Authors of this application are NOT responsible for lost data. - + Note that speed of used MySQL server and latency of used connection medium HEAVILY influences the final performance of this application. Using slow database connections leads to bad performance when browsing feeds or messages. diff --git a/src/librssguard/services/abstract/gui/authenticationdetails.cpp b/src/librssguard/services/abstract/gui/authenticationdetails.cpp index a47c87a7b..7c2ac7d87 100755 --- a/src/librssguard/services/abstract/gui/authenticationdetails.cpp +++ b/src/librssguard/services/abstract/gui/authenticationdetails.cpp @@ -6,6 +6,7 @@ AuthenticationDetails::AuthenticationDetails(QWidget* parent) : QWidget(parent) setupUi(this); // Set text boxes. + m_txtPassword->lineEdit()->setPasswordMode(true); m_txtUsername->lineEdit()->setPlaceholderText(tr("Username")); m_txtUsername->lineEdit()->setToolTip(tr("Set username to access the feed.")); m_txtPassword->lineEdit()->setPlaceholderText(tr("Password")); diff --git a/src/librssguard/services/greader/greaderentrypoint.cpp b/src/librssguard/services/greader/greaderentrypoint.cpp index 8916c7d0a..423aad2b1 100755 --- a/src/librssguard/services/greader/greaderentrypoint.cpp +++ b/src/librssguard/services/greader/greaderentrypoint.cpp @@ -31,8 +31,8 @@ QString GreaderEntryPoint::code() const { } QString GreaderEntryPoint::description() const { - return QObject::tr("Google Reader API is used by many online RSS readers. This is here to support") + - QSL(" Inoreader, FreshRSS, Bazqux, TheOldReader, Reedah, ..."); + return QObject::tr("Google Reader API is used by many online RSS readers.\n\nList of supported readers:") + + QSL(" Inoreader, FreshRSS, Bazqux, TheOldReader, Reedah and possibly others."); } QString GreaderEntryPoint::author() const { diff --git a/src/librssguard/services/greader/greaderserviceroot.cpp b/src/librssguard/services/greader/greaderserviceroot.cpp index 26ad8a2d1..6d9b4db7a 100755 --- a/src/librssguard/services/greader/greaderserviceroot.cpp +++ b/src/librssguard/services/greader/greaderserviceroot.cpp @@ -12,6 +12,7 @@ #include "network-web/oauth2service.h" #include "services/abstract/importantnode.h" #include "services/abstract/recyclebin.h" +#include "services/greader/definitions.h" #include "services/greader/greaderentrypoint.h" #include "services/greader/greadernetwork.h" #include "services/greader/gui/formeditgreaderaccount.h" @@ -43,7 +44,6 @@ QVariantHash GreaderServiceRoot::customDatabaseData() const { data["service"] = int(m_network->service()); data["username"] = m_network->username(); data["password"] = TextFactory::encrypt(m_network->password()); - data["url"] = m_network->baseUrl(); data["batch_size"] = m_network->batchSize(); data["download_only_unread"] = m_network->downloadOnlyUnreadMessages(); data["intelligent_synchronization"] = m_network->intelligentSynchronization(); @@ -54,6 +54,9 @@ QVariantHash GreaderServiceRoot::customDatabaseData() const { data["refresh_token"] = m_network->oauth()->refreshToken(); data["redirect_uri"] = m_network->oauth()->redirectUrl(); } + else { + data["url"] = m_network->baseUrl(); + } return data; } @@ -62,7 +65,6 @@ void GreaderServiceRoot::setCustomDatabaseData(const QVariantHash& data) { m_network->setService(GreaderServiceRoot::Service(data["service"].toInt())); m_network->setUsername(data["username"].toString()); m_network->setPassword(TextFactory::decrypt(data["password"].toString())); - m_network->setBaseUrl(data["url"].toString()); m_network->setBatchSize(data["batch_size"].toInt()); m_network->setDownloadOnlyUnreadMessages(data["download_only_unread"].toBool()); m_network->setIntelligentSynchronization(data["intelligent_synchronization"].toBool()); @@ -72,6 +74,11 @@ void GreaderServiceRoot::setCustomDatabaseData(const QVariantHash& data) { m_network->oauth()->setClientSecret(data["client_secret"].toString()); m_network->oauth()->setRefreshToken(data["refresh_token"].toString()); m_network->oauth()->setRedirectUrl(data["redirect_uri"].toString(), true); + + m_network->setBaseUrl(QSL(GREADER_URL_INOREADER)); + } + else { + m_network->setBaseUrl(data["url"].toString()); } } diff --git a/src/librssguard/services/greader/gui/greaderaccountdetails.cpp b/src/librssguard/services/greader/gui/greaderaccountdetails.cpp index a5775cbaa..98898224a 100755 --- a/src/librssguard/services/greader/gui/greaderaccountdetails.cpp +++ b/src/librssguard/services/greader/gui/greaderaccountdetails.cpp @@ -28,6 +28,7 @@ GreaderAccountDetails::GreaderAccountDetails(QWidget* parent) : QWidget(parent), } m_ui.m_lblTestResult->label()->setWordWrap(true); + m_ui.m_txtPassword->lineEdit()->setPasswordMode(true); m_ui.m_txtPassword->lineEdit()->setPlaceholderText(tr("Password for your account")); m_ui.m_txtUsername->lineEdit()->setPlaceholderText(tr("Username for your account")); m_ui.m_txtUrl->lineEdit()->setPlaceholderText(tr("URL of your server, without any service-specific path")); @@ -60,7 +61,6 @@ GreaderAccountDetails::GreaderAccountDetails(QWidget* parent) : QWidget(parent), GuiUtilities::setLabelAsNotice(*m_ui.m_lblInfo, true); - connect(m_ui.m_checkShowPassword, &QCheckBox::toggled, this, &GreaderAccountDetails::displayPassword); connect(m_ui.m_txtPassword->lineEdit(), &BaseLineEdit::textChanged, this, &GreaderAccountDetails::onPasswordChanged); connect(m_ui.m_txtUsername->lineEdit(), &BaseLineEdit::textChanged, this, &GreaderAccountDetails::onUsernameChanged); connect(m_ui.m_txtUrl->lineEdit(), &BaseLineEdit::textChanged, this, &GreaderAccountDetails::onUrlChanged); @@ -77,8 +77,7 @@ GreaderAccountDetails::GreaderAccountDetails(QWidget* parent) : QWidget(parent), setTabOrder(m_ui.m_cbNewAlgorithm, m_ui.m_spinLimitMessages); setTabOrder(m_ui.m_spinLimitMessages, m_ui.m_txtUsername->lineEdit()); setTabOrder(m_ui.m_txtUsername->lineEdit(), m_ui.m_txtPassword->lineEdit()); - setTabOrder(m_ui.m_txtPassword->lineEdit(), m_ui.m_checkShowPassword); - setTabOrder(m_ui.m_checkShowPassword, m_ui.m_txtAppId); + setTabOrder(m_ui.m_txtPassword->lineEdit(), m_ui.m_txtAppId); setTabOrder(m_ui.m_txtAppId, m_ui.m_txtAppKey); setTabOrder(m_ui.m_txtAppKey, m_ui.m_txtRedirectUrl); setTabOrder(m_ui.m_txtRedirectUrl, m_ui.m_btnRegisterApi); @@ -87,7 +86,6 @@ GreaderAccountDetails::GreaderAccountDetails(QWidget* parent) : QWidget(parent), onPasswordChanged(); onUsernameChanged(); onUrlChanged(); - displayPassword(false); emit m_ui.m_txtAppId->lineEdit()->textChanged(m_ui.m_txtAppId->lineEdit()->text()); emit m_ui.m_txtAppKey->lineEdit()->textChanged(m_ui.m_txtAppKey->lineEdit()->text()); @@ -165,10 +163,6 @@ void GreaderAccountDetails::setService(GreaderServiceRoot::Service service) { m_ui.m_cmbService->setCurrentIndex(m_ui.m_cmbService->findData(QVariant::fromValue(service))); } -void GreaderAccountDetails::displayPassword(bool display) { - m_ui.m_txtPassword->lineEdit()->setEchoMode(display ? QLineEdit::Normal : QLineEdit::Password); -} - void GreaderAccountDetails::performTest(const QNetworkProxy& custom_proxy) { m_lastProxy = custom_proxy; diff --git a/src/librssguard/services/greader/gui/greaderaccountdetails.h b/src/librssguard/services/greader/gui/greaderaccountdetails.h index c0e27ad19..8664a90d3 100755 --- a/src/librssguard/services/greader/gui/greaderaccountdetails.h +++ b/src/librssguard/services/greader/gui/greaderaccountdetails.h @@ -25,7 +25,6 @@ class GreaderAccountDetails : public QWidget { void setService(GreaderServiceRoot::Service service); private slots: - void displayPassword(bool display); void performTest(const QNetworkProxy& custom_proxy); void onUsernameChanged(); void onPasswordChanged(); diff --git a/src/librssguard/services/greader/gui/greaderaccountdetails.ui b/src/librssguard/services/greader/gui/greaderaccountdetails.ui index 137a4dc3b..a1fa9a55e 100755 --- a/src/librssguard/services/greader/gui/greaderaccountdetails.ui +++ b/src/librssguard/services/greader/gui/greaderaccountdetails.ui @@ -157,13 +157,6 @@ - - - - Show password - - - @@ -356,7 +349,6 @@ m_cbDownloadOnlyUnreadMessages m_cbNewAlgorithm m_spinLimitMessages - m_checkShowPassword m_btnTestSetup diff --git a/src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp b/src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp index 2b10c4093..5078944dd 100755 --- a/src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp +++ b/src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp @@ -15,6 +15,7 @@ OwnCloudAccountDetails::OwnCloudAccountDetails(QWidget* parent) : QWidget(parent m_ui.m_lblServerSideUpdateInformation->setText(tr("Leaving this option on causes that updates " "of feeds will be probably much slower and may time-out often.")); m_ui.m_txtPassword->lineEdit()->setPlaceholderText(tr("Password for your Nextcloud account")); + m_ui.m_txtPassword->lineEdit()->setPasswordMode(true); m_ui.m_txtUsername->lineEdit()->setPlaceholderText(tr("Username for your Nextcloud account")); m_ui.m_txtUrl->lineEdit()->setPlaceholderText(tr("URL of your Nextcloud server, without any API path")); m_ui.m_lblTestResult->setStatus(WidgetWithStatus::StatusType::Information, @@ -32,7 +33,6 @@ OwnCloudAccountDetails::OwnCloudAccountDetails(QWidget* parent) : QWidget(parent GuiUtilities::setLabelAsNotice(*m_ui.m_lblServerSideUpdateInformation, true); - connect(m_ui.m_checkShowPassword, &QCheckBox::toggled, this, &OwnCloudAccountDetails::displayPassword); connect(m_ui.m_txtPassword->lineEdit(), &BaseLineEdit::textChanged, this, &OwnCloudAccountDetails::onPasswordChanged); connect(m_ui.m_txtUsername->lineEdit(), &BaseLineEdit::textChanged, this, &OwnCloudAccountDetails::onUsernameChanged); connect(m_ui.m_txtUrl->lineEdit(), &BaseLineEdit::textChanged, this, &OwnCloudAccountDetails::onUrlChanged); @@ -42,17 +42,11 @@ OwnCloudAccountDetails::OwnCloudAccountDetails(QWidget* parent) : QWidget(parent setTabOrder(m_ui.m_spinLimitMessages, m_ui.m_checkServerSideUpdate); setTabOrder(m_ui.m_checkServerSideUpdate, m_ui.m_txtUsername->lineEdit()); setTabOrder(m_ui.m_txtUsername->lineEdit(), m_ui.m_txtPassword->lineEdit()); - setTabOrder(m_ui.m_txtPassword->lineEdit(), m_ui.m_checkShowPassword); - setTabOrder(m_ui.m_checkShowPassword, m_ui.m_btnTestSetup); + setTabOrder(m_ui.m_txtPassword->lineEdit(), m_ui.m_btnTestSetup); onPasswordChanged(); onUsernameChanged(); onUrlChanged(); - displayPassword(false); -} - -void OwnCloudAccountDetails::displayPassword(bool display) { - m_ui.m_txtPassword->lineEdit()->setEchoMode(display ? QLineEdit::Normal : QLineEdit::Password); } void OwnCloudAccountDetails::performTest(const QNetworkProxy& custom_proxy) { diff --git a/src/librssguard/services/owncloud/gui/owncloudaccountdetails.h b/src/librssguard/services/owncloud/gui/owncloudaccountdetails.h index ae2ebfd98..8b2293d7b 100755 --- a/src/librssguard/services/owncloud/gui/owncloudaccountdetails.h +++ b/src/librssguard/services/owncloud/gui/owncloudaccountdetails.h @@ -18,7 +18,6 @@ class OwnCloudAccountDetails : public QWidget { explicit OwnCloudAccountDetails(QWidget* parent = nullptr); private slots: - void displayPassword(bool display); void performTest(const QNetworkProxy& custom_proxy); void onUsernameChanged(); void onPasswordChanged(); diff --git a/src/librssguard/services/owncloud/gui/owncloudaccountdetails.ui b/src/librssguard/services/owncloud/gui/owncloudaccountdetails.ui index 9511f66c1..782e554f6 100755 --- a/src/librssguard/services/owncloud/gui/owncloudaccountdetails.ui +++ b/src/librssguard/services/owncloud/gui/owncloudaccountdetails.ui @@ -107,6 +107,9 @@ + + + @@ -120,16 +123,6 @@ - - - - - - - Show password - - - @@ -202,7 +195,6 @@ m_checkDownloadOnlyUnreadMessages m_checkServerSideUpdate m_spinLimitMessages - m_checkShowPassword m_btnTestSetup diff --git a/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.cpp b/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.cpp index 0f1827078..eca03e686 100644 --- a/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.cpp +++ b/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.cpp @@ -29,14 +29,14 @@ TtRssAccountDetails::TtRssAccountDetails(QWidget* parent) : QWidget(parent) { setTabOrder(m_ui.m_spinLimitMessages, m_ui.m_checkServerSideUpdate); setTabOrder(m_ui.m_checkServerSideUpdate, m_ui.m_txtUsername->lineEdit()); setTabOrder(m_ui.m_txtUsername->lineEdit(), m_ui.m_txtPassword->lineEdit()); - setTabOrder(m_ui.m_txtPassword->lineEdit(), m_ui.m_checkShowPassword); - setTabOrder(m_ui.m_checkShowPassword, m_ui.m_gbHttpAuthentication); + setTabOrder(m_ui.m_txtPassword->lineEdit(), m_ui.m_gbHttpAuthentication); setTabOrder(m_ui.m_gbHttpAuthentication, m_ui.m_txtHttpUsername->lineEdit()); setTabOrder(m_ui.m_txtHttpUsername->lineEdit(), m_ui.m_txtHttpPassword->lineEdit()); - setTabOrder(m_ui.m_txtHttpPassword->lineEdit(), m_ui.m_checkShowHttpPassword); - setTabOrder(m_ui.m_checkShowHttpPassword, m_ui.m_btnTestSetup); + setTabOrder(m_ui.m_txtHttpPassword->lineEdit(), m_ui.m_btnTestSetup); + + m_ui.m_txtHttpPassword->lineEdit()->setPasswordMode(true); + m_ui.m_txtPassword->lineEdit()->setPasswordMode(true); - connect(m_ui.m_checkShowPassword, &QCheckBox::toggled, this, &TtRssAccountDetails::displayPassword); connect(m_ui.m_txtPassword->lineEdit(), &BaseLineEdit::textChanged, this, &TtRssAccountDetails::onPasswordChanged); connect(m_ui.m_txtUsername->lineEdit(), &BaseLineEdit::textChanged, this, &TtRssAccountDetails::onUsernameChanged); connect(m_ui.m_txtHttpPassword->lineEdit(), &BaseLineEdit::textChanged, this, &TtRssAccountDetails::onHttpPasswordChanged); @@ -44,23 +44,12 @@ TtRssAccountDetails::TtRssAccountDetails(QWidget* parent) : QWidget(parent) { connect(m_ui.m_txtUrl->lineEdit(), &BaseLineEdit::textChanged, this, &TtRssAccountDetails::onUrlChanged); connect(m_ui.m_gbHttpAuthentication, &QGroupBox::toggled, this, &TtRssAccountDetails::onHttpPasswordChanged); connect(m_ui.m_gbHttpAuthentication, &QGroupBox::toggled, this, &TtRssAccountDetails::onHttpUsernameChanged); - connect(m_ui.m_checkShowHttpPassword, &QCheckBox::toggled, this, &TtRssAccountDetails::displayHttpPassword); onPasswordChanged(); onUsernameChanged(); onUrlChanged(); onHttpPasswordChanged(); onHttpUsernameChanged(); - displayPassword(false); - displayHttpPassword(false); -} - -void TtRssAccountDetails::displayPassword(bool display) { - m_ui.m_txtPassword->lineEdit()->setEchoMode(display ? QLineEdit::Normal : QLineEdit::Password); -} - -void TtRssAccountDetails::displayHttpPassword(bool display) { - m_ui.m_txtHttpPassword->lineEdit()->setEchoMode(display ? QLineEdit::Normal : QLineEdit::Password); } void TtRssAccountDetails::performTest(const QNetworkProxy& proxy) { diff --git a/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.h b/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.h index 3077d8848..6fb4fe3b1 100644 --- a/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.h +++ b/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.h @@ -20,8 +20,6 @@ class TtRssAccountDetails : public QWidget { explicit TtRssAccountDetails(QWidget* parent = nullptr); private slots: - void displayPassword(bool display); - void displayHttpPassword(bool display); void performTest(const QNetworkProxy& proxy); void onUsernameChanged(); diff --git a/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.ui b/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.ui index a0ce21e6d..b095fe272 100644 --- a/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.ui +++ b/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.ui @@ -127,6 +127,9 @@ + + + @@ -140,16 +143,6 @@ - - - - - - - Show password - - - @@ -197,13 +190,6 @@ - - - - Show password - - -