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

some more fixes with url dragging and url download error messages

This commit is contained in:
Mitchell Livingston 2006-11-22 01:06:31 +00:00
parent baf3b48c3d
commit a7c35c00dc
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
macosx/Controller.m
View File

@ -498,7 +498,8 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
NSRunAlertPanel(NSLocalizedString(@"Torrent download failed", NSRunAlertPanel(NSLocalizedString(@"Torrent download failed",
@"Download not a torrent -> title"), [NSString stringWithFormat: @"Download not a torrent -> title"), [NSString stringWithFormat:
NSLocalizedString(@"It appears that the file \"%@\" from %@ is not a torrent file.", NSLocalizedString(@"It appears that the file \"%@\" from %@ is not a torrent file.",
@"Download not a torrent -> message"), suggestedName, [[[download request] URL] absoluteString]], @"Download not a torrent -> message"), suggestedName,
[[[[download request] URL] absoluteString] stringByReplacingPercentEscapesUsingEncoding: NSUTF8StringEncoding]],
NSLocalizedString(@"OK", @"Download not a torrent -> button"), nil, nil); NSLocalizedString(@"OK", @"Download not a torrent -> button"), nil, nil);
[download release]; [download release];
@ -519,7 +520,8 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
NSRunAlertPanel(NSLocalizedString(@"Torrent download failed", NSRunAlertPanel(NSLocalizedString(@"Torrent download failed",
@"Torrent download error -> title"), [NSString stringWithFormat: @"Torrent download error -> title"), [NSString stringWithFormat:
NSLocalizedString(@"The torrent could not be downloaded from %@ because an error occurred (%@).", NSLocalizedString(@"The torrent could not be downloaded from %@ because an error occurred (%@).",
@"Torrent download failed -> message"), [[[download request] URL] absoluteString], @"Torrent download failed -> message"),
[[[[download request] URL] absoluteString] stringByReplacingPercentEscapesUsingEncoding: NSUTF8StringEncoding],
[error localizedDescription]], NSLocalizedString(@"OK", @"Torrent download failed -> button"), nil, nil); [error localizedDescription]], NSLocalizedString(@"OK", @"Torrent download failed -> button"), nil, nil);
[fPendingTorrentDownloads removeObjectForKey: [[download request] URL]]; [fPendingTorrentDownloads removeObjectForKey: [[download request] URL]];
@ -1840,15 +1842,13 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
[self application: NSApp openFiles: filesToOpen]; [self application: NSApp openFiles: filesToOpen];
[filesToOpen release]; [filesToOpen release];
} }
else if ([[pasteboard types] containsObject: NSURLPboardType])
if ([[pasteboard types] containsObject: NSURLPboardType])
{ {
NSURL * url; NSURL * url;
if ((url = [NSURL URLFromPasteboard: pasteboard])) if ((url = [NSURL URLFromPasteboard: pasteboard]))
[self openURL: url]; [self openURL: url];
} }
else if ([[pasteboard types] containsObject: TORRENT_TABLE_VIEW_DATA_TYPE])
if ([[pasteboard types] containsObject: TORRENT_TABLE_VIEW_DATA_TYPE])
{ {
//remember selected rows if needed //remember selected rows if needed
NSArray * selectedTorrents = nil; NSArray * selectedTorrents = nil;
@ -1900,6 +1900,7 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
[indexSet release]; [indexSet release];
} }
} }
else;
return YES; return YES;
} }