X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=bd4f12a66c93ad6130e097565e6454add83fe691;hp=e1e7aa1304c737843d042be4e8430f6444383959;hb=4f449987e5296701d1da9963789c4817935ab6c8;hpb=f864d363128de19fc6591b77ae9226b34166d715
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index e1e7aa1..bd4f12a 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -16,17 +16,19 @@
NSButtonCell
NSCustomObject
NSCustomView
- NSDrawer
NSMatrix
NSMenu
NSMenuItem
NSOutlineView
NSPopUpButton
NSPopUpButtonCell
+ NSPopover
NSScrollView
NSScroller
NSSegmentedCell
NSSegmentedControl
+ NSSlider
+ NSSliderCell
NSSplitView
NSTableColumn
NSTableView
@@ -36,6 +38,7 @@
NSToolbarFlexibleSpaceItem
NSToolbarItem
NSView
+ NSViewController
NSWindowTemplate
@@ -61,7 +64,7 @@
@@ -297,12 +301,33 @@
_NSWindowsMenu
+
_NSMainMenu
-
{640, 300}
-
+
256
@@ -433,7 +506,8 @@
256
{200, 298}
-
+
+
YES
NO
YES
@@ -474,11 +548,7 @@
67108928
2624
Text Cell
-
- LucidaGrande
- 13
- 1044
-
+
6
@@ -532,6 +602,7 @@
{{1, 1}, {200, 298}}
+
@@ -542,6 +613,7 @@
-2147483392
{{1, 1}, {8, 298}}
+
NO
@@ -553,6 +625,7 @@
-2147483392
{{-100, -100}, {473, 15}}
+
NO
1
@@ -563,7 +636,8 @@
{202, 300}
-
+
+
150034
@@ -576,6 +650,7 @@
{202, 300}
+
NSView
@@ -583,37 +658,74 @@
256
+
+
+ 268
+ {{228, 120}, {176, 12}}
+
+
+
+ _NS:9
+ YES
+
+ -2080374784
+ 262144
+
+ _NS:9
+
+ 20
+ 0.0
+ 4
+ 0.0
+ 0
+ 1
+ NO
+ NO
+
+ NO
+
265
- {{227, 123}, {180, 24}}
+ {{226, 132}, {179, 15}}
-
+
+
_NS:9
YES
67108864
- 0
-
+ 262144
+
LucidaGrande
- 13
- 16
+ 9
+ 3614
_NS:9
- 87
- Horizontal
+ 43
+ â
YES
0
- 86
- Vertical
+ 43
+ â
1
0
+
+ 42
+ â
+ 0
+
+
+ 42
+ â
+ 0
+
1
@@ -622,14 +734,20 @@
265
- {{227, 55}, {180, 24}}
+ {{226, 55}, {180, 24}}
+
+
_NS:9
YES
67108864
0
-
+
+ LucidaGrande
+ 13
+ 16
+
_NS:9
@@ -653,8 +771,9 @@
265
- {{227, 89}, {180, 24}}
+ {{226, 89}, {180, 24}}
+
_NS:9
YES
@@ -685,8 +804,9 @@
265
- {{229, 190}, {176, 24}}
+ {{228, 190}, {176, 24}}
+
_NS:9
NJKeyInputField
@@ -694,8 +814,9 @@
- {201, 32}
+ {200, 32}
{4, 2}
1353195520
NSActionCell
@@ -872,6 +994,7 @@
266
{{0, 269}, {429, 17}}
+
YES
@@ -883,7 +1006,7 @@
13
16
- No action selected
+ No input selected
@@ -895,6 +1018,7 @@
10
{{12, 258}, {405, 5}}
+
{0, 0}
@@ -921,27 +1045,31 @@
{{211, 0}, {429, 300}}
+
NSView
{640, 300}
+
YES
{640, 300}
+
+
{{0, 0}, {1440, 878}}
- {640, 369}
+ {640, 355}
{10000000000000, 10000000000000}
Enjoyable
YES
-
+
256
@@ -955,8 +1083,9 @@
256
- {320, 418}
+ {198, 198}
+
YES
NO
@@ -968,9 +1097,9 @@
- 317
- 40
- 1000
+ 190
+ 190
+ 190
- 3
- YES
YES
@@ -1002,7 +1129,7 @@
20
- 46170112
+ 44072960
1
@@ -1011,11 +1138,12 @@
NO
0
1
- 1
+ -1
- {{1, 1}, {320, 418}}
+ {{1, 1}, {198, 198}}
+
@@ -1026,7 +1154,8 @@
-2147483392
{{306, 1}, {15, 403}}
-
+
+
NO
_doScroller:
@@ -1035,20 +1164,22 @@
-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
@@ -1057,27 +1188,53 @@
4
1
+
+
+ 268
+ {{66, -1}, {134, 23}}
+
+
+
+ _NS:22
+ YES
+
+ -2080374784
+ 168034304
+
+
+ _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
@@ -1085,56 +1242,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}
- {100, 0}
- {400, 10000}
- 2
- 0.0
- 15
-
-
-
- ApplicationController
+ EnjoyableApplicationDelegate
- ConfigsController
+ NJMappingsController
- NJInputController
+ NJDeviceController
- TargetController
+ NJOutputController
+
+
+
+
+ 0
+ 1
+ 0.0
+ 0.0
+ YES
@@ -1163,6 +1322,14 @@
732
+
+
+ showHelp:
+
+
+
+ 870
+
orderFrontStandardAboutPanel:
@@ -1219,38 +1386,6 @@
370
-
-
- parentWindow
-
-
-
- 454
-
-
-
- contentView
-
-
-
- 455
-
-
-
- toggle:
-
-
-
- 498
-
-
-
- toggle:
-
-
-
- 811
-
delegate
@@ -1277,107 +1412,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
@@ -1403,14 +1506,6 @@
520
-
-
- targetController
-
-
-
- 697
-
exportPressed:
@@ -1429,67 +1524,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
@@ -1555,6 +1658,46 @@
781
+
+
+ mappingsController
+
+
+
+ 821
+
+
+
+ mappingPopup
+
+
+
+ 823
+
+
+
+ inputController
+
+
+
+ 828
+
+
+
+ mouseSpeedChanged:
+
+
+
+ 885
+
+
+
+ mouseSpeedSlider
+
+
+
+ 886
+
keyDelegate
@@ -1563,6 +1706,46 @@
818
+
+
+ performClick:
+
+
+
+ 871
+
+
+
+ view
+
+
+
+ 854
+
+
+
+ contentViewController
+
+
+
+ 852
+
+
+
+ delegate
+
+
+
+ 853
+
+
+
+ performClick:
+
+
+
+ 880
+
@@ -1597,9 +1780,10 @@
+
- MainMenu
+ Main Menu
19
@@ -1739,11 +1923,6 @@
-
- 420
-
-
-
450
@@ -1757,17 +1936,13 @@
451
-
-
+
+
+
- Drawer Content View
-
-
- 452
-
-
+ Mapping List Popover Content
453
@@ -1804,6 +1979,7 @@
+ Mapping List
461
@@ -1822,36 +1998,17 @@
482
- ApplicationController
487
-
-
+
+
-
- 495
-
-
-
-
- 507
-
-
-
-
-
-
-
- 508
-
-
-
511
@@ -1859,6 +2016,7 @@
+ Remove Mapping
512
@@ -1869,24 +2027,17 @@
514
- ConfigsController
479
- JoystickController
606
-
- 608
-
-
-
652
@@ -1903,6 +2054,7 @@
+ Input Devices Pane
634
@@ -1921,6 +2073,7 @@
+ Input Device List
636
@@ -1939,6 +2092,7 @@
+ Device/Input Name
642
@@ -1957,8 +2111,10 @@
+
+ Output Editor Pane
686
@@ -1979,21 +2135,25 @@
+ Output Types
657
+ Disabled
658
+ Key Press
699
+ Switch Mapping
700
@@ -2002,6 +2162,7 @@
+ Mapping Choice List
701
@@ -2024,6 +2185,7 @@
+ Input Name
707
@@ -2044,16 +2206,19 @@
733
+ Mouse Movement
734
+ Mouse Button
735
+ Mouse Scroll
659
@@ -2067,6 +2232,7 @@
+ Mouse Button Selector
745
@@ -2077,6 +2243,7 @@
748
+ Switch Mouse Mode
749
@@ -2085,6 +2252,7 @@
+ Mouse Scroll Selector
750
@@ -2098,6 +2266,7 @@
+ Mouse Motion Selector
755
@@ -2109,16 +2278,6 @@
-
- 790
-
-
-
-
- 810
-
-
-
812
@@ -2134,6 +2293,133 @@
+
+ 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
+
+
+
+
+ 883
+
+
+
+
+
+
+
+ 884
+
+
+
@@ -2154,14 +2440,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
@@ -2172,10 +2456,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
@@ -2183,7 +2482,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
@@ -2217,96 +2515,173 @@
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
+
+ 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
+
+ ToolTip
+
+ ToolTip
+
+ Maximum mouse speed
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- 818
+ 886
- 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
+
+ mappingsController
+ NJMappingsController
-
- activeMenuItem
- NSMenuItem
-
-
- 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
@@ -2322,17 +2697,35 @@
importPressed:
id
+
+ mappingPressed:
+ id
+
removePressed:
id
+ NJOutputController
+ NSPopover
+ NSButton
NSButton
NSTableView
- TargetController
+
+ outputController
+ NJOutputController
+
+
+ popover
+ NSPopover
+
+
+ popoverActivate
+ NSButton
+
removeButton
NSButton
@@ -2341,77 +2734,23 @@
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
-
-
-
- NJKeyInputField
- NSTextField
-
- keyDelegate
- id
-
-
- keyDelegate
-
- keyDelegate
- id
-
-
-
- IBProjectSource
- ./Classes/NJKeyInputField.h
-
-
-
- TargetController
+ NJOutputController
NSObject
- id
id
id
+ id
id
id
-
- configChosen:
- id
-
mbtnChanged:
id
@@ -2420,6 +2759,10 @@
mdirChanged:
id
+
+ mouseSpeedChanged:
+ id
+
radioChanged:
id
@@ -2430,33 +2773,34 @@
- NSPopUpButton
- ConfigsController
- JoystickController
+ NJDeviceController
NJKeyInputField
+ NSPopUpButton
+ NJMappingsController
NSSegmentedControl
NSSegmentedControl
+ NSSlider
NSMatrix
NSSegmentedControl
NSTextField
-
- configPopup
- NSPopUpButton
-
-
- configsController
- ConfigsController
-
-
- joystickController
- JoystickController
+
+ inputController
+ NJDeviceController
keyInput
NJKeyInputField
+
+ mappingPopup
+ NSPopUpButton
+
+
+ mappingsController
+ NJMappingsController
+
mouseBtnSelect
NSSegmentedControl
@@ -2465,6 +2809,10 @@
mouseDirSelect
NSSegmentedControl
+
+ mouseSpeedSlider
+ NSSlider
+
radioButtons
NSMatrix
@@ -2480,7 +2828,7 @@
IBProjectSource
- ./Classes/TargetController.h
+ ./Classes/NJOutputController.h
@@ -2491,12 +2839,12 @@
3
{8, 8}
- {9, 9}
{11, 10}
{11, 11}
{10, 3}
{16, 15}
{8, 8}
+ {9, 9}