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

macosx: Replace deprecated NSRunAlertPanel call in Controller.m

This commit is contained in:
Federico Bond 2020-09-10 02:42:53 -03:00
parent c2fb393390
commit 78e1436044
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
macosx/Controller.m
View File

@ -853,11 +853,15 @@ static void removeKeRangerRansomware()
fPendingTorrentDownloads = nil; fPendingTorrentDownloads = nil;
} }
NSRunAlertPanel(NSLocalizedString(@"Torrent download failed", "Download not a torrent -> title"), NSString * message = [NSString stringWithFormat: NSLocalizedString(@"It appears that the file \"%@\" from %@ is not a torrent file.",
[NSString stringWithFormat: NSLocalizedString(@"It appears that the file \"%@\" from %@ is not a torrent file.", "Download not a torrent -> message"), suggestedName,
"Download not a torrent -> message"), suggestedName, [[[[download request] URL] absoluteString] stringByReplacingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
[[[[download request] URL] absoluteString] stringByReplacingPercentEscapesUsingEncoding: NSUTF8StringEncoding]],
NSLocalizedString(@"OK", "Download not a torrent -> button"), nil, nil); NSAlert * alert = [[NSAlert alloc] init];
[alert addButtonWithTitle: NSLocalizedString(@"OK", "Download not a torrent -> button")];
[alert setMessageText: NSLocalizedString(@"Torrent download failed", "Download not a torrent -> title")];
[alert setInformativeText: message];
[alert runModal];
} }
else else
[download setDestination: [NSTemporaryDirectory() stringByAppendingPathComponent: [suggestedName lastPathComponent]] [download setDestination: [NSTemporaryDirectory() stringByAppendingPathComponent: [suggestedName lastPathComponent]]
@ -872,11 +876,16 @@ static void removeKeRangerRansomware()
- (void) download: (NSURLDownload *) download didFailWithError: (NSError *) error - (void) download: (NSURLDownload *) download didFailWithError: (NSError *) error
{ {
NSRunAlertPanel(NSLocalizedString(@"Torrent download failed", "Torrent download error -> title"), NSString * message = [NSString stringWithFormat: NSLocalizedString(@"The torrent could not be downloaded from %@: %@.",
[NSString stringWithFormat: NSLocalizedString(@"The torrent could not be downloaded from %@: %@.", "Torrent download failed -> message"),
"Torrent download failed -> message"), [[[[download request] URL] absoluteString] stringByReplacingPercentEscapesUsingEncoding: NSUTF8StringEncoding],
[[[[download request] URL] absoluteString] stringByReplacingPercentEscapesUsingEncoding: NSUTF8StringEncoding], [error localizedDescription]];
[error localizedDescription]], NSLocalizedString(@"OK", "Torrent download failed -> button"), nil, nil);
NSAlert * alert = [[NSAlert alloc] init];
[alert addButtonWithTitle: NSLocalizedString(@"OK", "Torrent download failed -> button")];
[alert setMessageText: NSLocalizedString(@"Torrent download failed", "Torrent download error -> title")];
[alert setInformativeText: message];
[alert runModal];
[fPendingTorrentDownloads removeObjectForKey: [[download request] URL]]; [fPendingTorrentDownloads removeObjectForKey: [[download request] URL]];
if ([fPendingTorrentDownloads count] == 0) if ([fPendingTorrentDownloads count] == 0)