version bump

Ample.xcodeproj/project.pbxproj

@@ -2460,7 +2460,7 @@
 				CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 56;
+				CURRENT_PROJECT_VERSION = 58;
 				DEVELOPMENT_TEAM = 583V9CR5RE;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2473,7 +2473,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = "0.264-u2";
+				MARKETING_VERSION = "0.266-u2";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ksherlock.ample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -2486,7 +2486,7 @@
 				CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 56;
+				CURRENT_PROJECT_VERSION = 58;
 				DEVELOPMENT_TEAM = 583V9CR5RE;
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2499,7 +2499,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = "0.264-u2";
+				MARKETING_VERSION = "0.266-u2";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ksherlock.ample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -2512,7 +2512,7 @@
 				CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 56;
+				CURRENT_PROJECT_VERSION = 58;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -2525,7 +2525,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 0.264;
+				MARKETING_VERSION = 0.266;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.ksherlock.ample-lite";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -2538,7 +2538,7 @@
 				CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 56;
+				CURRENT_PROJECT_VERSION = 58;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PREPROCESSOR_DEFINITIONS = "AMPLE_LITE=1";
 				INFOPLIST_FILE = Ample/Info.plist;
@@ -2547,7 +2547,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 0.264;
+				MARKETING_VERSION = 0.266;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.ksherlock.ample-lite";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};

Ample/Ample.h

@@ -33,6 +33,7 @@ extern NSString *kMamePath;
 extern NSString *kMameWorkingDirectory;
 extern NSString *kAutoCloseLogWindow;
 extern NSString *kMameComponentsDate;
+extern NSString *kUseLogWindow;
 
 extern NSString *kDownloadURL;
 extern NSString *kDownloadExtension;

Ample/Ample.m

@@ -129,6 +129,7 @@ NSString *kUseCustomMame = @"UseCustomMame";
 NSString *kMamePath = @"MamePath";
 NSString *kMameWorkingDirectory = @"MameWorkingDirectory";
 NSString *kAutoCloseLogWindow = @"AutoCloseLogWindow";
+NSString *kUseLogWindow = @"UseLogWindow";
 NSString *kMameComponentsDate = @"MameComponentsDate";
 NSString *kDefaultDownloadURL = @"DefaultDownloadURL";
 NSString *kDefaultDownloadExtension = @"DefaultDownloadExtension";

Ample/Base.lproj/Preferences.xib

@@ -26,7 +26,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Oz5-Xb-btk">
-                        <rect key="frame" x="138" y="181" width="322" height="21"/>
+                        <rect key="frame" x="138" y="159" width="322" height="21"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="vDR-2V-qxd">
                             <font key="font" usesAppearanceFont="YES"/>
@@ -40,7 +40,7 @@
                         </connections>
                     </textField>
                     <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="l8V-pC-gml">
-                        <rect key="frame" x="138" y="150" width="322" height="21"/>
+                        <rect key="frame" x="138" y="128" width="322" height="21"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="wfj-GY-Qu2">
                             <font key="font" usesAppearanceFont="YES"/>
@@ -49,12 +49,12 @@
                         </textFieldCell>
                         <connections>
                             <action selector="wdChanged:" target="-2" id="g1P-8l-ZXi"/>
-                            <binding destination="yvB-HG-64y" name="enabled" keyPath="values.UseCustomMame" id="DeG-OW-Gd2"/>
                             <binding destination="yvB-HG-64y" name="value" keyPath="values.MameWorkingDirectory" id="Kc9-Pc-XGU"/>
+                            <binding destination="yvB-HG-64y" name="enabled" keyPath="values.UseCustomMame" id="DeG-OW-Gd2"/>
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vTJ-Ez-c1R">
-                        <rect key="frame" x="18" y="153" width="114" height="16"/>
+                        <rect key="frame" x="18" y="131" width="114" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" title="Working Directory" id="UHt-0s-zxA">
                             <font key="font" metaFont="system"/>
@@ -63,7 +63,7 @@
                         </textFieldCell>
                     </textField>
                     <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="KAN-P2-ydI">
-                        <rect key="frame" x="136" y="234" width="217" height="18"/>
+                        <rect key="frame" x="136" y="212" width="217" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" title="Close log window on normal exit" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="QMz-O0-06U">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -74,7 +74,7 @@
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="j7D-jC-17Q">
-                        <rect key="frame" x="136" y="208" width="139" height="18"/>
+                        <rect key="frame" x="136" y="186" width="139" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <buttonCell key="cell" type="check" title="Use Custom MAME" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="V61-mz-QFo">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -96,7 +96,7 @@
                         </connections>
                     </button>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Qmb-Ag-Xyr">
-                        <rect key="frame" x="58" y="184" width="74" height="16"/>
+                        <rect key="frame" x="58" y="162" width="74" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" title="MAME Path" id="Xcq-4g-Wlw">
                             <font key="font" metaFont="system"/>
@@ -104,9 +104,20 @@
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
+                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qT7-cc-Phc">
+                        <rect key="frame" x="136" y="234" width="118" height="18"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="check" title="Use log window" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Adv-KH-abG">
+                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <binding destination="yvB-HG-64y" name="value" keyPath="values.UseLogWindow" id="meK-Jb-s8b"/>
+                        </connections>
+                    </button>
                 </subviews>
             </view>
-            <point key="canvasLocation" x="140" y="147"/>
+            <point key="canvasLocation" x="80" y="144"/>
         </window>
         <userDefaultsController id="KVS-Ag-1un"/>
         <userDefaultsController representsSharedInstance="YES" id="yvB-HG-64y"/>

Ample/Defaults.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>MameComponentsDate</key>
-	<date>2024-03-27T12:00:00Z</date>
+	<date>2024-05-31T12:00:00Z</date>
 	<key>UseCustomMame</key>
 	<false/>
 	<key>AutoCloseLogWindow</key>
@@ -16,6 +16,8 @@
 	<true/>
 	<key>DefaultDownloadURL</key>
 	<string>https://archive.org/download/mame-merged/mame-merged</string>
+	<key>UseLogWindow</key>
+	<true/>
 	<key>DefaultDownloadExtension</key>
 	<string>zip</string>
 </dict>

Ample/LogWindowController.m

@@ -34,7 +34,7 @@ static NSMutableSet *LogWindows;
 }
 
 
-+(id)controllerForTask: (NSTask *)task close: (BOOL)close{
++(id)controllerForTask: (NSTask *)task close: (BOOL)close {
     LogWindowController *controller = [[LogWindowController alloc] initWithWindowNibName: @"LogWindow"];
     [controller runTask: task close: close];
     return controller;
@@ -43,6 +43,8 @@ static NSMutableSet *LogWindows;
 
 +(id)controllerForArgs: (NSArray *)args close: (BOOL)close {
 
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    
     NSURL *url = MameURL();
 
     if (!url) {
@@ -65,6 +67,30 @@ static NSMutableSet *LogWindows;
     
     [task setArguments: args];
     
+    if ([defaults boolForKey: kUseLogWindow] == NO) {
+
+        NSAlert *alert = nil;
+        if (@available(macOS 10.13, *)) {
+            NSError *error = nil;
+
+            [task launchAndReturnError: &error];
+            if (error) {
+                alert = [NSAlert alertWithError: error];
+            }
+        } else {
+            @try {
+                [task launch];
+            } @catch (NSException *exception) {
+
+                alert = [NSAlert new];
+                [alert setMessageText: [exception reason]];
+            }
+        }
+        if (alert) [alert runModal];
+        return nil;
+    }
+    
+    
     return [LogWindowController controllerForTask: task close: close];
 
 }

Ample/Resources/mac128k.plist

@@ -123,6 +123,14 @@
             <key>devname</key>
             <string>mackbd_m0110t</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>jp</string>
+            <key>description</key>
+            <string>Macintosh Keyboard (Japanese - M0110J)</string>
+            <key>devname</key>
+            <string>mackbd_m0110j</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>us</string>
@@ -335,6 +343,14 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>jp</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (Japanese - M0110J)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>us</string>
@@ -429,6 +445,14 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>jp</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (Japanese - M0110J)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>us</string>

Ample/Resources/mac512k.plist

@@ -123,6 +123,14 @@
             <key>devname</key>
             <string>mackbd_m0110t</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>jp</string>
+            <key>description</key>
+            <string>Macintosh Keyboard (Japanese - M0110J)</string>
+            <key>devname</key>
+            <string>mackbd_m0110j</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>us</string>
@@ -335,6 +343,14 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>jp</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (Japanese - M0110J)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>us</string>
@@ -429,6 +445,14 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>jp</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (Japanese - M0110J)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>us</string>

Ample/Resources/mac512ke.plist

@@ -158,6 +158,14 @@
             <key>devname</key>
             <string>mackbd_m0110t</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>jp</string>
+            <key>description</key>
+            <string>Macintosh Keyboard (Japanese - M0110J)</string>
+            <key>devname</key>
+            <string>mackbd_m0110j</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>us</string>
@@ -370,6 +378,14 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>jp</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (Japanese - M0110J)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>us</string>
@@ -464,6 +480,14 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>jp</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (Japanese - M0110J)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>us</string>

Ample/Resources/macplus.plist

@@ -202,6 +202,14 @@
             <key>devname</key>
             <string>mackbd_m0110t</string>
           </dict>
+          <dict>
+            <key>value</key>
+            <string>jp</string>
+            <key>description</key>
+            <string>Macintosh Keyboard (Japanese - M0110J)</string>
+            <key>devname</key>
+            <string>mackbd_m0110j</string>
+          </dict>
           <dict>
             <key>value</key>
             <string>us</string>
@@ -786,6 +794,14 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>jp</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (Japanese - M0110J)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>us</string>
@@ -880,6 +896,14 @@
                 <key>default</key>
                 <false/>
               </dict>
+              <dict>
+                <key>value</key>
+                <string>jp</string>
+                <key>description</key>
+                <string>Macintosh Keyboard (Japanese - M0110J)</string>
+                <key>default</key>
+                <false/>
+              </dict>
               <dict>
                 <key>value</key>
                 <string>us</string>