X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Resources%2FEnglish.lproj%2FMainMenu.xib;h=0a2018693b56001f01b9f607fb0a9f1e5601ca2b;hp=772132edf41daa28e535f390b6edd2815f8d102e;hb=dacfcc6b0bf3bfebc89b5e6e8266da9eb36177cd;hpb=5f3311b43f99187a9bfe2c0b38da7e64d6986da1 diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib index 772132e..0a20186 100644 --- a/Resources/English.lproj/MainMenu.xib +++ b/Resources/English.lproj/MainMenu.xib @@ -718,10 +718,41 @@ aW5nLg NO + + + 268 + {{343, 31}, {70, 18}} + + + _NS:9 + YES + + 67108864 + 268435456 + Smooth + + _NS:9 + + 1211912448 + 2 + + NSImage + NSSwitch + + + NSSwitch + + + + 200 + 25 + + 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 @@ -1451,6 +1483,15 @@ aW5nLg + + NJMappingMenuController + + + NJMappingMenuController + + + NJMappingMenuController + @@ -1614,14 +1655,6 @@ aW5nLg 915 - - - inputController - - - - 819 - mappingsController @@ -1710,14 +1743,6 @@ aW5nLg 816 - - - outputController - - - - 827 - mappingPressed: @@ -1934,6 +1959,22 @@ aW5nLg 709 + + + scrollTypeChanged: + + + + 948 + + + + smoothCheck + + + + 949 + keyDelegate @@ -1998,6 +2039,78 @@ aW5nLg 933 + + + eventTranslationToggle + + + + 951 + + + + menu + + + + 952 + + + + delegate + + + + 956 + + + + menu + + + + 957 + + + + delegate + + + + 958 + + + + eventTranslationToggle + + + + 959 + + + + delegate + + + + 961 + + + + menu + + + + 964 + + + + eventTranslationToggle + + + + 965 + @@ -2485,6 +2598,7 @@ aW5nLg + @@ -2765,6 +2879,37 @@ aW5nLg + + 946 + + + + + + + + 947 + + + + + 950 + + + Main Mappings Menu Controller + + + 953 + + + Dock Menu Controller + + + 960 + + + Status Bar Menu Controller + @@ -2851,10 +2996,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 +3094,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 + 965 @@ -2974,9 +3181,7 @@ aW5nLg NSMenu - NJDeviceController NJMappingsController - NSMenu NSMenu NSWindow @@ -2985,18 +3190,10 @@ aW5nLg dockMenu NSMenu - - inputController - NJDeviceController - mappingsController NJMappingsController - - mappingsMenu - NSMenu - statusItemMenu NSMenu @@ -3083,6 +3280,33 @@ aW5nLg ./Classes/NJKeyInputField.h + + NJMappingMenuController + NSObject + + id + NSMenuItem + NSMenu + + + + delegate + id + + + eventTranslationToggle + NSMenuItem + + + menu + NSMenu + + + + IBProjectSource + ./Classes/NJMappingMenuController.h + + NJMappingsController NSObject @@ -3128,7 +3352,6 @@ aW5nLg NSButton NSButton - NJOutputController NSPopover NSButton NSButton @@ -3143,10 +3366,6 @@ aW5nLg moveUp NSButton - - outputController - NJOutputController - popover NSPopover @@ -3178,6 +3397,7 @@ aW5nLg id id id + id id @@ -3201,6 +3421,10 @@ aW5nLg scrollSpeedChanged: id + + scrollTypeChanged: + id + sdirChanged: id @@ -3217,6 +3441,7 @@ aW5nLg NSMatrix NSSegmentedControl NSSlider + NSButton NSTextField @@ -3260,6 +3485,10 @@ aW5nLg scrollSpeedSlider NSSlider + + smoothCheck + NSButton + title NSTextField @@ -3284,6 +3513,7 @@ aW5nLg {16, 15} {8, 8} {9, 9} + {15, 15}