FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2025-01-27 07:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add option to control the display of the unread message count on task bar (#649)

Browse Source 
In a news reading style with many sources and leaving messages unread
the unread message count becomes irrelevant. We already have an option
to disable the count in the icon tray, but not on the task bar. Added a
checkbox to enable/disable the message count on apps task bar icon /
entry.

Chose to put it into a new tab page as we might add more task bar
functionality (progress update, recent articles, etc..).
This commit is contained in:
igrekster 2022-02-22 18:27:43 +11:00 committed by GitHub
parent 9e99e7162d
commit aee9394f98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/librssguard/gui/settings/settingsgui.cpp
View File

@ -34,6 +34,10 @@ SettingsGui::SettingsGui(Settings* settings, QWidget* parent) : SettingsPanel(se
<< /*: Version column of skin list. */ tr("Version")
<< tr("Author"));
#if !defined(Q_OS_UNIX) || defined(Q_OS_MACOS)
m_ui->m_tabUi->setTabVisible(m_ui->m_tabUi->indexOf(m_ui->m_taskBar), false);
#endif
m_ui->m_helpCustomSkinColors->setHelpText(tr("You can override some colors defined by your skin here. "
"Some colors are used dynamically throughout the application."), false);
@ -73,6 +77,7 @@ SettingsGui::SettingsGui(Settings* settings, QWidget* parent) : SettingsPanel(se
&QStackedWidget::setCurrentIndex);
connect(m_ui->m_gbCustomSkinColors, &QGroupBox::toggled, this, &SettingsGui::dirtifySettings);
connect(m_ui->m_spinToolbarIconSize, QOverload<int>::of(&QSpinBox::valueChanged), this, &SettingsGui::dirtifySettings);
connect(m_ui->m_displayUnreadMessageCountOnTaskBar, &QCheckBox::toggled, this, &SettingsGui::dirtifySettings);
connect(m_ui->m_spinToolbarIconSize, QOverload<int>::of(&QSpinBox::valueChanged), this, [=](int value) {
if (value <= 0) {
@ -146,6 +151,10 @@ void SettingsGui::loadSettings() {
m_ui->m_checkMonochromeIcons->setChecked(settings()->value(GROUP(GUI), SETTING(GUI::MonochromeTrayIcon)).toBool());
m_ui->m_checkCountUnreadMessages->setChecked(settings()->value(GROUP(GUI), SETTING(GUI::UnreadNumbersInTrayIcon)).toBool());
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
m_ui->m_displayUnreadMessageCountOnTaskBar->setChecked(settings()->value(GROUP(GUI), SETTING(GUI::UnreadNumbersOnTaskBar)).toBool());
#endif
// Mark active theme.
if (current_theme == QL1S(APP_NO_THEME)) {
// Because "no icon theme" lies at the index 0.
@ -326,6 +335,10 @@ void SettingsGui::saveSettings() {
settings()->setValue(GROUP(GUI), GUI::ForceDarkFusion, m_ui->m_checkForceDarkFusion->isChecked());
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
settings()->setValue(GROUP(GUI), GUI::UnreadNumbersOnTaskBar, m_ui->m_displayUnreadMessageCountOnTaskBar->isChecked());
#endif
// Make sure that number of unread messages is shown in tray icon as requested.
qApp->feedReader()->feedsModel()->notifyWithCounts();

18
src/librssguard/gui/settings/settingsgui.ui
View File

@ -410,6 +410,24 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="m_taskBar">
<attribute name="title">
<string>Task bar</string>
</attribute>
<widget class="QCheckBox" name="m_displayUnreadMessageCountOnTaskBar">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>321</width>
<height>25</height>
</rect>
</property>
<property name="text">
<string>Display count of unread messages</string>
</property>
</widget>
</widget>
</widget>
</item>
</layout>

4
src/librssguard/miscellaneous/application.cpp
View File

@ -643,7 +643,9 @@ void Application::showMessagesNumber(int unread_messages, bool any_feed_has_unre
QVariantMap setProperty;
setProperty.insert("count", qint64(unread_messages));
setProperty.insert("count-visible", unread_messages > 0);
bool task_bar_count_enabled = settings()->value(GROUP(GUI),
SETTING(GUI::UnreadNumbersOnTaskBar)).toBool();
setProperty.insert("count-visible", task_bar_count_enabled && unread_messages > 0);
signal << setProperty;

5
src/librssguard/miscellaneous/settings.cpp
View File

@ -260,6 +260,11 @@ DVALUE(bool) GUI::ForceDarkFusionDef = false;
DKEY GUI::UnreadNumbersInTrayIcon = "show_unread_numbers_in_tray_icon";
DVALUE(bool) GUI::UnreadNumbersInTrayIconDef = true;
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
DKEY GUI::UnreadNumbersOnTaskBar = "show_unread_numbers_on_task_bar";
DVALUE(bool) GUI::UnreadNumbersOnTaskBarDef = true;
#endif
DKEY GUI::UseTrayIcon = "use_tray_icon";
DVALUE(bool) GUI::UseTrayIconDef = true;

5
src/librssguard/miscellaneous/settings.h
View File

@ -267,6 +267,11 @@ namespace GUI {
KEY UnreadNumbersInTrayIcon;
VALUE(bool) UnreadNumbersInTrayIconDef;
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
KEY UnreadNumbersOnTaskBar;
VALUE(bool) UnreadNumbersOnTaskBarDef;
#endif
KEY TabCloseMiddleClick;
VALUE(bool) TabCloseMiddleClickDef;