X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=cc6ba0138b08dd1791e501e08e482c2f776f8e82;hp=2e2b440547bda0ba63ccaa264acddef2a7f92ce3;hb=3eb4949fe4554cb4a32e1237571da4a96d26978c;hpb=ca998dd950f0b1900b21dc05cf57987d09b4e70e

diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 2e2b440..cc6ba01 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -240,6 +240,7 @@
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="35465992"/>
 									<reference key="NSMixedImage" ref="502551668"/>
+									<int key="NSTag">1</int>
 								</object>
 							</array>
 						</object>
@@ -301,9 +302,6 @@
 				</array>
 				<string key="NSName">_NSMainMenu</string>
 			</object>
-			<object class="NSCustomObject" id="755631768">
-				<string key="NSClassName">NSFontManager</string>
-			</object>
 			<object class="NSWindowTemplate" id="808667431">
 				<int key="NSWindowStyleMask">15</int>
 				<int key="NSWindowBacking">2</int>
@@ -327,19 +325,17 @@
 							<object class="NSMutableString" key="NSToolbarItemIdentifier">
 								<characters key="NS.bytes">4AC66688-76E8-47ED-AC0A-7462220A4019</characters>
 							</object>
-							<string key="NSToolbarItemLabel">Custom View</string>
-							<string key="NSToolbarItemPaletteLabel">Custom View</string>
+							<string key="NSToolbarItemLabel">Mapping Selector</string>
+							<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"/>
-								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="NSEnabled">YES</bool>
 								<object class="NSButtonCell" key="NSCell" id="850080795">
-									<int key="NSCellFlags">-2080374784</int>
+									<int key="NSCellFlags">67108864</int>
 									<int key="NSCellFlags2">134217728</int>
 									<string key="NSContents">(default)</string>
 									<object class="NSFont" key="NSSupport" id="45863614">
@@ -349,7 +345,7 @@
 									</object>
 									<string key="NSCellIdentifier">_NS:9</string>
 									<reference key="NSControlView" ref="227597319"/>
-									<int key="NSButtonFlags">-2034483200</int>
+									<int key="NSButtonFlags">918306816</int>
 									<int key="NSButtonFlags2">163</int>
 									<object class="NSCustomResource" key="NSNormalImage" id="13197350">
 										<string key="NSClassName">NSImage</string>
@@ -377,15 +373,13 @@
 							<object class="NSMutableString" key="NSToolbarItemIdentifier">
 								<characters key="NS.bytes">94389EFE-310F-4DB5-95F6-D4AEE8839979</characters>
 							</object>
-							<string key="NSToolbarItemLabel">Custom View</string>
-							<string key="NSToolbarItemPaletteLabel">Custom View</string>
+							<string key="NSToolbarItemLabel">Translation Switch</string>
+							<string key="NSToolbarItemPaletteLabel">Translation Switch</string>
 							<nil key="NSToolbarItemToolTip"/>
 							<object class="NSSegmentedControl" key="NSToolbarItemView" id="679083346">
-								<reference key="NSNextResponder"/>
+								<nil key="NSNextResponder"/>
 								<int key="NSvFlags">268</int>
-								<string key="NSFrame">{{5, 14}, {67, 25}}</string>
-								<reference key="NSSuperview"/>
-								<reference key="NSWindow"/>
+								<string key="NSFrame">{{19, 14}, {67, 25}}</string>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="NSEnabled">YES</bool>
 								<object class="NSSegmentedCell" key="NSCell" id="594076765">
@@ -399,9 +393,8 @@
 											<double key="NSSegmentItemWidth">32</double>
 											<object class="NSCustomResource" key="NSSegmentItemImage">
 												<string key="NSClassName">NSImage</string>
-												<string key="NSResourceName">NSPathTemplate</string>
+												<string key="NSResourceName">NSActionTemplate</string>
 											</object>
-											<string key="NSSegmentItemLabel"/>
 											<string key="NSSegmentItemTooltip">Show and remap inputs</string>
 											<bool key="NSSegmentItemSelected">YES</bool>
 											<int key="NSSegmentItemImageScaling">0</int>
@@ -410,9 +403,8 @@
 											<double key="NSSegmentItemWidth">32</double>
 											<object class="NSCustomResource" key="NSSegmentItemImage">
 												<string key="NSClassName">NSImage</string>
-												<string key="NSResourceName">NSActionTemplate</string>
+												<string key="NSResourceName">NSRightFacingTriangleTemplate</string>
 											</object>
-											<string key="NSSegmentItemLabel"/>
 											<string key="NSSegmentItemTooltip">Run mapped actions</string>
 											<int key="NSSegmentItemTag">1</int>
 											<int key="NSSegmentItemImageScaling">0</int>
@@ -461,7 +453,7 @@
 							</object>
 						</object>
 					</dictionary>
-					<array class="NSMutableArray" key="NSToolbarIBAllowedItems">
+					<array key="NSToolbarIBAllowedItems">
 						<reference ref="496378711"/>
 						<reference ref="981531896"/>
 						<reference ref="658903347"/>
@@ -501,7 +493,7 @@
 															<string key="NSFrameSize">{200, 298}</string>
 															<reference key="NSSuperview" ref="698362889"/>
 															<reference key="NSWindow"/>
-															<reference key="NSNextKeyView" ref="1036252745"/>
+															<reference key="NSNextKeyView" ref="892486973"/>
 															<bool key="NSEnabled">YES</bool>
 															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 															<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -631,7 +623,7 @@
 											<string key="NSFrameSize">{202, 300}</string>
 											<reference key="NSSuperview" ref="977242492"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="892486973"/>
+											<reference key="NSNextKeyView" ref="698362889"/>
 											<int key="NSsFlags">150034</int>
 											<reference key="NSVScroller" ref="1036252745"/>
 											<reference key="NSHScroller" ref="892486973"/>
@@ -959,7 +951,7 @@
 													<double key="NSSize">13</double>
 													<int key="NSfFlags">16</int>
 												</object>
-												<string key="NSPlaceholderString">No action selected</string>
+												<string key="NSPlaceholderString">No input selected</string>
 												<reference key="NSControlView" ref="1016088174"/>
 												<reference key="NSBackgroundColor" ref="473846075"/>
 												<reference key="NSTextColor" ref="813255721"/>
@@ -1036,10 +1028,10 @@
 									<object class="NSTableView" id="762432499">
 										<reference key="NSNextResponder" ref="947403733"/>
 										<int key="NSvFlags">256</int>
-										<string key="NSFrameSize">{196, 256}</string>
+										<string key="NSFrameSize">{198, 198}</string>
 										<reference key="NSSuperview" ref="947403733"/>
 										<reference key="NSWindow"/>
-										<reference key="NSNextKeyView" ref="968378655"/>
+										<reference key="NSNextKeyView" ref="553414014"/>
 										<bool key="NSEnabled">YES</bool>
 										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -1082,7 +1074,7 @@
 										<reference key="NSBackgroundColor" ref="834857663"/>
 										<reference key="NSGridColor" ref="133906332"/>
 										<double key="NSRowHeight">20</double>
-										<int key="NSTvFlags">48267264</int>
+										<int key="NSTvFlags">44072960</int>
 										<reference key="NSDelegate"/>
 										<reference key="NSDataSource"/>
 										<int key="NSColumnAutoresizingStyle">1</int>
@@ -1094,7 +1086,7 @@
 										<int key="NSTableViewRowSizeStyle">-1</int>
 									</object>
 								</array>
-								<string key="NSFrame">{{2, 2}, {196, 256}}</string>
+								<string key="NSFrame">{{1, 1}, {198, 198}}</string>
 								<reference key="NSSuperview" ref="443618264"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="762432499"/>
@@ -1128,11 +1120,11 @@
 								<double key="NSPercent">0.98123324396782841</double>
 							</object>
 						</array>
-						<string key="NSFrame">{{0, 54}, {200, 260}}</string>
+						<string key="NSFrame">{{0, 20}, {200, 200}}</string>
 						<reference key="NSSuperview" ref="671181514"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="553414014"/>
-						<int key="NSsFlags">150035</int>
+						<reference key="NSNextKeyView" ref="947403733"/>
+						<int key="NSsFlags">150034</int>
 						<reference key="NSVScroller" ref="968378655"/>
 						<reference key="NSHScroller" ref="553414014"/>
 						<reference key="NSContentView" ref="947403733"/>
@@ -1141,28 +1133,56 @@
 						<double key="NSMaxMagnification">4</double>
 						<double key="NSMagnification">1</double>
 					</object>
+					<object class="NSButton" id="149148392">
+						<reference key="NSNextResponder" ref="671181514"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{66, -1}, {134, 23}}</string>
+						<reference key="NSSuperview" ref="671181514"/>
+						<reference key="NSWindow"/>
+						<string key="NSReuseIdentifierKey">_NS:22</string>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSButtonCell" key="NSCell" id="517346822">
+							<int key="NSCellFlags">-2080374784</int>
+							<int key="NSCellFlags2">168034304</int>
+							<string key="NSContents"/>
+							<object class="NSFont" key="NSSupport" id="22">
+								<string key="NSName">LucidaGrande</string>
+								<double key="NSSize">9</double>
+								<int key="NSfFlags">3614</int>
+							</object>
+							<string key="NSCellIdentifier">_NS:22</string>
+							<reference key="NSControlView" ref="149148392"/>
+							<int key="NSButtonFlags">1221349376</int>
+							<int key="NSButtonFlags2">162</int>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">400</int>
+							<int key="NSPeriodicInterval">75</int>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
 					<object class="NSButton" id="861276216">
 						<reference key="NSNextResponder" ref="671181514"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{20, 19}, {39, 28}}</string>
+						<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">
 							<int key="NSCellFlags">67108864</int>
-							<int key="NSCellFlags2">134217728</int>
+							<int key="NSCellFlags2">134479872</int>
 							<string key="NSContents"/>
-							<reference key="NSSupport" ref="45863614"/>
+							<reference key="NSSupport" ref="22"/>
 							<reference key="NSControlView" ref="861276216"/>
 							<int key="NSButtonFlags">-2033958912</int>
-							<int key="NSButtonFlags2">162</int>
+							<int key="NSButtonFlags2">268435618</int>
 							<object class="NSCustomResource" key="NSNormalImage">
 								<string key="NSClassName">NSImage</string>
 								<string key="NSResourceName">NSAddTemplate</string>
 							</object>
 							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
+							<string key="NSKeyEquivalent">n</string>
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
@@ -1171,31 +1191,32 @@
 					<object class="NSButton" id="456935010">
 						<reference key="NSNextResponder" ref="671181514"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{67, 19}, {39, 28}}</string>
+						<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">
-							<int key="NSCellFlags">603979776</int>
-							<int key="NSCellFlags2">134217728</int>
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">134479872</int>
 							<string key="NSContents"/>
-							<reference key="NSSupport" ref="45863614"/>
+							<reference key="NSSupport" ref="22"/>
 							<reference key="NSControlView" ref="456935010"/>
 							<int key="NSButtonFlags">-2033958912</int>
-							<int key="NSButtonFlags2">162</int>
+							<int key="NSButtonFlags2">268435618</int>
 							<object class="NSCustomResource" key="NSNormalImage">
 								<string key="NSClassName">NSImage</string>
 								<string key="NSResourceName">NSRemoveTemplate</string>
 							</object>
 							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
+							<string type="base64-UTF8" key="NSKeyEquivalent">CA</string>
 							<int key="NSPeriodicDelay">400</int>
 							<int key="NSPeriodicInterval">75</int>
 						</object>
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
 				</array>
-				<string key="NSFrameSize">{200, 314}</string>
+				<string key="NSFrameSize">{200, 220}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="443618264"/>
@@ -1361,30 +1382,6 @@
 					</object>
 					<int key="connectionID">859</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">mainWindow</string>
-						<reference key="source" ref="207406104"/>
-						<reference key="destination" ref="808667431"/>
-					</object>
-					<int key="connectionID">500</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">activeMenuItem</string>
-						<reference key="source" ref="207406104"/>
-						<reference key="destination" ref="632598200"/>
-					</object>
-					<int key="connectionID">607</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleActivity:</string>
-						<reference key="source" ref="207406104"/>
-						<reference key="destination" ref="632598200"/>
-					</object>
-					<int key="connectionID">610</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">dockMenuBase</string>
@@ -1411,19 +1408,11 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">outputController</string>
+						<string key="label">window</string>
 						<reference key="source" ref="207406104"/>
-						<reference key="destination" ref="801536542"/>
-					</object>
-					<int key="connectionID">825</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">addPressed:</string>
-						<reference key="source" ref="468285243"/>
-						<reference key="destination" ref="861276216"/>
+						<reference key="destination" ref="808667431"/>
 					</object>
-					<int key="connectionID">515</int>
+					<int key="connectionID">865</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
@@ -1497,6 +1486,14 @@
 					</object>
 					<int key="connectionID">857</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>
+					<int key="connectionID">515</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">dataSource</string>
@@ -1609,14 +1606,6 @@
 					</object>
 					<int key="connectionID">823</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">mappingChosen:</string>
-						<reference key="source" ref="801536542"/>
-						<reference key="destination" ref="194275224"/>
-					</object>
-					<int key="connectionID">824</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">inputController</string>
@@ -1693,7 +1682,7 @@
 							<reference ref="379814623"/>
 						</array>
 						<reference key="parent" ref="0"/>
-						<string key="objectName">MainMenu</string>
+						<string key="objectName">Main Menu</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">19</int>
@@ -1833,11 +1822,6 @@
 						<reference key="object" ref="1011231497"/>
 						<reference key="parent" ref="835318025"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">420</int>
-						<reference key="object" ref="755631768"/>
-						<reference key="parent" ref="0"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">450</int>
 						<reference key="object" ref="808667431"/>
@@ -1852,11 +1836,12 @@
 						<reference key="object" ref="671181514"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="443618264"/>
-							<reference ref="861276216"/>
 							<reference ref="456935010"/>
+							<reference ref="149148392"/>
+							<reference ref="861276216"/>
 						</array>
 						<reference key="parent" ref="0"/>
-						<string key="objectName">Drawer Content View</string>
+						<string key="objectName">Mapping List Popover Content</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">453</int>
@@ -1893,6 +1878,7 @@
 							<reference ref="827961598"/>
 						</array>
 						<reference key="parent" ref="443618264"/>
+						<string key="objectName">Mapping List</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">461</int>
@@ -1911,7 +1897,6 @@
 						<int key="objectID">482</int>
 						<reference key="object" ref="207406104"/>
 						<reference key="parent" ref="0"/>
-						<string key="objectName">ApplicationController</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">487</int>
@@ -1923,19 +1908,6 @@
 						</array>
 						<reference key="parent" ref="808667431"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">507</int>
-						<reference key="object" ref="861276216"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="867532725"/>
-						</array>
-						<reference key="parent" ref="671181514"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">508</int>
-						<reference key="object" ref="867532725"/>
-						<reference key="parent" ref="861276216"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">511</int>
 						<reference key="object" ref="456935010"/>
@@ -1943,6 +1915,7 @@
 							<reference ref="1008023024"/>
 						</array>
 						<reference key="parent" ref="671181514"/>
+						<string key="objectName">Remove Mapping</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">512</int>
@@ -1953,13 +1926,11 @@
 						<int key="objectID">514</int>
 						<reference key="object" ref="468285243"/>
 						<reference key="parent" ref="0"/>
-						<string key="objectName">ConfigsController</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">479</int>
 						<reference key="object" ref="1007832501"/>
 						<reference key="parent" ref="0"/>
-						<string key="objectName">JoystickController</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">606</int>
@@ -1982,6 +1953,7 @@
 							<reference ref="364857164"/>
 						</array>
 						<reference key="parent" ref="206489479"/>
+						<string key="objectName">Input Devices Pane</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">634</int>
@@ -2000,6 +1972,7 @@
 							<reference ref="290995057"/>
 						</array>
 						<reference key="parent" ref="364857164"/>
+						<string key="objectName">Input Device List</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">636</int>
@@ -2018,6 +1991,7 @@
 							<reference ref="158646067"/>
 						</array>
 						<reference key="parent" ref="365506042"/>
+						<string key="objectName">Device/Input Name</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">642</int>
@@ -2038,6 +2012,7 @@
 							<reference ref="57697638"/>
 						</array>
 						<reference key="parent" ref="206489479"/>
+						<string key="objectName">Output Editor Pane</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">686</int>
@@ -2058,21 +2033,25 @@
 							<reference ref="211076068"/>
 						</array>
 						<reference key="parent" ref="606740242"/>
+						<string key="objectName">Output Types</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">657</int>
 						<reference key="object" ref="177186415"/>
 						<reference key="parent" ref="120408205"/>
+						<string key="objectName">Disabled</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">658</int>
 						<reference key="object" ref="387494389"/>
 						<reference key="parent" ref="120408205"/>
+						<string key="objectName">Key Press</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">699</int>
 						<reference key="object" ref="339215895"/>
 						<reference key="parent" ref="120408205"/>
+						<string key="objectName">Switch Mapping</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">700</int>
@@ -2081,6 +2060,7 @@
 							<reference ref="74311158"/>
 						</array>
 						<reference key="parent" ref="606740242"/>
+						<string key="objectName">Mapping Choice List</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">701</int>
@@ -2103,6 +2083,7 @@
 							<reference ref="853503577"/>
 						</array>
 						<reference key="parent" ref="606740242"/>
+						<string key="objectName">Input Name</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">707</int>
@@ -2123,16 +2104,19 @@
 						<int key="objectID">733</int>
 						<reference key="object" ref="820968178"/>
 						<reference key="parent" ref="120408205"/>
+						<string key="objectName">Mouse Movement</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">734</int>
 						<reference key="object" ref="275466816"/>
 						<reference key="parent" ref="120408205"/>
+						<string key="objectName">Mouse Button</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">735</int>
 						<reference key="object" ref="134694197"/>
 						<reference key="parent" ref="120408205"/>
+						<string key="objectName">Mouse Scroll</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">659</int>
@@ -2146,6 +2130,7 @@
 							<reference ref="514491330"/>
 						</array>
 						<reference key="parent" ref="606740242"/>
+						<string key="objectName">Mouse Button Selector</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">745</int>
@@ -2156,6 +2141,7 @@
 						<int key="objectID">748</int>
 						<reference key="object" ref="211076068"/>
 						<reference key="parent" ref="120408205"/>
+						<string key="objectName">Switch Mouse Mode</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">749</int>
@@ -2164,6 +2150,7 @@
 							<reference ref="301345285"/>
 						</array>
 						<reference key="parent" ref="606740242"/>
+						<string key="objectName">Mouse Scroll Selector</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">750</int>
@@ -2177,6 +2164,7 @@
 							<reference ref="241270212"/>
 						</array>
 						<reference key="parent" ref="606740242"/>
+						<string key="objectName">Mouse Motion Selector</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">755</int>
@@ -2188,11 +2176,6 @@
 						<reference key="object" ref="57697638"/>
 						<reference key="parent" ref="606740242"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">810</int>
-						<reference key="object" ref="914355947"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">812</int>
 						<reference key="object" ref="580069611"/>
@@ -2215,6 +2198,7 @@
 							<reference ref="227597319"/>
 						</array>
 						<reference key="parent" ref="1043384830"/>
+						<string key="objectName">Mapping Selector</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">835</int>
@@ -2236,6 +2220,7 @@
 							<reference ref="679083346"/>
 						</array>
 						<reference key="parent" ref="1043384830"/>
+						<string key="objectName">Translation Switch</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">840</int>
@@ -2265,6 +2250,40 @@
 						<int key="objectID">851</int>
 						<reference key="object" ref="586993839"/>
 						<reference key="parent" ref="0"/>
+						<string key="objectName">Mapping List Popover</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">507</int>
+						<reference key="object" ref="861276216"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="867532725"/>
+						</array>
+						<reference key="parent" ref="671181514"/>
+						<string key="objectName">Add Mapping</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">508</int>
+						<reference key="object" ref="867532725"/>
+						<reference key="parent" ref="861276216"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">862</int>
+						<reference key="object" ref="149148392"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="517346822"/>
+						</array>
+						<reference key="parent" ref="671181514"/>
+						<string key="objectName">Gradient Space</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">863</int>
+						<reference key="object" ref="517346822"/>
+						<reference key="parent" ref="149148392"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">810</int>
+						<reference key="object" ref="914355947"/>
+						<reference key="parent" ref="720053764"/>
 					</object>
 				</array>
 			</object>
@@ -2286,7 +2305,6 @@
 				<string key="239.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="420.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="YES" key="450.IBNSWindowAutoPositionCentersHorizontal"/>
 				<boolean value="YES" key="450.IBNSWindowAutoPositionCentersVertical"/>
 				<string key="450.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2360,19 +2378,21 @@
 				<string key="837.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="837.toolbarItem.selectable"/>
 				<string key="840.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="0" key="841.IBNSSegmentedControlInspectorSelectedSegmentMetadataKey"/>
+				<integer value="1" key="841.IBNSSegmentedControlInspectorSelectedSegmentMetadataKey"/>
 				<string key="841.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="842.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<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>
 				<string key="92.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">859</int>
+			<int key="maxID">865</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2380,26 +2400,16 @@
 					<string key="className">EnjoyableApplicationDelegate</string>
 					<string key="superclassName">NSObject</string>
 					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="activeMenuItem">NSMenuItem</string>
 						<string key="dockMenuBase">NSMenu</string>
-						<string key="drawer">NSDrawer</string>
 						<string key="inputController">NJDeviceController</string>
 						<string key="mappingsController">NJMappingsController</string>
-						<string key="outputController">NJOutputController</string>
+						<string key="window">NSWindow</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="activeMenuItem">
-							<string key="name">activeMenuItem</string>
-							<string key="candidateClassName">NSMenuItem</string>
-						</object>
 						<object class="IBToOneOutletInfo" key="dockMenuBase">
 							<string key="name">dockMenuBase</string>
 							<string key="candidateClassName">NSMenu</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="drawer">
-							<string key="name">drawer</string>
-							<string key="candidateClassName">NSDrawer</string>
-						</object>
 						<object class="IBToOneOutletInfo" key="inputController">
 							<string key="name">inputController</string>
 							<string key="candidateClassName">NJDeviceController</string>
@@ -2408,9 +2418,9 @@
 							<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 class="IBToOneOutletInfo" key="window">
+							<string key="name">window</string>
+							<string key="candidateClassName">NSWindow</string>
 						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -2639,9 +2649,9 @@
 			<string key="NSListViewTemplate">{11, 10}</string>
 			<string key="NSMenuCheckmark">{11, 11}</string>
 			<string key="NSMenuMixedState">{10, 3}</string>
-			<string key="NSPathTemplate">{13, 10}</string>
 			<string key="NSRadioButton">{16, 15}</string>
 			<string key="NSRemoveTemplate">{8, 8}</string>
+			<string key="NSRightFacingTriangleTemplate">{9, 9}</string>
 		</dictionary>
 	</data>
 </archive>