diff --git a/macosx/InfoWindowController.h b/macosx/InfoWindowController.h index 4973c8432..036b3a3d8 100644 --- a/macosx/InfoWindowController.h +++ b/macosx/InfoWindowController.h @@ -39,10 +39,7 @@ * fHashField, * fTorrentLocationField, * fDataLocationField, * fDateStartedField, -/* - * fPercentField, - * fDownloadRateField, * fUploadRateField, -*/ + //* fPercentField, * fStateField, * fDownloadedValidField, * fDownloadedTotalField, * fUploadedTotalField, * fRatioField, * fSeedersField, * fLeechersField, diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index 0caad9d6c..b209cbe35 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -107,11 +107,7 @@ { [fNameField setStringValue: @"No Torrents Selected"]; [fSizeField setStringValue: @""]; - -/* - [fDownloadRateField setStringValue: @""]; - [fUploadRateField setStringValue: @""]; -*/ + [fDownloadedValidField setStringValue: @""]; [fDownloadedTotalField setStringValue: @""]; [fUploadedTotalField setStringValue: @""]; @@ -198,24 +194,17 @@ int numberSelected = [fTorrents count]; if (numberSelected > 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]; - uploadRate += [torrent uploadRate]; - */ downloadedValid += [torrent downloadedValid]; downloadedTotal += [torrent downloadedTotal]; uploadedTotal += [torrent uploadedTotal]; } -/* - [fDownloadRateField setStringValue: [NSString stringForSpeed: downloadRate]]; - [fUploadRateField setStringValue: [NSString stringForSpeed: uploadRate]]; -*/ + [fDownloadedValidField setStringValue: [NSString stringForFileSize: downloadedValid]]; [fDownloadedTotalField setStringValue: [NSString stringForFileSize: downloadedTotal]]; [fUploadedTotalField setStringValue: [NSString stringForFileSize: uploadedTotal]];