X-Git-Url: https://git.yukkurigames.com/?a=blobdiff_plain;ds=sidebyside;f=Resources%2FEnglish.lproj%2FMainMenu.xib;h=98b5cef7620130d0295dbc5f6bc36566b2f3317d;hb=f8ae7787fe3fe272eaf04586e3007339c907fb33;hp=b60d2fe7b23f66d55786befdc2b0aa8028adb8c7;hpb=28dfa5b6977e17dd9951d1d8239052a15e38e5c2;p=enjoyable.git
diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib
index b60d2fe..98b5cef 100644
--- a/Resources/English.lproj/MainMenu.xib
+++ b/Resources/English.lproj/MainMenu.xib
@@ -29,7 +29,6 @@
NSSegmentedControl
NSSlider
NSSliderCell
- NSSplitView
NSTableColumn
NSTableView
NSTextField
@@ -87,6 +86,14 @@
+
-
{{0, 0}, {1440, 878}}
- {640, 375}
+ {664, 378}
{10000000000000, 10000000000000}
Enjoyable
YES
@@ -1395,6 +1454,90 @@ aW5nLg
0.0
YES
+
+
+
+
+
+
870
+
orderFrontStandardAboutPanel:
@@ -1446,14 +1597,6 @@ aW5nLg
37
-
-
- arrangeInFront:
-
-
-
- 39
-
performZoom:
@@ -1480,11 +1623,11 @@ aW5nLg
- unhideAllApplications:
-
-
+ performClose:
+
+
- 370
+ 941
@@ -1502,14 +1645,6 @@ aW5nLg
518
-
-
- outlineView
-
-
-
- 648
-
mappingsController
@@ -1526,14 +1661,6 @@ aW5nLg
826
-
-
- translatingEventsMenu
-
-
-
- 877
-
translatingEventsChanged:
@@ -1552,27 +1679,27 @@ aW5nLg
- connectDevicePrompt
+ outlineView
-
+
- 915
+ 648
- dockMenuBase
-
-
+ connectDevicePrompt
+
+
- 726
+ 915
- inputController
-
-
+ hidSleepingPrompt
+
+
- 819
+ 976
@@ -1590,6 +1717,38 @@ aW5nLg
865
+
+
+ statusItemMenu
+
+
+
+ 928
+
+
+
+ dockMenu
+
+
+
+ 930
+
+
+
+ mappingsMenu
+
+
+
+ 931
+
+
+
+ restoreToForeground:
+
+
+
+ 939
+
removePressed:
@@ -1630,14 +1789,6 @@ aW5nLg
816
-
-
- outputController
-
-
-
- 827
-
mappingPressed:
@@ -1702,6 +1853,14 @@ aW5nLg
902
+
+
+ addPressed:
+
+
+
+ 971
+
dataSource
@@ -1720,155 +1879,163 @@ aW5nLg
- delegate
-
-
+ mappingsController
+
+
- 892
+ 821
- radioButtons
+ inputController
-
+
- 692
+ 828
- title
+ mouseDirSelect
-
+
- 709
+ 756
-
- radioChanged:
+
+ mappingPopup
-
+
- 731
+ 823
-
- mouseBtnSelect
+
+ mdirChanged:
-
+
- 746
+ 757
- mbtnChanged:
+ sdirChanged:
-
+
- 747
+ 752
- scrollDirSelect
+ scrollSpeedSlider
-
+
- 751
+ 891
- sdirChanged:
+ radioChanged:
-
+
- 752
+ 731
- mouseDirSelect
+ keyInput
-
+
- 756
+ 781
- mdirChanged:
+ mbtnChanged:
-
+
- 757
+ 747
-
- keyInput
+
+ mouseSpeedChanged:
-
+
- 781
+ 885
- mappingsController
+ radioButtons
-
+
- 821
+ 692
- mappingPopup
+ mouseSpeedSlider
-
+
- 823
+ 886
+
+
+
+ scrollSpeedChanged:
+
+
+
+ 890
- inputController
+ scrollDirSelect
-
+
- 828
+ 751
-
- mouseSpeedChanged:
+
+ mouseBtnSelect
-
+
- 885
+ 746
- mouseSpeedSlider
+ title
-
+
- 886
+ 709
- scrollSpeedChanged:
+ scrollTypeChanged:
-
+
- 890
+ 948
- scrollSpeedSlider
+ smoothCheck
-
+
- 891
+ 949
- keyDelegate
+ delegate
- 818
+ 966
@@ -1910,6 +2077,102 @@ aW5nLg
880
+
+
+ performClick:
+
+
+
+ 932
+
+
+
+ performClick:
+
+
+
+ 933
+
+
+
+ eventTranslationToggle
+
+
+
+ 951
+
+
+
+ menu
+
+
+
+ 952
+
+
+
+ delegate
+
+
+
+ 956
+
+
+
+ menu
+
+
+
+ 957
+
+
+
+ delegate
+
+
+
+ 958
+
+
+
+ eventTranslationToggle
+
+
+
+ 959
+
+
+
+ delegate
+
+
+
+ 961
+
+
+
+ menu
+
+
+
+ 964
+
+
+
+ eventTranslationToggle
+
+
+
+ 965
+
+
+
+ checkForUpdates:
+
+
+
+ 969
+
@@ -1983,6 +2246,7 @@ aW5nLg
+
@@ -1992,13 +2256,14 @@ aW5nLg
-
+
+
@@ -2012,16 +2277,11 @@ aW5nLg
-
- 150
-
-
-
136
- Quit Enjoy
+ Quit Enjoyable
144
@@ -2061,7 +2321,6 @@ aW5nLg
-
@@ -2072,11 +2331,6 @@ aW5nLg
-
- 5
-
-
-
239
@@ -2114,7 +2368,8 @@ aW5nLg
453
-
+
+
@@ -2205,192 +2460,255 @@ aW5nLg
- 652
-
-
-
-
-
-
+ 686
+
+
- 653
-
-
-
-
-
-
- Input Devices Pane
+ 723
+
+
- 634
-
-
-
-
-
-
-
+ 812
+
+
- 637
-
+ 813
+
+
+
+
+ 814
+
+
+
+
+ 837
+
-
+
-
- Input Device List
+
+ Mapping Selector
- 636
-
-
+ 835
+
+
+
+
+
- 635
-
-
+ 836
+
+
- 639
-
+ 849
+
+
+
+
+ 850
+
+
+ Popover View Controller
+
+
+ 851
+
+
+ Mapping List Popover
+
+
+ 507
+
-
+
-
- Device/Input Name
+
+ Add Mapping
- 642
-
-
+ 508
+
+
- 654
-
+ 862
+
-
-
-
-
-
-
-
-
-
-
+
-
- Output Editor Pane
+
+ Gradient Space
- 686
-
-
+ 863
+
+
- 656
-
+ 810
+
+
+
+
+ 866
+
-
-
-
-
-
-
-
+
-
- Output Types
+
- 657
-
-
- Disabled
+ 867
+
+
+
+
+
- 658
-
-
- Key Press
+ 868
+
+
- 699
-
-
- Switch Mapping
+ 874
+
+
+
+
+
- 700
-
+ 872
+
-
+
-
- Mapping Choice List
+
- 701
-
+ 873
+
+
+
+
+ 893
+
-
+
-
+
+ Move Mapping Up
- 702
-
-
-
+ 894
+
+
- 706
-
+ 896
+
-
+
-
- Input Name
+
+ Move Mapping Down
- 707
-
-
+ 897
+
+
- 708
-
-
+ 916
+
+
+
+
+
+
+
- 723
-
-
+ 913
+
+
+
+
+
- 733
-
-
- Mouse Movement
+ 914
+
+
- 734
-
-
- Mouse Button
+ 917
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 735
-
-
- Mouse Scroll
+ 708
+
+
- 659
-
-
+ 706
+
+
+
+
+
+ Input Name
+
+
+ 656
+
+
+
+
+
+
+
+
+
+
+
+ Output Types
+
+
+ 700
+
+
+
+
+
+ Mapping Choice List
+
+
+ 778
+
+
744
@@ -2398,242 +2716,292 @@ aW5nLg
-
+
Mouse Button Selector
-
- 745
-
-
-
749
-
+
Mouse Scroll Selector
-
- 750
-
-
-
754
-
+
Mouse Motion Selector
+
+ 883
+
+
+
+
+
+
+
+ 887
+
+
+
+
+
+
+
+ 888
+
+
+
+
+ 884
+
+
+
755
- 778
-
-
+ 750
+
+
- 812
-
-
+ 745
+
+
+
+
+ 701
+
+
+
+
+
+
+
+ 702
+
+
+
+
+ 657
+
+
+ Disabled
+
+
+ 659
+
+
+
+
+ 658
+
+
+ Key Press
+
+
+ 699
+
+
+ Switch Mapping
+
+
+ 733
+
+
+ Mouse Movement
- 813
-
-
+ 734
+
+
+ Mouse Button
- 814
-
-
+ 735
+
+
+ Mouse Scroll
- 837
-
-
-
-
-
- Mapping Selector
+ 707
+
+
- 835
-
+ 634
+
-
+
+
+
-
-
-
- 836
-
-
+
- 849
-
-
+ 635
+
+
- 850
-
-
- Popover View Controller
+ 636
+
+
- 851
-
-
- Mapping List Popover
+ 637
+
+
+
+
+
+ Input Device List
- 507
-
+ 639
+
-
+
-
- Add Mapping
+
+ Device/Input Name
- 508
-
-
+ 642
+
+
- 862
-
+ 918
+
-
+
+
+
+
+
-
- Gradient Space
+
+ Status Item Menu
- 863
-
-
+ 919
+
+
- 810
-
-
+ 922
+
+
- 866
-
+ 923
+
-
+
+
-
+
+ Dock Menu
- 867
-
-
-
-
-
+ 926
+
+
- 868
-
-
+ 924
+
+
- 874
-
-
-
-
-
+ 925
+
+
- 872
-
-
-
-
-
+ 936
+
+
+ Quit Enjoyable
- 873
-
-
+ 938
+
+
- 883
-
+ 940
+
+
+
+
+ 946
+
-
+
-
+
- 884
-
-
+ 947
+
+
- 887
-
-
-
-
-
+ 950
+
+
+ Main Mappings Menu Controller
- 888
-
-
+ 953
+
+
+ Dock Menu Controller
- 893
-
-
-
-
-
- Move Mapping Up
+ 960
+
+
+ Status Bar Menu Controller
- 894
-
-
+ 967
+
+
- 896
-
-
-
-
-
- Move Mapping Down
+ 968
+
+
- 897
-
-
+ 970
+
+
- 913
-
+ 974
+
-
+
-
+
- 914
-
-
+ 975
+
+
@@ -2648,7 +3016,6 @@ aW5nLg
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
@@ -2659,7 +3026,7 @@ aW5nLg
com.apple.InterfaceBuilder.CocoaPlugin
{{114, 276}, {770, 487}}
-
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -2671,7 +3038,6 @@ aW5nLg
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
ToolTip
@@ -2703,9 +3069,6 @@ aW5nLg
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
@@ -2723,13 +3086,13 @@ aW5nLg
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
@@ -2811,38 +3174,128 @@ aW5nLg
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
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ IBUserDefinedRuntimeAttributesPlaceholderName
+
+ IBUserDefinedRuntimeAttributesPlaceholderName
+
+
+
+ com.apple.InterfaceBuilder.userDefinedRuntimeAttributeType.number
+ firstMappingIndex
+
+
+
+ com.apple.InterfaceBuilder.userDefinedRuntimeAttributeType.boolean
+ hasKeyEquivalents
+
+
+
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ IBUserDefinedRuntimeAttributesPlaceholderName
+
+ IBUserDefinedRuntimeAttributesPlaceholderName
+
+
+
+ com.apple.InterfaceBuilder.userDefinedRuntimeAttributeType.number
+ firstMappingIndex
+
+
+
+ com.apple.InterfaceBuilder.userDefinedRuntimeAttributeType.boolean
+ hasKeyEquivalents
+
+
+
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ IBUserDefinedRuntimeAttributesPlaceholderName
+
+ IBUserDefinedRuntimeAttributesPlaceholderName
+
+
+
+ com.apple.InterfaceBuilder.userDefinedRuntimeAttributeType.number
+ firstMappingIndex
+
+
+
+ com.apple.InterfaceBuilder.userDefinedRuntimeAttributeType.boolean
+ hasKeyEquivalents
+
+
+
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
- 915
+ 976
EnjoyableApplicationDelegate
NSObject
+
+ restoreToForeground:
+ id
+
+
+ restoreToForeground:
+
+ restoreToForeground:
+ id
+
+
- NSMenu
- NJDeviceController
+ NSMenu
NJMappingsController
+ NSMenu
NSWindow
-
- dockMenuBase
+
+ dockMenu
NSMenu
-
- inputController
- NJDeviceController
-
mappingsController
NJMappingsController
+
+ statusItemMenu
+ NSMenu
+
window
NSWindow
@@ -2858,28 +3311,32 @@ aW5nLg
NSObject
translatingEventsChanged:
- id
+ NSButton
translatingEventsChanged:
translatingEventsChanged:
- id
+ NSButton
NSView
+ NSView
NJMappingsController
NSOutlineView
NJOutputController
NSButton
- NSMenuItem
connectDevicePrompt
NSView
+
+ hidSleepingPrompt
+ NSView
+
mappingsController
NJMappingsController
@@ -2896,10 +3353,6 @@ aW5nLg
translatingEventsButton
NSButton
-
- translatingEventsMenu
- NSMenuItem
-
IBProjectSource
@@ -2908,15 +3361,15 @@ aW5nLg
NJKeyInputField
- NSTextField
+ NSControl
- keyDelegate
+ delegate
id
- keyDelegate
+ delegate
- keyDelegate
+ delegate
id
@@ -2925,6 +3378,33 @@ aW5nLg
./Classes/NJKeyInputField.h
+
+ NJMappingMenuController
+ NSObject
+
+ id
+ NSMenuItem
+ NSMenu
+
+
+
+ delegate
+ id
+
+
+ eventTranslationToggle
+ NSMenuItem
+
+
+ menu
+ NSMenu
+
+
+
+ IBProjectSource
+ ./Classes/NJMappingMenuController.h
+
+
NJMappingsController
NSObject
@@ -2970,7 +3450,6 @@ aW5nLg
NSButton
NSButton
- NJOutputController
NSPopover
NSButton
NSButton
@@ -2985,10 +3464,6 @@ aW5nLg
moveUp
NSButton
-
- outputController
- NJOutputController
-
popover
NSPopover
@@ -3020,6 +3495,7 @@ aW5nLg
id
id
id
+ id
id
@@ -3043,6 +3519,10 @@ aW5nLg
scrollSpeedChanged:
id
+
+ scrollTypeChanged:
+ id
+
sdirChanged:
id
@@ -3059,6 +3539,7 @@ aW5nLg
NSMatrix
NSSegmentedControl
NSSlider
+ NSButton
NSTextField
@@ -3102,6 +3583,10 @@ aW5nLg
scrollSpeedSlider
NSSlider
+
+ smoothCheck
+ NSButton
+
title
NSTextField
@@ -3112,6 +3597,36 @@ aW5nLg
./Classes/NJOutputController.h
+
+ SUUpdater
+ NSObject
+
+ checkForUpdates:
+ id
+
+
+ checkForUpdates:
+
+ checkForUpdates:
+ id
+
+
+
+ delegate
+ id
+
+
+ delegate
+
+ delegate
+ id
+
+
+
+ IBProjectSource
+ ./Classes/SUUpdater.h
+
+
0
@@ -3126,6 +3641,7 @@ aW5nLg
{16, 15}
{8, 8}
{9, 9}
+ {15, 15}