From ef2415293be8f827baeea1ab2473d6c97d890081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?A=20C=C5=93ur?= <coeur@gmx.fr>
Date: Sat, 26 Nov 2022 06:01:29 +0800
Subject: [PATCH] we do not support LevelButtonLevelTrace (#4236)

---
 macosx/MessageWindow.xib          |  1 -
 macosx/MessageWindowController.mm | 11 ++---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/macosx/MessageWindow.xib b/macosx/MessageWindow.xib
index 6bf9cb04b..18e148126 100644
--- a/macosx/MessageWindow.xib
+++ b/macosx/MessageWindow.xib
@@ -49,7 +49,6 @@
                                     <menuItem title="Warn" image="NSStatusPartiallyAvailable" id="menuItemWarn"/>
                                     <menuItem title="Info" image="NSStatusAvailable" id="menuItemInfo"/>
                                     <menuItem title="Debug" image="NSStatusNone" id="menuItemDebug"/>
-                                    <menuItem title="Trace" image="NSStatusNone" id="menuItemTracer"/>
                                 </items>
                             </menu>
                         </popUpButtonCell>
diff --git a/macosx/MessageWindowController.mm b/macosx/MessageWindowController.mm
index 50a0a2360..0b8caf9f2 100644
--- a/macosx/MessageWindowController.mm
+++ b/macosx/MessageWindowController.mm
@@ -16,7 +16,7 @@ typedef NS_ENUM(NSUInteger, LevelButtonLevel) {
     LevelButtonLevelWarn = 1,
     LevelButtonLevelInfo = 2,
     LevelButtonLevelDebug = 3,
-    LevelButtonLevelTrace = 4,
+    // we do not support LevelButtonLevelTrace, as it would overwhelm everything (#4233)
 };
 
 static NSTimeInterval const kUpdateSeconds = 0.75;
@@ -71,12 +71,10 @@ static NSTimeInterval const kUpdateSeconds = 0.75;
     [self.fLevelButton itemAtIndex:LevelButtonLevelWarn].title = NSLocalizedString(@"Warning", "Message window -> level string");
     [self.fLevelButton itemAtIndex:LevelButtonLevelInfo].title = NSLocalizedString(@"Info", "Message window -> level string");
     [self.fLevelButton itemAtIndex:LevelButtonLevelDebug].title = NSLocalizedString(@"Debug", "Message window -> level string");
-    [self.fLevelButton itemAtIndex:LevelButtonLevelTrace].title = NSLocalizedString(@"Trace", "Message window -> level string");
     [self.fLevelButton itemAtIndex:LevelButtonLevelError].image = [self.class iconForLevel:TR_LOG_ERROR];
     [self.fLevelButton itemAtIndex:LevelButtonLevelWarn].image = [self.class iconForLevel:TR_LOG_WARN];
     [self.fLevelButton itemAtIndex:LevelButtonLevelInfo].image = [self.class iconForLevel:TR_LOG_INFO];
     [self.fLevelButton itemAtIndex:LevelButtonLevelDebug].image = [self.class iconForLevel:TR_LOG_DEBUG];
-    [self.fLevelButton itemAtIndex:LevelButtonLevelTrace].image = [self.class iconForLevel:TR_LOG_TRACE];
 
     CGFloat const levelButtonOldWidth = NSWidth(self.fLevelButton.frame);
     [self.fLevelButton sizeToFit];
@@ -127,10 +125,8 @@ static NSTimeInterval const kUpdateSeconds = 0.75;
         [self.fLevelButton selectItemAtIndex:LevelButtonLevelInfo];
         break;
     case TR_LOG_DEBUG:
-        [self.fLevelButton selectItemAtIndex:LevelButtonLevelDebug];
-        break;
     case TR_LOG_TRACE:
-        [self.fLevelButton selectItemAtIndex:LevelButtonLevelTrace];
+        [self.fLevelButton selectItemAtIndex:LevelButtonLevelDebug];
         break;
     default: //safety
         [NSUserDefaults.standardUserDefaults setInteger:TR_LOG_ERROR forKey:@"MessageLevel"];
@@ -401,9 +397,6 @@ static NSTimeInterval const kUpdateSeconds = 0.75;
     case LevelButtonLevelDebug:
         level = TR_LOG_DEBUG;
         break;
-    case LevelButtonLevelTrace:
-        level = TR_LOG_TRACE;
-        break;
     default:
         NSAssert1(NO, @"Unknown message log level: %ld", [self.fLevelButton indexOfSelectedItem]);
         level = TR_LOG_INFO;