X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=1a87bd74e4dee4e83603236f19111e32363b238f;hp=056a907b7256a6ecc3bc700a2d720118edb2487b;hb=d0f4d54bb9eb66cbd19fa4dabb56fc09f42bd22d;hpb=9584becb2e5469e8f482d73e6f0c9c3bf879e0db diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index 056a907..1a87bd7 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -35,8 +35,6 @@ NSToolbar NSToolbarFlexibleSpaceItem NSToolbarItem - NSToolbarSeparatorItem - NSToolbarSpaceItem NSView NSWindowTemplate @@ -176,7 +174,7 @@ - Configurations + Mappings 1048576 2147483647 @@ -184,12 +182,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 @@ -291,7 +326,7 @@ 42CA6E7F-AC4A-4681-98B6-B9901269E463 - Start + Start/Stop @@ -309,17 +344,17 @@ YES 0 - + - EC49C240-1D96-41C2-AD75-D75EEB29EDEA + A03535DA-B573-44B2-86A0-5E261E68FC16 - Configurations + Configurations NSImage - NSMultipleDocuments + NSListViewTemplate @@ -358,79 +393,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 @@ -454,8 +433,7 @@ 256 {200, 298} - - + YES NO YES @@ -493,8 +471,8 @@ - 337641536 - 2048 + 67108928 + 2624 Text Cell LucidaGrande @@ -518,7 +496,7 @@ - 3 + 1 YES @@ -538,8 +516,8 @@ MC41AA - 17 - -767557632 + 20 + 306184192 4 @@ -548,11 +526,12 @@ YES 0 1 + -1 + NO {{1, 1}, {200, 298}} - @@ -563,7 +542,6 @@ -2147483392 {{1, 1}, {8, 298}} - NO @@ -575,7 +553,6 @@ -2147483392 {{-100, -100}, {473, 15}} - NO 1 @@ -586,13 +563,12 @@ {202, 300} - - - 133650 + + 150034 - QSAAAEEgAABBmAAAQZgAAA + QSAAAEEgAABBsAAAQbAAAA 0.25 4 1 @@ -600,7 +576,6 @@ {202, 300} - NSView @@ -610,10 +585,9 @@ - 268 + 265 {{227, 123}, {180, 24}} - _NS:9 YES @@ -647,11 +621,9 @@ - 268 + 265 {{227, 55}, {180, 24}} - - _NS:9 YES @@ -680,10 +652,9 @@ - 268 + 265 {{227, 89}, {180, 24}} - _NS:9 YES @@ -711,12 +682,52 @@ 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 @@ -760,7 +771,7 @@ 603979776 0 - Switch to configuration + Switch to mapping 1211912448 @@ -816,7 +827,7 @@ 603979776 0 - Toggle mouse scope + Switch mouse mode 1211912448 @@ -856,50 +867,16 @@ - - - 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 @@ -915,10 +892,9 @@ - 12 - {{0, 258}, {465, 5}} + 10 + {{12, 258}, {405, 5}} - {0, 0} @@ -942,70 +918,32 @@ 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} {10000000000000, 10000000000000} + Enjoyable YES - + 256 - - - 297 - {{226, 1}, {82, 32}} - - - - _NS:9 - YES - - -2080374784 - 134217728 - Export - - _NS:9 - - -2034876416 - 129 - - - 400 - 75 - - NO - 274 @@ -1019,7 +957,6 @@ 256 {320, 418} - YES NO @@ -1064,7 +1001,7 @@ 2 - 17 + 20 46170112 @@ -1074,11 +1011,11 @@ NO 0 1 + 1 {{1, 1}, {320, 418}} - @@ -1089,7 +1026,6 @@ -2147483392 {{306, 1}, {15, 403}} - NO @@ -1101,7 +1037,6 @@ -2147483392 {{1, 404}, {305, 15}} - NO 1 @@ -1112,13 +1047,12 @@ {{0, 34}, {322, 420}} - 133682 - QSAAAEEgAABBmAAAQZgAAA + QSAAAEEgAABBsAAAQbAAAA 0.25 4 1 @@ -1128,7 +1062,6 @@ 260 {{10, 4}, {39, 28}} - YES @@ -1155,8 +1088,6 @@ 260 {{57, 4}, {39, 28}} - - YES 603979776 @@ -1179,16 +1110,14 @@ {322, 454} - - NSView {200, 100} - {200, 0} - {300, 10000} + {100, 0} + {400, 10000} 2 0.0 15 @@ -1196,16 +1125,16 @@ - ApplicationController + EnjoyableApplicationDelegate - ConfigsController + NJMappingsController - JoystickController + NJDeviceController - TargetController + NJOutputController @@ -1314,6 +1243,14 @@ 498 + + + toggle: + + + + 811 + delegate @@ -1340,27 +1277,19 @@ - targetController - - - - 695 - - - - configsController + mappingsController - 717 + 822 - jsController - - + outputController + + - 484 + 826 @@ -1412,27 +1341,35 @@ - targetController + dockMenuBase - + - 712 + 726 - configsController + inputController + + + + 819 + + + + mappingsController - 716 + 820 - dockMenuBase + outputController - + - 726 + 825 @@ -1467,28 +1404,28 @@ 520 - - targetController + + exportPressed: - + - 697 + 815 - exportPressed: + importPressed: - + - 784 + 816 - exportButton + outputController - + - 785 + 827 @@ -1514,22 +1451,6 @@ 692 - - - configsController - - - - 693 - - - - joystickController - - - - 694 - title @@ -1538,22 +1459,6 @@ 709 - - - configPopup - - - - 713 - - - - configChosen: - - - - 714 - radioChanged: @@ -1620,19 +1525,43 @@ - targetController - - + mappingsController + + + + 821 + + + + mappingPopup + + + + 823 + + + + mappingChosen: + + - 779 + 824 - window + inputController + + + + 828 + + + + keyDelegate - + - 780 + 818 @@ -1702,6 +1631,10 @@ + + + + @@ -1827,7 +1760,6 @@ - Drawer Content View @@ -1896,29 +1828,12 @@ 487 - - - + - - 490 - - - - - 492 - - - - - 493 - - - 495 @@ -2039,8 +1954,8 @@ - + @@ -2195,17 +2110,29 @@ - 782 - - - - - + 790 + + + + + 810 + + + + + 812 + + - 783 - - + 813 + + + + + 814 + + @@ -2245,9 +2172,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 @@ -2296,9 +2220,12 @@ 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 @@ -2306,257 +2233,27 @@ - 785 + 828 - ApplicationController - NSObject - - toggleActivity: + NJKeyInputField + NSTextField + + keyDelegate id - - toggleActivity: - - toggleActivity: - id - - - - NSToolbarItem - NSMenuItem - ConfigsController - NSMenu - NSDrawer - JoystickController - NSWindow - TargetController - - - - activeButton - NSToolbarItem - - - activeMenuItem - NSMenuItem - - - configsController - ConfigsController - - - dockMenuBase - NSMenu - - - drawer - NSDrawer - - - jsController - JoystickController - - - mainWindow - NSWindow - - - targetController - TargetController - - - - IBProjectSource - ./Classes/ApplicationController.h - - - - ConfigsController - NSObject - - id - id - id - - - - addPressed: + + keyDelegate + + keyDelegate id - - exportPressed: - id - - - removePressed: - id - - - - NSButton - NSButton - NSTableView - TargetController - - - - exportButton - NSButton - - - removeButton - NSButton - - - 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 - - - - TargetController - NSObject - - id - id - id - id - id - - - - configChosen: - id - - - mbtnChanged: - id - - - mdirChanged: - id - - - radioChanged: - id - - - sdirChanged: - id - - - - NSPopUpButton - ConfigsController - JoystickController - KeyInputTextView - NSSegmentedControl - NSSegmentedControl - NSMatrix - NSSegmentedControl - NSTextField - - - - configPopup - NSPopUpButton - - - configsController - ConfigsController - - - joystickController - JoystickController - - - keyInput - KeyInputTextView - - - mouseBtnSelect - NSSegmentedControl - - - mouseDirSelect - NSSegmentedControl - - - radioButtons - NSMatrix - - - scrollDirSelect - NSSegmentedControl - - - title - NSTextField - - IBProjectSource - ./Classes/TargetController.h + ./Classes/NJKeyInputField.h @@ -2568,9 +2265,9 @@ {8, 8} {9, 9} + {11, 10} {11, 11} {10, 3} - {32, 32} {16, 15} {8, 8}