diff --git a/source/xcode/English.lproj/Localizable.strings b/source/xcode/English.lproj/Localizable.strings old mode 100644 new mode 100755 index 3282d979..bdbadbf5 --- a/source/xcode/English.lproj/Localizable.strings +++ b/source/xcode/English.lproj/Localizable.strings @@ -2,7 +2,6 @@ /* tabs */ "Main" = "Main"; -"Keys" = "Keys"; "Server" = "Server"; "Ok" = "Ok"; diff --git a/source/xcode/English.lproj/MainMenu.nib/designable.nib b/source/xcode/English.lproj/MainMenu.nib/designable.nib index a37e0897..e0cd4b01 100644 --- a/source/xcode/English.lproj/MainMenu.nib/designable.nib +++ b/source/xcode/English.lproj/MainMenu.nib/designable.nib @@ -1,14 +1,14 @@ - 1040 - 12E55 - 3084 - 1187.39 - 626.00 + 1060 + 14A389 + 7706 + 1343.14 + 755.00 com.apple.InterfaceBuilder.CocoaPlugin - 3084 + 7706 NSArrayController @@ -27,9 +27,6 @@ NSScroller NSSlider NSSliderCell - NSTableColumn - NSTableHeaderView - NSTableView NSTextField NSTextFieldCell NSUserDefaultsController @@ -73,8 +70,9 @@ {480, 202} + - {{0, 0}, {1440, 878}} + {{0, 0}, {1024, 745}} {219.31200000000001, 129} {10000000000000, 10000000000000} Main @@ -98,6 +96,7 @@ NSMenuMixedState submenuAction: + AssaultCube @@ -149,6 +148,7 @@ submenuAction: + Services @@ -228,6 +228,7 @@ submenuAction: + Edit @@ -336,6 +337,7 @@ submenuAction: + Find @@ -402,6 +404,7 @@ submenuAction: + Spelling @@ -447,6 +450,7 @@ submenuAction: + Help @@ -486,13 +490,14 @@ {{13, 75}, {49, 17}} + YES 67108864 272629760 Size: - LucidaGrande + YES 13 1044 @@ -501,7 +506,7 @@ 6 System controlColor - + 3 MC42NjY2NjY2NjY3AA @@ -517,6 +522,7 @@ NO + 1 @@ -524,6 +530,7 @@ {{64, 69}, {142, 26}} + YES -2076180416 @@ -599,6 +606,7 @@ {{65, 16}, {87, 38}} + YES NO 2 @@ -678,10 +686,63 @@ AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB -AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES +AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB +AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS -AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA +AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAxIAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMSExp +bm8CEAAAbW50clJHQiBYWVogB84AAgAJAAYAMQAAYWNzcE1TRlQAAAAASUVDIHNSR0IAAAAAAAAAAAAA +AAAAAPbWAAEAAAAA0y1IUCAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAARY3BydAAAAVAAAAAzZGVzYwAAAYQAAABsd3RwdAAAAfAAAAAUYmtwdAAAAgQAAAAUclhZWgAA +AhgAAAAUZ1hZWgAAAiwAAAAUYlhZWgAAAkAAAAAUZG1uZAAAAlQAAABwZG1kZAAAAsQAAACIdnVlZAAA +A0wAAACGdmlldwAAA9QAAAAkbHVtaQAAA/gAAAAUbWVhcwAABAwAAAAkdGVjaAAABDAAAAAMclRSQwAA +BDwAAAgMZ1RSQwAABDwAAAgMYlRSQwAABDwAAAgMdGV4dAAAAABDb3B5cmlnaHQgKGMpIDE5OTggSGV3 +bGV0dC1QYWNrYXJkIENvbXBhbnkAAGRlc2MAAAAAAAAAEnNSR0IgSUVDNjE5NjYtMi4xAAAAAAAAAAAA +AAASc1JHQiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAFhZWiAAAAAAAADzUQABAAAAARbMWFlaIAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA +b6IAADj1AAADkFhZWiAAAAAAAABimQAAt4UAABjaWFlaIAAAAAAAACSgAAAPhAAAts9kZXNjAAAAAAAA +ABZJRUMgaHR0cDovL3d3dy5pZWMuY2gAAAAAAAAAAAAAABZJRUMgaHR0cDovL3d3dy5pZWMuY2gAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZGVzYwAAAAAAAAAuSUVDIDYx +OTY2LTIuMSBEZWZhdWx0IFJHQiBjb2xvdXIgc3BhY2UgLSBzUkdCAAAAAAAAAAAAAAAuSUVDIDYxOTY2 +LTIuMSBEZWZhdWx0IFJHQiBjb2xvdXIgc3BhY2UgLSBzUkdCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRl +c2MAAAAAAAAALFJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUM2MTk2Ni0yLjEAAAAAAAAA +AAAAACxSZWZlcmVuY2UgVmlld2luZyBDb25kaXRpb24gaW4gSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAB2aWV3AAAAAAATpP4AFF8uABDPFAAD7cwABBMLAANcngAAAAFYWVogAAAAAABM +CVYAUAAAAFcf521lYXMAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAKPAAAAAnNpZyAAAAAAQ1JUIGN1 +cnYAAAAAAAAEAAAAAAUACgAPABQAGQAeACMAKAAtADIANwA7AEAARQBKAE8AVABZAF4AYwBoAG0AcgB3 +AHwAgQCGAIsAkACVAJoAnwCkAKkArgCyALcAvADBAMYAywDQANUA2wDgAOUA6wDwAPYA+wEBAQcBDQET +ARkBHwElASsBMgE4AT4BRQFMAVIBWQFgAWcBbgF1AXwBgwGLAZIBmgGhAakBsQG5AcEByQHRAdkB4QHp +AfIB+gIDAgwCFAIdAiYCLwI4AkECSwJUAl0CZwJxAnoChAKOApgCogKsArYCwQLLAtUC4ALrAvUDAAML +AxYDIQMtAzgDQwNPA1oDZgNyA34DigOWA6IDrgO6A8cD0wPgA+wD+QQGBBMEIAQtBDsESARVBGMEcQR+ +BIwEmgSoBLYExATTBOEE8AT+BQ0FHAUrBToFSQVYBWcFdwWGBZYFpgW1BcUF1QXlBfYGBgYWBicGNwZI +BlkGagZ7BowGnQavBsAG0QbjBvUHBwcZBysHPQdPB2EHdAeGB5kHrAe/B9IH5Qf4CAsIHwgyCEYIWghu +CIIIlgiqCL4I0gjnCPsJEAklCToJTwlkCXkJjwmkCboJzwnlCfsKEQonCj0KVApqCoEKmAquCsUK3Arz +CwsLIgs5C1ELaQuAC5gLsAvIC+EL+QwSDCoMQwxcDHUMjgynDMAM2QzzDQ0NJg1ADVoNdA2ODakNww3e +DfgOEw4uDkkOZA5/DpsOtg7SDu4PCQ8lD0EPXg96D5YPsw/PD+wQCRAmEEMQYRB+EJsQuRDXEPURExEx +EU8RbRGMEaoRyRHoEgcSJhJFEmQShBKjEsMS4xMDEyMTQxNjE4MTpBPFE+UUBhQnFEkUahSLFK0UzhTw +FRIVNBVWFXgVmxW9FeAWAxYmFkkWbBaPFrIW1hb6Fx0XQRdlF4kXrhfSF/cYGxhAGGUYihivGNUY+hkg +GUUZaxmRGbcZ3RoEGioaURp3Gp4axRrsGxQbOxtjG4obshvaHAIcKhxSHHscoxzMHPUdHh1HHXAdmR3D +HeweFh5AHmoelB6+HukfEx8+H2kflB+/H+ogFSBBIGwgmCDEIPAhHCFIIXUhoSHOIfsiJyJVIoIiryLd +IwojOCNmI5QjwiPwJB8kTSR8JKsk2iUJJTglaCWXJccl9yYnJlcmhya3JugnGCdJJ3onqyfcKA0oPyhx +KKIo1CkGKTgpaymdKdAqAio1KmgqmyrPKwIrNitpK50r0SwFLDksbiyiLNctDC1BLXYtqy3hLhYuTC6C +Lrcu7i8kL1ovkS/HL/4wNTBsMKQw2zESMUoxgjG6MfIyKjJjMpsy1DMNM0YzfzO4M/E0KzRlNJ402DUT +NU01hzXCNf02NzZyNq426TckN2A3nDfXOBQ4UDiMOMg5BTlCOX85vDn5OjY6dDqyOu87LTtrO6o76Dwn +PGU8pDzjPSI9YT2hPeA+ID5gPqA+4D8hP2E/oj/iQCNAZECmQOdBKUFqQaxB7kIwQnJCtUL3QzpDfUPA +RANER0SKRM5FEkVVRZpF3kYiRmdGq0bwRzVHe0fASAVIS0iRSNdJHUljSalJ8Eo3Sn1KxEsMS1NLmkvi +TCpMcky6TQJNSk2TTdxOJU5uTrdPAE9JT5NP3VAnUHFQu1EGUVBRm1HmUjFSfFLHUxNTX1OqU/ZUQlSP +VNtVKFV1VcJWD1ZcVqlW91dEV5JX4FgvWH1Yy1kaWWlZuFoHWlZaplr1W0VblVvlXDVchlzWXSddeF3J +XhpebF69Xw9fYV+zYAVgV2CqYPxhT2GiYfViSWKcYvBjQ2OXY+tkQGSUZOllPWWSZedmPWaSZuhnPWeT +Z+loP2iWaOxpQ2maafFqSGqfavdrT2una/9sV2yvbQhtYG25bhJua27Ebx5veG/RcCtwhnDgcTpxlXHw +cktypnMBc11zuHQUdHB0zHUodYV14XY+dpt2+HdWd7N4EXhueMx5KnmJeed6RnqlewR7Y3vCfCF8gXzh +fUF9oX4BfmJ+wn8jf4R/5YBHgKiBCoFrgc2CMIKSgvSDV4O6hB2EgITjhUeFq4YOhnKG14c7h5+IBIhp +iM6JM4mZif6KZIrKizCLlov8jGOMyo0xjZiN/45mjs6PNo+ekAaQbpDWkT+RqJIRknqS45NNk7aUIJSK +lPSVX5XJljSWn5cKl3WX4JhMmLiZJJmQmfyaaJrVm0Kbr5wcnImc951kndKeQJ6unx2fi5/6oGmg2KFH +obaiJqKWowajdqPmpFakx6U4pammGqaLpv2nbqfgqFKoxKk3qamqHKqPqwKrdavprFys0K1ErbiuLa6h +rxavi7AAsHWw6rFgsdayS7LCszizrrQltJy1E7WKtgG2ebbwt2i34LhZuNG5SrnCuju6tbsuu6e8Ibyb +vRW9j74KvoS+/796v/XAcMDswWfB48JfwtvDWMPUxFHEzsVLxcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2 +y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 +2vvbgNwF3IrdEN2W3hzeot8p36/gNuC94UThzOJT4tvjY+Pr5HPk/OWE5g3mlucf56noMui86Ubp0Opb +6uXrcOv77IbtEe2c7ijutO9A78zwWPDl8XLx//KM8xnzp/Q09ML1UPXe9m32+/eK+Bn4qPk4+cf6V/rn ++3f8B/yY/Sn9uv5L/tz/bf//A @@ -707,18 +768,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{2, 2}, {219, 104}} + {{17, 86}, {223, 121}} + {0, 0} 67108864 0 Window - LucidaGrande + YES 11 3100 @@ -728,9 +791,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA textBackgroundColor - - 3 - MCAwLjgwMDAwMDAxAA + + 6 + System + labelColor + @@ -753,6 +818,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{75, 66}, {124, 16}} + YES 67108864 @@ -783,6 +849,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{14, 65}, {41, 17}} + YES 67108864 @@ -794,6 +861,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 @@ -801,13 +869,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{72, 80}, {18, 17}} + YES 67108864 272629760 Off - LucidaGrande + YES 9 3614 @@ -816,6 +885,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 @@ -823,6 +893,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{130, 80}, {16, 17}} + YES 67108864 @@ -834,6 +905,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 @@ -841,6 +913,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{186, 80}, {16, 17}} + YES 67108864 @@ -852,6 +925,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 @@ -859,6 +933,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{15, 11}, {191, 18}} + YES -2080374784 @@ -888,6 +963,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{15, 35}, {192, 22}} + YES 67108864 @@ -899,16 +975,19 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 {{2, 2}, {219, 104}} + {{242, 86}, {223, 121}} + {0, 0} 67108864 @@ -916,10 +995,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA Graphics - - 3 - MCAwLjgwMDAwMDAxAA - + 3 @@ -933,6 +1009,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{149, 60}, {313, 22}} + YES -1804599231 @@ -951,6 +1028,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 @@ -958,6 +1036,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{17, 62}, {127, 17}} + YES 67108864 @@ -969,6 +1048,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 @@ -976,6 +1056,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{386, 12}, {82, 32}} + YES 67108864 @@ -999,6 +1080,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{143, 12}, {82, 32}} + YES 67108864 @@ -1024,6 +1106,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{35, 20}, {109, 17}} + YES 67108864 @@ -1035,11 +1118,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 {482, 227} + NSView @@ -1055,6 +1140,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{386, 12}, {82, 32}} + YES 67108864 @@ -1080,6 +1166,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{17, 284}, {114, 17}} + YES 67108864 @@ -1091,6 +1178,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 @@ -1098,6 +1186,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{17, 226}, {114, 17}} + YES 67108864 @@ -1109,6 +1198,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 @@ -1116,6 +1206,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{17, 194}, {114, 17}} + YES 67108864 @@ -1127,6 +1218,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 @@ -1134,6 +1226,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{17, 160}, {129, 17}} + YES 67108864 @@ -1145,6 +1238,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 @@ -1152,6 +1246,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{149, 282}, {183, 22}} + YES -1804599231 @@ -1165,6 +1260,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 @@ -1172,6 +1268,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{149, 252}, {183, 22}} + YES -1804599231 @@ -1184,6 +1281,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 @@ -1191,6 +1289,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{17, 254}, {115, 17}} + YES 67108864 @@ -1202,6 +1301,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 @@ -1209,6 +1309,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{149, 224}, {183, 22}} + YES -1804599231 @@ -1221,6 +1322,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 @@ -1228,6 +1330,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{149, 192}, {183, 22}} + YES -1804599231 @@ -1241,9 +1344,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 0 - . + , - , + wqA 0 1 @@ -1279,8 +1382,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - . - , + , + wqA NO YES YES @@ -1292,6 +1395,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 @@ -1299,6 +1403,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{149, 160}, {311, 22}} + YES -1804599231 @@ -1312,6 +1417,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 @@ -1319,6 +1425,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{20, 23}, {351, 11}} + YES 67108864 @@ -1330,6 +1437,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 @@ -1337,7 +1445,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 2048 + 2066 @@ -1345,6 +1453,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {64, 64} + ConsoleView NSView @@ -1359,6 +1468,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA MCAwIDAAA 4 + YES @@ -1366,7 +1476,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{428, 1}, {11, 79}} + NO + _doScroller: + 256 _doScroller: @@ -1379,7 +1492,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 80}, {427, 11}} + NO + _doScroller: + 257 _doScroller: @@ -1404,6 +1520,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{337, 241}, {144, 33}} + YES 67108864 @@ -1415,255 +1532,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NO + 1 {482, 324} - - NSView - - NSResponder - - - - 256 - - - - 274 - - - - 2304 - - - - 4352 - {425, 185} - - - YES - NO - YES - - - 256 - {425, 17} - - - - - - - 256 - {{426, 0}, {16, 17}} - - - - - - 93 - 40 - 1000 - - 75497536 - 2048 - Key - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - - - - 337641536 - 2048 - Text Cell - - - - 6 - System - controlBackgroundColor - - - - - 3 - YES - - - - 51 - 40 - 1000 - - 75497536 - 2048 - Mode - - - - - - 337641536 - 2048 - Text Cell - - - - - - 3 - YES - - - - 272.10107421875 - 4 - 1000 - - 75497536 - 2048 - Action - - - 6 - System - headerColor - - - - - - 337641536 - 2048 - Text Cell - - - - - - 3 - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - -759169024 - - - 4 - 15 - 0 - YES - 0 - 1 - - - {{1, 17}, {425, 185}} - - - - - - 4 - - - - 256 - {{426, 17}, {15, 185}} - - - NO - - _doScroller: - 0.63157892227172852 - - - - 256 - {{1, 202}, {425, 15}} - - - NO - 1 - - _doScroller: - 0.97191011905670166 - - - - 2304 - - - - {{1, 0}, {425, 17}} - - - - - - 4 - - - - {{20, 60}, {442, 218}} - - - - 133170 - - - - - - QSAAAEEgAABBmAAAQZgAAA - 0.25 - 4 - 1 - - - - 292 - {{20, 23}, {204, 11}} - - - YES - - 67108864 - 272629760 - Note: Edit the config.cfg file to change these - - - - - - NO - - - {482, 298} - - + NSView @@ -1686,18 +1561,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - - - key - mode - action - - YES - - YES - YES - YES - name @@ -1715,7 +1578,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - + orderFrontStandardAboutPanel: @@ -1892,14 +1755,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 740 - - - view3 - - - - 339 - window @@ -1956,14 +1811,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 842 - - - keys - - - - 315 - view1 @@ -2068,54 +1915,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 308 - - - value: arrangedObjects.key - - - - - - value: arrangedObjects.key - value - arrangedObjects.key - 2 - - - 295 - - - - value: arrangedObjects.mode - - - - - - value: arrangedObjects.mode - value - arrangedObjects.mode - 2 - - - 296 - - - - value: arrangedObjects.action - - - - - - value: arrangedObjects.action - value - arrangedObjects.action - 2 - - - 297 - value: values.server_description @@ -2582,69 +2381,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - - 213 - - - - - - - Keys - - - 273 - - - - - - - - - - - 274 - - - - - - - - - - 275 - - - - - - - - 276 - - - - - - - - 277 - - - - - - - - 278 - - - - - - 264 @@ -2792,12 +2528,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA Shared Defaults - - 294 - - - KeysController - 342 @@ -2829,11 +2559,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - - 904 - - - 905 @@ -2902,41 +2627,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - - 919 - - - - - 920 - - - - - 921 - - - 309 - - 922 - - - - - 923 - - - - - 924 - - - 925 @@ -3163,10 +2858,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 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 @@ -3174,6 +2869,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -3203,12 +2899,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 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 @@ -3239,7 +2929,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 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 @@ -3266,7 +2955,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 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 @@ -3281,12 +2969,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 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 @@ -3303,7 +2985,25 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSView IBProjectSource - ./Classes/ConsoleView.h + ../ConsoleView.h + + + + ConsoleView + + delete: + id + + + delete: + + delete: + id + + + + IBProjectSource + ../ConsoleView.m @@ -3336,7 +3036,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSTextField ConsoleView - NSArrayController NSArrayController NSButton NSProgressIndicator @@ -3355,10 +3054,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA console ConsoleView - - keys - NSArrayController - maps NSArrayController @@ -3394,22 +3089,58 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA IBProjectSource - ./Classes/Launcher.h + ../Launcher.h + + + + Launcher + + id + id + id + id + + + + multiplayerAction: + id + + + openUserdir: + id + + + playAction: + id + + + playMap: + id + + + + IBProjectSource + ../Launcher.m 0 IBCocoaFramework + NO com.apple.InterfaceBuilder.CocoaPlugin.macosx - + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + YES 3 - {11, 11} - {10, 3} + {12, 12} + {10, 2} {15, 15} diff --git a/source/xcode/English.lproj/MainMenu.nib/keyedobjects.nib b/source/xcode/English.lproj/MainMenu.nib/keyedobjects.nib index 52312165..2511e9f1 100644 Binary files a/source/xcode/English.lproj/MainMenu.nib/keyedobjects.nib and b/source/xcode/English.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/source/xcode/Keys.gif b/source/xcode/Keys.gif deleted file mode 100644 index 3ca15657..00000000 Binary files a/source/xcode/Keys.gif and /dev/null differ diff --git a/source/xcode/Launcher.h b/source/xcode/Launcher.h old mode 100644 new mode 100755 index 94274bb7..8eaa96a3 --- a/source/xcode/Launcher.h +++ b/source/xcode/Launcher.h @@ -9,14 +9,11 @@ //able to leave these disconnected IBOutlet NSView *view1; //Main - //20/7/13: RR Removing keys submenu -// IBOutlet NSView *view3; //Keys IBOutlet NSView *view4; //Server IBOutlet NSProgressIndicator *prog; //while scanning maps - it's there if you want to wire it up IBOutlet NSArrayController *maps; - IBOutlet NSArrayController *keys; IBOutlet NSPopUpButton *resolutions; IBOutlet NSButton *stencil; diff --git a/source/xcode/Launcher.m b/source/xcode/Launcher.m old mode 100644 new mode 100755 index 20a6bcd6..d8f87f56 --- a/source/xcode/Launcher.m +++ b/source/xcode/Launcher.m @@ -24,7 +24,6 @@ //tab names, i.e. image names (text is localised) #define tkMAIN @"Main" -#define tkKEYS @"Keys" #define tkSERVER @"Server" @@ -125,8 +124,6 @@ static int numberForKey(CFDictionaryRef desc, CFStringRef key) - (void)switchViews:(NSToolbarItem *)item { - //20/7/13: RR Removing keys submenu -// NSView *views[] = {view1, view3, view4}; NSView *views[] = {view1, view4}; NSView *prefsView = views[[item tag]-1]; @@ -161,8 +158,6 @@ static int numberForKey(CFDictionaryRef desc, CFStringRef key) SEL action = @selector(displayHelp:); id target = self; if(tag) { - //20/7/13: RR Removing keys submenu -// NSString *names[] = {tkMAIN, tkKEYS, tkSERVER}; NSString *names[] = {tkMAIN, tkSERVER}; name = names[tag-1]; action = @selector(switchViews:); @@ -213,8 +208,6 @@ static int numberForKey(CFDictionaryRef desc, CFStringRef key) - (NSArray *)toolbarSelectableItemIdentifiers: (NSToolbar *)toolbar { NSMutableArray *array = [NSMutableArray array]; - //20/7/13: RR Removing keys submenu -// NSView *views[] = {view1, view3, view4}; NSView *views[] = {view1, view4}; int i; for(i = 0; i < sizeof(views)/sizeof(NSView*); i++) if(views[i]) [array addObject:[NSString stringWithFormat:@"%d", i+1]]; @@ -284,98 +277,6 @@ static int numberForKey(CFDictionaryRef desc, CFStringRef key) [resolutions selectItemAtIndex: [[NSUserDefaults standardUserDefaults] integerForKey:dkRESOLUTION]]; } -/* build key array from config data */ --(NSArray *)getKeys:(NSDictionary *)dict -{ - NSMutableArray *arr = [NSMutableArray array]; - NSEnumerator *e = [dict keyEnumerator]; - NSString *key; - while ((key = [e nextObject])) - { - int pos = [key rangeOfString:@"bind."].location; - if(pos == NSNotFound || pos > 5) continue; - [arr addObject:[NSDictionary dictionaryWithObjectsAndKeys: //keys used in nib - [key substringFromIndex:pos+5], @"key", - [key substringToIndex:pos], @"mode", - [dict objectForKey:key], @"action", - nil]]; - } - return arr; -} - -/* - * extract a dictionary from the config files containing: - * - name, team, gamma strings - * - bind/editbind '.' key strings - */ --(NSDictionary *)readConfigFiles -{ - NSMutableDictionary *dict = [[NSMutableDictionary alloc] init]; - [dict setObject:@"" forKey:@"name"]; //ensure these entries are never nil - [dict setObject:@"" forKey:@"team"]; - - NSMutableArray *lines = [NSMutableArray array]; - NSString *files[] = {@"config/saved.cfg", @"config/autoexec.cfg"}; - - int i; - for(i = 0; i < sizeof(files)/sizeof(NSString*); i++) - { - NSString *file = [Launcher userdir]; - file = [file stringByAppendingPathComponent:files[i]]; - - [lines addObjectsFromArray:[[NSString stringWithContentsOfFile:file usedEncoding:NULL error:NULL] componentsSeparatedByString:@"\n"]]; // 10.4+ - - if(i==0 && ![lines count]) // ugh - special case when first run... - { - NSString *defaultfiles[] = {@"config/defaults.cfg", @"config/resetbinds.cfg"}; - - int j; - for(j = 0; j < sizeof(defaultfiles)/sizeof(NSString*); j++) - { - file = [[Launcher cwd] stringByAppendingPathComponent:defaultfiles[j]]; - [lines addObjectsFromArray:[[NSString stringWithContentsOfFile:file usedEncoding:NULL error:NULL] componentsSeparatedByString:@"\n"]]; // 10.4+ - } - } - - NSString *line; - NSEnumerator *e = [lines objectEnumerator]; - while(line = [e nextObject]) - { - NSRange r; // more flexible to do this manually rather than via NSScanner... - int j = 0; - while(j < [line length] && [line characterAtIndex:j] <= ' ') j++; //skip white - if(j != 0) continue; // shouldn't be indented - r.location = j; - while(j < [line length] && [line characterAtIndex:j] > ' ') j++; //until white - r.length = j - r.location; - NSString *type = [line substringWithRange:r]; - - while(j < [line length] && [line characterAtIndex:j] <= ' ') j++; //skip white - if(j < [line length] && [line characterAtIndex:j] == '"') - { - r.location = ++j; - while(j < [line length] && [line characterAtIndex:j] != '"') j++; //until close quote - r.length = (j++) - r.location; - } else { - r.location = j; - while(j < [line length] && [line characterAtIndex:j] > ' ') j++; //until white - r.length = j - r.location; - } - if(r.location+r.length >= [line length]) continue; //missing value - NSString *value = [line substringWithRange:r]; - - while(j < [line length] && [line characterAtIndex:j] <= ' ') j++; //skip white - NSString *remainder = [line substringFromIndex:j]; - - if([type isEqual:@"name"] || [type isEqual:@"team"] || [type isEqual:@"gamma"]) - [dict setObject:value forKey:type]; - else if([type isEqual:@"bind"] || [type isEqual:@"editbind"] || [type isEqual:@"specbind"]) - [dict setObject:remainder forKey:[NSString stringWithFormat:@"%@.%@", type,value]]; - } - } - return dict; -} - - (void)killServer { if(server > 0) kill(server, SIGKILL); //@WARNING - you do NOT want a 0 or -1 to be accidentally sent a kill! server = -1; @@ -595,10 +496,7 @@ static int numberForKey(CFDictionaryRef desc, CFStringRef key) [fm removeFileAtPath:[dir stringByAppendingPathComponent:@"saved.cfg"] handler:nil]; } [defs setObject:appVersion forKey:dkVERSION]; - - NSDictionary *dict = [self readConfigFiles]; - [keys addObjects:[self getKeys:dict]]; - + [self initMaps]; [self initResolutions]; server = -1;