Changeset 13121 for trunk/macosx/Controller.m

Timestamp:

Dec 29, 2011, 6:40:17 PM (11 years ago)

Author:

livings124

Message:

#4688 On Lion use new dragging functionality, allowing for the count of dragged files to appear under the mouse pointer

File:

• trunk/macosx/Controller.m (modified) (6 diffs)

trunk/macosx/Controller.m

@@ -115 +115 @@
 #define GROWL_AUTO_SPEED_LIMIT  @"Speed Limit Auto Changed"
 
+#warning remove when Lion-only
 #define TORRENT_TABLE_VIEW_DATA_TYPE    @"TorrentTableViewDataType"
 
@@ -399 +400 @@
                                 "Main window -> 3rd bottom left button (remove all) tooltip")];
     
-    [fTableView registerForDraggedTypes: [NSArray arrayWithObject: TORRENT_TABLE_VIEW_DATA_TYPE]];
+    [fTableView registerForDraggedTypes: [NSArray arrayWithObjects: TORRENT_TABLE_VIEW_DATA_TYPE, NSPasteboardTypeString, nil]];
     [fWindow registerForDraggedTypes: [NSArray arrayWithObjects: NSFilenamesPboardType, NSURLPboardType, nil]];
     
@@ -2476 +2477 @@
 }
 
+#warning remove when Lion-only
 - (BOOL) outlineView: (NSOutlineView *) outlineView writeItems: (NSArray *) items toPasteboard: (NSPasteboard *) pasteboard
 {
@@ -2490 +2492 @@
         }
         
-        [pasteboard declareTypes: [NSArray arrayWithObject: TORRENT_TABLE_VIEW_DATA_TYPE] owner: self];
         [pasteboard setData: [NSKeyedArchiver archivedDataWithRootObject: indexSet] forType: TORRENT_TABLE_VIEW_DATA_TYPE];
         return YES;
@@ -2497 +2498 @@
 }
 
-- (NSDragOperation) outlineView: (NSOutlineView *) outlineView validateDrop: (id < NSDraggingInfo >) info proposedItem: (id) item
-    proposedChildIndex: (NSInteger) index
-{
-    NSPasteboard * pasteboard = [info draggingPasteboard];
-    if ([[pasteboard types] containsObject: TORRENT_TABLE_VIEW_DATA_TYPE])
+- (id <NSPasteboardWriting>) outlineView: (NSOutlineView *) outlineView pasteboardWriterForItem: (id) item
+{
+    //only allow reordering of rows if sorting by order
+    if ([item isKindOfClass: [Torrent class]] && ([fDefaults boolForKey: @"SortByGroup"] || [[fDefaults stringForKey: @"Sort"] isEqualToString: SORT_ORDER]))
+    {
+        NSPasteboardItem * pbItem = [[[NSPasteboardItem alloc] init] autorelease];
+        #warning might make more sense to use TORRENT_TABLE_VIEW_DATA_TYPE
+        [pbItem setData: [NSKeyedArchiver archivedDataWithRootObject: [NSNumber numberWithInteger: [fTableView rowForItem: item]]] forType: NSPasteboardTypeString];
+        return pbItem;
+    }
+    else
+        return nil;
+}
+
+- (NSDragOperation) outlineView: (NSOutlineView *) outlineView validateDrop: (id <NSDraggingInfo>) info proposedItem: (id) item proposedChildIndex: (NSInteger) index
+{
+    if ([info draggingSource] == outlineView)
     {
         if ([fDefaults boolForKey: @"SortByGroup"])
@@ -2540 +2553 @@
 }
 
-- (BOOL) outlineView: (NSOutlineView *) outlineView acceptDrop: (id < NSDraggingInfo >) info item: (id) item
-    childIndex: (NSInteger) newRow
-{
-    NSPasteboard * pasteboard = [info draggingPasteboard];
-    if ([[pasteboard types] containsObject: TORRENT_TABLE_VIEW_DATA_TYPE])
+- (BOOL) outlineView: (NSOutlineView *) outlineView acceptDrop: (id <NSDraggingInfo>) info item: (id) item childIndex: (NSInteger) newRow
+{
+    if ([info draggingSource] == outlineView)
     {
         //remember selected rows
         NSArray * selectedValues = [fTableView selectedValues];
-    
-        NSIndexSet * indexes = [NSKeyedUnarchiver unarchiveObjectWithData: [pasteboard dataForType: TORRENT_TABLE_VIEW_DATA_TYPE]];
-        
-        //get the torrents to move
-        NSMutableArray * movingTorrents = [NSMutableArray arrayWithCapacity: [indexes count]];
-        for (NSUInteger i = [indexes firstIndex]; i != NSNotFound; i = [indexes indexGreaterThanIndex: i])
-            [movingTorrents addObject: [fTableView itemAtRow: i]];
+        
+        NSMutableArray * movingTorrents;
+        if ([[[info draggingPasteboard] types] containsObject: TORRENT_TABLE_VIEW_DATA_TYPE])
+        {
+            NSAssert(![NSApp isOnLionOrBetter], @"Dragging using pre-Lion functionality on Lion or greater");
+            
+            NSIndexSet * indexes = [NSKeyedUnarchiver unarchiveObjectWithData: [[info draggingPasteboard] dataForType: TORRENT_TABLE_VIEW_DATA_TYPE]];
+            
+            //get the torrents to move
+            movingTorrents = [NSMutableArray arrayWithCapacity: [indexes count]];
+            for (NSUInteger i = [indexes firstIndex]; i != NSNotFound; i = [indexes indexGreaterThanIndex: i])
+                [movingTorrents addObject: [fTableView itemAtRow: i]];   
+        }
+        else
+        {
+            NSAssert([NSApp isOnLionOrBetter], @"Dragging using Lion functionality on pre-Lion");
+            
+            movingTorrents = [NSMutableArray arrayWithCapacity: info.numberOfValidItemsForDrop];
+            [info enumerateDraggingItemsWithOptions: 0 forView: outlineView classes: [NSArray arrayWithObject: [NSPasteboardItem class]] searchOptions: nil usingBlock: ^(NSDraggingItem * draggingItem, NSInteger index, BOOL * stop) {
+                NSNumber * rowNumber = [NSKeyedUnarchiver unarchiveObjectWithData: [draggingItem.item dataForType: NSPasteboardTypeString]];
+                [movingTorrents addObject: [fTableView itemAtRow: [rowNumber integerValue]]];
+            }];
+        }
         
         //reset groups