X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Resources%2FEnglish.lproj%2FMainMenu.xib;h=7a2e668d755eee9521cc0a20056333208083eac1;hp=0c068fcde2a303464564ac534602af10f0e527b5;hb=7c9337b7789b0e940cc71f02c7cb7bd92dd2de70;hpb=93d9951d6bd16b37e88b8fb6c38bc4afd6c9401e

diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib
index 0c068fc..7a2e668 100644
--- a/Resources/English.lproj/MainMenu.xib
+++ b/Resources/English.lproj/MainMenu.xib
@@ -361,10 +361,9 @@
 							<string key="NSToolbarItemPaletteLabel">Enabled</string>
 							<nil key="NSToolbarItemToolTip"/>
 							<object class="NSButton" key="NSToolbarItemView" id="385218002">
-								<reference key="NSNextResponder"/>
+								<nil key="NSNextResponder"/>
 								<int key="NSvFlags">268</int>
 								<string key="NSFrame">{{7, 14}, {36, 25}}</string>
-								<reference key="NSSuperview"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="NSEnabled">YES</bool>
 								<object class="NSButtonCell" key="NSCell" id="422366518">
@@ -410,10 +409,9 @@
 							<string key="NSToolbarItemPaletteLabel">Mapping Selector</string>
 							<nil key="NSToolbarItemToolTip"/>
 							<object class="NSButton" key="NSToolbarItemView" id="227597319">
-								<reference key="NSNextResponder"/>
+								<nil key="NSNextResponder"/>
 								<int key="NSvFlags">268</int>
 								<string key="NSFrame">{{0, 14}, {140, 25}}</string>
-								<reference key="NSSuperview"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="NSEnabled">YES</bool>
 								<object class="NSButtonCell" key="NSCell" id="850080795">
@@ -1295,7 +1293,7 @@ aW5nLg</string>
 				<string key="NSClassName">NJInputController</string>
 			</object>
 			<object class="NSCustomObject" id="801536542">
-				<string key="NSClassName">NJOutputController</string>
+				<string key="NSClassName">NJOutputViewController</string>
 			</object>
 			<object class="NSCustomObject" id="647344717">
 				<string key="NSClassName">NJDeviceViewController</string>
@@ -1765,14 +1763,6 @@ aW5nLg</string>
 					</object>
 					<int key="connectionID">1025</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">1027</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">simulatingEventsChanged:</string>
@@ -1791,11 +1781,19 @@ aW5nLg</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">inputController</string>
+						<string key="label">ic</string>
 						<reference key="source" ref="207406104"/>
 						<reference key="destination" ref="1007832501"/>
 					</object>
-					<int key="connectionID">1032</int>
+					<int key="connectionID">1036</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">oc</string>
+						<reference key="source" ref="207406104"/>
+						<reference key="destination" ref="801536542"/>
+					</object>
+					<int key="connectionID">1037</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
@@ -1967,11 +1965,11 @@ aW5nLg</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">inputController</string>
+						<string key="label">delegate</string>
 						<reference key="source" ref="801536542"/>
-						<reference key="destination" ref="1007832501"/>
+						<reference key="destination" ref="207406104"/>
 					</object>
-					<int key="connectionID">1034</int>
+					<int key="connectionID">1035</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
@@ -3346,7 +3344,7 @@ aW5nLg</string>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">1034</int>
+			<int key="maxID">1037</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3380,9 +3378,9 @@ aW5nLg</string>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="dockMenu">NSMenu</string>
 						<string key="dvc">NJDeviceViewController</string>
-						<string key="inputController">NJInputController</string>
+						<string key="ic">NJInputController</string>
 						<string key="mvc">NJMappingsViewController</string>
-						<string key="outputController">NJOutputController</string>
+						<string key="oc">NJOutputViewController</string>
 						<string key="simulatingEventsButton">NSButton</string>
 						<string key="statusItemMenu">NSMenu</string>
 						<string key="window">NSWindow</string>
@@ -3396,17 +3394,17 @@ aW5nLg</string>
 							<string key="name">dvc</string>
 							<string key="candidateClassName">NJDeviceViewController</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="inputController">
-							<string key="name">inputController</string>
+						<object class="IBToOneOutletInfo" key="ic">
+							<string key="name">ic</string>
 							<string key="candidateClassName">NJInputController</string>
 						</object>
 						<object class="IBToOneOutletInfo" key="mvc">
 							<string key="name">mvc</string>
 							<string key="candidateClassName">NJMappingsViewController</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="outputController">
-							<string key="name">outputController</string>
-							<string key="candidateClassName">NJOutputController</string>
+						<object class="IBToOneOutletInfo" key="oc">
+							<string key="name">oc</string>
+							<string key="candidateClassName">NJOutputViewController</string>
 						</object>
 						<object class="IBToOneOutletInfo" key="simulatingEventsButton">
 							<string key="name">simulatingEventsButton</string>
@@ -3600,7 +3598,7 @@ aW5nLg</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">NJOutputController</string>
+					<string key="className">NJOutputViewController</string>
 					<string key="superclassName">NSObject</string>
 					<dictionary class="NSMutableDictionary" key="actions">
 						<string key="mbtnChanged:">id</string>
@@ -3642,7 +3640,7 @@ aW5nLg</string>
 						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="inputController">NJInputController</string>
+						<string key="delegate">id</string>
 						<string key="keyInput">NJKeyInputField</string>
 						<string key="mappingPopup">NSPopUpButton</string>
 						<string key="mouseBtnSelect">NSSegmentedControl</string>
@@ -3656,9 +3654,9 @@ aW5nLg</string>
 						<string key="unknownMapping">NSButton</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="inputController">
-							<string key="name">inputController</string>
-							<string key="candidateClassName">NJInputController</string>
+						<object class="IBToOneOutletInfo" key="delegate">
+							<string key="name">delegate</string>
+							<string key="candidateClassName">id</string>
 						</object>
 						<object class="IBToOneOutletInfo" key="keyInput">
 							<string key="name">keyInput</string>
@@ -3707,7 +3705,7 @@ aW5nLg</string>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/NJOutputController.h</string>
+						<string key="minorKey">./Classes/NJOutputViewController.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">