X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=bd4f12a66c93ad6130e097565e6454add83fe691;hp=1b4989d5e28b06c4930b58d8e3b27d618b8d7dc3;hb=4f449987e5296701d1da9963789c4817935ab6c8;hpb=62aa5b73be6ec1e499e6b155cd0e7687c338cbaa
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 1b4989d..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
@@ -35,9 +37,8 @@
NSToolbar
NSToolbarFlexibleSpaceItem
NSToolbarItem
- NSToolbarSeparatorItem
- NSToolbarSpaceItem
NSView
+ NSViewController
NSWindowTemplate
@@ -63,7 +64,7 @@
+
_NSMainMenu
-
{640, 300}
-
+
256
@@ -453,7 +506,8 @@
256
{200, 298}
-
+
+
YES
NO
YES
@@ -491,14 +545,10 @@
- 337641536
- 2048
+ 67108928
+ 2624
Text Cell
-
- LucidaGrande
- 13
- 1044
-
+
6
@@ -516,7 +566,7 @@
- 3
+ 1
YES
@@ -536,8 +586,8 @@
MC41AA
- 17
- -767557632
+ 20
+ 306184192
4
@@ -546,10 +596,13 @@
YES
0
1
+ -1
+ NO
{{1, 1}, {200, 298}}
+
@@ -560,6 +613,7 @@
-2147483392
{{1, 1}, {8, 298}}
+
NO
@@ -571,6 +625,7 @@
-2147483392
{{-100, -100}, {473, 15}}
+
NO
1
@@ -581,12 +636,13 @@
{202, 300}
-
- 133650
+
+
+ 150034
- QSAAAEEgAABBmAAAQZgAAA
+ QSAAAEEgAABBsAAAQbAAAA
0.25
4
1
@@ -594,6 +650,7 @@
{202, 300}
+
NSView
@@ -601,37 +658,74 @@
256
-
+
268
- {{227, 123}, {180, 24}}
+ {{228, 120}, {176, 12}}
+
_NS:9
YES
+
+ -2080374784
+ 262144
+
+ _NS:9
+
+ 20
+ 0.0
+ 4
+ 0.0
+ 0
+ 1
+ NO
+ NO
+
+ NO
+
+
+
+ 265
+ {{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
@@ -639,15 +733,21 @@
- 268
- {{227, 55}, {180, 24}}
+ 265
+ {{226, 55}, {180, 24}}
+
+
_NS:9
YES
67108864
0
-
+
+ LucidaGrande
+ 13
+ 16
+
_NS:9
@@ -670,9 +770,10 @@
- 268
- {{227, 89}, {180, 24}}
+ 265
+ {{226, 89}, {180, 24}}
+
_NS:9
YES
@@ -700,11 +801,56 @@
NO
+
+
+ 265
+ {{228, 190}, {176, 24}}
+
+
+
+ _NS:9
+ NJKeyInputField
+
+
268
- {{20, 16}, {201, 236}}
+ {{20, 16}, {200, 236}}
+
+
NO
7
1
@@ -733,7 +879,7 @@
603979776
0
- Press a key:
+ Press a key
1211912448
@@ -747,7 +893,7 @@
603979776
0
- Switch to configuration
+ Switch to mapping
1211912448
@@ -761,7 +907,7 @@
603979776
0
- Mouse movement
+ Move the mouse
1211912448
@@ -775,7 +921,7 @@
603979776
0
- Mouse button
+ Press a mouse button
1211912448
@@ -789,7 +935,7 @@
603979776
0
- Mouse scroll
+ Scroll the mouse
1211912448
@@ -803,7 +949,7 @@
603979776
0
- Toggle mouse scope
+ Switch mouse mode
1211912448
@@ -815,7 +961,7 @@
75
- {201, 32}
+ {200, 32}
{4, 2}
1353195520
NSActionCell
@@ -843,55 +989,24 @@
-
266
{{0, 269}, {429, 17}}
+
YES
- 68157504
- 138413056
+ 67108928
+ 138414656
LucidaGrande-Bold
13
16
- No action selected
+ No input selected
@@ -900,9 +1015,10 @@
- 12
- {{0, 258}, {465, 5}}
+ 10
+ {{12, 258}, {405, 5}}
+
{0, 0}
@@ -926,37 +1042,34 @@
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}
+ {640, 355}
{10000000000000, 10000000000000}
+ Enjoyable
YES
-
+
256
@@ -970,8 +1083,9 @@
256
- {320, 418}
+ {198, 198}
+
YES
NO
@@ -983,9 +1097,9 @@
- 317
- 40
- 1000
+ 190
+ 190
+ 190
- 3
- YES
YES
@@ -1016,8 +1128,8 @@
2
- 17
- 46170112
+ 20
+ 44072960
1
@@ -1026,10 +1138,12 @@
NO
0
1
+ -1
- {{1, 1}, {320, 418}}
+ {{1, 1}, {198, 198}}
+
@@ -1040,7 +1154,8 @@
-2147483392
{{306, 1}, {15, 403}}
-
+
+
NO
_doScroller:
@@ -1049,49 +1164,77 @@
-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
+
+
+ _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
@@ -1099,78 +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}
- {150, 0}
- {300, 10000}
- 2
- 0.0
- 15
-
-
-
- ApplicationController
+ EnjoyableApplicationDelegate
- ConfigsController
+ NJMappingsController
- JoystickController
+ NJDeviceController
- TargetController
+ NJOutputController
-
+
+
- 268
- {82, 32}
- _NS:9
- YES
-
- 67108864
- 134217728
- Button
-
- _NS:9
-
- -2038284288
- 129
-
-
- 200
- 25
-
- NO
+ 0
+ 1
+ 0.0
+ 0.0
+ YES
@@ -1199,6 +1322,14 @@
732
+
+
+ showHelp:
+
+
+
+ 870
+
orderFrontStandardAboutPanel:
@@ -1255,30 +1386,6 @@
370
-
-
- parentWindow
-
-
-
- 454
-
-
-
- contentView
-
-
-
- 455
-
-
-
- toggle:
-
-
-
- 498
-
delegate
@@ -1305,139 +1412,155 @@
- targetController
+ mappingsController
-
+
- 695
+ 822
- configsController
+ outputController
-
+
- 717
+ 826
- jsController
-
-
+ translatingEventsMenu
+
+
+
+ 877
+
+
+
+ translatingEventsChanged:
+
+
- 484
+ 878
- drawer
-
-
+ translatingEventsButton
+
+
- 486
+ 879
- mainWindow
+ dockMenuBase
-
+
- 500
+ 726
- activeMenuItem
+ inputController
-
+
- 607
+ 819
- activeButton
+ mappingsController
-
+
- 609
+ 820
-
- toggleActivity:
+
+ window
-
+
- 610
+ 865
- toggleActivity:
-
-
+ removePressed:
+
+
- 611
+ 516
- targetController
-
-
+ removeButton
+
+
- 712
+ 519
- configsController
-
-
+ tableView
+
+
- 716
+ 520
-
- dockMenuBase
-
-
+
+ exportPressed:
+
+
- 726
+ 815
- addPressed:
+ importPressed:
-
+
- 515
+ 816
+
+
+
+ outputController
+
+
+
+ 827
- removePressed:
+ mappingPressed:
-
+
- 516
+ 855
- removeButton
+ popover
-
+
- 519
+ 856
- tableView
+ popoverActivate
-
+
- 520
+ 857
-
- targetController
+
+ addPressed:
-
+
- 697
+ 515
@@ -1463,22 +1586,6 @@
692
-
-
- configsController
-
-
-
- 693
-
-
-
- joystickController
-
-
-
- 694
-
title
@@ -1487,22 +1594,6 @@
709
-
-
- configPopup
-
-
-
- 713
-
-
-
- configChosen:
-
-
-
- 714
-
radioChanged:
@@ -1569,19 +1660,91 @@
- targetController
+ mappingsController
+
+
+
+ 821
+
+
+
+ mappingPopup
+
+
+
+ 823
+
+
+
+ inputController
+
+
+
+ 828
+
+
+
+ mouseSpeedChanged:
+
+
+
+ 885
+
+
+
+ mouseSpeedSlider
+
+
+
+ 886
+
+
+
+ keyDelegate
- 779
+ 818
+
+
+
+ performClick:
+
+
+
+ 871
- window
-
-
+ view
+
+
+
+ 854
+
+
+
+ contentViewController
+
+
+
+ 852
+
+
+
+ delegate
+
+
- 780
+ 853
+
+
+
+ performClick:
+
+
+
+ 880
@@ -1617,9 +1780,10 @@
+
- MainMenu
+ Main Menu
19
@@ -1651,6 +1815,10 @@
+
+
+
+
@@ -1755,11 +1923,6 @@
-
- 420
-
-
-
450
@@ -1773,17 +1936,13 @@
451
-
-
+
+
+
- Drawer Content View
-
-
- 452
-
-
+ Mapping List Popover Content
453
@@ -1820,6 +1979,7 @@
+ Mapping List
461
@@ -1838,53 +1998,17 @@
482
- ApplicationController
487
-
-
+
-
-
+
-
- 490
-
-
-
-
- 492
-
-
-
-
- 493
-
-
-
-
- 495
-
-
-
-
- 507
-
-
-
-
-
-
-
- 508
-
-
-
511
@@ -1892,6 +2016,7 @@
+ Remove Mapping
512
@@ -1902,24 +2027,17 @@
514
- ConfigsController
479
- JoystickController
606
-
- 608
-
-
-
652
@@ -1936,6 +2054,7 @@
+ Input Devices Pane
634
@@ -1954,6 +2073,7 @@
+ Input Device List
636
@@ -1972,6 +2092,7 @@
+ Device/Input Name
642
@@ -1987,11 +2108,13 @@
-
+
+
+ Output Editor Pane
686
@@ -2012,21 +2135,25 @@
+ Output Types
657
+ Disabled
658
+ Key Press
699
+ Switch Mapping
700
@@ -2035,6 +2162,7 @@
+ Mapping Choice List
701
@@ -2057,6 +2185,7 @@
+ Input Name
707
@@ -2077,16 +2206,19 @@
733
+ Mouse Movement
734
+ Mouse Button
735
+ Mouse Scroll
659
@@ -2100,6 +2232,7 @@
+ Mouse Button Selector
745
@@ -2110,6 +2243,7 @@
748
+ Switch Mouse Mode
749
@@ -2118,6 +2252,7 @@
+ Mouse Scroll Selector
750
@@ -2131,6 +2266,7 @@
+ Mouse Motion Selector
755
@@ -2138,23 +2274,152 @@
- 765
-
+ 778
+
+
+
+
+ 812
+
+
+
+
+ 813
+
+
+
+
+ 814
+
+
+
+
+ 837
+
-
+
+
+ Mapping Selector
+
+
+ 835
+
+
+
+
+
+
+
+ 836
+
+
+
+
+ 849
+
+
+
+
+ 850
+
+ Popover View Controller
- 766
-
-
+ 851
+
+
+ Mapping List Popover
- 778
-
+ 507
+
+
+
+
+
+ Add Mapping
+
+
+ 508
+
+
+
+
+ 862
+
+
+
+
+
+ Gradient Space
+
+
+ 863
+
+
+
+
+ 810
+
+
+
+
+ 866
+
+
+
+
+
+
+
+ 867
+
+
+
+
+
+
+
+ 868
+
+
+
+
+ 874
+
+
+
+
+
+
+
+ 872
+
+
+
+
+
+
+
+ 873
+
+
+
+
+ 883
+
+
+
+
+
+ 884
+
+
+
@@ -2175,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
@@ -2193,13 +2456,25 @@
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
+
+ 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
@@ -2207,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
@@ -2241,91 +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
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
- 781
+ 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
-
-
- activeMenuItem
- NSMenuItem
-
-
- configsController
- ConfigsController
-
-
- dockMenuBase
- NSMenu
+
+ mappingsController
+ NJMappingsController
-
- 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
@@ -2333,17 +2689,43 @@
addPressed:
id
+
+ exportPressed:
+ id
+
+
+ importPressed:
+ id
+
+
+ mappingPressed:
+ id
+
removePressed:
id
+ NJOutputController
+ NSPopover
+ NSButton
NSButton
NSTableView
- TargetController
+
+ outputController
+ NJOutputController
+
+
+ popover
+ NSPopover
+
+
+ popoverActivate
+ NSButton
+
removeButton
NSButton
@@ -2352,80 +2734,23 @@
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
+ ./Classes/NJMappingsController.h
- TargetController
+ NJOutputController
NSObject
- id
id
id
+ id
id
id
-
- configChosen:
- id
-
mbtnChanged:
id
@@ -2434,6 +2759,10 @@
mdirChanged:
id
+
+ mouseSpeedChanged:
+ id
+
radioChanged:
id
@@ -2444,32 +2773,33 @@
- NSPopUpButton
- ConfigsController
- JoystickController
- KeyInputTextView
+ NJDeviceController
+ NJKeyInputField
+ NSPopUpButton
+ NJMappingsController
NSSegmentedControl
NSSegmentedControl
+ NSSlider
NSMatrix
NSSegmentedControl
NSTextField
-
- configPopup
- NSPopUpButton
-
-
- configsController
- ConfigsController
-
-
- joystickController
- JoystickController
+
+ inputController
+ NJDeviceController
keyInput
- KeyInputTextView
+ NJKeyInputField
+
+
+ mappingPopup
+ NSPopUpButton
+
+
+ mappingsController
+ NJMappingsController
mouseBtnSelect
@@ -2479,6 +2809,10 @@
mouseDirSelect
NSSegmentedControl
+
+ mouseSpeedSlider
+ NSSlider
+
radioButtons
NSMatrix
@@ -2494,7 +2828,7 @@
IBProjectSource
- ./Classes/TargetController.h
+ ./Classes/NJOutputController.h
@@ -2505,12 +2839,12 @@
3
{8, 8}
- {9, 9}
+ {11, 10}
{11, 11}
{10, 3}
- {32, 32}
{16, 15}
{8, 8}
+ {9, 9}