From e6603def258cbd677b223f02d46effd66c59d455 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Tue, 20 Jun 2006 17:10:35 +0000 Subject: [PATCH] Comment out code so connections in Interface Builder don't need to be made and unused calculations aren't made. --- .../English.lproj/InfoWindow.nib/classes.nib | 4 --- .../InfoWindow.nib/keyedobjects.nib | Bin 27749 -> 27749 bytes macosx/InfoWindowController.h | 4 +-- macosx/InfoWindowController.m | 28 ++++++++---------- 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/macosx/English.lproj/InfoWindow.nib/classes.nib b/macosx/English.lproj/InfoWindow.nib/classes.nib index 7ea7579b0..3cb20a8f6 100644 --- a/macosx/English.lproj/InfoWindow.nib/classes.nib +++ b/macosx/English.lproj/InfoWindow.nib/classes.nib @@ -16,7 +16,6 @@ fConnectedPeersField = NSTextField; fDataLocationField = NSTextField; fDateStartedField = NSTextField; - fDownloadRateField = NSTextField; fDownloadedTotalField = NSTextField; fDownloadedValidField = NSTextField; fDownloadingFromField = NSTextField; @@ -25,7 +24,6 @@ fImageView = NSImageView; fLeechersField = NSTextField; fNameField = NSTextField; - fPercentField = NSTextField; fPieceSizeField = NSTextField; fPiecesField = NSTextField; fRatioField = NSTextField; @@ -33,11 +31,9 @@ fRatioMatrix = NSMatrix; fSeedersField = NSTextField; fSizeField = NSTextField; - fStateField = NSTextField; fTabView = NSTabView; fTorrentLocationField = NSTextField; fTrackerField = NSTextField; - fUploadRateField = NSTextField; fUploadedTotalField = NSTextField; fUploadingToField = NSTextField; }; diff --git a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib index 717e41a8f323f4382799ea88999b90a06e035fc4..a6320a7b6b363d6263b717c7629610be6777164b 100644 GIT binary patch delta 2762 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 diff --git a/macosx/InfoWindowController.h b/macosx/InfoWindowController.h index 9d971d27c..63dae1c6c 100644 --- a/macosx/InfoWindowController.h +++ b/macosx/InfoWindowController.h @@ -38,10 +38,10 @@ * fHashField, * fTorrentLocationField, * fDataLocationField, * fDateStartedField, -#if 0 +/* * fStateField, * fPercentField, * fDownloadRateField, * fUploadRateField, -#endif +*/ * fDownloadedValidField, * fDownloadedTotalField, * fUploadedTotalField, * fRatioField, * fSeedersField, * fLeechersField, * fConnectedPeersField, * fDownloadingFromField, * fUploadingToField; diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index f79579406..289bb4aef 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -108,11 +108,10 @@ [fNameField setStringValue: @"No Torrents Selected"]; [fSizeField setStringValue: @""]; -#if 0 +/* [fDownloadRateField setStringValue: @""]; [fUploadRateField setStringValue: @""]; -#endif - +*/ [fDownloadedValidField setStringValue: @""]; [fDownloadedTotalField setStringValue: @""]; [fUploadedTotalField setStringValue: @""]; @@ -137,10 +136,10 @@ [fDataLocationField setToolTip: nil]; [fDateStartedField setStringValue: @""]; -#if 0 +/* [fStateField setStringValue: @""]; [fPercentField setStringValue: @""]; -#endif +*/ [fRatioField setStringValue: @""]; [fSeedersField setStringValue: @""]; @@ -249,25 +248,24 @@ int numberSelected = [fTorrents count]; if (numberSelected > 0) { - float downloadRate = 0, uploadRate = 0, downloadedValid = 0; + //float downloadRate = 0, uploadRate = 0; + float downloadedValid = 0; uint64_t downloadedTotal = 0, uploadedTotal = 0; Torrent * torrent; NSEnumerator * enumerator = [fTorrents objectEnumerator]; while ((torrent = [enumerator nextObject])) { - downloadRate += [torrent downloadRate]; + /*downloadRate += [torrent downloadRate]; uploadRate += [torrent uploadRate]; - + */ downloadedValid += [torrent downloadedValid]; downloadedTotal += [torrent downloadedTotal]; uploadedTotal += [torrent uploadedTotal]; } - -#if 0 +/* [fDownloadRateField setStringValue: [NSString stringForSpeed: downloadRate]]; [fUploadRateField setStringValue: [NSString stringForSpeed: uploadRate]]; -#endif - +*/ [fDownloadedValidField setStringValue: [NSString stringForFileSize: downloadedValid]]; [fDownloadedTotalField setStringValue: [NSString stringForFileSize: downloadedTotal]]; [fUploadedTotalField setStringValue: [NSString stringForFileSize: uploadedTotal]]; @@ -275,13 +273,11 @@ if (numberSelected == 1) { torrent = [fTorrents objectAtIndex: 0]; - -#if 0 +/* [fStateField setStringValue: [torrent state]]; [fPercentField setStringValue: [NSString stringWithFormat: @"%.2f%%", 100.0 * [torrent progress]]]; -#endif - +*/ int seeders = [torrent seeders], leechers = [torrent leechers]; [fSeedersField setStringValue: seeders < 0 ? @"N/A" : [NSString stringWithInt: seeders]];