Changeset 2137

Timestamp:

Jun 17, 2007, 5:04:13 PM (15 years ago)

Author:

livings124

Message:

when dragging a non-torrent file onto the window, display an overlay to create a torrent file

Location:

branches/file_selection/macosx

Files:

• Controller.m (modified) (4 diffs)
• CreatorWindowController.h (modified) (1 diff)
• CreatorWindowController.m (modified) (1 diff)
• DragOverlayWindow.h (modified) (1 diff)
• DragOverlayWindow.m (modified) (1 diff)

branches/file_selection/macosx/Controller.m

@@ -2128 +2128 @@
     if ([[pasteboard types] containsObject: NSFilenamesPboardType])
     {
-        //check if any files can be added
+        //check if any torrent files can be added
         NSArray * files = [pasteboard propertyListForType: NSFilenamesPboardType];
         NSEnumerator * enumerator = [files objectEnumerator];
         NSString * file;
         tr_torrent_t * tempTor;
+        BOOL torrent = NO;
         while ((file = [enumerator nextObject]))
         {
@@ -2146 +2147 @@
                 return NSDragOperationCopy;
             }
+            else
+            {
+                if (error == TR_EUNSUPPORTED || error == TR_EDUPLICATE)
+                    torrent = YES;
+            }
+        }
+        
+        //create a torrent file if a single file
+        if (!torrent && [files count] == 1)
+        {
+            if (!fOverlayWindow)
+                fOverlayWindow = [[DragOverlayWindow alloc] initWithLib: fLib forWindow: fWindow];
+            [fOverlayWindow setFile: [[files objectAtIndex: 0] lastPathComponent]];
+            
+            return NSDragOperationCopy;
         }
     }
@@ -2175 +2191 @@
     if ([[pasteboard types] containsObject: NSFilenamesPboardType])
     {
+        BOOL torrent = NO, accept = YES;
+        
         //create an array of files that can be opened
         NSMutableArray * filesToOpen = [[NSMutableArray alloc] init];
-        NSEnumerator * enumerator = [[pasteboard propertyListForType: NSFilenamesPboardType] objectEnumerator];
+        NSArray * files = [pasteboard propertyListForType: NSFilenamesPboardType];
+        NSEnumerator * enumerator = [files objectEnumerator];
         NSString * file;
         tr_torrent_t * tempTor;
@@ -2187 +2206 @@
                 tr_torrentClose(tempTor);
                 [filesToOpen addObject: file];
+                
+                torrent = YES;
             }
-        }
-        
-        [self application: NSApp openFiles: filesToOpen];
+            else
+            {
+                if (error == TR_EUNSUPPORTED || error == TR_EDUPLICATE)
+                    torrent = YES;
+            }
+        }
+        
+        if ([filesToOpen count] > 0)
+            [self application: NSApp openFiles: filesToOpen];
+        else
+        {
+            if (!torrent && [files count] == 1)
+                [CreatorWindowController createTorrentFile: fLib forFile: [files objectAtIndex: 0]];
+            else
+                accept = NO;
+        }
         [filesToOpen release];
         
-        return YES;
+        return accept;
     }
     else if ([[pasteboard types] containsObject: NSURLPboardType])

branches/file_selection/macosx/CreatorWindowController.h

@@ -45 +45 @@
 
 + (void) createTorrentFile: (tr_handle_t *) handle;
++ (void) createTorrentFile: (tr_handle_t *) handle forFile: (NSString *) file;
 
 - (id) initWithWindowNibName: (NSString *) name handle: (tr_handle_t *) handle path: (NSString *) path;

branches/file_selection/macosx/CreatorWindowController.m

@@ -50 +50 @@
 }
 
++ (void) createTorrentFile: (tr_handle_t *) handle forFile: (NSString *) file
+{
+    CreatorWindowController * creator = [[self alloc] initWithWindowNibName: @"Creator" handle: handle path: file];
+    [creator showWindow: nil];
+}
+
 - (id) initWithWindowNibName: (NSString *) name handle: (tr_handle_t *) handle path: (NSString *) path
 {

branches/file_selection/macosx/DragOverlayWindow.h

@@ -34 +34 @@
 
 - (id) initWithLib: (tr_handle_t *) lib forWindow: (NSWindow *) window;
+
 - (void) setTorrents: (NSArray *) files;
+- (void) setFile: (NSString *) file;
 - (void) setURL: (NSString *) url;
 

branches/file_selection/macosx/DragOverlayWindow.m

@@ -143 +143 @@
 }
 
+- (void) setFile: (NSString *) file
+{
+        
+    [[self contentView] setOverlay: [NSImage imageNamed: @"Create.png"]
+        mainLine: NSLocalizedString(@"Create a Torrent File", "Drag overlay -> file") subLine: file];
+    
+    //stop other animation and set to same progress
+    if ([fFadeOutAnimation isAnimating])
+    {
+        [fFadeOutAnimation stopAnimation];
+        [fFadeInAnimation setCurrentProgress: 1.0 - [fFadeOutAnimation currentProgress]];
+    }
+    [self setFrame: [[self parentWindow] frame] display: YES];
+    [fFadeInAnimation startAnimation];
+}
+
+
 - (void) setURL: (NSString *) url
 {