X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=c2ebf64845f91c20d37da52ed1cbe2352d88dfe3;hp=6797fb3cf42dcf41770e8bcf8902d7e746a186a6;hb=e2a4d830dd9817f6a515a3b1b6aa152d3bb98c2b;hpb=2e1a403613f408ff5a98dbd44c0b06945924bd2c
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 6797fb3..c2ebf64 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -409,7 +409,7 @@
{640, 300}
@@ -594,7 +588,6 @@
265
{{227, 123}, {180, 24}}
-
_NS:9
YES
@@ -631,8 +624,6 @@
265
{{227, 55}, {180, 24}}
-
-
_NS:9
YES
@@ -664,7 +655,6 @@
265
{{227, 89}, {180, 24}}
-
_NS:9
YES
@@ -697,17 +687,15 @@
265
{{229, 190}, {176, 24}}
-
_NS:9
- KeyInputTextView
+ NJKeyInputField
-
+
256
@@ -976,7 +957,6 @@
256
{320, 418}
-
YES
NO
@@ -1036,7 +1016,6 @@
{{1, 1}, {320, 418}}
-
@@ -1047,7 +1026,6 @@
-2147483392
{{306, 1}, {15, 403}}
-
NO
@@ -1059,7 +1037,6 @@
-2147483392
{{1, 404}, {305, 15}}
-
NO
1
@@ -1070,7 +1047,6 @@
{{0, 34}, {322, 420}}
-
133682
@@ -1086,7 +1062,6 @@
260
{{10, 4}, {39, 28}}
-
YES
@@ -1113,8 +1088,6 @@
260
{{57, 4}, {39, 28}}
-
-
YES
603979776
@@ -1137,8 +1110,6 @@
{322, 454}
-
-
NSView
@@ -1157,10 +1128,10 @@
ApplicationController
- ConfigsController
+ NJMappingsController
- JoystickController
+ NJInputController
TargetController
@@ -1314,19 +1285,11 @@
- configsController
+ mappingsController
- 717
-
-
-
- jsController
-
-
-
- 484
+ 822
@@ -1386,19 +1349,27 @@
- configsController
+ dockMenuBase
-
+
- 716
+ 726
- dockMenuBase
+ inputController
-
+
- 726
+ 819
+
+
+
+ mappingsController
+
+
+
+ 820
@@ -1480,14 +1451,6 @@
692
-
-
- configsController
-
-
-
- 693
-
joystickController
@@ -1504,22 +1467,6 @@
709
-
-
- configPopup
-
-
-
- 713
-
-
-
- configChosen:
-
-
-
- 714
-
radioChanged:
@@ -1586,19 +1533,35 @@
- targetController
-
-
+ mappingsController
+
+
+
+ 821
+
+
+
+ mappingPopup
+
+
+
+ 823
+
+
+
+ mappingChosen:
+
+
- 779
+ 824
- window
+ keyDelegate
-
+
- 780
+ 818
@@ -2270,7 +2233,7 @@
- 816
+ 824
@@ -2365,16 +2328,11 @@
- NSButton
NSButton
NSTableView
TargetController
-
- exportButton
- NSButton
-
removeButton
NSButton
@@ -2421,25 +2379,22 @@
- KeyInputTextView
+ NJKeyInputField
NSTextField
-
- TargetController
- NSWindow
-
-
-
- targetController
- TargetController
-
-
- window
- NSWindow
+
+ keyDelegate
+ id
+
+
+ keyDelegate
+
+ keyDelegate
+ id
-
+
IBProjectSource
- ./Classes/KeyInputTextView.h
+ ./Classes/NJKeyInputField.h
@@ -2478,7 +2433,7 @@
NSPopUpButton
ConfigsController
JoystickController
- KeyInputTextView
+ NJKeyInputField
NSSegmentedControl
NSSegmentedControl
NSMatrix
@@ -2500,7 +2455,7 @@
keyInput
- KeyInputTextView
+ NJKeyInputField
mouseBtnSelect