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

diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 6e75334..c2ebf64 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -214,7 +214,7 @@
 								</object>
 								<object class="NSMenuItem" id="187155117">
 									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Import...</string>
+									<string key="NSTitle">Import…</string>
 									<string key="NSKeyEquiv">o</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
@@ -223,7 +223,7 @@
 								</object>
 								<object class="NSMenuItem" id="888617891">
 									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Export...</string>
+									<string key="NSTitle">Export…</string>
 									<string key="NSKeyEquiv">s</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
@@ -409,7 +409,7 @@
 				<nil key="NSUserInterfaceItemIdentifier"/>
 				<string key="NSWindowContentMinSize">{640, 300}</string>
 				<object class="NSView" key="NSWindowView" id="177223957">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<array class="NSMutableArray" key="NSSubviews">
 						<object class="NSSplitView" id="206489479">
@@ -433,8 +433,7 @@
 															<int key="NSvFlags">256</int>
 															<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>
@@ -533,7 +532,6 @@
 													</array>
 													<string key="NSFrame">{{1, 1}, {200, 298}}</string>
 													<reference key="NSSuperview" ref="364857164"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="365506042"/>
 													<reference key="NSDocView" ref="365506042"/>
 													<reference key="NSBGColor" ref="834857663"/>
@@ -544,7 +542,6 @@
 													<int key="NSvFlags">-2147483392</int>
 													<string key="NSFrame">{{1, 1}, {8, 298}}</string>
 													<reference key="NSSuperview" ref="364857164"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="606740242"/>
 													<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 													<reference key="NSTarget" ref="364857164"/>
@@ -556,7 +553,6 @@
 													<int key="NSvFlags">-2147483392</int>
 													<string key="NSFrame">{{-100, -100}, {473, 15}}</string>
 													<reference key="NSSuperview" ref="364857164"/>
-													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="698362889"/>
 													<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 													<int key="NSsFlags">1</int>
@@ -567,8 +563,7 @@
 											</array>
 											<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"/>
@@ -581,7 +576,6 @@
 									</array>
 									<string key="NSFrameSize">{202, 300}</string>
 									<reference key="NSSuperview" ref="206489479"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="364857164"/>
 									<string key="NSClassName">NSView</string>
 								</object>
@@ -594,7 +588,6 @@
 											<int key="NSvFlags">265</int>
 											<string key="NSFrame">{{227, 123}, {180, 24}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="125828224"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
@@ -631,8 +624,6 @@
 											<int key="NSvFlags">265</int>
 											<string key="NSFrame">{{227, 55}, {180, 24}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSSegmentedCell" key="NSCell" id="301345285">
@@ -664,7 +655,6 @@
 											<int key="NSvFlags">265</int>
 											<string key="NSFrame">{{227, 89}, {180, 24}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="921829691"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
@@ -697,17 +687,15 @@
 											<int key="NSvFlags">265</int>
 											<string key="NSFrame">{{229, 190}, {176, 24}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="194275224"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
-											<string key="NSClassName">KeyInputTextView</string>
+											<string key="NSClassName">NJKeyInputField</string>
 										</object>
 										<object class="NSPopUpButton" id="194275224">
 											<reference key="NSNextResponder" ref="606740242"/>
 											<int key="NSvFlags">265</int>
 											<string key="NSFrame">{{226, 156}, {182, 26}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="875916470"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSPopUpButtonCell" key="NSCell" id="74311158">
@@ -740,7 +728,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{20, 16}, {201, 236}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="57697638"/>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											<int key="NSNumRows">7</int>
@@ -885,7 +872,6 @@
 											<int key="NSvFlags">266</int>
 											<string key="NSFrame">{{0, 269}, {429, 17}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="497528019"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="853503577">
@@ -909,7 +895,6 @@
 											<int key="NSvFlags">10</int>
 											<string key="NSFrame">{{12, 258}, {405, 5}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="120408205"/>
 											<string key="NSOffsets">{0, 0}</string>
 											<object class="NSTextFieldCell" key="NSTitleCell">
@@ -936,21 +921,17 @@
 									</array>
 									<string key="NSFrame">{{211, 0}, {429, 300}}</string>
 									<reference key="NSSuperview" ref="206489479"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="1016088174"/>
 									<string key="NSClassName">NSView</string>
 								</object>
 							</array>
 							<string key="NSFrameSize">{640, 300}</string>
 							<reference key="NSSuperview" ref="177223957"/>
-							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="977242492"/>
 							<bool key="NSIsVertical">YES</bool>
 						</object>
 					</array>
 					<string key="NSFrameSize">{640, 300}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="206489479"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
@@ -960,7 +941,7 @@
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
 			<object class="NSCustomView" id="671181514">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="NSScrollView" id="443618264">
@@ -976,7 +957,6 @@
 										<int key="NSvFlags">256</int>
 										<string key="NSFrameSize">{320, 418}</string>
 										<reference key="NSSuperview" ref="947403733"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="968378655"/>
 										<bool key="NSEnabled">YES</bool>
 										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -1021,7 +1001,7 @@
 										<double key="NSIntercellSpacingHeight">2</double>
 										<reference key="NSBackgroundColor" ref="834857663"/>
 										<reference key="NSGridColor" ref="133906332"/>
-										<double key="NSRowHeight">17</double>
+										<double key="NSRowHeight">20</double>
 										<int key="NSTvFlags">46170112</int>
 										<reference key="NSDelegate"/>
 										<reference key="NSDataSource"/>
@@ -1036,7 +1016,6 @@
 								</array>
 								<string key="NSFrame">{{1, 1}, {320, 418}}</string>
 								<reference key="NSSuperview" ref="443618264"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="762432499"/>
 								<reference key="NSDocView" ref="762432499"/>
 								<reference key="NSBGColor" ref="834857663"/>
@@ -1047,7 +1026,6 @@
 								<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="553414014"/>
 								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<reference key="NSTarget" ref="443618264"/>
@@ -1059,7 +1037,6 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{1, 404}, {305, 15}}</string>
 								<reference key="NSSuperview" ref="443618264"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="861276216"/>
 								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<int key="NSsFlags">1</int>
@@ -1070,7 +1047,6 @@
 						</array>
 						<string key="NSFrame">{{0, 34}, {322, 420}}</string>
 						<reference key="NSSuperview" ref="671181514"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="947403733"/>
 						<int key="NSsFlags">133682</int>
 						<reference key="NSVScroller" ref="968378655"/>
@@ -1086,7 +1062,6 @@
 						<int key="NSvFlags">260</int>
 						<string key="NSFrame">{{10, 4}, {39, 28}}</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">
@@ -1113,8 +1088,6 @@
 						<int key="NSvFlags">260</int>
 						<string key="NSFrame">{{57, 4}, {39, 28}}</string>
 						<reference key="NSSuperview" ref="671181514"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="1008023024">
 							<int key="NSCellFlags">603979776</int>
@@ -1137,8 +1110,6 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{322, 454}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="443618264"/>
 				<string key="NSClassName">NSView</string>
 			</object>
@@ -1157,10 +1128,10 @@
 				<string key="NSClassName">ApplicationController</string>
 			</object>
 			<object class="NSCustomObject" id="468285243">
-				<string key="NSClassName">ConfigsController</string>
+				<string key="NSClassName">NJMappingsController</string>
 			</object>
 			<object class="NSCustomObject" id="1007832501">
-				<string key="NSClassName">JoystickController</string>
+				<string key="NSClassName">NJInputController</string>
 			</object>
 			<object class="NSCustomObject" id="801536542">
 				<string key="NSClassName">TargetController</string>
@@ -1314,19 +1285,11 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">configsController</string>
+						<string key="label">mappingsController</string>
 						<reference key="source" ref="1007832501"/>
 						<reference key="destination" ref="468285243"/>
 					</object>
-					<int key="connectionID">717</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">jsController</string>
-						<reference key="source" ref="207406104"/>
-						<reference key="destination" ref="1007832501"/>
-					</object>
-					<int key="connectionID">484</int>
+					<int key="connectionID">822</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
@@ -1386,19 +1349,27 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">configsController</string>
+						<string key="label">dockMenuBase</string>
 						<reference key="source" ref="207406104"/>
-						<reference key="destination" ref="468285243"/>
+						<reference key="destination" ref="720053764"/>
 					</object>
-					<int key="connectionID">716</int>
+					<int key="connectionID">726</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">dockMenuBase</string>
+						<string key="label">inputController</string>
 						<reference key="source" ref="207406104"/>
-						<reference key="destination" ref="720053764"/>
+						<reference key="destination" ref="1007832501"/>
 					</object>
-					<int key="connectionID">726</int>
+					<int key="connectionID">819</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"/>
+					</object>
+					<int key="connectionID">820</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
@@ -1480,14 +1451,6 @@
 					</object>
 					<int key="connectionID">692</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">configsController</string>
-						<reference key="source" ref="801536542"/>
-						<reference key="destination" ref="468285243"/>
-					</object>
-					<int key="connectionID">693</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">joystickController</string>
@@ -1504,22 +1467,6 @@
 					</object>
 					<int key="connectionID">709</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">configPopup</string>
-						<reference key="source" ref="801536542"/>
-						<reference key="destination" ref="194275224"/>
-					</object>
-					<int key="connectionID">713</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">configChosen:</string>
-						<reference key="source" ref="801536542"/>
-						<reference key="destination" ref="194275224"/>
-					</object>
-					<int key="connectionID">714</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">radioChanged:</string>
@@ -1586,19 +1533,35 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">targetController</string>
-						<reference key="source" ref="57697638"/>
-						<reference key="destination" ref="801536542"/>
+						<string key="label">mappingsController</string>
+						<reference key="source" ref="801536542"/>
+						<reference key="destination" ref="468285243"/>
+					</object>
+					<int key="connectionID">821</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">mappingPopup</string>
+						<reference key="source" ref="801536542"/>
+						<reference key="destination" ref="194275224"/>
+					</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">779</int>
+					<int key="connectionID">824</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
+						<string key="label">keyDelegate</string>
 						<reference key="source" ref="57697638"/>
-						<reference key="destination" ref="808667431"/>
+						<reference key="destination" ref="801536542"/>
 					</object>
-					<int key="connectionID">780</int>
+					<int key="connectionID">818</int>
 				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -2270,7 +2233,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">816</int>
+			<int key="maxID">824</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2365,16 +2328,11 @@
 						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="exportButton">NSButton</string>
 						<string key="removeButton">NSButton</string>
 						<string key="tableView">NSTableView</string>
 						<string key="targetController">TargetController</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="exportButton">
-							<string key="name">exportButton</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
 						<object class="IBToOneOutletInfo" key="removeButton">
 							<string key="name">removeButton</string>
 							<string key="candidateClassName">NSButton</string>
@@ -2421,25 +2379,22 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">KeyInputTextView</string>
+					<string key="className">NJKeyInputField</string>
 					<string key="superclassName">NSTextField</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="targetController">TargetController</string>
-						<string key="window">NSWindow</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="targetController">
-							<string key="name">targetController</string>
-							<string key="candidateClassName">TargetController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="window">
-							<string key="name">window</string>
-							<string key="candidateClassName">NSWindow</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">keyDelegate</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">keyDelegate</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">keyDelegate</string>
+							<string key="candidateClassName">id</string>
 						</object>
-					</dictionary>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/KeyInputTextView.h</string>
+						<string key="minorKey">./Classes/NJKeyInputField.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -2478,7 +2433,7 @@
 						<string key="configPopup">NSPopUpButton</string>
 						<string key="configsController">ConfigsController</string>
 						<string key="joystickController">JoystickController</string>
-						<string key="keyInput">KeyInputTextView</string>
+						<string key="keyInput">NJKeyInputField</string>
 						<string key="mouseBtnSelect">NSSegmentedControl</string>
 						<string key="mouseDirSelect">NSSegmentedControl</string>
 						<string key="radioButtons">NSMatrix</string>
@@ -2500,7 +2455,7 @@
 						</object>
 						<object class="IBToOneOutletInfo" key="keyInput">
 							<string key="name">keyInput</string>
-							<string key="candidateClassName">KeyInputTextView</string>
+							<string key="candidateClassName">NJKeyInputField</string>
 						</object>
 						<object class="IBToOneOutletInfo" key="mouseBtnSelect">
 							<string key="name">mouseBtnSelect</string>