X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=00740ba8f728e5ca2acffa93767e472e18aa25b9;hp=8dd62bf725656ce6412702823bab9422b711dab0;hb=6044e47a97de33531c47cd209b30d4405aa0530a;hpb=dcedf147ddcb6c21768cea94a2f06b93007d2a82 diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index 8dd62bf..00740ba 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -16,13 +16,13 @@ NSButtonCell NSCustomObject NSCustomView - NSDrawer NSMatrix NSMenu NSMenuItem NSOutlineView NSPopUpButton NSPopUpButtonCell + NSPopover NSScrollView NSScroller NSSegmentedCell @@ -36,6 +36,7 @@ NSToolbarFlexibleSpaceItem NSToolbarItem NSView + NSViewController NSWindowTemplate @@ -239,6 +240,7 @@ 2147483647 + 1 @@ -300,9 +302,6 @@ _NSMainMenu - - NSFontManager - 15 2 @@ -319,50 +318,112 @@ YES NO YES - 1 - 2 + 2 + 1 - + - 42CA6E7F-AC4A-4681-98B6-B9901269E463 + 4AC66688-76E8-47ED-AC0A-7462220A4019 - - Start/Stop - - - - NSImage - NSGoRightTemplate + Mapping Selector + Mapping Selector + + + + 268 + {{0, 14}, {140, 25}} + + _NS:9 + YES + + 67108864 + 134217728 + (default) + + LucidaGrande + 13 + 1044 + + _NS:9 + + 918306816 + 163 + + NSImage + NSListViewTemplate + + + + 400 + 75 + + NO + - {0, 0} - {0, 0} + {13, 25} + {141, 25} YES - YES - -1 + NO + 0 YES 0 - + - A03535DA-B573-44B2-86A0-5E261E68FC16 + 94389EFE-310F-4DB5-95F6-D4AEE8839979 - - Configurations - - - - NSImage - NSListViewTemplate + Translation Switch + Translation Switch + + + + 268 + {{19, 14}, {67, 25}} + + _NS:9 + YES + + 67108864 + 0 + + _NS:9 + + + + 32 + + NSImage + NSActionTemplate + + Show and remap inputs + YES + 0 + + + 32 + + NSImage + NSRightFacingTriangleTemplate + + Run mapped actions + 1 + 0 + + + 4 + + NO + - {0, 0} - {0, 0} + {67, 25} + {67, 25} YES YES - -1 + 0 YES 0 @@ -395,21 +456,21 @@ - - + + - + - + {640, 300} - + 256 @@ -433,6 +494,7 @@ 256 {200, 298} + YES NO @@ -474,11 +536,7 @@ 67108928 2624 Text Cell - - LucidaGrande - 13 - 1044 - + 6 @@ -532,6 +590,7 @@ {{1, 1}, {200, 298}} + @@ -542,6 +601,7 @@ -2147483392 {{1, 1}, {8, 298}} + NO @@ -553,6 +613,7 @@ -2147483392 {{-100, -100}, {473, 15}} + NO 1 @@ -563,6 +624,7 @@ {202, 300} + 150034 @@ -576,6 +638,7 @@ {202, 300} + NSView @@ -588,6 +651,7 @@ 265 {{227, 123}, {180, 24}} + _NS:9 YES @@ -624,6 +688,7 @@ 265 {{227, 55}, {180, 24}} + _NS:9 YES @@ -655,6 +720,7 @@ 265 {{227, 89}, {180, 24}} + _NS:9 YES @@ -687,6 +753,7 @@ 265 {{229, 190}, {176, 24}} + _NS:9 NJKeyInputField @@ -696,6 +763,7 @@ 265 {{226, 156}, {182, 26}} + YES @@ -728,6 +796,7 @@ 268 {{20, 16}, {201, 236}} + NO 7 @@ -872,6 +941,7 @@ 266 {{0, 269}, {429, 17}} + YES @@ -883,7 +953,7 @@ 13 16 - No action selected + No input selected @@ -895,6 +965,7 @@ 10 {{12, 258}, {405, 5}} + {0, 0} @@ -921,27 +992,31 @@ {{211, 0}, {429, 300}} + NSView {640, 300} + YES {640, 300} + + {{0, 0}, {1440, 878}} - {640, 369} + {640, 355} {10000000000000, 10000000000000} Enjoyable YES - + 256 @@ -955,9 +1030,10 @@ 256 - {320, 418} + {198, 198} - + + YES NO YES @@ -968,9 +1044,9 @@ - 317 - 40 - 1000 + 190 + 190 + 190 75497536 2048 @@ -991,8 +1067,6 @@ - 3 - YES YES @@ -1002,7 +1076,7 @@ 20 - 46170112 + 44072960 1 @@ -1011,11 +1085,12 @@ NO 0 1 - 1 + -1 - {{1, 1}, {320, 418}} + {{1, 1}, {198, 198}} + @@ -1026,7 +1101,8 @@ -2147483392 {{306, 1}, {15, 403}} - + + NO _doScroller: @@ -1035,20 +1111,22 @@ -2147483392 - {{1, 404}, {305, 15}} + {{-100, -100}, {366, 16}} - + + NO 1 _doScroller: - 0.99688480000000002 + 0.98123324396782841 - {{0, 34}, {322, 420}} + {{0, 20}, {200, 200}} + - 133682 + 150034 @@ -1057,27 +1135,56 @@ 4 1 + + + 268 + {{66, -1}, {134, 23}} + + + _NS:22 + YES + + -2080374784 + 168034304 + + + LucidaGrande + 9 + 3614 + + _NS:22 + + 1221349376 + 162 + + + 400 + 75 + + NO + - 260 - {{10, 4}, {39, 28}} + 292 + {{0, -1}, {34, 23}} + YES 67108864 - 134217728 + 134479872 - + -2033958912 - 162 + 268435618 NSImage NSAddTemplate - + n 400 75 @@ -1085,57 +1192,59 @@ - 260 - {{57, 4}, {39, 28}} + 292 + {{33, -1}, {34, 23}} + + YES - 603979776 - 134217728 + 67108864 + 134479872 - + -2033958912 - 162 + 268435618 NSImage NSRemoveTemplate - + CA 400 75 NO - {322, 454} + {200, 220} + + NSView - - - {200, 100} - {100, 0} - {400, 10000} - 2 - 0.0 - 15 - - - - ApplicationController + EnjoyableApplicationDelegate NJMappingsController - NJInputController + NJDeviceController NJOutputController + + + + 0 + 1 + 0.0 + 0.0 + YES + @@ -1219,38 +1328,6 @@ 370 - - - parentWindow - - - - 454 - - - - contentView - - - - 455 - - - - toggle: - - - - 498 - - - - toggle: - - - - 811 - delegate @@ -1291,53 +1368,21 @@ 826 - - - drawer - - - - 486 - - - - mainWindow - - - - 500 - - - - activeMenuItem - - - - 607 - - - - activeButton - - - - 609 - - toggleActivity: - - + translatingEventsChanged: + + - 610 + 858 - - toggleActivity: - - + + translatingEventsSetting + + - 611 + 859 @@ -1372,12 +1417,12 @@ 825 - - addPressed: - - + + window + + - 515 + 865 @@ -1427,6 +1472,38 @@ 827 + + + mappingPressed: + + + + 855 + + + + popover + + + + 856 + + + + popoverActivate + + + + 857 + + + + addPressed: + + + + 515 + dataSource @@ -1539,14 +1616,6 @@ 823 - - - mappingChosen: - - - - 824 - inputController @@ -1563,6 +1632,30 @@ 818 + + + view + + + + 854 + + + + contentViewController + + + + 852 + + + + delegate + + + + 853 + @@ -1599,7 +1692,7 @@ - MainMenu + Main Menu 19 @@ -1739,11 +1832,6 @@ - - 420 - - - 450 @@ -1757,17 +1845,13 @@ 451 - - + + + - Drawer Content View - - - 452 - - + Mapping List Popover Content 453 @@ -1804,6 +1888,7 @@ + Mapping List 461 @@ -1822,36 +1907,17 @@ 482 - ApplicationController 487 - - + + - - 495 - - - - - 507 - - - - - - - - 508 - - - 511 @@ -1859,6 +1925,7 @@ + Remove Mapping 512 @@ -1869,24 +1936,17 @@ 514 - ConfigsController 479 - JoystickController 606 - - 608 - - - 652 @@ -1903,6 +1963,7 @@ + Input Devices Pane 634 @@ -1921,6 +1982,7 @@ + Input Device List 636 @@ -1939,6 +2001,7 @@ + Device/Input Name 642 @@ -1959,6 +2022,7 @@ + Output Editor Pane 686 @@ -1979,21 +2043,25 @@ + Output Types 657 + Disabled 658 + Key Press 699 + Switch Mapping 700 @@ -2002,6 +2070,7 @@ + Mapping Choice List 701 @@ -2024,6 +2093,7 @@ + Input Name 707 @@ -2044,16 +2114,19 @@ 733 + Mouse Movement 734 + Mouse Button 735 + Mouse Scroll 659 @@ -2067,6 +2140,7 @@ + Mouse Button Selector 745 @@ -2077,6 +2151,7 @@ 748 + Switch Mouse Mode 749 @@ -2085,6 +2160,7 @@ + Mouse Scroll Selector 750 @@ -2098,6 +2174,7 @@ + Mouse Motion Selector 755 @@ -2109,16 +2186,6 @@ - - 790 - - - - - 810 - - - 812 @@ -2134,6 +2201,100 @@ + + 837 + + + + + + Mapping Selector + + + 835 + + + + + + + + 836 + + + + + 842 + + + + + + Translation Switch + + + 840 + + + + + + + + 841 + + + + + 849 + + + + + 850 + + + Popover View Controller + + + 851 + + + Mapping List Popover + + + 507 + + + + + + Add Mapping + + + 508 + + + + + 862 + + + + + + Gradient Space + + + 863 + + + + + 810 + + + @@ -2154,14 +2315,12 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{114, 276}, {770, 487}} com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2172,7 +2331,6 @@ 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 @@ -2183,7 +2341,6 @@ 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 @@ -2220,93 +2377,142 @@ 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 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 + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - 828 + 865 - ApplicationController + EnjoyableApplicationDelegate + NSObject + + NSMenu + NJDeviceController + NJMappingsController + NJOutputController + NSWindow + + + + dockMenuBase + NSMenu + + + inputController + NJDeviceController + + + mappingsController + NJMappingsController + + + outputController + NJOutputController + + + window + NSWindow + + + + IBProjectSource + ./Classes/EnjoyableApplicationDelegate.h + + + + NJDeviceController NSObject - toggleActivity: + translatingEventsChanged: id - toggleActivity: + translatingEventsChanged: - toggleActivity: + translatingEventsChanged: id - NSToolbarItem - NSMenuItem - ConfigsController - NSMenu - NSDrawer - JoystickController - NSWindow - TargetController + NJMappingsController + NSOutlineView + NJOutputController + NSSegmentedControl - - activeButton - NSToolbarItem - - - activeMenuItem - NSMenuItem - - - configsController - ConfigsController - - - dockMenuBase - NSMenu - - - drawer - NSDrawer + + mappingsController + NJMappingsController - - jsController - JoystickController + + outlineView + NSOutlineView - - mainWindow - NSWindow + + outputController + NJOutputController - - targetController - TargetController + + translatingEventsSetting + NSSegmentedControl IBProjectSource - ./Classes/ApplicationController.h + ./Classes/NJDeviceController.h - ConfigsController + NJKeyInputField + NSTextField + + keyDelegate + id + + + keyDelegate + + keyDelegate + id + + + + IBProjectSource + ./Classes/NJKeyInputField.h + + + + NJMappingsController NSObject id id id + id id @@ -2322,17 +2528,35 @@ importPressed: id + + mappingPressed: + id + removePressed: id + NJOutputController + NSPopover + NSButton NSButton NSTableView - TargetController + + outputController + NJOutputController + + + popover + NSPopover + + + popoverActivate + NSButton + removeButton NSButton @@ -2341,77 +2565,22 @@ tableView NSTableView - - targetController - TargetController - - - - IBProjectSource - ./Classes/ConfigsController.h - - - - JoystickController - NSObject - - ConfigsController - NSOutlineView - TargetController - - - - configsController - ConfigsController - - - outlineView - NSOutlineView - - - targetController - TargetController - IBProjectSource - ./Classes/JoystickController.h + ./Classes/NJMappingsController.h - NJKeyInputField - NSTextField - - keyDelegate - id - - - keyDelegate - - keyDelegate - id - - - - IBProjectSource - ./Classes/NJKeyInputField.h - - - - TargetController + NJOutputController NSObject - id id id id id - - configChosen: - id - mbtnChanged: id @@ -2430,10 +2599,10 @@ - NSPopUpButton - ConfigsController - JoystickController + NJDeviceController NJKeyInputField + NSPopUpButton + NJMappingsController NSSegmentedControl NSSegmentedControl NSMatrix @@ -2441,22 +2610,22 @@ NSTextField - - configPopup - NSPopUpButton - - - configsController - ConfigsController - - - joystickController - JoystickController + + inputController + NJDeviceController keyInput NJKeyInputField + + mappingPopup + NSPopUpButton + + + mappingsController + NJMappingsController + mouseBtnSelect NSSegmentedControl @@ -2480,7 +2649,7 @@ IBProjectSource - ./Classes/TargetController.h + ./Classes/NJOutputController.h @@ -2490,13 +2659,14 @@ YES 3 + {15, 15} {8, 8} - {9, 9} {11, 10} {11, 11} {10, 3} {16, 15} {8, 8} + {9, 9}