X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=6e87fb02440bdad0d36971862161b6b324042b33;hp=1b4989d5e28b06c4930b58d8e3b27d618b8d7dc3;hb=4a490c57151dd4ba9cb27cc34a0e33fc68fc4d24;hpb=62aa5b73be6ec1e499e6b155cd0e7687c338cbaa diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index 1b4989d..6e87fb0 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,16 +182,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 @@ -290,7 +326,7 @@ 42CA6E7F-AC4A-4681-98B6-B9901269E463 - Start + Start/Stop @@ -308,17 +344,17 @@ YES 0 - + - EC49C240-1D96-41C2-AD75-D75EEB29EDEA + A03535DA-B573-44B2-86A0-5E261E68FC16 - Configurations + Configurations NSImage - NSMultipleDocuments + NSListViewTemplate @@ -357,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 @@ -453,7 +433,8 @@ 256 {200, 298} - + + YES NO YES @@ -491,8 +472,8 @@ - 337641536 - 2048 + 67108928 + 2624 Text Cell LucidaGrande @@ -516,7 +497,7 @@ - 3 + 1 YES @@ -536,8 +517,8 @@ MC41AA - 17 - -767557632 + 20 + 306184192 4 @@ -546,10 +527,13 @@ YES 0 1 + -1 + NO {{1, 1}, {200, 298}} + @@ -560,6 +544,7 @@ -2147483392 {{1, 1}, {8, 298}} + NO @@ -571,6 +556,7 @@ -2147483392 {{-100, -100}, {473, 15}} + NO 1 @@ -581,12 +567,13 @@ {202, 300} - - 133650 + + + 150034 - QSAAAEEgAABBmAAAQZgAAA + QSAAAEEgAABBsAAAQbAAAA 0.25 4 1 @@ -594,6 +581,7 @@ {202, 300} + NSView @@ -603,9 +591,10 @@ - 268 + 265 {{227, 123}, {180, 24}} + _NS:9 YES @@ -639,9 +628,10 @@ - 268 + 265 {{227, 55}, {180, 24}} + _NS:9 YES @@ -670,9 +660,10 @@ - 268 + 265 {{227, 89}, {180, 24}} + _NS:9 YES @@ -700,11 +691,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 +783,7 @@ 603979776 0 - Switch to configuration + Switch to mapping 1211912448 @@ -803,7 +839,7 @@ 603979776 0 - Toggle mouse scope + Switch mouse mode 1211912448 @@ -843,48 +879,17 @@ - - - 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 @@ -900,9 +905,10 @@ - 12 - {{0, 258}, {465, 5}} + 10 + {{12, 258}, {405, 5}} + {0, 0} @@ -926,37 +932,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} {10000000000000, 10000000000000} + Enjoyable YES - + 256 @@ -972,6 +975,7 @@ 256 {320, 418} + YES NO @@ -1016,7 +1020,7 @@ 2 - 17 + 20 46170112 @@ -1026,10 +1030,12 @@ NO 0 1 + 1 {{1, 1}, {320, 418}} + @@ -1040,6 +1046,7 @@ -2147483392 {{306, 1}, {15, 403}} + NO @@ -1051,6 +1058,7 @@ -2147483392 {{1, 404}, {305, 15}} + NO 1 @@ -1061,12 +1069,13 @@ {{0, 34}, {322, 420}} + 133682 - QSAAAEEgAABBmAAAQZgAAA + QSAAAEEgAABBsAAAQbAAAA 0.25 4 1 @@ -1076,6 +1085,7 @@ 260 {{10, 4}, {39, 28}} + YES @@ -1102,6 +1112,7 @@ 260 {{57, 4}, {39, 28}} + YES 603979776 @@ -1124,14 +1135,16 @@ {322, 454} + + NSView {200, 100} - {150, 0} - {300, 10000} + {100, 0} + {400, 10000} 2 0.0 15 @@ -1150,28 +1163,6 @@ TargetController - - - 268 - {82, 32} - _NS:9 - YES - - 67108864 - 134217728 - Button - - _NS:9 - - -2038284288 - 129 - - - 200 - 25 - - NO - @@ -1279,6 +1270,14 @@ 498 + + + toggle: + + + + 811 + delegate @@ -1439,6 +1438,22 @@ 697 + + + exportPressed: + + + + 815 + + + + importPressed: + + + + 816 + dataSource @@ -1569,19 +1584,11 @@ - targetController + keyDelegate - 779 - - - - window - - - - 780 + 818 @@ -1651,6 +1658,10 @@ + + + + @@ -1844,29 +1855,12 @@ 487 - - - + - - 490 - - - - - 492 - - - - - 493 - - - 495 @@ -1987,8 +1981,8 @@ - + @@ -2138,22 +2132,34 @@ - 765 - - - - - + 778 + + - 766 - - + 790 + + - 778 - - + 810 + + + + + 812 + + + + + 813 + + + + + 814 + + @@ -2193,9 +2199,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 @@ -2243,10 +2246,13 @@ 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 @@ -2254,7 +2260,7 @@ - 781 + 818 @@ -2326,6 +2332,8 @@ NSObject id + id + id id @@ -2333,6 +2341,14 @@ addPressed: id + + exportPressed: + id + + + importPressed: + id + removePressed: id @@ -2390,25 +2406,22 @@ - KeyInputTextView + NJKeyInputField NSTextField - - TargetController - NSWindow - - - - targetController - TargetController - - - window - NSWindow + + keyDelegate + id + + + keyDelegate + + keyDelegate + id - + IBProjectSource - ./Classes/KeyInputTextView.h + ./Classes/NJKeyInputField.h @@ -2447,7 +2460,7 @@ NSPopUpButton ConfigsController JoystickController - KeyInputTextView + NJKeyInputField NSSegmentedControl NSSegmentedControl NSMatrix @@ -2469,7 +2482,7 @@ keyInput - KeyInputTextView + NJKeyInputField mouseBtnSelect @@ -2506,9 +2519,9 @@ {8, 8} {9, 9} + {11, 10} {11, 11} {10, 3} - {32, 32} {16, 15} {8, 8}