X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Resources%2FEnglish.lproj%2FMainMenu.xib;h=7d4b4c63f07c9a4bae501ae6871bcee69eb9f2fb;hp=772132edf41daa28e535f390b6edd2815f8d102e;hb=48cd44b9d5bad73ac9b7456cc10d0a7fbb8d7b11;hpb=5f3311b43f99187a9bfe2c0b38da7e64d6986da1
diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib
index 772132e..7d4b4c6 100644
--- a/Resources/English.lproj/MainMenu.xib
+++ b/Resources/English.lproj/MainMenu.xib
@@ -524,7 +524,7 @@ aW5nLg
{232, 321}
-
+
YES
NO
YES
@@ -654,7 +654,7 @@ aW5nLg
{234, 323}
-
+
150034
@@ -718,10 +718,41 @@ aW5nLg
NO
+
265
- {{189, 33}, {224, 20}}
+ {{189, 33}, {150, 20}}
@@ -735,26 +766,27 @@ aW5nLg
- 86
- â
- Scroll up continuously
+ 36
+ â
+ -2
0
- 85
- â
- Scroll down continuously
- 1
+ 35
+ â
+ 2
0
- â¤
- Scroll up one step
+ 35
+ â
+ -1
0
- â¤
- Scroll down one step
+ 35
+ â
+ 1
0
@@ -765,10 +797,10 @@ aW5nLg
265
- {{191, 24}, {176, 16}}
+ {{191, 24}, {146, 16}}
-
+
_NS:9
YES
@@ -777,11 +809,11 @@ aW5nLg
_NS:9
- 30
- 0.0
+ 29
+ 1
15
0.0
- 11
+ 15
1
YES
NO
@@ -858,10 +890,10 @@ aW5nLg
_NS:9
20
- 0.0
+ 1
10
0.0
- 11
+ 20
1
YES
NO
@@ -1045,7 +1077,7 @@ aW5nLg
266
- {{9, 286}, {369, 17}}
+ {{9, 286}, {412, 17}}
@@ -1069,7 +1101,7 @@ aW5nLg
10
- {{12, 276}, {363, 5}}
+ {{12, 276}, {406, 5}}
@@ -1451,6 +1483,15 @@ aW5nLg
+
+ NJMappingMenuController
+
+
+ NJMappingMenuController
+
+
+ NJMappingMenuController
+
@@ -1574,14 +1615,6 @@ aW5nLg
826
-
-
- translatingEventsMenu
-
-
-
- 877
-
translatingEventsChanged:
@@ -1614,14 +1647,6 @@ aW5nLg
915
-
-
- inputController
-
-
-
- 819
-
mappingsController
@@ -1710,14 +1735,6 @@ aW5nLg
816
-
-
- outputController
-
-
-
- 827
-
mappingPressed:
@@ -1934,13 +1951,29 @@ aW5nLg
709
+
+
+ scrollTypeChanged:
+
+
+
+ 948
+
+
+
+ smoothCheck
+
+
+
+ 949
+
- keyDelegate
+ delegate
- 818
+ 966
@@ -1998,6 +2031,78 @@ aW5nLg
933
+
+
+ eventTranslationToggle
+
+
+
+ 951
+
+
+
+ menu
+
+
+
+ 952
+
+
+
+ delegate
+
+
+
+ 956
+
+
+
+ menu
+
+
+
+ 957
+
+
+
+ delegate
+
+
+
+ 958
+
+
+
+ eventTranslationToggle
+
+
+
+ 959
+
+
+
+ delegate
+
+
+
+ 961
+
+
+
+ menu
+
+
+
+ 964
+
+
+
+ eventTranslationToggle
+
+
+
+ 965
+
@@ -2485,6 +2590,7 @@ aW5nLg
+
@@ -2765,6 +2871,37 @@ aW5nLg
+
+ 946
+
+
+
+
+
+
+
+ 947
+
+
+
+
+ 950
+
+
+ Main Mappings Menu Controller
+
+
+ 953
+
+
+ Dock Menu Controller
+
+
+ 960
+
+
+ Status Bar Menu Controller
+
@@ -2851,10 +2988,10 @@ 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
@@ -2949,12 +3086,74 @@ aW5nLg
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
- 945
+ 966
@@ -2974,9 +3173,7 @@ aW5nLg
NSMenu
- NJDeviceController
NJMappingsController
- NSMenu
NSMenu
NSWindow
@@ -2985,18 +3182,10 @@ aW5nLg
dockMenu
NSMenu
-
- inputController
- NJDeviceController
-
mappingsController
NJMappingsController
-
- mappingsMenu
- NSMenu
-
statusItemMenu
NSMenu
@@ -3016,13 +3205,13 @@ aW5nLg
NSObject
translatingEventsChanged:
- id
+ NSButton
translatingEventsChanged:
translatingEventsChanged:
- id
+ NSButton
@@ -3031,7 +3220,6 @@ aW5nLg
NSOutlineView
NJOutputController
NSButton
- NSMenuItem
@@ -3054,10 +3242,6 @@ aW5nLg
translatingEventsButton
NSButton
-
- translatingEventsMenu
- NSMenuItem
-
IBProjectSource
@@ -3068,13 +3252,13 @@ aW5nLg
NJKeyInputField
NSTextField
- keyDelegate
+ delegate
id
- keyDelegate
+ delegate
- keyDelegate
+ delegate
id
@@ -3083,6 +3267,33 @@ aW5nLg
./Classes/NJKeyInputField.h
+
+ NJMappingMenuController
+ NSObject
+
+ id
+ NSMenuItem
+ NSMenu
+
+
+
+ delegate
+ id
+
+
+ eventTranslationToggle
+ NSMenuItem
+
+
+ menu
+ NSMenu
+
+
+
+ IBProjectSource
+ ./Classes/NJMappingMenuController.h
+
+
NJMappingsController
NSObject
@@ -3128,7 +3339,6 @@ aW5nLg
NSButton
NSButton
- NJOutputController
NSPopover
NSButton
NSButton
@@ -3143,10 +3353,6 @@ aW5nLg
moveUp
NSButton
-
- outputController
- NJOutputController
-
popover
NSPopover
@@ -3178,6 +3384,7 @@ aW5nLg
id
id
id
+ id
id
@@ -3201,6 +3408,10 @@ aW5nLg
scrollSpeedChanged:
id
+
+ scrollTypeChanged:
+ id
+
sdirChanged:
id
@@ -3217,6 +3428,7 @@ aW5nLg
NSMatrix
NSSegmentedControl
NSSlider
+ NSButton
NSTextField
@@ -3260,6 +3472,10 @@ aW5nLg
scrollSpeedSlider
NSSlider
+
+ smoothCheck
+ NSButton
+
title
NSTextField
@@ -3284,6 +3500,7 @@ aW5nLg
{16, 15}
{8, 8}
{9, 9}
+ {15, 15}