Changeset 9433


Ignore:
Timestamp:
Oct 29, 2009, 2:45:58 AM (13 years ago)
Author:
livings124
Message:

trivial cleanup and update strings file

Location:
trunk/macosx
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/Controller.m

    r9432 r9433  
    847847    }
    848848   
    849     tr_info info;
    850849    for (NSString * torrentPath in filenames)
    851850    {
     
    853852        tr_ctor * ctor = tr_ctorNew(fLib);
    854853        tr_ctorSetMetainfoFromFile(ctor, [torrentPath UTF8String]);
    855         tr_parse_result result = tr_torrentParse(ctor, &info);
     854       
     855        tr_info info;
     856        const tr_parse_result result = tr_torrentParse(ctor, &info);
     857        tr_ctorFree(ctor);
     858       
    856859        if (result != TR_PARSE_OK)
    857860        {
     
    866869                NSAssert2(NO, @"Unknown error code (%d) when attempting to open \"%@\"", result, torrentPath);
    867870           
    868             tr_ctorFree(ctor);
    869871            tr_metainfoFree(&info);
    870872            continue;
    871873        }
    872        
    873         tr_ctorFree(ctor);
    874874       
    875875        //determine download location
     
    889889       
    890890        //determine to show the options window
    891         BOOL showWindow = type == ADD_SHOW_OPTIONS || ([fDefaults boolForKey: @"DownloadAsk"]
    892                             && (info.isMultifile || ![fDefaults boolForKey: @"DownloadAskMulti"])
    893                             && (type != ADD_AUTO || ![fDefaults boolForKey: @"DownloadAskManual"]));
     891        const BOOL showWindow = type == ADD_SHOW_OPTIONS || ([fDefaults boolForKey: @"DownloadAsk"]
     892                                    && (info.isMultifile || ![fDefaults boolForKey: @"DownloadAskMulti"])
     893                                    && (type != ADD_AUTO || ![fDefaults boolForKey: @"DownloadAskManual"]));
    894894        tr_metainfoFree(&info);
    895895       
     
    20012001        if ([torrent isActive] && ![torrent isCheckingWaiting])
    20022002        {
     2003            const BOOL isActive = ![torrent isStalled];
     2004            if (isActive)
     2005                active++;
     2006           
    20032007            if ([torrent isSeeding])
    20042008            {
    20052009                seeding++;
    2006                 BOOL isActive = ![torrent isStalled];
    2007                 if (isActive)
    2008                     active++;
    2009                
    20102010                if (filterStatus && !((filterActive && isActive) || filterSeed))
    20112011                    continue;
     
    20142014            {
    20152015                downloading++;
    2016                 BOOL isActive = ![torrent isStalled];
    2017                 if (isActive)
    2018                     active++;
    2019                
    20202016                if (filterStatus && !((filterActive && isActive) || filterDownload))
    20212017                    continue;
  • trunk/macosx/en.lproj/Localizable.strings

    r9405 r9433  
    5151   Status Bar -> speed tooltip */
    5252"%d KB/s" = "%d KB/s";
     53
     54/* Inspector -> Peers tab -> peers */
     55"%d known" = "%d known";
    5356
    5457/* Status bar transfer count */
     
    286289"DL" = "DL";
    287290
     291/* Inspector -> Peers tab -> peers */
     292"DL from %d" = "DL from %d";
     293
    288294/* Torrent disk space alert -> button */
    289295"Do not check disk space again" = "Do not check disk space again";
     
    509515/* files tab -> tooltip */
    510516"Normal Priority" = "Normal Priority";
     517
     518/* Inspector -> Peers tab -> peers */
     519"Not Connected" = "Not Connected";
    511520
    512521/* Torrent disk space alert -> title */
     
    738747/* Create torrent -> location sheet -> button
    739748   Create torrent -> select file
    740    Default folder cannot be used alert -> prompt
    741    Default incomplete folder cannot be used alert -> prompt
    742749   Move torrent -> prompt
    743750   Open torrent -> prompt
     
    821828"The directory \"%@\" does not currently exist. Create this directory or choose a different one to create the torrent file." = "The directory \"%@\" does not currently exist. Create this directory or choose a different one to create the torrent file.";
    822829
    823 /* Default folder cannot be used alert -> message */
    824 "The download folder cannot be used. Choose a new location." = "The download folder cannot be used. Choose a new location.";
    825 
    826 /* Default incomplete folder cannot be used alert -> message */
    827 "The incomplete folder cannot be used. Choose a new location or cancel for none." = "The incomplete folder cannot be used. Choose a new location or cancel for none.";
    828 
    829830/* Move error alert -> message
    830831   Move inside itself alert -> message */
     
    950951"UL" = "UL";
    951952
     953/* Inspector -> Peers tab -> peers */
     954"UL to %d" = "UL to %d";
     955
    952956/* File Outline -> Menu */
    953957"Uncheck Selected" = "Uncheck Selected";
Note: See TracChangeset for help on using the changeset viewer.