Changeset 9431

Timestamp:

Oct 29, 2009, 1:44:54 AM (13 years ago)

Author:

livings124

Message:

remove the mac's redundant location check when adding a transfer

Location:

trunk/macosx

Files:

• Controller.m (modified) (2 diffs)
• InfoWindowController.m (modified) (2 diffs)

trunk/macosx/Controller.m

@@ -833 +833 @@
 - (void) openFiles: (NSArray *) filenames addType: (addType) type forcePath: (NSString *) path
 {
-    #warning checks could probably be removed, since location is checked when starting
-    if (!path && [fDefaults boolForKey: @"UseIncompleteDownloadFolder"]
-        && access([[[fDefaults stringForKey: @"IncompleteDownloadFolder"] stringByExpandingTildeInPath] UTF8String], 0))
-    {
-        NSOpenPanel * panel = [NSOpenPanel openPanel];
-        
-        [panel setPrompt: NSLocalizedString(@"Select", "Default incomplete folder cannot be used alert -> prompt")];
-        [panel setAllowsMultipleSelection: NO];
-        [panel setCanChooseFiles: NO];
-        [panel setCanChooseDirectories: YES];
-        [panel setCanCreateDirectories: YES];
-
-        [panel setMessage: NSLocalizedString(@"The incomplete folder cannot be used. Choose a new location or cancel for none.",
-                                        "Default incomplete folder cannot be used alert -> message")];
-        
-        NSDictionary * dict = [[NSDictionary alloc] initWithObjectsAndKeys: filenames, @"Filenames",
-                                                        [NSNumber numberWithInt: type], @"AddType", nil];
-        
-        [panel beginSheetForDirectory: nil file: nil types: nil modalForWindow: fWindow modalDelegate: self
-                didEndSelector: @selector(incompleteChoiceClosed:returnCode:contextInfo:) contextInfo: dict];
-        return;
-    }
-    
-    if (!path && [fDefaults boolForKey: @"DownloadLocationConstant"]
-        && access([[[fDefaults stringForKey: @"DownloadFolder"] stringByExpandingTildeInPath] UTF8String], 0))
-    {
-        NSOpenPanel * panel = [NSOpenPanel openPanel];
-        
-        [panel setPrompt: NSLocalizedString(@"Select", "Default folder cannot be used alert -> prompt")];
-        [panel setAllowsMultipleSelection: NO];
-        [panel setCanChooseFiles: NO];
-        [panel setCanChooseDirectories: YES];
-        [panel setCanCreateDirectories: YES];
-
-        [panel setMessage: NSLocalizedString(@"The download folder cannot be used. Choose a new location.",
-                                        "Default folder cannot be used alert -> message")];
-        
-        NSDictionary * dict = [[NSDictionary alloc] initWithObjectsAndKeys: filenames, @"Filenames",
-                                                        [NSNumber numberWithInt: type], @"AddType", nil];
-        
-        [panel beginSheetForDirectory: nil file: nil types: nil modalForWindow: fWindow modalDelegate: self
-                didEndSelector: @selector(downloadChoiceClosed:returnCode:contextInfo:) contextInfo: dict];
-        return;
-    }
-    
     BOOL deleteTorrentFile, canToggleDelete = NO;
     switch (type)
@@ -1928 +1883 @@
     [self sortTorrentsIgnoreSelected]; //actually sort
     
-    [fTableView selectValues: selectedValues];
+    //[fTableView selectValues: selectedValues];
 }
 

trunk/macosx/InfoWindowController.m

@@ -1035 +1035 @@
         }
         
-        //determing status strings from flags 
+        //determing status strings from flags
         NSMutableArray * statusArray = [NSMutableArray arrayWithCapacity: 6];
         NSString * flags = [peer objectForKey: @"Flags"];
@@ -1531 +1531 @@
                                 [upDownComponents componentsJoinedByString: @", "]];
         }
+        else
+            connectedText = [connectedText stringByAppendingFormat: @"\n%@", knownString];
         
         [fConnectedPeersField setStringValue: connectedText];