X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Resources%2FEnglish.lproj%2FMainMenu.xib;h=7d4b4c63f07c9a4bae501ae6871bcee69eb9f2fb;hp=0c4cdf5f60024a22dbeeef41cd8fe72d5e5108b0;hb=48cd44b9d5bad73ac9b7456cc10d0a7fbb8d7b11;hpb=4dabc5c754efa54adb2dc57063c7294b1c2e4654 diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib index 0c4cdf5..7d4b4c6 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 @@ -524,7 +524,7 @@ aW5nLg {232, 321} - + YES NO YES @@ -654,7 +654,7 @@ aW5nLg {234, 323} - + 150034 @@ -679,7 +679,7 @@ aW5nLg 265 - {{189, 117}, {180, 20}} + {{189, 117}, {224, 20}} @@ -693,23 +693,23 @@ aW5nLg - 44 + 55 ← 0 - 44 + 55 → 1 0 - 42 + 53 ↑ 0 - 41 + 52 ↓ 0 @@ -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}, {180, 20}} + {{189, 33}, {150, 20}} @@ -735,26 +766,27 @@ aW5nLg - 64 - ↑ - Scroll up continuously + 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 @@ -765,10 +797,10 @@ aW5nLg 265 - {{191, 24}, {130, 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 @@ -791,7 +823,7 @@ aW5nLg 265 - {{189, 70}, {180, 24}} + {{189, 70}, {224, 24}} @@ -814,13 +846,27 @@ aW5nLg 0 + 60 Center - 1 + 2 0 55 Right + 1 + 0 + + + 22 + 4 + 3 + 0 + + + 22 + 5 + 4 0 @@ -831,7 +877,7 @@ aW5nLg 265 - {{191, 108}, {176, 16}} + {{191, 108}, {220, 16}} @@ -844,10 +890,10 @@ aW5nLg _NS:9 20 - 0.0 + 1 10 0.0 - 11 + 20 1 YES NO @@ -857,7 +903,7 @@ aW5nLg 265 - {{191, 196}, {176, 23}} + {{191, 196}, {220, 23}} @@ -867,13 +913,13 @@ aW5nLg 265 - {{188, 153}, {182, 26}} + {{188, 153}, {226, 26}} YES - -1539309504 + -2076180416 2048 @@ -1031,7 +1077,7 @@ aW5nLg 266 - {{9, 286}, {369, 17}} + {{9, 286}, {412, 17}} @@ -1055,7 +1101,7 @@ aW5nLg 10 - {{12, 276}, {363, 5}} + {{12, 276}, {406, 5}} @@ -1082,7 +1128,7 @@ aW5nLg NO - {{233, 0}, {387, 323}} + {{233, 0}, {431, 323}} @@ -1090,19 +1136,19 @@ aW5nLg NSView - {620, 323} + {664, 323} {{0, 0}, {1440, 878}} - {620, 378} + {664, 378} {10000000000000, 10000000000000} Enjoyable YES - + 256 @@ -1118,8 +1164,7 @@ aW5nLg 256 {198, 198} - - + YES NO YES @@ -1176,7 +1221,6 @@ aW5nLg {{1, 1}, {198, 198}} - @@ -1187,7 +1231,6 @@ aW5nLg -2147483392 {{306, 1}, {15, 403}} - NO @@ -1199,7 +1242,6 @@ aW5nLg -2147483392 {{-100, -100}, {366, 16}} - NO 1 @@ -1210,8 +1252,7 @@ aW5nLg {{0, 20}, {200, 200}} - - + 150034 @@ -1226,7 +1267,6 @@ aW5nLg 268 {{66, -1}, {68, 23}} - _NS:22 YES @@ -1255,7 +1295,6 @@ aW5nLg 292 {{0, -1}, {34, 23}} - YES @@ -1282,8 +1321,6 @@ aW5nLg 292 {{166, -1}, {34, 23}} - - YES 67108864 @@ -1305,7 +1342,6 @@ aW5nLg 292 {{133, -1}, {34, 23}} - YES @@ -1328,7 +1364,6 @@ aW5nLg 292 {{33, -1}, {34, 23}} - YES @@ -1352,8 +1387,6 @@ aW5nLg {200, 220} - - NSView @@ -1450,6 +1483,15 @@ aW5nLg + + NJMappingMenuController + + + NJMappingMenuController + + + NJMappingMenuController + @@ -1573,14 +1615,6 @@ aW5nLg 826 - - - translatingEventsMenu - - - - 877 - translatingEventsChanged: @@ -1613,14 +1647,6 @@ aW5nLg 915 - - - inputController - - - - 819 - mappingsController @@ -1709,14 +1735,6 @@ aW5nLg 816 - - - outputController - - - - 827 - mappingPressed: @@ -1933,13 +1951,29 @@ aW5nLg 709 + + + scrollTypeChanged: + + + + 948 + - keyDelegate + smoothCheck + + + + 949 + + + + delegate - 818 + 966 @@ -1997,6 +2031,78 @@ aW5nLg 933 + + + eventTranslationToggle + + + + 951 + + + + menu + + + + 952 + + + + delegate + + + + 956 + + + + menu + + + + 957 + + + + delegate + + + + 958 + + + + eventTranslationToggle + + + + 959 + + + + delegate + + + + 961 + + + + menu + + + + 964 + + + + eventTranslationToggle + + + + 965 + @@ -2484,6 +2590,7 @@ aW5nLg + @@ -2764,6 +2871,37 @@ aW5nLg + + 946 + + + + + + + + 947 + + + + + 950 + + + Main Mappings Menu Controller + + + 953 + + + Dock Menu Controller + + + 960 + + + Status Bar Menu Controller + @@ -2850,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 @@ -2948,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 - 941 + 966 @@ -2973,9 +3173,7 @@ aW5nLg NSMenu - NJDeviceController NJMappingsController - NSMenu NSMenu NSWindow @@ -2984,18 +3182,10 @@ aW5nLg dockMenu NSMenu - - inputController - NJDeviceController - mappingsController NJMappingsController - - mappingsMenu - NSMenu - statusItemMenu NSMenu @@ -3015,13 +3205,13 @@ aW5nLg NSObject translatingEventsChanged: - id + NSButton translatingEventsChanged: translatingEventsChanged: - id + NSButton @@ -3030,7 +3220,6 @@ aW5nLg NSOutlineView NJOutputController NSButton - NSMenuItem @@ -3053,10 +3242,6 @@ aW5nLg translatingEventsButton NSButton - - translatingEventsMenu - NSMenuItem - IBProjectSource @@ -3067,13 +3252,13 @@ aW5nLg NJKeyInputField NSTextField - keyDelegate + delegate id - keyDelegate + delegate - keyDelegate + delegate id @@ -3082,6 +3267,33 @@ aW5nLg ./Classes/NJKeyInputField.h + + NJMappingMenuController + NSObject + + id + NSMenuItem + NSMenu + + + + delegate + id + + + eventTranslationToggle + NSMenuItem + + + menu + NSMenu + + + + IBProjectSource + ./Classes/NJMappingMenuController.h + + NJMappingsController NSObject @@ -3127,7 +3339,6 @@ aW5nLg NSButton NSButton - NJOutputController NSPopover NSButton NSButton @@ -3142,10 +3353,6 @@ aW5nLg moveUp NSButton - - outputController - NJOutputController - popover NSPopover @@ -3177,6 +3384,7 @@ aW5nLg id id id + id id @@ -3200,6 +3408,10 @@ aW5nLg scrollSpeedChanged: id + + scrollTypeChanged: + id + sdirChanged: id @@ -3216,6 +3428,7 @@ aW5nLg NSMatrix NSSegmentedControl NSSlider + NSButton NSTextField @@ -3259,6 +3472,10 @@ aW5nLg scrollSpeedSlider NSSlider + + smoothCheck + NSButton + title NSTextField @@ -3283,6 +3500,7 @@ aW5nLg {16, 15} {8, 8} {9, 9} + {15, 15}