Changeset 1089 for trunk


Ignore:
Timestamp:
Nov 14, 2006, 5:27:43 AM (15 years ago)
Author:
livings124
Message:

When loading from url, if set to download at the torrent location ask the user for a location instead

Location:
trunk/macosx
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/Badger.m

    r1088 r1089  
    100100
    101101    //set upload and download rate badges
    102     NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults];
    103     NSString * uploadRateString = uploadRate >= 0.1 && [defaults boolForKey: @"BadgeUploadRate"]
    104                                     ? [NSString stringForSpeedAbbrev: uploadRate] : nil,
    105             * downloadRateString = downloadRate >= 0.1 && [defaults boolForKey: @"BadgeDownloadRate"]
    106                                     ? [NSString stringForSpeedAbbrev: downloadRate] : nil;
     102    NSString * uploadRateString = uploadRate >= 0.1 && [[NSUserDefaults standardUserDefaults]
     103                    boolForKey: @"BadgeUploadRate"] ? [NSString stringForSpeedAbbrev: uploadRate] : nil,
     104            * downloadRateString = downloadRate >= 0.1 && [[NSUserDefaults standardUserDefaults]
     105                    boolForKey: @"BadgeDownloadRate"] ? [NSString stringForSpeedAbbrev: downloadRate] : nil;
    107106   
    108107    if (uploadRateString || downloadRateString)
  • trunk/macosx/Controller.m

    r1088 r1089  
    526526    NSString * path = [[fPendingTorrentDownloads objectForKey: [[download request] URL]] objectForKey: @"Path"];
    527527   
    528     [self openFiles: [NSArray arrayWithObject: path] ignoreDownloadFolder: NO forceDeleteTorrent: YES];
     528    [self openFiles: [NSArray arrayWithObject: path] ignoreDownloadFolder:
     529        ![[fDefaults stringForKey: @"DownloadChoice"] isEqualToString: @"Constant"] forceDeleteTorrent: YES];
    529530   
    530531    [fPendingTorrentDownloads removeObjectForKey: [[download request] URL]];
     
    17751776        [filesToOpen release];
    17761777    }
    1777     else if ([[pasteboard types] containsObject: NSURLPboardType])
     1778   
     1779    if ([[pasteboard types] containsObject: NSURLPboardType])
    17781780    {
    17791781        NSURL * url;
    1780         if ((url = [NSURL URLFromPasteboard:pasteboard]))
     1782        if ((url = [NSURL URLFromPasteboard: pasteboard]))
    17811783            [self openURL: url];
    17821784    }
    1783     else if ([[pasteboard types] containsObject: TORRENT_TABLE_VIEW_DATA_TYPE])
     1785   
     1786    if ([[pasteboard types] containsObject: TORRENT_TABLE_VIEW_DATA_TYPE])
    17841787    {
    17851788        //remember selected rows if needed
     
    18331836        }
    18341837    }
    1835     else;
    18361838   
    18371839    return YES;
Note: See TracChangeset for help on using the changeset viewer.