Changeset 1785


Ignore:
Timestamp:
Apr 23, 2007, 7:58:21 PM (15 years ago)
Author:
joshe
Message:

Merge r1754, r1755, and r1756 from trunk.

Location:
branches/0.7x/macosx
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/0.7x/macosx/InfoWindowController.m

    r1657 r1785  
    549549               
    550550                [fPexCheck setEnabled: NO];
     551        [fPexCheck setState: NSOffState];
    551552    }
    552553   
  • branches/0.7x/macosx/Torrent.m

    r1703 r1785  
    8181    {
    8282        fUseIncompleteFolder = [fDefaults boolForKey: @"UseIncompleteDownloadFolder"];
    83         fIncompleteFolder = [[fDefaults stringForKey: @"IncompleteDownloadFolder"] copy];
     83        fIncompleteFolder = [[[fDefaults stringForKey: @"IncompleteDownloadFolder"] stringByExpandingTildeInPath] retain];
    8484       
    8585        if (!fPublicTorrent)
     
    959959        return @"";
    960960   
    961     #warning localize string after release
    962961    NSString * error;
    963962    if (!(error = [NSString stringWithUTF8String: fStat->errorString])
    964963        && !(error = [NSString stringWithCString: fStat->errorString encoding: NSISOLatin1StringEncoding]))
    965         error = @"";
    966         //error = NSLocalizedString(@"(unreadable error)", "Torrent -> error string unreadable");
     964        error = NSLocalizedString(@"(unreadable error)", "Torrent -> error string unreadable");
    967965   
    968966    return error;
  • branches/0.7x/macosx/TorrentTableView.m

    r1645 r1785  
    217217   
    218218    //select torrent closest to text that isn't before text alphabetically
     219    int row;
    219220    NSEnumerator * enumerator = [tempTorrents objectEnumerator];
    220221    Torrent * torrent;
     
    222223        if ([[torrent name] caseInsensitiveCompare: text] != NSOrderedAscending)
    223224        {
    224             [self selectRow: [fTorrents indexOfObject: torrent] byExtendingSelection: NO];
     225            row = [fTorrents indexOfObject: torrent];
    225226            break;
    226227        }
     
    228229    //select last torrent alphabetically if no match found
    229230    if (!torrent)
    230         [self selectRow: [fTorrents indexOfObject: [tempTorrents lastObject]] byExtendingSelection: NO];
     231        row = [fTorrents indexOfObject: [tempTorrents lastObject]];
     232   
     233    [self selectRow: row byExtendingSelection: NO];
     234    [self scrollRowToVisible: row];
    231235}
    232236
Note: See TracChangeset for help on using the changeset viewer.