X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Resources%2FEnglish.lproj%2FMainMenu.xib;h=b2cc462bd025c796567c86c567cfb7a8491e7736;hp=772132edf41daa28e535f390b6edd2815f8d102e;hb=4a8e67a7294e8e527e2be9d8f5f39aae60691697;hpb=5f3311b43f99187a9bfe2c0b38da7e64d6986da1 diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib index 772132e..b2cc462 100644 --- a/Resources/English.lproj/MainMenu.xib +++ b/Resources/English.lproj/MainMenu.xib @@ -2,10 +2,10 @@ 1080 - 12C2034 + 12D78 3084 - 1187.34 - 625.00 + 1187.37 + 626.00 com.apple.InterfaceBuilder.CocoaPlugin 3084 @@ -37,7 +37,6 @@ NSToolbarFlexibleSpaceItem NSToolbarItem NSView - NSViewController NSWindowTemplate @@ -86,6 +85,14 @@ + + + Check for Updates... + + 2147483647 + + + YES @@ -214,6 +221,15 @@ + + + New… + n + 1048576 + 2147483647 + + + Import… @@ -479,26 +495,52 @@ 275 - + - 274 + -2147483374 {{20, 20}, {194, 283}} _NS:22 YES - + 603979776 134217728 - Tm8gaW5wdXQgZGV2aWNlcyB3ZXJlIGZvdW5kLgoKQ29ubmVjdCBhIGRldmljZSB0byBiZWdpbiBtYXBw -aW5nLg - + SW5wdXQgaXMgY3VycmVudGx5IGRpc2FibGVkLgoKU3dpdGNoIGJhY2sgdG8gcmUtZW5hYmxlIGlucHV0 +Lg + LucidaGrande-Bold 14 16 _NS:22 + + -2041823232 + 134 + + + 400 + 75 + + NO + + + + 274 + {{20, 20}, {194, 283}} + + + + _NS:22 + YES + + 603979776 + 134217728 + Tm8gaW5wdXQgZGV2aWNlcyB3ZXJlIGZvdW5kLgoKQ29ubmVjdCBhIGRldmljZSB0byBiZWdpbiBtYXBw +aW5nLg + + _NS:22 -2041823232 134 @@ -524,7 +566,7 @@ aW5nLg {232, 321} - + YES NO YES @@ -654,7 +696,7 @@ aW5nLg {234, 323} - + 150034 @@ -676,6 +718,31 @@ aW5nLg 285 + + + 268 + {{197, 157}, {193, 21}} + + + + _NS:9 + YES + + 603979776 + 33554432 + Unknown Mapping + + _NS:9 + + -2046672896 + 129 + + + 200 + 25 + + NO + 265 @@ -718,10 +785,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 +833,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 +864,10 @@ aW5nLg 265 - {{191, 24}, {176, 16}} + {{191, 24}, {146, 16}} - + _NS:9 YES @@ -777,11 +876,11 @@ aW5nLg _NS:9 - 30 - 0.0 + 29 + 1 15 0.0 - 11 + 15 1 YES NO @@ -858,10 +957,10 @@ aW5nLg _NS:9 20 - 0.0 + 1 10 0.0 - 11 + 20 1 YES NO @@ -884,7 +983,7 @@ aW5nLg {{188, 153}, {226, 26}} - + YES -2076180416 @@ -1045,7 +1144,7 @@ aW5nLg 266 - {{9, 286}, {369, 17}} + {{9, 286}, {412, 17}} @@ -1069,7 +1168,7 @@ aW5nLg 10 - {{12, 276}, {363, 5}} + {{12, 276}, {406, 5}} @@ -1116,7 +1215,7 @@ aW5nLg YES - + 256 @@ -1132,6 +1231,7 @@ aW5nLg 256 {198, 198} + YES NO @@ -1189,6 +1289,7 @@ aW5nLg {{1, 1}, {198, 198}} + @@ -1199,6 +1300,7 @@ aW5nLg -2147483392 {{306, 1}, {15, 403}} + NO @@ -1210,6 +1312,7 @@ aW5nLg -2147483392 {{-100, -100}, {366, 16}} + NO 1 @@ -1220,6 +1323,7 @@ aW5nLg {{0, 20}, {200, 200}} + 150034 @@ -1235,6 +1339,7 @@ aW5nLg 268 {{66, -1}, {68, 23}} + _NS:22 YES @@ -1263,6 +1368,7 @@ aW5nLg 292 {{0, -1}, {34, 23}} + YES @@ -1289,6 +1395,7 @@ aW5nLg 292 {{166, -1}, {34, 23}} + YES 67108864 @@ -1310,6 +1417,7 @@ aW5nLg 292 {{133, -1}, {34, 23}} + YES @@ -1332,6 +1440,7 @@ aW5nLg 292 {{33, -1}, {34, 23}} + YES @@ -1355,6 +1464,8 @@ aW5nLg {200, 220} + + NSView @@ -1370,7 +1481,6 @@ aW5nLg NJOutputController - 0 @@ -1451,6 +1561,24 @@ aW5nLg + + NJMappingMenuController + + + NJMappingMenuController + + + NJMappingMenuController + + + SUUpdater + + + NJDeviceViewController + + + NJMappingsViewController + @@ -1545,18 +1673,26 @@ aW5nLg delegate - - + + - 517 + 977 dataSource - + - 518 + 1001 + + + + delegate + + + + 1002 @@ -1576,51 +1712,43 @@ aW5nLg - translatingEventsMenu + connectDevicePrompt - + - 877 + 915 - - translatingEventsChanged: + + hidSleepingPrompt - + - 878 + 976 - - translatingEventsButton + + simulatingEventsChanged: - 879 + 978 - outlineView + simulatingEventsButton - + - 648 + 982 - connectDevicePrompt + devicesViewController - - - 915 - - - - inputController - - + - 819 + 992 @@ -1654,14 +1782,6 @@ aW5nLg 930 - - - mappingsMenu - - - - 931 - restoreToForeground: @@ -1672,131 +1792,59 @@ aW5nLg - removePressed: - - - - 516 - - - - removeButton - - - - 519 - - - - tableView - - - - 520 - - - - exportPressed: - + exportMappingClicked: + - 815 + 1015 - importPressed: - + importMappingClicked: + - 816 - - - - outputController - - - - 827 - - - - mappingPressed: - - - - 855 - - - - popover - - - - 856 + 1016 - popoverActivate - - - - 857 - - - - addPressed: - - - - 515 - - - - moveUpPressed: - - + mvc + + - 899 + 1024 - moveDownPressed: - - - - 900 - - - - moveUp - - + performClick: + + - 901 + 1012 - moveDown + mvc - + - 902 + 995 dataSource - + - 647 + 990 delegate - + - 696 + 991 @@ -1934,13 +1982,37 @@ aW5nLg 709 + + + scrollTypeChanged: + + + + 948 + + + + smoothCheck + + + + 949 + + + + unknownMapping + + + + 1022 + - keyDelegate + delegate - 818 + 966 @@ -1950,29 +2022,21 @@ aW5nLg 871 - - - view - - - - 854 - contentViewController - + - 852 + 996 delegate - + - 853 + 1004 @@ -1998,31 +2062,247 @@ aW5nLg 933 - - - - - 0 - - - + + + menu + + - - -2 - - - File's Owner + 952 + + + + delegate + + - - -1 - - - First Responder + 956 + + + + eventSimulationToggle + + - - -3 - - + 980 + + + + menu + + + + 957 + + + + delegate + + + + 958 + + + + eventSimulationToggle + + + + 979 + + + + delegate + + + + 961 + + + + menu + + + + 964 + + + + eventSimulationToggle + + + + 981 + + + + checkForUpdates: + + + + 969 + + + + delegate + + + + 984 + + + + hidStoppedNotice + + + + 987 + + + + noDevicesNotice + + + + 988 + + + + inputsTree + + + + 989 + + + + view + + + + 997 + + + + mappingTriggerClicked: + + + + 998 + + + + mappingListTrigger + + + + 999 + + + + mappingListPopover + + + + 1000 + + + + mappingList + + + + 1003 + + + + removeClicked: + + + + 1005 + + + + removeMapping + + + + 1006 + + + + addClicked: + + + + 1007 + + + + moveDownClicked: + + + + 1008 + + + + moveUpClicked: + + + + 1009 + + + + moveDown + + + + 1010 + + + + moveUp + + + + 1011 + + + + delegate + + + + 1023 + + + + + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + Application @@ -2071,6 +2351,7 @@ aW5nLg + @@ -2087,6 +2368,7 @@ aW5nLg + @@ -2334,12 +2616,6 @@ aW5nLg - - 850 - - - Popover View Controller - 851 @@ -2455,6 +2731,7 @@ aW5nLg + @@ -2485,6 +2762,8 @@ aW5nLg + + @@ -2765,12 +3044,96 @@ aW5nLg + + 946 + + + + + + + + 947 + + + + + 950 + + + Main Mappings Menu Controller + + + 953 + + + Dock Menu Controller + + + 960 + + + Status Bar Menu Controller + + + 967 + + + + + 968 + + + + + 970 + + + + + 974 + + + + + + + + 975 + + + + + 983 + + + + + 993 + + + + + 1020 + + + + + + + + 1021 + + + 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 @@ -2788,7 +3151,7 @@ aW5nLg com.apple.InterfaceBuilder.CocoaPlugin {{114, 276}, {770, 487}} - + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2851,10 +3214,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 @@ -2876,7 +3239,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 @@ -2949,34 +3311,110 @@ 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 + 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 - 945 + 1024 EnjoyableApplicationDelegate NSObject - - restoreToForeground: - id - - - restoreToForeground: - + + id + id + id + + + + exportMappingClicked: + id + + + importMappingClicked: + id + + restoreToForeground: id - + NSMenu - NJDeviceController NJMappingsController - NSMenu + NJMappingsViewController NSMenu NSWindow @@ -2985,17 +3423,13 @@ aW5nLg dockMenu NSMenu - - inputController - NJDeviceController - mappingsController NJMappingsController - - mappingsMenu - NSMenu + + mvc + NJMappingsViewController statusItemMenu @@ -3015,66 +3449,88 @@ aW5nLg NJDeviceController NSObject - translatingEventsChanged: - id + simulatingEventsChanged: + NSButton - translatingEventsChanged: + simulatingEventsChanged: - translatingEventsChanged: - id + simulatingEventsChanged: + NSButton - NSView + NJDeviceViewController NJMappingsController - NSOutlineView NJOutputController - NSButton - NSMenuItem + NSButton - - connectDevicePrompt - NSView + + devicesViewController + NJDeviceViewController mappingsController NJMappingsController - - outlineView - NSOutlineView - outputController NJOutputController - - translatingEventsButton + + simulatingEventsButton NSButton - - translatingEventsMenu - NSMenuItem - IBProjectSource ./Classes/NJDeviceController.h + + NJDeviceViewController + NSObject + + id + NSView + NSOutlineView + NSView + + + + delegate + id + + + hidStoppedNotice + NSView + + + inputsTree + NSOutlineView + + + noDevicesNotice + NSView + + + + IBProjectSource + ./Classes/NJDeviceViewController.h + + NJKeyInputField - NSTextField + NSControl - keyDelegate + delegate id - keyDelegate + delegate - keyDelegate + delegate id @@ -3084,57 +3540,98 @@ aW5nLg - NJMappingsController + NJMappingMenuController NSObject - - id - id - id - id - id - id - id + + id + NSMenuItem + NSMenu - - - addPressed: + + + delegate id - - exportPressed: - id + + eventSimulationToggle + NSMenuItem - - importPressed: + + menu + NSMenu + + + + IBProjectSource + ./Classes/NJMappingMenuController.h + + + + NJMappingsController + NSObject + + IBProjectSource + ./Classes/NJMappingsController.h + + + + NJMappingsViewController + NSViewController + + id + id + id + id + id + + + + addClicked: id - - mappingPressed: + + mappingTriggerClicked: id - - moveDownPressed: + + moveDownClicked: id - - moveUpPressed: + + moveUpClicked: id - - removePressed: + + removeClicked: id + id + NSTableView + NSPopover + NSButton NSButton NSButton - NJOutputController - NSPopover - NSButton - NSButton - NSTableView + NSButton + + delegate + id + + + mappingList + NSTableView + + + mappingListPopover + NSPopover + + + mappingListTrigger + NSButton + moveDown NSButton @@ -3143,30 +3640,14 @@ aW5nLg moveUp NSButton - - outputController - NJOutputController - - - popover - NSPopover - - - popoverActivate + + removeMapping NSButton - - removeButton - NSButton - - - tableView - NSTableView - IBProjectSource - ./Classes/NJMappingsController.h + ./Classes/NJMappingsViewController.h @@ -3178,6 +3659,7 @@ aW5nLg id id id + id id @@ -3201,6 +3683,10 @@ aW5nLg scrollSpeedChanged: id + + scrollTypeChanged: + id + sdirChanged: id @@ -3217,7 +3703,9 @@ aW5nLg NSMatrix NSSegmentedControl NSSlider + NSButton NSTextField + NSButton @@ -3260,16 +3748,54 @@ aW5nLg scrollSpeedSlider NSSlider + + smoothCheck + NSButton + title NSTextField + + unknownMapping + NSButton + IBProjectSource ./Classes/NJOutputController.h + + SUUpdater + NSObject + + checkForUpdates: + id + + + checkForUpdates: + + checkForUpdates: + id + + + + delegate + id + + + delegate + + delegate + id + + + + IBProjectSource + ./Classes/SUUpdater.h + + 0 @@ -3284,6 +3810,7 @@ aW5nLg {16, 15} {8, 8} {9, 9} + {15, 15}