From cf3e9e4b4a3c5ed7cec6f1b11c0057d6a3ff6949 Mon Sep 17 00:00:00 2001 From: relikd Date: Mon, 27 Oct 2025 17:36:07 +0100 Subject: [PATCH] feat: simplify options for show-only-unread --- baRSS/Helper/UserPrefs.h | 1 - baRSS/Helper/UserPrefs.m | 2 +- baRSS/Preferences/Appearance Tab/SettingsAppearanceView.m | 2 +- baRSS/Status Bar Menu/NSMenu+Ext.m | 6 +++--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/baRSS/Helper/UserPrefs.h b/baRSS/Helper/UserPrefs.h index 823e483..d9fd30c 100644 --- a/baRSS/Helper/UserPrefs.h +++ b/baRSS/Helper/UserPrefs.h @@ -20,7 +20,6 @@ /** default: @c YES */ static NSString* const Pref_globalOpenUnread = @"globalOpenUnread"; /** default: @c YES */ static NSString* const Pref_globalMarkRead = @"globalMarkRead"; /** default: @c YES */ static NSString* const Pref_globalMarkUnread = @"globalMarkUnread"; -/** default: @c NO */ static NSString* const Pref_globalUnreadOnly = @"globalUnreadOnly"; /** default: @c YES */ static NSString* const Pref_globalUnreadCount = @"globalUnreadCount"; /** default: @c YES */ static NSString* const Pref_groupOpenUnread = @"groupOpenUnread"; /** default: @c YES */ static NSString* const Pref_groupMarkRead = @"groupMarkRead"; diff --git a/baRSS/Helper/UserPrefs.m b/baRSS/Helper/UserPrefs.m index 4f75ae1..b2cce6c 100644 --- a/baRSS/Helper/UserPrefs.m +++ b/baRSS/Helper/UserPrefs.m @@ -20,7 +20,7 @@ void UserPrefsInit(void) { Pref_feedUnreadIndicator ]); defaultsAppend(defs, @NO, @[ - Pref_globalUnreadOnly, Pref_groupUnreadOnly, Pref_feedUnreadOnly, + Pref_groupUnreadOnly, Pref_feedUnreadOnly, Pref_groupUnreadIndicator, Pref_feedTruncateTitle, Pref_feedLimitArticles diff --git a/baRSS/Preferences/Appearance Tab/SettingsAppearanceView.m b/baRSS/Preferences/Appearance Tab/SettingsAppearanceView.m index 92c7f8c..e389ea6 100644 --- a/baRSS/Preferences/Appearance Tab/SettingsAppearanceView.m +++ b/baRSS/Preferences/Appearance Tab/SettingsAppearanceView.m @@ -28,9 +28,9 @@ [self entry:NSLocalizedString(@"Open all unread", nil) c1:Pref_globalOpenUnread c2:Pref_groupOpenUnread c3:Pref_feedOpenUnread]; [self entry:NSLocalizedString(@"Mark all read", nil) c1:Pref_globalMarkRead c2:Pref_groupMarkRead c3:Pref_feedMarkRead]; [self entry:NSLocalizedString(@"Mark all unread", nil) c1:Pref_globalMarkUnread c2:Pref_groupMarkUnread c3:Pref_feedMarkUnread]; - [self entry:NSLocalizedString(@"Show only unread / hide read", nil) c1:Pref_globalUnreadOnly c2:Pref_groupUnreadOnly c3:Pref_feedUnreadOnly]; [self entry:NSLocalizedString(@"Number of unread articles", nil) c1:Pref_globalUnreadCount c2:Pref_groupUnreadCount c3:Pref_feedUnreadCount]; [self entry:NSLocalizedString(@"Indicator for unread articles", nil) c1:nil c2:Pref_groupUnreadIndicator c3:Pref_feedUnreadIndicator]; + [self entry:NSLocalizedString(@"Show only unread / hide read", nil) c1:nil c2:Pref_groupUnreadOnly c3:Pref_feedUnreadOnly]; [[self entry:NSLocalizedString(@"Truncate article title", nil) c1:nil c2:nil c3:Pref_feedTruncateTitle] tooltip:NSLocalizedString(@"Truncate article title after 60 characters", nil)]; [[self entry:NSLocalizedString(@"Limit number of articles", nil) c1:nil c2:nil c3:Pref_feedLimitArticles] diff --git a/baRSS/Status Bar Menu/NSMenu+Ext.m b/baRSS/Status Bar Menu/NSMenu+Ext.m index 635d8a6..b006cb1 100644 --- a/baRSS/Status Bar Menu/NSMenu+Ext.m +++ b/baRSS/Status Bar Menu/NSMenu+Ext.m @@ -57,9 +57,9 @@ typedef NS_ENUM(NSInteger, MenuItemTag) { NSUInteger unread = unreadMap[[t substringFromIndex:2]].unread; // Check user preferences to show only unread entries - if (unread == 0 && - ((fg.type == FEED && UserPrefsBool(Pref_globalUnreadOnly)) || - (fg.type == GROUP && UserPrefsBool(Pref_groupUnreadOnly)))) { + if (unread == 0 + && (fg.type == FEED || fg.type == GROUP) + && UserPrefsBool(Pref_groupUnreadOnly)) { item.hidden = YES; }