From: Mitchell Livingston Date: Sun, 19 Jul 2009 19:14:01 +0000 (+0000) Subject: remove ability to remove .torrent files for the ui X-Git-Tag: 1.74~151 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=30502116f69ea0e255a5ca62080397c15ce60b01;p=transmission remove ability to remove .torrent files for the ui --- diff --git a/macosx/Controller.h b/macosx/Controller.h index a9f6c5205..bd2b419f0 100644 --- a/macosx/Controller.h +++ b/macosx/Controller.h @@ -140,15 +140,12 @@ typedef enum - (void) stopAllTorrents: (id) sender; - (void) stopTorrents: (NSArray *) torrents; -- (void) removeTorrents: (NSArray *) torrents - deleteData: (BOOL) deleteData deleteTorrent: (BOOL) deleteData; +- (void) removeTorrents: (NSArray *) torrents deleteData: (BOOL) deleteData; - (void) removeSheetDidEnd: (NSWindow *) sheet returnCode: (NSInteger) returnCode contextInfo: (NSDictionary *) dict; -- (void) confirmRemoveTorrents: (NSArray *) torrents deleteData: (BOOL) deleteData deleteTorrent: (BOOL) deleteTorrent; +- (void) confirmRemoveTorrents: (NSArray *) torrents deleteData: (BOOL) deleteData; - (void) removeNoDelete: (id) sender; - (void) removeDeleteData: (id) sender; -- (void) removeDeleteTorrent: (id) sender; -- (void) removeDeleteDataAndTorrent: (id) sender; - (void) moveDataFilesSelected: (id) sender; - (void) moveDataFiles: (NSArray *) torrents; diff --git a/macosx/Controller.m b/macosx/Controller.m index b38b8aaad..17acdada1 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -1145,7 +1145,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy [self updateTorrentHistory]; } -- (void) removeTorrents: (NSArray *) torrents deleteData: (BOOL) deleteData deleteTorrent: (BOOL) deleteTorrent +- (void) removeTorrents: (NSArray *) torrents deleteData: (BOOL) deleteData { [torrents retain]; NSInteger active = 0, downloading = 0; @@ -1164,32 +1164,23 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy { NSDictionary * dict = [[NSDictionary alloc] initWithObjectsAndKeys: torrents, @"Torrents", - [NSNumber numberWithBool: deleteData], @"DeleteData", - [NSNumber numberWithBool: deleteTorrent], @"DeleteTorrent", nil]; + [NSNumber numberWithBool: deleteData], @"DeleteData", nil]; NSString * title, * message; - NSInteger selected = [torrents count]; + const NSInteger selected = [torrents count]; if (selected == 1) { NSString * torrentName = [[torrents objectAtIndex: 0] name]; - if (!deleteData && !deleteTorrent) - title = [NSString stringWithFormat: - NSLocalizedString(@"Are you sure you want to remove \"%@\" from the transfer list?", - "Removal confirm panel -> title"), torrentName]; - else if (deleteData && !deleteTorrent) + if (deleteData) title = [NSString stringWithFormat: NSLocalizedString(@"Are you sure you want to remove \"%@\" from the transfer list" " and trash the data file?", "Removal confirm panel -> title"), torrentName]; - else if (!deleteData && deleteTorrent) - title = [NSString stringWithFormat: - NSLocalizedString(@"Are you sure you want to remove \"%@\" from the transfer list" - " and trash the torrent file?", "Removal confirm panel -> title"), torrentName]; else title = [NSString stringWithFormat: - NSLocalizedString(@"Are you sure you want to remove \"%@\" from the transfer list" - " and trash both the data and torrent files?", "Removal confirm panel -> title"), torrentName]; + NSLocalizedString(@"Are you sure you want to remove \"%@\" from the transfer list?", + "Removal confirm panel -> title"), torrentName]; message = NSLocalizedString(@"This transfer is active." " Once removed, continuing the transfer will require the torrent file.", @@ -1197,22 +1188,14 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy } else { - if (!deleteData && !deleteTorrent) - title = [NSString stringWithFormat: - NSLocalizedString(@"Are you sure you want to remove %d transfers from the transfer list?", - "Removal confirm panel -> title"), selected]; - else if (deleteData && !deleteTorrent) + if (deleteData) title = [NSString stringWithFormat: NSLocalizedString(@"Are you sure you want to remove %d transfers from the transfer list" - " and trash the data file?", "Removal confirm panel -> title"), selected]; - else if (!deleteData && deleteTorrent) - title = [NSString stringWithFormat: - NSLocalizedString(@"Are you sure you want to remove %d transfers from the transfer list" - " and trash the torrent file?", "Removal confirm panel -> title"), selected]; + " and trash the data files?", "Removal confirm panel -> title"), selected]; else title = [NSString stringWithFormat: - NSLocalizedString(@"Are you sure you want to remove %d transfers from the transfer list" - " and trash both the data and torrent files?", "Removal confirm panel -> title"), selected]; + NSLocalizedString(@"Are you sure you want to remove %d transfers from the transfer list?", + "Removal confirm panel -> title"), selected]; if (selected == active) message = [NSString stringWithFormat: NSLocalizedString(@"There are %d active transfers.", @@ -1232,22 +1215,21 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy } } - [self confirmRemoveTorrents: torrents deleteData: deleteData deleteTorrent: deleteTorrent]; + [self confirmRemoveTorrents: torrents deleteData: deleteData]; } - (void) removeSheetDidEnd: (NSWindow *) sheet returnCode: (NSInteger) returnCode contextInfo: (NSDictionary *) dict { NSArray * torrents = [dict objectForKey: @"Torrents"]; if (returnCode == NSAlertDefaultReturn) - [self confirmRemoveTorrents: torrents deleteData: [[dict objectForKey: @"DeleteData"] boolValue] - deleteTorrent: [[dict objectForKey: @"DeleteTorrent"] boolValue]]; + [self confirmRemoveTorrents: torrents deleteData: [[dict objectForKey: @"DeleteData"] boolValue]]; else [torrents release]; [dict release]; } -- (void) confirmRemoveTorrents: (NSArray *) torrents deleteData: (BOOL) deleteData deleteTorrent: (BOOL) deleteTorrent +- (void) confirmRemoveTorrents: (NSArray *) torrents deleteData: (BOOL) deleteData { //don't want any of these starting then stopping for (Torrent * torrent in torrents) @@ -1262,8 +1244,6 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy if (deleteData) [torrent trashData]; - if (deleteTorrent) - [torrent trashTorrent]; [torrent closeRemoveTorrent]; } @@ -1277,22 +1257,12 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy - (void) removeNoDelete: (id) sender { - [self removeTorrents: [fTableView selectedTorrents] deleteData: NO deleteTorrent: NO]; + [self removeTorrents: [fTableView selectedTorrents] deleteData: NO]; } - (void) removeDeleteData: (id) sender { - [self removeTorrents: [fTableView selectedTorrents] deleteData: YES deleteTorrent: NO]; -} - -- (void) removeDeleteTorrent: (id) sender -{ - [self removeTorrents: [fTableView selectedTorrents] deleteData: NO deleteTorrent: YES]; -} - -- (void) removeDeleteDataAndTorrent: (id) sender -{ - [self removeTorrents: [fTableView selectedTorrents] deleteData: YES deleteTorrent: YES]; + [self removeTorrents: [fTableView selectedTorrents] deleteData: YES]; } - (void) moveDataFilesSelected: (id) sender @@ -3540,26 +3510,19 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy return canUseTable && [fTableView numberOfSelectedRows] > 0; //enable remove items - if (action == @selector(removeNoDelete:) || action == @selector(removeDeleteData:) - || action == @selector(removeDeleteTorrent:) || action == @selector(removeDeleteDataAndTorrent:)) + if (action == @selector(removeNoDelete:) || action == @selector(removeDeleteData:)) { - BOOL warning = NO, - onlyDownloading = [fDefaults boolForKey: @"CheckRemoveDownloading"], - canDelete = action != @selector(removeDeleteTorrent:) && action != @selector(removeDeleteDataAndTorrent:); + BOOL warning = NO; for (Torrent * torrent in [fTableView selectedTorrents]) { - if (!warning && [torrent isActive]) - { - warning = onlyDownloading ? ![torrent isSeeding] : YES; - if (warning && canDelete) - break; - } - if (!canDelete && [torrent publicTorrent]) + if ([torrent isActive]) { - canDelete = YES; - if (warning) + if ([fDefaults boolForKey: @"CheckRemoveDownloading"] ? ![torrent isSeeding] : YES) + { + warning = YES; break; + } } } @@ -3576,7 +3539,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy [menuItem setTitle: [title substringToIndex: [title rangeOfString: ellipsis].location]]; } - return canUseTable && canDelete && [fTableView numberOfSelectedRows] > 0; + return canUseTable && [fTableView numberOfSelectedRows] > 0; } //enable pause all item @@ -4123,7 +4086,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy - (void) rpcRemoveTorrent: (Torrent *) torrent { - [self confirmRemoveTorrents: [[NSArray arrayWithObject: torrent] retain] deleteData: NO deleteTorrent: NO]; + [self confirmRemoveTorrents: [[NSArray arrayWithObject: torrent] retain] deleteData: NO]; [torrent release]; } diff --git a/macosx/en.lproj/MainMenu.xib b/macosx/en.lproj/MainMenu.xib index b5b7c4b75..18f457b4f 100644 --- a/macosx/en.lproj/MainMenu.xib +++ b/macosx/en.lproj/MainMenu.xib @@ -8,8 +8,9 @@ 353.00 YES + - + YES @@ -2691,26 +2692,6 @@ zTTNVc11zYbNps3HzefOCM4ozknOac6KzqrOus7bzvvPHM88z13Pfc+ez77P38/v0ADQINBB0GHQgtCi 4 - - - Remove Torrent File - - 1572864 - 2147483647 - - - 4 - - - - Remove All Files - - 1048576 - 2147483647 - - - 4 - YES @@ -3153,26 +3134,6 @@ zTTNVc11zYbNps3HzefOCM4ozknOac6KzqrOus7bzvvPHM88z13Pfc+ez77P38/v0ADQINBB0GHQgtCi 4 - - - Remove Torrent File - - 1572864 - 2147483647 - - - 4 - - - - Remove All Files - - 1048576 - 2147483647 - - - 4 - YES @@ -4989,14 +4950,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 1547 - - - removeDeleteTorrent: - - - - 1548 - removeNoDelete: @@ -5013,14 +4966,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 1555 - - - removeDeleteTorrent: - - - - 1556 - linkHomepage: @@ -5077,22 +5022,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 1584 - - - removeDeleteDataAndTorrent: - - - - 1585 - - - - removeDeleteDataAndTorrent: - - - - 1586 - fFilterBar @@ -6826,8 +6755,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - - @@ -6891,16 +6818,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - - 1544 - - - - - 1545 - - - 1566 @@ -7082,8 +6999,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - - @@ -7135,16 +7050,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - - 1552 - - - - - 1553 - - - 1808 @@ -8443,18 +8348,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 1539.ImportedFromIB2 1541.IBPluginDependency 1541.ImportedFromIB2 - 1544.IBPluginDependency - 1544.ImportedFromIB2 - 1545.IBPluginDependency - 1545.ImportedFromIB2 1550.IBPluginDependency 1550.ImportedFromIB2 1551.IBPluginDependency 1551.ImportedFromIB2 - 1552.IBPluginDependency - 1552.ImportedFromIB2 - 1553.IBPluginDependency - 1553.ImportedFromIB2 1558.IBPluginDependency 1558.ImportedFromIB2 1559.IBPluginDependency @@ -9009,7 +8906,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin - {{376, 427}, {293, 373}} + {{376, 467}, {293, 333}} com.apple.InterfaceBuilder.CocoaPlugin {{446, 528}, {293, 373}} @@ -9081,14 +8978,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - {{382, 705}, {457, 23}} com.apple.InterfaceBuilder.CocoaPlugin @@ -9492,7 +9381,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{529, 336}, {277, 273}} + {{529, 376}, {277, 233}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -9590,8 +9479,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA openURLEndSheet: openURLShowSheet: removeDeleteData: - removeDeleteDataAndTorrent: - removeDeleteTorrent: removeNoDelete: resumeAllTorrents: resumeSelectedTorrents: @@ -9688,8 +9575,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA id id id - id - id