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

diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib
index b2cc462..7a2e668 100644
--- a/Resources/English.lproj/MainMenu.xib
+++ b/Resources/English.lproj/MainMenu.xib
@@ -1214,6 +1214,101 @@ aW5nLg</string>
 				<string key="NSFrameAutosaveName">Enjoyable</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
+			<object class="NSMenu" id="388664617">
+				<string key="NSTitle"/>
+				<array class="NSMutableArray" key="NSMenuItems">
+					<object class="NSMenuItem" id="679462300">
+						<reference key="NSMenu" ref="388664617"/>
+						<string key="NSTitle">Enable</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+					</object>
+					<object class="NSMenuItem" id="462014786">
+						<reference key="NSMenu" ref="388664617"/>
+						<bool key="NSIsDisabled">YES</bool>
+						<bool key="NSIsSeparator">YES</bool>
+						<string key="NSTitle"/>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+					</object>
+					<object class="NSMenuItem" id="937740972">
+						<reference key="NSMenu" ref="388664617"/>
+						<bool key="NSIsDisabled">YES</bool>
+						<bool key="NSIsSeparator">YES</bool>
+						<string key="NSTitle"/>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+					</object>
+					<object class="NSMenuItem" id="548842355">
+						<reference key="NSMenu" ref="388664617"/>
+						<string key="NSTitle">Show Enjoyable</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+					</object>
+					<object class="NSMenuItem" id="567028745">
+						<reference key="NSMenu" ref="388664617"/>
+						<string key="NSTitle">Quit Enjoyable</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+					</object>
+				</array>
+			</object>
+			<object class="NSMenu" id="330397624">
+				<string key="NSTitle"/>
+				<array class="NSMutableArray" key="NSMenuItems">
+					<object class="NSMenuItem" id="803553950">
+						<reference key="NSMenu" ref="330397624"/>
+						<string key="NSTitle">Enable</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+					</object>
+					<object class="NSMenuItem" id="598206649">
+						<reference key="NSMenu" ref="330397624"/>
+						<bool key="NSIsDisabled">YES</bool>
+						<bool key="NSIsSeparator">YES</bool>
+						<string key="NSTitle"/>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+					</object>
+				</array>
+			</object>
+			<object class="NSCustomObject" id="207406104">
+				<string key="NSClassName">EnjoyableApplicationDelegate</string>
+			</object>
+			<object class="NSCustomObject" id="1007832501">
+				<string key="NSClassName">NJInputController</string>
+			</object>
+			<object class="NSCustomObject" id="801536542">
+				<string key="NSClassName">NJOutputViewController</string>
+			</object>
+			<object class="NSCustomObject" id="647344717">
+				<string key="NSClassName">NJDeviceViewController</string>
+			</object>
+			<object class="NSCustomObject" id="70919963">
+				<string key="NSClassName">NJMappingsViewController</string>
+			</object>
+			<object class="NSPopover" id="586993839">
+				<nil key="NSNextResponder"/>
+				<int key="NSAppearance">0</int>
+				<int key="NSBehavior">1</int>
+				<double key="NSContentWidth">0.0</double>
+				<double key="NSContentHeight">0.0</double>
+				<bool key="NSAnimates">YES</bool>
+			</object>
 			<object class="NSCustomView" id="671181514">
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
@@ -1469,98 +1564,6 @@ aW5nLg</string>
 				<reference key="NSNextKeyView" ref="443618264"/>
 				<string key="NSClassName">NSView</string>
 			</object>
-			<object class="NSCustomObject" id="207406104">
-				<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">NJDeviceController</string>
-			</object>
-			<object class="NSCustomObject" id="801536542">
-				<string key="NSClassName">NJOutputController</string>
-			</object>
-			<object class="NSPopover" id="586993839">
-				<nil key="NSNextResponder"/>
-				<int key="NSAppearance">0</int>
-				<int key="NSBehavior">1</int>
-				<double key="NSContentWidth">0.0</double>
-				<double key="NSContentHeight">0.0</double>
-				<bool key="NSAnimates">YES</bool>
-			</object>
-			<object class="NSMenu" id="388664617">
-				<string key="NSTitle"/>
-				<array class="NSMutableArray" key="NSMenuItems">
-					<object class="NSMenuItem" id="679462300">
-						<reference key="NSMenu" ref="388664617"/>
-						<string key="NSTitle">Enable</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-					</object>
-					<object class="NSMenuItem" id="462014786">
-						<reference key="NSMenu" ref="388664617"/>
-						<bool key="NSIsDisabled">YES</bool>
-						<bool key="NSIsSeparator">YES</bool>
-						<string key="NSTitle"/>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-					</object>
-					<object class="NSMenuItem" id="937740972">
-						<reference key="NSMenu" ref="388664617"/>
-						<bool key="NSIsDisabled">YES</bool>
-						<bool key="NSIsSeparator">YES</bool>
-						<string key="NSTitle"/>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-					</object>
-					<object class="NSMenuItem" id="548842355">
-						<reference key="NSMenu" ref="388664617"/>
-						<string key="NSTitle">Show Enjoyable</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-					</object>
-					<object class="NSMenuItem" id="567028745">
-						<reference key="NSMenu" ref="388664617"/>
-						<string key="NSTitle">Quit Enjoyable</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-					</object>
-				</array>
-			</object>
-			<object class="NSMenu" id="330397624">
-				<string key="NSTitle"/>
-				<array class="NSMutableArray" key="NSMenuItems">
-					<object class="NSMenuItem" id="803553950">
-						<reference key="NSMenu" ref="330397624"/>
-						<string key="NSTitle">Enable</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-					</object>
-					<object class="NSMenuItem" id="598206649">
-						<reference key="NSMenu" ref="330397624"/>
-						<bool key="NSIsDisabled">YES</bool>
-						<bool key="NSIsSeparator">YES</bool>
-						<string key="NSTitle"/>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-					</object>
-				</array>
-			</object>
 			<object class="NSCustomObject" id="9563326">
 				<string key="NSClassName">NJMappingMenuController</string>
 			</object>
@@ -1573,12 +1576,6 @@ aW5nLg</string>
 			<object class="NSCustomObject" id="665704974">
 				<string key="NSClassName">SUUpdater</string>
 			</object>
-			<object class="NSCustomObject" id="647344717">
-				<string key="NSClassName">NJDeviceViewController</string>
-			</object>
-			<object class="NSCustomObject" id="70919963">
-				<string key="NSClassName">NJMappingsViewController</string>
-			</object>
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<array class="NSMutableArray" key="connectionRecords">
@@ -1696,67 +1693,11 @@ aW5nLg</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">mappingsController</string>
-						<reference key="source" ref="1007832501"/>
-						<reference key="destination" ref="468285243"/>
-					</object>
-					<int key="connectionID">822</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">outputController</string>
-						<reference key="source" ref="1007832501"/>
-						<reference key="destination" ref="801536542"/>
-					</object>
-					<int key="connectionID">826</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">connectDevicePrompt</string>
-						<reference key="source" ref="1007832501"/>
-						<reference key="destination" ref="12898323"/>
-					</object>
-					<int key="connectionID">915</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">hidSleepingPrompt</string>
-						<reference key="source" ref="1007832501"/>
-						<reference key="destination" ref="918286878"/>
-					</object>
-					<int key="connectionID">976</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">simulatingEventsChanged:</string>
-						<reference key="source" ref="1007832501"/>
-						<reference key="destination" ref="385218002"/>
-					</object>
-					<int key="connectionID">978</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">simulatingEventsButton</string>
-						<reference key="source" ref="1007832501"/>
-						<reference key="destination" ref="385218002"/>
-					</object>
-					<int key="connectionID">982</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">devicesViewController</string>
+						<string key="label">delegate</string>
 						<reference key="source" ref="1007832501"/>
-						<reference key="destination" ref="647344717"/>
-					</object>
-					<int key="connectionID">992</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">mappingsController</string>
-						<reference key="source" ref="207406104"/>
-						<reference key="destination" ref="468285243"/>
+						<reference key="destination" ref="207406104"/>
 					</object>
-					<int key="connectionID">820</int>
+					<int key="connectionID">1029</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
@@ -1814,53 +1755,69 @@ aW5nLg</string>
 					</object>
 					<int key="connectionID">1024</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dvc</string>
+						<reference key="source" ref="207406104"/>
+						<reference key="destination" ref="647344717"/>
+					</object>
+					<int key="connectionID">1025</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">performClick:</string>
-						<reference key="source" ref="861276216"/>
-						<reference key="destination" ref="331930027"/>
+						<string key="label">simulatingEventsChanged:</string>
+						<reference key="source" ref="207406104"/>
+						<reference key="destination" ref="385218002"/>
 					</object>
-					<int key="connectionID">1012</int>
+					<int key="connectionID">1030</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">mvc</string>
-						<reference key="source" ref="468285243"/>
-						<reference key="destination" ref="70919963"/>
+						<string key="label">simulatingEventsButton</string>
+						<reference key="source" ref="207406104"/>
+						<reference key="destination" ref="385218002"/>
 					</object>
-					<int key="connectionID">995</int>
+					<int key="connectionID">1031</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">dataSource</string>
-						<reference key="source" ref="365506042"/>
-						<reference key="destination" ref="647344717"/>
+						<string key="label">ic</string>
+						<reference key="source" ref="207406104"/>
+						<reference key="destination" ref="1007832501"/>
 					</object>
-					<int key="connectionID">990</int>
+					<int key="connectionID">1036</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="365506042"/>
-						<reference key="destination" ref="647344717"/>
+						<string key="label">oc</string>
+						<reference key="source" ref="207406104"/>
+						<reference key="destination" ref="801536542"/>
 					</object>
-					<int key="connectionID">991</int>
+					<int key="connectionID">1037</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performClick:</string>
+						<reference key="source" ref="861276216"/>
+						<reference key="destination" ref="331930027"/>
+					</object>
+					<int key="connectionID">1012</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">mappingsController</string>
-						<reference key="source" ref="801536542"/>
-						<reference key="destination" ref="468285243"/>
+						<string key="label">dataSource</string>
+						<reference key="source" ref="365506042"/>
+						<reference key="destination" ref="647344717"/>
 					</object>
-					<int key="connectionID">821</int>
+					<int key="connectionID">990</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"/>
+						<string key="label">delegate</string>
+						<reference key="source" ref="365506042"/>
+						<reference key="destination" ref="647344717"/>
 					</object>
-					<int key="connectionID">828</int>
+					<int key="connectionID">991</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
@@ -2006,6 +1963,14 @@ aW5nLg</string>
 					</object>
 					<int key="connectionID">1022</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="801536542"/>
+						<reference key="destination" ref="207406104"/>
+					</object>
+					<int key="connectionID">1035</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
@@ -2142,14 +2107,6 @@ aW5nLg</string>
 					</object>
 					<int key="connectionID">969</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="647344717"/>
-						<reference key="destination" ref="1007832501"/>
-					</object>
-					<int key="connectionID">984</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">hidStoppedNotice</string>
@@ -2174,6 +2131,14 @@ aW5nLg</string>
 					</object>
 					<int key="connectionID">989</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="647344717"/>
+						<reference key="destination" ref="207406104"/>
+					</object>
+					<int key="connectionID">1028</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">view</string>
@@ -2549,11 +2514,6 @@ aW5nLg</string>
 						<reference key="object" ref="1008023024"/>
 						<reference key="parent" ref="456935010"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">514</int>
-						<reference key="object" ref="468285243"/>
-						<reference key="parent" ref="0"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">479</int>
 						<reference key="object" ref="1007832501"/>
@@ -3183,7 +3143,6 @@ aW5nLg</string>
 				</object>
 				<string key="511.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="512.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="514.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3385,7 +3344,7 @@ aW5nLg</string>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">1024</int>
+			<int key="maxID">1037</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3396,6 +3355,7 @@ aW5nLg</string>
 						<string key="exportMappingClicked:">id</string>
 						<string key="importMappingClicked:">id</string>
 						<string key="restoreToForeground:">id</string>
+						<string key="simulatingEventsChanged:">NSButton</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
 						<object class="IBActionInfo" key="exportMappingClicked:">
@@ -3410,11 +3370,18 @@ aW5nLg</string>
 							<string key="name">restoreToForeground:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="simulatingEventsChanged:">
+							<string key="name">simulatingEventsChanged:</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="dockMenu">NSMenu</string>
-						<string key="mappingsController">NJMappingsController</string>
+						<string key="dvc">NJDeviceViewController</string>
+						<string key="ic">NJInputController</string>
 						<string key="mvc">NJMappingsViewController</string>
+						<string key="oc">NJOutputViewController</string>
+						<string key="simulatingEventsButton">NSButton</string>
 						<string key="statusItemMenu">NSMenu</string>
 						<string key="window">NSWindow</string>
 					</dictionary>
@@ -3423,14 +3390,26 @@ aW5nLg</string>
 							<string key="name">dockMenu</string>
 							<string key="candidateClassName">NSMenu</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="mappingsController">
-							<string key="name">mappingsController</string>
-							<string key="candidateClassName">NJMappingsController</string>
+						<object class="IBToOneOutletInfo" key="dvc">
+							<string key="name">dvc</string>
+							<string key="candidateClassName">NJDeviceViewController</string>
+						</object>
+						<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="oc">
+							<string key="name">oc</string>
+							<string key="candidateClassName">NJOutputViewController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="simulatingEventsButton">
+							<string key="name">simulatingEventsButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="statusItemMenu">
 							<string key="name">statusItemMenu</string>
 							<string key="candidateClassName">NSMenu</string>
@@ -3445,49 +3424,6 @@ aW5nLg</string>
 						<string key="minorKey">./Classes/EnjoyableApplicationDelegate.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NJDeviceController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">simulatingEventsChanged:</string>
-						<string key="NS.object.0">NSButton</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">simulatingEventsChanged:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">simulatingEventsChanged:</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="devicesViewController">NJDeviceViewController</string>
-						<string key="mappingsController">NJMappingsController</string>
-						<string key="outputController">NJOutputController</string>
-						<string key="simulatingEventsButton">NSButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="devicesViewController">
-							<string key="name">devicesViewController</string>
-							<string key="candidateClassName">NJDeviceViewController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="mappingsController">
-							<string key="name">mappingsController</string>
-							<string key="candidateClassName">NJMappingsController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="outputController">
-							<string key="name">outputController</string>
-							<string key="candidateClassName">NJOutputController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="simulatingEventsButton">
-							<string key="name">simulatingEventsButton</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/NJDeviceController.h</string>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NJDeviceViewController</string>
 					<string key="superclassName">NSObject</string>
@@ -3520,6 +3456,25 @@ aW5nLg</string>
 						<string key="minorKey">./Classes/NJDeviceViewController.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NJInputController</string>
+					<string key="superclassName">NSObject</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">delegate</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">delegate</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">delegate</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NJInputController.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NJKeyInputField</string>
 					<string key="superclassName">NSControl</string>
@@ -3566,14 +3521,6 @@ aW5nLg</string>
 						<string key="minorKey">./Classes/NJMappingMenuController.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NJMappingsController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/NJMappingsController.h</string>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NJMappingsViewController</string>
 					<string key="superclassName">NSViewController</string>
@@ -3651,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>
@@ -3693,10 +3640,9 @@ aW5nLg</string>
 						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="inputController">NJDeviceController</string>
+						<string key="delegate">id</string>
 						<string key="keyInput">NJKeyInputField</string>
 						<string key="mappingPopup">NSPopUpButton</string>
-						<string key="mappingsController">NJMappingsController</string>
 						<string key="mouseBtnSelect">NSSegmentedControl</string>
 						<string key="mouseDirSelect">NSSegmentedControl</string>
 						<string key="mouseSpeedSlider">NSSlider</string>
@@ -3708,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">NJDeviceController</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>
@@ -3720,10 +3666,6 @@ aW5nLg</string>
 							<string key="name">mappingPopup</string>
 							<string key="candidateClassName">NSPopUpButton</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="mappingsController">
-							<string key="name">mappingsController</string>
-							<string key="candidateClassName">NJMappingsController</string>
-						</object>
 						<object class="IBToOneOutletInfo" key="mouseBtnSelect">
 							<string key="name">mouseBtnSelect</string>
 							<string key="candidateClassName">NSSegmentedControl</string>
@@ -3763,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">