X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=402d345839306c869d64ca1516210c352d8c2d94;hp=1a87bd74e4dee4e83603236f19111e32363b238f;hb=ce24f5cc4eb879f248f3363663c5330a06b1046f;hpb=d0f4d54bb9eb66cbd19fa4dabb56fc09f42bd22d
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 1a87bd7..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
-
{640, 300}
-
+
256
@@ -433,7 +510,8 @@
256
{200, 298}
-
+
+
YES
NO
YES
@@ -474,11 +552,7 @@
67108928
2624
Text Cell
-
- LucidaGrande
- 13
- 1044
-
+
6
@@ -532,6 +606,7 @@
{{1, 1}, {200, 298}}
+
@@ -542,6 +617,7 @@
-2147483392
{{1, 1}, {8, 298}}
+
NO
@@ -553,6 +629,7 @@
-2147483392
{{-100, -100}, {473, 15}}
+
NO
1
@@ -563,7 +640,8 @@
{202, 300}
-
+
+
150034
@@ -576,6 +654,7 @@
{202, 300}
+
NSView
@@ -588,6 +667,7 @@
265
{{227, 123}, {180, 24}}
+
_NS:9
YES
@@ -624,6 +704,8 @@
265
{{227, 55}, {180, 24}}
+
+
_NS:9
YES
@@ -655,6 +737,7 @@
265
{{227, 89}, {180, 24}}
+
_NS:9
YES
@@ -687,6 +770,7 @@
265
{{229, 190}, {176, 24}}
+
_NS:9
NJKeyInputField
@@ -696,6 +780,7 @@
265
{{226, 156}, {182, 26}}
+
YES
+
+
+ showHelp:
+
+
+
+ 870
+
orderFrontStandardAboutPanel:
@@ -1219,38 +1354,6 @@
370
-
-
- parentWindow
-
-
-
- 454
-
-
-
- contentView
-
-
-
- 455
-
-
-
- toggle:
-
-
-
- 498
-
-
-
- toggle:
-
-
-
- 811
-
delegate
@@ -1293,51 +1396,27 @@
- drawer
-
-
-
- 486
-
-
-
- mainWindow
-
-
-
- 500
-
-
-
- activeMenuItem
-
+ translatingEventsMenu
+
- 607
-
-
-
- activeButton
-
-
-
- 609
+ 877
- toggleActivity:
-
-
+ translatingEventsChanged:
+
+
- 610
+ 878
-
- toggleActivity:
-
-
+
+ translatingEventsButton
+
+
- 611
+ 879
@@ -1365,19 +1444,11 @@
- outputController
+ window
-
-
- 825
-
-
-
- addPressed:
-
-
+
- 515
+ 865
@@ -1427,6 +1498,38 @@
827
+
+
+ mappingPressed:
+
+
+
+ 855
+
+
+
+ popover
+
+
+
+ 856
+
+
+
+ popoverActivate
+
+
+
+ 857
+
+
+
+ addPressed:
+
+
+
+ 515
+
dataSource
@@ -1539,14 +1642,6 @@
823
-
-
- mappingChosen:
-
-
-
- 824
-
inputController
@@ -1563,6 +1658,46 @@
818
+
+
+ performClick:
+
+
+
+ 871
+
+
+
+ view
+
+
+
+ 854
+
+
+
+ contentViewController
+
+
+
+ 852
+
+
+
+ delegate
+
+
+
+ 853
+
+
+
+ performClick:
+
+
+
+ 880
+
@@ -1597,9 +1732,10 @@
+
- MainMenu
+ Main Menu
19
@@ -1739,11 +1875,6 @@
-
- 420
-
-
-
450
@@ -1757,17 +1888,13 @@
451
-
-
+
+
+
- Drawer Content View
-
-
- 452
-
-
+ Mapping List Popover Content
453
@@ -1804,6 +1931,7 @@
+ Mapping List
461
@@ -1822,36 +1950,17 @@
482
- ApplicationController
487
-
-
+
+
-
- 495
-
-
-
-
- 507
-
-
-
-
-
-
-
- 508
-
-
-
511
@@ -1859,6 +1968,7 @@
+ Remove Mapping
512
@@ -1869,24 +1979,17 @@
514
- ConfigsController
479
- JoystickController
606
-
- 608
-
-
-
652
@@ -1903,6 +2006,7 @@
+ Input Devices Pane
634
@@ -1921,6 +2025,7 @@
+ Input Device List
636
@@ -1939,6 +2044,7 @@
+ Device/Input Name
642
@@ -1959,6 +2065,7 @@
+ Output Editor Pane
686
@@ -1979,21 +2086,25 @@
+ Output Types
657
+ Disabled
658
+ Key Press
699
+ Switch Mapping
700
@@ -2002,6 +2113,7 @@
+ Mapping Choice List
701
@@ -2024,6 +2136,7 @@
+ Input Name
707
@@ -2044,16 +2157,19 @@
733
+ Mouse Movement
734
+ Mouse Button
735
+ Mouse Scroll
659
@@ -2067,6 +2183,7 @@
+ Mouse Button Selector
745
@@ -2077,6 +2194,7 @@
748
+ Switch Mouse Mode
749
@@ -2085,6 +2203,7 @@
+ Mouse Scroll Selector
750
@@ -2098,6 +2217,7 @@
+ Mouse Motion Selector
755
@@ -2109,16 +2229,6 @@
-
- 790
-
-
-
-
- 810
-
-
-
812
@@ -2134,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
+
+
+
@@ -2154,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
@@ -2172,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
@@ -2183,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
@@ -2220,23 +2456,133 @@
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
- 828
+ 880
+
+ EnjoyableApplicationDelegate
+ NSObject
+
+ NSMenu
+ NJDeviceController
+ NJMappingsController
+ NSWindow
+
+
+
+ dockMenuBase
+ NSMenu
+
+
+ inputController
+ NJDeviceController
+
+
+ mappingsController
+ NJMappingsController
+
+
+ window
+ NSWindow
+
+
+
+ IBProjectSource
+ ./Classes/EnjoyableApplicationDelegate.h
+
+
+
+ NJDeviceController
+ NSObject
+
+ translatingEventsChanged:
+ id
+
+
+ translatingEventsChanged:
+
+ translatingEventsChanged:
+ id
+
+
+
+ NJMappingsController
+ NSOutlineView
+ NJOutputController
+ NSButton
+ NSMenuItem
+
+
+
+ mappingsController
+ NJMappingsController
+
+
+ outlineView
+ NSOutlineView
+
+
+ outputController
+ NJOutputController
+
+
+ translatingEventsButton
+ NSButton
+
+
+ translatingEventsMenu
+ NSMenuItem
+
+
+
+ IBProjectSource
+ ./Classes/NJDeviceController.h
+
+
NJKeyInputField
NSTextField
@@ -2256,6 +2602,153 @@
./Classes/NJKeyInputField.h
+
+ NJMappingsController
+ NSObject
+
+ id
+ id
+ id
+ id
+ id
+
+
+
+ addPressed:
+ id
+
+
+ exportPressed:
+ id
+
+
+ importPressed:
+ id
+
+
+ mappingPressed:
+ id
+
+
+ removePressed:
+ id
+
+
+
+ NJOutputController
+ NSPopover
+ NSButton
+ NSButton
+ NSTableView
+
+
+
+ outputController
+ NJOutputController
+
+
+ popover
+ NSPopover
+
+
+ popoverActivate
+ NSButton
+
+
+ removeButton
+ NSButton
+
+
+ tableView
+ NSTableView
+
+
+
+ IBProjectSource
+ ./Classes/NJMappingsController.h
+
+
+
+ NJOutputController
+ NSObject
+
+ id
+ id
+ id
+ id
+
+
+
+ mbtnChanged:
+ id
+
+
+ mdirChanged:
+ id
+
+
+ radioChanged:
+ id
+
+
+ sdirChanged:
+ id
+
+
+
+ NJDeviceController
+ NJKeyInputField
+ NSPopUpButton
+ NJMappingsController
+ NSSegmentedControl
+ NSSegmentedControl
+ NSMatrix
+ NSSegmentedControl
+ NSTextField
+
+
+
+ inputController
+ NJDeviceController
+
+
+ keyInput
+ NJKeyInputField
+
+
+ mappingPopup
+ NSPopUpButton
+
+
+ mappingsController
+ NJMappingsController
+
+
+ mouseBtnSelect
+ NSSegmentedControl
+
+
+ mouseDirSelect
+ NSSegmentedControl
+
+
+ radioButtons
+ NSMatrix
+
+
+ scrollDirSelect
+ NSSegmentedControl
+
+
+ title
+ NSTextField
+
+
+
+ IBProjectSource
+ ./Classes/NJOutputController.h
+
+
0
@@ -2264,12 +2757,12 @@
3
{8, 8}
- {9, 9}
{11, 10}
{11, 11}
{10, 3}
{16, 15}
{8, 8}
+ {9, 9}