X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Resources%2FEnglish.lproj%2FMainMenu.xib;h=0a2018693b56001f01b9f607fb0a9f1e5601ca2b;hp=895e1d2a69aad74ff22b52216097c823931767d0;hb=dacfcc6b0bf3bfebc89b5e6e8266da9eb36177cd;hpb=ba6488fd986229dadcf8a7c7dcc028d2c1ddecf5
diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib
index 895e1d2..0a20186 100644
--- a/Resources/English.lproj/MainMenu.xib
+++ b/Resources/English.lproj/MainMenu.xib
@@ -132,20 +132,20 @@
-
+
265
- {{189, 70}, {180, 24}}
+ {{189, 70}, {224, 24}}
@@ -846,26 +841,69 @@ aW5nLg
- 87
+ 55
Left
- YES
0
- 86
+ 60
+ Center
+ 2
+ 0
+
+
+ 55
Right
1
0
+
+ 22
+ 4
+ 3
+ 0
+
+
+ 22
+ 5
+ 4
+ 0
+
1
NO
+
+
+ 265
+ {{191, 108}, {220, 16}}
+
+
+
+ _NS:9
+ YES
+
+ 67108864
+ 262144
+
+ _NS:9
+
+ 20
+ 1
+ 10
+ 0.0
+ 20
+ 1
+ YES
+ NO
+
+ NO
+
265
- {{191, 196}, {176, 23}}
+ {{191, 196}, {220, 23}}
@@ -875,13 +913,13 @@ aW5nLg
- {620, 323}
+ {664, 323}
{{0, 0}, {1440, 878}}
- {620, 378}
+ {664, 378}
{10000000000000, 10000000000000}
Enjoyable
YES
@@ -1373,6 +1411,87 @@ aW5nLg
0.0
YES
+
+
+
+ NJMappingMenuController
+
+
+ NJMappingMenuController
+
+
+ NJMappingMenuController
+
@@ -1408,6 +1527,14 @@ aW5nLg
870
+
+
+ terminate:
+
+
+
+ 937
+
orderFrontStandardAboutPanel:
@@ -1424,14 +1551,6 @@ aW5nLg
37
-
-
- arrangeInFront:
-
-
-
- 39
-
performZoom:
@@ -1458,11 +1577,11 @@ aW5nLg
- unhideAllApplications:
-
-
+ performClose:
+
+
- 370
+ 941
@@ -1538,35 +1657,51 @@ aW5nLg
- dockMenuBase
+ mappingsController
-
+
- 726
+ 820
- inputController
+ window
-
+
- 819
+ 865
- mappingsController
+ statusItemMenu
-
+
- 820
+ 928
- window
+ dockMenu
-
+
- 865
+ 930
+
+
+
+ mappingsMenu
+
+
+
+ 931
+
+
+
+ restoreToForeground:
+
+
+
+ 939
@@ -1608,14 +1743,6 @@ aW5nLg
816
-
-
- outputController
-
-
-
- 827
-
mappingPressed:
@@ -1832,6 +1959,22 @@ aW5nLg
709
+
+
+ scrollTypeChanged:
+
+
+
+ 948
+
+
+
+ smoothCheck
+
+
+
+ 949
+
keyDelegate
@@ -1880,6 +2023,94 @@ aW5nLg
880
+
+
+ performClick:
+
+
+
+ 932
+
+
+
+ performClick:
+
+
+
+ 933
+
+
+
+ eventTranslationToggle
+
+
+
+ 951
+
+
+
+ menu
+
+
+
+ 952
+
+
+
+ delegate
+
+
+
+ 956
+
+
+
+ menu
+
+
+
+ 957
+
+
+
+ delegate
+
+
+
+ 958
+
+
+
+ eventTranslationToggle
+
+
+
+ 959
+
+
+
+ delegate
+
+
+
+ 961
+
+
+
+ menu
+
+
+
+ 964
+
+
+
+ eventTranslationToggle
+
+
+
+ 965
+
@@ -1962,13 +2193,13 @@ aW5nLg
-
+
@@ -1982,16 +2213,11 @@ aW5nLg
-
- 150
-
-
-
136
- Quit Enjoy
+ Quit Enjoyable
144
@@ -2031,7 +2257,6 @@ aW5nLg
-
@@ -2042,11 +2267,6 @@ aW5nLg
-
- 5
-
-
-
239
@@ -2378,6 +2598,7 @@ aW5nLg
+
@@ -2594,6 +2815,101 @@ aW5nLg
+
+ 918
+
+
+
+
+
+
+
+
+
+ Status Item Menu
+
+
+ 919
+
+
+
+
+ 922
+
+
+
+
+ 923
+
+
+
+
+
+
+ Dock Menu
+
+
+ 926
+
+
+
+
+ 924
+
+
+
+
+ 925
+
+
+
+
+ 936
+
+
+ Quit Enjoyable
+
+
+ 938
+
+
+
+
+ 940
+
+
+
+
+ 946
+
+
+
+
+
+
+
+ 947
+
+
+
+
+ 950
+
+
+ Main Mappings Menu Controller
+
+
+ 953
+
+
+ Dock Menu Controller
+
+
+ 960
+
+
+ Status Bar Menu Controller
+
@@ -2607,7 +2923,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
@@ -2630,7 +2945,6 @@ aW5nLg
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
ToolTip
@@ -2679,13 +2993,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
@@ -2769,38 +3083,121 @@ 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
+
+ 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
- 917
+ 965
EnjoyableApplicationDelegate
NSObject
+
+ restoreToForeground:
+ id
+
+
+ restoreToForeground:
+
+ restoreToForeground:
+ id
+
+
- NSMenu
- NJDeviceController
+ NSMenu
NJMappingsController
+ NSMenu
NSWindow
-
- dockMenuBase
+
+ dockMenu
NSMenu
-
- inputController
- NJDeviceController
-
mappingsController
NJMappingsController
+
+ statusItemMenu
+ NSMenu
+
window
NSWindow
@@ -2883,6 +3280,33 @@ aW5nLg
./Classes/NJKeyInputField.h
+
+ NJMappingMenuController
+ NSObject
+
+ id
+ NSMenuItem
+ NSMenu
+
+
+
+ delegate
+ id
+
+
+ eventTranslationToggle
+ NSMenuItem
+
+
+ menu
+ NSMenu
+
+
+
+ IBProjectSource
+ ./Classes/NJMappingMenuController.h
+
+
NJMappingsController
NSObject
@@ -2928,7 +3352,6 @@ aW5nLg
NSButton
NSButton
- NJOutputController
NSPopover
NSButton
NSButton
@@ -2943,10 +3366,6 @@ aW5nLg
moveUp
NSButton
-
- outputController
- NJOutputController
-
popover
NSPopover
@@ -2978,6 +3397,7 @@ aW5nLg
id
id
id
+ id
id
@@ -3001,6 +3421,10 @@ aW5nLg
scrollSpeedChanged:
id
+
+ scrollTypeChanged:
+ id
+
sdirChanged:
id
@@ -3017,6 +3441,7 @@ aW5nLg
NSMatrix
NSSegmentedControl
NSSlider
+ NSButton
NSTextField
@@ -3060,6 +3485,10 @@ aW5nLg
scrollSpeedSlider
NSSlider
+
+ smoothCheck
+ NSButton
+
title
NSTextField
@@ -3084,6 +3513,7 @@ aW5nLg
{16, 15}
{8, 8}
{9, 9}
+ {15, 15}