X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=1a87bd74e4dee4e83603236f19111e32363b238f;hp=c2ebf64845f91c20d37da52ed1cbe2352d88dfe3;hb=d0f4d54bb9eb66cbd19fa4dabb56fc09f42bd22d;hpb=e2a4d830dd9817f6a515a3b1b6aa152d3bb98c2b

diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index c2ebf64..1a87bd7 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -1125,16 +1125,16 @@
 				<nil key="NSDelegate"/>
 			</object>
 			<object class="NSCustomObject" id="207406104">
-				<string key="NSClassName">ApplicationController</string>
+				<string key="NSClassName">EnjoyableApplicationDelegate</string>
 			</object>
 			<object class="NSCustomObject" id="468285243">
 				<string key="NSClassName">NJMappingsController</string>
 			</object>
 			<object class="NSCustomObject" id="1007832501">
-				<string key="NSClassName">NJInputController</string>
+				<string key="NSClassName">NJDeviceController</string>
 			</object>
 			<object class="NSCustomObject" id="801536542">
-				<string key="NSClassName">TargetController</string>
+				<string key="NSClassName">NJOutputController</string>
 			</object>
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -1277,19 +1277,19 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">targetController</string>
+						<string key="label">mappingsController</string>
 						<reference key="source" ref="1007832501"/>
-						<reference key="destination" ref="801536542"/>
+						<reference key="destination" ref="468285243"/>
 					</object>
-					<int key="connectionID">695</int>
+					<int key="connectionID">822</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">mappingsController</string>
+						<string key="label">outputController</string>
 						<reference key="source" ref="1007832501"/>
-						<reference key="destination" ref="468285243"/>
+						<reference key="destination" ref="801536542"/>
 					</object>
-					<int key="connectionID">822</int>
+					<int key="connectionID">826</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
@@ -1339,14 +1339,6 @@
 					</object>
 					<int key="connectionID">611</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">targetController</string>
-						<reference key="source" ref="207406104"/>
-						<reference key="destination" ref="801536542"/>
-					</object>
-					<int key="connectionID">712</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">dockMenuBase</string>
@@ -1371,6 +1363,14 @@
 					</object>
 					<int key="connectionID">820</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">outputController</string>
+						<reference key="source" ref="207406104"/>
+						<reference key="destination" ref="801536542"/>
+					</object>
+					<int key="connectionID">825</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">addPressed:</string>
@@ -1403,14 +1403,6 @@
 					</object>
 					<int key="connectionID">520</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">targetController</string>
-						<reference key="source" ref="468285243"/>
-						<reference key="destination" ref="801536542"/>
-					</object>
-					<int key="connectionID">697</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">exportPressed:</string>
@@ -1427,6 +1419,14 @@
 					</object>
 					<int key="connectionID">816</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">outputController</string>
+						<reference key="source" ref="468285243"/>
+						<reference key="destination" ref="801536542"/>
+					</object>
+					<int key="connectionID">827</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">dataSource</string>
@@ -1451,14 +1451,6 @@
 					</object>
 					<int key="connectionID">692</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">joystickController</string>
-						<reference key="source" ref="801536542"/>
-						<reference key="destination" ref="1007832501"/>
-					</object>
-					<int key="connectionID">694</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">title</string>
@@ -1555,6 +1547,14 @@
 					</object>
 					<int key="connectionID">824</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">inputController</string>
+						<reference key="source" ref="801536542"/>
+						<reference key="destination" ref="1007832501"/>
+					</object>
+					<int key="connectionID">828</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">keyDelegate</string>
@@ -2233,151 +2233,10 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">824</int>
+			<int key="maxID">828</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">ApplicationController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">toggleActivity:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">toggleActivity:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">toggleActivity:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="activeButton">NSToolbarItem</string>
-						<string key="activeMenuItem">NSMenuItem</string>
-						<string key="configsController">ConfigsController</string>
-						<string key="dockMenuBase">NSMenu</string>
-						<string key="drawer">NSDrawer</string>
-						<string key="jsController">JoystickController</string>
-						<string key="mainWindow">NSWindow</string>
-						<string key="targetController">TargetController</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="activeButton">
-							<string key="name">activeButton</string>
-							<string key="candidateClassName">NSToolbarItem</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="activeMenuItem">
-							<string key="name">activeMenuItem</string>
-							<string key="candidateClassName">NSMenuItem</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="configsController">
-							<string key="name">configsController</string>
-							<string key="candidateClassName">ConfigsController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="dockMenuBase">
-							<string key="name">dockMenuBase</string>
-							<string key="candidateClassName">NSMenu</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="drawer">
-							<string key="name">drawer</string>
-							<string key="candidateClassName">NSDrawer</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="jsController">
-							<string key="name">jsController</string>
-							<string key="candidateClassName">JoystickController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="mainWindow">
-							<string key="name">mainWindow</string>
-							<string key="candidateClassName">NSWindow</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="targetController">
-							<string key="name">targetController</string>
-							<string key="candidateClassName">TargetController</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ApplicationController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ConfigsController</string>
-					<string key="superclassName">NSObject</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="addPressed:">id</string>
-						<string key="exportPressed:">id</string>
-						<string key="importPressed:">id</string>
-						<string key="removePressed:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="addPressed:">
-							<string key="name">addPressed:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="exportPressed:">
-							<string key="name">exportPressed:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="importPressed:">
-							<string key="name">importPressed:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="removePressed:">
-							<string key="name">removePressed:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="removeButton">NSButton</string>
-						<string key="tableView">NSTableView</string>
-						<string key="targetController">TargetController</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="removeButton">
-							<string key="name">removeButton</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableView">
-							<string key="name">tableView</string>
-							<string key="candidateClassName">NSTableView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="targetController">
-							<string key="name">targetController</string>
-							<string key="candidateClassName">TargetController</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ConfigsController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">JoystickController</string>
-					<string key="superclassName">NSObject</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="configsController">ConfigsController</string>
-						<string key="outlineView">NSOutlineView</string>
-						<string key="targetController">TargetController</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="configsController">
-							<string key="name">configsController</string>
-							<string key="candidateClassName">ConfigsController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="outlineView">
-							<string key="name">outlineView</string>
-							<string key="candidateClassName">NSOutlineView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="targetController">
-							<string key="name">targetController</string>
-							<string key="candidateClassName">TargetController</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/JoystickController.h</string>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NJKeyInputField</string>
 					<string key="superclassName">NSTextField</string>
@@ -2397,92 +2256,6 @@
 						<string key="minorKey">./Classes/NJKeyInputField.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">TargetController</string>
-					<string key="superclassName">NSObject</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="configChosen:">id</string>
-						<string key="mbtnChanged:">id</string>
-						<string key="mdirChanged:">id</string>
-						<string key="radioChanged:">id</string>
-						<string key="sdirChanged:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="configChosen:">
-							<string key="name">configChosen:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="mbtnChanged:">
-							<string key="name">mbtnChanged:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="mdirChanged:">
-							<string key="name">mdirChanged:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="radioChanged:">
-							<string key="name">radioChanged:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="sdirChanged:">
-							<string key="name">sdirChanged:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="configPopup">NSPopUpButton</string>
-						<string key="configsController">ConfigsController</string>
-						<string key="joystickController">JoystickController</string>
-						<string key="keyInput">NJKeyInputField</string>
-						<string key="mouseBtnSelect">NSSegmentedControl</string>
-						<string key="mouseDirSelect">NSSegmentedControl</string>
-						<string key="radioButtons">NSMatrix</string>
-						<string key="scrollDirSelect">NSSegmentedControl</string>
-						<string key="title">NSTextField</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="configPopup">
-							<string key="name">configPopup</string>
-							<string key="candidateClassName">NSPopUpButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="configsController">
-							<string key="name">configsController</string>
-							<string key="candidateClassName">ConfigsController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="joystickController">
-							<string key="name">joystickController</string>
-							<string key="candidateClassName">JoystickController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="keyInput">
-							<string key="name">keyInput</string>
-							<string key="candidateClassName">NJKeyInputField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="mouseBtnSelect">
-							<string key="name">mouseBtnSelect</string>
-							<string key="candidateClassName">NSSegmentedControl</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="mouseDirSelect">
-							<string key="name">mouseDirSelect</string>
-							<string key="candidateClassName">NSSegmentedControl</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="radioButtons">
-							<string key="name">radioButtons</string>
-							<string key="candidateClassName">NSMatrix</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="scrollDirSelect">
-							<string key="name">scrollDirSelect</string>
-							<string key="candidateClassName">NSSegmentedControl</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="title">
-							<string key="name">title</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/TargetController.h</string>
-					</object>
-				</object>
 			</array>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>