X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Resources%2FEnglish.lproj%2FMainMenu.xib;h=b3d81baab01fbe1ab44ee32f9cf860184b805a4c;hp=0c4cdf5f60024a22dbeeef41cd8fe72d5e5108b0;hb=6cee2033d1c0fc0dacf444064305b9e7e87672a9;hpb=4dabc5c754efa54adb2dc57063c7294b1c2e4654 diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib index 0c4cdf5..b3d81ba 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… @@ -321,7 +337,7 @@ 15 2 - {{355, 59}, {620, 323}} + {{355, 59}, {664, 323}} 1685585920 Enjoyable NSWindow @@ -345,9 +361,11 @@ Enabled - + 268 {{7, 14}, {36, 25}} + + _NS:9 YES @@ -393,9 +411,11 @@ Mapping Selector - + 268 {{0, 14}, {140, 25}} + + _NS:9 YES @@ -470,7 +490,7 @@ - {620, 323} + {664, 323} 256 @@ -479,26 +499,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 @@ -676,10 +722,35 @@ aW5nLg 285 + + + 268 + {{197, 157}, {193, 21}} + + + + _NS:9 + YES + + 603979776 + 33554432 + Unknown Mapping + + _NS:9 + + -2046672896 + 129 + + + 200 + 25 + + NO + 265 - {{189, 117}, {180, 20}} + {{189, 117}, {224, 20}} @@ -693,23 +764,23 @@ aW5nLg - 44 + 55 ← 0 - 44 + 55 → 1 0 - 42 + 53 ↑ 0 - 41 + 52 ↓ 0 @@ -718,10 +789,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 +837,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 +868,10 @@ aW5nLg 265 - {{191, 24}, {130, 16}} + {{191, 24}, {146, 16}} - + _NS:9 YES @@ -777,11 +880,11 @@ aW5nLg _NS:9 - 30 - 0.0 + 29 + 1 15 0.0 - 11 + 15 1 YES NO @@ -791,7 +894,7 @@ aW5nLg 265 - {{189, 70}, {180, 24}} + {{189, 70}, {224, 24}} @@ -814,13 +917,27 @@ aW5nLg 0 + 60 Center - 1 + 2 0 55 Right + 1 + 0 + + + 22 + 4 + 3 + 0 + + + 22 + 5 + 4 0 @@ -831,7 +948,7 @@ aW5nLg 265 - {{191, 108}, {176, 16}} + {{191, 108}, {220, 16}} @@ -844,10 +961,10 @@ aW5nLg _NS:9 20 - 0.0 + 1 10 0.0 - 11 + 20 1 YES NO @@ -857,7 +974,7 @@ aW5nLg 265 - {{191, 196}, {176, 23}} + {{191, 196}, {220, 23}} @@ -867,13 +984,13 @@ aW5nLg 265 - {{188, 153}, {182, 26}} + {{188, 153}, {226, 26}} - + YES - -1539309504 + -2076180416 2048 @@ -1031,7 +1148,7 @@ aW5nLg 266 - {{9, 286}, {369, 17}} + {{9, 286}, {412, 17}} @@ -1055,7 +1172,7 @@ aW5nLg 10 - {{12, 276}, {363, 5}} + {{12, 276}, {406, 5}} @@ -1082,7 +1199,7 @@ aW5nLg NO - {{233, 0}, {387, 323}} + {{233, 0}, {431, 323}} @@ -1090,13 +1207,13 @@ aW5nLg NSView - {620, 323} + {664, 323} {{0, 0}, {1440, 878}} - {620, 378} + {664, 378} {10000000000000, 10000000000000} Enjoyable YES @@ -1283,7 +1400,6 @@ aW5nLg {{166, -1}, {34, 23}} - YES 67108864 @@ -1357,27 +1473,6 @@ aW5nLg NSView - - EnjoyableApplicationDelegate - - - NJMappingsController - - - NJDeviceController - - - NJOutputController - - - - - 0 - 1 - 0.0 - 0.0 - YES - @@ -1450,6 +1545,44 @@ aW5nLg + + EnjoyableApplicationDelegate + + + + 0 + 1 + 0.0 + 0.0 + YES + + + NJMappingsController + + + NJDeviceController + + + NJOutputController + + + NJDeviceViewController + + + NJMappingsViewController + + + NJMappingMenuController + + + NJMappingMenuController + + + NJMappingMenuController + + + SUUpdater + @@ -1544,82 +1677,42 @@ aW5nLg delegate - - + + - 517 + 977 dataSource - - - 518 - - - - mappingsController - - - - 822 - - - - outputController - - - - 826 - - - - translatingEventsMenu - - - - 877 - - - - translatingEventsChanged: - - + - 878 + 1001 - translatingEventsButton - - + delegate + + - 879 + 1002 - outlineView + mappingsController - + - 648 + 822 - connectDevicePrompt + delegate - - - 915 - - - - inputController - - + - 819 + 1029 @@ -1653,14 +1746,6 @@ aW5nLg 930 - - - mappingsMenu - - - - 931 - restoreToForeground: @@ -1671,131 +1756,91 @@ aW5nLg - removePressed: - - - - 516 - - - - removeButton - - - - 519 - - - - tableView - - - - 520 - - - - exportPressed: - + exportMappingClicked: + - 815 + 1015 - importPressed: - + importMappingClicked: + - 816 + 1016 - outputController - - - - 827 - - - - mappingPressed: - - + mvc + + - 855 + 1024 - popover - - + dvc + + - 856 + 1025 - popoverActivate - - - - 857 - - - - addPressed: - - + deviceController + + - 515 + 1026 - - moveUpPressed: - - + + outputController + + - 899 + 1027 - moveDownPressed: - - + simulatingEventsChanged: + + - 900 + 1030 - moveUp - - + simulatingEventsButton + + - 901 + 1031 - - moveDown - - + + performClick: + + - 902 + 1012 dataSource - + - 647 + 990 delegate - + - 696 + 991 @@ -1807,19 +1852,11 @@ aW5nLg - inputController + mouseDirSelect - + - 828 - - - - mouseDirSelect - - - - 756 + 756 @@ -1933,13 +1970,37 @@ aW5nLg 709 + + + scrollTypeChanged: + + + + 948 + - keyDelegate + smoothCheck + + + + 949 + + + + unknownMapping + + + + 1022 + + + + delegate - 818 + 966 @@ -1949,29 +2010,21 @@ aW5nLg 871 - - - view - - - - 854 - contentViewController - + - 852 + 996 delegate - + - 853 + 1004 @@ -1997,6 +2050,222 @@ aW5nLg 933 + + + menu + + + + 952 + + + + delegate + + + + 956 + + + + eventSimulationToggle + + + + 980 + + + + menu + + + + 957 + + + + delegate + + + + 958 + + + + eventSimulationToggle + + + + 979 + + + + delegate + + + + 961 + + + + menu + + + + 964 + + + + eventSimulationToggle + + + + 981 + + + + checkForUpdates: + + + + 969 + + + + hidStoppedNotice + + + + 987 + + + + noDevicesNotice + + + + 988 + + + + inputsTree + + + + 989 + + + + delegate + + + + 1028 + + + + 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 + @@ -2070,6 +2339,7 @@ aW5nLg + @@ -2086,6 +2356,7 @@ aW5nLg + @@ -2333,12 +2604,6 @@ aW5nLg - - 850 - - - Popover View Controller - 851 @@ -2454,6 +2719,7 @@ aW5nLg + @@ -2484,6 +2750,8 @@ aW5nLg + + @@ -2764,12 +3032,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 @@ -2787,7 +3139,7 @@ aW5nLg com.apple.InterfaceBuilder.CocoaPlugin {{114, 276}, {770, 487}} - + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2850,10 +3202,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 @@ -2875,7 +3227,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 @@ -2948,53 +3299,150 @@ 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 - 941 + 1031 EnjoyableApplicationDelegate NSObject - - restoreToForeground: - id - - - restoreToForeground: - + + id + id + id + NSButton + + + + exportMappingClicked: + id + + + importMappingClicked: + id + + restoreToForeground: id - + + simulatingEventsChanged: + NSButton + + + NJDeviceController NSMenu - NJDeviceController + NJDeviceViewController NJMappingsController - NSMenu + NJMappingsViewController + NJOutputController + NSButton NSMenu NSWindow + + deviceController + NJDeviceController + dockMenu NSMenu - - inputController - NJDeviceController + + dvc + NJDeviceViewController mappingsController NJMappingsController - - mappingsMenu - NSMenu + + mvc + NJMappingsViewController + + + outputController + NJOutputController + + + simulatingEventsButton + NSButton statusItemMenu @@ -3013,67 +3461,68 @@ aW5nLg NJDeviceController NSObject - - translatingEventsChanged: - id - - - translatingEventsChanged: - - translatingEventsChanged: - id - - - NSView + id NJMappingsController - NSOutlineView - NJOutputController - NSButton - NSMenuItem - - connectDevicePrompt - NSView + + delegate + id mappingsController NJMappingsController - - outlineView - NSOutlineView + + + IBProjectSource + ./Classes/NJDeviceController.h + + + + NJDeviceViewController + NSObject + + id + NSView + NSOutlineView + NSView + + + + delegate + id - - outputController - NJOutputController + + hidStoppedNotice + NSView - - translatingEventsButton - NSButton + + inputsTree + NSOutlineView - - translatingEventsMenu - NSMenuItem + + noDevicesNotice + NSView IBProjectSource - ./Classes/NJDeviceController.h + ./Classes/NJDeviceViewController.h NJKeyInputField - NSTextField + NSControl - keyDelegate + delegate id - keyDelegate + delegate - keyDelegate + delegate id @@ -3083,57 +3532,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 @@ -3142,30 +3632,14 @@ aW5nLg moveUp NSButton - - outputController - NJOutputController - - - popover - NSPopover - - - popoverActivate + + removeMapping NSButton - - removeButton - NSButton - - - tableView - NSTableView - IBProjectSource - ./Classes/NJMappingsController.h + ./Classes/NJMappingsViewController.h @@ -3177,6 +3651,7 @@ aW5nLg id id id + id id @@ -3200,13 +3675,16 @@ aW5nLg scrollSpeedChanged: id + + scrollTypeChanged: + id + sdirChanged: id - NJDeviceController NJKeyInputField NSPopUpButton NJMappingsController @@ -3216,13 +3694,11 @@ aW5nLg NSMatrix NSSegmentedControl NSSlider + NSButton NSTextField + NSButton - - inputController - NJDeviceController - keyInput NJKeyInputField @@ -3259,16 +3735,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 @@ -3283,6 +3797,7 @@ aW5nLg {16, 15} {8, 8} {9, 9} + {15, 15}