pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor ui enhancements for greader api plugin

Browse source
This commit is contained in:
Martin Rotter 2022-08-27 11:15:34 +02:00
parent f0904b21c6
commit 0edb3a2839
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/librssguard/services/greader/gui/greaderaccountdetails.cpp
View file

@ -6,6 +6,7 @@
#include "exceptions/applicationexception.h" #include "exceptions/applicationexception.h"
#include "gui/guiutilities.h" #include "gui/guiutilities.h"
#include "miscellaneous/application.h" #include "miscellaneous/application.h"
#include "miscellaneous/iconfactory.h"
#include "miscellaneous/systemfactory.h" #include "miscellaneous/systemfactory.h"
#include "network-web/oauth2service.h" #include "network-web/oauth2service.h"
#include "network-web/webfactory.h" #include "network-web/webfactory.h"
@ -23,7 +24,11 @@ GreaderAccountDetails::GreaderAccountDetails(QWidget* parent) : QWidget(parent),
for (int i = 0; i < me.keyCount(); i++) { for (int i = 0; i < me.keyCount(); i++) {
GreaderServiceRoot::Service serv = static_cast<GreaderServiceRoot::Service>(me.value(i)); GreaderServiceRoot::Service serv = static_cast<GreaderServiceRoot::Service>(me.value(i));
m_ui.m_cmbService->addItem(GreaderServiceRoot::serviceToString(serv), QVariant::fromValue(serv)); auto ico = qApp->icons()->miscIcon(QString(me.key(i)).toLower());
m_ui.m_cmbService->addItem(ico.availableSizes().isEmpty() ? qApp->icons()->miscIcon(QSL("google")) : ico,
GreaderServiceRoot::serviceToString(serv),
QVariant::fromValue(serv));
} }
m_ui.m_dateNewerThan->setMinimumDate(QDate(2000, 1, 1)); m_ui.m_dateNewerThan->setMinimumDate(QDate(2000, 1, 1));
@ -71,7 +76,7 @@ GreaderAccountDetails::GreaderAccountDetails(QWidget* parent) : QWidget(parent),
connect(m_ui.m_cmbService, connect(m_ui.m_cmbService,
QOverload<int>::of(&QComboBox::currentIndexChanged), QOverload<int>::of(&QComboBox::currentIndexChanged),
this, this,
&GreaderAccountDetails::fillPredefinedUrl); &GreaderAccountDetails::selectedServiceChanged);
connect(m_ui.m_cbNewAlgorithm, &QCheckBox::toggled, m_ui.m_spinLimitMessages, &MessageCountSpinBox::setDisabled); connect(m_ui.m_cbNewAlgorithm, &QCheckBox::toggled, m_ui.m_spinLimitMessages, &MessageCountSpinBox::setDisabled);
connect(m_ui.m_txtAppId->lineEdit(), &BaseLineEdit::textChanged, this, &GreaderAccountDetails::checkOAuthValue); connect(m_ui.m_txtAppId->lineEdit(), &BaseLineEdit::textChanged, this, &GreaderAccountDetails::checkOAuthValue);
connect(m_ui.m_txtAppKey->lineEdit(), &BaseLineEdit::textChanged, this, &GreaderAccountDetails::checkOAuthValue); connect(m_ui.m_txtAppKey->lineEdit(), &BaseLineEdit::textChanged, this, &GreaderAccountDetails::checkOAuthValue);
@ -237,7 +242,7 @@ void GreaderAccountDetails::onUrlChanged() {
} }
} }
void GreaderAccountDetails::fillPredefinedUrl() { void GreaderAccountDetails::selectedServiceChanged() {
switch (service()) { switch (service()) {
case GreaderServiceRoot::Service::Reedah: case GreaderServiceRoot::Service::Reedah:
m_ui.m_txtUrl->lineEdit()->setText(QSL(GREADER_URL_REEDAH)); m_ui.m_txtUrl->lineEdit()->setText(QSL(GREADER_URL_REEDAH));
@ -255,12 +260,18 @@ void GreaderAccountDetails::fillPredefinedUrl() {
m_ui.m_txtUrl->lineEdit()->setText(QSL(GREADER_URL_INOREADER)); m_ui.m_txtUrl->lineEdit()->setText(QSL(GREADER_URL_INOREADER));
break; break;
default: case GreaderServiceRoot::Service::Miniflux:
m_ui.m_txtUrl->lineEdit()->clear(); m_ui.m_cbNewAlgorithm->setChecked(true);
m_ui.m_txtUrl->setFocus();
break; break;
} }
// Miniflux only works with "intelligent algorithm" because it does not
// support "stream/contents" API method yet.
m_ui.m_cbNewAlgorithm->setEnabled(service() != GreaderServiceRoot::Service::Miniflux);
m_ui.m_txtUrl->lineEdit()->selectAll();
m_ui.m_txtUrl->setFocus();
// Show OAuth settings for Inoreader and classic for other services. // Show OAuth settings for Inoreader and classic for other services.
m_ui.m_stackedAuth->setCurrentIndex(service() == GreaderServiceRoot::Service::Inoreader ? 1 : 0); m_ui.m_stackedAuth->setCurrentIndex(service() == GreaderServiceRoot::Service::Inoreader ? 1 : 0);
m_ui.m_txtUrl->setDisabled(service() == GreaderServiceRoot::Service::Inoreader); m_ui.m_txtUrl->setDisabled(service() == GreaderServiceRoot::Service::Inoreader);

2
src/librssguard/services/greader/gui/greaderaccountdetails.h
View file

@ -29,7 +29,7 @@ class GreaderAccountDetails : public QWidget {
void onUsernameChanged(); void onUsernameChanged();
void onPasswordChanged(); void onPasswordChanged();
void onUrlChanged(); void onUrlChanged();
void fillPredefinedUrl(); void selectedServiceChanged();
void checkOAuthValue(const QString& value); void checkOAuthValue(const QString& value);
void registerApi(); void registerApi();
void onAuthFailed(); void onAuthFailed();