X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=1a87bd74e4dee4e83603236f19111e32363b238f;hp=9c7050aa2f059d9e817b124811d7223517abc275;hb=d0f4d54bb9eb66cbd19fa4dabb56fc09f42bd22d;hpb=794561a4606fa9e31e3b2b077891f5b1e6084698
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 9c7050a..1a87bd7 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -214,7 +214,7 @@
@@ -517,8 +516,8 @@
MC41AA
- 17
- -767557632
+ 20
+ 306184192
4
@@ -527,11 +526,12 @@
YES
0
1
+ -1
+ NO
{{1, 1}, {200, 298}}
-
@@ -542,7 +542,6 @@
-2147483392
{{1, 1}, {8, 298}}
-
NO
@@ -554,7 +553,6 @@
-2147483392
{{-100, -100}, {473, 15}}
-
NO
1
@@ -565,13 +563,12 @@
{202, 300}
-
-
- 133650
+
+ 150034
- QSAAAEEgAABBmAAAQZgAAA
+ QSAAAEEgAABBsAAAQbAAAA
0.25
4
1
@@ -579,7 +576,6 @@
{202, 300}
-
NSView
@@ -589,10 +585,9 @@
+
+
+ 265
+ {{229, 190}, {176, 24}}
+
+
+ _NS:9
+ NJKeyInputField
+
+
268
{{20, 16}, {201, 236}}
-
NO
7
@@ -739,7 +771,7 @@
603979776
0
- Switch to configuration
+ Switch to mapping
1211912448
@@ -795,7 +827,7 @@
603979776
0
- Toggle mouse scope
+ Switch mouse mode
1211912448
@@ -835,50 +867,16 @@
-
266
{{0, 269}, {429, 17}}
-
YES
- 68157504
- 138413056
+ 67108928
+ 138414656
LucidaGrande-Bold
@@ -894,10 +892,9 @@
- 12
- {{0, 258}, {465, 5}}
+ 10
+ {{12, 258}, {405, 5}}
-
{0, 0}
@@ -921,43 +918,30 @@
0
NO
-
-
- 265
- {{229, 190}, {176, 24}}
-
-
-
- _NS:9
- KeyInputTextView
-
{{211, 0}, {429, 300}}
-
NSView
{640, 300}
-
YES
{640, 300}
-
-
{{0, 0}, {1440, 878}}
{640, 369}
{10000000000000, 10000000000000}
+ Enjoyable
YES
-
+
256
@@ -973,7 +957,6 @@
256
{320, 418}
-
YES
NO
@@ -1018,7 +1001,7 @@
2
- 17
+ 20
46170112
@@ -1028,11 +1011,11 @@
NO
0
1
+ 1
{{1, 1}, {320, 418}}
-
@@ -1043,7 +1026,6 @@
-2147483392
{{306, 1}, {15, 403}}
-
NO
@@ -1055,7 +1037,6 @@
-2147483392
{{1, 404}, {305, 15}}
-
NO
1
@@ -1066,13 +1047,12 @@
{{0, 34}, {322, 420}}
-
133682
- QSAAAEEgAABBmAAAQZgAAA
+ QSAAAEEgAABBsAAAQbAAAA
0.25
4
1
@@ -1082,7 +1062,6 @@
260
{{10, 4}, {39, 28}}
-
YES
@@ -1109,8 +1088,6 @@
260
{{57, 4}, {39, 28}}
-
-
YES
603979776
@@ -1133,16 +1110,14 @@
{322, 454}
-
-
NSView
{200, 100}
- {200, 0}
- {300, 10000}
+ {100, 0}
+ {400, 10000}
2
0.0
15
@@ -1150,16 +1125,16 @@
- ApplicationController
+ EnjoyableApplicationDelegate
- ConfigsController
+ NJMappingsController
- JoystickController
+ NJDeviceController
- TargetController
+ NJOutputController
@@ -1302,27 +1277,19 @@
- targetController
-
-
-
- 695
-
-
-
- configsController
+ mappingsController
- 717
+ 822
- jsController
-
-
+ outputController
+
+
- 484
+ 826
@@ -1374,27 +1341,35 @@
- targetController
+ dockMenuBase
-
+
+
+ 726
+
+
+
+ inputController
+
+
- 712
+ 819
- configsController
+ mappingsController
- 716
+ 820
- dockMenuBase
+ outputController
-
+
- 726
+ 825
@@ -1428,14 +1403,6 @@
520
-
-
- targetController
-
-
-
- 697
-
exportPressed:
@@ -1452,6 +1419,14 @@
816
+
+
+ outputController
+
+
+
+ 827
+
dataSource
@@ -1476,22 +1451,6 @@
692
-
-
- configsController
-
-
-
- 693
-
-
-
- joystickController
-
-
-
- 694
-
title
@@ -1500,22 +1459,6 @@
709
-
-
- configPopup
-
-
-
- 713
-
-
-
- configChosen:
-
-
-
- 714
-
radioChanged:
@@ -1582,19 +1525,43 @@
- targetController
-
-
+ mappingsController
+
+
+
+ 821
+
+
+
+ mappingPopup
+
+
+
+ 823
+
+
+
+ mappingChosen:
+
+
+
+ 824
+
+
+
+ inputController
+
+
- 779
+ 828
- window
+ keyDelegate
-
+
- 780
+ 818
@@ -1987,8 +1954,8 @@
-
+
@@ -2266,262 +2233,27 @@
- 816
+ 828
- ApplicationController
- NSObject
-
- toggleActivity:
+ NJKeyInputField
+ NSTextField
+
+ keyDelegate
id
-
- toggleActivity:
-
- toggleActivity:
+
+ keyDelegate
+
+ keyDelegate
id
-
- NSToolbarItem
- NSMenuItem
- ConfigsController
- NSMenu
- NSDrawer
- JoystickController
- NSWindow
- TargetController
-
-
-
- activeButton
- NSToolbarItem
-
-
- activeMenuItem
- NSMenuItem
-
-
- configsController
- ConfigsController
-
-
- dockMenuBase
- NSMenu
-
-
- drawer
- NSDrawer
-
-
- jsController
- JoystickController
-
-
- mainWindow
- NSWindow
-
-
- targetController
- TargetController
-
-
-
- IBProjectSource
- ./Classes/ApplicationController.h
-
-
-
- ConfigsController
- NSObject
-
- id
- id
- id
- id
-
-
-
- addPressed:
- id
-
-
- exportPressed:
- id
-
-
- importPressed:
- id
-
-
- removePressed:
- id
-
-
-
- NSButton
- NSButton
- NSTableView
- TargetController
-
-
-
- exportButton
- NSButton
-
-
- removeButton
- NSButton
-
-
- tableView
- NSTableView
-
-
- targetController
- TargetController
-
-
-
- IBProjectSource
- ./Classes/ConfigsController.h
-
-
-
- JoystickController
- NSObject
-
- ConfigsController
- NSOutlineView
- TargetController
-
-
-
- configsController
- ConfigsController
-
-
- outlineView
- NSOutlineView
-
-
- targetController
- TargetController
-
-
-
- IBProjectSource
- ./Classes/JoystickController.h
-
-
-
- KeyInputTextView
- NSTextField
-
- TargetController
- NSWindow
-
-
-
- targetController
- TargetController
-
-
- window
- NSWindow
-
-
-
- IBProjectSource
- ./Classes/KeyInputTextView.h
-
-
-
- TargetController
- NSObject
-
- id
- id
- id
- id
- id
-
-
-
- configChosen:
- id
-
-
- mbtnChanged:
- id
-
-
- mdirChanged:
- id
-
-
- radioChanged:
- id
-
-
- sdirChanged:
- id
-
-
-
- NSPopUpButton
- ConfigsController
- JoystickController
- KeyInputTextView
- NSSegmentedControl
- NSSegmentedControl
- NSMatrix
- NSSegmentedControl
- NSTextField
-
-
-
- configPopup
- NSPopUpButton
-
-
- configsController
- ConfigsController
-
-
- joystickController
- JoystickController
-
-
- keyInput
- KeyInputTextView
-
-
- mouseBtnSelect
- NSSegmentedControl
-
-
- mouseDirSelect
- NSSegmentedControl
-
-
- radioButtons
- NSMatrix
-
-
- scrollDirSelect
- NSSegmentedControl
-
-
- title
- NSTextField
-
-
IBProjectSource
- ./Classes/TargetController.h
+ ./Classes/NJKeyInputField.h