X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Resources%2FEnglish.lproj%2FMainMenu.xib;h=b2cc462bd025c796567c86c567cfb7a8491e7736;hp=be18595c536aa61d3b3d239d52371fdc9fa6006e;hb=4a8e67a7294e8e527e2be9d8f5f39aae60691697;hpb=91ea24909c2c38d9f3d319e6440b362222fdfd87 diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib index be18595..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 @@ -489,7 +488,7 @@ {664, 323} - + 256 @@ -501,6 +500,7 @@ -2147483374 {{20, 20}, {194, 283}} + _NS:22 YES @@ -530,6 +530,7 @@ Lg 274 {{20, 20}, {194, 283}} + _NS:22 YES @@ -564,6 +565,7 @@ aW5nLg {232, 321} + YES NO @@ -659,6 +661,7 @@ aW5nLg {{1, 1}, {232, 321}} + @@ -669,6 +672,7 @@ aW5nLg -2147483392 {{1, 1}, {8, 298}} + NO @@ -680,6 +684,7 @@ aW5nLg -2147483392 {{-100, -100}, {473, 15}} + NO 1 @@ -690,6 +695,7 @@ aW5nLg {234, 323} + 150034 @@ -703,6 +709,7 @@ aW5nLg {234, 323} + _NS:9 NSView @@ -711,11 +718,37 @@ aW5nLg 285 + + + 268 + {{197, 157}, {193, 21}} + + + + _NS:9 + YES + + 603979776 + 33554432 + Unknown Mapping + + _NS:9 + + -2046672896 + 129 + + + 200 + 25 + + NO + 265 {{189, 117}, {224, 20}} + _NS:9 YES @@ -757,6 +790,7 @@ aW5nLg 268 {{343, 31}, {70, 18}} + _NS:9 YES @@ -787,6 +821,7 @@ aW5nLg 265 {{189, 33}, {150, 20}} + _NS:9 YES @@ -831,6 +866,7 @@ aW5nLg 265 {{191, 24}, {146, 16}} + _NS:9 YES @@ -856,6 +892,7 @@ aW5nLg 265 {{189, 70}, {224, 24}} + _NS:9 YES @@ -909,6 +946,7 @@ aW5nLg 265 {{191, 108}, {220, 16}} + _NS:9 YES @@ -934,6 +972,7 @@ aW5nLg 265 {{191, 196}, {220, 23}} + _NS:9 NJKeyInputField @@ -943,7 +982,8 @@ aW5nLg 265 {{188, 153}, {226, 26}} - + + YES -2076180416 @@ -975,6 +1015,7 @@ aW5nLg 268 {{24, 20}, {163, 250}} + NO 6 @@ -1105,6 +1146,7 @@ aW5nLg 266 {{9, 286}, {412, 17}} + YES @@ -1128,6 +1170,7 @@ aW5nLg 10 {{12, 276}, {406, 5}} + {0, 0} @@ -1154,12 +1197,15 @@ aW5nLg {{233, 0}, {431, 323}} + _NS:9 NSView {664, 323} + + {{0, 0}, {1440, 878}} @@ -1169,7 +1215,7 @@ aW5nLg YES - + 256 @@ -1185,6 +1231,7 @@ aW5nLg 256 {198, 198} + YES NO @@ -1242,6 +1289,7 @@ aW5nLg {{1, 1}, {198, 198}} + @@ -1252,6 +1300,7 @@ aW5nLg -2147483392 {{306, 1}, {15, 403}} + NO @@ -1263,6 +1312,7 @@ aW5nLg -2147483392 {{-100, -100}, {366, 16}} + NO 1 @@ -1273,6 +1323,7 @@ aW5nLg {{0, 20}, {200, 200}} + 150034 @@ -1288,6 +1339,7 @@ aW5nLg 268 {{66, -1}, {68, 23}} + _NS:22 YES @@ -1316,6 +1368,7 @@ aW5nLg 292 {{0, -1}, {34, 23}} + YES @@ -1342,6 +1395,7 @@ aW5nLg 292 {{166, -1}, {34, 23}} + YES 67108864 @@ -1363,6 +1417,7 @@ aW5nLg 292 {{133, -1}, {34, 23}} + YES @@ -1385,6 +1440,7 @@ aW5nLg 292 {{33, -1}, {34, 23}} + YES @@ -1408,6 +1464,8 @@ aW5nLg {200, 220} + + NSView @@ -1423,7 +1481,6 @@ aW5nLg NJOutputController - 0 @@ -1516,6 +1573,12 @@ aW5nLg SUUpdater + + NJDeviceViewController + + + NJMappingsViewController + @@ -1617,19 +1680,19 @@ aW5nLg - delegate + dataSource - + - 517 + 1001 - dataSource + delegate - + - 518 + 1002 @@ -1647,14 +1710,6 @@ aW5nLg 826 - - - outlineView - - - - 648 - connectDevicePrompt @@ -1687,6 +1742,14 @@ aW5nLg 982 + + + devicesViewController + + + + 992 + mappingsController @@ -1719,14 +1782,6 @@ aW5nLg 930 - - - mappingsMenu - - - - 931 - restoreToForeground: @@ -1737,131 +1792,59 @@ aW5nLg - removePressed: - - - - 516 - - - - removeButton - - - - 519 - - - - tableView - - - - 520 - - - - exportPressed: - + exportMappingClicked: + - 815 + 1015 - importPressed: - + importMappingClicked: + - 816 - - - - mappingPressed: - - - - 855 + 1016 - popover - - - - 856 - - - - popoverActivate - - - - 857 - - - - addPressed: - - - - 515 - - - - moveUpPressed: - - + mvc + + - 899 + 1024 - moveDownPressed: - - + performClick: + + - 900 + 1012 - moveUp + mvc - + - 901 - - - - moveDown - - - - 902 - - - - addPressed: - - - - 971 + 995 dataSource - + - 647 + 990 delegate - + - 696 + 991 @@ -2015,6 +1998,14 @@ aW5nLg 949 + + + unknownMapping + + + + 1022 + delegate @@ -2031,29 +2022,21 @@ aW5nLg 871 - - - view - - - - 854 - contentViewController - + - 852 + 996 delegate - + - 853 + 1004 @@ -2159,6 +2142,142 @@ aW5nLg 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 + @@ -2497,12 +2616,6 @@ aW5nLg - - 850 - - - Popover View Controller - 851 @@ -2650,6 +2763,7 @@ aW5nLg + @@ -2989,12 +3103,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 @@ -3100,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 @@ -3240,32 +3378,43 @@ aW5nLg com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - 982 + 1024 EnjoyableApplicationDelegate NSObject - - restoreToForeground: - id - - - restoreToForeground: - + + id + id + id + + + + exportMappingClicked: + id + + + importMappingClicked: + id + + restoreToForeground: id - + NSMenu NJMappingsController + NJMappingsViewController NSMenu NSWindow @@ -3278,6 +3427,10 @@ aW5nLg mappingsController NJMappingsController + + mvc + NJMappingsViewController + statusItemMenu NSMenu @@ -3296,47 +3449,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 @@ -3345,6 +3488,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 @@ -3369,7 +3544,7 @@ aW5nLg NSObject id - NSMenuItem + NSMenuItem NSMenu @@ -3377,8 +3552,8 @@ aW5nLg delegate id - - eventTranslationToggle + + eventSimulationToggle NSMenuItem @@ -3394,54 +3569,69 @@ aW5nLg NJMappingsController NSObject + + IBProjectSource + ./Classes/NJMappingsController.h + + + + NJMappingsViewController + NSViewController - id - id - id - id - id - id - id + id + id + id + id + id - - addPressed: - id - - - exportPressed: + + addClicked: id - - importPressed: + + mappingTriggerClicked: id - - mappingPressed: + + moveDownClicked: id - - moveDownPressed: + + moveUpClicked: 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 @@ -3450,26 +3640,14 @@ aW5nLg moveUp NSButton - - popover - NSPopover - - - popoverActivate + + removeMapping NSButton - - removeButton - NSButton - - - tableView - NSTableView - IBProjectSource - ./Classes/NJMappingsController.h + ./Classes/NJMappingsViewController.h @@ -3527,6 +3705,7 @@ aW5nLg NSSlider NSButton NSTextField + NSButton @@ -3577,6 +3756,10 @@ aW5nLg title NSTextField + + unknownMapping + NSButton + IBProjectSource