X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=a110b51f3da664c0fa388e99a41e2103d50d615c;hp=6e87fb02440bdad0d36971862161b6b324042b33;hb=04a5164fec6b5d856b4ab181a2b7c870c2dc679a;hpb=4a490c57151dd4ba9cb27cc34a0e33fc68fc4d24
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 6e87fb0..a110b51 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -16,13 +16,13 @@
NSButtonCell
NSCustomObject
NSCustomView
- NSDrawer
NSMatrix
NSMenu
NSMenuItem
NSOutlineView
NSPopUpButton
NSPopUpButtonCell
+ NSPopover
NSScrollView
NSScroller
NSSegmentedCell
@@ -36,6 +36,7 @@
NSToolbarFlexibleSpaceItem
NSToolbarItem
NSView
+ NSViewController
NSWindowTemplate
@@ -239,6 +240,7 @@
2147483647
+ 1
@@ -319,50 +321,118 @@
YES
NO
YES
- 1
- 2
+ 2
+ 1
-
-
-
+
+
-
+
-
+
@@ -475,11 +545,7 @@
67108928
2624
Text Cell
-
- LucidaGrande
- 13
- 1044
-
+
6
@@ -632,6 +698,7 @@
{{227, 55}, {180, 24}}
+
_NS:9
YES
@@ -953,7 +1020,7 @@
{{0, 0}, {1440, 878}}
- {640, 369}
+ {640, 355}
{10000000000000, 10000000000000}
Enjoyable
YES
@@ -973,7 +1040,7 @@
256
- {320, 418}
+ {196, 256}
@@ -987,9 +1054,9 @@
- 317
- 40
- 1000
+ 190
+ 190
+ 190
- 3
- YES
YES
@@ -1021,7 +1086,7 @@
20
- 46170112
+ 48267264
1
@@ -1030,10 +1095,10 @@
NO
0
1
- 1
+ -1
- {{1, 1}, {320, 418}}
+ {{2, 2}, {196, 256}}
@@ -1047,7 +1112,7 @@
{{306, 1}, {15, 403}}
-
+
NO
_doScroller:
@@ -1056,22 +1121,22 @@
-2147483392
- {{1, 404}, {305, 15}}
+ {{-100, -100}, {366, 16}}
-
+
NO
1
_doScroller:
- 0.99688480000000002
+ 0.98123324396782841
- {{0, 34}, {322, 420}}
+ {{0, 54}, {200, 260}}
-
- 133682
+
+ 150035
@@ -1082,8 +1147,8 @@
- 260
- {{10, 4}, {39, 28}}
+ 292
+ {{20, 19}, {39, 28}}
@@ -1109,10 +1174,11 @@
- 260
- {{57, 4}, {39, 28}}
+ 292
+ {{67, 19}, {39, 28}}
+
YES
603979776
@@ -1134,34 +1200,32 @@
NO
- {322, 454}
+ {200, 314}
NSView
-
-
- {200, 100}
- {100, 0}
- {400, 10000}
- 2
- 0.0
- 15
-
-
-
- ApplicationController
+ EnjoyableApplicationDelegate
- ConfigsController
+ NJMappingsController
- JoystickController
+ NJDeviceController
- TargetController
+ NJOutputController
+
+
+
+
+ 0
+ 1
+ 0.0
+ 0.0
+ YES
@@ -1246,38 +1310,6 @@
370
-
-
- parentWindow
-
-
-
- 454
-
-
-
- contentView
-
-
-
- 455
-
-
-
- toggle:
-
-
-
- 498
-
-
-
- toggle:
-
-
-
- 811
-
delegate
@@ -1304,35 +1336,35 @@
- targetController
+ mappingsController
-
+
- 695
+ 822
- configsController
+ outputController
-
+
- 717
+ 826
-
- jsController
-
-
+
+ translatingEventsChanged:
+
+
- 484
+ 858
- drawer
-
-
+ translatingEventsSetting
+
+
- 486
+ 859
@@ -1350,14 +1382,6 @@
607
-
-
- activeButton
-
-
-
- 609
-
toggleActivity:
@@ -1367,36 +1391,36 @@
610
-
- toggleActivity:
+
+ dockMenuBase
-
+
- 611
+ 726
- targetController
+ inputController
-
+
- 712
+ 819
- configsController
+ mappingsController
- 716
+ 820
- dockMenuBase
+ outputController
-
+
- 726
+ 825
@@ -1430,14 +1454,6 @@
520
-
-
- targetController
-
-
-
- 697
-
exportPressed:
@@ -1456,67 +1472,67 @@
- dataSource
-
-
+ outputController
+
+
- 647
+ 827
-
- delegate
-
-
+
+ mappingPressed:
+
+
- 696
+ 855
- radioButtons
-
-
+ popover
+
+
- 692
+ 856
- configsController
-
-
+ popoverActivate
+
+
- 693
+ 857
- joystickController
-
+ dataSource
+
- 694
+ 647
- title
-
-
+ delegate
+
+
- 709
+ 696
- configPopup
+ radioButtons
-
+
- 713
+ 692
-
- configChosen:
+
+ title
-
+
- 714
+ 709
@@ -1582,6 +1598,38 @@
781
+
+
+ mappingsController
+
+
+
+ 821
+
+
+
+ mappingPopup
+
+
+
+ 823
+
+
+
+ mappingChosen:
+
+
+
+ 824
+
+
+
+ inputController
+
+
+
+ 828
+
keyDelegate
@@ -1590,6 +1638,30 @@
818
+
+
+ view
+
+
+
+ 854
+
+
+
+ contentViewController
+
+
+
+ 852
+
+
+
+ delegate
+
+
+
+ 853
+
@@ -1784,18 +1856,13 @@
451
+
-
Drawer Content View
-
- 452
-
-
-
453
@@ -1855,17 +1922,12 @@
487
-
-
+
+
-
- 495
-
-
-
507
@@ -1909,11 +1971,6 @@
-
- 608
-
-
-
652
@@ -2136,11 +2193,6 @@
-
- 790
-
-
-
810
@@ -2161,6 +2213,64 @@
+
+ 837
+
+
+
+
+
+
+
+ 835
+
+
+
+
+
+
+
+ 836
+
+
+
+
+ 842
+
+
+
+
+
+
+
+ 840
+
+
+
+
+
+
+
+ 841
+
+
+
+
+ 849
+
+
+
+
+ 850
+
+
+ Popover View Controller
+
+
+ 851
+
+
+
@@ -2188,7 +2298,6 @@
{{114, 276}, {770, 487}}
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -2199,7 +2308,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
@@ -2210,7 +2318,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
@@ -2247,25 +2354,35 @@
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
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- 818
+ 859
- ApplicationController
+ EnjoyableApplicationDelegate
NSObject
toggleActivity:
@@ -2279,61 +2396,104 @@
- NSToolbarItem
- NSMenuItem
- ConfigsController
NSMenu
- NSDrawer
- JoystickController
- NSWindow
- TargetController
+ NJDeviceController
+ NJMappingsController
+ NJOutputController
-
- activeButton
- NSToolbarItem
-
-
- activeMenuItem
- NSMenuItem
-
-
- configsController
- ConfigsController
-
dockMenuBase
NSMenu
-
- drawer
- NSDrawer
+
+ inputController
+ NJDeviceController
+
+
+ mappingsController
+ NJMappingsController
+
+
+ outputController
+ NJOutputController
+
+
+
+ IBProjectSource
+ ./Classes/EnjoyableApplicationDelegate.h
+
+
+
+ NJDeviceController
+ NSObject
+
+ translatingEventsChanged:
+ id
+
+
+ translatingEventsChanged:
+
+ translatingEventsChanged:
+ id
+
+
+
+ NJMappingsController
+ NSOutlineView
+ NJOutputController
+ NSSegmentedControl
+
+
+
+ mappingsController
+ NJMappingsController
-
- jsController
- JoystickController
+
+ outlineView
+ NSOutlineView
-
- mainWindow
- NSWindow
+
+ outputController
+ NJOutputController
-
- targetController
- TargetController
+
+ translatingEventsSetting
+ NSSegmentedControl
IBProjectSource
- ./Classes/ApplicationController.h
+ ./Classes/NJDeviceController.h
- ConfigsController
+ NJKeyInputField
+ NSTextField
+
+ keyDelegate
+ id
+
+
+ keyDelegate
+
+ keyDelegate
+ id
+
+
+
+ IBProjectSource
+ ./Classes/NJKeyInputField.h
+
+
+
+ NJMappingsController
NSObject
id
id
id
+ id
id
@@ -2349,17 +2509,35 @@
importPressed:
id
+
+ mappingPressed:
+ id
+
removePressed:
id
+ NJOutputController
+ NSPopover
+ NSButton
NSButton
NSTableView
- TargetController
+
+ outputController
+ NJOutputController
+
+
+ popover
+ NSPopover
+
+
+ popoverActivate
+ NSButton
+
removeButton
NSButton
@@ -2368,77 +2546,22 @@
tableView
NSTableView
-
- targetController
- TargetController
-
-
-
- IBProjectSource
- ./Classes/ConfigsController.h
-
-
-
- JoystickController
- NSObject
-
- ConfigsController
- NSOutlineView
- TargetController
-
-
-
- configsController
- ConfigsController
-
-
- outlineView
- NSOutlineView
-
-
- targetController
- TargetController
-
IBProjectSource
- ./Classes/JoystickController.h
+ ./Classes/NJMappingsController.h
- NJKeyInputField
- NSTextField
-
- keyDelegate
- id
-
-
- keyDelegate
-
- keyDelegate
- id
-
-
-
- IBProjectSource
- ./Classes/NJKeyInputField.h
-
-
-
- TargetController
+ NJOutputController
NSObject
- id
id
id
id
id
-
- configChosen:
- id
-
mbtnChanged:
id
@@ -2457,10 +2580,10 @@
- NSPopUpButton
- ConfigsController
- JoystickController
+ NJDeviceController
NJKeyInputField
+ NSPopUpButton
+ NJMappingsController
NSSegmentedControl
NSSegmentedControl
NSMatrix
@@ -2468,22 +2591,22 @@
NSTextField
-
- configPopup
- NSPopUpButton
-
-
- configsController
- ConfigsController
-
-
- joystickController
- JoystickController
+
+ inputController
+ NJDeviceController
keyInput
NJKeyInputField
+
+ mappingPopup
+ NSPopUpButton
+
+
+ mappingsController
+ NJMappingsController
+
mouseBtnSelect
NSSegmentedControl
@@ -2507,7 +2630,7 @@
IBProjectSource
- ./Classes/TargetController.h
+ ./Classes/NJOutputController.h
@@ -2517,11 +2640,12 @@
YES
3
+ {15, 15}
{8, 8}
- {9, 9}
{11, 10}
{11, 11}
{10, 3}
+ {13, 10}
{16, 15}
{8, 8}