mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

a little cleanup to the peer count code

This commit is contained in:
Mitchell Livingston 2009-09-28 15:59:17 +00:00
parent bc0411ca50
commit 9f04b0846e
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
macosx/TrackerCell.m
View File

@ -50,6 +50,7 @@
- (NSAttributedString *) attributedNameWithColor: (NSColor *) color; - (NSAttributedString *) attributedNameWithColor: (NSColor *) color;
- (NSAttributedString *) attributedStatusWithString: (NSString *) statusString color: (NSColor *) color; - (NSAttributedString *) attributedStatusWithString: (NSString *) statusString color: (NSColor *) color;
- (NSAttributedString *) attributedCount: (NSInteger) count color: (NSColor *) color;
@end @end
@ -135,21 +136,15 @@ NSMutableSet * fTrackerIconLoading;
[nameString drawInRect: nameRect]; [nameString drawInRect: nameRect];
//count strings //count strings
NSString * seederBaseString = [node totalSeeders] != -1 ? [NSString stringWithFormat: @"%d", [node totalSeeders]] NSAttributedString * seederString = [self attributedCount: [node totalSeeders] color: statusColor];
: NSLocalizedString(@"N/A", "tracker peer stat");
NSAttributedString * seederString = [self attributedStatusWithString: seederBaseString color: statusColor];
const NSRect seederRect = [self rectForCountWithString: seederString withAboveRect: nameRect inBounds: cellFrame]; const NSRect seederRect = [self rectForCountWithString: seederString withAboveRect: nameRect inBounds: cellFrame];
[seederString drawInRect: seederRect]; [seederString drawInRect: seederRect];
NSString * leecherBaseString = [node totalLeechers] != -1 ? [NSString stringWithFormat: @"%d", [node totalLeechers]] NSAttributedString * leecherString = [self attributedCount: [node totalLeechers] color: statusColor];
: NSLocalizedString(@"N/A", "tracker peer stat");
NSAttributedString * leecherString = [self attributedStatusWithString: leecherBaseString color: statusColor];
const NSRect leecherRect = [self rectForCountWithString: leecherString withAboveRect: seederRect inBounds: cellFrame]; const NSRect leecherRect = [self rectForCountWithString: leecherString withAboveRect: seederRect inBounds: cellFrame];
[leecherString drawInRect: leecherRect]; [leecherString drawInRect: leecherRect];
NSString * downloadedBaseString = [node totalDownloaded] != -1 ? [NSString stringWithFormat: @"%d", [node totalDownloaded]] NSAttributedString * downloadedString = [self attributedCount: [node totalDownloaded] color: statusColor];
: NSLocalizedString(@"N/A", "tracker peer stat");
NSAttributedString * downloadedString = [self attributedStatusWithString: downloadedBaseString color: statusColor];
const NSRect downloadedRect = [self rectForCountWithString: downloadedString withAboveRect: leecherRect inBounds: cellFrame]; const NSRect downloadedRect = [self rectForCountWithString: downloadedString withAboveRect: leecherRect inBounds: cellFrame];
[downloadedString drawInRect: downloadedRect]; [downloadedString drawInRect: downloadedRect];
@ -297,19 +292,25 @@ NSMutableSet * fTrackerIconLoading;
- (NSAttributedString *) attributedNameWithColor: (NSColor *) color - (NSAttributedString *) attributedNameWithColor: (NSColor *) color
{ {
if (color) [fNameAttributes setObject: color forKey: NSForegroundColorAttributeName];
[fNameAttributes setObject: color forKey: NSForegroundColorAttributeName];
NSString * name = [(TrackerNode *)[self objectValue] host]; NSString * name = [(TrackerNode *)[self objectValue] host];
return [[[NSAttributedString alloc] initWithString: name attributes: fNameAttributes] autorelease]; return [[[NSAttributedString alloc] initWithString: name attributes: fNameAttributes] autorelease];
} }
- (NSAttributedString *) attributedStatusWithString: (NSString *) statusString color: (NSColor *) color - (NSAttributedString *) attributedStatusWithString: (NSString *) statusString color: (NSColor *) color
{ {
if (color) [fStatusAttributes setObject: color forKey: NSForegroundColorAttributeName];
[fStatusAttributes setObject: color forKey: NSForegroundColorAttributeName];
return [[[NSAttributedString alloc] initWithString: statusString attributes: fStatusAttributes] autorelease]; return [[[NSAttributedString alloc] initWithString: statusString attributes: fStatusAttributes] autorelease];
} }
- (NSAttributedString *) attributedCount: (NSInteger) count color: (NSColor *) color
{
[fStatusAttributes setObject: color forKey: NSForegroundColorAttributeName];
NSString * countString = count != -1 ? [NSString stringWithFormat: @"%d", count] : NSLocalizedString(@"N/A", "tracker peer stat");
return [[[NSAttributedString alloc] initWithString: countString attributes: fStatusAttributes] autorelease];
}
@end @end