Revision: 6826
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6826&view=rev
Author:   hofman
Date:     2010-09-20 11:28:35 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
pass pasteboard for paste to delegate method

Modified Paths:
--------------
    trunk/SKBookmarkController.m
    trunk/SKDownloadController.m
    trunk/SKOutlineView.h
    trunk/SKOutlineView.m
    trunk/SKPresentationOptionsSheetController.m
    trunk/SKTableView.h
    trunk/SKTableView.m

Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m        2010-09-19 21:04:17 UTC (rev 6825)
+++ trunk/SKBookmarkController.m        2010-09-20 11:28:35 UTC (rev 6826)
@@ -749,9 +749,8 @@
     return [items count] > 0;
 }
 
-- (void)outlineViewPaste:(NSOutlineView *)ov {
+- (void)tableView:(NSTableView *)tv pasteFromPasteboard:(NSPasteboard *)pboard 
{
     NSUInteger count = 0;
-    NSPasteboard *pboard = [NSPasteboard generalPasteboard];
     if ([pboard availableTypeFromArray:[NSArray 
arrayWithObjects:NSFilenamesPboardType, nil]]) {
         NSArray *paths = [pboard propertyListForType:NSFilenamesPboardType];
         SKBookmark *item = nil;
@@ -767,8 +766,8 @@
         NSBeep();
 }
 
-- (BOOL)outlineViewCanPaste:(NSOutlineView *)ov {
-    return nil != [[NSPasteboard generalPasteboard] 
availableTypeFromArray:[NSArray arrayWithObjects:NSFilenamesPboardType, nil]];
+- (BOOL)tableView:(NSTableView *)tv canPasteFromPasteboard:(NSPasteboard 
*)pboard {
+    return nil != [pboard availableTypeFromArray:[NSArray 
arrayWithObjects:NSFilenamesPboardType, nil]];
 }
 
 - (NSArray *)outlineView:(NSOutlineView *)ov 
typeSelectHelperSelectionItems:(SKTypeSelectHelper *)typeSelectHelper {

Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m        2010-09-19 21:04:17 UTC (rev 6825)
+++ trunk/SKDownloadController.m        2010-09-20 11:28:35 UTC (rev 6826)
@@ -412,8 +412,7 @@
     return YES;
 }
 
-- (void)tableViewPaste:(NSTableView *)tv {
-    NSPasteboard *pboard = [NSPasteboard generalPasteboard];
+- (void)tableView:(NSTableView *)tv pasteFromPasteboard:(NSPasteboard *)pboard 
{
     NSURL *theURL = [NSURL URLFromPasteboardAnyType:pboard];
     
     if ([theURL isFileURL])
@@ -422,8 +421,8 @@
         [self addDownloadForURL:theURL];
 }
 
-- (BOOL)tableViewCanPaste:(NSTableView *)tv {
-    return (nil != [[NSPasteboard generalPasteboard] 
availableTypeFromArray:[NSArray arrayWithObjects:NSURLPboardType, 
SKWeblocFilePboardType, NSStringPboardType, nil]]);
+- (BOOL)tableView:(NSTableView *)tv canPasteFromPasteboard:(NSPasteboard 
*)pboard {
+    return (nil != [pboard availableTypeFromArray:[NSArray 
arrayWithObjects:NSURLPboardType, SKWeblocFilePboardType, NSStringPboardType, 
nil]]);
 }
 
 - (NSArray *)tableView:(NSTableView *)aTableView 
typeSelectHelperSelectionItems:(SKTypeSelectHelper *)typeSelectHelper {

Modified: trunk/SKOutlineView.h
===================================================================
--- trunk/SKOutlineView.h       2010-09-19 21:04:17 UTC (rev 6825)
+++ trunk/SKOutlineView.h       2010-09-20 11:28:35 UTC (rev 6826)
@@ -77,8 +77,8 @@
 - (void)outlineView:(NSOutlineView *)anOutlineView copyItems:(NSArray *)items;
 - (BOOL)outlineView:(NSOutlineView *)anOutlineView canCopyItems:(NSArray 
*)items;
 
-- (void)outlineViewPaste:(NSOutlineView *)anOutlineView;
-- (BOOL)outlineViewCanPaste:(NSOutlineView *)anOutlineView;
+- (void)outlineView:(NSOutlineView *)anOutlineView 
pasteFromPasteboard:(NSPasteboard *)pboard;
+- (BOOL)outlineView:(NSOutlineView *)anOutlineView 
canPasteFromPasteboard:(NSPasteboard *)pboard;
 
 - (NSArray *)outlineView:(NSOutlineView *)anOutlineView 
typeSelectHelperSelectionItems:(SKTypeSelectHelper *)aTypeSelectHelper;
 - (void)outlineView:(NSOutlineView *)anOutlineView 
typeSelectHelper:(SKTypeSelectHelper *)aTypeSelectHelper 
didFailToFindMatchForSearchString:(NSString *)searchString;

Modified: trunk/SKOutlineView.m
===================================================================
--- trunk/SKOutlineView.m       2010-09-19 21:04:17 UTC (rev 6825)
+++ trunk/SKOutlineView.m       2010-09-20 11:28:35 UTC (rev 6826)
@@ -193,9 +193,9 @@
 }
 
 - (BOOL)canPaste {
-    if ([[self delegate] respondsToSelector:@selector(outlineViewPaste:)]) {
-        if ([[self delegate] 
respondsToSelector:@selector(outlineViewCanPaste:)])
-            return [[self delegate] outlineViewCanPaste:self];
+    if ([[self delegate] 
respondsToSelector:@selector(outlineView:pasteFromPasteboard:)]) {
+        if ([[self delegate] 
respondsToSelector:@selector(outlineView:canPasteFromPasteboard:)])
+            return [[self delegate] outlineView:self 
canPasteFromPasteboard:[NSPasteboard generalPasteboard]];
         else
             return YES;
     }
@@ -204,7 +204,7 @@
 
 - (void)paste:(id)sender {
     if ([self canPaste])
-        [[self delegate] outlineViewPaste:self];
+        [[self delegate] outlineView:self pasteFromPasteboard:[NSPasteboard 
generalPasteboard]];
     else
         NSBeep();
 }

Modified: trunk/SKPresentationOptionsSheetController.m
===================================================================
--- trunk/SKPresentationOptionsSheetController.m        2010-09-19 21:04:17 UTC 
(rev 6825)
+++ trunk/SKPresentationOptionsSheetController.m        2010-09-20 11:28:35 UTC 
(rev 6826)
@@ -421,14 +421,13 @@
     return YES;
 }
 
-- (void)tableViewPaste:(NSTableView *)tv {
-    NSPasteboard *pboard = [NSPasteboard generalPasteboard];
+- (void)tableView:(NSTableView *)tv pasteFromPasteboard:(NSPasteboard *)pboard 
{
     if ([pboard availableTypeFromArray:[NSArray 
arrayWithObject:SKTransitionPboardType]])
         [[transitions objectAtIndex:[tableView selectedRow]] 
setProperties:[pboard propertyListForType:SKTransitionPboardType]];
 }
 
-- (BOOL)tableViewCanPaste:(NSTableView *)tv {
-    return ([tableView selectedRow] != -1 && [[NSPasteboard generalPasteboard] 
availableTypeFromArray:[NSArray arrayWithObject:SKTransitionPboardType]]);
+- (BOOL)tableView:(NSTableView *)tv canPasteFromPasteboard:(NSPasteboard 
*)pboard {
+    return ([tableView selectedRow] != -1 && [pboard 
availableTypeFromArray:[NSArray arrayWithObject:SKTransitionPboardType]]);
 }
 
 - (NSArray *)tableView:(NSTableView *)tv 
typeSelectHelperSelectionItems:(SKTypeSelectHelper *)typeSelectHelper {

Modified: trunk/SKTableView.h
===================================================================
--- trunk/SKTableView.h 2010-09-19 21:04:17 UTC (rev 6825)
+++ trunk/SKTableView.h 2010-09-20 11:28:35 UTC (rev 6826)
@@ -76,8 +76,8 @@
 - (void)tableView:(NSTableView *)aTableView copyRowsWithIndexes:(NSIndexSet 
*)rowIndexes;
 - (BOOL)tableView:(NSTableView *)aTableView canCopyRowsWithIndexes:(NSIndexSet 
*)rowIndexes;
 
-- (void)tableViewPaste:(NSTableView *)aTableView;
-- (BOOL)tableViewCanPaste:(NSTableView *)aTableView;
+- (void)tableView:(NSTableView *)aTableView pasteFromPasteboard:(NSPasteboard 
*)pboard;
+- (BOOL)tableView:(NSTableView *)aTableView 
canPasteFromPasteboard:(NSPasteboard *)pboard;
 
 - (BOOL)tableView:(NSTableView *)aTableView 
hasImageContextForTableColumn:(NSTableColumn *)tableColumn 
row:(NSInteger)rowIndex;
 - (id<SKImageToolTipContext>)tableView:(NSTableView *)aTableView 
imageContextForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex;

Modified: trunk/SKTableView.m
===================================================================
--- trunk/SKTableView.m 2010-09-19 21:04:17 UTC (rev 6825)
+++ trunk/SKTableView.m 2010-09-20 11:28:35 UTC (rev 6826)
@@ -179,9 +179,9 @@
 }
 
 - (BOOL)canPaste {
-    if ([[self delegate] respondsToSelector:@selector(tableViewPaste:)]) {
-        if ([[self delegate] respondsToSelector:@selector(tableViewCanPaste:)])
-            return [[self delegate] tableViewCanPaste:self];
+    if ([[self delegate] 
respondsToSelector:@selector(tableView:pasteFromPasteboard:)]) {
+        if ([[self delegate] 
respondsToSelector:@selector(tableView:canPasteFromPasteboard:)])
+            return [[self delegate] tableView:self 
canPasteFromPasteboard:[NSPasteboard generalPasteboard]];
         else
             return YES;
     }
@@ -190,7 +190,7 @@
 
 - (void)paste:(id)sender {
     if ([self canPaste])
-        [[self delegate] tableViewPaste:self];
+        [[self delegate] tableView:self pasteFromPasteboard:[NSPasteboard 
generalPasteboard]];
     else
         NSBeep();
 }


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

------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to