Skip to content

Commit cd117b2

Browse files
alinebeealinebee
committed
Updated scripting definitions to allow programmatic switching to the Joysticks panel. Corrected some script links in help file.
1 parent d951a84 commit cd117b2

File tree

9 files changed

+36
-23
lines changed

9 files changed

+36
-23
lines changed

‎Boxer.xcodeproj/project.pbxproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
9F550667121B057C0042614A /* 35Diskette.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9F550664121B057C0042614A /* 35Diskette.icns */; };
8989
9F550668121B057C0042614A /* CDCase.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9F550665121B057C0042614A /* CDCase.icns */; };
9090
9F550669121B057C0042614A /* 525Diskette.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9F550666121B057C0042614A /* 525Diskette.icns */; };
91-
9F569BD51312DC620097A0E3 /* BoxerHelp in Resources */ = {isa = PBXBuildFile; fileRef = 9F569B831312DC620097A0E3 /* BoxerHelp */; };
9291
9F573C5A0F8E18B10089D8B7 /* NSWorkspace+BXMountedVolumes.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F573C590F8E18B10089D8B7 /* NSWorkspace+BXMountedVolumes.m */; };
9392
9F573D390F8E69AF0089D8B7 /* BXPackage.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F573D380F8E69AF0089D8B7 /* BXPackage.m */; };
9493
9F59D99810AE0956008DBBC1 /* BoxArtShine.png in Resources */ = {isa = PBXBuildFile; fileRef = 9F59D99710AE0956008DBBC1 /* BoxArtShine.png */; };
@@ -371,6 +370,7 @@
371370
9FF86679134DCA16001CE857 /* toc2cue in Resources */ = {isa = PBXBuildFile; fileRef = 9FF86677134DCA16001CE857 /* toc2cue */; };
372371
9FFAFE2D10DE33FB00728BAC /* GameProfiles.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9FFAFE2C10DE33FB00728BAC /* GameProfiles.plist */; };
373372
9FFAFE4310DE343F00728BAC /* Configurations in Resources */ = {isa = PBXBuildFile; fileRef = 9FFAFE2E10DE343F00728BAC /* Configurations */; };
373+
9FFB4AB013D052280003BB96 /* BoxerHelp in Resources */ = {isa = PBXBuildFile; fileRef = 9FFB4A5513D052280003BB96 /* BoxerHelp */; };
374374
9FFC2AC012A19CCC008C2B3B /* Sample Game Icons in Resources */ = {isa = PBXBuildFile; fileRef = 9FFC2ABF12A19CCC008C2B3B /* Sample Game Icons */; };
375375
9FFE1F831390F70C005C438A /* BXThrustmasterFCS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9FFE1F821390F70C005C438A /* BXThrustmasterFCS.mm */; };
376376
9FFF9728123269D1009B5EE5 /* NDAlias+AliasFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 9FFF9716123269D1009B5EE5 /* NDAlias+AliasFile.m */; };
@@ -552,7 +552,6 @@
552552
9F550664121B057C0042614A /* 35Diskette.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = 35Diskette.icns; sourceTree = "<group>"; };
553553
9F550665121B057C0042614A /* CDCase.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = CDCase.icns; sourceTree = "<group>"; };
554554
9F550666121B057C0042614A /* 525Diskette.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = 525Diskette.icns; sourceTree = "<group>"; };
555-
9F569B841312DC620097A0E3 /* English */ = {isa = PBXFileReference; explicitFileType = wrapper.htmld; name = English; path = English.lproj/BoxerHelp; sourceTree = "<group>"; };
556555
9F573C580F8E18B10089D8B7 /* NSWorkspace+BXMountedVolumes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSWorkspace+BXMountedVolumes.h"; sourceTree = "<group>"; };
557556
9F573C590F8E18B10089D8B7 /* NSWorkspace+BXMountedVolumes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSWorkspace+BXMountedVolumes.m"; sourceTree = "<group>"; };
558557
9F573D370F8E69AF0089D8B7 /* BXPackage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BXPackage.h; sourceTree = "<group>"; };
@@ -1071,6 +1070,7 @@
10711070
9FF86677134DCA16001CE857 /* toc2cue */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = toc2cue; sourceTree = "<group>"; };
10721071
9FFAFE2C10DE33FB00728BAC /* GameProfiles.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = GameProfiles.plist; sourceTree = "<group>"; };
10731072
9FFAFE2E10DE343F00728BAC /* Configurations */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Configurations; sourceTree = "<group>"; };
1073+
9FFB4A5613D052280003BB96 /* English */ = {isa = PBXFileReference; lastKnownFileType = folder; name = English; path = English.lproj/BoxerHelp; sourceTree = "<group>"; };
10741074
9FFBF67011A7F8F4000A1863 /* BXFrameRenderingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BXFrameRenderingView.h; sourceTree = "<group>"; };
10751075
9FFBF6AA11A811F7000A1863 /* BXEventConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BXEventConstants.h; sourceTree = "<group>"; };
10761076
9FFC2ABF12A19CCC008C2B3B /* Sample Game Icons */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "Sample Game Icons"; sourceTree = "<group>"; };
@@ -1232,9 +1232,9 @@
12321232
29B97317FDCFA39411CA2CEA /* Resources */ = {
12331233
isa = PBXGroup;
12341234
children = (
1235+
9FFB4A5513D052280003BB96 /* BoxerHelp */,
12351236
9FF86676134DCA16001CE857 /* cdrdao */,
12361237
9FF86677134DCA16001CE857 /* toc2cue */,
1237-
9F569B831312DC620097A0E3 /* BoxerHelp */,
12381238
9F70C19B129036C900A3627F /* Boxer.sdef */,
12391239
9FDCDEFC11B5B83B0032DA4E /* dsa_pub.pem */,
12401240
9FCBB2DB10A61E9300C28B09 /* Launch.conf */,
@@ -2480,7 +2480,6 @@
24802480
9FC5353512F489F8005E7670 /* 35DisketteShine.icns in Resources */,
24812481
9F2121E7130187A9002AB1B7 /* ShelfTemplateLeopard.jpg in Resources */,
24822482
9F2121E8130187A9002AB1B7 /* ShelfTemplateSnowLeopard.jpg in Resources */,
2483-
9F569BD51312DC620097A0E3 /* BoxerHelp in Resources */,
24842483
9FF86678134DCA16001CE857 /* cdrdao in Resources */,
24852484
9FF86679134DCA16001CE857 /* toc2cue in Resources */,
24862485
9FDE34131351DCDB000DCE44 /* DOSImportWindow.xib in Resources */,
@@ -2491,6 +2490,7 @@
24912490
9FA54099139E85D800999940 /* 4ButtonJoystick.png in Resources */,
24922491
9F7FC94C139EB38300D60320 /* RacingWheel.png in Resources */,
24932492
9FD012E313AB845200AF6FE8 /* GamepadTemplate.pdf in Resources */,
2493+
9FFB4AB013D052280003BB96 /* BoxerHelp in Resources */,
24942494
);
24952495
runOnlyForDeploymentPostprocessing = 0;
24962496
};
@@ -2905,14 +2905,6 @@
29052905
name = MainMenu.xib;
29062906
sourceTree = "<group>";
29072907
};
2908-
9F569B831312DC620097A0E3 /* BoxerHelp */ = {
2909-
isa = PBXVariantGroup;
2910-
children = (
2911-
9F569B841312DC620097A0E3 /* English */,
2912-
);
2913-
name = BoxerHelp;
2914-
sourceTree = "<group>";
2915-
};
29162908
9F59DEDD10B01743008DBBC1 /* ProgramPanel.xib */ = {
29172909
isa = PBXVariantGroup;
29182910
children = (
@@ -3003,6 +2995,14 @@
30032995
name = ImportRenameTip.png;
30042996
sourceTree = "<group>";
30052997
};
2998+
9FFB4A5513D052280003BB96 /* BoxerHelp */ = {
2999+
isa = PBXVariantGroup;
3000+
children = (
3001+
9FFB4A5613D052280003BB96 /* English */,
3002+
);
3003+
name = BoxerHelp;
3004+
sourceTree = "<group>";
3005+
};
30063006
/* End PBXVariantGroup section */
30073007

30083008
/* Begin XCBuildConfiguration section */

‎Boxer/BXInspectorController.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ enum {
1515
BXGameInspectorPanelTag = 0,
1616
BXCPUInspectorPanelTag = 1,
1717
BXMouseInspectorPanelTag = 2,
18-
BXDriveInspectorPanelTag = 3
18+
BXDriveInspectorPanelTag = 3,
19+
BXJoystickInspectorPanelTag = 4
1920
};
2021

2122

@@ -42,6 +43,7 @@ enum {
4243
- (IBAction) showCPUPanel: (id)sender;
4344
- (IBAction) showDrivesPanel: (id)sender;
4445
- (IBAction) showMousePanel: (id)sender;
46+
- (IBAction) showJoystickPanel: (id)sender;
4547

4648
//Show help pages for the various panels
4749
- (IBAction) showGamePanelHelp: (id)sender;

‎Boxer/BXInspectorController.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ - (IBAction) showGamePanel: (id)sender { [self setSelectedTabViewItemIndex: BXG
197197
- (IBAction) showCPUPanel: (id)sender { [self setSelectedTabViewItemIndex: BXCPUInspectorPanelTag]; [self showWindow: sender]; }
198198
- (IBAction) showMousePanel: (id)sender { [self setSelectedTabViewItemIndex: BXMouseInspectorPanelTag]; [self showWindow: sender]; }
199199
- (IBAction) showDrivesPanel: (id)sender { [self setSelectedTabViewItemIndex: BXDriveInspectorPanelTag]; [self showWindow: sender]; }
200+
- (IBAction) showJoystickPanel: (id)sender { [self setSelectedTabViewItemIndex: BXJoystickInspectorPanelTag]; [self showWindow: sender]; }
200201

201202
- (void) tabView: (NSTabView *)tabView didSelectTabViewItem: (NSTabViewItem *)tabViewItem
202203
{

‎Resources/Boxer.sdef

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
<enumerator name="Drives panel" code="DIpn">
3434
<cocoa integer-value="3"/>
3535
</enumerator>
36+
<enumerator name="Joystick panel" code="JIpn">
37+
<cocoa integer-value="4"/>
38+
</enumerator>
3639
</enumeration>
3740

3841
<class-extension extends="application" description="The Boxer application.">

‎Resources/English.lproj/BoxerHelp/BoxerHelp.helpindex

0 Bytes
Binary file not shown.

‎Resources/English.lproj/BoxerHelp/pages/drives.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
55
<title>Adding and removing DOS drives</title>
6-
<meta name="description" content="What to do when it’s time to insert disc 2.">
6+
<meta name="description" content="Using the Drives Inspector to add and remove emulated floppy drives, hard drives and CD-ROM drives.">
77
<meta name="keywords" content="disk, disc, mount, imgmount, eject, cdrom, cd-rom">
88

99
<link rel="stylesheet" type="text/css" href="../shared/styles/main.css">
@@ -38,7 +38,7 @@ <h3>To add a drive to DOS:</h3>
3838
<a name="removing-drives"></a>
3939
<h3>To remove a drive from DOS:</h3>
4040
<ul>
41-
<li><strong>Drag the drive out of the Drives Inspector</strong> until the cursor becomes a puff-of-smoke, and then release it.</li>
41+
<li><strong>Drag the drive out of the Drives Inspector</strong> until the cursor changes to a puff of smoke, and then release it.</li>
4242

4343
<li>You can also <strong>select the drive and click the <img src="../shared/images/eject-drive-button.png" alt="-" width="38" height="22" style="vertical-align: bottom"> button</strong>. But that’s not quite as fun.</li>
4444
</ul>

‎Resources/English.lproj/BoxerHelp/pages/keyboard-and-mouse.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ <h2>Preventing arrow-keys from switching OS&nbsp;X Spaces</h2>
118118
<p>The default OS&nbsp;X keyboard shortcuts to switch Spaces are <kbd>Ctrl ^</kbd>+<kbd>⇠</kbd><kbd>⇡</kbd><kbd>⇣</kbd><kbd>⇢</kbd>. These can interfere with games that use <kbd>Ctrl ^</kbd> as an action button. You can change or disable these shortcuts:</p>
119119

120120
<ul>
121-
<li><strong>In OS&nbsp;X 10.6 and below</strong>, via the <a href="help:runscript=BoxerHelp/shared/scripts/opensystemprefs.scpt string='com.apple.preference.spaces'" rel="other-application">Exposé and Spaces preferences pane</a>.</li>
121+
<li><strong>In OS&nbsp;X 10.6 and below</strong>, via the <a href="help:runscript=BoxerHelp/shared/scripts/opensystemprefs.scpt string='com.apple.preference.expose'" rel="other-application">Exposé and Spaces preferences pane</a>.</li>
122122

123123
<li><strong>In OS&nbsp;X 10.7</strong>, via the <a href="help:runscript=BoxerHelp/shared/scripts/opensystemprefs.scpt string='com.apple.preference.keyboard'" rel="other-application">Keyboard preferences pane</a> instead.</li>
124124
</ul>

‎Resources/English.lproj/BoxerHelp/shared/scripts/openinspector.scpt

224 Bytes
Binary file not shown.

‎Resources/English.lproj/InspectorPanel.xib

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</object>
2222
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
2323
<bool key="EncodedWithXMLCoder">YES</bool>
24-
<integer value="1071"/>
24+
<integer value="125"/>
2525
</object>
2626
<object class="NSArray" key="IBDocument.PluginDependencies">
2727
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -123,7 +123,7 @@
123123
<object class="NSMutableArray" key="NSTabViewItems">
124124
<bool key="EncodedWithXMLCoder">YES</bool>
125125
<object class="NSTabViewItem" id="45197897">
126-
<string key="NSIdentifier">1</string>
126+
<string key="NSIdentifier">0</string>
127127
<object class="NSView" key="NSView" id="428256279">
128128
<nil key="NSNextResponder"/>
129129
<int key="NSvFlags">256</int>
@@ -459,7 +459,7 @@
459459
<reference key="NSTabView" ref="681208964"/>
460460
</object>
461461
<object class="NSTabViewItem" id="670612504">
462-
<string key="NSIdentifier">2</string>
462+
<string key="NSIdentifier">1</string>
463463
<object class="NSView" key="NSView" id="708850558">
464464
<nil key="NSNextResponder"/>
465465
<int key="NSvFlags">256</int>
@@ -929,7 +929,7 @@
929929
<reference key="NSTabView" ref="681208964"/>
930930
</object>
931931
<object class="NSTabViewItem" id="1056279122">
932-
<string key="NSIdentifier">3</string>
932+
<string key="NSIdentifier">2</string>
933933
<object class="NSView" key="NSView" id="194898093">
934934
<reference key="NSNextResponder" ref="681208964"/>
935935
<int key="NSvFlags">256</int>
@@ -1217,7 +1217,7 @@
12171217
<reference key="NSTabView" ref="681208964"/>
12181218
</object>
12191219
<object class="NSTabViewItem" id="79271469">
1220-
<string key="NSIdentifier">4</string>
1220+
<string key="NSIdentifier">3</string>
12211221
<object class="NSView" key="NSView" id="732220087">
12221222
<nil key="NSNextResponder"/>
12231223
<int key="NSvFlags">256</int>
@@ -1463,7 +1463,7 @@
14631463
<reference key="NSTabView" ref="681208964"/>
14641464
</object>
14651465
<object class="NSTabViewItem" id="970355323">
1466-
<string key="NSIdentifier">5</string>
1466+
<string key="NSIdentifier">4</string>
14671467
<object class="NSView" key="NSView" id="1019944720">
14681468
<nil key="NSNextResponder"/>
14691469
<int key="NSvFlags">256</int>
@@ -5403,7 +5403,7 @@ A</string>
54035403
</object>
54045404
<string>BXSegmentedCell</string>
54055405
<string>com.binarymethod.BGHUDAppKitPlugin</string>
5406-
<integer value="3"/>
5406+
<integer value="4"/>
54075407
<string>com.binarymethod.BGHUDAppKitPlugin</string>
54085408
<string>com.binarymethod.BGHUDAppKitPlugin</string>
54095409
<string>com.binarymethod.BGHUDAppKitPlugin</string>
@@ -6312,6 +6312,7 @@ A</string>
63126312
<string>showGamePanel:</string>
63136313
<string>showGamePanelHelp:</string>
63146314
<string>showInactiveJoystickPanelHelp:</string>
6315+
<string>showJoystickPanel:</string>
63156316
<string>showJoystickPanelHelp:</string>
63166317
<string>showMousePanel:</string>
63176318
<string>showMousePanelHelp:</string>
@@ -6328,6 +6329,7 @@ A</string>
63286329
<string>id</string>
63296330
<string>id</string>
63306331
<string>id</string>
6332+
<string>id</string>
63316333
</object>
63326334
</object>
63336335
<object class="NSMutableDictionary" key="actionInfosByName">
@@ -6341,6 +6343,7 @@ A</string>
63416343
<string>showGamePanel:</string>
63426344
<string>showGamePanelHelp:</string>
63436345
<string>showInactiveJoystickPanelHelp:</string>
6346+
<string>showJoystickPanel:</string>
63446347
<string>showJoystickPanelHelp:</string>
63456348
<string>showMousePanel:</string>
63466349
<string>showMousePanelHelp:</string>
@@ -6375,6 +6378,10 @@ A</string>
63756378
<string key="name">showInactiveJoystickPanelHelp:</string>
63766379
<string key="candidateClassName">id</string>
63776380
</object>
6381+
<object class="IBActionInfo">
6382+
<string key="name">showJoystickPanel:</string>
6383+
<string key="candidateClassName">id</string>
6384+
</object>
63786385
<object class="IBActionInfo">
63796386
<string key="name">showJoystickPanelHelp:</string>
63806387
<string key="candidateClassName">id</string>

0 commit comments

Comments
 (0)