When filtering transfers,the amount in the status bar shows how many transfers are actually visible and the total amount.

This commit is contained in:
Mitchell Livingston 2006-07-25 02:12:18 +00:00
parent c60fd34b30
commit 44dd48fa52
4 changed files with 20 additions and 16 deletions

View File

@ -99,7 +99,6 @@
- (void) quitSheetDidEnd: (NSWindow *) sheet returnCode: (int) returnCode contextInfo: (void *) contextInfo; - (void) quitSheetDidEnd: (NSWindow *) sheet returnCode: (int) returnCode contextInfo: (void *) contextInfo;
- (NSArray *) torrentsAtIndexes: (NSIndexSet *) indexSet; - (NSArray *) torrentsAtIndexes: (NSIndexSet *) indexSet;
- (void) torrentNumberChanged;
- (void) resumeSelectedTorrents: (id) sender; - (void) resumeSelectedTorrents: (id) sender;
- (void) resumeAllTorrents: (id) sender; - (void) resumeAllTorrents: (id) sender;

View File

@ -212,8 +212,6 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
[torrent release]; [torrent release];
} }
[self torrentNumberChanged];
//set sort //set sort
fSortType = [[fDefaults stringForKey: @"Sort"] retain]; fSortType = [[fDefaults stringForKey: @"Sort"] retain];
@ -493,8 +491,6 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
[torrent release]; [torrent release];
} }
[self torrentNumberChanged];
[self updateUI: nil]; [self updateUI: nil];
[self applyFilter: nil]; [self applyFilter: nil];
@ -516,13 +512,6 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
} }
} }
- (void) torrentNumberChanged
{
int count = [fTorrents count];
[fTotalTorrentsField setStringValue: [NSString stringWithFormat:
@"%d Transfer%s", count, count == 1 ? "" : "s"]];
}
//called on by applescript //called on by applescript
- (void) open: (NSArray *) files - (void) open: (NSArray *) files
{ {
@ -721,12 +710,10 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
[[tempTorrents objectAtIndex: i] setOrderValue: i]; [[tempTorrents objectAtIndex: i] setOrderValue: i];
} }
[self torrentNumberChanged]; [fTableView deselectAll: nil];
[self updateUI: nil]; [self updateUI: nil];
[self setWindowSizeToFit]; [self applyFilter: nil];
[fTableView deselectAll: nil];
[self updateTorrentHistory]; [self updateTorrentHistory];
} }
@ -1065,6 +1052,7 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
NSMutableArray * tempTorrents = [[NSMutableArray alloc] initWithCapacity: [fTorrents count]]; NSMutableArray * tempTorrents = [[NSMutableArray alloc] initWithCapacity: [fTorrents count]];
BOOL filtering = YES;
if ([fFilterType isEqualToString: @"Pause"]) if ([fFilterType isEqualToString: @"Pause"])
{ {
NSEnumerator * enumerator = [fTorrents objectEnumerator]; NSEnumerator * enumerator = [fTorrents objectEnumerator];
@ -1090,7 +1078,10 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
[tempTorrents addObject: torrent]; [tempTorrents addObject: torrent];
} }
else else
{
filtering = NO;
[tempTorrents setArray: fTorrents]; [tempTorrents setArray: fTorrents];
}
NSString * searchString = [fSearchFilterField stringValue]; NSString * searchString = [fSearchFilterField stringValue];
if (![searchString isEqualToString: @""]) if (![searchString isEqualToString: @""])
@ -1122,6 +1113,16 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
[indexSet release]; [indexSet release];
} }
//set status bar torrents
NSMutableString * totalTorrentsString = [NSMutableString stringWithString: @""];
if (filtering)
[totalTorrentsString appendFormat: @"%d/", [fFilteredTorrents count]];
int totalCount = [fTorrents count];
[totalTorrentsString appendFormat: @"%d Transfer%s", totalCount, totalCount == 1 ? "" : "s"];
[fTotalTorrentsField setStringValue: totalTorrentsString];
[self setWindowSizeToFit]; [self setWindowSizeToFit];
} }

View File

@ -29,6 +29,10 @@
</array> </array>
<key>IBOldestOS</key> <key>IBOldestOS</key>
<integer>3</integer> <integer>3</integer>
<key>IBOpenObjects</key>
<array>
<integer>21</integer>
</array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>8J135</string> <string>8J135</string>
</dict> </dict>

Binary file not shown.