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

add progress of checking

This commit is contained in:
Mitchell Livingston 2007-07-24 01:45:14 +00:00
parent dd55805012
commit c9f9a07415
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
macosx/English.lproj/Localizable.strings
View File

Binary file not shown.

10
macosx/Torrent.m
View File

@ -357,7 +357,8 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
break; break;
case TR_STATUS_CHECK: case TR_STATUS_CHECK:
tempString = [NSLocalizedString(@"Checking existing data", "Torrent -> status string") stringByAppendingEllipsis]; tempString = [NSString stringWithFormat: NSLocalizedString(@"Checking existing data (%.2f%%)",
"Torrent -> status string"), 100.0 * fStat->recheckProgress];
[statusString setString: tempString]; [statusString setString: tempString];
[shortStatusString setString: tempString]; [shortStatusString setString: tempString];
@ -990,7 +991,12 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
break; break;
case TR_STATUS_CHECK: case TR_STATUS_CHECK:
return [NSLocalizedString(@"Checking existing data", "Torrent -> status string") stringByAppendingEllipsis]; return [NSString stringWithFormat: NSLocalizedString(@"Checking existing data (%.2f%%)",
"Torrent -> status string"), 100.0 * fStat->recheckProgress];
break;
case TR_STATUS_CHECK_WAIT:
return [NSLocalizedString(@"Waiting to check existing data", "Torrent -> status string") stringByAppendingEllipsis];
break; break;
case TR_STATUS_DOWNLOAD: case TR_STATUS_DOWNLOAD:

11
macosx/TorrentTableView.m
View File

@ -248,8 +248,12 @@
torrent = [fTorrents objectAtIndex: i]; torrent = [fTorrents objectAtIndex: i];
rect = [self pauseRectForRow: i]; rect = [self pauseRectForRow: i];
if ([torrent isActive] && ![torrent isChecking]) image = nil;
image = NSPointInRect(fClickPoint, rect) ? fPauseOnIcon : fPauseOffIcon; if ([torrent isActive])
{
if (![torrent isChecking])
image = NSPointInRect(fClickPoint, rect) ? fPauseOnIcon : fPauseOffIcon;
}
else if ([torrent isPaused]) else if ([torrent isPaused])
{ {
if ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask && [fDefaults boolForKey: @"Queue"]) if ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask && [fDefaults boolForKey: @"Queue"])
@ -259,8 +263,7 @@
else else
image = NSPointInRect(fClickPoint, rect) ? fResumeOnIcon : fResumeOffIcon; image = NSPointInRect(fClickPoint, rect) ? fResumeOnIcon : fResumeOffIcon;
} }
else else;
image = nil;
if (image) if (image)
[image compositeToPoint: NSMakePoint(rect.origin.x, NSMaxY(rect)) operation: NSCompositeSourceOver]; [image compositeToPoint: NSMakePoint(rect.origin.x, NSMaxY(rect)) operation: NSCompositeSourceOver];