X-Git-Url: https://git.yukkurigames.com/?a=blobdiff_plain;ds=inline;f=Resources%2FEnglish.lproj%2FMainMenu.xib;h=0c4cdf5f60024a22dbeeef41cd8fe72d5e5108b0;hb=4dabc5c754efa54adb2dc57063c7294b1c2e4654;hp=cd9a1b9281fd43bab4a315520c297133a3616d2b;hpb=0064c1fbff36795885a9724081af2a17d83c20a3;p=enjoyable.git
diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib
index cd9a1b9..0c4cdf5 100644
--- a/Resources/English.lproj/MainMenu.xib
+++ b/Resources/English.lproj/MainMenu.xib
@@ -29,7 +29,6 @@
NSSegmentedControl
NSSlider
NSSliderCell
- NSSplitView
NSTableColumn
NSTableView
NSTextField
@@ -133,20 +132,20 @@
-
+
+
870
+
orderFrontStandardAboutPanel:
@@ -1428,14 +1509,6 @@
37
-
-
- arrangeInFront:
-
-
-
- 39
-
performZoom:
@@ -1462,11 +1535,11 @@
- unhideAllApplications:
-
-
+ performClose:
+
+
- 370
+ 941
@@ -1484,14 +1557,6 @@
518
-
-
- outlineView
-
-
-
- 648
-
mappingsController
@@ -1534,11 +1599,19 @@
- dockMenuBase
-
-
+ outlineView
+
+
+
+ 648
+
+
+
+ connectDevicePrompt
+
+
- 726
+ 915
@@ -1564,6 +1637,38 @@
865
+
+
+ statusItemMenu
+
+
+
+ 928
+
+
+
+ dockMenu
+
+
+
+ 930
+
+
+
+ mappingsMenu
+
+
+
+ 931
+
+
+
+ restoreToForeground:
+
+
+
+ 939
+
removePressed:
@@ -1694,59 +1799,43 @@
- delegate
-
-
+ mappingsController
+
+
- 892
+ 821
- radioButtons
+ inputController
-
+
- 692
+ 828
- title
-
-
-
- 709
-
-
-
- radioChanged:
+ mouseDirSelect
-
+
- 731
+ 756
- mouseBtnSelect
+ mappingPopup
-
+
- 746
+ 823
- mbtnChanged:
-
-
-
- 747
-
-
-
- scrollDirSelect
+ mdirChanged:
-
+
- 751
+ 757
@@ -1758,19 +1847,19 @@
- mouseDirSelect
+ scrollSpeedSlider
-
+
- 756
+ 891
- mdirChanged:
+ radioChanged:
-
+
- 757
+ 731
@@ -1781,36 +1870,28 @@
781
-
- mappingsController
+
+ mbtnChanged:
-
+
- 821
+ 747
-
- mappingPopup
+
+ mouseSpeedChanged:
-
+
- 823
+ 885
- inputController
-
-
-
- 828
-
-
-
- mouseSpeedChanged:
+ radioButtons
-
+
- 885
+ 692
@@ -1830,11 +1911,27 @@
- scrollSpeedSlider
+ scrollDirSelect
-
+
- 891
+ 751
+
+
+
+ mouseBtnSelect
+
+
+
+ 746
+
+
+
+ title
+
+
+
+ 709
@@ -1884,6 +1981,22 @@
880
+
+
+ performClick:
+
+
+
+ 932
+
+
+
+ performClick:
+
+
+
+ 933
+
@@ -1966,13 +2079,13 @@
-
+
@@ -1986,16 +2099,11 @@
-
- 150
-
-
-
136
- Quit Enjoy
+ Quit Enjoyable
144
@@ -2035,7 +2143,6 @@
-
@@ -2046,11 +2153,6 @@
-
- 5
-
-
-
239
@@ -2088,7 +2190,8 @@
453
-
+
+
@@ -2179,191 +2282,253 @@
- 652
-
-
-
-
-
-
+ 686
+
+
- 653
-
-
-
-
-
- Input Devices Pane
+ 723
+
+
- 634
-
+ 812
+
+
+
+
+ 813
+
+
+
+
+ 814
+
+
+
+
+ 837
+
-
-
-
+
-
+
+ Mapping Selector
- 637
-
+ 835
+
-
+
-
- Input Device List
+
- 636
-
-
+ 836
+
+
- 635
-
-
+ 849
+
+
- 639
-
-
-
-
-
- Device/Input Name
+ 850
+
+
+ Popover View Controller
- 642
-
-
+ 851
+
+
+ Mapping List Popover
- 654
-
+ 507
+
-
-
-
-
-
-
-
-
-
-
+
-
- Output Editor Pane
+
+ Add Mapping
- 686
-
-
+ 508
+
+
- 656
-
+ 862
+
-
-
-
-
-
-
-
+
-
- Output Types
-
-
- 657
-
-
- Disabled
+
+ Gradient Space
- 658
-
-
- Key Press
+ 863
+
+
- 699
-
-
- Switch Mapping
+ 810
+
+
- 700
-
-
-
+ 866
+
+
+
-
- Mapping Choice List
+
- 701
-
+ 867
+
-
+
-
+
- 702
-
-
-
+ 868
+
+
- 706
-
+ 874
+
-
+
-
- Input Name
+
- 707
-
-
+ 872
+
+
+
+
+
- 708
-
-
+ 873
+
+
- 723
-
-
+ 893
+
+
+
+
+
+ Move Mapping Up
- 733
-
-
- Mouse Movement
+ 894
+
+
- 734
-
-
- Mouse Button
+ 896
+
+
+
+
+
+ Move Mapping Down
- 735
-
-
- Mouse Scroll
+ 897
+
+
- 659
-
-
+ 916
+
+
+
+
+
+
+
+
+ 913
+
+
+
+
+
+
+
+ 914
+
+
+
+
+ 917
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 708
+
+
+
+
+ 706
+
+
+
+
+
+ Input Name
+
+
+ 656
+
+
+
+
+
+
+
+
+
+
+
+ Output Types
+
+
+ 700
+
+
+
+
+
+ Mapping Choice List
+
+
+ 778
+
+
744
@@ -2371,229 +2536,233 @@
-
+
Mouse Button Selector
-
- 745
-
-
-
749
-
+
Mouse Scroll Selector
-
- 750
-
-
-
754
-
+
Mouse Motion Selector
- 755
-
-
+ 883
+
+
+
+
+
- 778
-
-
+ 887
+
+
+
+
+
- 812
-
-
+ 888
+
+
- 813
-
-
+ 884
+
+
- 814
-
-
+ 755
+
+
- 837
-
-
-
-
-
- Mapping Selector
+ 750
+
+
- 835
-
+ 745
+
+
+
+
+ 701
+
-
+
-
+
- 836
-
-
+ 702
+
+
- 849
-
-
+ 657
+
+
+ Disabled
- 850
-
-
- Popover View Controller
+ 659
+
+
- 851
-
-
- Mapping List Popover
+ 658
+
+
+ Key Press
- 507
-
-
-
-
-
- Add Mapping
+ 699
+
+
+ Switch Mapping
- 508
-
-
+ 733
+
+
+ Mouse Movement
- 862
-
-
-
-
-
- Gradient Space
+ 734
+
+
+ Mouse Button
- 863
-
-
+ 735
+
+
+ Mouse Scroll
- 810
-
-
+ 707
+
+
- 866
-
+ 634
+
-
+
+
+
-
+
- 867
-
-
-
-
-
+ 635
+
+
- 868
-
-
+ 636
+
+
- 874
-
+ 637
+
-
+
-
+
+ Input Device List
- 872
-
+ 639
+
-
+
-
+
+ Device/Input Name
- 873
-
-
+ 642
+
+
- 883
-
+ 918
+
-
+
+
+
+
+
-
+
+ Status Item Menu
- 884
-
-
+ 919
+
+
- 887
-
+ 922
+
+
+
+
+ 923
+
-
+
+
-
+
+ Dock Menu
- 888
-
-
+ 926
+
+
- 893
-
-
-
-
-
- Move Mapping Up
+ 924
+
+
- 894
-
-
+ 925
+
+
- 896
-
-
-
-
-
- Move Mapping Down
+ 936
+
+
+ Quit Enjoyable
- 897
-
-
+ 938
+
+
+
+
+ 940
+
+
@@ -2608,7 +2777,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
@@ -2631,7 +2799,6 @@
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
ToolTip
@@ -2663,9 +2830,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
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -2683,13 +2847,13 @@
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
@@ -2769,28 +2933,55 @@
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
- 902
+ 941
EnjoyableApplicationDelegate
NSObject
+
+ restoreToForeground:
+ id
+
+
+ restoreToForeground:
+
+ restoreToForeground:
+ id
+
+
- NSMenu
+ NSMenu
NJDeviceController
NJMappingsController
+ NSMenu
+ NSMenu
NSWindow
-
- dockMenuBase
+
+ dockMenu
NSMenu
@@ -2801,6 +2992,14 @@
mappingsController
NJMappingsController
+
+ mappingsMenu
+ NSMenu
+
+
+ statusItemMenu
+ NSMenu
+
window
NSWindow
@@ -2826,6 +3025,7 @@
+ NSView
NJMappingsController
NSOutlineView
NJOutputController
@@ -2833,6 +3033,10 @@
NSMenuItem
+
+ connectDevicePrompt
+ NSView
+
mappingsController
NJMappingsController