fix: uniform menu titles
This commit is contained in:
@@ -37,7 +37,7 @@
|
|||||||
c2:nil c2tt:nil
|
c2:nil c2tt:nil
|
||||||
c3:nil c3tt:nil];
|
c3:nil c3tt:nil];
|
||||||
|
|
||||||
[self entry:NSLocalizedString(@"Toggle “Show Hidden Articles”", 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)
|
help:NSLocalizedString(@"Show button in main menu to quickly toggle whether hidden articles should be shown. See option “Show only unread”.", nil)
|
||||||
tip:nil
|
tip:nil
|
||||||
c1:Pref_globalToggleHidden c1tt:NSLocalizedString(@"in main menu", nil)
|
c1:Pref_globalToggleHidden c1tt:NSLocalizedString(@"in main menu", nil)
|
||||||
@@ -132,7 +132,7 @@ static inline NSButton* Checkbox(id this, CGFloat x, CGFloat y, NSString *key) {
|
|||||||
if (pref3) [Checkbox(self, __X + 2, y + 2, pref3) tooltip:ttip3].accessibilityLabel = [label stringByAppendingString:@" (feed)"];
|
if (pref3) [Checkbox(self, __X + 2, y + 2, pref3) tooltip:ttip3].accessibilityLabel = [label stringByAppendingString:@" (feed)"];
|
||||||
if (extraTip != nil) {
|
if (extraTip != nil) {
|
||||||
label = [label stringByAppendingString:@" *"];
|
label = [label stringByAppendingString:@" *"];
|
||||||
ttip = [ttip stringByAppendingFormat:@"\n\nTip: %@", extraTip];
|
ttip = [ttip stringByAppendingFormat:@"\n\n* Tip: %@", extraTip];
|
||||||
}
|
}
|
||||||
return [[[[NSView label:label] placeIn:self x:PAD_WIN + 3 * colWidth yTop:y] sizeToRight:PAD_WIN] tooltip:ttip];
|
return [[[[NSView label:label] placeIn:self x:PAD_WIN + 3 * colWidth yTop:y] sizeToRight:PAD_WIN] tooltip:ttip];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -176,14 +176,14 @@
|
|||||||
|
|
||||||
- (void)insertMainMenuHeader:(NSMenu*)menu {
|
- (void)insertMainMenuHeader:(NSMenu*)menu {
|
||||||
// 'Pause Updates' item
|
// 'Pause Updates' item
|
||||||
NSMenuItem *pause = [menu addItemWithTitle:NSLocalizedString(@"Pause Updates", nil) action:@selector(pauseUpdates) keyEquivalent:@""];
|
NSMenuItem *pause = [menu addItemWithTitle:NSLocalizedString(@"Pause updates", nil) action:@selector(pauseUpdates) keyEquivalent:@""];
|
||||||
pause.target = self;
|
pause.target = self;
|
||||||
if ([UpdateScheduler isPaused])
|
if ([UpdateScheduler isPaused])
|
||||||
pause.title = NSLocalizedString(@"Resume Updates", nil);
|
pause.title = NSLocalizedString(@"Resume updates", nil);
|
||||||
|
|
||||||
// 'show hidden articles' item
|
// 'show hidden articles' item
|
||||||
if (UserPrefsBool(Pref_globalToggleHidden)) {
|
if (UserPrefsBool(Pref_globalToggleHidden)) {
|
||||||
NSMenuItem *toggleHidden = [menu addItemWithTitle:NSLocalizedString(@"Show Hidden Articles", nil) action:@selector(toggleHiddenArticles) keyEquivalent:@"h"];
|
NSMenuItem *toggleHidden = [menu addItemWithTitle:NSLocalizedString(@"Show hidden articles", nil) action:@selector(toggleHiddenArticles) keyEquivalent:@"h"];
|
||||||
toggleHidden.target = self;
|
toggleHidden.target = self;
|
||||||
toggleHidden.enabled = !self.holdingOptKey && (UserPrefsBool(Pref_groupUnreadOnly) || UserPrefsBool(Pref_feedUnreadOnly));
|
toggleHidden.enabled = !self.holdingOptKey && (UserPrefsBool(Pref_groupUnreadOnly) || UserPrefsBool(Pref_feedUnreadOnly));
|
||||||
[toggleHidden setState:self.barMenu.showHidden ? NSControlStateValueOn : NSControlStateValueOff];
|
[toggleHidden setState:self.barMenu.showHidden ? NSControlStateValueOn : NSControlStateValueOff];
|
||||||
|
|||||||
Reference in New Issue
Block a user