Revision: 6726
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6726&view=rev
Author:   hofman
Date:     2010-08-23 11:10:53 +0000 (Mon, 23 Aug 2010)

Log Message:
-----------
support drop and paste of color on note outline view

Modified Paths:
--------------
    trunk/SKMainWindowController.m
    trunk/SKMainWindowController_UI.m

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2010-08-23 09:58:06 UTC (rev 6725)
+++ trunk/SKMainWindowController.m      2010-08-23 11:10:53 UTC (rev 6726)
@@ -458,6 +458,8 @@
     [noteTypeSheetController setDelegate:self];
     [[rightSideController.noteOutlineView headerView] 
setMenu:[noteTypeSheetController noteTypeMenu]];
     
+    [rightSideController.noteOutlineView registerForDraggedTypes:[NSArray 
arrayWithObjects:NSColorPboardType, nil]];
+    
     [pdfView setTypeSelectHelper:[leftSideController.thumbnailTableView 
typeSelectHelper]];
     
     [[self window] recalculateKeyViewLoop];

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2010-08-23 09:58:06 UTC (rev 6725)
+++ trunk/SKMainWindowController_UI.m   2010-08-23 11:10:53 UTC (rev 6726)
@@ -600,6 +600,28 @@
     }
 }
 
+- (NSDragOperation)outlineView:(NSOutlineView *)ov validateDrop:(id 
<NSDraggingInfo>)info proposedItem:(id)item 
proposedChildIndex:(NSInteger)anIndex {
+    NSDragOperation dragOp = NSDragOperationNone;
+    if ([ov isEqual:rightSideController.noteOutlineView]) {
+        NSPasteboard *pboard = [info draggingPasteboard];
+        if ([pboard availableTypeFromArray:[NSArray 
arrayWithObjects:NSColorPboardType, nil]] &&
+            anIndex == NSOutlineViewDropOnItemIndex && [item type] != nil)
+            dragOp = NSDragOperationEvery;
+    }
+    return dragOp;
+}
+
+- (BOOL)outlineView:(NSOutlineView *)ov acceptDrop:(id <NSDraggingInfo>)info 
item:(id)item childIndex:(NSInteger)anIndex {
+    if ([ov isEqual:rightSideController.noteOutlineView]) {
+        NSPasteboard *pboard = [info draggingPasteboard];
+        if ([pboard availableTypeFromArray:[NSArray 
arrayWithObjects:NSColorPboardType, nil]]) {
+            [item setColor:[NSColor colorFromPasteboard:pboard]];
+            return YES;
+        }
+    }
+    return NO;
+}
+
 #pragma mark NSOutlineView delegate protocol
 
 - (BOOL)outlineView:(NSOutlineView *)ov shouldEditTableColumn:(NSTableColumn 
*)tableColumn item:(id)item{
@@ -782,6 +804,22 @@
     return NO;
 }
 
+- (void)outlineViewPaste:(NSOutlineView *)ov {
+    if ([ov isEqual:rightSideController.noteOutlineView]) {
+        NSPasteboard *pboard = [NSPasteboard generalPasteboard];
+        if ([pboard availableTypeFromArray:[NSArray 
arrayWithObjects:NSColorPboardType, nil]])
+            [[self selectedNotes] setValue:[NSColor 
colorFromPasteboard:pboard] forKey:SKNPDFAnnotationColorKey];
+    }
+}
+
+- (BOOL)outlineViewCanPaste:(NSOutlineView *)ov {
+    if ([ov isEqual:rightSideController.noteOutlineView]) {
+        return [ov numberOfSelectedRows] > 0 &&
+               [[NSPasteboard generalPasteboard] 
availableTypeFromArray:[NSArray arrayWithObjects:NSColorPboardType, nil]] != 
nil;
+    }
+    return NO;
+}
+
 - (NSArray *)outlineViewHighlightedRows:(NSOutlineView *)ov {
     if ([ov isEqual:leftSideController.tocOutlineView]) {
         NSMutableArray *array = [NSMutableArray array];


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to