X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Resources%2FEnglish.lproj%2FMainMenu.xib;h=0a2018693b56001f01b9f607fb0a9f1e5601ca2b;hp=22b83f7ace1416b336322e596747e337ba9fde77;hb=dacfcc6b0bf3bfebc89b5e6e8266da9eb36177cd;hpb=22efc1e5000d462091f3156ee5a8959be32cfb11 diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib index 22b83f7..0a20186 100644 --- a/Resources/English.lproj/MainMenu.xib +++ b/Resources/English.lproj/MainMenu.xib @@ -321,7 +321,7 @@ 15 2 - {{355, 59}, {620, 323}} + {{355, 59}, {664, 323}} 1685585920 Enjoyable NSWindow @@ -470,7 +470,7 @@ - {620, 323} + {664, 323} 256 @@ -676,62 +676,10 @@ aW5nLg 285 - - - 265 - {{191, 24}, {130, 12}} - - - - _NS:9 - YES - - -2080374784 - 262144 - - _NS:9 - - 30 - 0.0 - 15 - 0.0 - 0 - 1 - NO - NO - - NO - - - - 265 - {{191, 108}, {176, 12}} - - - - _NS:9 - YES - - -2080374784 - 262144 - - _NS:9 - - 20 - 0.0 - 4 - 0.0 - 0 - 1 - NO - NO - - NO - 265 - {{189, 117}, {180, 20}} + {{189, 117}, {224, 20}} @@ -745,24 +693,23 @@ aW5nLg - 44 + 55 ← - YES 0 - 44 + 55 → 1 0 - 42 + 53 ↑ 0 - 41 + 52 ↓ 0 @@ -771,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}, {180, 20}} + {{189, 33}, {150, 20}} @@ -788,27 +766,27 @@ aW5nLg - 64 - ↑ - Scroll up continuously - YES + 36 + ← + -2 0 - 63 - ↓ - Scroll down continuously - 1 + 35 + → + 2 0 - ⤒ - Scroll up one step + 35 + ↑ + -1 0 - ⤓ - Scroll down one step + 35 + ↓ + 1 0 @@ -816,10 +794,36 @@ aW5nLg NO + + + 265 + {{191, 24}, {146, 16}} + + + + _NS:9 + YES + + -2080374784 + 262144 + + _NS:9 + + 29 + 1 + 15 + 0.0 + 15 + 1 + YES + NO + + NO + 265 - {{189, 70}, {180, 24}} + {{189, 70}, {224, 24}} @@ -837,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}} @@ -866,13 +913,13 @@ aW5nLg 265 - {{188, 153}, {182, 26}} + {{188, 153}, {226, 26}} YES - -1539309504 + -2076180416 2048 @@ -1081,7 +1128,7 @@ aW5nLg NO - {{233, 0}, {387, 323}} + {{233, 0}, {431, 323}} @@ -1089,19 +1136,19 @@ aW5nLg NSView - {620, 323} + {664, 323} {{0, 0}, {1440, 878}} - {620, 378} + {664, 378} {10000000000000, 10000000000000} Enjoyable YES - + 256 @@ -1117,8 +1164,7 @@ aW5nLg 256 {198, 198} - - + YES NO YES @@ -1175,7 +1221,6 @@ aW5nLg {{1, 1}, {198, 198}} - @@ -1186,7 +1231,6 @@ aW5nLg -2147483392 {{306, 1}, {15, 403}} - NO @@ -1198,7 +1242,6 @@ aW5nLg -2147483392 {{-100, -100}, {366, 16}} - NO 1 @@ -1209,8 +1252,7 @@ aW5nLg {{0, 20}, {200, 200}} - - + 150034 @@ -1225,7 +1267,6 @@ aW5nLg 268 {{66, -1}, {68, 23}} - _NS:22 YES @@ -1254,7 +1295,6 @@ aW5nLg 292 {{0, -1}, {34, 23}} - YES @@ -1281,8 +1321,6 @@ aW5nLg 292 {{166, -1}, {34, 23}} - - YES 67108864 @@ -1304,7 +1342,6 @@ aW5nLg 292 {{133, -1}, {34, 23}} - YES @@ -1327,7 +1364,6 @@ aW5nLg 292 {{33, -1}, {34, 23}} - YES @@ -1351,8 +1387,6 @@ aW5nLg {200, 220} - - NSView @@ -1449,6 +1483,15 @@ aW5nLg + + NJMappingMenuController + + + NJMappingMenuController + + + NJMappingMenuController + @@ -1612,14 +1655,6 @@ aW5nLg 915 - - - inputController - - - - 819 - mappingsController @@ -1708,14 +1743,6 @@ aW5nLg 816 - - - outputController - - - - 827 - mappingPressed: @@ -1932,6 +1959,22 @@ aW5nLg 709 + + + scrollTypeChanged: + + + + 948 + + + + smoothCheck + + + + 949 + keyDelegate @@ -1996,6 +2039,78 @@ aW5nLg 933 + + + eventTranslationToggle + + + + 951 + + + + menu + + + + 952 + + + + delegate + + + + 956 + + + + menu + + + + 957 + + + + delegate + + + + 958 + + + + eventTranslationToggle + + + + 959 + + + + delegate + + + + 961 + + + + menu + + + + 964 + + + + eventTranslationToggle + + + + 965 + @@ -2483,6 +2598,7 @@ aW5nLg + @@ -2763,6 +2879,37 @@ aW5nLg + + 946 + + + + + + + + 947 + + + + + 950 + + + Main Mappings Menu Controller + + + 953 + + + Dock Menu Controller + + + 960 + + + Status Bar Menu Controller + @@ -2846,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 @@ -2947,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 - 941 + 965 @@ -2972,9 +3181,7 @@ aW5nLg NSMenu - NJDeviceController NJMappingsController - NSMenu NSMenu NSWindow @@ -2983,18 +3190,10 @@ aW5nLg dockMenu NSMenu - - inputController - NJDeviceController - mappingsController NJMappingsController - - mappingsMenu - NSMenu - statusItemMenu NSMenu @@ -3081,6 +3280,33 @@ aW5nLg ./Classes/NJKeyInputField.h + + NJMappingMenuController + NSObject + + id + NSMenuItem + NSMenu + + + + delegate + id + + + eventTranslationToggle + NSMenuItem + + + menu + NSMenu + + + + IBProjectSource + ./Classes/NJMappingMenuController.h + + NJMappingsController NSObject @@ -3126,7 +3352,6 @@ aW5nLg NSButton NSButton - NJOutputController NSPopover NSButton NSButton @@ -3141,10 +3366,6 @@ aW5nLg moveUp NSButton - - outputController - NJOutputController - popover NSPopover @@ -3176,6 +3397,7 @@ aW5nLg id id id + id id @@ -3199,6 +3421,10 @@ aW5nLg scrollSpeedChanged: id + + scrollTypeChanged: + id + sdirChanged: id @@ -3215,6 +3441,7 @@ aW5nLg NSMatrix NSSegmentedControl NSSlider + NSButton NSTextField @@ -3258,6 +3485,10 @@ aW5nLg scrollSpeedSlider NSSlider + + smoothCheck + NSButton + title NSTextField @@ -3282,6 +3513,7 @@ aW5nLg {16, 15} {8, 8} {9, 9} + {15, 15}