#4712 Gray out the 'Display a window when adding a magnet link' option, whenever 'Same directory as torrent' is selected

macosx/PrefsController.h

@@ -42,6 +42,7 @@
     IBOutlet NSButton * fCheckForUpdatesButton, * fCheckForUpdatesBetaButton;
     
     IBOutlet NSPopUpButton * fFolderPopUp, * fIncompleteFolderPopUp, * fImportFolderPopUp, * fDoneScriptPopUp;
+    IBOutlet NSButton * fShowMagnetAddWindowCheck;
     IBOutlet NSTextField * fRatioStopField, * fIdleStopField, * fQueueDownloadField, * fQueueSeedField, * fStalledField;
 
     IBOutlet NSTextField * fUploadField, * fDownloadField,
@@ -124,6 +125,9 @@
 
 - (void) setRenamePartialFiles: (id) sender;
 
+- (IBAction) setShowAddMagnetWindow: (id) sender;
+- (void) updateShowAddMagnetWindowField;
+
 - (void) setDoneScriptEnabled: (id) sender;
 - (void) doneScriptSheetShow: (id) sender;
 

macosx/PrefsController.m

@@ -110,6 +110,9 @@
         if ([fDefaults boolForKey: @"AutoImport"] && (autoPath = [fDefaults stringForKey: @"AutoImportDirectory"]))
             [[(Controller *)[NSApp delegate] fileWatcherQueue] addPath: [autoPath stringByExpandingTildeInPath] notifyingAbout: VDKQueueNotifyAboutWrite];
         
+        //set special-handling of magnet link add window checkbox
+        [self updateShowAddMagnetWindowField];
+        
         //set blocklist scheduler
         [[BlocklistScheduler scheduler] updateSchedule];
         
@@ -820,6 +823,7 @@
 - (void) setDownloadLocation: (id) sender
 {
     [fDefaults setBool: [fFolderPopUp indexOfSelectedItem] == DOWNLOAD_FOLDER forKey: @"DownloadLocationConstant"];
+    [self updateShowAddMagnetWindowField];
 }
 
 - (void) folderSheetShow: (id) sender
@@ -839,7 +843,8 @@
             
             NSString * folder = [[[panel URLs] objectAtIndex: 0] path];
             [fDefaults setObject: folder forKey: @"DownloadFolder"];
-            [fDefaults setObject: @"Constant" forKey: @"DownloadChoice"];
+            [fDefaults setBool: YES forKey: @"DownloadLocationConstant"];
+            [self updateShowAddMagnetWindowField];
             
             tr_sessionSetDownloadDir(fHandle, [folder UTF8String]);
         }
@@ -908,6 +913,26 @@
     tr_sessionSetIncompleteFileNamingEnabled(fHandle, [fDefaults boolForKey: @"RenamePartialFiles"]);
 }
 
+- (void) setShowAddMagnetWindow: (id) sender
+{
+    [fDefaults setBool: ([fShowMagnetAddWindowCheck state] == NSOnState) forKey: @"MagnetOpenAsk"];
+}
+
+- (void) updateShowAddMagnetWindowField
+{
+    if (![fDefaults boolForKey: @"DownloadLocationConstant"])
+    {
+        //always show the add window for magnet links when the download location is the same as the torrent file
+        [fShowMagnetAddWindowCheck setState: NSOnState];
+        [fShowMagnetAddWindowCheck setEnabled: NO];
+    }
+    else
+    {
+        [fShowMagnetAddWindowCheck setState: [fDefaults boolForKey: @"MagnetOpenAsk"]];
+        [fShowMagnetAddWindowCheck setEnabled: YES];
+    }
+}
+
 - (void) setDoneScriptEnabled: (id) sender
 {
     if ([fDefaults boolForKey: @"DoneScriptEnabled"] && ![[NSFileManager defaultManager] fileExistsAtPath: [fDefaults stringForKey:@"DoneScriptPath"]])