X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Resources%2FEnglish.lproj%2FMainMenu.xib;h=e045c4d3598a79a4ef1a396f834b43bac4e0673e;hp=98b5cef7620130d0295dbc5f6bc36566b2f3317d;hb=24bdb92798b9abe86c7954042a47523791736b7c;hpb=f8ae7787fe3fe272eaf04586e3007339c907fb33 diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib index 98b5cef..e045c4d 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 @@ -567,7 +566,7 @@ aW5nLg {232, 321} - + YES NO YES @@ -697,7 +696,7 @@ aW5nLg {234, 323} - + 150034 @@ -719,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 @@ -767,6 +791,7 @@ aW5nLg {{343, 31}, {70, 18}} + _NS:9 YES @@ -959,7 +984,7 @@ aW5nLg {{188, 153}, {226, 26}} - + YES -2076180416 @@ -1191,7 +1216,7 @@ aW5nLg YES - + 256 @@ -1207,7 +1232,8 @@ aW5nLg 256 {198, 198} - + + YES NO YES @@ -1264,6 +1290,7 @@ aW5nLg {{1, 1}, {198, 198}} + @@ -1274,6 +1301,7 @@ aW5nLg -2147483392 {{306, 1}, {15, 403}} + NO @@ -1285,6 +1313,7 @@ aW5nLg -2147483392 {{-100, -100}, {366, 16}} + NO 1 @@ -1295,7 +1324,8 @@ aW5nLg {{0, 20}, {200, 200}} - + + 150034 @@ -1310,6 +1340,7 @@ aW5nLg 268 {{66, -1}, {68, 23}} + _NS:22 YES @@ -1338,6 +1369,7 @@ aW5nLg 292 {{0, -1}, {34, 23}} + YES @@ -1364,6 +1396,8 @@ aW5nLg 292 {{166, -1}, {34, 23}} + + YES 67108864 @@ -1385,6 +1419,7 @@ aW5nLg 292 {{133, -1}, {34, 23}} + YES @@ -1407,6 +1442,7 @@ aW5nLg 292 {{33, -1}, {34, 23}} + YES @@ -1430,6 +1466,8 @@ aW5nLg {200, 220} + + NSView @@ -1445,7 +1483,6 @@ aW5nLg NJOutputController - 0 @@ -1538,6 +1575,12 @@ aW5nLg SUUpdater + + NJDeviceViewController + + + NJMappingsViewController + @@ -1632,18 +1675,26 @@ aW5nLg delegate - - + + - 517 + 977 dataSource - + - 518 + 1001 + + + + delegate + + + + 1002 @@ -1662,44 +1713,44 @@ aW5nLg 826 - - translatingEventsChanged: + + connectDevicePrompt - + - 878 + 915 - translatingEventsButton + hidSleepingPrompt - + - 879 + 976 - - outlineView + + simulatingEventsChanged: - + - 648 + 978 - connectDevicePrompt + simulatingEventsButton - + - 915 + 982 - hidSleepingPrompt + devicesViewController - + - 976 + 992 @@ -1751,131 +1802,51 @@ aW5nLg - removePressed: - - - - 516 - - - - removeButton - - - - 519 - - - - tableView - - - - 520 - - - - exportPressed: - + exportMappingClicked: + - 815 + 1015 - importPressed: - + importMappingClicked: + - 816 - - - - mappingPressed: - - - - 855 - - - - popover - - - - 856 - - - - popoverActivate - - - - 857 - - - - addPressed: - - - - 515 - - - - moveUpPressed: - - - - 899 + 1016 - moveDownPressed: - - - - 900 - - - - moveUp - - + performClick: + + - 901 + 1012 - moveDown - - - - 902 - - - - addPressed: + mvc - + - 971 + 995 dataSource - + - 647 + 990 delegate - + - 696 + 991 @@ -2029,6 +2000,14 @@ aW5nLg 949 + + + unknownMapping + + + + 1022 + delegate @@ -2045,29 +2024,21 @@ aW5nLg 871 - - - view - - - - 854 - contentViewController - + - 852 + 996 delegate - + - 853 + 1004 @@ -2093,14 +2064,6 @@ aW5nLg 933 - - - eventTranslationToggle - - - - 951 - menu @@ -2117,6 +2080,14 @@ aW5nLg 956 + + + eventSimulationToggle + + + + 980 + menu @@ -2135,11 +2106,11 @@ aW5nLg - eventTranslationToggle + eventSimulationToggle - 959 + 979 @@ -2159,11 +2130,11 @@ aW5nLg - eventTranslationToggle + eventSimulationToggle - 965 + 981 @@ -2173,6 +2144,142 @@ aW5nLg 969 + + + delegate + + + + 984 + + + + hidStoppedNotice + + + + 987 + + + + noDevicesNotice + + + + 988 + + + + inputsTree + + + + 989 + + + + delegate + + + + 994 + + + + view + + + + 997 + + + + mappingTriggerClicked: + + + + 998 + + + + mappingListTrigger + + + + 999 + + + + mappingListPopover + + + + 1000 + + + + mappingList + + + + 1003 + + + + removeClicked: + + + + 1005 + + + + removeMapping + + + + 1006 + + + + addClicked: + + + + 1007 + + + + moveDownClicked: + + + + 1008 + + + + moveUpClicked: + + + + 1009 + + + + moveDown + + + + 1010 + + + + moveUp + + + + 1011 + @@ -2511,12 +2618,6 @@ aW5nLg - - 850 - - - Popover View Controller - 851 @@ -2664,6 +2765,7 @@ aW5nLg + @@ -3003,12 +3105,37 @@ aW5nLg + + 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 @@ -3114,7 +3241,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 @@ -3254,29 +3380,39 @@ aW5nLg com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - 976 + 1022 EnjoyableApplicationDelegate NSObject - - restoreToForeground: - id - - - restoreToForeground: - + + id + id + id + + + + exportMappingClicked: + id + + + importMappingClicked: + id + + restoreToForeground: id - + NSMenu NJMappingsController @@ -3310,47 +3446,37 @@ aW5nLg NJDeviceController NSObject - translatingEventsChanged: + simulatingEventsChanged: NSButton - translatingEventsChanged: + simulatingEventsChanged: - translatingEventsChanged: + simulatingEventsChanged: NSButton - NSView - NSView + NJDeviceViewController NJMappingsController - NSOutlineView NJOutputController - NSButton + NSButton - - connectDevicePrompt - NSView - - - hidSleepingPrompt - NSView + + devicesViewController + NJDeviceViewController mappingsController NJMappingsController - - outlineView - NSOutlineView - outputController NJOutputController - - translatingEventsButton + + simulatingEventsButton NSButton @@ -3359,6 +3485,38 @@ aW5nLg ./Classes/NJDeviceController.h + + NJDeviceViewController + NSObject + + id + NSView + NSOutlineView + NSView + + + + delegate + id + + + hidStoppedNotice + NSView + + + inputsTree + NSOutlineView + + + noDevicesNotice + NSView + + + + IBProjectSource + ./Classes/NJDeviceViewController.h + + NJKeyInputField NSControl @@ -3383,7 +3541,7 @@ aW5nLg NSObject id - NSMenuItem + NSMenuItem NSMenu @@ -3391,8 +3549,8 @@ aW5nLg delegate id - - eventTranslationToggle + + eventSimulationToggle NSMenuItem @@ -3408,54 +3566,80 @@ aW5nLg NJMappingsController NSObject + + mvc + NJMappingsViewController + + + mvc + + mvc + NJMappingsViewController + + + + IBProjectSource + ./Classes/NJMappingsController.h + + + + NJMappingsViewController + NSViewController - id - id - id - id - id - id - id + id + id + id + id + id - - addPressed: + + addClicked: id - - exportPressed: + + mappingTriggerClicked: id - - importPressed: + + moveDownClicked: id - - mappingPressed: + + moveUpClicked: id - - moveDownPressed: - id - - - moveUpPressed: - id - - - removePressed: + + removeClicked: id + id + NSTableView + NSPopover + NSButton NSButton NSButton - NSPopover - NSButton - NSButton - NSTableView + NSButton + + delegate + id + + + mappingList + NSTableView + + + mappingListPopover + NSPopover + + + mappingListTrigger + NSButton + moveDown NSButton @@ -3464,26 +3648,14 @@ aW5nLg moveUp NSButton - - popover - NSPopover - - - popoverActivate - NSButton - - - removeButton + + removeMapping NSButton - - tableView - NSTableView - IBProjectSource - ./Classes/NJMappingsController.h + ./Classes/NJMappingsViewController.h @@ -3541,6 +3713,7 @@ aW5nLg NSSlider NSButton NSTextField + NSBUtton @@ -3591,6 +3764,10 @@ aW5nLg title NSTextField + + unknownMapping + NSBUtton + IBProjectSource