diff --git a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib index a6320a7b6..6c0984001 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.m b/macosx/InfoWindowController.m index 289bb4aef..4264fcda2 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -33,13 +33,13 @@ #define MAX_WINDOW_WIDTH 2000 #define TAB_INFO_IDENT @"Info" -#define TAB_STATUS_IDENT @"Status" +#define TAB_ACTIVITY_IDENT @"Activity" #define TAB_OPTIONS_IDENT @"Options" #define TAB_FILES_IDENT @"Files" //15 spacing at the bottom of each tab #define TAB_INFO_HEIGHT 185.0 -#define TAB_STATUS_HEIGHT 199.0 +#define TAB_ACTIVITY_HEIGHT 199.0 #define TAB_OPTIONS_HEIGHT 82.0 #define TAB_FILES_HEIGHT 250.0 @@ -327,8 +327,8 @@ NSString * identifier = [tabViewItem identifier]; if ([identifier isEqualToString: TAB_INFO_IDENT]) height = TAB_INFO_HEIGHT; - else if ([identifier isEqualToString: TAB_STATUS_IDENT]) - height = TAB_STATUS_HEIGHT; + else if ([identifier isEqualToString: TAB_ACTIVITY_IDENT]) + height = TAB_ACTIVITY_HEIGHT; else if ([identifier isEqualToString: TAB_OPTIONS_IDENT]) height = TAB_OPTIONS_HEIGHT; else @@ -422,8 +422,7 @@ NSEnumerator * enumerator = [fTorrents objectEnumerator]; float ratioLimit = [sender floatValue]; - if (![[sender stringValue] isEqualToString: - [NSString stringWithFormat: @"%.2f", ratioLimit]] + if (![[sender stringValue] isEqualToString: [NSString stringWithFormat: @"%.2f", ratioLimit]] || ratioLimit < 0) { NSBeep(); diff --git a/macosx/Torrent.h b/macosx/Torrent.h index ec9e152f5..e1585aefd 100644 --- a/macosx/Torrent.h +++ b/macosx/Torrent.h @@ -97,7 +97,7 @@ - (BOOL) publicTorrent; - (BOOL) privateTorrent; -- (NSString *) state; +//- (NSString *) state; - (float) progress; - (BOOL) isActive; diff --git a/macosx/Torrent.m b/macosx/Torrent.m index ee60e7ab3..5a9ca9b16 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -381,7 +381,7 @@ return fPrivateTorrent; } -- (NSString *) state +/*- (NSString *) state { switch( fStat->status ) { @@ -408,7 +408,7 @@ default: return @"N/A"; } -} +}*/ - (float) progress {