From 681ba0ed25823b29c5d77f22bb3e8324dd5a0c45 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Tue, 20 Jun 2006 17:19:15 +0000 Subject: [PATCH] Status is now Activity, commented out now-unused method --- .../InfoWindow.nib/keyedobjects.nib | Bin 27749 -> 27751 bytes macosx/InfoWindowController.m | 11 +++++------ macosx/Torrent.h | 2 +- macosx/Torrent.m | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib index a6320a7b6b363d6263b717c7629610be6777164b..6c0984001268beb7f6abbf6eaad2948b3d73f795 100644 GIT binary patch delta 5278 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 RHZxx^UorIw&u}3){$IUWJIDY4 delta 5340 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 F`8Of7R6PIy 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 {