Changeset 2475


Ignore:
Timestamp:
Jul 24, 2007, 1:45:14 AM (13 years ago)
Author:
livings124
Message:

add progress of checking

Location:
trunk/macosx
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/English.lproj/Localizable.strings

    r2438 r2475  
    153153
    154154/* Torrent -> status string */
    155 "Checking existing data" = "Checking existing data";
     155"Checking existing data (%.2f%%)" = "Checking existing data (%.2f%%)";
    156156
    157157/* Preferences -> Network -> port status */
     
    321321"Open" = "Open";
    322322
     323/* Open toolbar item -> palette label */
     324"Open Torrent Files" = "Open Torrent Files";
     325
    323326/* Open toolbar item -> tooltip */
    324327"Open torrent files" = "Open torrent files";
    325 
    326 /* Open toolbar item -> palette label */
    327 "Open Torrent Files" = "Open Torrent Files";
    328328
    329329/* Pause toolbar item -> label */
  • trunk/macosx/Torrent.m

    r2473 r2475  
    358358
    359359        case TR_STATUS_CHECK:
    360             tempString = [NSLocalizedString(@"Checking existing data", "Torrent -> status string") stringByAppendingEllipsis];
     360            tempString = [NSString stringWithFormat: NSLocalizedString(@"Checking existing data (%.2f%%)",
     361                                    "Torrent -> status string"), 100.0 * fStat->recheckProgress];
    361362           
    362363            [statusString setString: tempString];
     
    991992
    992993        case TR_STATUS_CHECK:
    993             return [NSLocalizedString(@"Checking existing data", "Torrent -> status string") stringByAppendingEllipsis];
     994            return [NSString stringWithFormat: NSLocalizedString(@"Checking existing data (%.2f%%)",
     995                                    "Torrent -> status string"), 100.0 * fStat->recheckProgress];
     996            break;
     997       
     998        case TR_STATUS_CHECK_WAIT:
     999            return [NSLocalizedString(@"Waiting to check existing data", "Torrent -> status string") stringByAppendingEllipsis];
    9941000            break;
    9951001
  • trunk/macosx/TorrentTableView.m

    r2473 r2475  
    249249        rect  = [self pauseRectForRow: i];
    250250       
    251         if ([torrent isActive] && ![torrent isChecking])
    252             image = NSPointInRect(fClickPoint, rect) ? fPauseOnIcon : fPauseOffIcon;
     251        image = nil;
     252        if ([torrent isActive])
     253        {
     254            if (![torrent isChecking])
     255                image = NSPointInRect(fClickPoint, rect) ? fPauseOnIcon : fPauseOffIcon;
     256        }
    253257        else if ([torrent isPaused])
    254258        {
     
    260264                image = NSPointInRect(fClickPoint, rect) ? fResumeOnIcon : fResumeOffIcon;
    261265        }
    262         else
    263             image = nil;
     266        else;
    264267       
    265268        if (image)
Note: See TracChangeset for help on using the changeset viewer.