X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=1a87bd74e4dee4e83603236f19111e32363b238f;hp=1b4989d5e28b06c4930b58d8e3b27d618b8d7dc3;hb=d0f4d54bb9eb66cbd19fa4dabb56fc09f42bd22d;hpb=62aa5b73be6ec1e499e6b155cd0e7687c338cbaa
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 1b4989d..1a87bd7 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -35,8 +35,6 @@
NSToolbar
NSToolbarFlexibleSpaceItem
NSToolbarItem
- NSToolbarSeparatorItem
- NSToolbarSpaceItem
NSView
NSWindowTemplate
@@ -176,7 +174,7 @@
- 3
+ 1
YES
@@ -536,8 +516,8 @@
MC41AA
- 17
- -767557632
+ 20
+ 306184192
4
@@ -546,6 +526,8 @@
YES
0
1
+ -1
+ NO
{{1, 1}, {200, 298}}
@@ -582,11 +564,11 @@
{202, 300}
- 133650
+ 150034
- QSAAAEEgAABBmAAAQZgAAA
+ QSAAAEEgAABBsAAAQbAAAA
0.25
4
1
@@ -603,7 +585,7 @@
- 268
+ 265
{{227, 123}, {180, 24}}
@@ -639,7 +621,7 @@
- 268
+ 265
{{227, 55}, {180, 24}}
_NS:9
@@ -670,7 +652,7 @@
- 268
+ 265
{{227, 89}, {180, 24}}
@@ -700,11 +682,53 @@
NO
+
+
+ 265
+ {{229, 190}, {176, 24}}
+
+
+ _NS:9
+ NJKeyInputField
+
+
268
{{20, 16}, {201, 236}}
+
NO
7
1
@@ -747,7 +771,7 @@
603979776
0
- Switch to configuration
+ Switch to mapping
1211912448
@@ -803,7 +827,7 @@
603979776
0
- Toggle mouse scope
+ Switch mouse mode
1211912448
@@ -843,38 +867,6 @@
-
266
@@ -883,8 +875,8 @@
YES
- 68157504
- 138413056
+ 67108928
+ 138414656
LucidaGrande-Bold
@@ -900,8 +892,8 @@
- 12
- {{0, 258}, {465, 5}}
+ 10
+ {{12, 258}, {405, 5}}
{0, 0}
@@ -926,14 +918,6 @@
0
NO
-
-
- 265
- {{229, 190}, {176, 24}}
-
- _NS:9
- KeyInputTextView
-
{{211, 0}, {429, 300}}
@@ -953,6 +937,7 @@
{{0, 0}, {1440, 878}}
{640, 369}
{10000000000000, 10000000000000}
+ Enjoyable
YES
@@ -1016,7 +1001,7 @@
2
- 17
+ 20
46170112
@@ -1026,6 +1011,7 @@
NO
0
1
+ 1
{{1, 1}, {320, 418}}
@@ -1066,7 +1052,7 @@
- QSAAAEEgAABBmAAAQZgAAA
+ QSAAAEEgAABBsAAAQbAAAA
0.25
4
1
@@ -1130,8 +1116,8 @@
{200, 100}
- {150, 0}
- {300, 10000}
+ {100, 0}
+ {400, 10000}
2
0.0
15
@@ -1139,38 +1125,16 @@
- ApplicationController
+ EnjoyableApplicationDelegate
- ConfigsController
+ NJMappingsController
- JoystickController
+ NJDeviceController
- TargetController
-
-
-
- 268
- {82, 32}
- _NS:9
- YES
-
- 67108864
- 134217728
- Button
-
- _NS:9
-
- -2038284288
- 129
-
-
- 200
- 25
-
- NO
+ NJOutputController
@@ -1279,6 +1243,14 @@
498
+
+
+ toggle:
+
+
+
+ 811
+
delegate
@@ -1305,27 +1277,19 @@
- targetController
-
-
-
- 695
-
-
-
- configsController
+ mappingsController
- 717
+ 822
- jsController
-
-
+ outputController
+
+
- 484
+ 826
@@ -1377,27 +1341,35 @@
- targetController
+ dockMenuBase
-
+
+
+ 726
+
+
+
+ inputController
+
+
- 712
+ 819
- configsController
+ mappingsController
- 716
+ 820
- dockMenuBase
+ outputController
-
+
- 726
+ 825
@@ -1431,13 +1403,29 @@
520
+
+
+ exportPressed:
+
+
+
+ 815
+
+
+
+ importPressed:
+
+
+
+ 816
+
- targetController
+ outputController
- 697
+ 827
@@ -1463,22 +1451,6 @@
692
-
-
- configsController
-
-
-
- 693
-
-
-
- joystickController
-
-
-
- 694
-
title
@@ -1487,22 +1459,6 @@
709
-
-
- configPopup
-
-
-
- 713
-
-
-
- configChosen:
-
-
-
- 714
-
radioChanged:
@@ -1569,19 +1525,43 @@
- targetController
-
-
+ mappingsController
+
+
+
+ 821
+
+
+
+ mappingPopup
+
+
+
+ 823
+
+
+
+ mappingChosen:
+
+
+
+ 824
+
+
+
+ inputController
+
+
- 779
+ 828
- window
+ keyDelegate
-
+
- 780
+ 818
@@ -1651,6 +1631,10 @@
+
+
+
+
@@ -1844,29 +1828,12 @@
487
-
-
-
+
-
- 490
-
-
-
-
- 492
-
-
-
-
- 493
-
-
-
495
@@ -1987,8 +1954,8 @@
-
+
@@ -2138,22 +2105,34 @@
- 765
-
-
-
-
-
+ 778
+
+
- 766
-
-
+ 790
+
+
- 778
-
-
+ 810
+
+
+
+
+ 812
+
+
+
+
+ 813
+
+
+
+
+ 814
+
+
@@ -2193,9 +2172,6 @@
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -2243,10 +2219,13 @@
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -2254,247 +2233,27 @@
- 781
+ 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
-
-
-
- addPressed:
- id
-
-
- removePressed:
- id
-
-
-
- NSButton
- NSTableView
- TargetController
-
-
-
- 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
@@ -2506,9 +2265,9 @@
{8, 8}
{9, 9}
+ {11, 10}
{11, 11}
{10, 3}
- {32, 32}
{16, 15}
{8, 8}