X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Resources%2FEnglish.lproj%2FMainMenu.xib;h=b3d81baab01fbe1ab44ee32f9cf860184b805a4c;hp=98b5cef7620130d0295dbc5f6bc36566b2f3317d;hb=6cee2033d1c0fc0dacf444064305b9e7e87672a9;hpb=f8ae7787fe3fe272eaf04586e3007339c907fb33

diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib
index 98b5cef..b3d81ba 100644
--- a/Resources/English.lproj/MainMenu.xib
+++ b/Resources/English.lproj/MainMenu.xib
@@ -2,10 +2,10 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1080</int>
-		<string key="IBDocument.SystemVersion">12C2034</string>
+		<string key="IBDocument.SystemVersion">12D78</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.34</string>
-		<string key="IBDocument.HIToolboxVersion">625.00</string>
+		<string key="IBDocument.AppKitVersion">1187.37</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			<string key="NS.object.0">3084</string>
@@ -37,7 +37,6 @@
 			<string>NSToolbarFlexibleSpaceItem</string>
 			<string>NSToolbarItem</string>
 			<string>NSView</string>
-			<string>NSViewController</string>
 			<string>NSWindowTemplate</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
@@ -362,9 +361,11 @@
 							<string key="NSToolbarItemPaletteLabel">Enabled</string>
 							<nil key="NSToolbarItemToolTip"/>
 							<object class="NSButton" key="NSToolbarItemView" id="385218002">
-								<nil key="NSNextResponder"/>
+								<reference key="NSNextResponder"/>
 								<int key="NSvFlags">268</int>
 								<string key="NSFrame">{{7, 14}, {36, 25}}</string>
+								<reference key="NSSuperview"/>
+								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="NSEnabled">YES</bool>
 								<object class="NSButtonCell" key="NSCell" id="422366518">
@@ -410,9 +411,11 @@
 							<string key="NSToolbarItemPaletteLabel">Mapping Selector</string>
 							<nil key="NSToolbarItemToolTip"/>
 							<object class="NSButton" key="NSToolbarItemView" id="227597319">
-								<nil key="NSNextResponder"/>
+								<reference key="NSNextResponder"/>
 								<int key="NSvFlags">268</int>
 								<string key="NSFrame">{{0, 14}, {140, 25}}</string>
+								<reference key="NSSuperview"/>
+								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="NSEnabled">YES</bool>
 								<object class="NSButtonCell" key="NSCell" id="850080795">
@@ -567,7 +570,7 @@ aW5nLg</string>
 													<string key="NSFrameSize">{232, 321}</string>
 													<reference key="NSSuperview" ref="698362889"/>
 													<reference key="NSWindow"/>
-													<reference key="NSNextKeyView" ref="892486973"/>
+													<reference key="NSNextKeyView" ref="1036252745"/>
 													<bool key="NSEnabled">YES</bool>
 													<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 													<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -697,7 +700,7 @@ aW5nLg</string>
 									<string key="NSFrameSize">{234, 323}</string>
 									<reference key="NSSuperview" ref="734312853"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="698362889"/>
+									<reference key="NSNextKeyView" ref="892486973"/>
 									<int key="NSsFlags">150034</int>
 									<reference key="NSVScroller" ref="1036252745"/>
 									<reference key="NSHScroller" ref="892486973"/>
@@ -719,6 +722,31 @@ aW5nLg</string>
 							<reference key="NSNextResponder" ref="177223957"/>
 							<int key="NSvFlags">285</int>
 							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSButton" id="529992855">
+									<reference key="NSNextResponder" ref="471332453"/>
+									<int key="NSvFlags">268</int>
+									<string key="NSFrame">{{197, 157}, {193, 21}}</string>
+									<reference key="NSSuperview" ref="471332453"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="875916470"/>
+									<string key="NSReuseIdentifierKey">_NS:9</string>
+									<bool key="NSEnabled">YES</bool>
+									<object class="NSButtonCell" key="NSCell" id="420588612">
+										<int key="NSCellFlags">603979776</int>
+										<int key="NSCellFlags2">33554432</int>
+										<string key="NSContents">Unknown Mapping</string>
+										<reference key="NSSupport" ref="45863614"/>
+										<string key="NSCellIdentifier">_NS:9</string>
+										<reference key="NSControlView" ref="529992855"/>
+										<int key="NSButtonFlags">-2046672896</int>
+										<int key="NSButtonFlags2">129</int>
+										<string key="NSAlternateContents"/>
+										<string key="NSKeyEquivalent"/>
+										<int key="NSPeriodicDelay">200</int>
+										<int key="NSPeriodicInterval">25</int>
+									</object>
+									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+								</object>
 								<object class="NSSegmentedControl" id="875916470">
 									<reference key="NSNextResponder" ref="471332453"/>
 									<int key="NSvFlags">265</int>
@@ -959,7 +987,7 @@ aW5nLg</string>
 									<string key="NSFrame">{{188, 153}, {226, 26}}</string>
 									<reference key="NSSuperview" ref="471332453"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="875916470"/>
+									<reference key="NSNextKeyView" ref="529992855"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSPopUpButtonCell" key="NSCell" id="74311158">
 										<int key="NSCellFlags">-2076180416</int>
@@ -1191,7 +1219,7 @@ aW5nLg</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
 			<object class="NSCustomView" id="671181514">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="NSScrollView" id="443618264">
@@ -1207,7 +1235,8 @@ aW5nLg</string>
 										<int key="NSvFlags">256</int>
 										<string key="NSFrameSize">{198, 198}</string>
 										<reference key="NSSuperview" ref="947403733"/>
-										<reference key="NSNextKeyView" ref="553414014"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="968378655"/>
 										<bool key="NSEnabled">YES</bool>
 										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -1264,6 +1293,7 @@ aW5nLg</string>
 								</array>
 								<string key="NSFrame">{{1, 1}, {198, 198}}</string>
 								<reference key="NSSuperview" ref="443618264"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="762432499"/>
 								<reference key="NSDocView" ref="762432499"/>
 								<reference key="NSBGColor" ref="834857663"/>
@@ -1274,6 +1304,7 @@ aW5nLg</string>
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{306, 1}, {15, 403}}</string>
 								<reference key="NSSuperview" ref="443618264"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="861276216"/>
 								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<reference key="NSTarget" ref="443618264"/>
@@ -1285,6 +1316,7 @@ aW5nLg</string>
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{-100, -100}, {366, 16}}</string>
 								<reference key="NSSuperview" ref="443618264"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="947403733"/>
 								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<int key="NSsFlags">1</int>
@@ -1295,7 +1327,8 @@ aW5nLg</string>
 						</array>
 						<string key="NSFrame">{{0, 20}, {200, 200}}</string>
 						<reference key="NSSuperview" ref="671181514"/>
-						<reference key="NSNextKeyView" ref="947403733"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="553414014"/>
 						<int key="NSsFlags">150034</int>
 						<reference key="NSVScroller" ref="968378655"/>
 						<reference key="NSHScroller" ref="553414014"/>
@@ -1310,6 +1343,7 @@ aW5nLg</string>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{66, -1}, {68, 23}}</string>
 						<reference key="NSSuperview" ref="671181514"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1023366520"/>
 						<string key="NSReuseIdentifierKey">_NS:22</string>
 						<bool key="NSEnabled">YES</bool>
@@ -1338,6 +1372,7 @@ aW5nLg</string>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{0, -1}, {34, 23}}</string>
 						<reference key="NSSuperview" ref="671181514"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="456935010"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="867532725">
@@ -1364,6 +1399,7 @@ aW5nLg</string>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{166, -1}, {34, 23}}</string>
 						<reference key="NSSuperview" ref="671181514"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="828611353">
 							<int key="NSCellFlags">67108864</int>
@@ -1385,6 +1421,7 @@ aW5nLg</string>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{133, -1}, {34, 23}}</string>
 						<reference key="NSSuperview" ref="671181514"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1043784903"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="57592747">
@@ -1407,6 +1444,7 @@ aW5nLg</string>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{33, -1}, {34, 23}}</string>
 						<reference key="NSSuperview" ref="671181514"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="149148392"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="1008023024">
@@ -1430,30 +1468,11 @@ aW5nLg</string>
 					</object>
 				</array>
 				<string key="NSFrameSize">{200, 220}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<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="NSViewController" id="328152383"/>
-			<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">
@@ -1526,6 +1545,32 @@ aW5nLg</string>
 					</object>
 				</array>
 			</object>
+			<object class="NSCustomObject" id="207406104">
+				<string key="NSClassName">EnjoyableApplicationDelegate</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="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="NSCustomObject" id="647344717">
+				<string key="NSClassName">NJDeviceViewController</string>
+			</object>
+			<object class="NSCustomObject" id="70919963">
+				<string key="NSClassName">NJMappingsViewController</string>
+			</object>
 			<object class="NSCustomObject" id="9563326">
 				<string key="NSClassName">NJMappingMenuController</string>
 			</object>
@@ -1632,74 +1677,42 @@ aW5nLg</string>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
-						<reference key="source" ref="762432499"/>
-						<reference key="destination" ref="468285243"/>
+						<reference key="source" ref="808667431"/>
+						<reference key="destination" ref="207406104"/>
 					</object>
-					<int key="connectionID">517</int>
+					<int key="connectionID">977</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">dataSource</string>
 						<reference key="source" ref="762432499"/>
-						<reference key="destination" ref="468285243"/>
-					</object>
-					<int key="connectionID">518</int>
-				</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="IBActionConnection" key="connection">
-						<string key="label">translatingEventsChanged:</string>
-						<reference key="source" ref="1007832501"/>
-						<reference key="destination" ref="385218002"/>
+						<reference key="destination" ref="70919963"/>
 					</object>
-					<int key="connectionID">878</int>
+					<int key="connectionID">1001</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">translatingEventsButton</string>
-						<reference key="source" ref="1007832501"/>
-						<reference key="destination" ref="385218002"/>
-					</object>
-					<int key="connectionID">879</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">outlineView</string>
-						<reference key="source" ref="1007832501"/>
-						<reference key="destination" ref="365506042"/>
+						<string key="label">delegate</string>
+						<reference key="source" ref="762432499"/>
+						<reference key="destination" ref="70919963"/>
 					</object>
-					<int key="connectionID">648</int>
+					<int key="connectionID">1002</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">connectDevicePrompt</string>
+						<string key="label">mappingsController</string>
 						<reference key="source" ref="1007832501"/>
-						<reference key="destination" ref="12898323"/>
+						<reference key="destination" ref="468285243"/>
 					</object>
-					<int key="connectionID">915</int>
+					<int key="connectionID">822</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">hidSleepingPrompt</string>
+						<string key="label">delegate</string>
 						<reference key="source" ref="1007832501"/>
-						<reference key="destination" ref="918286878"/>
+						<reference key="destination" ref="207406104"/>
 					</object>
-					<int key="connectionID">976</int>
+					<int key="connectionID">1029</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
@@ -1733,14 +1746,6 @@ aW5nLg</string>
 					</object>
 					<int key="connectionID">930</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">mappingsMenu</string>
-						<reference key="source" ref="207406104"/>
-						<reference key="destination" ref="720053764"/>
-					</object>
-					<int key="connectionID">931</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">restoreToForeground:</string>
@@ -1751,131 +1756,91 @@ aW5nLg</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">removePressed:</string>
-						<reference key="source" ref="468285243"/>
-						<reference key="destination" ref="456935010"/>
-					</object>
-					<int key="connectionID">516</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">removeButton</string>
-						<reference key="source" ref="468285243"/>
-						<reference key="destination" ref="456935010"/>
-					</object>
-					<int key="connectionID">519</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">tableView</string>
-						<reference key="source" ref="468285243"/>
-						<reference key="destination" ref="762432499"/>
-					</object>
-					<int key="connectionID">520</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">exportPressed:</string>
-						<reference key="source" ref="468285243"/>
+						<string key="label">exportMappingClicked:</string>
+						<reference key="source" ref="207406104"/>
 						<reference key="destination" ref="888617891"/>
 					</object>
-					<int key="connectionID">815</int>
+					<int key="connectionID">1015</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">importPressed:</string>
-						<reference key="source" ref="468285243"/>
+						<string key="label">importMappingClicked:</string>
+						<reference key="source" ref="207406104"/>
 						<reference key="destination" ref="187155117"/>
 					</object>
-					<int key="connectionID">816</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">mappingPressed:</string>
-						<reference key="source" ref="468285243"/>
-						<reference key="destination" ref="227597319"/>
-					</object>
-					<int key="connectionID">855</int>
+					<int key="connectionID">1016</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">popover</string>
-						<reference key="source" ref="468285243"/>
-						<reference key="destination" ref="586993839"/>
+						<string key="label">mvc</string>
+						<reference key="source" ref="207406104"/>
+						<reference key="destination" ref="70919963"/>
 					</object>
-					<int key="connectionID">856</int>
+					<int key="connectionID">1024</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">popoverActivate</string>
-						<reference key="source" ref="468285243"/>
-						<reference key="destination" ref="227597319"/>
+						<string key="label">dvc</string>
+						<reference key="source" ref="207406104"/>
+						<reference key="destination" ref="647344717"/>
 					</object>
-					<int key="connectionID">857</int>
+					<int key="connectionID">1025</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">addPressed:</string>
-						<reference key="source" ref="468285243"/>
-						<reference key="destination" ref="861276216"/>
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">deviceController</string>
+						<reference key="source" ref="207406104"/>
+						<reference key="destination" ref="1007832501"/>
 					</object>
-					<int key="connectionID">515</int>
+					<int key="connectionID">1026</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">moveUpPressed:</string>
-						<reference key="source" ref="468285243"/>
-						<reference key="destination" ref="1023366520"/>
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">outputController</string>
+						<reference key="source" ref="207406104"/>
+						<reference key="destination" ref="801536542"/>
 					</object>
-					<int key="connectionID">899</int>
+					<int key="connectionID">1027</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">moveDownPressed:</string>
-						<reference key="source" ref="468285243"/>
-						<reference key="destination" ref="1043784903"/>
-					</object>
-					<int key="connectionID">900</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">moveUp</string>
-						<reference key="source" ref="468285243"/>
-						<reference key="destination" ref="1023366520"/>
+						<string key="label">simulatingEventsChanged:</string>
+						<reference key="source" ref="207406104"/>
+						<reference key="destination" ref="385218002"/>
 					</object>
-					<int key="connectionID">901</int>
+					<int key="connectionID">1030</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">moveDown</string>
-						<reference key="source" ref="468285243"/>
-						<reference key="destination" ref="1043784903"/>
+						<string key="label">simulatingEventsButton</string>
+						<reference key="source" ref="207406104"/>
+						<reference key="destination" ref="385218002"/>
 					</object>
-					<int key="connectionID">902</int>
+					<int key="connectionID">1031</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">addPressed:</string>
-						<reference key="source" ref="468285243"/>
+						<string key="label">performClick:</string>
+						<reference key="source" ref="861276216"/>
 						<reference key="destination" ref="331930027"/>
 					</object>
-					<int key="connectionID">971</int>
+					<int key="connectionID">1012</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">dataSource</string>
 						<reference key="source" ref="365506042"/>
-						<reference key="destination" ref="1007832501"/>
+						<reference key="destination" ref="647344717"/>
 					</object>
-					<int key="connectionID">647</int>
+					<int key="connectionID">990</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
 						<reference key="source" ref="365506042"/>
-						<reference key="destination" ref="1007832501"/>
+						<reference key="destination" ref="647344717"/>
 					</object>
-					<int key="connectionID">696</int>
+					<int key="connectionID">991</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
@@ -1885,14 +1850,6 @@ aW5nLg</string>
 					</object>
 					<int key="connectionID">821</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">mouseDirSelect</string>
@@ -2029,6 +1986,14 @@ aW5nLg</string>
 					</object>
 					<int key="connectionID">949</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">unknownMapping</string>
+						<reference key="source" ref="801536542"/>
+						<reference key="destination" ref="529992855"/>
+					</object>
+					<int key="connectionID">1022</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
@@ -2045,29 +2010,21 @@ aW5nLg</string>
 					</object>
 					<int key="connectionID">871</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="328152383"/>
-						<reference key="destination" ref="671181514"/>
-					</object>
-					<int key="connectionID">854</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">contentViewController</string>
 						<reference key="source" ref="586993839"/>
-						<reference key="destination" ref="328152383"/>
+						<reference key="destination" ref="70919963"/>
 					</object>
-					<int key="connectionID">852</int>
+					<int key="connectionID">996</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
 						<reference key="source" ref="586993839"/>
-						<reference key="destination" ref="468285243"/>
+						<reference key="destination" ref="70919963"/>
 					</object>
-					<int key="connectionID">853</int>
+					<int key="connectionID">1004</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
@@ -2093,14 +2050,6 @@ aW5nLg</string>
 					</object>
 					<int key="connectionID">933</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">eventTranslationToggle</string>
-						<reference key="source" ref="9563326"/>
-						<reference key="destination" ref="632598200"/>
-					</object>
-					<int key="connectionID">951</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">menu</string>
@@ -2117,6 +2066,14 @@ aW5nLg</string>
 					</object>
 					<int key="connectionID">956</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">eventSimulationToggle</string>
+						<reference key="source" ref="9563326"/>
+						<reference key="destination" ref="632598200"/>
+					</object>
+					<int key="connectionID">980</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">menu</string>
@@ -2135,11 +2092,11 @@ aW5nLg</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">eventTranslationToggle</string>
+						<string key="label">eventSimulationToggle</string>
 						<reference key="source" ref="427912652"/>
 						<reference key="destination" ref="803553950"/>
 					</object>
-					<int key="connectionID">959</int>
+					<int key="connectionID">979</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
@@ -2159,11 +2116,11 @@ aW5nLg</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">eventTranslationToggle</string>
+						<string key="label">eventSimulationToggle</string>
 						<reference key="source" ref="452957078"/>
 						<reference key="destination" ref="679462300"/>
 					</object>
-					<int key="connectionID">965</int>
+					<int key="connectionID">981</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
@@ -2173,6 +2130,142 @@ aW5nLg</string>
 					</object>
 					<int key="connectionID">969</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">hidStoppedNotice</string>
+						<reference key="source" ref="647344717"/>
+						<reference key="destination" ref="918286878"/>
+					</object>
+					<int key="connectionID">987</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">noDevicesNotice</string>
+						<reference key="source" ref="647344717"/>
+						<reference key="destination" ref="12898323"/>
+					</object>
+					<int key="connectionID">988</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">inputsTree</string>
+						<reference key="source" ref="647344717"/>
+						<reference key="destination" ref="365506042"/>
+					</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>
+						<reference key="source" ref="70919963"/>
+						<reference key="destination" ref="671181514"/>
+					</object>
+					<int key="connectionID">997</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">mappingTriggerClicked:</string>
+						<reference key="source" ref="70919963"/>
+						<reference key="destination" ref="496378711"/>
+					</object>
+					<int key="connectionID">998</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">mappingListTrigger</string>
+						<reference key="source" ref="70919963"/>
+						<reference key="destination" ref="227597319"/>
+					</object>
+					<int key="connectionID">999</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">mappingListPopover</string>
+						<reference key="source" ref="70919963"/>
+						<reference key="destination" ref="586993839"/>
+					</object>
+					<int key="connectionID">1000</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">mappingList</string>
+						<reference key="source" ref="70919963"/>
+						<reference key="destination" ref="762432499"/>
+					</object>
+					<int key="connectionID">1003</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">removeClicked:</string>
+						<reference key="source" ref="70919963"/>
+						<reference key="destination" ref="456935010"/>
+					</object>
+					<int key="connectionID">1005</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">removeMapping</string>
+						<reference key="source" ref="70919963"/>
+						<reference key="destination" ref="456935010"/>
+					</object>
+					<int key="connectionID">1006</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">addClicked:</string>
+						<reference key="source" ref="70919963"/>
+						<reference key="destination" ref="861276216"/>
+					</object>
+					<int key="connectionID">1007</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">moveDownClicked:</string>
+						<reference key="source" ref="70919963"/>
+						<reference key="destination" ref="1043784903"/>
+					</object>
+					<int key="connectionID">1008</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">moveUpClicked:</string>
+						<reference key="source" ref="70919963"/>
+						<reference key="destination" ref="1023366520"/>
+					</object>
+					<int key="connectionID">1009</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">moveDown</string>
+						<reference key="source" ref="70919963"/>
+						<reference key="destination" ref="1043784903"/>
+					</object>
+					<int key="connectionID">1010</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">moveUp</string>
+						<reference key="source" ref="70919963"/>
+						<reference key="destination" ref="1023366520"/>
+					</object>
+					<int key="connectionID">1011</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="70919963"/>
+						<reference key="destination" ref="207406104"/>
+					</object>
+					<int key="connectionID">1023</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -2511,12 +2604,6 @@ aW5nLg</string>
 						<reference key="object" ref="658903347"/>
 						<reference key="parent" ref="1043384830"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">850</int>
-						<reference key="object" ref="328152383"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Popover View Controller</string>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">851</int>
 						<reference key="object" ref="586993839"/>
@@ -2664,6 +2751,7 @@ aW5nLg</string>
 							<reference ref="385416822"/>
 							<reference ref="792189805"/>
 							<reference ref="20704797"/>
+							<reference ref="529992855"/>
 						</array>
 						<reference key="parent" ref="177223957"/>
 					</object>
@@ -3003,12 +3091,37 @@ aW5nLg</string>
 						<reference key="object" ref="543930440"/>
 						<reference key="parent" ref="918286878"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">983</int>
+						<reference key="object" ref="647344717"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">993</int>
+						<reference key="object" ref="70919963"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1020</int>
+						<reference key="object" ref="529992855"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="420588612"/>
+						</array>
+						<reference key="parent" ref="471332453"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1021</int>
+						<reference key="object" ref="420588612"/>
+						<reference key="parent" ref="529992855"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
 				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1020.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1021.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3114,7 +3227,6 @@ aW5nLg</string>
 				<string key="837.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="837.toolbarItem.selectable"/>
 				<string key="849.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="850.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="851.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="862.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="863.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3254,44 +3366,84 @@ aW5nLg</string>
 				<string key="970.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="974.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="975.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="983.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="993.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">976</int>
+			<int key="maxID">1031</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<object class="IBPartialClassDescription">
 					<string key="className">EnjoyableApplicationDelegate</string>
 					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">restoreToForeground:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">restoreToForeground:</string>
-						<object class="IBActionInfo" key="NS.object.0">
+					<dictionary class="NSMutableDictionary" key="actions">
+						<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:">
+							<string key="name">exportMappingClicked:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="importMappingClicked:">
+							<string key="name">importMappingClicked:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="restoreToForeground:">
 							<string key="name">restoreToForeground:</string>
 							<string key="candidateClassName">id</string>
 						</object>
-					</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="deviceController">NJDeviceController</string>
 						<string key="dockMenu">NSMenu</string>
+						<string key="dvc">NJDeviceViewController</string>
 						<string key="mappingsController">NJMappingsController</string>
+						<string key="mvc">NJMappingsViewController</string>
+						<string key="outputController">NJOutputController</string>
+						<string key="simulatingEventsButton">NSButton</string>
 						<string key="statusItemMenu">NSMenu</string>
 						<string key="window">NSWindow</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="deviceController">
+							<string key="name">deviceController</string>
+							<string key="candidateClassName">NJDeviceController</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="dockMenu">
 							<string key="name">dockMenu</string>
 							<string key="candidateClassName">NSMenu</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="dvc">
+							<string key="name">dvc</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="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>
+						<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>
@@ -3309,54 +3461,55 @@ aW5nLg</string>
 				<object class="IBPartialClassDescription">
 					<string key="className">NJDeviceController</string>
 					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">translatingEventsChanged:</string>
-						<string key="NS.object.0">NSButton</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">translatingEventsChanged:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">translatingEventsChanged:</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-					</object>
 					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="connectDevicePrompt">NSView</string>
-						<string key="hidSleepingPrompt">NSView</string>
+						<string key="delegate">id</string>
 						<string key="mappingsController">NJMappingsController</string>
-						<string key="outlineView">NSOutlineView</string>
-						<string key="outputController">NJOutputController</string>
-						<string key="translatingEventsButton">NSButton</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="connectDevicePrompt">
-							<string key="name">connectDevicePrompt</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="hidSleepingPrompt">
-							<string key="name">hidSleepingPrompt</string>
-							<string key="candidateClassName">NSView</string>
+						<object class="IBToOneOutletInfo" key="delegate">
+							<string key="name">delegate</string>
+							<string key="candidateClassName">id</string>
 						</object>
 						<object class="IBToOneOutletInfo" key="mappingsController">
 							<string key="name">mappingsController</string>
 							<string key="candidateClassName">NJMappingsController</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="outlineView">
-							<string key="name">outlineView</string>
-							<string key="candidateClassName">NSOutlineView</string>
+					</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>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="delegate">id</string>
+						<string key="hidStoppedNotice">NSView</string>
+						<string key="inputsTree">NSOutlineView</string>
+						<string key="noDevicesNotice">NSView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="delegate">
+							<string key="name">delegate</string>
+							<string key="candidateClassName">id</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="outputController">
-							<string key="name">outputController</string>
-							<string key="candidateClassName">NJOutputController</string>
+						<object class="IBToOneOutletInfo" key="hidStoppedNotice">
+							<string key="name">hidStoppedNotice</string>
+							<string key="candidateClassName">NSView</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="translatingEventsButton">
-							<string key="name">translatingEventsButton</string>
-							<string key="candidateClassName">NSButton</string>
+						<object class="IBToOneOutletInfo" key="inputsTree">
+							<string key="name">inputsTree</string>
+							<string key="candidateClassName">NSOutlineView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="noDevicesNotice">
+							<string key="name">noDevicesNotice</string>
+							<string key="candidateClassName">NSView</string>
 						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/NJDeviceController.h</string>
+						<string key="minorKey">./Classes/NJDeviceViewController.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -3383,7 +3536,7 @@ aW5nLg</string>
 					<string key="superclassName">NSObject</string>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="delegate">id</string>
-						<string key="eventTranslationToggle">NSMenuItem</string>
+						<string key="eventSimulationToggle">NSMenuItem</string>
 						<string key="menu">NSMenu</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -3391,8 +3544,8 @@ aW5nLg</string>
 							<string key="name">delegate</string>
 							<string key="candidateClassName">id</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="eventTranslationToggle">
-							<string key="name">eventTranslationToggle</string>
+						<object class="IBToOneOutletInfo" key="eventSimulationToggle">
+							<string key="name">eventSimulationToggle</string>
 							<string key="candidateClassName">NSMenuItem</string>
 						</object>
 						<object class="IBToOneOutletInfo" key="menu">
@@ -3408,54 +3561,69 @@ aW5nLg</string>
 				<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>
 					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="addPressed:">id</string>
-						<string key="exportPressed:">id</string>
-						<string key="importPressed:">id</string>
-						<string key="mappingPressed:">id</string>
-						<string key="moveDownPressed:">id</string>
-						<string key="moveUpPressed:">id</string>
-						<string key="removePressed:">id</string>
+						<string key="addClicked:">id</string>
+						<string key="mappingTriggerClicked:">id</string>
+						<string key="moveDownClicked:">id</string>
+						<string key="moveUpClicked:">id</string>
+						<string key="removeClicked:">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>
+						<object class="IBActionInfo" key="addClicked:">
+							<string key="name">addClicked:</string>
 							<string key="candidateClassName">id</string>
 						</object>
-						<object class="IBActionInfo" key="importPressed:">
-							<string key="name">importPressed:</string>
+						<object class="IBActionInfo" key="mappingTriggerClicked:">
+							<string key="name">mappingTriggerClicked:</string>
 							<string key="candidateClassName">id</string>
 						</object>
-						<object class="IBActionInfo" key="mappingPressed:">
-							<string key="name">mappingPressed:</string>
+						<object class="IBActionInfo" key="moveDownClicked:">
+							<string key="name">moveDownClicked:</string>
 							<string key="candidateClassName">id</string>
 						</object>
-						<object class="IBActionInfo" key="moveDownPressed:">
-							<string key="name">moveDownPressed:</string>
+						<object class="IBActionInfo" key="moveUpClicked:">
+							<string key="name">moveUpClicked:</string>
 							<string key="candidateClassName">id</string>
 						</object>
-						<object class="IBActionInfo" key="moveUpPressed:">
-							<string key="name">moveUpPressed:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="removePressed:">
-							<string key="name">removePressed:</string>
+						<object class="IBActionInfo" key="removeClicked:">
+							<string key="name">removeClicked:</string>
 							<string key="candidateClassName">id</string>
 						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="delegate">id</string>
+						<string key="mappingList">NSTableView</string>
+						<string key="mappingListPopover">NSPopover</string>
+						<string key="mappingListTrigger">NSButton</string>
 						<string key="moveDown">NSButton</string>
 						<string key="moveUp">NSButton</string>
-						<string key="popover">NSPopover</string>
-						<string key="popoverActivate">NSButton</string>
-						<string key="removeButton">NSButton</string>
-						<string key="tableView">NSTableView</string>
+						<string key="removeMapping">NSButton</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="delegate">
+							<string key="name">delegate</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mappingList">
+							<string key="name">mappingList</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mappingListPopover">
+							<string key="name">mappingListPopover</string>
+							<string key="candidateClassName">NSPopover</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mappingListTrigger">
+							<string key="name">mappingListTrigger</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="moveDown">
 							<string key="name">moveDown</string>
 							<string key="candidateClassName">NSButton</string>
@@ -3464,26 +3632,14 @@ aW5nLg</string>
 							<string key="name">moveUp</string>
 							<string key="candidateClassName">NSButton</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="popover">
-							<string key="name">popover</string>
-							<string key="candidateClassName">NSPopover</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="popoverActivate">
-							<string key="name">popoverActivate</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="removeButton">
-							<string key="name">removeButton</string>
+						<object class="IBToOneOutletInfo" key="removeMapping">
+							<string key="name">removeMapping</string>
 							<string key="candidateClassName">NSButton</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="tableView">
-							<string key="name">tableView</string>
-							<string key="candidateClassName">NSTableView</string>
-						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/NJMappingsController.h</string>
+						<string key="minorKey">./Classes/NJMappingsViewController.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -3529,7 +3685,6 @@ aW5nLg</string>
 						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="inputController">NJDeviceController</string>
 						<string key="keyInput">NJKeyInputField</string>
 						<string key="mappingPopup">NSPopUpButton</string>
 						<string key="mappingsController">NJMappingsController</string>
@@ -3541,12 +3696,9 @@ aW5nLg</string>
 						<string key="scrollSpeedSlider">NSSlider</string>
 						<string key="smoothCheck">NSButton</string>
 						<string key="title">NSTextField</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>
 						<object class="IBToOneOutletInfo" key="keyInput">
 							<string key="name">keyInput</string>
 							<string key="candidateClassName">NJKeyInputField</string>
@@ -3591,6 +3743,10 @@ aW5nLg</string>
 							<string key="name">title</string>
 							<string key="candidateClassName">NSTextField</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="unknownMapping">
+							<string key="name">unknownMapping</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>