FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix #804

Browse Source
This commit is contained in:
Martin Rotter 2022-09-14 10:57:45 +02:00
parent e75882082e
commit b790fe0c5b
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -57,10 +57,12 @@
cmake_minimum_required(VERSION 3.9.0) cmake_minimum_required(VERSION 3.9.0)
# Global variables describing the project. # Global variables describing the project.
string(TIMESTAMP YEAR "%Y")
set(APP_NAME "RSS Guard") set(APP_NAME "RSS Guard")
set(APP_EMAIL "rotter.martinos@gmail.com") set(APP_EMAIL "rotter.martinos@gmail.com")
set(APP_AUTHOR "Martin Rotter") set(APP_AUTHOR "Martin Rotter")
set(APP_COPYRIGHT "\\251 2011-2022 ${APP_AUTHOR}") set(APP_COPYRIGHT "\\251 2011-${YEAR} ${APP_AUTHOR}")
set(APP_REVERSE_NAME "com.github.rssguard") set(APP_REVERSE_NAME "com.github.rssguard")
set(APP_DONATE_URL "https://github.com/sponsors/martinrotter") set(APP_DONATE_URL "https://github.com/sponsors/martinrotter")
set(APP_VERSION "4.2.4") set(APP_VERSION "4.2.4")

2
resources/desktop/com.github.rssguard.appdata.xml
View File

@ -24,7 +24,7 @@
<url type="donation">https://github.com/sponsors/martinrotter</url> <url type="donation">https://github.com/sponsors/martinrotter</url>
<content_rating type="oars-1.1" /> <content_rating type="oars-1.1" />
<releases> <releases>
<release version="4.2.4" date="2022-09-08"/> <release version="4.2.4" date="2022-09-14"/>
</releases> </releases>
<content_rating type="oars-1.0"> <content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute> <content_attribute id="violence-cartoon">none</content_attribute>

2
src/librssguard/gui/webviewers/webengine/webengineviewer.cpp
View File

@ -32,6 +32,8 @@ WebEngineViewer::WebEngineViewer(QWidget* parent) : QWebEngineView(parent), m_br
WebEnginePage* page = new WebEnginePage(this); WebEnginePage* page = new WebEnginePage(this);
setPage(page); setPage(page);
// page->profile()->settings()->setAttribute(QWebEngineSettings::WebAttribute::ScrollAnimatorEnabled, true);
} }
bool WebEngineViewer::event(QEvent* event) { bool WebEngineViewer::event(QEvent* event) {

14
src/librssguard/miscellaneous/notificationfactory.cpp
View File

@ -26,10 +26,7 @@ Notification NotificationFactory::notificationForEvent(Notification::Event event
}); });
if (good_n.count() <= 0) { if (good_n.count() <= 0) {
qCriticalNN << LOGSEC_CORE qDebugNN << LOGSEC_CORE << "Notification for event" << QUOTE_W_SPACE(int(event)) << "not found";
<< "Notification for event"
<< QUOTE_W_SPACE(int(event))
<< "not found";
return Notification(); return Notification();
} }
@ -59,10 +56,9 @@ void NotificationFactory::save(const QList<Notification>& new_notifications, Set
m_notifications = new_notifications; m_notifications = new_notifications;
for (const auto& n : qAsConst(m_notifications)) { for (const auto& n : qAsConst(m_notifications)) {
settings->setValue(GROUP(Notifications), QString::number(int(n.event())), QStringList { settings->setValue(GROUP(Notifications),
n.balloonEnabled() ? QSL("1") : QSL("0"), QString::number(int(n.event())),
n.soundPath(), QStringList{
QString::number(n.volume()) n.balloonEnabled() ? QSL("1") : QSL("0"), n.soundPath(), QString::number(n.volume())});
});
} }
} }

5
src/librssguard/network-web/webfactory.cpp
View File

@ -379,7 +379,10 @@ QAction* WebFactory::createEngineSettingsAction(const QString& title, QWebEngine
act->setChecked(qApp->settings() act->setChecked(qApp->settings()
->value(WebEngineAttributes::ID, QString::number(static_cast<int>(attribute)), true) ->value(WebEngineAttributes::ID, QString::number(static_cast<int>(attribute)), true)
.toBool()); .toBool());
m_engineProfile->settings()->setAttribute(attribute, act->isChecked());
auto enabl = act->isChecked();
m_engineProfile->settings()->setAttribute(attribute, enabl);
connect(act, &QAction::toggled, this, &WebFactory::webEngineSettingChanged); connect(act, &QAction::toggled, this, &WebFactory::webEngineSettingChanged);
return act; return act;
} }