From e8de3db99c9ff969b8f889f682c224272f03a4f7 Mon Sep 17 00:00:00 2001 From: rogerman Date: Fri, 8 Apr 2022 01:27:08 -0700 Subject: [PATCH] Cocoa Port: If OpenGL is the Video Output Engine, then drop the revision number from the engine name in the troubleshooting forms. - The only OpenGL version with a revision number is v1.2.1, but the Cocoa port will always use v2.0 or higher. So let's remove the revision number to make things look cleaner. - Also change the tags "DESMUME RUNTIME INFORMATION" to "DESMUME TROUBLESHOOTING INFORMATION", which is more explanatory when the information is copy/pasted into whatever text field it appears in. --- desmume/src/frontend/cocoa/userinterface/MacOGLDisplayView.mm | 2 +- .../cocoa/userinterface/troubleshootingWindowDelegate.mm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/desmume/src/frontend/cocoa/userinterface/MacOGLDisplayView.mm b/desmume/src/frontend/cocoa/userinterface/MacOGLDisplayView.mm index 7444fa799..605a09305 100644 --- a/desmume/src/frontend/cocoa/userinterface/MacOGLDisplayView.mm +++ b/desmume/src/frontend/cocoa/userinterface/MacOGLDisplayView.mm @@ -156,7 +156,7 @@ MacOGLClientFetchObject::MacOGLClientFetchObject() CGLSetCurrentContext(prevContext); - snprintf(_name, sizeof(_name) - 1, "macOS OpenGL v%i.%i.%i", _contextInfo->GetVersionMajor(), _contextInfo->GetVersionMinor(), _contextInfo->GetVersionRevision()); + snprintf(_name, sizeof(_name) - 1, "macOS OpenGL v%i.%i", _contextInfo->GetVersionMajor(), _contextInfo->GetVersionMinor()); strlcpy(_description, _contextInfo->GetRendererString(), sizeof(_description) - 1); _clientData = [[MacClientSharedObject alloc] init]; diff --git a/desmume/src/frontend/cocoa/userinterface/troubleshootingWindowDelegate.mm b/desmume/src/frontend/cocoa/userinterface/troubleshootingWindowDelegate.mm index 0de18d09b..c68fa675e 100644 --- a/desmume/src/frontend/cocoa/userinterface/troubleshootingWindowDelegate.mm +++ b/desmume/src/frontend/cocoa/userinterface/troubleshootingWindowDelegate.mm @@ -95,7 +95,7 @@ romSerialStr = unspecifiedStr; } - NSString *finalFormTextStr = @"[ BEGIN DESMUME RUNTIME INFORMATION ]\n"; + NSString *finalFormTextStr = @"[ BEGIN DESMUME TROUBLESHOOTING INFORMATION ]\n"; finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nApp Version: "] stringByAppendingString:appVersionStr]; finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nOperating System: "] stringByAppendingString:[CocoaDSUtil operatingSystemString]]; finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nModel Identifier: "] stringByAppendingString:[CocoaDSUtil modelIdentifierString]]; @@ -188,7 +188,7 @@ [bindings setValue:NSSTRING_TITLE_GO_BUG_REPORT_WEBPAGE_TITLE forKey:@"goWebpageButtonTitle"]; } - finalFormTextStr = [finalFormTextStr stringByAppendingString:@"\n\n[ END DESMUME RUNTIME INFORMATION ]"]; + finalFormTextStr = [finalFormTextStr stringByAppendingString:@"\n\n[ END DESMUME TROUBLESHOOTING INFORMATION ]"]; [bindings setValue:finalFormTextStr forKey:@"finalFormText"];