Changeset 9126

Timestamp:

Sep 17, 2009, 1:10:18 AM (13 years ago)

Author:

livings124

Message:

show a warning whenever removing any tracker, regardless of if it's built-in

Location:

trunk/macosx

Files:

• Defaults.plist (modified) (1 diff)
• InfoWindowController.m (modified) (6 diffs)
• PrefsController.m (modified) (1 diff)

trunk/macosx/Defaults.plist

@@ -193 +193 @@
         <key>WarningRemainingSpace</key>
         <true/>
-        <key>WarningRemoveBuiltInTracker</key>
+        <key>WarningRemoveTrackers</key>
         <true/>
         <key>WarningResetStats</key>

trunk/macosx/InfoWindowController.m

@@ -1745 +1745 @@
     NSMutableIndexSet * indexes = [[[fTrackerTable selectedRowIndexes] mutableCopy] autorelease];
     
-    //get all rows to remove and determine if any built-in trackers are being remove
-    NSUInteger i = 0, numberBuiltIn = 0;
+    //get all rows to remove
+    NSUInteger i = 0, trackerCount = 0;
     while (i < [fTrackers count])
     {
-        const BOOL builtIn = i != 0 || [[fTrackers objectAtIndex: i] intValue] != 0;
-        
         //if a group is selected, remove all trackers in the group
         if ([indexes containsIndex: i])
@@ -1757 +1755 @@
             {
                 [indexes addIndex: i];
-                if (builtIn)
-                    numberBuiltIn++;
+                trackerCount++;
             }
         }
@@ -1770 +1767 @@
                 if (![indexes containsIndex: j])
                     allSelected = NO;
-                else if (builtIn)
-                    numberBuiltIn++;
-                else;
+                else
+                    trackerCount++;
             }
             
@@ -1782 +1778 @@
     }
     
-    #warning show warning and allow?
     if ([fTrackers count] == [indexes count])
     {
@@ -1791 +1786 @@
     Torrent * torrent = [fTorrents objectAtIndex: 0];
     
-    //determine if removing trackers built into the torrent
-    #warning remove?
-    if (NO && numberBuiltIn > 0 && [[NSUserDefaults standardUserDefaults] boolForKey: @"WarningRemoveBuiltInTracker"])
+    if ([[NSUserDefaults standardUserDefaults] boolForKey: @"WarningRemoveTrackers"])
     {
         NSAlert * alert = [[NSAlert alloc] init];
         
-        if (numberBuiltIn > 1)
-        {
-            [alert setMessageText: [NSString stringWithFormat:
-                                    NSLocalizedString(@"Are you sure you want to remove %d built-in trackers?",
-                                    "Remove built-in tracker alert -> title"), numberBuiltIn]];
-            [alert setInformativeText: NSLocalizedString(@"These tracker addresses are part of the torrent file."
-                " Once removed, Transmission will no longer attempt to contact them.", "Remove built-in tracker alert -> message")];
+        if (trackerCount > 1)
+        {
+            [alert setMessageText: [NSString stringWithFormat: NSLocalizedString(@"Are you sure you want to remove %d trackers?",
+                                                                "Remove trackers alert -> title"), trackerCount]];
+            [alert setInformativeText: NSLocalizedString(@"Once removed, Transmission will no longer attempt to contact them."
+                                        " This cannot be undone.", "Remove trackers alert -> message")];
         }
         else
         {
-            [alert setMessageText: NSLocalizedString(@"Are you sure you want to remove a built-in tracker?",
-                                    "Remove built-in tracker alert -> title")];
-            [alert setInformativeText: NSLocalizedString(@"The tracker address is part of the torrent file."
-                " Once removed, Transmission will no longer attempt to contact it.", "Remove built-in tracker alert -> message")];
-        }
-        
-        [alert addButtonWithTitle: NSLocalizedString(@"Remove", "Remove built-in tracker alert -> button")];
-        [alert addButtonWithTitle: NSLocalizedString(@"Cancel", "Remove built-in tracker alert -> button")];
+            [alert setMessageText: NSLocalizedString(@"Are you sure you want to remove this tracker?", "Remove trackers alert -> title")];
+            [alert setInformativeText: NSLocalizedString(@"Once removed, Transmission will no longer attempt to contact it."
+                                        " This cannot be undone.", "Remove trackers alert -> message")];
+        }
+        
+        [alert addButtonWithTitle: NSLocalizedString(@"Remove", "Remove trackers alert -> button")];
+        [alert addButtonWithTitle: NSLocalizedString(@"Cancel", "Remove trackers alert -> button")];
         
         [alert setShowsSuppressionButton: YES];
@@ -1820 +1811 @@
         NSInteger result = [alert runModal];
         if ([[alert suppressionButton] state] == NSOnState)
-            [[NSUserDefaults standardUserDefaults] setBool: NO forKey: @"WarningRemoveBuiltInTracker"];
+            [[NSUserDefaults standardUserDefaults] setBool: NO forKey: @"WarningRemoveTrackers"];
         [alert release];
         

trunk/macosx/PrefsController.m

@@ -676 +676 @@
     [fDefaults removeObjectForKey: @"WarningResetStats"];
     [fDefaults removeObjectForKey: @"WarningCreatorBlankAddress"];
-    [fDefaults removeObjectForKey: @"WarningRemoveBuiltInTracker"];
+    [fDefaults removeObjectForKey: @"WarningRemoveTrackers"];
     [fDefaults removeObjectForKey: @"WarningInvalidOpen"];
     [fDefaults removeObjectForKey: @"WarningDonate"];