Changeset 7483

Timestamp:

Dec 24, 2008, 1:42:10 AM (12 years ago)

Author:

livings124

Message:

remove Mac's custom code to show a warning when a folder contains extra data when deleting (in preparation of implementing [7473])

Location:

trunk/macosx

Files:

• Defaults.plist (modified) (1 diff)
• PrefsController.m (modified) (1 diff)
• Torrent.m (modified) (1 diff)
• en.lproj/Localizable.strings (modified) (11 diffs)

trunk/macosx/Defaults.plist

@@ -175 +175 @@
         <key>UseIncompleteDownloadFolder</key>
         <false/>
-        <key>WarningCheckContentsForRemove</key>
-        <true/>
         <key>WarningCreatorBlankAddress</key>
         <true/>

trunk/macosx/PrefsController.m

@@ -636 +636 @@
     [fDefaults removeObjectForKey: @"WarningRemoveBuiltInTracker"];
     [fDefaults removeObjectForKey: @"WarningInvalidOpen"];
-    [fDefaults removeObjectForKey: @"WarningCheckContentsForRemove"];
 }
 

trunk/macosx/Torrent.m

@@ -454 +454 @@
 - (void) trashData
 {
-    if ([self isFolder] && [fDefaults boolForKey: @"WarningCheckContentsForRemove"])
-    {
-        NSEnumerator * enumerator = [[NSFileManager defaultManager] enumeratorAtPath: [self dataLocation]];
-        NSString * file;
-        while ((file = [enumerator nextObject]))
-        {
-            NSArray * actualComponents = [file pathComponents];
-            if ([[actualComponents lastObject] hasPrefix: @"."])
-                continue;
-            
-            BOOL isExtra = YES;
-        
-            NSEnumerator * nodeEnumerator = [fFlatFileList objectEnumerator];
-            FileListNode * node;
-            while ((node = [nodeEnumerator nextObject]))
-            {
-                NSArray * listedComponents = [[node fullPath] pathComponents];
-                if ([listedComponents count]-1 < [actualComponents count])
-                    continue;
-                
-                //remove first component (the folder name) and only include the same number of levels
-                listedComponents = [listedComponents objectsAtIndexes: [NSIndexSet indexSetWithIndexesInRange:
-                                    NSMakeRange(1, [actualComponents count])]];
-                
-                if ([listedComponents isEqualToArray: actualComponents])
-                {
-                    isExtra = NO;
-                    break;
-                }
-            }
-            
-            if (!isExtra)
-                continue;
-
-            NSLog(@"Extra file found: %@", file);
-            
-            NSAlert * alert = [[NSAlert alloc] init];
-            [alert setMessageText: [NSString stringWithFormat: NSLocalizedString(@"\"%@\" contains extra content.",
-                                                        "Delete folder with extra contents -> title"), [self name]]];
-            [alert setInformativeText: NSLocalizedString(@"The directory contains data that is not part of the transfer."
-                " Are you sure you want to move this directory to the trash?", "Delete folder with extra contents -> message")];
-            [alert addButtonWithTitle: NSLocalizedString(@"Trash", "Delete folder with extra contents -> button")];
-            [alert addButtonWithTitle: NSLocalizedString(@"Keep", "Delete folder with extra contents -> button")];
-            
-            BOOL onLeopard = [NSApp isOnLeopardOrBetter];
-            if (onLeopard)
-            {
-                [alert setShowsSuppressionButton: YES];
-                [[alert suppressionButton] setTitle: NSLocalizedString(@"Do not check directory contents again",
-                                                        "Delete folder with extra contents -> button")];
-            }
-            else
-                [alert addButtonWithTitle: NSLocalizedString(@"Never Check", "Delete folder with extra contents -> button")];
-
-            NSInteger result = [alert runModal];
-            if ((onLeopard ? [[alert suppressionButton] state] == NSOnState : result == NSAlertThirdButtonReturn))
-                [fDefaults setBool: NO forKey: @"WarningCheckContentsForRemove"];
-            [alert release];
-            
-            if (result == NSAlertSecondButtonReturn)
-                return;
-            else
-                break;
-        }
-    }
-    
     [self trashFile: [self dataLocation]];
 }

trunk/macosx/en.lproj/Localizable.strings

@@ -126 +126 @@
 "\"%@\" cannot be used. The transfer will be paused." = "\"%@\" cannot be used. The transfer will be paused.";
 
-/* Delete folder with extra contents -> title */
-"\"%@\" contains extra content." = "\"%@\" contains extra content.";
-
 /* Open invalid alert -> title */
 "\"%@\" is not a valid torrent file." = "\"%@\" is not a valid torrent file.";
@@ -156 +153 @@
 "Add" = "Add";
 
-/* Groups -> rule editor -> button */
-"All criteria must be met to assign a transfer on add." = "All criteria must be met to assign a transfer on add.";
+/* Groups -> rule editor -> all/any */
+"All" = "All";
 
 /* Groups -> Button */
@@ -164 +161 @@
 /* Torrent disk space alert -> button */
 "Always Download" = "Always Download";
+
+/* Groups -> rule editor -> all/any */
+"Any" = "Any";
 
 /* All toolbar item -> label */
@@ -282 +282 @@
 "Creation of \"%@\" failed." = "Creation of \"%@\" failed.";
 
+/* Groups -> rule editor -> button (All/Any criteria must....) */
+"criteria must be met to assign a transfer on add." = "criteria must be met to assign a transfer on add.";
+
 /* Inspector -> peer -> status */
 "Currently downloading (interested and not choked)" = "Currently downloading (interested and not choked)";
@@ -298 +301 @@
    status bar -> status label */
 "DL" = "DL";
-
-/* Delete folder with extra contents -> button */
-"Do not check directory contents again" = "Do not check directory contents again";
 
 /* Torrent disk space alert -> button */
@@ -441 +441 @@
 "KB" = "KB";
 
-/* Delete folder with extra contents -> button */
-"Keep" = "Keep";
-
 /* Prefs -> blocklist -> message */
 "Last updated" = "Last updated";
@@ -485 +482 @@
 /* Prefs -> blocklist -> message */
 "Never" = "Never";
-
-/* Delete folder with extra contents -> button */
-"Never Check" = "Never Check";
 
 /* Group table row */
@@ -543 +537 @@
 "Open Torrent Address" = "Open Torrent Address";
 
+/* Open toolbar item -> palette label */
+"Open Torrent Files" = "Open Torrent Files";
+
 /* Open toolbar item -> tooltip */
 "Open torrent files" = "Open torrent files";
-
-/* Open toolbar item -> palette label */
-"Open Torrent Files" = "Open Torrent Files";
 
 /* Open address toolbar item -> tooltip */
@@ -714 +708 @@
 "Seeding" = "Seeding";
 
+/* Torrent -> status string */
+"Seeding complete" = "Seeding complete";
+
 /* Growl notification title */
 "Seeding Complete" = "Seeding Complete";
-
-/* Torrent -> status string */
-"Seeding complete" = "Seeding complete";
 
 /* Torrent -> status string */
@@ -801 +795 @@
 "The destination directory and root data directory have the same name." = "The destination directory and root data directory have the same name.";
 
-/* Delete folder with extra contents -> message */
-"The directory contains data that is not part of the transfer. Are you sure you want to move this directory to the trash?" = "The directory contains data that is not part of the transfer. Are you sure you want to move this directory to the trash?";
-
 /* Default folder cannot be used alert -> message */
 "The download folder cannot be used. Choose a new location." = "The download folder cannot be used. Choose a new location.";
@@ -932 +923 @@
 "Transmission is already running." = "Transmission is already running.";
 
-/* Delete folder with extra contents -> button */
-"Trash" = "Trash";
-
 /* Torrent -> status string
    status bar -> status label */