X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=cd9a1b9281fd43bab4a315520c297133a3616d2b;hp=056a907b7256a6ecc3bc700a2d720118edb2487b;hb=56d825ba259066d847a9fc3f9c8c0c0a362a1507;hpb=9584becb2e5469e8f482d73e6f0c9c3bf879e0db diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index 056a907..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 @@ -35,9 +37,8 @@ NSToolbar NSToolbarFlexibleSpaceItem NSToolbarItem - NSToolbarSeparatorItem - NSToolbarSpaceItem NSView + NSViewController NSWindowTemplate @@ -63,7 +64,7 @@ Enjoyable - + CA 1048576 2147483647 @@ -176,7 +177,7 @@ - Configurations + Mappings 1048576 2147483647 @@ -184,12 +185,49 @@ submenuAction: - Configurations + Mappings - Enable mapping - . + Enable + r + 1048576 + 2147483647 + + + + + + YES + YES + + + 2147483647 + + + + + + List + l + 1048576 + 2147483647 + + + + + + Import… + o + 1048576 + 2147483647 + + + + + + Export… + s 1048576 2147483647 @@ -204,6 +242,7 @@ 2147483647 + 1 @@ -262,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 @@ -284,50 +344,98 @@ YES NO YES - 1 - 2 + 2 + 1 - + - 42CA6E7F-AC4A-4681-98B6-B9901269E463 + 2CB21E35-9CF1-4C67-9670-31139C914D10 - Start - 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 - + - EC49C240-1D96-41C2-AD75-D75EEB29EDEA + 4AC66688-76E8-47ED-AC0A-7462220A4019 - Configurations - Configurations - - - - NSImage - NSMultipleDocuments + 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 @@ -358,77 +466,21 @@ - - 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} + {640, 320} 256 @@ -452,7 +504,7 @@ 256 - {200, 298} + {200, 318} @@ -493,14 +545,10 @@ - 337641536 - 2048 + 67108928 + 2624 Text Cell - - LucidaGrande - 13 - 1044 - + 6 @@ -518,7 +566,7 @@ - 3 + 1 YES @@ -538,8 +586,8 @@ MC41AA - 17 - -767557632 + 20 + 306184192 4 @@ -548,9 +596,11 @@ YES 0 1 + -1 + NO - {{1, 1}, {200, 298}} + {{1, 1}, {200, 318}} @@ -584,21 +634,21 @@ 0.99789030000000001 - {202, 300} + {202, 320} - 133650 + 150034 - QSAAAEEgAABBmAAAQZgAAA + QSAAAEEgAABBsAAAQbAAAA 0.25 4 1 - {202, 300} + {202, 320} @@ -608,38 +658,96 @@ 256 - + - 268 - {{227, 123}, {180, 24}} + 265 + {{228, 21}, {130, 12}} + + + + _NS:9 + YES + + -2080374784 + 262144 + + _NS:9 + + 30 + 0.0 + 15 + 0.0 + 0 + 1 + NO + NO + + NO + + + + 265 + {{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 @@ -647,32 +755,44 @@ - 268 - {{227, 55}, {180, 24}} + 265 + {{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 @@ -680,8 +800,8 @@ - 268 - {{227, 89}, {180, 24}} + 265 + {{226, 67}, {180, 24}} @@ -690,7 +810,11 @@ 67108864 0 - + + LucidaGrande + 13 + 16 + _NS:9 @@ -711,15 +835,58 @@ NO + + + 265 + {{228, 197}, {176, 24}} + + + + _NS:9 + NJKeyInputField + + + + 265 + {{225, 152}, {182, 26}} + + + + YES + + -1539309504 + 2048 + + + 109199360 + 129 + + + 400 + 75 + + YES + + OtherViews + + + -1 + 1 + YES + YES + 2 + + NO + 268 - {{20, 16}, {201, 236}} + {{20, 16}, {200, 256}} NO - 7 + 6 1 @@ -746,7 +913,7 @@ 603979776 0 - Press a key: + Press a key 1211912448 @@ -760,7 +927,7 @@ 603979776 0 - Switch to configuration + Switch to mapping 1211912448 @@ -774,7 +941,7 @@ 603979776 0 - Mouse movement + Move the mouse 1211912448 @@ -788,7 +955,7 @@ 603979776 0 - Mouse button + Press a mouse button 1211912448 @@ -802,21 +969,7 @@ 603979776 0 - Mouse scroll - - - 1211912448 - 0 - - - - 400 - 75 - - - 603979776 - 0 - Toggle mouse scope + Scroll the mouse 1211912448 @@ -828,7 +981,7 @@ 75 - {201, 32} + {200, 41} {4, 2} 1353195520 NSActionCell @@ -856,57 +1009,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}} + {{0, 289}, {429, 17}} YES - 68157504 - 138413056 + 67108928 + 138414656 LucidaGrande-Bold 13 16 - No action selected + No input selected @@ -915,8 +1035,8 @@ - 12 - {{0, 258}, {465, 5}} + 10 + {{12, 278}, {405, 5}} @@ -942,70 +1062,48 @@ 0 NO - - - 265 - {{229, 190}, {176, 24}} - - - - _NS:9 - KeyInputTextView - - {{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 256 - - - 297 - {{226, 1}, {82, 32}} - - - - _NS:9 - YES - - -2080374784 - 134217728 - Export - - _NS:9 - - -2034876416 - 129 - - - 400 - 75 - - NO - 274 @@ -1017,7 +1115,7 @@ 256 - {320, 418} + {198, 198} @@ -1031,9 +1129,9 @@ - 317 - 40 - 1000 + 190 + 190 + 190 75497536 2048 @@ -1054,8 +1152,6 @@ - 3 - YES YES @@ -1064,8 +1160,8 @@ 2 - 17 - 46170112 + 20 + 44072960 1 @@ -1074,9 +1170,10 @@ NO 0 1 + -1 - {{1, 1}, {320, 418}} + {{1, 1}, {198, 198}} @@ -1090,7 +1187,7 @@ {{306, 1}, {15, 403}} - + NO _doScroller: @@ -1099,52 +1196,127 @@ -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}, {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 + + + + 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 @@ -1152,60 +1324,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} - {200, 0} - {300, 10000} - 2 - 0.0 - 15 - - - - ApplicationController + EnjoyableApplicationDelegate - ConfigsController + NJMappingsController - JoystickController + NJDeviceController - TargetController + NJOutputController + + + + + 0 + 1 + 0.0 + 0.0 + YES @@ -1234,6 +1404,14 @@ 732 + + + showHelp: + + + + 870 + orderFrontStandardAboutPanel: @@ -1290,30 +1468,6 @@ 370 - - - parentWindow - - - - 454 - - - - contentView - - - - 455 - - - - toggle: - - - - 498 - delegate @@ -1340,155 +1494,187 @@ - targetController + mappingsController - + - 695 + 822 - configsController + outputController - + - 717 + 826 - jsController - - + translatingEventsMenu + + + + 877 + + + + translatingEventsChanged: + + - 484 + 878 - drawer - - + translatingEventsButton + + - 486 + 879 - mainWindow + dockMenuBase - + - 500 + 726 - activeMenuItem + inputController - + - 607 + 819 - activeButton + mappingsController - + - 609 + 820 - - toggleActivity: + + window - + - 610 + 865 - toggleActivity: - - + removePressed: + + - 611 + 516 - targetController - - + removeButton + + - 712 + 519 - configsController - - + tableView + + - 716 + 520 - - dockMenuBase - - + + exportPressed: + + - 726 + 815 - addPressed: + importPressed: - + - 515 + 816 + + + + outputController + + + + 827 - removePressed: + mappingPressed: - + - 516 + 855 - removeButton + popover - + - 519 + 856 - tableView + popoverActivate - + - 520 + 857 - - targetController + + addPressed: - + - 697 + 515 - exportPressed: + moveUpPressed: + + + + 899 + + + + moveDownPressed: - + - 784 + 900 - exportButton + moveUp - + - 785 + 901 + + + + moveDown + + + + 902 @@ -1508,27 +1694,19 @@ - radioButtons - - - - 692 - - - - configsController - - + delegate + + - 693 + 892 - joystickController + radioButtons - + - 694 + 692 @@ -1538,22 +1716,6 @@ 709 - - - configPopup - - - - 713 - - - - configChosen: - - - - 714 - radioChanged: @@ -1620,57 +1782,146 @@ - targetController - - + mappingsController + + - 779 + 821 - window - - + mappingPopup + + - 780 + 823 - - - - - 0 - - - + + + inputController + + - - -2 - - - File's Owner + 828 + + + + mouseSpeedChanged: + + - - -1 - - - First Responder + 885 + + + + mouseSpeedSlider + + - - -3 - - - Application + 886 + + + + scrollSpeedChanged: + + - - 29 - - - - - + 890 + + + + scrollSpeedSlider + + + + 891 + + + + keyDelegate + + + + 818 + + + + performClick: + + + + 871 + + + + view + + + + 854 + + + + contentViewController + + + + 852 + + + + delegate + + + + 853 + + + + performClick: + + + + 880 + + + + + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 29 + + + + + + - MainMenu + Main Menu 19 @@ -1702,6 +1953,10 @@ + + + + @@ -1806,11 +2061,6 @@ - - 420 - - - 450 @@ -1824,18 +2074,15 @@ 451 - - - + + + + + - Drawer Content View - - - 452 - - + Mapping List Popover Content 453 @@ -1872,6 +2119,7 @@ + Mapping List 461 @@ -1890,53 +2138,17 @@ 482 - ApplicationController 487 - - + - - + - - 490 - - - - - 492 - - - - - 493 - - - - - 495 - - - - - 507 - - - - - - - - 508 - - - 511 @@ -1944,6 +2156,7 @@ + Remove Mapping 512 @@ -1954,24 +2167,17 @@ 514 - ConfigsController 479 - JoystickController 606 - - 608 - - - 652 @@ -1988,6 +2194,7 @@ + Input Devices Pane 634 @@ -2006,6 +2213,7 @@ + Input Device List 636 @@ -2024,6 +2232,7 @@ + Device/Input Name 642 @@ -2035,15 +2244,18 @@ - - + + + + + Output Editor Pane 686 @@ -2061,24 +2273,27 @@ - + Output Types 657 + Disabled 658 + Key Press 699 + Switch Mapping 700 @@ -2087,6 +2302,7 @@ + Mapping Choice List 701 @@ -2109,6 +2325,7 @@ + Input Name 707 @@ -2129,16 +2346,19 @@ 733 + Mouse Movement 734 + Mouse Button 735 + Mouse Scroll 659 @@ -2152,17 +2372,13 @@ + Mouse Button Selector 745 - - 748 - - - 749 @@ -2170,6 +2386,7 @@ + Mouse Scroll Selector 750 @@ -2183,6 +2400,7 @@ + Mouse Motion Selector 755 @@ -2195,17 +2413,187 @@ - 782 - + 812 + + + + + 813 + + + + + 814 + + + + + 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 - 783 - - + 897 + + @@ -2227,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 @@ -2245,13 +2631,25 @@ 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 + + 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 @@ -2259,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 @@ -2286,99 +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 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 - 785 + 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 - - - activeMenuItem - NSMenuItem - - - configsController - ConfigsController - - - dockMenuBase - NSMenu + + mappingsController + NJMappingsController - - drawer - NSDrawer + + outlineView + NSOutlineView - - jsController - JoystickController + + outputController + NJOutputController - - mainWindow - NSWindow + + translatingEventsButton + NSButton - - targetController - TargetController + + translatingEventsMenu + NSMenuItem 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 + id id @@ -2390,20 +2899,55 @@ exportPressed: id + + 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 @@ -2414,80 +2958,24 @@ 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 + id id - - configChosen: - id - mbtnChanged: id @@ -2496,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 @@ -2541,6 +3039,10 @@ mouseDirSelect NSSegmentedControl + + mouseSpeedSlider + NSSlider + radioButtons NSMatrix @@ -2549,6 +3051,10 @@ scrollDirSelect NSSegmentedControl + + scrollSpeedSlider + NSSlider + title NSTextField @@ -2556,7 +3062,7 @@ IBProjectSource - ./Classes/TargetController.h + ./Classes/NJOutputController.h @@ -2567,12 +3073,12 @@ 3 {8, 8} - {9, 9} + {11, 10} {11, 11} {10, 3} - {32, 32} {16, 15} {8, 8} + {9, 9}