diff --git a/CMakeLists.txt b/CMakeLists.txt index 81d2006d7..0e6ea40e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,10 +57,12 @@ cmake_minimum_required(VERSION 3.9.0) # Global variables describing the project. +string(TIMESTAMP YEAR "%Y") + set(APP_NAME "RSS Guard") set(APP_EMAIL "rotter.martinos@gmail.com") 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_DONATE_URL "https://github.com/sponsors/martinrotter") set(APP_VERSION "4.2.4") diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml index 78a5fc23d..8b8d7391d 100644 --- a/resources/desktop/com.github.rssguard.appdata.xml +++ b/resources/desktop/com.github.rssguard.appdata.xml @@ -24,7 +24,7 @@ https://github.com/sponsors/martinrotter - + none diff --git a/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp b/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp index 03ae28363..247d0cf42 100644 --- a/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp +++ b/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp @@ -32,6 +32,8 @@ WebEngineViewer::WebEngineViewer(QWidget* parent) : QWebEngineView(parent), m_br WebEnginePage* page = new WebEnginePage(this); setPage(page); + + // page->profile()->settings()->setAttribute(QWebEngineSettings::WebAttribute::ScrollAnimatorEnabled, true); } bool WebEngineViewer::event(QEvent* event) { diff --git a/src/librssguard/miscellaneous/notificationfactory.cpp b/src/librssguard/miscellaneous/notificationfactory.cpp index 39fdec74a..06725cbad 100644 --- a/src/librssguard/miscellaneous/notificationfactory.cpp +++ b/src/librssguard/miscellaneous/notificationfactory.cpp @@ -26,10 +26,7 @@ Notification NotificationFactory::notificationForEvent(Notification::Event event }); if (good_n.count() <= 0) { - qCriticalNN << LOGSEC_CORE - << "Notification for event" - << QUOTE_W_SPACE(int(event)) - << "not found"; + qDebugNN << LOGSEC_CORE << "Notification for event" << QUOTE_W_SPACE(int(event)) << "not found"; return Notification(); } @@ -59,10 +56,9 @@ void NotificationFactory::save(const QList& new_notifications, Set m_notifications = new_notifications; for (const auto& n : qAsConst(m_notifications)) { - settings->setValue(GROUP(Notifications), QString::number(int(n.event())), QStringList { - n.balloonEnabled() ? QSL("1") : QSL("0"), - n.soundPath(), - QString::number(n.volume()) - }); + settings->setValue(GROUP(Notifications), + QString::number(int(n.event())), + QStringList{ + n.balloonEnabled() ? QSL("1") : QSL("0"), n.soundPath(), QString::number(n.volume())}); } } diff --git a/src/librssguard/network-web/webfactory.cpp b/src/librssguard/network-web/webfactory.cpp index c6751cf46..5d859afd5 100644 --- a/src/librssguard/network-web/webfactory.cpp +++ b/src/librssguard/network-web/webfactory.cpp @@ -379,7 +379,10 @@ QAction* WebFactory::createEngineSettingsAction(const QString& title, QWebEngine act->setChecked(qApp->settings() ->value(WebEngineAttributes::ID, QString::number(static_cast(attribute)), true) .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); return act; }