Changeset 16240

Timestamp:

06/15/2006 02:32:11 PM (2 years ago)

Author:

evands

Message:

• Paste now leaves bold/italics/underline/font/size etc. but strips colors, alignment, images, etc.
  
• Added a new paste item, Paste with Colors and Images, which does a traditional paste with rich text operation.
  

Closes #2880

Files:

• trunk/Frameworks/Adium Framework/AIMessageEntryTextView.m (modified) (5 diffs)
• trunk/Resources/MainMenu.nib/classes.nib (modified) (2 diffs)
• trunk/Resources/MainMenu.nib/keyedobjects.nib (modified) (previous)
• trunk/Source/AIInterfaceController.h (modified) (1 diff)
• trunk/Source/AIInterfaceController.m (modified) (2 diffs)
• trunk/Source/AIMenuController.h (modified) (1 diff)
• trunk/Source/AIMenuController.m (modified) (1 diff)

trunk/Frameworks/Adium Framework/AIMessageEntryTextView.m

@@ -57 +57 @@
-- (void)addAttachmentOfImage:(NSImage *)inImage;
-- (void)addAttachmentsFromPasteboard:(NSPasteboard *)pasteboard;
+@end
+
+@interface NSMutableAttributedString (AIMessageEntryTextViewAdditions)
+- (void)convertForPasteWithTraits;
-@end
-
@@ -371 +375 @@
-}
-
-
+
+
+
-{
-        NSPasteboard *generalPasteboard = [NSPasteboard generalPasteboard];
@@ -404 +410 @@
-        NSDictionary    *attributes = [[self typingAttributes] copy];
-
-d
+
-                [super paste:sender];
-        }
@@ -414 +420 @@
-        [attributes release];
-}
+
+- (void)pasteAsPlainTextWithTraits:(id)sender
+{
+        NSDictionary    *attributes = [[self typingAttributes] copy];
+        
+        NSPasteboard *generalPasteboard = [NSPasteboard generalPasteboard];
+        NSEnumerator *enumerator = [[generalPasteboard types] objectEnumerator];
+        NSString         *type;
+        BOOL             handledPaste = NO;
+        
+        //Types is ordered by the preference for handling of the data; enumerating it lets us allow the sending application's hints to be followed.
+        while ((type = [enumerator nextObject]) && !handledPaste) {
+                NSLog(@"Looking at type %@",type);
+                if ([type isEqualToString:NSRTFPboardType] ||
+                        [type isEqualToString:NSRTFDPboardType] ||
+                        [type isEqualToString:NSHTMLPboardType]) {
+                        NSData *data = [generalPasteboard dataForType:type];
+                        NSMutableAttributedString *attributedString;
+                        
+                        if ([type isEqualToString:NSRTFPboardType]) {
+                                attributedString = [[NSMutableAttributedString alloc] initWithRTF:data
+                                                                                                                           documentAttributes:NULL];
+                        } else if ([type isEqualToString:NSRTFDPboardType]) {
+                                attributedString = [[NSMutableAttributedString alloc] initWithRTFD:data
+                                                                                                                                documentAttributes:NULL];
+                        } else /* NSHTMLPboardType */ {
+                                attributedString = [[NSMutableAttributedString alloc] initWithHTML:data
+                                                                                                                                documentAttributes:NULL];
+                        }
+
+                        [attributedString convertForPasteWithTraits];
+                        [[self textStorage] replaceCharactersInRange:[self selectedRange]
+                                                                        withAttributedString:attributedString];
+                        [attributedString release];
+                        
+                        handledPaste = YES;
+                        
+                } else if ([type isEqualToString:NSStringPboardType]) {
+                        //Paste a plain text string directly
+                        [super paste:sender];
+                        handledPaste = YES;
+                        
+                } else if ([type isEqualToString:NSFilenamesPboardType]) {
+                        [self addAttachmentsFromPasteboard:generalPasteboard];
+                        handledPaste = YES;
+
+                } else if ([type isEqualToString:NSURLPboardType]) {
+                        //Paste a URL directly
+                        [super paste:sender];
+                        handledPaste = YES;
+                }
+        }
+        
+        //If we didn't handle it yet, let super try to deal with it
+        if (!handledPaste) {
+                [super paste:sender];
+        }
+        
+        if (attributes) {
+                [self setTypingAttributes:attributes];
+        }
+        
+        [attributes release];   
+}
+
+#pragma mark Deletion
-
-- (void)deleteBackward:(id)sender
@@ -1004 +1076 @@
-
-@end
+
+@implementation NSMutableAttributedString (AIMessageEntryTextViewAdditions)
+- (void)convertForPasteWithTraits
+{
+        NSRange fullRange = NSMakeRange(0, [self length]);
+        
+        //Remove non-trait attributes
+        [self removeAttribute:NSBackgroundColorAttributeName range:fullRange];
+        [self removeAttribute:NSBaselineOffsetAttributeName range:fullRange];
+        [self removeAttribute:NSCursorAttributeName range:fullRange];
+        [self removeAttribute:NSExpansionAttributeName range:fullRange];
+        [self removeAttribute:NSForegroundColorAttributeName range:fullRange];
+        [self removeAttribute:NSKernAttributeName range:fullRange];
+        [self removeAttribute:NSLigatureAttributeName range:fullRange];
+        [self removeAttribute:NSObliquenessAttributeName range:fullRange];
+        [self removeAttribute:NSParagraphStyleAttributeName range:fullRange];
+        [self removeAttribute:NSShadowAttributeName range:fullRange];
+        [self removeAttribute:NSStrokeWidthAttributeName range:fullRange];
+        
+        //Replace attachments with nothing! Absolutely nothing!
+        [self convertAttachmentsToStringsUsingPlaceholder:@""];
+}
+@end

trunk/Resources/MainMenu.nib/classes.nib

@@ -30 +30 @@
-                paste = id; 
-                pasteAndMatchStyle = id; 
+                pasteWithImagesAndColors = id; 
-                previousMessage = id; 
-                runToolbarCustomizationPalette = id; 
@@ -103 +104 @@
-                "menuItem_pasteAndMatchStyle" = NSMenuItem; 
-                "menuItem_pasteStyle" = NSMenuItem; 
+                "menuItem_pasteWithImagesAndColors" = NSMenuItem; 
-                "menuItem_preferences" = NSMenuItem; 
-                "menuItem_print" = NSMenuItem; 

trunk/Source/AIInterfaceController.h

@@ -253 +253 @@
-- (IBAction)paste:(id)sender;
-- (IBAction)pasteAndMatchStyle:(id)sender;
+- (IBAction)pasteWithImagesAndColors:(id)sender;
-
-//Custom printing

trunk/Source/AIInterfaceController.m

@@ -1223 +1223 @@
-- (IBAction)paste:(id)sender
-{
-RichText
+PlainTextWithTraits
-}
-
@@ -1230 +1230 @@
-{
-        [self _pasteWithPreferredSelector:@selector(pasteAsPlainText:) sender:sender];
+}
+
+- (IBAction)pasteWithImagesAndColors:(id)sender
+{
+        [self _pasteWithPreferredSelector:@selector(pasteAsRichText:) sender:sender];   
-}
-

trunk/Source/AIMenuController.h

@@ -118 +118 @@
-        IBOutlet        NSMenuItem      *menuItem_copy;
-        IBOutlet        NSMenuItem      *menuItem_paste;
+        IBOutlet        NSMenuItem      *menuItem_pasteWithImagesAndColors;
-        IBOutlet        NSMenuItem      *menuItem_pasteAndMatchStyle;
-        IBOutlet        NSMenuItem      *menuItem_clear;

trunk/Source/AIMenuController.m

@@ -340 +340 @@
-        [menuItem_copy setTitle:AILocalizedString(@"Copy",nil)];
-        [menuItem_paste setTitle:AILocalizedString(@"Paste",nil)];
+        [menuItem_pasteWithImagesAndColors setTitle:AILocalizedString(@"Paste with Images and Colors",nil)];
-        [menuItem_pasteAndMatchStyle setTitle:AILocalizedString(@"Paste and Match Style",nil)];
-        [menuItem_clear setTitle:AILocalizedString(@"Clear",nil)];