diff --git a/macosx/English.lproj/InfoWindow.nib/classes.nib b/macosx/English.lproj/InfoWindow.nib/classes.nib index 3797ea429..939e8cb79 100644 --- a/macosx/English.lproj/InfoWindow.nib/classes.nib +++ b/macosx/English.lproj/InfoWindow.nib/classes.nib @@ -39,6 +39,7 @@ fSeedersField = NSTextField; fSizeField = NSTextField; fStateField = NSTextField; + fSwarmSpeedField = NSTextField; fTabView = NSTabView; fTorrentLocationField = NSTextField; fTrackerField = NSTextField; diff --git a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib index 02a75c18e..59e3a73d1 100644 Binary files a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib and b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib differ diff --git a/macosx/InfoWindowController.h b/macosx/InfoWindowController.h index 6b4f10a95..ccd0fcfb1 100644 --- a/macosx/InfoWindowController.h +++ b/macosx/InfoWindowController.h @@ -44,7 +44,7 @@ * fStateField, * fDownloadedValidField, * fDownloadedTotalField, * fUploadedTotalField, * fRatioField, * fSeedersField, * fLeechersField, - * fConnectedPeersField, * fDownloadingFromField, * fUploadingToField; + * fConnectedPeersField, * fDownloadingFromField, * fUploadingToField, * fSwarmSpeedField; IBOutlet NSTableView * fPeerTable; IBOutlet NSTextField * fPeerTableStatusField; diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index 7daaaf872..d63c64a0a 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -40,7 +40,7 @@ //15 spacing at the bottom of each tab #define TAB_INFO_HEIGHT 182.0 -#define TAB_ACTIVITY_HEIGHT 214.0 +#define TAB_ACTIVITY_HEIGHT 230.0 #define TAB_PEERS_HEIGHT 255.0 #define TAB_FILES_HEIGHT 255.0 #define TAB_OPTIONS_HEIGHT 116.0 @@ -166,6 +166,7 @@ [fConnectedPeersField setStringValue: @""]; [fDownloadingFromField setStringValue: @""]; [fUploadingToField setStringValue: @""]; + [fSwarmSpeedField setStringValue: @""]; [fPeers removeAllObjects]; [fPeerTable reloadData]; @@ -267,6 +268,8 @@ [fRatioField setStringValue: [NSString stringForRatioWithDownload: downloadedTotal upload: uploadedTotal]]; + [fSwarmSpeedField setStringValue: [torrent isActive] ? [NSString stringForSpeed: [torrent swarmSpeed]] : @""]; + //set peers table [fPeers setArray: [torrent peers]]; [fPeers sortUsingDescriptors: [self peerSortDescriptors]]; diff --git a/macosx/Torrent.h b/macosx/Torrent.h index 64035a207..4b16a6572 100644 --- a/macosx/Torrent.h +++ b/macosx/Torrent.h @@ -132,6 +132,7 @@ - (float) downloadedValid; - (uint64_t) downloadedTotal; - (uint64_t) uploadedTotal; +- (float) swarmSpeed; - (NSNumber *) orderValue; - (void) setOrderValue: (int) orderValue; diff --git a/macosx/Torrent.m b/macosx/Torrent.m index afcfd8922..b9590e641 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -612,6 +612,11 @@ return fStat->uploaded; } +- (float) swarmSpeed +{ + return fStat->swarmspeed; +} + - (NSNumber *) orderValue { return [NSNumber numberWithInt: fOrderValue];