From f119dfb89e99b2564e2dc06f355e6ef154cef2d4 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Tue, 24 Jul 2012 00:17:47 +0000 Subject: [PATCH] temporarily revert gui changes for #2353 for 2.61, hiding the new functionality --- macosx/en.lproj/InfoOptionsView.xib | 181 +++-------------- macosx/en.lproj/PrefsWindow.xib | 303 +++++----------------------- 2 files changed, 78 insertions(+), 406 deletions(-) diff --git a/macosx/en.lproj/InfoOptionsView.xib b/macosx/en.lproj/InfoOptionsView.xib index 754dd4c5a..e5ba0c20f 100644 --- a/macosx/en.lproj/InfoOptionsView.xib +++ b/macosx/en.lproj/InfoOptionsView.xib @@ -2,13 +2,13 @@ 1060 - 11E53 - 2182 - 1138.47 - 569.00 + 11D50 + 2177 + 1138.32 + 568.00 com.apple.InterfaceBuilder.CocoaPlugin - 2182 + 2177 NSTextField @@ -47,7 +47,7 @@ 268 - {{217, 71}, {45, 20}} + {{217, 54}, {45, 20}} @@ -123,7 +123,7 @@ 268 - {{71, 70}, {138, 22}} + {{71, 53}, {138, 22}} @@ -205,7 +205,7 @@ 268 - {{10, 74}, {56, 14}} + {{10, 57}, {56, 14}} @@ -236,7 +236,7 @@ 268 - {{217, 93}, {45, 20}} + {{217, 76}, {45, 20}} @@ -292,7 +292,7 @@ 268 - {{9, 112}, {88, 17}} + {{9, 95}, {88, 17}} @@ -314,7 +314,7 @@ 268 - {{9, 198}, {117, 14}} + {{9, 181}, {117, 14}} @@ -332,7 +332,7 @@ 268 - {{9, 236}, {46, 17}} + {{9, 219}, {46, 17}} @@ -350,7 +350,7 @@ 268 - {{125, 154}, {45, 20}} + {{125, 137}, {45, 20}} @@ -401,7 +401,7 @@ 268 - {{175, 157}, {29, 14}} + {{175, 140}, {29, 14}} @@ -419,7 +419,7 @@ 268 - {{125, 176}, {45, 20}} + {{125, 159}, {45, 20}} @@ -470,7 +470,7 @@ 266 - {{214, 96}, {101, 14}} + {{214, 79}, {90, 14}} @@ -491,7 +491,7 @@ 266 - {{214, 74}, {101, 14}} + {{214, 57}, {90, 14}} @@ -512,10 +512,10 @@ 268 - {{267, 74}, {47, 14}} + {{267, 57}, {47, 14}} - + YES 67239424 @@ -530,7 +530,7 @@ 268 - {{175, 179}, {29, 14}} + {{175, 162}, {29, 14}} @@ -548,7 +548,7 @@ 268 - {{71, 92}, {138, 22}} + {{71, 75}, {138, 22}} @@ -619,7 +619,7 @@ 268 - {{10, 96}, {35, 14}} + {{10, 79}, {35, 14}} @@ -637,7 +637,7 @@ 268 - {{10, 221}, {94, 14}} + {{10, 204}, {94, 14}} @@ -759,7 +759,7 @@ 268 - {{10, 155}, {93, 18}} + {{10, 138}, {93, 18}} @@ -785,34 +785,10 @@ 25 - - - 268 - {{10, 52}, {314, 18}} - - - - YES - - -2080244224 - 16908288 - Remove from the transfer list when seeding completes - - - 1211912703 - 2 - - - - - 200 - 25 - - 268 - {{10, 135}, {230, 18}} + {{10, 118}, {230, 18}} @@ -836,7 +812,7 @@ 268 - {{10, 177}, {109, 18}} + {{10, 160}, {109, 18}} @@ -860,7 +836,7 @@ 268 - {{109, 217}, {98, 22}} + {{109, 200}, {98, 22}} @@ -940,7 +916,7 @@ - {332, 258} + {321, 241} @@ -1184,30 +1160,6 @@ 112 - - - fRemovesSeedingCompleteCheck - - - - 117 - - - - fRemoveSeedingCompleteCheck - - - - 118 - - - - setRemoveWhenSeedingCompletes: - - - - 119 - delegate @@ -1304,7 +1256,6 @@ - Options @@ -1758,19 +1709,6 @@ - - 113 - - - - - - - - 114 - - - @@ -1784,8 +1722,6 @@ ColorTextField 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 @@ -1861,7 +1797,7 @@ - 119 + 112 @@ -1876,60 +1812,6 @@ InfoOptionsViewController NSViewController - - id - id - id - id - id - id - id - id - id - id - - - - setIdleLimit: - id - - - setIdleSetting: - id - - - setPeersConnectLimit: - id - - - setPriority: - id - - - setRatioLimit: - id - - - setRatioSetting: - id - - - setRemoveWhenSeedingCompletes: - id - - - setSpeedLimit: - id - - - setUseGlobalSpeedLimit: - id - - - setUseSpeedLimit: - id - - NSButton NSTextField @@ -1945,7 +1827,6 @@ NSTextField NSTextField NSPopUpButton - NSButton NSButton NSTextField NSTextField @@ -2007,10 +1888,6 @@ fRatioPopUp NSPopUpButton - - fRemoveSeedingCompleteCheck - NSButton - fUploadLimitCheck NSButton diff --git a/macosx/en.lproj/PrefsWindow.xib b/macosx/en.lproj/PrefsWindow.xib index 7696de8b8..ca6ad0fc5 100644 --- a/macosx/en.lproj/PrefsWindow.xib +++ b/macosx/en.lproj/PrefsWindow.xib @@ -75,8 +75,6 @@ 256 {542, 107} - - {{0, 0}, {2560, 1440}} {10000000000000, 10000000000000} @@ -567,10 +565,8 @@ 274 - {{13, 10}, {516, 379}} + {{13, 10}, {516, 341}} - - @@ -580,9 +576,8 @@ 264 - {{219, 290}, {182, 26}} + {{219, 274}, {182, 26}} - YES -2076049856 @@ -683,9 +678,8 @@ 264 - {{108, 296}, {109, 17}} + {{108, 280}, {109, 17}} - YES 67239424 @@ -700,9 +694,8 @@ 264 - {{44, 296}, {62, 17}} + {{44, 280}, {62, 17}} - YES 67239424 @@ -717,9 +710,8 @@ 264 - {{109, 227}, {188, 18}} + {{109, 211}, {188, 18}} - YES 67239424 @@ -740,9 +732,8 @@ 264 - {{109, 207}, {226, 18}} + {{109, 191}, {226, 18}} - YES 67239424 @@ -763,9 +754,8 @@ 264 - {{109, 74}, {181, 18}} + {{109, 58}, {181, 18}} - YES 67239424 @@ -786,9 +776,8 @@ 264 - {{293, 69}, {182, 26}} + {{293, 53}, {182, 26}} - YES -2076049856 @@ -858,9 +847,8 @@ 264 - {{40, 75}, {66, 17}} + {{40, 59}, {66, 17}} - YES 67239424 @@ -875,9 +863,8 @@ 264 - {{109, 270}, {178, 18}} + {{109, 254}, {178, 18}} - YES 67239424 @@ -898,9 +885,8 @@ 264 - {{290, 265}, {182, 26}} + {{290, 249}, {182, 26}} - YES -2076049856 @@ -970,9 +956,8 @@ 264 - {{109, 171}, {307, 18}} + {{109, 155}, {307, 18}} - YES 67239424 @@ -993,9 +978,8 @@ 264 - {{109, 111}, {315, 18}} + {{109, 95}, {315, 18}} - YES 67239424 @@ -1016,9 +1000,8 @@ 264 - {{109, 247}, {192, 18}} + {{109, 231}, {192, 18}} - YES 67239424 @@ -1039,9 +1022,8 @@ 264 - {{128, 131}, {197, 18}} + {{128, 115}, {197, 18}} - YES 67239424 @@ -1062,9 +1044,8 @@ 264 - {{21, 172}, {86, 17}} + {{21, 156}, {86, 17}} - YES 67239424 @@ -1079,9 +1060,8 @@ 264 - {{128, 151}, {235, 18}} + {{128, 135}, {235, 18}} - YES 67239424 @@ -1100,8 +1080,7 @@ - {{10, 33}, {496, 324}} - + {{10, 33}, {496, 308}} Adding @@ -1115,9 +1094,8 @@ 264 - {{302, 175}, {35, 22}} + {{312, 177}, {35, 22}} - YES @@ -1181,9 +1159,8 @@ 264 - {{32, 177}, {56, 17}} + {{42, 179}, {56, 17}} - YES @@ -1199,9 +1176,8 @@ 264 - {{342, 177}, {101, 17}} + {{352, 179}, {101, 17}} - YES @@ -1217,9 +1193,8 @@ 264 - {{91, 302}, {157, 18}} + {{101, 264}, {157, 18}} - YES @@ -1241,9 +1216,8 @@ 264 - {{254, 301}, {50, 22}} + {{264, 263}, {50, 22}} - YES @@ -1294,9 +1268,8 @@ 264 - {{91, 258}, {220, 18}} + {{101, 220}, {220, 18}} - YES @@ -1318,9 +1291,8 @@ 264 - {{317, 257}, {41, 22}} + {{327, 219}, {41, 22}} - YES @@ -1375,9 +1347,8 @@ 264 - {{41, 303}, {47, 17}} + {{51, 265}, {47, 17}} - YES @@ -1393,9 +1364,8 @@ 264 - {{109, 283}, {269, 14}} + {{119, 245}, {269, 14}} - YES @@ -1423,9 +1393,8 @@ 264 - {{91, 176}, {205, 18}} + {{101, 178}, {205, 18}} - YES @@ -1447,9 +1416,8 @@ 264 - {{288, 149}, {35, 22}} + {{298, 151}, {35, 22}} - YES @@ -1499,9 +1467,8 @@ 264 - {{328, 151}, {101, 17}} + {{338, 153}, {101, 17}} - YES @@ -1517,9 +1484,8 @@ 264 - {{91, 150}, {191, 18}} + {{101, 152}, {191, 18}} - YES @@ -1541,9 +1507,8 @@ 264 - {{349, 123}, {41, 22}} + {{359, 125}, {41, 22}} - YES @@ -1597,9 +1562,8 @@ 264 - {{395, 125}, {55, 17}} + {{405, 127}, {55, 17}} - YES @@ -1615,9 +1579,8 @@ 264 - {{91, 124}, {252, 18}} + {{101, 126}, {252, 18}} - YES @@ -1639,9 +1602,8 @@ 264 - {{11, 85}, {77, 17}} + {{21, 87}, {77, 17}} - YES @@ -1657,9 +1619,8 @@ 264 - {{289, 79}, {130, 26}} + {{299, 81}, {130, 26}} - YES @@ -1710,9 +1671,8 @@ 264 - {{91, 59}, {183, 18}} + {{101, 61}, {183, 18}} - YES @@ -1734,9 +1694,8 @@ 264 - {{289, 54}, {130, 26}} + {{299, 56}, {130, 26}} - YES @@ -1783,9 +1742,8 @@ 264 - {{91, 84}, {195, 18}} + {{101, 86}, {195, 18}} - YES @@ -1807,10 +1765,9 @@ 264 - {{363, 259}, {55, 17}} + {{373, 221}, {55, 17}} - - + YES 67239424 @@ -1825,9 +1782,8 @@ 264 - {{91, 19}, {195, 18}} + {{101, 21}, {195, 18}} - YES @@ -1849,9 +1805,8 @@ 264 - {{16, 20}, {72, 17}} + {{26, 22}, {72, 17}} - YES @@ -1867,9 +1822,8 @@ 264 - {{289, 14}, {168, 26}} + {{299, 16}, {168, 26}} - YES @@ -1940,10 +1894,8 @@ 268 - {{459, 14}, {25, 25}} + {{469, 16}, {25, 25}} - - YES 67239424 @@ -1959,52 +1911,9 @@ 25 - - - 264 - {{91, 235}, {367, 18}} - - - - YES - - 67239424 - 0 - Remove from the transfer list when seeding completes - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 264 - {{109, 217}, {180, 14}} - - - - YES - - 67239424 - 272760832 - Applies to newly added transfers - - - - - - - {{10, 33}, {496, 333}} + {{10, 33}, {496, 295}} - Management @@ -2022,9 +1931,8 @@ - {542, 393} + {542, 355} - NSView NSResponder @@ -3252,7 +3160,7 @@ AAABAAAAAQ NSResponder - + 256 @@ -3260,8 +3168,6 @@ AAABAAAAAQ 258 {{191, 100}, {331, 22}} - - YES -1804468671 @@ -3282,8 +3188,6 @@ AAABAAAAAQ 256 {{154, 162}, {184, 18}} - - YES 67239424 @@ -3306,8 +3210,6 @@ AAABAAAAAQ 256 {{57, 183}, {75, 17}} - - YES 67239424 @@ -3324,8 +3226,6 @@ AAABAAAAAQ 256 {{135, 182}, {165, 18}} - - YES 67239424 @@ -3348,8 +3248,6 @@ AAABAAAAAQ 256 {{45, 326}, {87, 17}} - - YES 67239424 @@ -3366,8 +3264,6 @@ AAABAAAAAQ 256 {{134, 326}, {196, 17}} - - YES 67239424 @@ -3384,8 +3280,6 @@ AAABAAAAAQ 256 {{335, 324}, {50, 22}} - - YES -1804468671 @@ -3436,8 +3330,6 @@ AAABAAAAAQ 256 {{390, 326}, {39, 17}} - - YES 67239424 @@ -3454,8 +3346,6 @@ AAABAAAAAQ 256 {{457, 300}, {39, 17}} - - YES 67239424 @@ -3472,8 +3362,6 @@ AAABAAAAAQ 256 {{402, 298}, {50, 22}} - - YES -1804468671 @@ -3524,8 +3412,6 @@ AAABAAAAAQ 256 {{153, 102}, {33, 17}} - - YES 67239424 @@ -3542,8 +3428,6 @@ AAABAAAAAQ 256 {{134, 300}, {263, 17}} - - YES 67239424 @@ -3560,8 +3444,6 @@ AAABAAAAAQ 256 {{135, 258}, {296, 18}} - - YES 67239424 @@ -3584,8 +3466,6 @@ AAABAAAAAQ 256 {{135, 218}, {294, 18}} - - YES 67239424 @@ -3608,8 +3488,6 @@ AAABAAAAAQ 256 {{135, 238}, {347, 18}} - - YES 67239424 @@ -3632,8 +3510,6 @@ AAABAAAAAQ 256 {{134, 280}, {379, 14}} - - YES 67239424 @@ -3650,8 +3526,6 @@ AAABAAAAAQ 256 {{153, 54}, {372, 14}} - - YES 67239424 @@ -3671,8 +3545,6 @@ AAABAAAAAQ 256 {{135, 126}, {289, 18}} - - YES 67239424 @@ -3695,8 +3567,6 @@ AAABAAAAAQ 256 {{71, 127}, {61, 17}} - - YES 67239424 @@ -3713,8 +3583,6 @@ AAABAAAAAQ 256 {{234, 76}, {291, 17}} - - YES 67239488 @@ -3731,8 +3599,6 @@ AAABAAAAAQ 256 {{150, 66}, {85, 32}} - - YES 67239424 @@ -3753,8 +3619,6 @@ AAABAAAAAQ 289 {{504, 12}, {21, 23}} - - YES 67239424 @@ -3778,8 +3642,6 @@ AAABAAAAAQ 256 {{154, 32}, {203, 18}} - - YES 67239424 @@ -3799,9 +3661,6 @@ AAABAAAAAQ {542, 366} - - - NSView NSResponder @@ -5451,22 +5310,6 @@ AAABAAAAAQ 2117 - - - setLPD: - - - - 2120 - - - - delegate - - - - 2126 - value: values.CheckQuit @@ -7679,22 +7522,6 @@ AAABAAAAAQ 2079 - - - value: values.RemoveWhenFinishSeeding - - - - - - value: values.RemoveWhenFinishSeeding - value - values.RemoveWhenFinishSeeding - 2 - - - 2125 - @@ -8011,8 +7838,6 @@ AAABAAAAAQ - - @@ -10321,32 +10146,6 @@ AAABAAAAAQ - - 2118 - - - - - - - - 2119 - - - - - 2122 - - - - - - - - 2123 - - - @@ -10654,10 +10453,6 @@ AAABAAAAAQ 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 @@ -10767,7 +10562,7 @@ AAABAAAAAQ - 2126 + 2117