X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=402d345839306c869d64ca1516210c352d8c2d94;hp=9c7050aa2f059d9e817b124811d7223517abc275;hb=ce24f5cc4eb879f248f3363663c5330a06b1046f;hpb=794561a4606fa9e31e3b2b077891f5b1e6084698
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 9c7050a..402d345 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
@@ -61,7 +62,7 @@
@@ -297,12 +299,33 @@
_NSWindowsMenu
+
_NSMainMenu
-
@@ -472,14 +549,10 @@
- 337641536
- 2048
+ 67108928
+ 2624
Text Cell
-
- LucidaGrande
- 13
- 1044
-
+
6
@@ -497,7 +570,7 @@
- 3
+ 1
YES
@@ -517,8 +590,8 @@
MC41AA
- 17
- -767557632
+ 20
+ 306184192
4
@@ -527,6 +600,8 @@
YES
0
1
+ -1
+ NO
{{1, 1}, {200, 298}}
@@ -567,11 +642,11 @@
- 133650
+ 150034
- QSAAAEEgAABBmAAAQZgAAA
+ QSAAAEEgAABBsAAAQbAAAA
0.25
4
1
@@ -589,7 +664,7 @@
- 268
+ 265
{{227, 123}, {180, 24}}
@@ -626,7 +701,7 @@
- 268
+ 265
{{227, 55}, {180, 24}}
@@ -659,7 +734,7 @@
- 268
+ 265
{{227, 89}, {180, 24}}
@@ -690,6 +765,49 @@
NO
+
+
+ 265
+ {{229, 190}, {176, 24}}
+
+
+
+ _NS:9
+ NJKeyInputField
+
+
268
@@ -725,7 +843,7 @@
603979776
0
- Press a key:
+ Press a key
1211912448
@@ -739,7 +857,7 @@
603979776
0
- Switch to configuration
+ Switch to mapping
1211912448
@@ -753,7 +871,7 @@
603979776
0
- Mouse movement
+ Move the mouse
1211912448
@@ -767,7 +885,7 @@
603979776
0
- Mouse button
+ Press a mouse button
1211912448
@@ -781,7 +899,7 @@
603979776
0
- Mouse scroll
+ Scroll the mouse
1211912448
@@ -795,7 +913,7 @@
603979776
0
- Toggle mouse scope
+ Switch mouse mode
1211912448
@@ -835,39 +953,6 @@
-
266
@@ -877,15 +962,15 @@
YES
- 68157504
- 138413056
+ 67108928
+ 138414656
LucidaGrande-Bold
13
16
- No action selected
+ No input selected
@@ -894,8 +979,8 @@
- 12
- {{0, 258}, {465, 5}}
+ 10
+ {{12, 258}, {405, 5}}
@@ -921,16 +1006,6 @@
0
NO
-
-
- 265
- {{229, 190}, {176, 24}}
-
-
-
- _NS:9
- KeyInputTextView
-
{{211, 0}, {429, 300}}
@@ -952,8 +1027,9 @@
{{0, 0}, {1440, 878}}
- {640, 369}
+ {640, 355}
{10000000000000, 10000000000000}
+ Enjoyable
YES
@@ -971,7 +1047,7 @@
256
- {320, 418}
+ {198, 198}
@@ -985,9 +1061,9 @@
- 317
- 40
- 1000
+ 190
+ 190
+ 190
- 3
- YES
YES
@@ -1018,8 +1092,8 @@
2
- 17
- 46170112
+ 20
+ 44072960
1
@@ -1028,9 +1102,10 @@
NO
0
1
+ -1
- {{1, 1}, {320, 418}}
+ {{1, 1}, {198, 198}}
@@ -1044,7 +1119,7 @@
{{306, 1}, {15, 403}}
-
+
NO
_doScroller:
@@ -1053,52 +1128,81 @@
-2147483392
- {{1, 404}, {305, 15}}
+ {{-100, -100}, {366, 16}}
-
+
NO
1
_doScroller:
- 0.99688480000000002
+ 0.98123324396782841
- {{0, 34}, {322, 420}}
+ {{0, 20}, {200, 200}}
-
- 133682
+
+ 150034
- QSAAAEEgAABBmAAAQZgAAA
+ QSAAAEEgAABBsAAAQbAAAA
0.25
4
1
+
+
+ 268
+ {{66, -1}, {134, 23}}
+
+
+
+ _NS:22
+ YES
+
+ -2080374784
+ 168034304
+
+
+ LucidaGrande
+ 9
+ 3614
+
+ _NS:22
+
+ 1221349376
+ 162
+
+
+ 400
+ 75
+
+ NO
+
- 260
- {{10, 4}, {39, 28}}
+ 292
+ {{0, -1}, {34, 23}}
YES
67108864
- 134217728
+ 134479872
-
+
-2033958912
- 162
+ 268435618
NSImage
NSAddTemplate
-
+ n
400
75
@@ -1106,60 +1210,58 @@
- 260
- {{57, 4}, {39, 28}}
+ 292
+ {{33, -1}, {34, 23}}
-
+
YES
- 603979776
- 134217728
+ 67108864
+ 134479872
-
+
-2033958912
- 162
+ 268435618
NSImage
NSRemoveTemplate
-
+ CA
400
75
NO
- {322, 454}
+ {200, 220}
NSView
-
-
- {200, 100}
- {200, 0}
- {300, 10000}
- 2
- 0.0
- 15
-
-
-
- ApplicationController
+ EnjoyableApplicationDelegate
- ConfigsController
+ NJMappingsController
- JoystickController
+ NJDeviceController
- TargetController
+ NJOutputController
+
+
+
+
+ 0
+ 1
+ 0.0
+ 0.0
+ YES
@@ -1188,6 +1290,14 @@
732
+
+
+ showHelp:
+
+
+
+ 870
+
orderFrontStandardAboutPanel:
@@ -1244,38 +1354,6 @@
370
-
-
- parentWindow
-
-
-
- 454
-
-
-
- contentView
-
-
-
- 455
-
-
-
- toggle:
-
-
-
- 498
-
-
-
- toggle:
-
-
-
- 811
-
delegate
@@ -1302,107 +1380,75 @@
- targetController
-
-
-
- 695
-
-
-
- configsController
+ mappingsController
- 717
+ 822
- jsController
-
-
+ outputController
+
+
- 484
+ 826
- drawer
-
-
+ translatingEventsMenu
+
+
- 486
+ 877
-
- mainWindow
-
-
+
+ translatingEventsChanged:
+
+
- 500
+ 878
- activeMenuItem
-
-
+ translatingEventsButton
+
+
- 607
+ 879
- activeButton
-
-
-
- 609
-
-
-
- toggleActivity:
-
-
-
- 610
-
-
-
- toggleActivity:
+ dockMenuBase
-
+
- 611
+ 726
- targetController
+ inputController
-
+
- 712
+ 819
- configsController
+ mappingsController
- 716
+ 820
- dockMenuBase
+ window
-
-
- 726
-
-
-
- addPressed:
-
-
+
- 515
+ 865
@@ -1428,14 +1474,6 @@
520
-
-
- targetController
-
-
-
- 697
-
exportPressed:
@@ -1454,67 +1492,75 @@
- dataSource
-
-
+ outputController
+
+
- 647
+ 827
-
- delegate
-
-
+
+ mappingPressed:
+
+
- 696
+ 855
- radioButtons
-
-
+ popover
+
+
- 692
+ 856
- configsController
-
-
+ popoverActivate
+
+
+
+ 857
+
+
+
+ addPressed:
+
+
- 693
+ 515
- joystickController
-
+ dataSource
+
- 694
+ 647
- title
-
-
+ delegate
+
+
- 709
+ 696
- configPopup
+ radioButtons
-
+
- 713
+ 692
-
- configChosen:
+
+ title
-
+
- 714
+ 709
@@ -1582,19 +1628,75 @@
- targetController
+ mappingsController
+
+
+
+ 821
+
+
+
+ mappingPopup
+
+
+
+ 823
+
+
+
+ inputController
+
+
+
+ 828
+
+
+
+ keyDelegate
- 779
+ 818
+
+
+
+ performClick:
+
+
+
+ 871
- window
-
-
+ view
+
+
+
+ 854
+
+
+
+ contentViewController
+
+
- 780
+ 852
+
+
+
+ delegate
+
+
+
+ 853
+
+
+
+ performClick:
+
+
+
+ 880
@@ -1630,9 +1732,10 @@
+
- MainMenu
+ Main Menu
19
@@ -1772,11 +1875,6 @@
-
- 420
-
-
-
450
@@ -1790,17 +1888,13 @@
451
-
-
+
+
+
- Drawer Content View
-
-
- 452
-
-
+ Mapping List Popover Content
453
@@ -1837,6 +1931,7 @@
+ Mapping List
461
@@ -1855,36 +1950,17 @@
482
- ApplicationController
487
-
-
+
+
-
- 495
-
-
-
-
- 507
-
-
-
-
-
-
-
- 508
-
-
-
511
@@ -1892,6 +1968,7 @@
+ Remove Mapping
512
@@ -1902,24 +1979,17 @@
514
- ConfigsController
479
- JoystickController
606
-
- 608
-
-
-
652
@@ -1936,6 +2006,7 @@
+ Input Devices Pane
634
@@ -1954,6 +2025,7 @@
+ Input Device List
636
@@ -1972,6 +2044,7 @@
+ Device/Input Name
642
@@ -1987,11 +2060,12 @@
-
+
+ Output Editor Pane
686
@@ -2012,21 +2086,25 @@
+ Output Types
657
+ Disabled
658
+ Key Press
699
+ Switch Mapping
700
@@ -2035,6 +2113,7 @@
+ Mapping Choice List
701
@@ -2057,6 +2136,7 @@
+ Input Name
707
@@ -2077,16 +2157,19 @@
733
+ Mouse Movement
734
+ Mouse Button
735
+ Mouse Scroll
659
@@ -2100,6 +2183,7 @@
+ Mouse Button Selector
745
@@ -2110,6 +2194,7 @@
748
+ Switch Mouse Mode
749
@@ -2118,6 +2203,7 @@
+ Mouse Scroll Selector
750
@@ -2131,6 +2217,7 @@
+ Mouse Motion Selector
755
@@ -2142,16 +2229,6 @@
-
- 790
-
-
-
-
- 810
-
-
-
812
@@ -2167,6 +2244,120 @@
+
+ 837
+
+
+
+
+
+ Mapping Selector
+
+
+ 835
+
+
+
+
+
+
+
+ 836
+
+
+
+
+ 849
+
+
+
+
+ 850
+
+
+ Popover View Controller
+
+
+ 851
+
+
+ Mapping List Popover
+
+
+ 507
+
+
+
+
+
+ Add Mapping
+
+
+ 508
+
+
+
+
+ 862
+
+
+
+
+
+ Gradient Space
+
+
+ 863
+
+
+
+
+ 810
+
+
+
+
+ 866
+
+
+
+
+
+
+
+ 867
+
+
+
+
+
+
+
+ 868
+
+
+
+
+ 874
+
+
+
+
+
+
+
+ 872
+
+
+
+
+
+
+
+ 873
+
+
+
@@ -2187,14 +2378,12 @@
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
{{114, 276}, {770, 487}}
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -2205,10 +2394,25 @@
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
+ ToolTip
+
+ ToolTip
+
+ Create a new mapping
+
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
+ ToolTip
+
+ ToolTip
+
+ Remove the selected mapping
+
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -2216,7 +2420,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
@@ -2253,93 +2456,160 @@
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
+
+ ToolTip
+
+ ToolTip
+
+ Change the active mapping
+
+
+ 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
+
+ ToolTip
+
+ ToolTip
+
+ Enable mapped actions
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- 816
+ 880
- ApplicationController
+ EnjoyableApplicationDelegate
+ NSObject
+
+ NSMenu
+ NJDeviceController
+ NJMappingsController
+ NSWindow
+
+
+
+ dockMenuBase
+ NSMenu
+
+
+ inputController
+ NJDeviceController
+
+
+ mappingsController
+ NJMappingsController
+
+
+ window
+ NSWindow
+
+
+
+ IBProjectSource
+ ./Classes/EnjoyableApplicationDelegate.h
+
+
+
+ NJDeviceController
NSObject
- toggleActivity:
+ translatingEventsChanged:
id
- toggleActivity:
+ translatingEventsChanged:
- toggleActivity:
+ translatingEventsChanged:
id
- NSToolbarItem
- NSMenuItem
- ConfigsController
- NSMenu
- NSDrawer
- JoystickController
- NSWindow
- TargetController
+ NJMappingsController
+ NSOutlineView
+ NJOutputController
+ NSButton
+ NSMenuItem
-
- activeButton
- NSToolbarItem
-
-
- activeMenuItem
- NSMenuItem
+
+ mappingsController
+ NJMappingsController
-
- configsController
- ConfigsController
-
-
- dockMenuBase
- NSMenu
-
-
- drawer
- NSDrawer
+
+ outlineView
+ NSOutlineView
-
- jsController
- JoystickController
+
+ outputController
+ NJOutputController
-
- mainWindow
- NSWindow
+
+ translatingEventsButton
+ NSButton
-
- targetController
- TargetController
+
+ translatingEventsMenu
+ NSMenuItem
IBProjectSource
- ./Classes/ApplicationController.h
+ ./Classes/NJDeviceController.h
+
+
+
+ NJKeyInputField
+ NSTextField
+
+ keyDelegate
+ id
+
+
+ keyDelegate
+
+ keyDelegate
+ id
+
+
+
+ IBProjectSource
+ ./Classes/NJKeyInputField.h
- ConfigsController
+ NJMappingsController
NSObject
id
id
id
+ id
id
@@ -2355,20 +2625,33 @@
importPressed:
id
+
+ mappingPressed:
+ id
+
removePressed:
id
- NSButton
+ NJOutputController
+ NSPopover
+ NSButton
NSButton
NSTableView
- TargetController
-
- exportButton
+
+ outputController
+ NJOutputController
+
+
+ popover
+ NSPopover
+
+
+ popoverActivate
NSButton
@@ -2379,80 +2662,22 @@
tableView
NSTableView
-
- targetController
- TargetController
-
IBProjectSource
- ./Classes/ConfigsController.h
+ ./Classes/NJMappingsController.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
+ NJOutputController
NSObject
- id
id
id
id
id
-
- configChosen:
- id
-
mbtnChanged:
id
@@ -2471,10 +2696,10 @@
- NSPopUpButton
- ConfigsController
- JoystickController
- KeyInputTextView
+ NJDeviceController
+ NJKeyInputField
+ NSPopUpButton
+ NJMappingsController
NSSegmentedControl
NSSegmentedControl
NSMatrix
@@ -2482,21 +2707,21 @@
NSTextField
-
- configPopup
- NSPopUpButton
-
-
- configsController
- ConfigsController
-
-
- joystickController
- JoystickController
+
+ inputController
+ NJDeviceController
keyInput
- KeyInputTextView
+ NJKeyInputField
+
+
+ mappingPopup
+ NSPopUpButton
+
+
+ mappingsController
+ NJMappingsController
mouseBtnSelect
@@ -2521,7 +2746,7 @@
IBProjectSource
- ./Classes/TargetController.h
+ ./Classes/NJOutputController.h
@@ -2532,12 +2757,12 @@
3
{8, 8}
- {9, 9}
{11, 10}
{11, 11}
{10, 3}
{16, 15}
{8, 8}
+ {9, 9}