feat: add setting to show "toggle hidden" button
This commit is contained in:
@@ -17,6 +17,7 @@
|
|||||||
// ------ Appearance matrix ------ (Preferences > Appearance Tab) ------
|
// ------ Appearance matrix ------ (Preferences > Appearance Tab) ------
|
||||||
/** default: @c YES */ static NSString* const Pref_globalTintMenuIcon = @"globalTintMenuBarIcon";
|
/** default: @c YES */ static NSString* const Pref_globalTintMenuIcon = @"globalTintMenuBarIcon";
|
||||||
/** default: @c YES */ static NSString* const Pref_globalUpdateAll = @"globalUpdateAll";
|
/** default: @c YES */ static NSString* const Pref_globalUpdateAll = @"globalUpdateAll";
|
||||||
|
/** default: @c NO */ static NSString* const Pref_globalToggleHidden = @"globalToggleHidden";
|
||||||
/** default: @c YES */ static NSString* const Pref_globalOpenUnread = @"globalOpenUnread";
|
/** 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_globalMarkRead = @"globalMarkRead";
|
||||||
/** default: @c YES */ static NSString* const Pref_globalMarkUnread = @"globalMarkUnread";
|
/** default: @c YES */ static NSString* const Pref_globalMarkUnread = @"globalMarkUnread";
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ void UserPrefsInit(void) {
|
|||||||
Pref_feedUnreadIndicator
|
Pref_feedUnreadIndicator
|
||||||
]);
|
]);
|
||||||
defaultsAppend(defs, @NO, @[
|
defaultsAppend(defs, @NO, @[
|
||||||
|
Pref_globalToggleHidden,
|
||||||
Pref_groupUnreadOnly, Pref_feedUnreadOnly,
|
Pref_groupUnreadOnly, Pref_feedUnreadOnly,
|
||||||
Pref_groupUnreadIndicator,
|
Pref_groupUnreadIndicator,
|
||||||
Pref_feedTruncateTitle,
|
Pref_feedTruncateTitle,
|
||||||
|
|||||||
@@ -31,12 +31,19 @@
|
|||||||
c3:nil c3tt:nil];
|
c3:nil c3tt:nil];
|
||||||
|
|
||||||
[self entry:NSLocalizedString(@"Update all feeds", nil)
|
[self entry:NSLocalizedString(@"Update all feeds", nil)
|
||||||
help:NSLocalizedString(@"Show button in status bar menu to reload all feeds. This will force fetch new online content regardless of next-update timer.", nil)
|
help:NSLocalizedString(@"Show button in main menu to reload all feeds. This will force fetch new online content regardless of next-update timer.", nil)
|
||||||
tip:nil
|
tip:nil
|
||||||
c1:Pref_globalUpdateAll c1tt:NSLocalizedString(@"in main menu", nil)
|
c1:Pref_globalUpdateAll c1tt:NSLocalizedString(@"in main menu", nil)
|
||||||
c2:nil c2tt:nil
|
c2:nil c2tt:nil
|
||||||
c3:nil c3tt:nil];
|
c3:nil c3tt:nil];
|
||||||
|
|
||||||
|
[self entry:NSLocalizedString(@"Toggle “Show Hidden Articles”", nil)
|
||||||
|
help:NSLocalizedString(@"Show button in main menu to quickly toggle whether hidden articles should be shown. See option “Show only unread”.", nil)
|
||||||
|
tip:nil
|
||||||
|
c1:Pref_globalToggleHidden c1tt:NSLocalizedString(@"in main menu", nil)
|
||||||
|
c2:nil c2tt:nil
|
||||||
|
c3:nil c3tt:nil];
|
||||||
|
|
||||||
[self entry:NSLocalizedString(@"Open all unread", nil)
|
[self entry:NSLocalizedString(@"Open all unread", nil)
|
||||||
help:NSLocalizedString(@"Show button to open unread articles.", nil)
|
help:NSLocalizedString(@"Show button to open unread articles.", nil)
|
||||||
tip:NSLocalizedString(@"If you hold down option-key, this will become an “open a few” unread articles button.", nil)
|
tip:NSLocalizedString(@"If you hold down option-key, this will become an “open a few” unread articles button.", nil)
|
||||||
@@ -74,7 +81,7 @@
|
|||||||
|
|
||||||
[self entry:NSLocalizedString(@"Show only unread", nil)
|
[self entry:NSLocalizedString(@"Show only unread", nil)
|
||||||
help:NSLocalizedString(@"Hide articles which have been read.", nil)
|
help:NSLocalizedString(@"Hide articles which have been read.", nil)
|
||||||
tip:NSLocalizedString(@"You can hold down option-key before opening the menu bar menu to quickly show hidden articles even if this setting is on.", nil)
|
tip:NSLocalizedString(@"You can hold down option-key before opening the main menu to temporarily disable this setting.", nil)
|
||||||
c1:nil c1tt:nil
|
c1:nil c1tt:nil
|
||||||
c2:Pref_groupUnreadOnly c2tt:NSLocalizedString(@"hide group & feed folders", nil)
|
c2:Pref_groupUnreadOnly c2tt:NSLocalizedString(@"hide group & feed folders", nil)
|
||||||
c3:Pref_feedUnreadOnly c3tt:NSLocalizedString(@"hide articles inside of feed folder", nil)];
|
c3:Pref_feedUnreadOnly c3tt:NSLocalizedString(@"hide articles inside of feed folder", nil)];
|
||||||
|
|||||||
@@ -182,14 +182,16 @@
|
|||||||
pause.title = NSLocalizedString(@"Resume Updates", nil);
|
pause.title = NSLocalizedString(@"Resume Updates", nil);
|
||||||
|
|
||||||
// 'show hidden articles' item
|
// 'show hidden articles' item
|
||||||
NSMenuItem *toggleHidden = [menu addItemWithTitle:NSLocalizedString(@"Show Hidden Articles", nil) action:@selector(toggleHiddenArticles) keyEquivalent:@"h"];
|
if (UserPrefsBool(Pref_globalToggleHidden)) {
|
||||||
toggleHidden.target = self;
|
NSMenuItem *toggleHidden = [menu addItemWithTitle:NSLocalizedString(@"Show Hidden Articles", nil) action:@selector(toggleHiddenArticles) keyEquivalent:@"h"];
|
||||||
toggleHidden.enabled = !self.holdingOptKey && (UserPrefsBool(Pref_groupUnreadOnly) || UserPrefsBool(Pref_feedUnreadOnly));
|
toggleHidden.target = self;
|
||||||
[toggleHidden setState:self.barMenu.showHidden ? NSControlStateValueOn : NSControlStateValueOff];
|
toggleHidden.enabled = !self.holdingOptKey && (UserPrefsBool(Pref_groupUnreadOnly) || UserPrefsBool(Pref_feedUnreadOnly));
|
||||||
if (!toggleHidden.enabled) {
|
[toggleHidden setState:self.barMenu.showHidden ? NSControlStateValueOn : NSControlStateValueOff];
|
||||||
toggleHidden.toolTip = self.holdingOptKey
|
if (!toggleHidden.enabled) {
|
||||||
? NSLocalizedString(@"Option disabled because overwritten by holding down option-key.", nil)
|
toggleHidden.toolTip = self.holdingOptKey
|
||||||
: NSLocalizedString(@"Option disabled because appearance setting for “Show only unread” is disabled.", nil);
|
? NSLocalizedString(@"Option disabled because overwritten by holding down option-key.", nil)
|
||||||
|
: NSLocalizedString(@"Option disabled because appearance setting for “Show only unread” is disabled.", nil);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 'Update all feeds' item
|
// 'Update all feeds' item
|
||||||
|
|||||||
Reference in New Issue
Block a user