From 4a23a7a70ef2542d3402ccac3485cfa0819c85cb Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 13 Jul 2025 21:38:26 +0200 Subject: [PATCH 1/6] "Enter" icon in default button only for certain NSInterfaceStyles Show "Enter" icon in default button only if NSInterfaceStyle is NSNextStepInterfaceStyle or GSWindowMakerInterfaceStyle. This looks alien in other interface styles. --- Source/NSAlert.m | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/NSAlert.m b/Source/NSAlert.m index ccbcfdbf31..a669a025c2 100644 --- a/Source/NSAlert.m +++ b/Source/NSAlert.m @@ -502,8 +502,13 @@ - (id) _initWithoutGModel [defButton setHighlightsBy: NSPushInCellMask | NSChangeGrayCellMask | NSContentsCellMask]; [defButton setImagePosition: NSImageRight]; - [defButton setImage: [NSImage imageNamed: @"common_ret"]]; - [defButton setAlternateImage: [NSImage imageNamed: @"common_retH"]]; + NSInterfaceStyle interfaceStyle = NSInterfaceStyleForKey(@"NSInterfaceStyle", nil); + if (interfaceStyle == NSNextStepInterfaceStyle + || interfaceStyle == GSWindowMakerInterfaceStyle) + { + [defButton setImage: [NSImage imageNamed: @"common_ret"]]; + [defButton setAlternateImage: [NSImage imageNamed: @"common_retH"]]; + } altButton = [self _makeButtonWithRect: rect tag: NSAlertAlternateReturn]; othButton = [self _makeButtonWithRect: rect tag: NSAlertOtherReturn]; From 0184385c0725be32124b416d6450cfd9aa33e5b5 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 13 Jul 2025 21:40:37 +0200 Subject: [PATCH 2/6] "Enter" icon in default button only for certain NSInterfaceStyles --- Source/GSHelpManagerPanel.m | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/GSHelpManagerPanel.m b/Source/GSHelpManagerPanel.m index 2966080180..8898ae0ec2 100644 --- a/Source/GSHelpManagerPanel.m +++ b/Source/GSHelpManagerPanel.m @@ -101,8 +101,13 @@ - (id)init [button setTitle: NSLocalizedString(@"OK", @"")]; [button setKeyEquivalent: @"\r"]; [button setImagePosition: NSImageRight]; - [button setImage: [NSImage imageNamed: @"common_ret"]]; - [button setAlternateImage: [NSImage imageNamed: @"common_retH"]]; + NSInterfaceStyle interfaceStyle = NSInterfaceStyleForKey(@"NSInterfaceStyle", nil); + if (interfaceStyle == NSNextStepInterfaceStyle + || interfaceStyle == GSWindowMakerInterfaceStyle) + { + [button setImage: [NSImage imageNamed: @"common_ret"]]; + [button setAlternateImage: [NSImage imageNamed: @"common_retH"]]; + } [button setTarget: self]; [button setAction: @selector(buttonAction:)]; From 21ce941ea80a7a5d3c734d3654b008699079d41c Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 13 Jul 2025 21:46:56 +0200 Subject: [PATCH 3/6] "Enter" icon in default button only for certain NSInterfaceStyles --- Source/GSThemeDrawing.m | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/Source/GSThemeDrawing.m b/Source/GSThemeDrawing.m index ab420059ca..66b4709c6e 100644 --- a/Source/GSThemeDrawing.m +++ b/Source/GSThemeDrawing.m @@ -102,22 +102,27 @@ @implementation GSTheme (Drawing) - (void) setKeyEquivalent: (NSString *)key forButtonCell: (NSButtonCell *)cell { - if([cell image] == nil && ([key isEqualToString:@"\r"] || - [key isEqualToString:@"\n"])) - { - [cell setImagePosition: NSImageRight]; - [cell setImage: [NSImage imageNamed:@"common_ret"]]; - [cell setAlternateImage: [NSImage imageNamed:@"common_retH"]]; - } - else if([key isEqualToString:@"\r"] == NO && - [key isEqualToString:@"\n"] == NO) - { - NSImage *cellImage = [cell image]; - if(cellImage == [NSImage imageNamed:@"common_ret"]) - { - [cell setImage: nil]; - [cell setAlternateImage: nil]; - } + NSInterfaceStyle interfaceStyle = NSInterfaceStyleForKey(@"NSInterfaceStyle", nil); + if (interfaceStyle == NSNextStepInterfaceStyle + || interfaceStyle == GSWindowMakerInterfaceStyle) + { + if([cell image] == nil && ([key isEqualToString:@"\r"] || + [key isEqualToString:@"\n"])) + { + [cell setImagePosition: NSImageRight]; + [cell setImage: [NSImage imageNamed:@"common_ret"]]; + [cell setAlternateImage: [NSImage imageNamed:@"common_retH"]]; + } + else if([key isEqualToString:@"\r"] == NO && + [key isEqualToString:@"\n"] == NO) + { + NSImage *cellImage = [cell image]; + if(cellImage == [NSImage imageNamed:@"common_ret"]) + { + [cell setImage: nil]; + [cell setAlternateImage: nil]; + } + } } } From 50e186ebe07bade5be7f2e4922f264011da54120 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 13 Jul 2025 21:48:36 +0200 Subject: [PATCH 4/6] "Enter" icon in default button only for certain NSInterfaceStyles --- Source/NSSavePanel.m | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Source/NSSavePanel.m b/Source/NSSavePanel.m index 61ccc2bcbc..16c5d332cb 100644 --- a/Source/NSSavePanel.m +++ b/Source/NSSavePanel.m @@ -333,9 +333,14 @@ -(id) _initWithoutGModel _okButton = [[NSButton alloc] initWithFrame: r]; [_okButton setBordered: YES]; [_okButton setTitle: _(@"OK")]; - [_okButton setImagePosition: NSImageRight]; - [_okButton setImage: [NSImage imageNamed: @"common_ret"]]; - [_okButton setAlternateImage: [NSImage imageNamed: @"common_retH"]]; + [_okButton setImagePosition: NSImageRight]; + NSInterfaceStyle interfaceStyle = NSInterfaceStyleForKey(@"NSInterfaceStyle", nil); + if (interfaceStyle == NSNextStepInterfaceStyle + || interfaceStyle == GSWindowMakerInterfaceStyle) + { + [_okButton setImage: [NSImage imageNamed: @"common_ret"]]; + [_okButton setAlternateImage: [NSImage imageNamed: @"common_retH"]]; + } [_okButton setTarget: self]; [_okButton setAction: @selector(ok:)]; [_okButton setEnabled: NO]; From 5813e93759c62e9c4313c892e284b5a551c5cf31 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 13 Jul 2025 21:49:39 +0200 Subject: [PATCH 5/6] "Enter" icon in default button only for certain NSInterfaceStyles --- Source/NSSpellChecker.m | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/NSSpellChecker.m b/Source/NSSpellChecker.m index ede3d3bd31..924917deef 100644 --- a/Source/NSSpellChecker.m +++ b/Source/NSSpellChecker.m @@ -709,8 +709,13 @@ - (void) awakeFromNib [_correctButton setKeyEquivalent: @"c"]; [_correctButton setKeyEquivalentModifierMask: NSCommandKeyMask]; [_correctButton setImagePosition: NSImageRight]; - [_correctButton setImage: [NSImage imageNamed: @"common_ret"]]; - [_correctButton setAlternateImage: [NSImage imageNamed: @"common_retH"]]; + NSInterfaceStyle interfaceStyle = NSInterfaceStyleForKey(@"NSInterfaceStyle", nil); + if (interfaceStyle == NSNextStepInterfaceStyle + || interfaceStyle == GSWindowMakerInterfaceStyle) + { + [_correctButton setImage: [NSImage imageNamed: @"common_ret"]]; + [_correctButton setAlternateImage: [NSImage imageNamed: @"common_retH"]]; + } [_spellPanel makeFirstResponder: _correctButton]; [_spellPanel setBecomesKeyOnlyIfNeeded: YES]; [_spellPanel setFloatingPanel: YES]; From 13a0379f5f6540152f77df87982948cf9990e017 Mon Sep 17 00:00:00 2001 From: probonopd Date: Mon, 14 Jul 2025 00:57:56 +0200 Subject: [PATCH 6/6] Fix indentation --- Source/GSHelpManagerPanel.m | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Source/GSHelpManagerPanel.m b/Source/GSHelpManagerPanel.m index 8898ae0ec2..cf6b3327cc 100644 --- a/Source/GSHelpManagerPanel.m +++ b/Source/GSHelpManagerPanel.m @@ -101,15 +101,15 @@ - (id)init [button setTitle: NSLocalizedString(@"OK", @"")]; [button setKeyEquivalent: @"\r"]; [button setImagePosition: NSImageRight]; - NSInterfaceStyle interfaceStyle = NSInterfaceStyleForKey(@"NSInterfaceStyle", nil); - if (interfaceStyle == NSNextStepInterfaceStyle - || interfaceStyle == GSWindowMakerInterfaceStyle) - { - [button setImage: [NSImage imageNamed: @"common_ret"]]; - [button setAlternateImage: [NSImage imageNamed: @"common_retH"]]; - } - [button setTarget: self]; - [button setAction: @selector(buttonAction:)]; + NSInterfaceStyle interfaceStyle = NSInterfaceStyleForKey(@"NSInterfaceStyle", nil); + if (interfaceStyle == NSNextStepInterfaceStyle + || interfaceStyle == GSWindowMakerInterfaceStyle) + { + [button setImage: [NSImage imageNamed: @"common_ret"]]; + [button setAlternateImage: [NSImage imageNamed: @"common_retH"]]; + } + [button setTarget: self]; + [button setAction: @selector(buttonAction:)]; [[self contentView] addSubview: button]; RELEASE (button);