Changeset 716 for trunk

Timestamp:

Aug 2, 2006, 12:04:04 AM (16 years ago)

Author:

livings124

Message:

Holding down option and using the open menu item now ignores the default download location and asks where to download.

Location:

trunk/macosx

Files:

• Controller.h (modified) (2 diffs)
• Controller.m (modified) (6 diffs)
• English.lproj/MainMenu.nib/classes.nib (modified) (1 diff)
• English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)

trunk/macosx/Controller.h

@@ -54 +54 @@
     NSToolbar                       * fToolbar;
     
+    IBOutlet NSMenuItem             * fOpenIgnoreDownloadFolder;
+    
     IBOutlet NSMenuItem             * fAdvancedBarItem, * fSmallViewItem,
                                     * fSpeedLimitItem, * fSpeedLimitDockItem;
@@ -92 +94 @@
 }
 
-- (void) openShowSheet:   (id) sender;
-- (void) openSheetClosed: (NSOpenPanel *) s returnCode: (int) code contextInfo: (void *) info;
+- (void) openFiles: (NSArray *) filenames;
+- (void) openFiles: (NSArray *) filenames ignoreDownloadFolder: (BOOL) ignore;
+- (void) openShowSheet: (id) sender;
 
 - (void) quitSheetDidEnd: (NSWindow *) sheet returnCode: (int) returnCode contextInfo: (void *) contextInfo;

trunk/macosx/Controller.m

@@ -431 +431 @@
 }
 
+- (NSArray *) torrentsAtIndexes: (NSIndexSet *) indexSet
+{
+    if ([fFilteredTorrents respondsToSelector: @selector(objectsAtIndexes:)])
+        return [fFilteredTorrents objectsAtIndexes: indexSet];
+    else
+    {
+        NSMutableArray * torrents = [NSMutableArray arrayWithCapacity: [indexSet count]];
+        unsigned int i;
+        for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
+            [torrents addObject: [fFilteredTorrents objectAtIndex: i]];
+
+        return torrents;
+    }
+}
+
 - (void) folderChoiceClosed: (NSOpenPanel *) openPanel returnCode: (int) code
     contextInfo: (Torrent *) torrent
@@ -447 +462 @@
 
 - (void) application: (NSApplication *) sender openFiles: (NSArray *) filenames
+{
+    [self openFiles: filenames ignoreDownloadFolder: NO];
+}
+
+- (void) openFiles: (NSArray *) filenames ignoreDownloadFolder: (BOOL) ignore
 {
     NSString * downloadChoice = [fDefaults stringForKey: @"DownloadChoice"], * torrentPath;
@@ -460 +480 @@
             noteNewRecentDocumentURL: [NSURL fileURLWithPath: torrentPath]];
 
-        if ([downloadChoice isEqualToString: @"Ask"])
+        if (ignore || [downloadChoice isEqualToString: @"Ask"])
         {
             NSOpenPanel * panel = [NSOpenPanel openPanel];
@@ -499 +519 @@
 }
 
-- (NSArray *) torrentsAtIndexes: (NSIndexSet *) indexSet
-{
-    if ([fFilteredTorrents respondsToSelector: @selector(objectsAtIndexes:)])
-        return [fFilteredTorrents objectsAtIndexes: indexSet];
-    else
-    {
-        NSMutableArray * torrents = [NSMutableArray arrayWithCapacity: [indexSet count]];
-        unsigned int i;
-        for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-            [torrents addObject: [fFilteredTorrents objectAtIndex: i]];
-
-        return torrents;
-    }
-}
-
 //called on by applescript
 - (void) open: (NSArray *) files
 {
-    [self performSelectorOnMainThread: @selector(openFromSheet:) withObject: files waitUntilDone: NO];
+    [self performSelectorOnMainThread: @selector(openFiles:) withObject: files waitUntilDone: NO];
+}
+
+- (void) openFiles: (NSArray *) filenames
+{
+    [self openFiles: filenames ignoreDownloadFolder: NO];
 }
 
@@ -530 +540 @@
     [panel beginSheetForDirectory: nil file: nil types: [NSArray arrayWithObject: @"torrent"]
         modalForWindow: fWindow modalDelegate: self didEndSelector:
-        @selector(openSheetClosed:returnCode:contextInfo:) contextInfo: nil];
-}
-
-- (void) openSheetClosed: (NSOpenPanel *) panel returnCode: (int) code contextInfo: (void *) info
+        @selector(openSheetClosed:returnCode:contextInfo:)
+        contextInfo: [NSNumber numberWithBool: sender == fOpenIgnoreDownloadFolder]];
+}
+
+- (void) openSheetClosed: (NSOpenPanel *) panel returnCode: (int) code contextInfo: (NSNumber *) ignore
 {
     if (code == NSOKButton)
-        [self performSelectorOnMainThread: @selector(openFromSheet:) withObject: [panel filenames] waitUntilDone: NO];
-}
-
-- (void) openFromSheet: (NSArray *) filenames
-{
-    [self application: NSApp openFiles: filenames];
+    {
+        NSDictionary * dictionary = [[NSDictionary alloc] initWithObjectsAndKeys:
+                                        [panel filenames], @"Files", ignore, @"Ignore", nil];
+        [self performSelectorOnMainThread: @selector(openFromSheet:) withObject: dictionary waitUntilDone: NO];
+    }
+}
+
+- (void) openFromSheet: (NSDictionary *) dictionary
+{
+    [self openFiles: [dictionary objectForKey: @"Files"]
+        ignoreDownloadFolder: [[dictionary objectForKey: @"Ignore"] boolValue]];
+    
+    [dictionary release];
 }
 
@@ -1431 +1449 @@
         {
             oldCount = [fTorrents count];
-            [self openFromSheet: [NSArray arrayWithObject: [path stringByAppendingPathComponent: file]]];
+            [self openFiles: [NSArray arrayWithObject: [path stringByAppendingPathComponent: file]]];
             
             //import only actually happened if the torrent array is larger

trunk/macosx/English.lproj/MainMenu.nib/classes.nib

@@ -52 +52 @@
                 fNextInfoTabItem = NSMenuItem; 
                 fNoFilterButton = BarButton; 
+                fOpenIgnoreDownloadFolder = NSMenuItem; 
                 fOrderSortActionItem = NSMenuItem; 
                 fOrderSortItem = NSMenuItem; 

trunk/macosx/English.lproj/MainMenu.nib/info.nib

@@ -14 +14 @@
                 <string>337 545 477 67 0 0 1152 842 </string>
                 <key>29</key>
-                <string>207 725 451 44 0 0 1152 842 </string>
+                <string>227 675 451 44 0 0 1152 842 </string>
                 <key>456</key>
                 <string>396 374 216 206 0 0 1152 842 </string>