From fbf0e3a99ad3e6a7659d3ef49419d0defe933da5 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Sun, 22 Nov 2009 00:50:38 +0000 Subject: [PATCH] #2592 remove swarm speed from the mac ui --- macosx/InfoWindowController.h | 2 +- macosx/InfoWindowController.m | 2 - macosx/en.lproj/InfoWindow.xib | 157 +++++++-------------------------- 3 files changed, 34 insertions(+), 127 deletions(-) diff --git a/macosx/InfoWindowController.h b/macosx/InfoWindowController.h index 9301007f6..e0559a807 100644 --- a/macosx/InfoWindowController.h +++ b/macosx/InfoWindowController.h @@ -48,7 +48,7 @@ * fCreatorField, * fDateCreatedField, * fStateField, * fProgressField, * fHaveField, * fDownloadedTotalField, * fUploadedTotalField, * fFailedHashField, - * fRatioField, * fSwarmSpeedField; + * fRatioField; IBOutlet NSTextView * fCommentView; IBOutlet NSButton * fRevealDataButton; diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index 90cdc250a..62b352378 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -348,7 +348,6 @@ typedef enum [fStateField setStringValue: @""]; [fProgressField setStringValue: @""]; - [fSwarmSpeedField setStringValue: @""]; [fErrorMessageView setString: @""]; [fErrorMessageView setSelectable: NO]; @@ -1417,7 +1416,6 @@ typedef enum [fProgressField setStringValue: [NSString localizedStringWithFormat: @"%.2f%%", 100.0 * [torrent progress]]]; [fRatioField setStringValue: [NSString stringForRatio: [torrent ratio]]]; - [fSwarmSpeedField setStringValue: [torrent isActive] ? [NSString stringForSpeed: [torrent swarmSpeed]] : @""]; NSString * errorMessage = [torrent errorMessage]; if (![errorMessage isEqualToString: [fErrorMessageView string]]) diff --git a/macosx/en.lproj/InfoWindow.xib b/macosx/en.lproj/InfoWindow.xib index 4319391a9..ec478066d 100644 --- a/macosx/en.lproj/InfoWindow.xib +++ b/macosx/en.lproj/InfoWindow.xib @@ -2,18 +2,18 @@ 1050 - 10B504 + 10C540 740 - 1038.2 - 437.00 + 1038.25 + 458.00 com.apple.InterfaceBuilder.CocoaPlugin 740 YES - - + + YES @@ -423,7 +423,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA {1.79769e+308, 1.79769e+308} - + 258 YES @@ -884,20 +884,21 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA {350, 210} + NSView NSResponder - + 258 YES 268 - {{10, 207}, {74, 14}} + {{10, 192}, {74, 14}} YES @@ -913,7 +914,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA 266 - {{85, 207}, {166, 14}} + {{85, 192}, {166, 14}} YES @@ -930,7 +931,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA 268 - {{25, 191}, {59, 14}} + {{25, 176}, {59, 14}} YES @@ -946,7 +947,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA 266 - {{85, 191}, {166, 14}} + {{85, 176}, {166, 14}} YES @@ -963,7 +964,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA 268 - {{49, 159}, {35, 14}} + {{49, 144}, {35, 14}} YES @@ -979,7 +980,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA 266 - {{85, 159}, {158, 14}} + {{85, 144}, {158, 14}} YES @@ -996,7 +997,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA 268 - {{50, 223}, {34, 14}} + {{50, 208}, {34, 14}} YES @@ -1012,7 +1013,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA 266 - {{85, 223}, {166, 14}} + {{85, 208}, {166, 14}} YES @@ -1029,7 +1030,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA 268 - {{50, 255}, {34, 14}} + {{50, 240}, {34, 14}} YES @@ -1045,7 +1046,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA 266 - {{85, 255}, {166, 14}} + {{85, 240}, {166, 14}} YES @@ -1059,39 +1060,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA - - - 268 - {{14, 143}, {70, 14}} - - YES - - 67239424 - 71303168 - Swarm Rate: - - - - - - - - - 266 - {{85, 143}, {166, 14}} - - YES - - 67239488 - 272631808 - - - N/A - - - - - 265 @@ -1107,7 +1075,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA NeXT TIFF v4.0 pasteboard type - {{255, 178}, {91, 91}} + {{255, 163}, {91, 91}} YES @@ -1224,7 +1192,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA 0.94565220000000005 - {{85, 82}, {265, 58}} + {{85, 83}, {265, 58}} 18 @@ -1235,7 +1203,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA 268 - {{50, 127}, {34, 14}} + {{50, 128}, {34, 14}} YES @@ -1399,7 +1367,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA 266 - {{9, 271}, {296, 14}} + {{9, 256}, {296, 14}} YES @@ -1470,7 +1438,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA 265 - {{251, 160}, {99, 15}} + {{251, 145}, {99, 15}} YES @@ -1503,7 +1471,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA 268 - {{30, 239}, {54, 14}} + {{30, 224}, {54, 14}} YES @@ -1519,7 +1487,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA 266 - {{85, 239}, {166, 14}} + {{85, 224}, {166, 14}} YES @@ -1536,7 +1504,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA 268 - {{15, 175}, {69, 14}} + {{15, 160}, {69, 14}} YES @@ -1552,7 +1520,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA 266 - {{85, 175}, {166, 14}} + {{85, 160}, {166, 14}} YES @@ -1567,7 +1535,8 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA - {360, 290} + {360, 275} + NSView @@ -1752,7 +1721,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA NSResponder - + 274 YES @@ -2228,7 +2197,6 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAwOQA {{1, 17}, {336, 209}} - 4 @@ -2262,7 +2230,6 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAwOQA {{1, 0}, {336, 17}} - 4 @@ -2271,7 +2238,6 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAwOQA {{10, 44}, {338, 227}} - 562 @@ -2392,7 +2358,6 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAwOQA {{1, 17}, {336, 48}} - 4 @@ -2426,7 +2391,6 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAwOQA {{1, 0}, {336, 17}} - 4 @@ -2435,7 +2399,6 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAwOQA {{10, 275}, {338, 66}} - 562 @@ -2446,12 +2409,11 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAwOQA {358, 346} - NSView NSResponder - + 274 YES @@ -2584,7 +2546,6 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAwOQA {{1, 1}, {307, 324}} - 4 @@ -2612,7 +2573,6 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAwOQA {{10, 34}, {320, 326}} - 18 @@ -2683,7 +2643,6 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAwOQA {340, 365} - NSView @@ -3566,14 +3525,6 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAwOQA 1131 - - - fSwarmSpeedField - - - - 1132 - fErrorMessageView @@ -4330,10 +4281,7 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAwOQA - - - @@ -4349,6 +4297,7 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAwOQA + Activity @@ -4443,24 +4392,6 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAwOQA - - 1006 - - - YES - - - - - - 1007 - - - YES - - - - 1008 @@ -5070,16 +5001,6 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAwOQA - - 1517 - - - - - 1518 - - - 1519 @@ -5748,10 +5669,6 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAwOQA 1004.ImportedFromIB2 1005.IBPluginDependency 1005.ImportedFromIB2 - 1006.IBPluginDependency - 1006.ImportedFromIB2 - 1007.IBPluginDependency - 1007.ImportedFromIB2 1008.CustomClassName 1008.IBPluginDependency 1008.ImportedFromIB2 @@ -5909,8 +5826,6 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAwOQA 1514.IBPluginDependency 1515.IBPluginDependency 1516.IBPluginDependency - 1517.IBPluginDependency - 1518.IBPluginDependency 1519.IBPluginDependency 1520.IBPluginDependency 1521.IBPluginDependency @@ -6147,10 +6062,6 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAwOQA com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - PiecesView com.apple.InterfaceBuilder.CocoaPlugin @@ -6335,8 +6246,6 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAwOQA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -6517,7 +6426,7 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAwOQA com.apple.InterfaceBuilder.CocoaPlugin - {{409, 632}, {360, 290}} + {{409, 647}, {360, 275}} com.apple.InterfaceBuilder.CocoaPlugin {{274, 636}, {360, 290}}