From: Joe Wreschnig Date: Mon, 4 Mar 2013 15:01:38 +0000 (+0100) Subject: Give accurate names to most of the items in the nib. Tweak button appearance on the... X-Git-Tag: version-1.0~41 X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=commitdiff_plain;h=8ac97ce92f0607b38c14db63e6eabfd78729d473;hp=c38397be0be3a8b0b5c502bf5a5bc24b3c0f61bb Give accurate names to most of the items in the nib. Tweak button appearance on the popover to resemble e.g. System Preferences lists with add/remove. --- diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index a110b51..e30e982 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -302,9 +302,6 @@ _NSMainMenu - - NSFontManager - 15 2 @@ -336,7 +333,6 @@ 268 {{0, 14}, {140, 25}} - _NS:9 YES @@ -387,7 +383,6 @@ 268 {{5, 14}, {67, 25}} - _NS:9 YES @@ -963,7 +958,7 @@ 13 16 - No action selected + No input selected @@ -1040,7 +1035,7 @@ 256 - {196, 256} + {198, 198} @@ -1086,7 +1081,7 @@ 20 - 48267264 + 44072960 1 @@ -1098,7 +1093,7 @@ -1 - {{2, 2}, {196, 256}} + {{1, 1}, {198, 198}} @@ -1132,11 +1127,11 @@ 0.98123324396782841 - {{0, 54}, {200, 260}} + {{0, 20}, {200, 200}} - 150035 + 150034 @@ -1145,28 +1140,57 @@ 4 1 + + + 268 + {{66, -1}, {134, 23}} + + + + _NS:22 + YES + + -2080374784 + 168034304 + + + LucidaGrande + 9 + 3614 + + _NS:22 + + 1221349376 + 162 + + + 400 + 75 + + NO + 292 - {{20, 19}, {39, 28}} + {{0, -1}, {34, 23}} YES 67108864 - 134217728 + 134479872 - + -2033958912 - 162 + 268435618 NSImage NSAddTemplate - + n 400 75 @@ -1175,32 +1199,32 @@ 292 - {{67, 19}, {39, 28}} + {{33, -1}, {34, 23}} - + YES - 603979776 - 134217728 + 67108864 + 134479872 - + -2033958912 - 162 + 268435618 NSImage NSRemoveTemplate - + CA 400 75 NO - {200, 314} + {200, 220} @@ -1366,30 +1390,6 @@ 859 - - - mainWindow - - - - 500 - - - - activeMenuItem - - - - 607 - - - - toggleActivity: - - - - 610 - dockMenuBase @@ -1422,14 +1422,6 @@ 825 - - - addPressed: - - - - 515 - removePressed: @@ -1502,6 +1494,14 @@ 857 + + + addPressed: + + + + 515 + dataSource @@ -1614,14 +1614,6 @@ 823 - - - mappingChosen: - - - - 824 - inputController @@ -1698,7 +1690,7 @@ - MainMenu + Main Menu 19 @@ -1838,11 +1830,6 @@ - - 420 - - - 450 @@ -1857,11 +1844,12 @@ - + + - Drawer Content View + Mapping List Popover Content 453 @@ -1898,6 +1886,7 @@ + Mapping List 461 @@ -1916,7 +1905,6 @@ 482 - ApplicationController 487 @@ -1928,19 +1916,6 @@ - - 507 - - - - - - - - 508 - - - 511 @@ -1948,6 +1923,7 @@ + Remove Mapping 512 @@ -1958,13 +1934,11 @@ 514 - ConfigsController 479 - JoystickController 606 @@ -1987,6 +1961,7 @@ + Input Devices Pane 634 @@ -2005,6 +1980,7 @@ + Input Device List 636 @@ -2023,6 +1999,7 @@ + Device/Input Name 642 @@ -2043,6 +2020,7 @@ + Output Editor Pane 686 @@ -2063,21 +2041,25 @@ + Output Types 657 + Disabled 658 + Key Press 699 + Switch Mapping 700 @@ -2086,6 +2068,7 @@ + Mapping Choice List 701 @@ -2108,6 +2091,7 @@ + Input Name 707 @@ -2128,16 +2112,19 @@ 733 + Mouse Movement 734 + Mouse Button 735 + Mouse Scroll 659 @@ -2151,6 +2138,7 @@ + Mouse Button Selector 745 @@ -2161,6 +2149,7 @@ 748 + Switch Mouse Mode 749 @@ -2169,6 +2158,7 @@ + Mouse Scroll Selector 750 @@ -2182,6 +2172,7 @@ + Mouse Motion Selector 755 @@ -2220,6 +2211,7 @@ + Mapping Selector 835 @@ -2241,6 +2233,7 @@ + Translation Switch 840 @@ -2270,6 +2263,35 @@ 851 + Mapping List Popover + + + 507 + + + + + + Add Mapping + + + 508 + + + + + 862 + + + + + + Gradient Space + + + 863 + + @@ -2291,7 +2313,6 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2371,30 +2392,21 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - 859 + 863 EnjoyableApplicationDelegate NSObject - - toggleActivity: - id - - - toggleActivity: - - toggleActivity: - id - - NSMenu NJDeviceController