X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=00740ba8f728e5ca2acffa93767e472e18aa25b9;hp=1b4989d5e28b06c4930b58d8e3b27d618b8d7dc3;hb=6044e47a97de33531c47cd209b30d4405aa0530a;hpb=62aa5b73be6ec1e499e6b155cd0e7687c338cbaa diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index 1b4989d..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 @@ -35,9 +35,8 @@ NSToolbar NSToolbarFlexibleSpaceItem NSToolbarItem - NSToolbarSeparatorItem - NSToolbarSpaceItem NSView + NSViewController NSWindowTemplate @@ -176,7 +175,7 @@ - Configurations + Mappings 1048576 2147483647 @@ -184,16 +183,54 @@ submenuAction: - Configurations + Mappings - Enable mapping + Enable + r + 1048576 + 2147483647 + + + + + + YES + YES + 2147483647 + + + List + l + 1048576 + 2147483647 + + + + + + Import… + o + 1048576 + 2147483647 + + + + + + Export… + s + 1048576 + 2147483647 + + + YES @@ -203,6 +240,7 @@ 2147483647 + 1 @@ -264,9 +302,6 @@ _NSMainMenu - - NSFontManager - 15 2 @@ -283,50 +318,112 @@ YES NO YES - 1 - 2 + 2 + 1 - + - 42CA6E7F-AC4A-4681-98B6-B9901269E463 + 4AC66688-76E8-47ED-AC0A-7462220A4019 - Start - 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 - + - EC49C240-1D96-41C2-AD75-D75EEB29EDEA + 94389EFE-310F-4DB5-95F6-D4AEE8839979 - Configurations - Configurations - - - - NSImage - NSMultipleDocuments + 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 @@ -357,79 +454,23 @@ - - NSToolbarSeparatorItem - - Separator - - - - - - {12, 5} - {12, 1000} - YES - YES - -1 - YES - 0 - - YES - YES - - - 1048576 - 2147483647 - - - - - - NSToolbarSpaceItem - - Space - - - - - - {32, 5} - {32, 32} - YES - YES - -1 - YES - 0 - - YES - YES - - - 1048576 - 2147483647 - - - - - - - - + + - - + + {640, 300} - + 256 @@ -453,6 +494,7 @@ 256 {200, 298} + YES NO @@ -491,14 +533,10 @@ - 337641536 - 2048 + 67108928 + 2624 Text Cell - - LucidaGrande - 13 - 1044 - + 6 @@ -516,7 +554,7 @@ - 3 + 1 YES @@ -536,8 +574,8 @@ MC41AA - 17 - -767557632 + 20 + 306184192 4 @@ -546,10 +584,13 @@ YES 0 1 + -1 + NO {{1, 1}, {200, 298}} + @@ -560,6 +601,7 @@ -2147483392 {{1, 1}, {8, 298}} + NO @@ -571,6 +613,7 @@ -2147483392 {{-100, -100}, {473, 15}} + NO 1 @@ -581,12 +624,13 @@ {202, 300} + - 133650 + 150034 - QSAAAEEgAABBmAAAQZgAAA + QSAAAEEgAABBsAAAQbAAAA 0.25 4 1 @@ -594,6 +638,7 @@ {202, 300} + NSView @@ -603,9 +648,10 @@ - 268 + 265 {{227, 123}, {180, 24}} + _NS:9 YES @@ -639,9 +685,10 @@ - 268 + 265 {{227, 55}, {180, 24}} + _NS:9 YES @@ -670,9 +717,10 @@ - 268 + 265 {{227, 89}, {180, 24}} + _NS:9 YES @@ -700,11 +748,56 @@ NO + + + 265 + {{229, 190}, {176, 24}} + + + + _NS:9 + NJKeyInputField + + + + 265 + {{226, 156}, {182, 26}} + + + + YES + + -1539309504 + 2048 + + + 109199360 + 129 + + + 400 + 75 + + YES + + OtherViews + + + -1 + 1 + YES + YES + 2 + + NO + 268 {{20, 16}, {201, 236}} + + NO 7 1 @@ -747,7 +840,7 @@ 603979776 0 - Switch to configuration + Switch to mapping 1211912448 @@ -803,7 +896,7 @@ 603979776 0 - Toggle mouse scope + Switch mouse mode 1211912448 @@ -843,55 +936,24 @@ - - - 268 - {{226, 156}, {182, 26}} - - - YES - - -1539309504 - 2048 - - - 109199360 - 129 - - - 400 - 75 - - YES - - OtherViews - - - -1 - 1 - YES - YES - 2 - - NO - 266 {{0, 269}, {429, 17}} + YES - 68157504 - 138413056 + 67108928 + 138414656 LucidaGrande-Bold 13 16 - No action selected + No input selected @@ -900,9 +962,10 @@ - 12 - {{0, 258}, {465, 5}} + 10 + {{12, 258}, {405, 5}} + {0, 0} @@ -926,37 +989,34 @@ 0 NO - - - 265 - {{229, 190}, {176, 24}} - - _NS:9 - KeyInputTextView - {{211, 0}, {429, 300}} + NSView {640, 300} + YES {640, 300} + + {{0, 0}, {1440, 878}} - {640, 369} + {640, 355} {10000000000000, 10000000000000} + Enjoyable YES - + 256 @@ -970,9 +1030,10 @@ 256 - {320, 418} + {198, 198} - + + YES NO YES @@ -983,9 +1044,9 @@ - 317 - 40 - 1000 + 190 + 190 + 190 75497536 2048 @@ -1006,8 +1067,6 @@ - 3 - YES YES @@ -1016,8 +1075,8 @@ 2 - 17 - 46170112 + 20 + 44072960 1 @@ -1026,10 +1085,12 @@ NO 0 1 + -1 - {{1, 1}, {320, 418}} + {{1, 1}, {198, 198}} + @@ -1040,7 +1101,8 @@ -2147483392 {{306, 1}, {15, 403}} - + + NO _doScroller: @@ -1049,49 +1111,80 @@ -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 - QSAAAEEgAABBmAAAQZgAAA + QSAAAEEgAABBsAAAQbAAAA 0.25 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 @@ -1099,78 +1192,58 @@ - 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} - {150, 0} - {300, 10000} - 2 - 0.0 - 15 - - - - ApplicationController + EnjoyableApplicationDelegate - ConfigsController + NJMappingsController - JoystickController + NJDeviceController - TargetController + NJOutputController - + + - 268 - {82, 32} - _NS:9 - YES - - 67108864 - 134217728 - Button - - _NS:9 - - -2038284288 - 129 - - - 200 - 25 - - NO + 0 + 1 + 0.0 + 0.0 + YES @@ -1255,30 +1328,6 @@ 370 - - - parentWindow - - - - 454 - - - - contentView - - - - 455 - - - - toggle: - - - - 498 - delegate @@ -1305,139 +1354,155 @@ - targetController + mappingsController - + - 695 + 822 - configsController + outputController - + - 717 + 826 - - jsController - - + + translatingEventsChanged: + + - 484 + 858 - drawer - - + translatingEventsSetting + + - 486 + 859 - mainWindow + dockMenuBase - + - 500 + 726 - activeMenuItem + inputController - + - 607 + 819 - activeButton + mappingsController - + - 609 + 820 - - toggleActivity: + + outputController - + - 610 + 825 - - toggleActivity: + + window - + - 611 + 865 - - targetController - - + + removePressed: + + - 712 + 516 - configsController - - + removeButton + + - 716 + 519 - dockMenuBase - - + tableView + + - 726 + 520 - addPressed: + exportPressed: - + - 515 + 815 - removePressed: + importPressed: - + - 516 + 816 - removeButton + outputController - + - 519 + 827 + + + + mappingPressed: + + + + 855 - tableView + popover - + - 520 + 856 - targetController + popoverActivate - + + + 857 + + + + addPressed: + + - 697 + 515 @@ -1463,22 +1528,6 @@ 692 - - - configsController - - - - 693 - - - - joystickController - - - - 694 - title @@ -1487,22 +1536,6 @@ 709 - - - configPopup - - - - 713 - - - - configChosen: - - - - 714 - radioChanged: @@ -1569,19 +1602,59 @@ - targetController + mappingsController + + + + 821 + + + + mappingPopup + + + + 823 + + + + inputController + + + + 828 + + + + keyDelegate - 779 + 818 - window - - + view + + - 780 + 854 + + + + contentViewController + + + + 852 + + + + delegate + + + + 853 @@ -1619,7 +1692,7 @@ - MainMenu + Main Menu 19 @@ -1651,6 +1724,10 @@ + + + + @@ -1755,11 +1832,6 @@ - - 420 - - - 450 @@ -1773,17 +1845,13 @@ 451 - - + + + - Drawer Content View - - - 452 - - + Mapping List Popover Content 453 @@ -1820,6 +1888,7 @@ + Mapping List 461 @@ -1838,53 +1907,17 @@ 482 - ApplicationController 487 - - + + - - - - 490 - - - - - 492 - - - - - 493 - - - - - 495 - - - - - 507 - - - - - - - - 508 - - - 511 @@ -1892,6 +1925,7 @@ + Remove Mapping 512 @@ -1902,24 +1936,17 @@ 514 - ConfigsController 479 - JoystickController 606 - - 608 - - - 652 @@ -1936,6 +1963,7 @@ + Input Devices Pane 634 @@ -1954,6 +1982,7 @@ + Input Device List 636 @@ -1972,6 +2001,7 @@ + Device/Input Name 642 @@ -1987,11 +2017,12 @@ - + + Output Editor Pane 686 @@ -2012,21 +2043,25 @@ + Output Types 657 + Disabled 658 + Key Press 699 + Switch Mapping 700 @@ -2035,6 +2070,7 @@ + Mapping Choice List 701 @@ -2057,6 +2093,7 @@ + Input Name 707 @@ -2077,16 +2114,19 @@ 733 + Mouse Movement 734 + Mouse Button 735 + Mouse Scroll 659 @@ -2100,6 +2140,7 @@ + Mouse Button Selector 745 @@ -2110,6 +2151,7 @@ 748 + Switch Mouse Mode 749 @@ -2118,6 +2160,7 @@ + Mouse Scroll Selector 750 @@ -2131,6 +2174,7 @@ + Mouse Motion Selector 755 @@ -2138,22 +2182,118 @@ - 765 - + 778 + + + + + 812 + + + + + 813 + + + + + 814 + + + + + 837 + - + + + Mapping Selector + + + 835 + + + + + + + + 836 + + + + + 842 + + + + + + Translation Switch + + + 840 + + + + + + + + 841 + + + + + 849 + + + + + 850 + + Popover View Controller - 766 - - + 851 + + + Mapping List Popover - 778 - - + 507 + + + + + + Add Mapping + + + 508 + + + + + 862 + + + + + + Gradient Space + + + 863 + + + + + 810 + + @@ -2175,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 @@ -2193,10 +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 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2207,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 @@ -2243,89 +2376,143 @@ 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 + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - 781 + 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 + + mappingsController + NJMappingsController - - dockMenuBase - NSMenu - - - drawer - NSDrawer - - - 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 @@ -2333,17 +2520,43 @@ addPressed: id + + exportPressed: + id + + + importPressed: + id + + + mappingPressed: + id + removePressed: id + NJOutputController + NSPopover + NSButton NSButton NSTableView - TargetController + + outputController + NJOutputController + + + popover + NSPopover + + + popoverActivate + NSButton + removeButton NSButton @@ -2352,80 +2565,22 @@ tableView NSTableView - - targetController - TargetController - IBProjectSource - ./Classes/ConfigsController.h + ./Classes/NJMappingsController.h - JoystickController - NSObject - - ConfigsController - NSOutlineView - TargetController - - - - configsController - ConfigsController - - - outlineView - NSOutlineView - - - targetController - TargetController - - - - IBProjectSource - ./Classes/JoystickController.h - - - - KeyInputTextView - NSTextField - - TargetController - NSWindow - - - - targetController - TargetController - - - window - NSWindow - - - - IBProjectSource - ./Classes/KeyInputTextView.h - - - - TargetController + NJOutputController NSObject - id id id id id - - configChosen: - id - mbtnChanged: id @@ -2444,10 +2599,10 @@ - NSPopUpButton - ConfigsController - JoystickController - KeyInputTextView + NJDeviceController + NJKeyInputField + NSPopUpButton + NJMappingsController NSSegmentedControl NSSegmentedControl NSMatrix @@ -2455,21 +2610,21 @@ NSTextField - - configPopup - NSPopUpButton - - - configsController - ConfigsController - - - joystickController - JoystickController + + inputController + NJDeviceController keyInput - KeyInputTextView + NJKeyInputField + + + mappingPopup + NSPopUpButton + + + mappingsController + NJMappingsController mouseBtnSelect @@ -2494,7 +2649,7 @@ IBProjectSource - ./Classes/TargetController.h + ./Classes/NJOutputController.h @@ -2504,13 +2659,14 @@ YES 3 + {15, 15} {8, 8} - {9, 9} + {11, 10} {11, 11} {10, 3} - {32, 32} {16, 15} {8, 8} + {9, 9}