X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=cd9a1b9281fd43bab4a315520c297133a3616d2b;hp=6e753347eb5247e21e2dcf358f9b23cebae8d349;hb=56d825ba259066d847a9fc3f9c8c0c0a362a1507;hpb=93aebea558bc99a77ab8a9d43bf521d0164e15c8 diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index 6e75334..cd9a1b9 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -16,17 +16,19 @@ NSButtonCell NSCustomObject NSCustomView - NSDrawer NSMatrix NSMenu NSMenuItem NSOutlineView NSPopUpButton NSPopUpButtonCell + NSPopover NSScrollView NSScroller NSSegmentedCell NSSegmentedControl + NSSlider + NSSliderCell NSSplitView NSTableColumn NSTableView @@ -36,6 +38,7 @@ NSToolbarFlexibleSpaceItem NSToolbarItem NSView + NSViewController NSWindowTemplate @@ -61,7 +64,7 @@ Enjoyable - + CA 1048576 2147483647 @@ -214,7 +217,7 @@ - Import... + Import… o 1048576 2147483647 @@ -223,7 +226,7 @@ - Export... + Export… s 1048576 2147483647 @@ -239,6 +242,7 @@ 2147483647 + 1 @@ -297,16 +301,37 @@ _NSWindowsMenu + + + Help + + 2147483647 + + + submenuAction: + + Help + + + + Enjoyable Help + ? + 1048576 + 2147483647 + + + + + _NSHelpMenu + + _NSMainMenu - - NSFontManager - 15 2 - {{355, 59}, {640, 300}} + {{355, 59}, {640, 320}} 1685585920 Enjoyable NSWindow @@ -319,50 +344,98 @@ YES NO YES - 1 - 2 + 2 + 1 - + - 42CA6E7F-AC4A-4681-98B6-B9901269E463 + 2CB21E35-9CF1-4C67-9670-31139C914D10 - - Start/Stop - - - - NSImage - NSGoRightTemplate + Enabled + Enabled + + + + 268 + {{7, 14}, {36, 25}} + _NS:9 + YES + + 67108864 + 134217728 + + + LucidaGrande + 13 + 1044 + + _NS:9 + + -1228128256 + 163 + + NSImage + NSRightFacingTriangleTemplate + + + + 200 + 25 + + NO + - {0, 0} - {0, 0} + {36, 25} + {36, 25} YES YES - -1 + 0 YES 0 - + - A03535DA-B573-44B2-86A0-5E261E68FC16 + 4AC66688-76E8-47ED-AC0A-7462220A4019 - - Configurations - - - - NSImage - NSListViewTemplate + Mapping Selector + Mapping Selector + + + + 268 + {{0, 14}, {140, 25}} + _NS:9 + YES + + 67108864 + 134217728 + (default) + + _NS:9 + + 918306816 + 163 + + NSImage + NSListViewTemplate + + + + 400 + 75 + + NO + - {0, 0} - {0, 0} + {13, 25} + {141, 25} YES - YES - -1 + NO + 0 YES 0 @@ -395,19 +468,19 @@ - - + + - + - + - {640, 300} + {640, 320} 256 @@ -431,7 +504,7 @@ 256 - {200, 298} + {200, 318} @@ -475,11 +548,7 @@ 67108928 2624 Text Cell - - LucidaGrande - 13 - 1044 - + 6 @@ -531,7 +600,7 @@ NO - {{1, 1}, {200, 298}} + {{1, 1}, {200, 318}} @@ -565,7 +634,7 @@ 0.99789030000000001 - {202, 300} + {202, 320} @@ -579,7 +648,7 @@ 1 - {202, 300} + {202, 320} @@ -589,38 +658,96 @@ 256 - + + + 265 + {{228, 21}, {130, 12}} + + + + _NS:9 + YES + + -2080374784 + 262144 + + _NS:9 + + 30 + 0.0 + 15 + 0.0 + 0 + 1 + NO + NO + + NO + + 265 - {{227, 123}, {180, 24}} + {{228, 107}, {176, 12}} _NS:9 YES + + -2080374784 + 262144 + + _NS:9 + + 20 + 0.0 + 4 + 0.0 + 0 + 1 + NO + NO + + NO + + + + 265 + {{226, 117}, {180, 20}} + + + + _NS:9 + YES 67108864 - 0 - - LucidaGrande - 13 - 16 - + 131072 + _NS:9 - 87 - Horizontal + 44 + ← YES 0 - 86 - Vertical + 44 + → 1 0 + + 42 + ↑ + 0 + + + 41 + ↓ + 0 + 1 @@ -629,31 +756,43 @@ 265 - {{227, 55}, {180, 24}} + {{226, 31}, {180, 20}} - + _NS:9 YES 67108864 - 0 - + 131072 + _NS:9 - 87 - Up + 64 + ↑ + Scroll up continuously YES 0 - 86 - Down + 63 + ↓ + Scroll down continuously 1 0 + + ⤒ + Scroll up one step + 0 + + + ⤓ + Scroll down one step + 0 + 1 @@ -662,7 +801,7 @@ 265 - {{227, 89}, {180, 24}} + {{226, 67}, {180, 24}} @@ -671,7 +810,11 @@ 67108864 0 - + + LucidaGrande + 13 + 16 + _NS:9 @@ -695,17 +838,17 @@ 265 - {{229, 190}, {176, 24}} + {{228, 197}, {176, 24}} _NS:9 - KeyInputTextView + NJKeyInputField 265 - {{226, 156}, {182, 26}} + {{225, 152}, {182, 26}} @@ -738,12 +881,12 @@ 268 - {{20, 16}, {201, 236}} + {{20, 16}, {200, 256}} NO - 7 + 6 1 @@ -770,7 +913,7 @@ 603979776 0 - Press a key: + Press a key 1211912448 @@ -798,7 +941,7 @@ 603979776 0 - Mouse movement + Move the mouse 1211912448 @@ -812,7 +955,7 @@ 603979776 0 - Mouse button + Press a mouse button 1211912448 @@ -826,21 +969,7 @@ 603979776 0 - Mouse scroll - - - 1211912448 - 0 - - - - 400 - 75 - - - 603979776 - 0 - Switch mouse mode + Scroll the mouse 1211912448 @@ -852,7 +981,7 @@ 75 - {201, 32} + {200, 41} {4, 2} 1353195520 NSActionCell @@ -883,7 +1012,7 @@ 266 - {{0, 269}, {429, 17}} + {{0, 289}, {429, 17}} @@ -897,7 +1026,7 @@ 13 16 - No action selected + No input selected @@ -907,7 +1036,7 @@ 10 - {{12, 258}, {405, 5}} + {{12, 278}, {405, 5}} @@ -934,27 +1063,39 @@ NO - {{211, 0}, {429, 300}} + {{211, 0}, {429, 320}} NSView - {640, 300} + {640, 320} YES + Main Split + + YES + + + + + + + + + - {640, 300} + {640, 320} {{0, 0}, {1440, 878}} - {640, 369} + {640, 375} {10000000000000, 10000000000000} Enjoyable YES @@ -974,7 +1115,7 @@ 256 - {320, 418} + {198, 198} @@ -988,9 +1129,9 @@ - 317 - 40 - 1000 + 190 + 190 + 190 75497536 2048 @@ -1011,8 +1152,6 @@ - 3 - YES YES @@ -1021,8 +1160,8 @@ 2 - 17 - 46170112 + 20 + 44072960 1 @@ -1031,10 +1170,10 @@ NO 0 1 - 1 + -1 - {{1, 1}, {320, 418}} + {{1, 1}, {198, 198}} @@ -1048,7 +1187,7 @@ {{306, 1}, {15, 403}} - + NO _doScroller: @@ -1057,22 +1196,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 @@ -1081,89 +1220,162 @@ 4 1 + + + 268 + {{66, -1}, {68, 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 NO - + - 260 - {{57, 4}, {39, 28}} + 292 + {{166, -1}, {34, 23}} YES + + 67108864 + 134479872 + ⬇ + + + -2033434624 + 268435618 + +  + 400 + 75 + + NO + + + + 292 + {{133, -1}, {34, 23}} + + + + YES + + 67108864 + 134479872 + ⬆ + + + -2033434624 + 268435618 + +  + 400 + 75 + + NO + + + + 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 - ConfigsController + NJMappingsController - JoystickController + NJDeviceController - TargetController + NJOutputController + + + + + 0 + 1 + 0.0 + 0.0 + YES @@ -1192,6 +1404,14 @@ 732 + + + showHelp: + + + + 870 + orderFrontStandardAboutPanel: @@ -1248,38 +1468,6 @@ 370 - - - parentWindow - - - - 454 - - - - contentView - - - - 455 - - - - toggle: - - - - 498 - - - - toggle: - - - - 811 - delegate @@ -1306,107 +1494,75 @@ - targetController - - - - 695 - - - - configsController + mappingsController - 717 + 822 - jsController - - + outputController + + - 484 + 826 - drawer - - + translatingEventsMenu + + - 486 + 877 - - mainWindow - - + + translatingEventsChanged: + + - 500 + 878 - activeMenuItem - - + translatingEventsButton + + - 607 + 879 - activeButton - - - - 609 - - - - toggleActivity: - - - - 610 - - - - toggleActivity: + dockMenuBase - + - 611 + 726 - targetController + inputController - + - 712 + 819 - configsController + mappingsController - 716 + 820 - dockMenuBase + window - - - 726 - - - - addPressed: - - + - 515 + 865 @@ -1432,14 +1588,6 @@ 520 - - - targetController - - - - 697 - exportPressed: @@ -1458,67 +1606,115 @@ - dataSource - - + outputController + + - 647 + 827 - - delegate - - + + mappingPressed: + + - 696 + 855 - radioButtons - - + popover + + - 692 + 856 - configsController - - + popoverActivate + + - 693 + 857 - - joystickController - + + addPressed: + + + + 515 + + + + moveUpPressed: + + + + 899 + + + + moveDownPressed: + + + + 900 + + + + moveUp + + + + 901 + + + + moveDown + + + + 902 + + + + dataSource + - 694 + 647 - title - - + delegate + + - 709 + 696 + + + + delegate + + + + 892 - configPopup + radioButtons - + - 713 + 692 - - configChosen: + + title - + - 714 + 709 @@ -1586,19 +1782,107 @@ - targetController + mappingsController + + + + 821 + + + + mappingPopup + + + + 823 + + + + inputController + + + + 828 + + + + mouseSpeedChanged: + + + + 885 + + + + mouseSpeedSlider + + + + 886 + + + + scrollSpeedChanged: + + + + 890 + + + + scrollSpeedSlider + + + + 891 + + + + keyDelegate - 779 + 818 + + + + performClick: + + + + 871 - window - - + view + + + + 854 + + + + contentViewController + + - 780 + 852 + + + + delegate + + + + 853 + + + + performClick: + + + + 880 @@ -1634,9 +1918,10 @@ + - MainMenu + Main Menu 19 @@ -1776,11 +2061,6 @@ - - 420 - - - 450 @@ -1794,17 +2074,15 @@ 451 - - + + + + + - Drawer Content View - - - 452 - - + Mapping List Popover Content 453 @@ -1841,6 +2119,7 @@ + Mapping List 461 @@ -1859,36 +2138,17 @@ 482 - ApplicationController 487 - - + + - - 495 - - - - - 507 - - - - - - - - 508 - - - 511 @@ -1896,6 +2156,7 @@ + Remove Mapping 512 @@ -1906,24 +2167,17 @@ 514 - ConfigsController 479 - JoystickController 606 - - 608 - - - 652 @@ -1940,6 +2194,7 @@ + Input Devices Pane 634 @@ -1958,6 +2213,7 @@ + Input Device List 636 @@ -1976,6 +2232,7 @@ + Device/Input Name 642 @@ -1987,15 +2244,18 @@ - + + + + Output Editor Pane 686 @@ -2013,24 +2273,27 @@ - + Output Types 657 + Disabled 658 + Key Press 699 + Switch Mapping 700 @@ -2039,6 +2302,7 @@ + Mapping Choice List 701 @@ -2061,6 +2325,7 @@ + Input Name 707 @@ -2081,16 +2346,19 @@ 733 + Mouse Movement 734 + Mouse Button 735 + Mouse Scroll 659 @@ -2104,17 +2372,13 @@ + Mouse Button Selector 745 - - 748 - - - 749 @@ -2122,6 +2386,7 @@ + Mouse Scroll Selector 750 @@ -2135,6 +2400,7 @@ + Mouse Motion Selector 755 @@ -2146,16 +2412,6 @@ - - 790 - - - - - 810 - - - 812 @@ -2171,6 +2427,174 @@ + + 837 + + + + + + Mapping Selector + + + 835 + + + + + + + + 836 + + + + + 849 + + + + + 850 + + + Popover View Controller + + + 851 + + + Mapping List Popover + + + 507 + + + + + + Add Mapping + + + 508 + + + + + 862 + + + + + + Gradient Space + + + 863 + + + + + 810 + + + + + 866 + + + + + + + + 867 + + + + + + + + 868 + + + + + 874 + + + + + + + + 872 + + + + + + + + 873 + + + + + 883 + + + + + + + + 884 + + + + + 887 + + + + + + + + 888 + + + + + 893 + + + + + + Move Mapping Up + + + 894 + + + + + 896 + + + + + + Move Mapping Down + + + 897 + + + @@ -2191,14 +2615,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 @@ -2209,10 +2631,25 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Create a new mapping + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Remove the selected mapping + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2220,7 +2657,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 @@ -2247,103 +2683,211 @@ 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 + + ToolTip + + ToolTip + + Change the active mapping + + + 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 + + ToolTip + + ToolTip + + Enable mapped actions + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Maximum mouse speed + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Mouse scroll speed + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Move the selected mapping up the list + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Move the selected mapping down the list + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - 816 + 902 - ApplicationController + EnjoyableApplicationDelegate + NSObject + + NSMenu + NJDeviceController + NJMappingsController + NSWindow + + + + dockMenuBase + NSMenu + + + inputController + NJDeviceController + + + mappingsController + NJMappingsController + + + 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 + NSButton + NSMenuItem - - activeButton - NSToolbarItem + + mappingsController + NJMappingsController - - activeMenuItem - NSMenuItem - - - configsController - ConfigsController - - - dockMenuBase - NSMenu - - - drawer - NSDrawer + + outlineView + NSOutlineView - - jsController - JoystickController + + outputController + NJOutputController - - mainWindow - NSWindow + + translatingEventsButton + NSButton - - targetController - TargetController + + translatingEventsMenu + NSMenuItem IBProjectSource - ./Classes/ApplicationController.h + ./Classes/NJDeviceController.h + + + + NJKeyInputField + NSTextField + + keyDelegate + id + + + keyDelegate + + keyDelegate + id + + + + IBProjectSource + ./Classes/NJKeyInputField.h - ConfigsController + NJMappingsController NSObject id id id + id + id + id id @@ -2359,20 +2903,51 @@ importPressed: id + + mappingPressed: + id + + + moveDownPressed: + id + + + moveUpPressed: + id + removePressed: id - NSButton + NSButton + NSButton + NJOutputController + NSPopover + NSButton NSButton NSTableView - TargetController - - exportButton + + moveDown + NSButton + + + moveUp + NSButton + + + outputController + NJOutputController + + + popover + NSPopover + + + popoverActivate NSButton @@ -2383,80 +2958,24 @@ tableView NSTableView - - targetController - TargetController - - - - IBProjectSource - ./Classes/ConfigsController.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 + ./Classes/NJMappingsController.h - TargetController + NJOutputController NSObject - id id id + id id + id id - - configChosen: - id - mbtnChanged: id @@ -2465,42 +2984,52 @@ mdirChanged: id + + mouseSpeedChanged: + id + radioChanged: id + + scrollSpeedChanged: + id + sdirChanged: id - NSPopUpButton - ConfigsController - JoystickController - KeyInputTextView + NJDeviceController + NJKeyInputField + NSPopUpButton + NJMappingsController NSSegmentedControl NSSegmentedControl + NSSlider NSMatrix NSSegmentedControl + NSSlider NSTextField - - configPopup - NSPopUpButton - - - configsController - ConfigsController - - - joystickController - JoystickController + + inputController + NJDeviceController keyInput - KeyInputTextView + NJKeyInputField + + + mappingPopup + NSPopUpButton + + + mappingsController + NJMappingsController mouseBtnSelect @@ -2510,6 +3039,10 @@ mouseDirSelect NSSegmentedControl + + mouseSpeedSlider + NSSlider + radioButtons NSMatrix @@ -2518,6 +3051,10 @@ scrollDirSelect NSSegmentedControl + + scrollSpeedSlider + NSSlider + title NSTextField @@ -2525,7 +3062,7 @@ IBProjectSource - ./Classes/TargetController.h + ./Classes/NJOutputController.h @@ -2536,12 +3073,12 @@ 3 {8, 8} - {9, 9} {11, 10} {11, 11} {10, 3} {16, 15} {8, 8} + {9, 9}