Changeset 23663

Timestamp:

05/26/2008 09:17:26 AM (6 months ago)

Author:

evands

Message:

• Handle dragging from iTunes to the contact list and message window/message text entry view, using [23662]'s -[NSPasteboard(AIPasteboardAdditions) filesFromITunesDragPasteboard]. Fixes #5114
  
• Cleaned up some ugly pasteboard analyzing code in AIAbstractListController
  

Files:

• trunk/Frameworks/Adium Framework/Source/AIAbstractListController.m (modified) (2 diffs)
• trunk/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m (modified) (5 diffs)
• trunk/Source/AIListController.m (modified) (7 diffs)

trunk/Frameworks/Adium Framework/Source/AIAbstractListController.m

@@ -40 +40 @@
-#import <AIUtilities/AIApplicationAdditions.h>
-#import <AIUtilities/AIOutlineViewAdditions.h>
+#import <AIUtilities/AIPasteboardAdditions.h>
-#import <Adium/KFTypeSelectTableView.h>
-#import "AIMessageWindowController.h"
@@ -202 +203 @@
-
-        //Dragging
-
+
+
+
+
-        
-        [contactListView reloadData];

trunk/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m

@@ -34 +34 @@
-#import <AIUtilities/AIImageAdditions.h>
-#import <AIUtilities/AIFileManagerAdditions.h>
+#import <AIUtilities/AIPasteboardAdditions.h>
-
-#import <AIUtilities/AITigerCompatibility.h>
@@ -56 +57 @@
-
-#define FILES_AND_IMAGES_TYPES [NSArray arrayWithObjects: \
-
+AIiTunesTrackPboardType, 
-
-#define PASS_TO_SUPERCLASS_DRAG_TYPE_ARRAY [NSArray arrayWithObjects: \
@@ -1164 +1165 @@
-#pragma mark Drag and drop
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-*/
-
+
-- (NSArray *)acceptableDragTypes;
-{
@@ -1184 +1190 @@
-    
-    dragTypes = [NSMutableArray arrayWithArray:[super acceptableDragTypes]];
+        [dragTypes addObject:AIiTunesTrackPboardType];
+
-    return dragTypes;
-}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-//We don't need to prepare for the types we are handling in performDragOperation: below
@@ -1222 +1249 @@
-- (void)addAttachmentsFromPasteboard:(NSPasteboard *)pasteboard
-{
-
+
+
-                //The pasteboard points to one or more files on disc.  Use them directly.
-
+
+
+
+
+
+
+
+
-                NSEnumerator    *enumerator = [files objectEnumerator];
-                NSString                *path;

trunk/Source/AIListController.m

@@ -34 +34 @@
-#import <AIUtilities/AIAttributedStringAdditions.h>
-#import <AIUtilities/AIAutoScrollView.h>
+#import <AIUtilities/AIPasteboardAdditions.h>
-#import <AIUtilities/AIWindowAdditions.h>
-#import <AIUtilities/AIOutlineViewAdditions.h>
@@ -617 +618 @@
-                           [types containsObject:NSRTFPboardType] ||
-                           [types containsObject:NSURLPboardType] ||
-
+
+
-                retVal = ((item && [item isKindOfClass:[AIListContact class]]) ? NSDragOperationLink : NSDragOperationNone);
-
@@ -631 +633 @@
-        BOOL            success = YES;
-        NSPasteboard *draggingPasteboard = [info draggingPasteboard];
- = [draggingPasteboard availableTypeFromArray:[NSArray arrayWithObject:@"AIListObject"]]
-
-[availableType isEqualToString:@"AIListObject"]
+
+
+(availableType = [draggingPasteboard availableTypeFromArray:[NSArray arrayWithObject:@"AIListObject"]])
-                //Kill the selection now, (in a more finder-esque way)
-                [outlineView deselectAll:nil];
@@ -654 +656 @@
-                        
-                } else if ([item isMemberOfClass:[AIMetaContact class]]) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                        }
-                                }
-                                
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-                        //Call super and return its value
-
-
+
-                        
-                } else if ([item isKindOfClass:[AIListContact class]]) {
@@ -739 +733 @@
-                                                                                   AILocalizedString(@"Once combined, Adium will treat these contacts as a single individual both on your contact list and when sending messages.\n\nYou may un-combine these contacts by getting info on the combined contact.","Explanation of metacontact creation"));
-                }
-
+
+
+
+
-                //Drag and Drop file transfer for the contact list.
-                NSString                *file;
-                NSArray                 *files = [[info draggingPasteboard] propertyListForType:NSFilenamesPboardType];
-                NSEnumerator    *enumerator = [files objectEnumerator];
-
-                AIListContact   *targetFileTransferContact = [[adium contactController] preferredContactForContentType:CONTENT_FILE_TRANSFER_TYPE
-                                                                                                                                                                                          forListContact:item];
-                if (targetFileTransferContact) {
+                        NSArray                 *files = nil;
+                        NSString                *file;
+                        NSEnumerator    *enumerator;
+                        
+                        if ([availableType isEqualToString:NSFilenamesPboardType]) {
+                                files = [[info draggingPasteboard] propertyListForType:NSFilenamesPboardType];
+                                
+                        } else if ([availableType isEqualToString:AIiTunesTrackPboardType]) {
+                                files = [[info draggingPasteboard] filesFromITunesDragPasteboard];
+                        }
+
+                        enumerator = [files objectEnumerator];
-                        while ((file = [enumerator nextObject])) {
-                                [[adium fileTransferController] sendFile:file toListContact:targetFileTransferContact];
-                        }
+
-                } else {
-                        AILogWithSignature(@"No contact available to receive files");
@@ -756 +762 @@
-                }
-
-
-
-
+
+
-                //Drag and drop text sending via the contact list.
-                if ([item isKindOfClass:[AIListContact class]]) {
@@ -766 +771 @@
-                        NSAttributedString                              *messageAttributedString = nil;
-                        
-([[[info draggingPasteboard] types] containsObject
+ ([availableType isEqualToString
-                                //for RTF data, we want to preserve the formatting, so use dataForType:
-                                messageAttributedString = [NSAttributedString stringWithData:[[info draggingPasteboard] dataForType:NSRTFPboardType]];
-                        }
-([[[info draggingPasteboard] types] containsObject
+ ([availableType isEqualToString
-                                //NSURLPboardType contains an NSURL object
-
-
-([[[info draggingPasteboard] types] containsObject
+ 
+
+ ([availableType isEqualToString
-                                //this is just plain text, so stringForType: works fine
-
+ 
-                        }
-