BibDesk

Revision: 5935
Author:   hofman
Date:     2006-03-22 06:39:13 -0800 (Wed, 22 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=5935&view=rev

Log Message:
-----------
Fix dragimage for cite command.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-03-22 14:13:44 UTC (rev 5934)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-03-22 14:39:13 UTC (rev 5935)
@@ -684,11 +684,11 @@
 				if ([sud boolForKey:BDSKCitePrependTildeKey])
 					[s appendString:@"~"];
 				[s appendString:@"\\"];
-				[s appendString:[sud stringForKey:BDSKCiteStartBracketKey]];
 				if (tv == ccTableView) 
 					[s appendString:[customStringArray objectAtIndex:[dragRows firstIndex]]];
 				else
 					[s appendString:[sud stringForKey:BDSKCiteStringKey]];
+				[s appendString:[sud stringForKey:BDSKCiteStartBracketKey]];
 				[s appendString:[firstItem citeKey]];
 				if (count > 1 && sep == NO) {
 					[s appendString:@","];


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

Revision: 5997
Author:   hofman
Date:     2006-03-26 07:53:06 -0800 (Sun, 26 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=5997&view=rev

Log Message:
-----------
Properly drag items from shared groups.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-03-26 15:52:10 UTC (rev 5996)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-03-26 15:53:06 UTC (rev 5997)
@@ -373,19 +373,23 @@
 			// multiple dragged rows always are the selected rows
 			pubs = [[groupedPublications copy] autorelease];
 		}else if([rowIndexes count] == 1){
-			// a single row, not necessarily the selected one
-			BDSKGroup *group = [self objectInGroupsAtIndex:[rowIndexes firstIndex]];
-			NSArray *allPubs = [publications copy];
-			NSMutableArray *pubsInGroup = [NSMutableArray arrayWithCapacity:[allPubs count]];
-			NSEnumerator *pubEnum = [allPubs objectEnumerator];
-			BibItem *pub;
-			[allPubs release];
-			
-			while (pub = [pubEnum nextObject]) {
-				if ([group containsItem:pub]) 
-					[pubsInGroup addObject:pub];
-			}
-			pubs = pubsInGroup;
+            // a single row, not necessarily the selected one
+            BDSKGroup *group = [self objectInGroupsAtIndex:[rowIndexes firstIndex]];
+            if ([group isShared]) {
+                pubs = [(BDSKSharedGroup *)group publications];
+			} else {
+                NSArray *allPubs = [publications copy];
+                NSMutableArray *pubsInGroup = [NSMutableArray arrayWithCapacity:[allPubs count]];
+                NSEnumerator *pubEnum = [allPubs objectEnumerator];
+                BibItem *pub;
+                [allPubs release];
+                
+                while (pub = [pubEnum nextObject]) {
+                    if ([group containsItem:pub]) 
+                        [pubsInGroup addObject:pub];
+                }
+                pubs = pubsInGroup;
+            }
 		}
 		if([pubs count] == 0){
             NSBeginAlertSheet(NSLocalizedString(@"Empty Groups", @""),nil,nil,nil,documentWindow,nil,NULL,NULL,NULL,


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

Revision: 6001
Author:   hofman
Date:     2006-03-26 08:48:14 -0800 (Sun, 26 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=6001&view=rev

Log Message:
-----------
Don't allow dragging on a shared group.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-03-26 16:20:22 UTC (rev 6000)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-03-26 16:48:14 UTC (rev 6001)
@@ -843,7 +843,7 @@
         }
     }else if(tv == groupTableView){
         // not sure why this check is necessary, but it silences an error message when you drag off the list of items
-        if([info draggingSource] == groupTableView || row >= [tv numberOfRows] || row <= [smartGroups count] || (type == nil && [info draggingSource] != tableView)) 
+        if([info draggingSource] == groupTableView || row >= [tv numberOfRows] || row <= [smartGroups count] + [sharedGroups count] || (type == nil && [info draggingSource] != tableView)) 
             return NSDragOperationNone;
         
         // here we actually target a specific row


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

Revision: 6028
Author:   hofman
Date:     2006-03-27 04:56:33 -0800 (Mon, 27 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=6028&view=rev

Log Message:
-----------
Fix dragging of shared pubs to All Publications. We shouldn't try to add them to a group.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-03-27 12:13:23 UTC (rev 6027)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-03-27 12:56:33 UTC (rev 6028)
@@ -930,10 +930,7 @@
         BOOL shouldSelect = [[self selectedGroups] containsObject:group];
 		
 		if (([info draggingSource] == groupTableView || [info draggingSource] == tableView) && dragFromSharedGroups && row == 0) {
-            if([self addPublicationsFromPasteboard:pboard error:NULL] == NO)
-                return NO;
-            
-            pubs = [self selectedPublications];            
+            return [self addPublicationsFromPasteboard:pboard error:NULL];
         } else if([info draggingSource] == groupTableView || row <= [smartGroups count] + [sharedGroups count]) {
             return NO;
         } else if([info draggingSource] == tableView){


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

Revision: 6101
Author:   hofman
Date:     2006-04-01 23:31:53 -0800 (Sat, 01 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=6101&view=rev

Log Message:
-----------
Disable buttons and dropping files and URLs in the main table for shared items.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-04-02 07:31:06 UTC (rev 6100)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-04-02 07:31:53 UTC (rev 6101)
@@ -262,6 +262,15 @@
     return NO;
 }
 
+- (void)tableView:(NSTableView *)tv willDisplayCell:(id)aCell forTableColumn:(NSTableColumn *)aTableColumn row:(int)row{
+    if (tv == tableView && [aCell isKindOfClass:[NSButtonCell class]]) {
+        if (row != -1 && [[shownPublications objectAtIndex:row] document] == nil) 
+            [aCell setEnabled:NO];
+        else
+            [aCell setEnabled:YES];
+    }
+}
+
 - (void)tableViewSelectionDidChange:(NSNotification *)aNotification{
 	NSTableView *tv = [aNotification object];
     if(tv == tableView){
@@ -846,7 +855,7 @@
 			return NSDragOperationNone;
 		}
         // set drop row to -1 and NSTableViewDropOperation to NSTableViewDropOn, when we don't target specific rows http://www.corbinstreehouse.com/blog/?p=123
-        if(row == -1 || op == NSTableViewDropAbove){
+        if(row == -1 || op == NSTableViewDropAbove || [[shownPublications objectAtIndex:row] document] == nil){
             [tv setDropRow:-1 dropOperation:NSTableViewDropOn];
 		}else if(([type isEqualToString:NSFilenamesPboardType] == NO || [[info draggingPasteboard] containsUnparseableFile] == NO) &&
                  [type isEqualToString:BDSKWeblocFilePboardType] == NO && [type isEqualToString:NSURLPboardType] == NO){
@@ -894,7 +903,9 @@
             BibItem *pub = [shownPublications objectAtIndex:row];
             NSURL *theURL = nil;
             
-            if([type isEqualToString:NSFilenamesPboardType]){
+            if([pub document] == nil){
+                return NO;
+            }else if([type isEqualToString:NSFilenamesPboardType]){
                 NSArray *fileNames = [pboard propertyListForType:NSFilenamesPboardType];
                 if ([fileNames count] == 0)
                     return NO;


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

Revision: 6235
Author:   hofman
Date:     2006-04-11 08:19:29 -0700 (Tue, 11 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=6235&view=rev

Log Message:
-----------
Wait with posting of selection change notifications till idle.
This should be OK, as it is a UI update. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-04-11 15:02:43 UTC (rev 6234)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-04-11 15:19:29 UTC (rev 6235)
@@ -300,12 +300,12 @@
 	NSTableView *tv = [aNotification object];
     if(tv == tableView){
         NSNotification *note = [NSNotification notificationWithName:BDSKTableSelectionChangedNotification object:self];
-        [[NSNotificationQueue defaultQueue] enqueueNotification:note postingStyle:NSPostNow coalesceMask:NSNotificationCoalescingOnName forModes:nil];
+        [[NSNotificationQueue defaultQueue] enqueueNotification:note postingStyle:NSPostWhenIdle coalesceMask:NSNotificationCoalescingOnName forModes:nil];
     }else if(tv == (NSTableView *)ccTableView){
 		[removeCustomCiteStringButton setEnabled:([tv numberOfSelectedRows] > 0)];
 	}else if(tv == groupTableView){
         NSNotification *note = [NSNotification notificationWithName:BDSKGroupTableSelectionChangedNotification object:self];
-        [[NSNotificationQueue defaultQueue] enqueueNotification:note postingStyle:NSPostNow coalesceMask:NSNotificationCoalescingOnName forModes:nil];
+        [[NSNotificationQueue defaultQueue] enqueueNotification:note postingStyle:NSPostWhenIdle coalesceMask:NSNotificationCoalescingOnName forModes:nil];
     }
 }
 


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

Revision: 6256
Author:   hofman
Date:     2006-04-13 10:02:15 -0700 (Thu, 13 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=6256&view=rev

Log Message:
-----------
Pass correct index set.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-04-13 16:50:52 UTC (rev 6255)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-04-13 17:02:15 UTC (rev 6256)
@@ -457,13 +457,13 @@
         dragCopyType = 1; // only type that makes sense here
         
         NSIndexSet *indexes = [groupTableView selectedRowIndexes];
-        dragFromSharedGroups = [self hasOnlySharedGroupsAtIndexes:rowIndexes];
+        dragFromSharedGroups = [self hasOnlySharedGroupsAtIndexes:indexes];
     }else{
 		// drag from the main table
 		pubs = [shownPublications objectsAtIndexes:rowIndexes];
         
         NSIndexSet *indexes = [groupTableView selectedRowIndexes];
-        dragFromSharedGroups = [self hasOnlySharedGroupsAtIndexes:rowIndexes];
+        dragFromSharedGroups = [self hasOnlySharedGroupsAtIndexes:indexes];
 
 		if(pboard == [NSPasteboard pasteboardWithName:NSDragPboard]){
 			// see where we clicked in the table


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

Revision: 6262
Author:   amaxwell
Date:     2006-04-14 09:32:17 -0700 (Fri, 14 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=6262&view=rev

Log Message:
-----------
Display a caution icon if the shared group failed to load.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-04-14 16:31:39 UTC (rev 6261)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-04-14 16:32:17 UTC (rev 6262)
@@ -277,14 +277,14 @@
         if ([group isShared] == NO) return;
         
         NSProgressIndicator *spinner = [sharedGroupSpinners objectForKey:[group name]];
+        int column = [[tv tableColumns] indexOfObject:aTableColumn];
+        NSRect rect = [tv frameOfCellAtColumn:column row:row];
+        NSSize size = [spinner frame].size;
+        rect.origin.x = NSMaxX(rect) - size.width - 2.0;
+        rect.origin.y += floorf((NSHeight(rect) - size.height) / 2.0);
+        rect.size = size;
         
         if ([(BDSKSharedGroup *)group isRetrieving]) {
-            int column = [[tv tableColumns] indexOfObject:aTableColumn];
-            NSRect rect = [tv frameOfCellAtColumn:column row:row];
-            NSSize size = [spinner frame].size;
-            rect.origin.x = NSMaxX(rect) - size.width - 2.0;
-            rect.origin.y += floorf((NSHeight(rect) - size.height) / 2.0);
-            rect.size = size;
             [spinner setFrame:rect];
             if([[tv subviews] containsObject:spinner] == NO)
                 [tv addSubview:spinner];
@@ -293,6 +293,12 @@
             [spinner stopAnimation:nil];
             [spinner removeFromSuperview];
         }
+        if ([(BDSKSharedGroup *)group failedLoad]) {
+            if([tv isFlipped])
+                [[NSImage cautionIconImage] drawFlippedInRect:rect fromRect:NSMakeRect(0,0,16,16) operation:NSCompositeSourceOver fraction:1.0];
+            else
+                [[NSImage cautionIconImage] drawInRect:rect fromRect:NSMakeRect(0,0,16,16) operation:NSCompositeSourceOver fraction:1.0];
+        }
     }
 }
 


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

Revision: 6264
Author:   amaxwell
Date:     2006-04-14 16:57:05 -0700 (Fri, 14 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=6264&view=rev

Log Message:
-----------
remove caution icon image drawing from table delegate

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-04-14 21:45:19 UTC (rev 6263)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-04-14 23:57:05 UTC (rev 6264)
@@ -277,14 +277,15 @@
         if ([group isShared] == NO) return;
         
         NSProgressIndicator *spinner = [sharedGroupSpinners objectForKey:[group name]];
-        int column = [[tv tableColumns] indexOfObject:aTableColumn];
-        NSRect rect = [tv frameOfCellAtColumn:column row:row];
-        NSSize size = [spinner frame].size;
-        rect.origin.x = NSMaxX(rect) - size.width - 2.0;
-        rect.origin.y += floorf((NSHeight(rect) - size.height) / 2.0);
-        rect.size = size;
         
         if ([(BDSKSharedGroup *)group isRetrieving]) {
+            int column = [[tv tableColumns] indexOfObject:aTableColumn];
+            NSRect rect = [tv frameOfCellAtColumn:column row:row];
+            NSSize size = [spinner frame].size;
+            rect.origin.x = NSMaxX(rect) - size.width - 2.0;
+            rect.origin.y += floorf((NSHeight(rect) - size.height) / 2.0);
+            rect.size = size;
+            
             [spinner setFrame:rect];
             if([[tv subviews] containsObject:spinner] == NO)
                 [tv addSubview:spinner];
@@ -293,12 +294,6 @@
             [spinner stopAnimation:nil];
             [spinner removeFromSuperview];
         }
-        if ([(BDSKSharedGroup *)group failedLoad]) {
-            if([tv isFlipped])
-                [[NSImage cautionIconImage] drawFlippedInRect:rect fromRect:NSMakeRect(0,0,16,16) operation:NSCompositeSourceOver fraction:1.0];
-            else
-                [[NSImage cautionIconImage] drawInRect:rect fromRect:NSMakeRect(0,0,16,16) operation:NSCompositeSourceOver fraction:1.0];
-        }
     }
 }
 


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

Revision: 6315
Author:   hofman
Date:     2006-04-23 07:05:10 -0700 (Sun, 23 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=6315&view=rev

Log Message:
-----------
Shared groups are only selected by themselves now, use that fact. 
Make sure shared items can only be dropped on the All Publications group. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-04-23 12:11:20 UTC (rev 6314)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-04-23 14:05:10 UTC (rev 6315)
@@ -431,13 +431,13 @@
                 }
                 pubs = pubsInGroup;
             }
+            dragFromSharedGroups = [self hasSharedGroupsAtIndexes:rowIndexes];
 		}
 		if([pubs count] == 0){
             NSBeginAlertSheet(NSLocalizedString(@"Empty Groups", @""),nil,nil,nil,documentWindow,nil,NULL,NULL,NULL,
                               NSLocalizedString(@"The groups you want to drag do not contain any items.", @""));
             return NO;
         }
-        dragFromSharedGroups = [self hasOnlySharedGroupsAtIndexes:rowIndexes];
 			
     } else if(tv == (NSTableView *)ccTableView){
 		// drag from the custom cite drawer table
@@ -457,14 +457,12 @@
         pubs = [self selectedPublications];
         dragCopyType = 1; // only type that makes sense here
         
-        NSIndexSet *indexes = [groupTableView selectedRowIndexes];
-        dragFromSharedGroups = [self hasOnlySharedGroupsAtIndexes:indexes];
+        dragFromSharedGroups = [self hasSharedGroupsAtIndexes:[groupTableView selectedRowIndexes]];
     }else{
 		// drag from the main table
 		pubs = [shownPublications objectsAtIndexes:rowIndexes];
         
-        NSIndexSet *indexes = [groupTableView selectedRowIndexes];
-        dragFromSharedGroups = [self hasOnlySharedGroupsAtIndexes:indexes];
+        dragFromSharedGroups = [self hasSharedGroupsAtIndexes:[groupTableView selectedRowIndexes]];
 
 		if(pboard == [NSPasteboard pasteboardWithName:NSDragPboard]){
 			// see where we clicked in the table
@@ -895,7 +893,9 @@
             return NSDragOperationEvery; // if it's not from me, copying is OK
         }
     }else if(tv == groupTableView){
-		if (([info draggingSource] == groupTableView || [info draggingSource] == tableView) && dragFromSharedGroups && row == 0) {
+		if (([info draggingSource] == groupTableView || [info draggingSource] == tableView) && dragFromSharedGroups) {
+            if (row != 0)
+                return NSDragOperationNone;
             [tv setDropRow:row dropOperation:NSTableViewDropOn];
             return NSDragOperationCopy;
         }


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

Revision: 6329
Author:   hofman
Date:     2006-04-25 07:17:51 -0700 (Tue, 25 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=6329&view=rev

Log Message:
-----------
Implementation of RFE # 1476010.
Select items in .aux file when dropping the file on the main table. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-04-25 12:33:23 UTC (rev 6328)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-04-25 14:17:51 UTC (rev 6329)
@@ -958,6 +958,36 @@
         }else{
             [groupTableView selectRowIndexes:[NSIndexSet indexSetWithIndex:0] byExtendingSelection:NO];
             
+            if([type isEqualToString:NSFilenamesPboardType]){
+                NSArray *filenames = [pboard propertyListForType:NSFilenamesPboardType];
+                if([filenames count] == 1){
+                    NSString *file = [filenames lastObject];
+                    if([[file pathExtension] caseInsensitiveCompare:@"aux"] == NSOrderedSame){
+                        NSString *auxString = [NSString stringWithContentsOfFile:file];
+                        
+                        if (auxString == nil)
+                            return NO;
+                        
+                        NSScanner *scanner = [NSScanner scannerWithString:auxString];
+                        NSString *key = nil;
+                        NSArray *items = nil;
+                        NSMutableArray *selItems = [NSMutableArray array];
+                        
+                        while ([scanner isAtEnd] == NO && 
+                               [scanner scanUpToString:@"\\bibcite{" intoString:NULL] && 
+                               [scanner scanString:@"\\bibcite{" intoString:NULL]) {
+                            if([scanner scanUpToString:@"}" intoString:&key]) {
+                                if (items = [itemsForCiteKeys arrayForKey:key])
+                                    [selItems addObjectsFromArray:items];
+                            }
+                        }
+                        [self highlightBibs:selItems];
+                        
+                        return YES;
+                    }
+                }
+            }
+            
             BOOL result = [self addPublicationsFromPasteboard:pboard error:NULL];
             
             if (result) [self updateUI];
@@ -1217,9 +1247,12 @@
         
     NSString *fileName = [fileNames lastObject];
     NSSet *unreadableTypes = [NSSet caseInsensitiveStringSetWithObjects:@"pdf", @"ps", @"eps", @"doc", @"htm", @"textClipping", @"webloc", @"html", @"rtf", @"tiff", @"tif", @"png", @"jpg", @"jpeg", nil];
+    NSSet *readableTypes = [NSSet caseInsensitiveStringSetWithObjects:@"bib", @"aux", @"ris", @"fcgi", @"refman", nil];
     
     if([unreadableTypes containsObject:[fileName pathExtension]])
         return YES;
+    if([readableTypes containsObject:[fileName pathExtension]])
+        return NO;
     
     NSData *contentData = [[NSData alloc] initWithContentsOfFile:fileName];
     NSString *contentString = [[NSString alloc] initWithData:contentData encoding:NSUTF8StringEncoding];


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

Revision: 6358
Author:   amaxwell
Date:     2006-04-29 11:45:45 -0700 (Sat, 29 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=6358&view=rev

Log Message:
-----------
Save/restore graphics context when changing color.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-04-29 18:29:44 UTC (rev 6357)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-04-29 18:45:45 UTC (rev 6358)
@@ -789,14 +789,14 @@
 		image = [[[NSImage alloc] initWithSize:size] autorelease];
         
         [image lockFocus];
-		
-		[[color colorWithAlphaComponent:0.2] set];
+        
+		[NSGraphicsContext saveGraphicsState];
+		[[color colorWithAlphaComponent:0.2] setFill];
 		[NSBezierPath fillRoundRectInRect:rect radius:4.0];
-		[[color colorWithAlphaComponent:0.8] set];
+		[[color colorWithAlphaComponent:0.8] setStroke];
 		[NSBezierPath setDefaultLineWidth:2.0];
 		[NSBezierPath strokeRoundRectInRect:rect radius:4.0];
 		
-		[NSGraphicsContext saveGraphicsState];
 		NSRectClip(NSInsetRect(rect, 2.0, 2.0));
         [attrString drawAtPoint:point];
 		[NSGraphicsContext restoreGraphicsState];
@@ -836,11 +836,13 @@
 		
 		[image drawInRect:rect fromRect:iconRect operation:NSCompositeCopy fraction:1.0];
 		
+        [NSGraphicsContext saveGraphicsState];
 		// draw a count of the rows being dragged, similar to Mail.app
-		[[NSColor redColor] set];
+		[[NSColor redColor] setFill];
 		[NSBezierPath fillHorizontalOvalAroundRect:countRect];
 		[countString drawInRect:countRect];
-		
+		[NSGraphicsContext restoreGraphicsState];
+        
 		[labeledImage unlockFocus];
 		
 		image = labeledImage;


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

Revision: 6940
Author:   hofman
Date:     2006-06-16 03:51:14 -0700 (Fri, 16 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=6940&view=rev

Log Message:
-----------
Fix bug # 1507183. Save custom cite strings to prefs after changing them. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-06-16 05:44:44 UTC (rev 6939)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-06-16 10:51:14 UTC (rev 6940)
@@ -167,6 +167,7 @@
 - (void)tableView:(NSTableView *)tv setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn row:(int)row{
     if(tv == (NSTableView *)ccTableView){
 		[customStringArray replaceObjectAtIndex:row withObject:object];
+        [[OFPreferenceWrapper sharedPreferenceWrapper] setObject:customStringArray forKey:BDSKCustomCiteStringsKey];
 	}else if (tv == tableView){
         BibTypeManager *typeManager = [BibTypeManager sharedManager];
 


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

Revision: 6969
Author:   amaxwell
Date:     2006-06-20 11:48:22 -0700 (Tue, 20 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=6969&view=rev

Log Message:
-----------
Workaround for beachball reported by users on the Mac OS X-TeX mailing list.  Dropping directly on a row in the table to trigger autofile caused a delay in getting the comment string from the Finder, when the drag also originated from the Finder.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-06-20 14:13:53 UTC (rev 6968)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-06-20 18:48:22 UTC (rev 6969)
@@ -974,8 +974,10 @@
                 return NO;
             
             [pub setField:field toValue:[theURL absoluteString]];
+            
+            // arm: autofile after a delay, assuming the Finder is our drag source.  The Finder blocks our AESendMessage call in NSFileManager to get the file's comment string, likely because it's main event loop is busy trying to process the slide back image or some other part of the drag (getting the comment takes ~20 s in this case vs. the normal < 0.01 s).  A delay of 0.5 s was not sufficient.
             if([field isEqualToString:BDSKLocalUrlString])
-                [pub autoFilePaper];
+                [pub performSelector:@selector(autoFilePaper) withObject:nil afterDelay:0.7];
             
             [self highlightBib:pub];
             [[pub undoManager] setActionName:NSLocalizedString(@"Edit Publication",@"")];


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

Revision: 6998
Author:   amaxwell
Date:     2006-06-30 19:06:33 -0700 (Fri, 30 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=6998&view=rev

Log Message:
-----------
Fix exception raised when dropping on an empty table.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-06-30 05:44:20 UTC (rev 6997)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-07-01 02:06:33 UTC (rev 6998)
@@ -905,7 +905,7 @@
 			return NSDragOperationNone;
 		}
         // set drop row to -1 and NSTableViewDropOperation to NSTableViewDropOn, when we don't target specific rows http://www.corbinstreehouse.com/blog/?p=123
-        if(row == -1 || op == NSTableViewDropAbove || [[shownPublications objectAtIndex:row] document] == nil){
+        if(row == -1 || op == NSTableViewDropAbove || (row < [shownPublications count] && [[shownPublications objectAtIndex:row] document] == nil)){
             [tv setDropRow:-1 dropOperation:NSTableViewDropOn];
 		}else if(([type isEqualToString:NSFilenamesPboardType] == NO || [[info draggingPasteboard] containsUnparseableFile] == NO) &&
                  [type isEqualToString:BDSKWeblocFilePboardType] == NO && [type isEqualToString:NSURLPboardType] == NO){


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

Revision: 7026
Author:   amaxwell
Date:     2006-07-08 10:54:34 -0700 (Sat, 08 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=7026&view=rev

Log Message:
-----------
enable drops on all publications group

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-07-08 14:24:53 UTC (rev 7025)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-07-08 17:54:34 UTC (rev 7026)
@@ -926,7 +926,7 @@
             return NSDragOperationCopy;
         }
         // not sure why this check is necessary, but it silences an error message when you drag off the list of items
-        if([info draggingSource] == groupTableView || row >= [tv numberOfRows] || (NSLocationInRange(row, [self rangeOfCategoryGroups]) == NO && NSLocationInRange(row, [self rangeOfStaticGroups]) == NO) || (type == nil && [info draggingSource] != tableView)) 
+        if([info draggingSource] == groupTableView || row >= [tv numberOfRows] || (NSLocationInRange(row, [self rangeOfCategoryGroups]) == NO && NSLocationInRange(row, [self rangeOfStaticGroups]) == NO && row != 0) || (type == nil && [info draggingSource] != tableView)) 
             return NSDragOperationNone;
         
         // here we actually target a specific row
@@ -1029,7 +1029,7 @@
 		
 		if (([info draggingSource] == groupTableView || [info draggingSource] == tableView) && dragFromSharedGroups && row == 0) {
             return [self addPublicationsFromPasteboard:pboard error:NULL];
-        } else if([info draggingSource] == groupTableView || (NSLocationInRange(row, [self rangeOfCategoryGroups]) == NO && NSLocationInRange(row, [self rangeOfStaticGroups]) == NO)) {
+        } else if([info draggingSource] == groupTableView || (NSLocationInRange(row, [self rangeOfCategoryGroups]) == NO && NSLocationInRange(row, [self rangeOfStaticGroups]) == NO && row != 0)) {
             return NO;
         } else if([info draggingSource] == tableView){
             // we already have these publications, so we just want to add them to the group, not the document
@@ -1045,7 +1045,7 @@
         OBPRECONDITION([pubs count]);
         
         // add to the group we're dropping on, /not/ the currently selected group; no need to add to all pubs group, though
-        if(group != nil){
+        if(group != nil && row != 0){
             [self addPublications:pubs toGroup:group];
             // reselect if necessary, or we default to selecting the all publications group (which is really annoying when creating a new pub by dropping a PDF on a group)
             if(shouldSelect) 


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

Revision: 7257
Author:   hofman
Date:     2006-08-06 03:06:58 -0700 (Sun, 06 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=7257&view=rev

Log Message:
-----------
Fix typos.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-08-06 09:45:55 UTC (rev 7256)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-08-06 10:06:58 UTC (rev 7257)
@@ -942,10 +942,10 @@
         } else if([type isEqualToString:BDSKBibItemPboardType]){
             return NSDragOperationCopy; // @@ can't drag row indexes from another document; should use NSArchiver instead
         }else{
-            NSDragOperationEvery;
+            return NSDragOperationEvery;
         }
     }
-    return NO;
+    return NSDragOperationNone;
 }
 
 // This method is called when the mouse is released over a table view that previously decided to allow a drop via the validateDrop method.  The data source should incorporate the data from the dragging pasteboard at this time.


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

Revision: 7260
Author:   hofman
Date:     2006-08-06 03:42:18 -0700 (Sun, 06 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=7260&view=rev

Log Message:
-----------
We can only add items to a group when the pasteboard contains items.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-08-06 10:29:53 UTC (rev 7259)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-08-06 10:42:18 UTC (rev 7260)
@@ -938,7 +938,10 @@
         // here we actually target a specific row
         [tv setDropRow:row dropOperation:NSTableViewDropOn];
         if([info draggingSource] == tableView){
-            return NSDragOperationLink;
+            if([type isEqualToString:BDSKBibItemPboardType])
+                return NSDragOperationLink;
+            else
+                return NSDragOperationNone;
         } else if([type isEqualToString:BDSKBibItemPboardType]){
             return NSDragOperationCopy; // @@ can't drag row indexes from another document; should use NSArchiver instead
         }else{


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

Revision: 7288
Author:   hofman
Date:     2006-08-07 06:57:18 -0700 (Mon, 07 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=7288&view=rev

Log Message:
-----------
Allow non local drags from the group table view. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-08-07 13:48:44 UTC (rev 7287)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-08-07 13:57:18 UTC (rev 7288)
@@ -717,7 +717,7 @@
 	} else if (tv == ccTableView) {
 		return (isLocal)? NSDragOperationNone : NSDragOperationCopy;
 	} else {
-		return NSDragOperationNone;
+		return (isLocal)? NSDragOperationEvery : NSDragOperationCopy;
 	}
 }
 


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

Revision: 7354
Author:   amaxwell
Date:     2006-08-10 09:46:22 -0700 (Thu, 10 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=7354&view=rev

Log Message:
-----------
Use currently sorted table column value for typeahead search.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-08-10 15:11:17 UTC (rev 7353)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-08-10 16:46:22 UTC (rev 7354)
@@ -1118,23 +1118,41 @@
 #pragma mark || Methods to support the type-ahead selector.
 
 - (void)updateTypeAheadStatus:(NSString *)searchString{
-    if(!searchString)
+    NSString *tcID = [lastSelectedColumnForSort identifier];
+    if(!searchString || !tcID)
         [self updateUI]; // resets the status line to its default value
     else
-        [self setStatus:[NSString stringWithFormat:@"%@ \"%@\"", NSLocalizedString(@"Finding item with author or title:", @""), searchString]];
+        [self setStatus:[NSString stringWithFormat:NSLocalizedString(@"Finding item with %@: \"%@\"", @""), tcID, searchString]];
 }
 
 - (NSArray *)typeAheadSelectionItems{
-    if([documentWindow firstResponder] == tableView){
-        NSEnumerator *e = [shownPublications objectEnumerator];
-        NSMutableArray *a = [NSMutableArray arrayWithCapacity:[shownPublications count]];
-        BibItem *pub = nil;
+    if([documentWindow firstResponder] == tableView){    
+        
+        // some users seem to expect that the currently sorted table column is used for typeahead
+        // since the datasource method already knows how to convert columns to BibItem values, we
+        // can use that
+        
+        NSString *field = [lastSelectedColumnForSort identifier];
+        NSTableColumn *column = [tableView tableColumnWithIdentifier:field];
+        unsigned int row, numberOfRows = [tableView numberOfRows];
+        NSMutableArray *a = [NSMutableArray arrayWithCapacity:numberOfRows];
 
-        while(pub = [e nextObject]){
-            [a addObject:[[pub bibTeXAuthorString] stringByAppendingString:[pub title]]];
+        // table datasource returns an NSImage for URL fields, so we'll ignore those columns
+        if([[BibTypeManager sharedManager] isURLField:field] == NO && nil != column){
+            id value;
+            typedef id (*dataIMP)(id, SEL, id, id, unsigned int);
+            SEL selector = @selector(tableView:objectValueForTableColumn:row:);
+            dataIMP get_datasource_value = (dataIMP)[self methodForSelector:selector];
+            
+            for (row = 0; row < numberOfRows; row++){
+                value = get_datasource_value(self, selector, tableView, column, row);
+                if(value) [a addObject:[value description]];
+            }
         }
         return a;
+        
     } else if([documentWindow firstResponder] == groupTableView){
+        
         int i;
 		int groupCount = [self countOfGroups];
         NSMutableArray *array = [NSMutableArray arrayWithCapacity:groupCount];
@@ -1146,6 +1164,7 @@
             [array addObject:[group stringValue]];
 		}
         return array;
+        
     } else return [NSArray array];
 }
     // This is where we build the list of possible items which the user can select by typing the first few letters. You should return an array of NSStrings.
@@ -1155,8 +1174,9 @@
         int n = [self numberOfSelectedPubs];
         BibItem *bib;
         if (n == 1){
-            bib = [shownPublications objectAtIndex:[tableView selectedRow]];
-            return [[bib bibTeXAuthorString] stringByAppendingString:[bib title]];
+            NSTableColumn *column = [tableView tableColumnWithIdentifier:[lastSelectedColumnForSort identifier]];
+            unsigned row = [tableView selectedRow];
+            return [[self tableView:tableView objectValueForTableColumn:column row:row] description];
         }else{
             return nil;
         }


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

Revision: 7355
Author:   amaxwell
Date:     2006-08-10 09:55:06 -0700 (Thu, 10 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=7355&view=rev

Log Message:
-----------
remove unused var, fix some comments

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-08-10 16:46:22 UTC (rev 7354)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-08-10 16:55:06 UTC (rev 7355)
@@ -1117,6 +1117,7 @@
 
 #pragma mark || Methods to support the type-ahead selector.
 
+// used for status bar
 - (void)updateTypeAheadStatus:(NSString *)searchString{
     NSString *tcID = [lastSelectedColumnForSort identifier];
     if(!searchString || !tcID)
@@ -1125,12 +1126,15 @@
         [self setStatus:[NSString stringWithFormat:NSLocalizedString(@"Finding item with %@: \"%@\"", @""), tcID, searchString]];
 }
 
+// This is where we build the list of possible items which the user can select by typing the first few letters. You should return an array of NSStrings.
 - (NSArray *)typeAheadSelectionItems{
     if([documentWindow firstResponder] == tableView){    
         
-        // some users seem to expect that the currently sorted table column is used for typeahead
+        // Some users seem to expect that the currently sorted table column is used for typeahead;
         // since the datasource method already knows how to convert columns to BibItem values, we
-        // can use that
+        // can it almost directly.  It might be possible to cache this in the datasource method itself
+        // to avoid calling it twice on -reloadData, but that will only work if -reloadData reloads
+        // all rows instead of just visible rows.
         
         NSString *field = [lastSelectedColumnForSort identifier];
         NSTableColumn *column = [tableView tableColumnWithIdentifier:field];
@@ -1167,12 +1171,11 @@
         
     } else return [NSArray array];
 }
-    // This is where we build the list of possible items which the user can select by typing the first few letters. You should return an array of NSStrings.
 
+// Type-ahead-selection behavior can change if an item is currently selected (especially if the item was selected by type-ahead-selection). Return nil if you have no selection or a multiple selection.
 - (NSString *)currentlySelectedItem{
     if([documentWindow firstResponder] == tableView){
         int n = [self numberOfSelectedPubs];
-        BibItem *bib;
         if (n == 1){
             NSTableColumn *column = [tableView tableColumnWithIdentifier:[lastSelectedColumnForSort identifier]];
             unsigned row = [tableView selectedRow];
@@ -1187,9 +1190,8 @@
             return [[[self selectedGroups] lastObject] stringValue];
     } else return nil;
 }
-// Type-ahead-selection behavior can change if an item is currently selected (especially if the item was selected by type-ahead-selection). Return nil if you have no selection or a multiple selection.
 
-// fixme -  also need to call the processkeychars in keydown...
+// We call this when a type-ahead-selection match has been made; you should select the item based on its index in the array you provided in -typeAheadSelectionItems.
 - (void)typeAheadSelectItemAtIndex:(int)itemIndex{
     NSResponder *responder = [documentWindow firstResponder];
     OBPRECONDITION([responder isKindOfClass:[NSTableView class]]);
@@ -1198,10 +1200,8 @@
         [(NSTableView *)responder scrollRowToVisible:itemIndex];
     }
 }
-// We call this when a type-ahead-selection match has been made; you should select the item based on its index in the array you provided in -typeAheadSelectionItems.
 
-
-
+// promise drags (currently used for webloc files)
 - (NSArray *)tableView:(NSTableView *)tv namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination forDraggedRowsWithIndexes:(NSIndexSet *)indexSet;
 {
 


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

Revision: 7357
Author:   hofman
Date:     2006-08-10 10:30:50 -0700 (Thu, 10 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=7357&view=rev

Log Message:
-----------
All items in the array for typeahead should be filled as the items correspond to the rows. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-08-10 17:23:12 UTC (rev 7356)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-08-10 17:30:50 UTC (rev 7357)
@@ -1150,7 +1150,7 @@
             
             for (row = 0; row < numberOfRows; row++){
                 value = get_datasource_value(self, selector, tableView, column, row);
-                if(value) [a addObject:[value description]];
+                [a addObject:value ? [value description] : @""];
             }
         }
         return a;


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

Revision: 7358
Author:   amaxwell
Date:     2006-08-10 11:01:22 -0700 (Thu, 10 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=7358&view=rev

Log Message:
-----------
ensure that currentlySelectedItem returns @"" for nil values

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-08-10 17:30:50 UTC (rev 7357)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-08-10 18:01:22 UTC (rev 7358)
@@ -1150,6 +1150,8 @@
             
             for (row = 0; row < numberOfRows; row++){
                 value = get_datasource_value(self, selector, tableView, column, row);
+                
+                // use @"" for nil values; ensure typeahead index matches shownPublications index
                 [a addObject:value ? [value description] : @""];
             }
         }
@@ -1175,11 +1177,13 @@
 // Type-ahead-selection behavior can change if an item is currently selected (especially if the item was selected by type-ahead-selection). Return nil if you have no selection or a multiple selection.
 - (NSString *)currentlySelectedItem{
     if([documentWindow firstResponder] == tableView){
-        int n = [self numberOfSelectedPubs];
-        if (n == 1){
+        if ([self numberOfSelectedPubs] == 1){
             NSTableColumn *column = [tableView tableColumnWithIdentifier:[lastSelectedColumnForSort identifier]];
             unsigned row = [tableView selectedRow];
-            return [[self tableView:tableView objectValueForTableColumn:column row:row] description];
+            id value = [self tableView:tableView objectValueForTableColumn:column row:row];
+            
+            // return @"" for nil values; don't bother checking for URL types, since -typeAheadSelectionItems is empty in that case
+            return value ? [value description] : @"";
         }else{
             return nil;
         }


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

Revision: 7369
Author:   hofman
Date:     2006-08-11 06:32:53 -0700 (Fri, 11 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=7369&view=rev

Log Message:
-----------
Remove unused variables.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-08-11 13:26:31 UTC (rev 7368)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-08-11 13:32:53 UTC (rev 7369)
@@ -1179,11 +1179,7 @@
 - (unsigned int)typeSelectHelperCurrentlySelectedIndex:(BDSKTypeSelectHelper *)typeSelectHelper{
     if(typeSelectHelper == [tableView typeSelectHelper]){    
         if ([self numberOfSelectedPubs] == 1){
-            NSTableColumn *column = [tableView tableColumnWithIdentifier:[lastSelectedColumnForSort identifier]];
-            unsigned row = [tableView selectedRow];
-            id value = [self tableView:tableView objectValueForTableColumn:column row:row];
-            
-            return row;
+            return [tableView selectedRow];
         }else{
             return NSNotFound;
         }


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

Revision: 7440
Author:   hofman
Date:     2006-08-15 01:32:04 -0700 (Tue, 15 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=7440&view=rev

Log Message:
-----------
Do not allow dragging from the custom cite tableview to the same window.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-08-15 05:44:14 UTC (rev 7439)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-08-15 08:32:04 UTC (rev 7440)
@@ -850,7 +850,7 @@
             [tv setDropRow:-1 dropOperation:NSTableViewDropOn];
             return NSDragOperationCopy;
         }
-        if([info draggingSource] == tableView || [info draggingSource] == groupTableView || type == nil) {
+        if([info draggingSource] == tableView || [info draggingSource] == groupTableView || [info draggingSource] == ccTableView || type == nil) {
 			// can't copy onto same table
 			return NSDragOperationNone;
 		}
@@ -874,7 +874,7 @@
         }
             
         // not sure why this check is necessary, but it silences an error message when you drag off the list of items
-        if([info draggingSource] == groupTableView || row >= [tv numberOfRows] || [[self objectInGroupsAtIndex:row]  isValidDropTarget] == NO || (type == nil && [info draggingSource] != tableView)) 
+        if([info draggingSource] == ccTableView || [info draggingSource] == groupTableView || row >= [tv numberOfRows] || [[self objectInGroupsAtIndex:row]  isValidDropTarget] == NO || (type == nil && [info draggingSource] != tableView)) 
             return NSDragOperationNone;
         
         // here we actually target a specific row


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

Revision: 7633
          http://svn.sourceforge.net/bibdesk/?rev=7633&view=rev
Author:   hofman
Date:     2006-09-02 09:29:57 -0700 (Sat, 02 Sep 2006)

Log Message:
-----------
RFE #1550505. Implement delegate methods to add tracking rects for URL cells, showing the URL or abbreviated path in the staus bar on hover. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-09-02 16:27:48 UTC (rev 7632)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-09-02 16:29:57 UTC (rev 7633)
@@ -1209,7 +1209,27 @@
     return promiseDragColumnIdentifier;
 }
 
+#pragma mark Tracking rects
 
+- (BOOL)tableView:(NSTableView *)tv shouldTrackTableColumn:(NSTableColumn *)tableColumn row:(int)row;
+{
+    NSString *tcID = [tableColumn identifier];
+    return [[BibTypeManager sharedManager] isURLField:tcID];
+}
+
+- (void)tableView:(NSTableView *)tv mouseEnteredTableColumn:(NSTableColumn *)tableColumn row:(int)row;
+{
+    NSString *tcID = [tableColumn identifier];
+    BibItem *pub = [[self publications] objectAtIndex:row];
+    NSURL *url = [pub URLForField:tcID];
+    [self setStatus:[url isFileURL] ? [[url path] stringByAbbreviatingWithTildeInPath] : [url absoluteString]];
+}
+
+- (void)tableView:(NSTableView *)tv mouseExitedTableColumn:(NSTableColumn *)tableColumn row:(int)row;
+{
+    [self updateUI];
+}
+
 @end
 
 


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

Revision: 7634
          http://svn.sourceforge.net/bibdesk/?rev=7634&view=rev
Author:   hofman
Date:     2006-09-02 09:50:56 -0700 (Sat, 02 Sep 2006)

Log Message:
-----------
Don't track the mouse over URL cells without a URL.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-09-02 16:29:57 UTC (rev 7633)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-09-02 16:50:56 UTC (rev 7634)
@@ -1214,7 +1214,7 @@
 - (BOOL)tableView:(NSTableView *)tv shouldTrackTableColumn:(NSTableColumn *)tableColumn row:(int)row;
 {
     NSString *tcID = [tableColumn identifier];
-    return [[BibTypeManager sharedManager] isURLField:tcID];
+    return [[BibTypeManager sharedManager] isURLField:tcID] && [[[self publications] objectAtIndex:row] URLForField:tcID];
 }
 
 - (void)tableView:(NSTableView *)tv mouseEnteredTableColumn:(NSTableColumn *)tableColumn row:(int)row;
@@ -1222,7 +1222,8 @@
     NSString *tcID = [tableColumn identifier];
     BibItem *pub = [[self publications] objectAtIndex:row];
     NSURL *url = [pub URLForField:tcID];
-    [self setStatus:[url isFileURL] ? [[url path] stringByAbbreviatingWithTildeInPath] : [url absoluteString]];
+    if (url)
+        [self setStatus:[url isFileURL] ? [[url path] stringByAbbreviatingWithTildeInPath] : [url absoluteString]];
 }
 
 - (void)tableView:(NSTableView *)tv mouseExitedTableColumn:(NSTableColumn *)tableColumn row:(int)row;


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

Revision: 7906
          http://svn.sourceforge.net/bibdesk/?rev=7906&view=rev
Author:   amaxwell
Date:     2006-10-12 14:08:58 -0700 (Thu, 12 Oct 2006)

Log Message:
-----------
use the shownPublications array for tracking updates

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-10-12 20:22:28 UTC (rev 7905)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-10-12 21:08:58 UTC (rev 7906)
@@ -1211,11 +1211,11 @@
 - (BOOL)tableView:(NSTableView *)tv shouldTrackTableColumn:(NSTableColumn *)tableColumn row:(int)row;
 {
     // this can happen when we revert
-    if (row == -1 || row >= [[self publications] count])
+    if (row == -1 || row >= [self numberOfRowsInTableView:tv])
         return NO;
     
     NSString *tcID = [tableColumn identifier];
-    return [[BibTypeManager sharedManager] isURLField:tcID] && [[[self publications] objectAtIndex:row] URLForField:tcID];
+    return [[BibTypeManager sharedManager] isURLField:tcID] && [[shownPublications objectAtIndex:row] URLForField:tcID];
 }
 
 - (void)tableView:(NSTableView *)tv mouseEnteredTableColumn:(NSTableColumn *)tableColumn row:(int)row;
@@ -1223,9 +1223,8 @@
     if (row == -1 || row >= [[self publications] count])
         return;
     
-    NSString *tcID = [tableColumn identifier];
-    BibItem *pub = [[self publications] objectAtIndex:row];
-    NSURL *url = [pub URLForField:tcID];
+    BibItem *pub = [shownPublications objectAtIndex:row];
+    NSURL *url = [pub URLForField:[tableColumn identifier]];
     if (url)
         [self setStatus:[url isFileURL] ? [[url path] stringByAbbreviatingWithTildeInPath] : [url absoluteString]];
 }


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

Revision: 7909
          http://svn.sourceforge.net/bibdesk/?rev=7909&view=rev
Author:   amaxwell
Date:     2006-10-12 17:49:45 -0700 (Thu, 12 Oct 2006)

Log Message:
-----------
fix test to use shownPublications array

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-10-12 23:19:45 UTC (rev 7908)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-10-13 00:49:45 UTC (rev 7909)
@@ -1220,7 +1220,7 @@
 
 - (void)tableView:(NSTableView *)tv mouseEnteredTableColumn:(NSTableColumn *)tableColumn row:(int)row;
 {
-    if (row == -1 || row >= [[self publications] count])
+    if (row == -1 || row >= [self numberOfRowsInTableView:tv])
         return;
     
     BibItem *pub = [shownPublications objectAtIndex:row];


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

Revision: 7944
          http://svn.sourceforge.net/bibdesk/?rev=7944&view=rev
Author:   hofman
Date:     2006-10-15 05:05:34 -0700 (Sun, 15 Oct 2006)

Log Message:
-----------
Avoid code duplication

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-10-15 11:48:24 UTC (rev 7943)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-10-15 12:05:34 UTC (rev 7944)
@@ -1100,20 +1100,9 @@
 - (void)providePromisedTypes {
 	NSEnumerator *nameEnum = [[promisedPboardTypes allKeys] objectEnumerator];
 	NSString *name;
-	
-	while (name = [nameEnum nextObject]) {
-		NSPasteboard *pboard = [NSPasteboard pasteboardWithName:name];
-		NSArray *types = [[self promisedTypesForPasteboard:pboard] copy]; // we need to copy as types can be removed
-		NSEnumerator *typeEnum = nil;
-		NSString *type;
-		
-		if (types == nil) return;
-		typeEnum = [types objectEnumerator];
-		[types release];
-		
-		while (type = [typeEnum nextObject]) 
-			[self pasteboard:pboard provideDataForType:type];
-	}
+    
+	while (name = [nameEnum nextObject])
+        [self providePromisedTypesForPasteboard:[NSPasteboard pasteboardWithName:name]];
 }
 
 // NSPasteboard delegate method for the owner


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

Revision: 8009
          http://svn.sourceforge.net/bibdesk/?rev=8009&view=rev
Author:   hofman
Date:     2006-10-18 10:41:50 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
Drags from URL groups should be treated as shared.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-10-18 17:30:24 UTC (rev 8008)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-10-18 17:41:50 UTC (rev 8009)
@@ -441,7 +441,7 @@
                 }
                 pubs = pubsInGroup;
             }
-            dragFromSharedGroups = [self hasSharedGroupsAtIndexes:rowIndexes];
+            dragFromSharedGroups = [self hasSharedGroupsAtIndexes:rowIndexes] || [self hasURLGroupsAtIndexes:rowIndexes];
 		}
 		if([pubs count] == 0){
             NSBeginAlertSheet(NSLocalizedString(@"Empty Groups", @""),nil,nil,nil,documentWindow,nil,NULL,NULL,NULL,
@@ -467,12 +467,12 @@
         pubs = [self selectedPublications];
         dragCopyType = 1; // only type that makes sense here
         
-        dragFromSharedGroups = [self hasSharedGroupsAtIndexes:[groupTableView selectedRowIndexes]];
+        dragFromSharedGroups = [self hasSharedGroupsAtIndexes:[groupTableView selectedRowIndexes]] || [self hasURLGroupsAtIndexes:[groupTableView selectedRowIndexes]];
     }else{
 		// drag from the main table
 		pubs = [shownPublications objectsAtIndexes:rowIndexes];
         
-        dragFromSharedGroups = [self hasSharedGroupsAtIndexes:[groupTableView selectedRowIndexes]];
+        dragFromSharedGroups = [self hasSharedGroupsAtIndexes:[groupTableView selectedRowIndexes]] || [self hasURLGroupsAtIndexes:[groupTableView selectedRowIndexes]];
 
 		if(pboard == [NSPasteboard pasteboardWithName:NSDragPboard]){
 			// see where we clicked in the table


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

Revision: 8023
          http://svn.sourceforge.net/bibdesk/?rev=8023&view=rev
Author:   hofman
Date:     2006-10-19 04:18:56 -0700 (Thu, 19 Oct 2006)

Log Message:
-----------
Don't drag from the main table to the All Publications group.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-10-19 09:47:38 UTC (rev 8022)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-10-19 11:18:56 UTC (rev 8023)
@@ -896,7 +896,7 @@
         }
             
         // not sure why this check is necessary, but it silences an error message when you drag off the list of items
-        if([info draggingSource] == ccTableView || [info draggingSource] == groupTableView || row >= [tv numberOfRows] || [[self objectInGroupsAtIndex:row]  isValidDropTarget] == NO || (type == nil && [info draggingSource] != tableView)) 
+        if([info draggingSource] == ccTableView || [info draggingSource] == groupTableView || row >= [tv numberOfRows] || [[self objectInGroupsAtIndex:row]  isValidDropTarget] == NO || row == 0 || (type == nil && [info draggingSource] != tableView)) 
             return NSDragOperationNone;
         
         // here we actually target a specific row


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

Revision: 8024
          http://svn.sourceforge.net/bibdesk/?rev=8024&view=rev
Author:   hofman
Date:     2006-10-19 04:26:15 -0700 (Thu, 19 Oct 2006)

Log Message:
-----------
Don't drag from the main table to the All Publications group. But wee should be able to drag from other documents. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-10-19 11:18:56 UTC (rev 8023)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-10-19 11:26:15 UTC (rev 8024)
@@ -896,7 +896,7 @@
         }
             
         // not sure why this check is necessary, but it silences an error message when you drag off the list of items
-        if([info draggingSource] == ccTableView || [info draggingSource] == groupTableView || row >= [tv numberOfRows] || [[self objectInGroupsAtIndex:row]  isValidDropTarget] == NO || row == 0 || (type == nil && [info draggingSource] != tableView)) 
+        if([info draggingSource] == ccTableView || [info draggingSource] == groupTableView || row >= [tv numberOfRows] || [[self objectInGroupsAtIndex:row]  isValidDropTarget] == NO || (type == nil && [info draggingSource] != tableView) || (row == 0 && [info draggingSource] == tableView)) 
             return NSDragOperationNone;
         
         // here we actually target a specific row


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

Revision: 8049
          http://svn.sourceforge.net/bibdesk/?rev=8049&view=rev
Author:   hofman
Date:     2006-10-20 06:16:03 -0700 (Fri, 20 Oct 2006)

Log Message:
-----------
Allow editing of name for any name-editable group. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-10-20 13:06:41 UTC (rev 8048)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-10-20 13:16:03 UTC (rev 8049)
@@ -227,19 +227,12 @@
 		// we need to check for this because for some reason setObjectValue:... is called when the row is selected in this tableView
 		if([NSString isEmptyString:object] || [[group stringValue] isEqualToString:object])
 			return;
-		if([group isSmart] == YES){
-			[(BDSKSmartGroup *)group setName:object];
-			[[self undoManager] setActionName:NSLocalizedString(@"Rename Smart Group",@"Rename smart group")];
-			[self sortGroupsByKey:sortGroupsKey];
-		}else if([group isStatic] == YES){
-			[(BDSKStaticGroup *)group setName:object];
-			[[self undoManager] setActionName:NSLocalizedString(@"Rename Static Group",@"Rename static group")];
-			[self sortGroupsByKey:sortGroupsKey];
-		}else if([group isURL] == YES){
-			[(BDSKURLGroup *)group setName:object];
-			[[self undoManager] setActionName:NSLocalizedString(@"Rename URL Group",@"Rename URL group")];
-			[self sortGroupsByKey:sortGroupsKey];
-		}else{
+		if([group hasEditableName]){
+			[group performSelector:@selector(setName:) withObject:object];
+			[[self undoManager] setActionName:NSLocalizedString(@"Rename Group",@"Rename group")];
+			if([sortGroupsKey isEqualToString:BDSKGroupCellStringKey])
+                [self sortGroupsByKey:sortGroupsKey];
+		}else if([group isCategory]){
 			NSArray *pubs = [groupedPublications copy];
 			[self movePublications:pubs fromGroup:group toGroupNamed:object];
 			[pubs release];


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

Revision: 8067
          http://svn.sourceforge.net/bibdesk/?rev=8067&view=rev
Author:   hofman
Date:     2006-10-21 07:04:10 -0700 (Sat, 21 Oct 2006)

Log Message:
-----------
Pass the correct row indexes to check for external groups. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-10-21 13:54:33 UTC (rev 8066)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-10-21 14:04:10 UTC (rev 8067)
@@ -466,9 +466,9 @@
         dragCopyType = 1; // only type that makes sense here
         
         dragFromSharedGroups = [self hasExternalGroupsAtIndexes:rowIndexes];
-    }else{
+    }else if(tv == tableView){
 		// drag from the main table
-		pubs = [shownPublications objectsAtIndexes:rowIndexes];
+		pubs = [shownPublications objectsAtIndexes:[groupTableView selectedRowIndexes]];
         
         dragFromSharedGroups = [self hasExternalGroupsAtIndexes:rowIndexes];
 


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

Revision: 8082
          http://svn.sourceforge.net/bibdesk/?rev=8082&view=rev
Author:   hofman
Date:     2006-10-23 01:34:49 -0700 (Mon, 23 Oct 2006)

Log Message:
-----------
Check correct row indexes for dragging. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-10-22 12:32:48 UTC (rev 8081)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-10-23 08:34:49 UTC (rev 8082)
@@ -466,9 +466,9 @@
         dragFromSharedGroups = [self hasExternalGroupsAtIndexes:rowIndexes];
     }else if(tv == tableView){
 		// drag from the main table
-		pubs = [shownPublications objectsAtIndexes:[groupTableView selectedRowIndexes]];
+		pubs = [shownPublications objectsAtIndexes:rowIndexes];
         
-        dragFromSharedGroups = [self hasExternalGroupsAtIndexes:rowIndexes];
+        dragFromSharedGroups = [self hasExternalGroupsAtIndexes:[groupTableView selectedRowIndexes]];
 
 		if(pboard == [NSPasteboard pasteboardWithName:NSDragPboard]){
 			// see where we clicked in the table


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

Revision: 8135
          http://svn.sourceforge.net/bibdesk/?rev=8135&view=rev
Author:   hofman
Date:     2006-10-26 02:52:55 -0700 (Thu, 26 Oct 2006)

Log Message:
-----------
Copy publications from external groups.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-10-26 09:14:54 UTC (rev 8134)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-10-26 09:52:55 UTC (rev 8135)
@@ -424,7 +424,7 @@
             // a single row, not necessarily the selected one
             BDSKGroup *group = [self objectInGroupsAtIndex:[rowIndexes firstIndex]];
             if ([group isExternal]) {
-                pubs = [(id)group publications];
+                pubs = [[[(id)group publications] copy] autorelease];
 			} else {
                 NSArray *allPubs = [publications copy];
                 NSMutableArray *pubsInGroup = [NSMutableArray arrayWithCapacity:[allPubs count]];


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

Revision: 8137
          http://svn.sourceforge.net/bibdesk/?rev=8137&view=rev
Author:   hofman
Date:     2006-10-26 03:31:07 -0700 (Thu, 26 Oct 2006)

Log Message:
-----------
Cannot drop on external groups. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-10-26 10:04:21 UTC (rev 8136)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-10-26 10:31:07 UTC (rev 8137)
@@ -858,7 +858,7 @@
     if(tv == (NSTableView *)ccTableView){
         return NSDragOperationNone;// can't drag into that tv.
     }else if(tv == tableView){
-		if(type == nil) 
+        if([self hasExternalGroupsSelected] || type == nil) 
 			return NSDragOperationNone;
 		if ([info draggingSource] == groupTableView && dragFromSharedGroups && [groupTableView selectedRow] == 0) {
             [tv setDropRow:-1 dropOperation:NSTableViewDropOn];


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

Revision: 8168
          http://svn.sourceforge.net/bibdesk/?rev=8168&view=rev
Author:   amaxwell
Date:     2006-10-27 10:12:42 -0700 (Fri, 27 Oct 2006)

Log Message:
-----------
enable checkboxes for document == self

add pragma mark for promise drags

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-10-27 17:07:38 UTC (rev 8167)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-10-27 17:12:42 UTC (rev 8168)
@@ -281,9 +281,9 @@
     if (tv == tableView) {
         if ([aCell isKindOfClass:[NSButtonCell class]]) {
             if ([[shownPublications objectAtIndex:row] document] == self) 
+                [aCell setEnabled:YES];
+            else
                 [aCell setEnabled:NO];
-            else
-                [aCell setEnabled:YES];
         }
     } else if (tv == groupTableView) {
         BDSKGroup *group = [self objectInGroupsAtIndex:row];
@@ -1222,6 +1222,7 @@
     [tv scrollRowToVisible:itemIndex];
 }
 
+#pragma mark HFS Promise drags
 // promise drags (currently used for webloc files)
 - (NSArray *)tableView:(NSTableView *)tv namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination forDraggedRowsWithIndexes:(NSIndexSet *)indexSet;
 {


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

Revision: 8223
          http://svn.sourceforge.net/bibdesk/?rev=8223&view=rev
Author:   hofman
Date:     2006-10-31 10:10:28 -0800 (Tue, 31 Oct 2006)

Log Message:
-----------
Only display first dragged key.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-10-31 07:30:36 UTC (rev 8222)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-10-31 18:10:28 UTC (rev 8223)
@@ -751,17 +751,14 @@
                 inside = YES;
 				break;
 			case BDSKCiteDragCopyType:
-				// Are we using a custom citeString (from the drawer?
+				// Are we using a custom citeString (from the drawer?)
 				if (tv == ccTableView) { 
-					[s appendString:[self citeStringForPublications:promisedDraggedItems citeString:[customStringArray objectAtIndex:[dragRows firstIndex]]]];
+					[s appendString:[self citeStringForPublications:[NSArray arrayWithObject:firstItem] citeString:[customStringArray objectAtIndex:[dragRows firstIndex]]]];
 				} else {
-					[s appendString:[self citeStringForPublications:promisedDraggedItems citeString:[sud stringForKey:BDSKCiteStringKey]]];
+					[s appendString:[self citeStringForPublications:[NSArray arrayWithObject:firstItem] citeString:[sud stringForKey:BDSKCiteStringKey]]];
 				}
-				// trim to something reasonably short
-				if ([s length] > 40) {
-					[s setString:[s substringToIndex:40]];
+				if (count > 1) 
 					[s appendString:[NSString horizontalEllipsisString]];
-				}
 				break;
 			case BDSKPDFDragCopyType:
 			case BDSKRTFDragCopyType:


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

Revision: 8365
          http://svn.sourceforge.net/bibdesk/?rev=8365&view=rev
Author:   hofman
Date:     2006-11-10 10:46:16 -0800 (Fri, 10 Nov 2006)

Log Message:
-----------
Slight simplification and improved readability of drop validation. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-11-10 17:43:07 UTC (rev 8364)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-11-10 18:46:16 UTC (rev 8365)
@@ -851,17 +851,18 @@
     
     NSPasteboard *pboard = [info draggingPasteboard];
     NSString *type = [pboard availableTypeFromArray:[NSArray arrayWithObjects:BDSKBibItemPboardType, BDSKWeblocFilePboardType, BDSKReferenceMinerStringPboardType, NSStringPboardType, NSFilenamesPboardType, NSURLPboardType, nil]];
+    id draggingSource = [info draggingSource];
     
     if(tv == (NSTableView *)ccTableView){
         return NSDragOperationNone;// can't drag into that tv.
     }else if(tv == tableView){
         if([self hasExternalGroupsSelected] || type == nil) 
 			return NSDragOperationNone;
-		if ([info draggingSource] == groupTableView && docState.dragFromSharedGroups && [groupTableView selectedRow] == 0) {
+		if (draggingSource == groupTableView && docState.dragFromSharedGroups && [groupTableView selectedRow] == 0) {
             [tv setDropRow:-1 dropOperation:NSTableViewDropOn];
             return NSDragOperationCopy;
         }
-        if([info draggingSource] == tableView || [info draggingSource] == groupTableView || [info draggingSource] == ccTableView || type == nil) {
+        if(draggingSource == tableView || draggingSource == groupTableView || draggingSource == ccTableView) {
 			// can't copy onto same table
 			return NSDragOperationNone;
 		}
@@ -877,7 +878,7 @@
         else
             return NSDragOperationEvery;
     }else if(tv == groupTableView){
-		if (([info draggingSource] == groupTableView || [info draggingSource] == tableView) && docState.dragFromSharedGroups) {
+		if ((draggingSource == groupTableView || draggingSource == tableView) && docState.dragFromSharedGroups) {
             if (row != 0)
                 return NSDragOperationNone;
             [tv setDropRow:row dropOperation:NSTableViewDropOn];
@@ -885,12 +886,12 @@
         }
             
         // not sure why this check is necessary, but it silences an error message when you drag off the list of items
-        if([info draggingSource] == ccTableView || [info draggingSource] == groupTableView || row >= [tv numberOfRows] || [[groups objectAtIndex:row]  isValidDropTarget] == NO || (type == nil && [info draggingSource] != tableView) || (row == 0 && [info draggingSource] == tableView)) 
+        if(draggingSource == ccTableView || draggingSource == groupTableView || row >= [tv numberOfRows] || [[groups objectAtIndex:row]  isValidDropTarget] == NO || type == nil || (row == 0 && draggingSource == tableView)) 
             return NSDragOperationNone;
         
         // here we actually target a specific row
         [tv setDropRow:row dropOperation:NSTableViewDropOn];
-        if([info draggingSource] == tableView){
+        if(draggingSource == tableView){
             if([type isEqualToString:BDSKBibItemPboardType])
                 return NSDragOperationLink;
             else
@@ -913,7 +914,7 @@
 	
     NSPasteboard *pboard = [info draggingPasteboard];
     NSString *type = [pboard availableTypeFromArray:[NSArray arrayWithObjects:BDSKBibItemPboardType, BDSKWeblocFilePboardType, BDSKReferenceMinerStringPboardType, NSStringPboardType, NSFilenamesPboardType, NSURLPboardType, nil]];
-	
+    
     if(tv == (NSTableView *)ccTableView){
         return NO; // can't drag into that tv.
     } else if(tv == tableView){
@@ -988,16 +989,17 @@
         }
     } else if(tv == groupTableView){
         NSArray *pubs = nil;
+        id draggingSource = [info draggingSource];
         
         // retain is required to fix bug #1356183
         BDSKGroup *group = [[[groups objectAtIndex:row] retain] autorelease];
         BOOL shouldSelect = [[self selectedGroups] containsObject:group];
 		
-		if (([info draggingSource] == groupTableView || [info draggingSource] == tableView) && docState.dragFromSharedGroups && row == 0) {
+		if ((draggingSource == groupTableView || draggingSource == tableView) && docState.dragFromSharedGroups && row == 0) {
             return [self addPublicationsFromPasteboard:pboard error:NULL];
-        } else if([info draggingSource] == groupTableView || [group isValidDropTarget] == NO) {
+        } else if(draggingSource == groupTableView || [group isValidDropTarget] == NO) {
             return NO;
-        } else if([info draggingSource] == tableView){
+        } else if(draggingSource == tableView){
             // we already have these publications, so we just want to add them to the group, not the document
             
 			pubs = [self promisedItemsForPasteboard:[NSPasteboard pasteboardWithName:NSDragPboard]];


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

Revision: 8372
          http://svn.sourceforge.net/bibdesk/?rev=8372&view=rev
Author:   hofman
Date:     2006-11-11 02:53:04 -0800 (Sat, 11 Nov 2006)

Log Message:
-----------
Fix determination of dragging of shared groups.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-11-11 10:24:48 UTC (rev 8371)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-11-11 10:53:04 UTC (rev 8372)
@@ -465,12 +465,12 @@
         pubs = [self selectedPublications];
         dragCopyType = 1; // only type that makes sense here
         
-        docState.dragFromSharedGroups = [groups hasExternalGroupsAtIndexes:rowIndexes];
+        docState.dragFromSharedGroups = [self hasExternalGroupsSelected];
     }else if(tv == tableView){
 		// drag from the main table
 		pubs = [shownPublications objectsAtIndexes:rowIndexes];
         
-        docState.dragFromSharedGroups = [groups hasExternalGroupsAtIndexes:[groupTableView selectedRowIndexes]];
+        docState.dragFromSharedGroups = [self hasExternalGroupsSelected];
 
 		if(pboard == [NSPasteboard pasteboardWithName:NSDragPboard]){
 			// see where we clicked in the table


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

Revision: 8429
          http://svn.sourceforge.net/bibdesk/?rev=8429&view=rev
Author:   hofman
Date:     2006-11-13 08:05:08 -0800 (Mon, 13 Nov 2006)

Log Message:
-----------
Put nil on the pasteboard when we fail to generate data. Otherwise we will be called again, which can lead to a crash when the document is closed. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-11-13 13:10:57 UTC (rev 8428)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-11-13 16:05:08 UTC (rev 8429)
@@ -667,6 +667,7 @@
 			   [texTask hasPDFData]){
 				[pboard setData:[texTask PDFData] forType:NSPDFPboardType];
 			}else{
+				[pboard setData:nil forType:NSPDFPboardType];
 				NSBeep();
 			}
 		}else if([type isEqualToString:NSRTFPboardType]){
@@ -676,6 +677,7 @@
 			   [texTask hasRTFData]){
 				[pboard setData:[texTask RTFData] forType:NSRTFPboardType];
 			}else{
+				[pboard setData:nil forType:NSRTFPboardType];
 				NSBeep();
 			}
 		}else if([type isEqualToString:NSStringPboardType]){
@@ -688,6 +690,7 @@
 				   [texTask hasLTB]){
 					[pboard setString:[texTask LTBString] forType:NSStringPboardType];
 				}else{
+                    [pboard setData:nil forType:NSStringPboardType];
 					NSBeep();
 				}
 			}else{
@@ -696,6 +699,7 @@
 				   [texTask hasLaTeX]){
 					[pboard setString:[texTask LaTeXString] forType:NSStringPboardType];
 				}else{
+                    [pboard setData:nil forType:NSStringPboardType];
 					NSBeep();
 				}
 			}


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

Revision: 8441
          http://svn.sourceforge.net/bibdesk/?rev=8441&view=rev
Author:   amaxwell
Date:     2006-11-13 13:20:55 -0800 (Mon, 13 Nov 2006)

Log Message:
-----------
unused var

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-11-13 21:02:06 UTC (rev 8440)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-11-13 21:20:55 UTC (rev 8441)
@@ -549,7 +549,6 @@
 }
 	
 - (BOOL)writePublications:(NSArray *)pubs forDragCopyType:(int)dragCopyType citeString:(NSString *)citeString toPasteboard:(NSPasteboard*)pboard{
-	NSMutableArray *promisedTypes = [NSMutableArray arrayWithObjects:BDSKBibItemPboardType, nil];
 	NSString *mainType = nil;
 	NSString *string = nil;
 	NSData *data = nil;


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

Revision: 8445
          http://svn.sourceforge.net/bibdesk/?rev=8445&view=rev
Author:   hofman
Date:     2006-11-13 16:43:18 -0800 (Mon, 13 Nov 2006)

Log Message:
-----------
Check if we are the current document before using data from the shared previewer.

Remove commented code. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-11-13 23:08:40 UTC (rev 8444)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-11-14 00:43:18 UTC (rev 8445)
@@ -567,33 +567,27 @@
 		case BDSKPDFDragCopyType:
 			mainType = NSPDFPboardType;
 			if([pubs isEqualToArray:[self selectedPublications]]){
-			   if([previewer isVisible])
-                    // we are copying, and the previewer is showing, so we reuse it's PDF data if available
-                    data = [previewer PDFData];
-			   if(data == nil && [[BDSKPreviewer sharedPreviewer] isVisible])
-                    // we are copying, and the previewer is showing, so we reuse it's PDF data if available
+                // reuse the PDF data from a previewer if available
+                data = [previewer PDFData];
+                if(data == nil && [[NSDocumentController sharedDocumentController] currentDocument] == self)
                     data = [[BDSKPreviewer sharedPreviewer] PDFData];
 			}
 			break;
 		case BDSKRTFDragCopyType:
 			mainType = NSRTFPboardType;
 			if([pubs isEqualToArray:[self selectedPublications]]){
-			   if([previewer isVisible])
-                    // we are copying, and the previewer is showing, so we reuse it's RTF data if available
-                    data = [previewer RTFData];
-			   if(data == nil && [[BDSKPreviewer sharedPreviewer] isVisible])
-                    // we are copying, and the previewer is showing, so we reuse it's RTF data if available
+                // reuse the RTF data from a previewer if available
+                data = [previewer RTFData];
+                if(data == nil && [[NSDocumentController sharedDocumentController] currentDocument] == self)
                     data = [[BDSKPreviewer sharedPreviewer] RTFData];
 			}
 			break;
 		case BDSKLaTeXDragCopyType:
 			mainType = NSStringPboardType;
 			if([pubs isEqualToArray:[self selectedPublications]]){
-			   if([previewer isVisible])
-                    // we are copying, and the previewer is showing, so we reuse it's LaTeX string if available
-                    string = [previewer LaTeXString];
-			   if(string == nil && [[BDSKPreviewer sharedPreviewer] isVisible])
-                    // we are copying, and the previewer is showing, so we reuse it's LaTeX string if available
+                // reuse the LaTeX string from a previewer if available
+                string = [previewer LaTeXString];
+                if(string == nil && [[NSDocumentController sharedDocumentController] currentDocument] == self)
                     string = [[BDSKPreviewer sharedPreviewer] LaTeXString];
 			}
 			break;
@@ -637,8 +631,6 @@
         [pboardHelper setString:string forType:mainType forPasteboard:pboard];
 	else if(data != nil)
         [pboardHelper setData:data forType:mainType forPasteboard:pboard];
-	
-	//[self setPromisedItems:pubs types:promisedTypes dragCopyType:dragCopyType forPasteboard:pboard];
 
     return YES;
 }


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

Revision: 8455
          http://svn.sourceforge.net/bibdesk/?rev=8455&view=rev
Author:   amaxwell
Date:     2006-11-14 09:09:55 -0800 (Tue, 14 Nov 2006)

Log Message:
-----------
Use NSView's isDescendantOf: method to determine if the spinner should be added.  Only start animation if it hasn't been added.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-11-14 17:09:05 UTC (rev 8454)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-11-14 17:09:55 UTC (rev 8455)
@@ -324,9 +324,11 @@
             rect = BDSKCenterRectVertically(rect, size.height, [tv isFlipped]);
             
             [spinner setFrame:rect];
-            if([[tv subviews] containsObject:spinner] == NO)
+            if([spinner isDescendantOf:tv] == NO) {
                 [tv addSubview:spinner];
-            [spinner startAnimation:nil];
+                [spinner startAnimation:nil];
+            }
+            
         } else if (spinner != nil) {
             [spinner stopAnimation:nil];
             [spinner removeFromSuperview];


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

Revision: 8478
          http://svn.sourceforge.net/bibdesk/?rev=8478&view=rev
Author:   amaxwell
Date:     2006-11-15 08:26:55 -0800 (Wed, 15 Nov 2006)

Log Message:
-----------
Add case for dragging from drawer (local variable was unused).

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-11-15 16:11:01 UTC (rev 8477)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-11-15 16:26:55 UTC (rev 8478)
@@ -993,6 +993,8 @@
             // we already have these publications, so we just want to add them to the group, not the document
             
 			pubs = [pboardHelper promisedItemsForPasteboard:[NSPasteboard pasteboardWithName:NSDragPboard]];
+        } else if(isDragFromDrawer){
+            return NO;
         } else {
             if([self addPublicationsFromPasteboard:pboard error:NULL] == NO)
                 return NO;


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

Revision: 8481
          http://svn.sourceforge.net/bibdesk/?rev=8481&view=rev
Author:   amaxwell
Date:     2006-11-15 14:28:16 -0800 (Wed, 15 Nov 2006)

Log Message:
-----------
Remove test and comment.  I think these were left over from the original sorting implementation, which only sorted in one direction (the datasource altered the row variable based on an ascending/descending flag).

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-11-15 22:00:33 UTC (rev 8480)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-11-15 22:28:16 UTC (rev 8481)
@@ -93,9 +93,8 @@
 }
 
 - (id)tableView:(NSTableView *)tv objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row{
-    if(tv == tableView){ // sortedRow can be -1 if you delete the last pub and sortDescending is true
-        BibItem *pub = row == -1 ? nil : [shownPublications objectAtIndex:row];
-        return [pub displayValueOfField:[tableColumn identifier]];
+    if(tv == tableView){
+        return [[shownPublications objectAtIndex:row] displayValueOfField:[tableColumn identifier]];
     }else if(tv == groupTableView){
 		return [groups objectAtIndex:row];
     }else return nil;


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

Revision: 8482
          http://svn.sourceforge.net/bibdesk/?rev=8482&view=rev
Author:   hofman
Date:     2006-11-15 14:40:36 -0800 (Wed, 15 Nov 2006)

Log Message:
-----------
Collapse if cases. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-11-15 22:28:16 UTC (rev 8481)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-11-15 22:40:36 UTC (rev 8482)
@@ -912,14 +912,12 @@
 		
 		if ((isDragFromGroupTable || isDragFromMainTable) && docState.dragFromSharedGroups && row == 0) {
             return [self addPublicationsFromPasteboard:pboard error:NULL];
-        } else if(isDragFromGroupTable || [group isValidDropTarget] == NO) {
+        } else if(isDragFromGroupTable || isDragFromDrawer || [group isValidDropTarget] == NO) {
             return NO;
         } else if(isDragFromMainTable){
             // we already have these publications, so we just want to add them to the group, not the document
             
 			pubs = [pboardHelper promisedItemsForPasteboard:[NSPasteboard pasteboardWithName:NSDragPboard]];
-        } else if(isDragFromDrawer){
-            return NO;
         } else {
             if([self addPublicationsFromPasteboard:pboard error:NULL] == NO)
                 return NO;


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

Revision: 8509
          http://svn.sourceforge.net/bibdesk/?rev=8509&view=rev
Author:   hofman
Date:     2006-11-17 07:51:49 -0800 (Fri, 17 Nov 2006)

Log Message:
-----------
Never use data from a previewer for drag/copy. It is unreliable, as the selection might have changed and the queued notification has not yet been received. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-11-17 15:15:17 UTC (rev 8508)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-11-17 15:51:49 UTC (rev 8509)
@@ -511,31 +511,11 @@
 			break;
 		case BDSKPDFDragCopyType:
 			mainType = NSPDFPboardType;
-			if([pubs isEqualToArray:[self selectedPublications]]){
-                // reuse the PDF data from a previewer if available
-                data = [previewer PDFData];
-                if(data == nil && [self isMainDocument])
-                    data = [[BDSKPreviewer sharedPreviewer] PDFData];
-			}
 			break;
 		case BDSKRTFDragCopyType:
 			mainType = NSRTFPboardType;
-			if([pubs isEqualToArray:[self selectedPublications]]){
-                // reuse the RTF data from a previewer if available
-                data = [previewer RTFData];
-                if(data == nil && [self isMainDocument])
-                    data = [[BDSKPreviewer sharedPreviewer] RTFData];
-			}
 			break;
 		case BDSKLaTeXDragCopyType:
-			mainType = NSStringPboardType;
-			if([pubs isEqualToArray:[self selectedPublications]]){
-                // reuse the LaTeX string from a previewer if available
-                string = [previewer LaTeXString];
-                if(string == nil && [self isMainDocument])
-                    string = [[BDSKPreviewer sharedPreviewer] LaTeXString];
-			}
-			break;
 		case BDSKLTBDragCopyType:
 			mainType = NSStringPboardType;
 			break;


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

Revision: 8555
          http://svn.sourceforge.net/bibdesk/?rev=8555&view=rev
Author:   hofman
Date:     2006-11-20 06:49:35 -0800 (Mon, 20 Nov 2006)

Log Message:
-----------
Only disable button cells for items in external groups.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-11-20 13:50:29 UTC (rev 8554)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-11-20 14:49:35 UTC (rev 8555)
@@ -207,7 +207,8 @@
 - (void)tableView:(NSTableView *)tv willDisplayCell:(id)aCell forTableColumn:(NSTableColumn *)aTableColumn row:(int)row{
     if (row == -1) return;
     if (tv == tableView) {
-        [aCell setEnabled:[self hasSharedGroupsSelected] == NO];
+        if([aCell isKindOfClass:[NSButtonCell class]])
+            [aCell setEnabled:[self hasExternalGroupsSelected] == NO];
     } else if (tv == groupTableView) {
         BDSKGroup *group = [groups objectAtIndex:row];
         NSProgressIndicator *spinner = [groups spinnerForGroup:group];


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

Revision: 8632
          http://svn.sourceforge.net/bibdesk/?rev=8632&view=rev
Author:   hofman
Date:     2006-11-30 02:59:13 -0800 (Thu, 30 Nov 2006)

Log Message:
-----------
Catch TeXify exception when writing xattrs.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-11-30 10:39:21 UTC (rev 8631)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-11-30 10:59:13 UTC (rev 8632)
@@ -468,8 +468,14 @@
                             [filePaths addObject:path];
                             NSError *xerror = nil;
                             // we can always write xattrs; this doesn't alter the original file's content in any way, but fails if you have a really long abstract/annote
-                            if([[NSFileManager defaultManager] setExtendedAttributeNamed:OMNI_BUNDLE_IDENTIFIER @".bibtexstring" toValue:[[pub bibTeXString] dataUsingEncoding:NSUTF8StringEncoding] atPath:path options:nil error:&xerror] == NO)
-                                NSLog(@"%@ line %d: adding xattrs failed with error %@", __FILENAMEASNSSTRING__, __LINE__, xerror);
+                            @try{
+                                if([[NSFileManager defaultManager] setExtendedAttributeNamed:OMNI_BUNDLE_IDENTIFIER @".bibtexstring" toValue:[[pub bibTeXString] dataUsingEncoding:NSUTF8StringEncoding] atPath:path options:nil error:&xerror] == NO)
+                                    NSLog(@"%@ line %d: adding xattrs failed with error %@", __FILENAMEASNSSTRING__, __LINE__, xerror);
+                            }
+                            @catch(id exception){
+                                // this could be a TeXify exception
+                                NSLog(@"%@ line %d: adding xattrs failed with exception %@", __FILENAMEASNSSTRING__, __LINE__, exception);
+                            }
                             // writing the standard PDF metadata alters the original file, so we'll make it a separate preference; this is also really slow
                             if([[OFPreferenceWrapper sharedPreferenceWrapper] boolForKey:BDSKShouldWritePDFMetadata])
                                 [pub addPDFMetadataToFileForLocalURLField:dragColumnId];


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

Revision: 8651
          http://svn.sourceforge.net/bibdesk/?rev=8651&view=rev
Author:   hofman
Date:     2006-12-02 06:00:56 -0800 (Sat, 02 Dec 2006)

Log Message:
-----------
Check object class of "edited" group value. When a group is selected, tableView:setObjectValue:forTableColumn:row: can be called with the current group name, which can be a BibAuthor. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-12-02 13:49:51 UTC (rev 8650)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-12-02 14:00:56 UTC (rev 8651)
@@ -155,17 +155,17 @@
 	}else if(tv == groupTableView){
 		BDSKGroup *group = [groups objectAtIndex:row];
 		// we need to check for this because for some reason setObjectValue:... is called when the row is selected in this tableView
-		if([NSString isEmptyString:object] || [[group stringValue] isEqualToString:object])
+		if(([object isKindOfClass:[NSString class]] && [NSString isEmptyString:object]) || [[group name] isEqual:object])
 			return;
-		if([group hasEditableName]){
+		if([group isCategory]){
+			NSArray *pubs = [groupedPublications copy];
+			[self movePublications:pubs fromGroup:group toGroupNamed:object];
+			[pubs release];
+		}else if([group hasEditableName]){
 			[(BDSKMutableGroup *)group setName:object];
 			[[self undoManager] setActionName:NSLocalizedString(@"Rename Group", @"Undo action name")];
 			if([sortGroupsKey isEqualToString:BDSKGroupCellStringKey])
                 [self sortGroupsByKey:sortGroupsKey];
-		}else if([group isCategory]){
-			NSArray *pubs = [groupedPublications copy];
-			[self movePublications:pubs fromGroup:group toGroupNamed:object];
-			[pubs release];
 		}
 	}
 }


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

Revision: 8670
          http://svn.sourceforge.net/bibdesk/?rev=8670&view=rev
Author:   hofman
Date:     2006-12-03 08:00:57 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
small changes for group rename warning alert.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-12-03 15:26:53 UTC (rev 8669)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-12-03 16:00:57 UTC (rev 8670)
@@ -172,7 +172,7 @@
 
 #pragma mark TableView delegate
 
-- (void)disableWarningAlertDidEnd:(BDSKAlert *)alert returnCode:(int)returnCode contextInfo:(void *)contextInfo {
+- (void)disableGroupRenameWarningAlertDidEnd:(BDSKAlert *)alert returnCode:(int)returnCode contextInfo:(void *)contextInfo {
 	if ([alert checkValue] == YES) {
 		[[OFPreferenceWrapper sharedPreferenceWrapper] setBool:NO forKey:BDSKWarnOnRenameGroupKey];
 	}
@@ -187,17 +187,17 @@
 			
 			BDSKAlert *alert = [BDSKAlert alertWithMessageText:NSLocalizedString(@"Warning", @"Message in alert dialog")
 												 defaultButton:NSLocalizedString(@"OK", @"Button title")
-											   alternateButton:nil
-												   otherButton:NSLocalizedString(@"Cancel", @"Button title")
+											   alternateButton:NSLocalizedString(@"Cancel", @"Button title")
+												   otherButton:nil
 									 informativeTextWithFormat:NSLocalizedString(@"This action will change the %@ field in %i items. Do you want to proceed?", @"Informative text in alert dialog"), currentGroupField, [groupedPublications count]];
 			[alert setHasCheckButton:YES];
 			[alert setCheckValue:NO];
 			int rv = [alert runSheetModalForWindow:documentWindow
 									 modalDelegate:self 
-									didEndSelector:@selector(disableWarningAlertDidEnd:returnCode:contextInfo:) 
+									didEndSelector:@selector(disableGroupRenameWarningAlertDidEnd:returnCode:contextInfo:) 
 								didDismissSelector:NULL 
-									   contextInfo:BDSKWarnOnRenameGroupKey];
-			if (rv == NSAlertOtherReturn)
+									   contextInfo:NULL];
+			if (rv == NSAlertAlternateReturn)
 				return NO;
 		}
 		return YES;


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

Revision: 8857
          http://svn.sourceforge.net/bibdesk/?rev=8857&view=rev
Author:   amaxwell
Date:     2006-12-25 12:17:57 -0800 (Mon, 25 Dec 2006)

Log Message:
-----------
display group stringValue as tooltip

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-12-25 18:04:44 UTC (rev 8856)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-12-25 20:17:57 UTC (rev 8857)
@@ -170,6 +170,11 @@
 	}
 }
 
+- (NSString *)tableView:(NSTableView *)tv toolTipForTableColumn:(NSTableColumn *)aTableColumn row:(int)row {
+    return (tv == groupTableView ? [[groups objectAtIndex:row] stringValue] : nil);
+}
+    
+
 #pragma mark TableView delegate
 
 - (void)disableGroupRenameWarningAlertDidEnd:(BDSKAlert *)alert returnCode:(int)returnCode contextInfo:(void *)contextInfo {


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

Revision: 9028
          http://svn.sourceforge.net/bibdesk/?rev=9028&view=rev
Author:   amaxwell
Date:     2007-01-02 17:23:40 -0800 (Tue, 02 Jan 2007)

Log Message:
-----------
remove history when exporting a search group

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2007-01-03 00:29:17 UTC (rev 9027)
+++ trunk/bibdesk/BibDocument_DataSource.m	2007-01-03 01:23:40 UTC (rev 9028)
@@ -996,6 +996,7 @@
         if (plist) {
             // we probably don't want to share this info with anyone else
             [plist removeObjectForKey:@"search term"];
+            [plist removeObjectForKey:@"history"];
             
             NSString *fileName = [group respondsToSelector:@selector(serverInfo)] ? [[(BDSKSearchGroup *)group serverInfo] name] : [group name];
             fileName = [fileName stringByAppendingPathExtension:@"bdsksearch"];


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

Revision: 9051
          http://svn.sourceforge.net/bibdesk/?rev=9051&view=rev
Author:   hofman
Date:     2007-01-03 10:19:51 -0800 (Wed, 03 Jan 2007)

Log Message:
-----------
Do ot add a new group when we did not add any pubs. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2007-01-03 18:15:33 UTC (rev 9050)
+++ trunk/bibdesk/BibDocument_DataSource.m	2007-01-03 18:19:51 UTC (rev 9051)
@@ -923,7 +923,7 @@
         }
         
         // add to the group we're dropping on, /not/ the currently selected group; no need to add to all pubs group, though
-        if(group != nil && row != 0){
+        if(group != nil && row != 0 && [pubs count]){
             [self addPublications:pubs toGroup:group];
             // reselect if necessary, or we default to selecting the all publications group (which is really annoying when creating a new pub by dropping a PDF on a group)
             // don't use row, because we might have added the Last Import group


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

Revision: 9052
          http://svn.sourceforge.net/bibdesk/?rev=9052&view=rev
Author:   hofman
Date:     2007-01-03 10:21:19 -0800 (Wed, 03 Jan 2007)

Log Message:
-----------
Do ot add a new group when we did not add any pubs. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2007-01-03 18:19:51 UTC (rev 9051)
+++ trunk/bibdesk/BibDocument_DataSource.m	2007-01-03 18:21:19 UTC (rev 9052)
@@ -898,9 +898,7 @@
             pubs = [self selectedPublications];            
         }
 
-        OBPRECONDITION([pubs count]);
-        
-        if(row == -1){
+        if(row == -1 && [pubs count]){
             // add a new static groups with the added items, use a common author name or keyword if available
             NSEnumerator *pubEnum = [pubs objectEnumerator];
             BibItem *pub = [pubEnum nextObject];


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

Revision: 9189
          http://svn.sourceforge.net/bibdesk/?rev=9189&view=rev
Author:   hofman
Date:     2007-01-11 14:33:59 -0800 (Thu, 11 Jan 2007)

Log Message:
-----------
Only drag files when there are any files. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2007-01-11 21:38:17 UTC (rev 9188)
+++ trunk/bibdesk/BibDocument_DataSource.m	2007-01-11 22:33:59 UTC (rev 9189)
@@ -460,7 +460,6 @@
                     BibItem *pub = nil;
                     NSString *path;
                     NSMutableArray *filePaths = [NSMutableArray arrayWithCapacity:[rowIndexes count]];
-                    [pboard declareTypes:[NSArray arrayWithObjects:NSFilenamesPboardType, nil] owner:nil];
 
                     while(row != NSNotFound){
                         pub = [shownPublications objectAtIndex:row];
@@ -477,9 +476,12 @@
                         }
                         row = [rowIndexes indexGreaterThanIndex:row];
                     }
-
-                    return [pboard setPropertyList:filePaths forType:NSFilenamesPboardType];
                     
+                    if([filePaths count]){
+                        [pboard declareTypes:[NSArray arrayWithObjects:NSFilenamesPboardType, nil] owner:nil];
+                        return [pboard setPropertyList:filePaths forType:NSFilenamesPboardType];
+                    }
+                    
 				}else if([dragColumnId isRemoteURLField]){
 					// cache this so we know which column (field) was dragged
 					[self setPromiseDragColumnIdentifier:dragColumnId];


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

Revision: 9316
          http://svn.sourceforge.net/bibdesk/?rev=9316&view=rev
Author:   hofman
Date:     2007-01-19 11:31:07 -0800 (Fri, 19 Jan 2007)

Log Message:
-----------
Make sure we set the pboard for templates as the helper does not know how to handle those and will get confused.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2007-01-19 19:30:20 UTC (rev 9315)
+++ trunk/bibdesk/BibDocument_DataSource.m	2007-01-19 19:31:07 UTC (rev 9316)
@@ -573,7 +573,9 @@
         [pboardHelper setString:string forType:mainType forPasteboard:pboard];
 	else if(data != nil)
         [pboardHelper setData:data forType:mainType forPasteboard:pboard];
-    
+    else if(dragCopyType >= BDSKTemplateDragCopyType)
+        [pboardHelper setData:nil forType:mainType forPasteboard:pboard];
+        
     return YES;
 }
 


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

Revision: 9544
          http://svn.sourceforge.net/bibdesk/?rev=9544&view=rev
Author:   hofman
Date:     2007-02-03 16:23:56 -0800 (Sat, 03 Feb 2007)

Log Message:
-----------
Support selection from .aux files using non-standrad bibliography styles, such as harvard. Guess citation command from the file. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2007-02-03 23:27:40 UTC (rev 9543)
+++ trunk/bibdesk/BibDocument_DataSource.m	2007-02-04 00:23:56 UTC (rev 9544)
@@ -841,19 +841,35 @@
                         
                         NSScanner *scanner = [NSScanner scannerWithString:auxString];
                         NSString *key = nil;
+                        NSString *command = nil;
                         NSArray *items = nil;
                         NSMutableArray *selItems = [NSMutableArray array];
                         
-                        while ([scanner isAtEnd] == NO && 
-                               [scanner scanUpToString:@"\\bibcite{" intoString:NULL] && 
-                               [scanner scanString:@"\\bibcite{" intoString:NULL]) {
-                            if([scanner scanUpToString:@"}" intoString:&key]) {
-                                if (items = [publications allItemsForCiteKey:key])
-                                    [selItems addObjectsFromArray:items];
-                            }
-                        }
-                        [self selectPublications:selItems];
+                        [scanner setCharactersToBeSkipped:nil];
                         
+                        if ([scanner scanUpToString:@"\\bibdata{" intoString:NULL] == NO ||
+                            [scanner scanUpToCharactersFromSet:[NSCharacterSet newlineCharacterSet] intoString:NULL] == NO ||
+                            [scanner scanCharactersFromSet:[NSCharacterSet newlineCharacterSet] intoString:NULL] == NO ||
+                            [scanner scanUpToString:@"{" intoString:&command] == NO ||
+                            [scanner scanString:@"{" intoString:NULL] == NO)
+                            return NO;
+                        
+                        command = [command stringByAppendingString:@"{"];
+                        
+                        do {
+                            if ([scanner scanUpToString:@"}" intoString:&key] == NO)
+                                break;
+                            if (items = [publications allItemsForCiteKey:key])
+                                [selItems addObjectsFromArray:items];
+                            if ([scanner scanUpToCharactersFromSet:[NSCharacterSet newlineCharacterSet] intoString:NULL] == NO ||
+                                [scanner scanCharactersFromSet:[NSCharacterSet newlineCharacterSet] intoString:NULL] == NO ||
+                                [scanner scanString:command intoString:NULL] == NO)
+                                break;
+                        } while ([scanner isAtEnd] == NO);
+                        
+                        if ([selItems count])
+                            [self selectPublications:selItems];
+                        
                         return YES;
                     }
                 }


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

Revision: 10306
          http://svn.sourceforge.net/bibdesk/?rev=10306&view=rev
Author:   amaxwell
Date:     2007-03-23 14:42:24 -0700 (Fri, 23 Mar 2007)

Log Message:
-----------
Fix exception when dropping an item from another document on the selected category group.  It's not clear why this no longer worked.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2007-03-23 21:40:28 UTC (rev 10305)
+++ trunk/bibdesk/BibDocument_DataSource.m	2007-03-23 21:42:24 UTC (rev 10306)
@@ -902,6 +902,7 @@
             
 			pubs = [pboardHelper promisedItemsForPasteboard:[NSPasteboard pasteboardWithName:NSDragPboard]];
         } else {
+            
             if([self addPublicationsFromPasteboard:pboard selectLibrary:YES error:NULL] == NO)
                 return NO;
             
@@ -932,11 +933,12 @@
         
         // add to the group we're dropping on, /not/ the currently selected group; no need to add to all pubs group, though
         if(group != nil && row != 0 && [pubs count]){
+            
             [self addPublications:pubs toGroup:group];
-            // reselect if necessary, or we default to selecting the all publications group (which is really annoying when creating a new pub by dropping a PDF on a group)
-            // don't use row, because we might have added the Last Import group
+            
+            // Reselect if necessary, or we default to selecting the all publications group (which is really annoying when creating a new pub by dropping a PDF on a group).  Don't use row, because we might have added the Last Import group.  Also, note that a side effect of addPublicationsFromPasteboard:selectLibrary: may create a new group (if dropping on a selected category group), so [groups indexOfObjectIdenticalTo:group] == NSNotFound.
             if(shouldSelect) 
-                [groupTableView selectRowIndexes:[NSIndexSet indexSetWithIndex:[groups indexOfObjectIdenticalTo:group]] byExtendingSelection:NO];
+                [groupTableView selectRowIndexes:[NSIndexSet indexSetWithIndex:[groups indexOfObject:group]] byExtendingSelection:NO];
         }
         
         return YES;


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

Revision: 10954
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=10954&view=rev
Author:   amaxwell
Date:     2007-08-20 10:02:40 -0700 (Mon, 20 Aug 2007)

Log Message:
-----------
remove test for 10.4 functionality

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2007-08-20 16:58:46 UTC (rev 10953)
+++ trunk/bibdesk/BibDocument_DataSource.m	2007-08-20 17:02:40 UTC (rev 10954)
@@ -1077,10 +1077,7 @@
 
     NSError *error = nil;
 	if ([self addPublicationsFromPasteboard:pboard selectLibrary:YES error:&error] == NO) {
-        if(error != nil && [NSResponder instancesRespondToSelector:@selector(presentError:)])
-            [tv presentError:error];
-		else
-            NSBeep();
+        [tv presentError:error];
 	}
 }
 


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

Revision: 10963
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=10963&view=rev
Author:   hofman
Date:     2007-08-21 07:22:54 -0700 (Tue, 21 Aug 2007)

Log Message:
-----------
Use separate status message when type select updates for group table.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2007-08-21 12:10:14 UTC (rev 10962)
+++ trunk/bibdesk/BibDocument_DataSource.m	2007-08-21 14:22:54 UTC (rev 10963)
@@ -1103,8 +1103,10 @@
 - (void)typeSelectHelper:(BDSKTypeSelectHelper *)typeSelectHelper updateSearchString:(NSString *)searchString{
     if(searchString == nil || sortKey == nil)
         [self updateStatus]; // resets the status line to its default value
-    else
+    else if(typeSelectHelper == [tableView typeSelectHelper]) 
         [self setStatus:[NSString stringWithFormat:NSLocalizedString(@"Finding item with %@: \"%@\"", @"Status message:Finding item with [sorting field]: \"[search string]\""), [sortKey localizedFieldName], searchString]];
+    else if(typeSelectHelper == [groupTableView typeSelectHelper]) 
+        [self setStatus:[NSString stringWithFormat:NSLocalizedString(@"Finding group: \"%@\"", @"Status message:Finding group: \"[search string]\""), searchString]];
 }
 
 // This is where we build the list of possible items which the user can select by typing the first few letters. You should return an array of NSStrings.


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

Revision: 11118
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=11118&view=rev
Author:   amaxwell
Date:     2007-09-21 15:22:34 -0700 (Fri, 21 Sep 2007)

Log Message:
-----------
Allow the user to target a specific drop row with any file, rather than sniffing the pasteboard during the drag.  This is a partial workaround for bug #1799630.  

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2007-09-21 16:07:41 UTC (rev 11117)
+++ trunk/bibdesk/BibDocument_DataSource.m	2007-09-21 22:22:34 UTC (rev 11118)
@@ -777,7 +777,9 @@
         // set drop row to -1 and NSTableViewDropOperation to NSTableViewDropOn, when we don't target specific rows http://www.corbinstreehouse.com/blog/?p=123
         if(row == -1 || op == NSTableViewDropAbove){
             [tv setDropRow:-1 dropOperation:NSTableViewDropOn];
-		}else if(([type isEqualToString:NSFilenamesPboardType] == NO || [[info draggingPasteboard] containsUnparseableFile] == NO) &&
+		}
+        // We were checking -containsUnparseableFile here as well, but I think it makes sense to allow the user to target a specific row with any file type (including BibTeX).  Further, checking -containsUnparseableFile can be unacceptably slow (see bug #1799630), which ruins the dragging experience.
+        else if(([type isEqualToString:NSFilenamesPboardType] == NO) &&
                  [type isEqualToString:BDSKWeblocFilePboardType] == NO && [type isEqualToString:NSURLPboardType] == NO){
             [tv setDropRow:-1 dropOperation:NSTableViewDropOn];
         }


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

Revision: 11823
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=11823&view=rev
Author:   amaxwell
Date:     2007-12-06 15:47:58 -0800 (Thu, 06 Dec 2007)

Log Message:
-----------
handle multiple files dropped on a single table row

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2007-12-06 21:49:57 UTC (rev 11822)
+++ trunk/bibdesk/BibDocument_DataSource.m	2007-12-06 23:47:58 UTC (rev 11823)
@@ -846,23 +846,29 @@
             return NO;
 		if(row != -1){
             BibItem *pub = [shownPublications objectAtIndex:row];
+            NSMutableArray *urlsToAdd = [NSMutableArray array];
             NSURL *theURL = nil;
             
             if([type isEqualToString:NSFilenamesPboardType]){
                 NSArray *fileNames = [pboard propertyListForType:NSFilenamesPboardType];
                 if ([fileNames count] == 0)
                     return NO;
-                theURL = [NSURL fileURLWithPath:[[fileNames objectAtIndex:0] stringByExpandingTildeInPath]];
+                NSEnumerator *fileEnum = [fileNames objectEnumerator];
+                NSString *aPath;
+                while (aPath = [fileEnum nextObject])
+                    [urlsToAdd addObject:[NSURL fileURLWithPath:[aPath stringByExpandingTildeInPath]]];
             }else if([type isEqualToString:BDSKWeblocFilePboardType]){
-                theURL = [NSURL URLWithString:[pboard stringForType:BDSKWeblocFilePboardType]];
+                [urlsToAdd addObject:[NSURL URLWithString:[pboard stringForType:BDSKWeblocFilePboardType]]];
             }else if([type isEqualToString:NSURLPboardType]){
-                theURL = [NSURL URLFromPasteboard:pboard];
+                [urlsToAdd addObject:[NSURL URLFromPasteboard:pboard]];
             }else return NO;
             
-            if(theURL == nil)
+            if([urlsToAdd count] == 0)
                 return NO;
             
-            [pub addFileForURL:theURL autoFile:YES];
+            NSEnumerator *urlEnum = [urlsToAdd objectEnumerator];
+            while (theURL = [urlEnum nextObject])
+                [pub addFileForURL:theURL autoFile:YES];
             
             [self selectPublication:pub];
             [[pub undoManager] setActionName:NSLocalizedString(@"Edit Publication", @"Undo action name")];


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

Revision: 12143
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12143&view=rev
Author:   hofman
Date:     2007-12-31 05:20:18 -0800 (Mon, 31 Dec 2007)

Log Message:
-----------
Different contextual menu for linked files and URLs.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2007-12-31 12:49:29 UTC (rev 12142)
+++ trunk/bibdesk/BibDocument_DataSource.m	2007-12-31 13:20:18 UTC (rev 12143)
@@ -311,6 +311,7 @@
 	if(tv == tableView){
 		
 		NSString *tcId = [[[tableView tableColumns] objectAtIndex:column] identifier];
+        NSArray *linkedURLs;
         NSURL *theURL;
         
 		if([tcId isURLField]){
@@ -339,10 +340,67 @@
                                     andSubmenuOfApplicationsForURL:theURL atIndex:1];
             }
             [menu addItem:[NSMenuItem separatorItem]];
-            item = [menu addItemWithTitle:NSLocalizedString(@"Edit", @"Menu item title") action:@selector(editPubCmd:) keyEquivalent:@""];
+            item = [menu addItemWithTitle:NSLocalizedString(@"Get Info", @"Menu item title") action:@selector(editPubCmd:) keyEquivalent:@""];
             [item setTarget:self];
-            item = [menu addItemWithTitle:[NSLocalizedString(@"Delete", @"Menu item title") stringByAppendingEllipsis] action:@selector(deleteSelectedPubs:) keyEquivalent:@""];
+            item = [menu addItemWithTitle:NSLocalizedString(@"Remove", @"Menu item title") action:@selector(removeSelectedPubs:) keyEquivalent:@""];
             [item setTarget:self];
+            item = [menu addItemWithTitle:NSLocalizedString(@"Delete", @"Menu item title") action:@selector(deleteSelectedPubs:) keyEquivalent:@""];
+            [item setTarget:self];
+            [item setKeyEquivalentModifierMask:NSAlternateKeyMask];
+            [item setAlternate:YES];
+		}else if([tcId isEqualToString:BDSKLocalFileString]){
+            linkedURLs = [self selectedFileURLs];
+            
+            if([linkedURLs count]){
+                menu = [[NSMenu allocWithZone:[NSMenu menuZone]] init];
+                item = [menu addItemWithTitle:NSLocalizedString(@"Open Linked Files", @"Menu item title") action:@selector(openLinkedFile:) keyEquivalent:@""];
+                [item setTarget:self];
+                [item setRepresentedObject:tcId];
+                item = [menu addItemWithTitle:NSLocalizedString(@"Reveal Linked Files in Finder", @"Menu item title") action:@selector(revealLinkedFile:) keyEquivalent:@""];
+                [item setTarget:self];
+                [item setRepresentedObject:tcId];
+                item = [menu addItemWithTitle:NSLocalizedString(@"Show Skim Notes For Linked Files", @"Menu item title") action:@selector(showNotesForLinkedFile:) keyEquivalent:@""];
+                [item setTarget:self];
+                [item setRepresentedObject:tcId];
+                item = [menu addItemWithTitle:NSLocalizedString(@"Copy Skim Notes For Linked Files", @"Menu item title") action:@selector(copyNotesForLinkedFile:) keyEquivalent:@""];
+                [item setTarget:self];
+                [item setRepresentedObject:tcId];
+                if([linkedURLs count] == 1 && (theURL = [linkedURLs lastObject]) && [theURL isEqual:[NSNull null]] == NO){
+                    item = [menu insertItemWithTitle:NSLocalizedString(@"Open With", @"Menu item title") 
+                                        andSubmenuOfApplicationsForURL:theURL atIndex:1];
+                }
+                [menu addItem:[NSMenuItem separatorItem]];
+            }
+            item = [menu addItemWithTitle:NSLocalizedString(@"Get Info", @"Menu item title") action:@selector(editPubCmd:) keyEquivalent:@""];
+            [item setTarget:self];
+            item = [menu addItemWithTitle:NSLocalizedString(@"Remove", @"Menu item title") action:@selector(removeSelectedPubs:) keyEquivalent:@""];
+            [item setTarget:self];
+            item = [menu addItemWithTitle:NSLocalizedString(@"Delete", @"Menu item title") action:@selector(deleteSelectedPubs:) keyEquivalent:@""];
+            [item setTarget:self];
+            [item setKeyEquivalentModifierMask:NSAlternateKeyMask];
+            [item setAlternate:YES];
+		}else if([tcId isEqualToString:BDSKRemoteURLString]){
+            linkedURLs = [[self selectedPublications] valueForKeyPath:@"@unionOfArrays.remoteURLs.URL"];
+            
+            if([linkedURLs count]){
+                menu = [[NSMenu allocWithZone:[NSMenu menuZone]] init];
+                item = [menu addItemWithTitle:NSLocalizedString(@"Open URLs in Browser", @"Menu item title") action:@selector(openLinkedURL:) keyEquivalent:@""];
+                [item setTarget:self];
+                [item setRepresentedObject:tcId];
+                if([linkedURLs count] == 1 && (theURL = [linkedURLs lastObject]) && [theURL isEqual:[NSNull null]] == NO){
+                    item = [menu insertItemWithTitle:NSLocalizedString(@"Open With", @"Menu item title") 
+                                        andSubmenuOfApplicationsForURL:theURL atIndex:1];
+                }
+                [menu addItem:[NSMenuItem separatorItem]];
+            }
+            item = [menu addItemWithTitle:NSLocalizedString(@"Get Info", @"Menu item title") action:@selector(editPubCmd:) keyEquivalent:@""];
+            [item setTarget:self];
+            item = [menu addItemWithTitle:NSLocalizedString(@"Remove", @"Menu item title") action:@selector(removeSelectedPubs:) keyEquivalent:@""];
+            [item setTarget:self];
+            item = [menu addItemWithTitle:NSLocalizedString(@"Delete", @"Menu item title") action:@selector(deleteSelectedPubs:) keyEquivalent:@""];
+            [item setTarget:self];
+            [item setKeyEquivalentModifierMask:NSAlternateKeyMask];
+            [item setAlternate:YES];
 		}else{
 			menu = [actionMenu copyWithZone:[NSMenu menuZone]];
             


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

Revision: 12255
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12255&view=rev
Author:   hofman
Date:     2008-01-04 10:43:33 -0800 (Fri, 04 Jan 2008)

Log Message:
-----------
Drag local file / remote URL from local file / remote URL column.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-01-04 13:38:08 UTC (rev 12254)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-01-04 18:43:33 UTC (rev 12255)
@@ -72,6 +72,7 @@
 #import "NSIndexSet_BDSKExtensions.h"
 #import "BDSKSearchGroup.h"
 #import "BDSKLinkedFile.h"
+#import "NSArray_BDSKExtensions.h"
 
 #define MAX_DRAG_IMAGE_WIDTH 700.0
 
@@ -579,6 +580,57 @@
                         [url writeToPasteboard:pboard];
 						return success;
 					}
+				
+                }else if([dragColumnId isEqualToString:BDSKLocalFileString]){
+
+                    // if we have more than one files, we can't put file contents on the pasteboard, but most apps seem to handle file names just fine
+                    unsigned row = [rowIndexes firstIndex];
+                    BibItem *pub = nil;
+                    NSMutableArray *filePaths = [NSMutableArray arrayWithCapacity:[rowIndexes count]];
+                    NSEnumerator *fileEnum;
+                    BDSKLinkedFile *file;
+                    NSString *path;
+                    
+                    while(row != NSNotFound){
+                        pub = [shownPublications objectAtIndex:row];
+                        fileEnum = [[pub localFiles] objectEnumerator];
+                        
+                        while(file = [fileEnum nextObject]){
+                            path = [file path];
+                            if(path != nil){
+                                [filePaths addObject:path];
+                                NSError *xerror = nil;
+                                // we can always write xattrs; this doesn't alter the original file's content in any way, but fails if you have a really long abstract/annote
+                                if([[NSFileManager defaultManager] setExtendedAttributeNamed:OMNI_BUNDLE_IDENTIFIER @".bibtexstring" toValue:[[pub bibTeXString] dataUsingEncoding:NSUTF8StringEncoding] atPath:path options:nil error:&xerror] == NO)
+                                    NSLog(@"%@ line %d: adding xattrs failed with error %@", __FILENAMEASNSSTRING__, __LINE__, xerror);
+                            }
+                        }
+                        row = [rowIndexes indexGreaterThanIndex:row];
+                    }
+                    
+                    if([filePaths count]){
+                        [pboard declareTypes:[NSArray arrayWithObjects:NSFilenamesPboardType, nil] owner:nil];
+                        return [pboard setPropertyList:filePaths forType:NSFilenamesPboardType];
+                    }
+                    
+				}else if([dragColumnId isEqualToString:BDSKRemoteURLString]){
+					// cache this so we know which column (field) was dragged
+					[self setPromiseDragColumnIdentifier:dragColumnId];
+					
+					BibItem *pub;
+                    NSURL *url;
+                    unsigned row = [rowIndexes firstIndex];
+                    while(row != NSNotFound){
+                        pub = [shownPublications objectAtIndex:row];
+                        if(url = [[pub remoteURLs] firstObject]){
+                            // put the URL and a webloc file promise on the pasteboard
+                            [pboard declareTypes:[NSArray arrayWithObjects:NSFilesPromisePboardType, NSURLPboardType, nil] owner:self];
+                            success = [pboard setPropertyList:[NSArray arrayWithObject:[[pub displayTitle] stringByAppendingPathExtension:@"webloc"]] forType:NSFilesPromisePboardType];
+                            [url writeToPasteboard:pboard];
+                            return success;
+                        }
+                        row = [rowIndexes indexGreaterThanIndex:row];
+                    }
 				}
 			}
 		}


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

Revision: 12394
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12394&view=rev
Author:   hofman
Date:     2008-01-09 11:20:36 -0800 (Wed, 09 Jan 2008)

Log Message:
-----------
Write URL to pasteboard rather than trying to write a LinkedFile object.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-01-09 18:29:39 UTC (rev 12393)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-01-09 19:20:36 UTC (rev 12394)
@@ -622,7 +622,7 @@
                     unsigned row = [rowIndexes firstIndex];
                     while(row != NSNotFound){
                         pub = [shownPublications objectAtIndex:row];
-                        if(url = [[pub remoteURLs] firstObject]){
+                        if(file = [[[pub remoteURLs] firstObject] URL]){
                             // put the URL and a webloc file promise on the pasteboard
                             [pboard declareTypes:[NSArray arrayWithObjects:NSFilesPromisePboardType, NSURLPboardType, nil] owner:self];
                             success = [pboard setPropertyList:[NSArray arrayWithObject:[[pub displayTitle] stringByAppendingPathExtension:@"webloc"]] forType:NSFilesPromisePboardType];


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

Revision: 12395
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12395&view=rev
Author:   hofman
Date:     2008-01-09 11:21:05 -0800 (Wed, 09 Jan 2008)

Log Message:
-----------
Fix typo in last commit.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-01-09 19:20:36 UTC (rev 12394)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-01-09 19:21:05 UTC (rev 12395)
@@ -622,7 +622,7 @@
                     unsigned row = [rowIndexes firstIndex];
                     while(row != NSNotFound){
                         pub = [shownPublications objectAtIndex:row];
-                        if(file = [[[pub remoteURLs] firstObject] URL]){
+                        if(url = [[[pub remoteURLs] firstObject] URL]){
                             // put the URL and a webloc file promise on the pasteboard
                             [pboard declareTypes:[NSArray arrayWithObjects:NSFilesPromisePboardType, NSURLPboardType, nil] owner:self];
                             success = [pboard setPropertyList:[NSArray arrayWithObject:[[pub displayTitle] stringByAppendingPathExtension:@"webloc"]] forType:NSFilesPromisePboardType];


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

Revision: 12397
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12397&view=rev
Author:   hofman
Date:     2008-01-09 11:54:54 -0800 (Wed, 09 Jan 2008)

Log Message:
-----------
Write promised webloc files for drag from Remote URL column.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-01-09 19:24:12 UTC (rev 12396)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-01-09 19:54:54 UTC (rev 12397)
@@ -1106,38 +1106,44 @@
         
         // this ivar stores the field name (e.g. Url, L2)
         NSString *fieldName = [self promiseDragColumnIdentifier];
-        BOOL isLocalFile = [fieldName isLocalFileField];
-        
+        BOOL isRemoteURLField = [fieldName isRemoteURLField];
+        NSEnumerator *fileEnum;
+        BDSKLinkedFile *file;
         NSString *originalPath;
         NSString *fileName;
         NSString *basePath = [dropDestination path];
-
+        int i = 0;
+        
+        OBASSERT(isRemoteURLField || [fieldName isEqualToString:BDSKRemoteURLString]);
+        
         while(rowIdx != NSNotFound){
             theBib = [shownPublications objectAtIndex:rowIdx];
-            if(isLocalFile){
-                originalPath = [[theBib localFileURLForField:fieldName] path];
-                fileName = [originalPath lastPathComponent];
-                NSParameterAssert(fileName);
-                fullPath = [basePath stringByAppendingPathComponent:fileName];
+            if(isRemoteURLField){
+                fileName = [theBib displayTitle];
+                fullPath = [[basePath stringByAppendingPathComponent:fileName] stringByAppendingPathExtension:@"webloc"];
+                url = [theBib remoteURLForField:fieldName];
+                [fullPathDict setValue:url forKey:fullPath];
                 [fileNames addObject:fileName];
-                // create a dictionary with each original file path (source) as key, and destination path as value
-                [fullPathDict setValue:fullPath forKey:originalPath];
-                
-            } else if((url = [theBib remoteURLForField:fieldName])){
-                fullPath = [[basePath stringByAppendingPathComponent:[theBib displayTitle]] stringByAppendingPathExtension:@"webloc"];
-                // create a dictionary with each destination file path as key (handed to us from the Finder/dropDestination) and each item's URL as value
-                [fullPathDict setValue:url forKey:fullPath];
-                [fileNames addObject:[theBib displayTitle]];
+            } else{
+                fileEnum = [[theBib remoteURLs] objectEnumerator];
+                i = 0;
+                while (file = [fileEnum nextObject]) {
+                    if (url = [file URL]) {
+                        fileName = [theBib displayTitle];
+                        if (i > 0)
+                            fileName = [fileName stringByAppendingFormat:@"-%i", i];
+                        i++;
+                        fullPath = [[basePath stringByAppendingPathComponent:fileName] stringByAppendingPathExtension:@"webloc"];
+                        [fullPathDict setValue:url forKey:fullPath];
+                        [fileNames addObject:fileName];
+                    }
+                }
             }
             rowIdx = [indexSet indexGreaterThanIndex:rowIdx];
         }
         [self setPromiseDragColumnIdentifier:nil];
         
-        // We generally want to run promised file creation in the background to avoid blocking our UI, although webloc files are so small it probably doesn't matter.
-        if(isLocalFile)
-            [[NSFileManager defaultManager] copyFilesInBackgroundThread:fullPathDict];
-        else
-            [[NSFileManager defaultManager] createWeblocFilesInBackgroundThread:fullPathDict];
+        [[NSFileManager defaultManager] createWeblocFilesInBackgroundThread:fullPathDict];
 
         return fileNames;
     } else if ([tv isEqual:groupTableView]) {


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

Revision: 12398
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12398&view=rev
Author:   hofman
Date:     2008-01-09 12:29:32 -0800 (Wed, 09 Jan 2008)

Log Message:
-----------
Declare all promised webloc files. Draw count badge for dragged URLs.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-01-09 19:54:54 UTC (rev 12397)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-01-09 20:29:32 UTC (rev 12398)
@@ -570,16 +570,29 @@
 				}else if([dragColumnId isRemoteURLField]){
 					// cache this so we know which column (field) was dragged
 					[self setPromiseDragColumnIdentifier:dragColumnId];
-					
-					BibItem *pub = [shownPublications objectAtIndex:[rowIndexes firstIndex]];
-					NSURL *url = [pub remoteURLForField:dragColumnId];
-					if(url != nil){
-						// put the URL and a webloc file promise on the pasteboard
+
+                    // if we have more than one row, we can't put file contents on the pasteboard, but most apps seem to handle file names just fine
+                    unsigned row = [rowIndexes firstIndex];
+                    BibItem *pub = nil;
+                    NSURL *url, *theURL = nil;
+                    NSMutableArray *filePaths = [NSMutableArray arrayWithCapacity:[rowIndexes count]];
+
+                    while(row != NSNotFound){
+                        pub = [shownPublications objectAtIndex:row];
+                        url = [pub remoteURLForField:dragColumnId];
+                        if(url != nil){
+                            if (theURL == nil)
+                                theURL = url;
+                            [filePaths addObject:[[pub displayTitle] stringByAppendingPathExtension:@"webloc"]];
+                        }
+					}
+                    
+                    if([filePaths count]){
                         [pboard declareTypes:[NSArray arrayWithObjects:NSFilesPromisePboardType, NSURLPboardType, nil] owner:self];
-                        success = [pboard setPropertyList:[NSArray arrayWithObject:[[pub displayTitle] stringByAppendingPathExtension:@"webloc"]] forType:NSFilesPromisePboardType];
-                        [url writeToPasteboard:pboard];
+                        success = [pboard setPropertyList:filePaths forType:NSFilesPromisePboardType];
+                        [theURL writeToPasteboard:pboard];
 						return success;
-					}
+                    }
 				
                 }else if([dragColumnId isEqualToString:BDSKLocalFileString]){
 
@@ -596,8 +609,7 @@
                         fileEnum = [[pub localFiles] objectEnumerator];
                         
                         while(file = [fileEnum nextObject]){
-                            path = [file path];
-                            if(path != nil){
+                            if (path = [file path]) {
                                 [filePaths addObject:path];
                                 NSError *xerror = nil;
                                 // we can always write xattrs; this doesn't alter the original file's content in any way, but fails if you have a really long abstract/annote
@@ -616,21 +628,36 @@
 				}else if([dragColumnId isEqualToString:BDSKRemoteURLString]){
 					// cache this so we know which column (field) was dragged
 					[self setPromiseDragColumnIdentifier:dragColumnId];
-					
-					BibItem *pub;
-                    NSURL *url;
+                    
                     unsigned row = [rowIndexes firstIndex];
+                    BibItem *pub = nil;
+                    NSMutableArray *filePaths = [NSMutableArray arrayWithCapacity:[rowIndexes count]];
+                    NSString *fileName;
+                    NSEnumerator *fileEnum;
+                    BDSKLinkedFile *file;
+                    NSURL *url, *theURL = nil;
+                    
                     while(row != NSNotFound){
                         pub = [shownPublications objectAtIndex:row];
-                        if(url = [[[pub remoteURLs] firstObject] URL]){
-                            // put the URL and a webloc file promise on the pasteboard
-                            [pboard declareTypes:[NSArray arrayWithObjects:NSFilesPromisePboardType, NSURLPboardType, nil] owner:self];
-                            success = [pboard setPropertyList:[NSArray arrayWithObject:[[pub displayTitle] stringByAppendingPathExtension:@"webloc"]] forType:NSFilesPromisePboardType];
-                            [url writeToPasteboard:pboard];
-                            return success;
+                        fileName = [[pub displayTitle] stringByAppendingPathExtension:@"webloc"];
+                        fileEnum = [[pub remoteURLs] objectEnumerator];
+                        
+                        while(file = [fileEnum nextObject]){
+                            if (url = [file URL]) {
+                                if (theURL == nil)
+                                    theURL = url;
+                                [filePaths addObject:fileName];
+                            }
                         }
                         row = [rowIndexes indexGreaterThanIndex:row];
                     }
+                    
+                    if([filePaths count]){
+                        [pboard declareTypes:[NSArray arrayWithObjects:NSFilesPromisePboardType, NSURLPboardType, nil] owner:self];
+                        success = [pboard setPropertyList:filePaths forType:NSFilesPromisePboardType];
+                        [theURL writeToPasteboard:pboard];
+                        return success;
+                    }
 				}
 			}
 		}
@@ -759,6 +786,8 @@
         count = 1;
         image = [NSImage imageForURL:[NSURL URLFromPasteboard:pb]];
         isIcon = YES;
+        if ([pb availableTypeFromArray:[NSArray arrayWithObject:NSFilesPromisePboardType]])
+            count = MAX(1, (int)[[pb propertyListForType:NSFilesPromisePboardType] count]);
     
 	} else if ([dragType isEqualToString:NSFilesPromisePboardType]) {
 		NSArray *fileNames = [pb propertyListForType:NSFilesPromisePboardType];


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

Revision: 12399
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12399&view=rev
Author:   hofman
Date:     2008-01-09 12:36:09 -0800 (Wed, 09 Jan 2008)

Log Message:
-----------
Forgot to loop through the rows.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-01-09 20:29:32 UTC (rev 12398)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-01-09 20:36:09 UTC (rev 12399)
@@ -568,7 +568,8 @@
                     }
                     
 				}else if([dragColumnId isRemoteURLField]){
-					// cache this so we know which column (field) was dragged
+					
+                    // cache this so we know which column (field) was dragged
 					[self setPromiseDragColumnIdentifier:dragColumnId];
 
                     // if we have more than one row, we can't put file contents on the pasteboard, but most apps seem to handle file names just fine
@@ -585,6 +586,7 @@
                                 theURL = url;
                             [filePaths addObject:[[pub displayTitle] stringByAppendingPathExtension:@"webloc"]];
                         }
+                        row = [rowIndexes indexGreaterThanIndex:row];
 					}
                     
                     if([filePaths count]){


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

Revision: 12417
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12417&view=rev
Author:   amaxwell
Date:     2008-01-10 16:53:17 -0800 (Thu, 10 Jan 2008)

Log Message:
-----------
remove unused local var

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-01-11 00:45:15 UTC (rev 12416)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-01-11 00:53:17 UTC (rev 12417)
@@ -1140,7 +1140,6 @@
         BOOL isRemoteURLField = [fieldName isRemoteURLField];
         NSEnumerator *fileEnum;
         BDSKLinkedFile *file;
-        NSString *originalPath;
         NSString *fileName;
         NSString *basePath = [dropDestination path];
         int i = 0;


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

Revision: 12533
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12533&view=rev
Author:   hofman
Date:     2008-01-17 09:37:17 -0800 (Thu, 17 Jan 2008)

Log Message:
-----------
Tracking rects and status messages for lcoal file and remote url columns.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-01-17 15:49:24 UTC (rev 12532)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-01-17 17:37:17 UTC (rev 12533)
@@ -1380,7 +1380,9 @@
         return NO;
     
     NSString *tcID = [tableColumn identifier];
-    return [tcID isURLField] && [[shownPublications objectAtIndex:row] URLForField:tcID];
+    return ([tcID isURLField] && [[shownPublications objectAtIndex:row] URLForField:tcID]) ||
+           ([tcID isEqualToString:BDSKLocalFileString] && [[[shownPublications objectAtIndex:row] localFiles] count]) ||
+           ([tcID isEqualToString:BDSKRemoteURLString] && [[[shownPublications objectAtIndex:row] remoteURLs] count]);
 }
 
 - (void)tableView:(NSTableView *)tv mouseEnteredTableColumn:(NSTableColumn *)tableColumn row:(int)row;
@@ -1388,10 +1390,18 @@
     if (row == -1 || row >= [self numberOfRowsInTableView:tv])
         return;
     
+    NSString *tcID = [tableColumn identifier];
     BibItem *pub = [shownPublications objectAtIndex:row];
-    NSURL *url = [pub URLForField:[tableColumn identifier]];
-    if (url)
-        [self setStatus:[url isFileURL] ? [[url path] stringByAbbreviatingWithTildeInPath] : [url absoluteString]];
+    
+    if ([tcID isURLField]) {
+        NSURL *url = [pub URLForField:[tableColumn identifier]];
+        if (url)
+            [self setStatus:[url isFileURL] ? [[url path] stringByAbbreviatingWithTildeInPath] : [url absoluteString]];
+    } else if ([tcID isEqualToString:BDSKLocalFileString]) {
+        [self setStatus:[[pub existingLocalFiles] valueForKeyPath:@"path.stringByAbbreviatingWithTildeInPath.@..."]];
+    } else if ([tcID isEqualToString:BDSKRemoteURLString]) {
+        [self setStatus:[[pub remoteURLs] valueForKeyPath:@"URL.absoluteString.@..."]];
+    }
 }
 
 - (void)tableView:(NSTableView *)tv mouseExitedTableColumn:(NSTableColumn *)tableColumn row:(int)row;


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

Revision: 12891
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12891&view=rev
Author:   hofman
Date:     2008-02-28 12:51:28 -0800 (Thu, 28 Feb 2008)

Log Message:
-----------
Fix pref option for drag type.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-02-28 20:48:29 UTC (rev 12890)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-02-28 20:51:28 UTC (rev 12891)
@@ -472,7 +472,7 @@
 - (BOOL)tableView:(NSTableView *)tv writeRowsWithIndexes:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard *)pboard{
     OFPreferenceWrapper *sud = [OFPreferenceWrapper sharedPreferenceWrapper];
     int idx = ([NSApp currentModifierFlags] & NSAlternateKeyMask) ? 1 : 0;
-    NSString *dragCopyTypeKey = ([NSApp currentModifierFlags] & NSAlternateKeyMask) ? BDSKDefaultDragCopyTypeKey : BDSKAlternateDragCopyTypeKey;
+    NSString *dragCopyTypeKey = ([NSApp currentModifierFlags] & NSAlternateKeyMask) ? BDSKAlternateDragCopyTypeKey : BDSKDefaultDragCopyTypeKey;
 	int dragCopyType = [sud integerForKey:dragCopyTypeKey];
     BOOL success = NO;
 	NSString *citeString = [sud stringForKey:BDSKCiteStringKey];
@@ -815,7 +815,7 @@
 	} else {
 		OFPreferenceWrapper *sud = [OFPreferenceWrapper sharedPreferenceWrapper];
 		NSMutableString *s = [NSMutableString string];
-        NSString *dragCopyTypeKey = ([NSApp currentModifierFlags] & NSAlternateKeyMask) ? BDSKDefaultDragCopyTypeKey : BDSKAlternateDragCopyTypeKey;
+        NSString *dragCopyTypeKey = ([NSApp currentModifierFlags] & NSAlternateKeyMask) ? BDSKAlternateDragCopyTypeKey : BDSKDefaultDragCopyTypeKey;
         
         dragCopyType = [sud integerForKey:dragCopyTypeKey];
         


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

Revision: 12892
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12892&view=rev
Author:   hofman
Date:     2008-02-28 13:04:48 -0800 (Thu, 28 Feb 2008)

Log Message:
-----------
Fix drag image for dragged item URLs.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-02-28 20:51:28 UTC (rev 12891)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-02-28 21:04:48 UTC (rev 12892)
@@ -803,6 +803,8 @@
         isIcon = YES;
         if ([pb availableTypeFromArray:[NSArray arrayWithObject:NSFilesPromisePboardType]])
             count = MAX(1, (int)[[pb propertyListForType:NSFilesPromisePboardType] count]);
+        else if ([pb availableTypeFromArray:[NSArray arrayWithObject:@"WebURLsWithTitlesPboardType"]])
+            count = MAX(1, (int)[[pboardHelper promisedItemsForPasteboard:pb] count]);
     
 	} else if ([dragType isEqualToString:NSFilesPromisePboardType]) {
 		NSArray *fileNames = [pb propertyListForType:NSFilesPromisePboardType];
@@ -864,6 +866,14 @@
                         [s appendString:[NSString horizontalEllipsisString]];
                     inside = YES;
                     break;
+                case BDSKURLDragCopyType:
+                    // in fact, this should already be handled above
+                    count = 1;
+                    image = [NSImage imageForURL:[NSURL URLFromPasteboard:pb]];
+                    isIcon = YES;
+                    if ([pb availableTypeFromArray:[NSArray arrayWithObject:@"WebURLsWithTitlesPboardType"]])
+                        count = MAX(1, (int)[[pboardHelper promisedItemsForPasteboard:pb] count]);
+                    break;
                 default:
                     [s appendString:@"["];
                     [s appendString:[firstItem citeKey]]; 


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

Revision: 12902
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12902&view=rev
Author:   hofman
Date:     2008-02-29 09:01:58 -0800 (Fri, 29 Feb 2008)

Log Message:
-----------
Allow adding external file groups through drop on the group pane, use Link modifiers.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-02-29 15:49:01 UTC (rev 12901)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-02-29 17:01:58 UTC (rev 12902)
@@ -71,6 +71,7 @@
 #import "NSMenu_BDSKExtensions.h"
 #import "NSIndexSet_BDSKExtensions.h"
 #import "BDSKSearchGroup.h"
+#import "BDSKURLGroup.h"
 #import "BDSKLinkedFile.h"
 #import "NSArray_BDSKExtensions.h"
 
@@ -957,25 +958,28 @@
                 return NSDragOperationNone;
             [tv setDropRow:row dropOperation:NSTableViewDropOn];
             return NSDragOperationCopy;
+        } else if (isDragFromDrawer || isDragFromGroupTable || type == nil) {
+            return NSDragOperationNone;
         }
         
-        if(op == NSTableViewDropAbove){
+        if (op == NSTableViewDropAbove || (row >= 0 && [[groups objectAtIndex:row] isValidDropTarget] == NO)) {
             // here we actually target the whole table, as we don't insert in a specific location
             row = -1;
             [tv setDropRow:row dropOperation:NSTableViewDropOn];
         }
         
-        if(isDragFromDrawer || isDragFromGroupTable || type == nil || (row >= 0 && [[groups objectAtIndex:row]  isValidDropTarget] == NO) || (row == 0 && isDragFromMainTable))
-            return NSDragOperationNone;
-        
-        if(isDragFromMainTable){
-            if([type isEqualToString:BDSKBibItemPboardType])
+        if (isDragFromMainTable) {
+            if([type isEqualToString:BDSKBibItemPboardType] && row > 0)
                 return NSDragOperationLink;
             else
                 return NSDragOperationNone;
         } else if([type isEqualToString:BDSKBibItemPboardType]){
             return NSDragOperationCopy; // @@ can't drag row indexes from another document; should use NSArchiver instead
-        }else{
+        } else if ([[NSSet setWithObjects:BDSKWeblocFilePboardType, NSFilenamesPboardType, NSURLPboardType, nil] containsObject:type] &&
+                   ([NSApp currentModifierFlags] & (NSAlternateKeyMask | NSCommandKeyMask)) == (NSAlternateKeyMask | NSCommandKeyMask) ){
+            [tv setDropRow:-1 dropOperation:NSTableViewDropOn];
+            return NSDragOperationLink;
+        } else {
             return NSDragOperationEvery;
         }
     }
@@ -1085,7 +1089,7 @@
         // retain is required to fix bug #1356183
         BDSKGroup *group = row == -1 ? nil : [[[groups objectAtIndex:row] retain] autorelease];
         BOOL shouldSelect = row == -1 || [[self selectedGroups] containsObject:group];
-		
+        
 		if ((isDragFromGroupTable || isDragFromMainTable) && docState.dragFromExternalGroups && row == 0) {
             return [self addPublicationsFromPasteboard:pboard selectLibrary:NO verbose:YES error:NULL];
         } else if(isDragFromGroupTable || isDragFromDrawer || (row >= 0 && [group isValidDropTarget] == NO)) {
@@ -1094,6 +1098,47 @@
             // we already have these publications, so we just want to add them to the group, not the document
             
 			pubs = [pboardHelper promisedItemsForPasteboard:[NSPasteboard pasteboardWithName:NSDragPboard]];
+        } else if ([[NSSet setWithObjects:BDSKWeblocFilePboardType, NSFilenamesPboardType, NSURLPboardType, nil] containsObject:type] &&
+                   ([NSApp currentModifierFlags] & (NSAlternateKeyMask | NSCommandKeyMask)) == (NSAlternateKeyMask | NSCommandKeyMask) ){
+            NSArray *urls = nil;
+            
+            if ([type isEqualToString:BDSKWeblocFilePboardType]) {
+                urls = [NSArray arrayWithObjects:[NSURL URLWithString:[pboard stringForType:BDSKWeblocFilePboardType]], nil]; 	
+            } else if ([type isEqualToString:NSURLPboardType]) {
+                urls = [NSArray arrayWithObjects:[NSURL URLFromPasteboard:pboard], nil];
+            } else if ([type isEqualToString:NSFilenamesPboardType]) {
+                NSEnumerator *fileEnum = [[pboard propertyListForType:NSFilenamesPboardType] objectEnumerator];
+                NSString *file;
+                urls = [NSMutableArray array];
+                while (file = [fileEnum nextObject])
+                    [(NSMutableArray *)urls addObject:[NSURL fileURLWithPath:file]];
+            }
+            
+            NSEnumerator *urlEnum = [urls objectEnumerator];
+            NSURL *url;
+            group = nil;
+            
+            while (url = [urlEnum nextObject]) {
+                if ([url isFileURL] && [[[url path] pathExtension] isEqualToString:@"bdsksearch"]) {
+                    NSDictionary *dictionary = [NSDictionary dictionaryWithContentsOfURL:url];
+                    Class groupClass = NSClassFromString([dictionary objectForKey:@"class"]);
+                    group = [[[(groupClass ? groupClass : [BDSKSearchGroup class]) alloc] initWithDictionary:dictionary] autorelease];
+                    if(group)
+                        [groups addSearchGroup:(BDSKSearchGroup *)group];
+                } else {
+                    group = [[[BDSKURLGroup alloc] initWithURL:url] autorelease];
+                    [groups addURLGroup:(BDSKURLGroup *)group];
+                }
+            }
+            if (urlGroup)
+                [self selectGroup:group];
+            if ([urls count]) {
+                [[self undoManager] setActionName:NSLocalizedString(@"Add Group", @"Undo action name")];
+                return YES;
+            } else {
+                return NO;
+            }
+            
         } else {
             
             if([self addPublicationsFromPasteboard:pboard selectLibrary:YES verbose:YES error:NULL] == NO)


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

Revision: 12903
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12903&view=rev
Author:   hofman
Date:     2008-02-29 09:03:38 -0800 (Fri, 29 Feb 2008)

Log Message:
-----------
Fix typo in last commit.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-02-29 17:01:58 UTC (rev 12902)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-02-29 17:03:38 UTC (rev 12903)
@@ -1130,7 +1130,7 @@
                     [groups addURLGroup:(BDSKURLGroup *)group];
                 }
             }
-            if (urlGroup)
+            if (group)
                 [self selectGroup:group];
             if ([urls count]) {
                 [[self undoManager] setActionName:NSLocalizedString(@"Add Group", @"Undo action name")];


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

Revision: 12915
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12915&view=rev
Author:   hofman
Date:     2008-03-01 13:59:36 -0800 (Sat, 01 Mar 2008)

Log Message:
-----------
Always add new groups for URLs and files dropped on the groups table.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-03-01 21:27:52 UTC (rev 12914)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-03-01 21:59:36 UTC (rev 12915)
@@ -975,8 +975,7 @@
                 return NSDragOperationNone;
         } else if([type isEqualToString:BDSKBibItemPboardType]){
             return NSDragOperationCopy; // @@ can't drag row indexes from another document; should use NSArchiver instead
-        } else if ([[NSSet setWithObjects:BDSKWeblocFilePboardType, NSFilenamesPboardType, NSURLPboardType, nil] containsObject:type] &&
-                   ([NSApp currentModifierFlags] & (NSAlternateKeyMask | NSCommandKeyMask)) == (NSAlternateKeyMask | NSCommandKeyMask) ){
+        } else if ([[NSSet setWithObjects:BDSKWeblocFilePboardType, NSFilenamesPboardType, NSURLPboardType, nil] containsObject:type]){
             [tv setDropRow:-1 dropOperation:NSTableViewDropOn];
             return NSDragOperationLink;
         } else {
@@ -1098,8 +1097,7 @@
             // we already have these publications, so we just want to add them to the group, not the document
             
 			pubs = [pboardHelper promisedItemsForPasteboard:[NSPasteboard pasteboardWithName:NSDragPboard]];
-        } else if ([[NSSet setWithObjects:BDSKWeblocFilePboardType, NSFilenamesPboardType, NSURLPboardType, nil] containsObject:type] &&
-                   ([NSApp currentModifierFlags] & (NSAlternateKeyMask | NSCommandKeyMask)) == (NSAlternateKeyMask | NSCommandKeyMask) ){
+        } else if ([[NSSet setWithObjects:BDSKWeblocFilePboardType, NSFilenamesPboardType, NSURLPboardType, nil] containsObject:type]){
             NSArray *urls = nil;
             
             if ([type isEqualToString:BDSKWeblocFilePboardType]) {


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

Revision: 12916
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12916&view=rev
Author:   hofman
Date:     2008-03-01 14:04:31 -0800 (Sat, 01 Mar 2008)

Log Message:
-----------
Allow dropping a x-bdsk-search URL on the group table to add a search group.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-03-01 21:59:36 UTC (rev 12915)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-03-01 22:04:31 UTC (rev 12916)
@@ -1123,6 +1123,10 @@
                     group = [[[(groupClass ? groupClass : [BDSKSearchGroup class]) alloc] initWithDictionary:dictionary] autorelease];
                     if(group)
                         [groups addSearchGroup:(BDSKSearchGroup *)group];
+                } else if ([[url scheme] isEqualToString:@"x-bdsk-search"]) {
+                    group = [[[BDSKSearchGroup alloc] initWithURL:url] autorelease];
+                    if(group)
+                        [groups addSearchGroup:(BDSKSearchGroup *)group];
                 } else {
                     group = [[[BDSKURLGroup alloc] initWithURL:url] autorelease];
                     [groups addURLGroup:(BDSKURLGroup *)group];


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

Revision: 12917
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12917&view=rev
Author:   hofman
Date:     2008-03-01 14:15:43 -0800 (Sat, 01 Mar 2008)

Log Message:
-----------
Change order of checking pboard types for group pane, check for URLs/filenames before checking for strings.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-03-01 22:04:31 UTC (rev 12916)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-03-01 22:15:43 UTC (rev 12917)
@@ -923,12 +923,13 @@
        proposedDropOperation:(NSTableViewDropOperation)op{
     
     NSPasteboard *pboard = [info draggingPasteboard];
-    NSString *type = [pboard availableTypeFromArray:[NSArray arrayWithObjects:BDSKBibItemPboardType, BDSKWeblocFilePboardType, BDSKReferenceMinerStringPboardType, NSStringPboardType, NSFilenamesPboardType, NSURLPboardType, nil]];
     BOOL isDragFromMainTable = [[info draggingSource] isEqual:tableView];
     BOOL isDragFromGroupTable = [[info draggingSource] isEqual:groupTableView];
     BOOL isDragFromDrawer = [[info draggingSource] isEqual:[drawerController tableView]];
     
     if(tv == tableView){
+        NSString *type = [pboard availableTypeFromArray:[NSArray arrayWithObjects:BDSKBibItemPboardType, BDSKWeblocFilePboardType, BDSKReferenceMinerStringPboardType, NSStringPboardType, NSFilenamesPboardType, NSURLPboardType, nil]];
+        
         if([self hasExternalGroupsSelected] || type == nil) 
 			return NSDragOperationNone;
 		if (isDragFromGroupTable && docState.dragFromExternalGroups && [self hasLibraryGroupSelected]) {
@@ -953,7 +954,9 @@
         else
             return NSDragOperationEvery;
     }else if(tv == groupTableView){
-		if ((isDragFromGroupTable || isDragFromMainTable) && docState.dragFromExternalGroups) {
+        NSString *type = [pboard availableTypeFromArray:[NSArray arrayWithObjects:BDSKBibItemPboardType, BDSKWeblocFilePboardType, BDSKReferenceMinerStringPboardType, NSFilenamesPboardType, NSURLPboardType, NSStringPboardType, nil]];
+		
+        if ((isDragFromGroupTable || isDragFromMainTable) && docState.dragFromExternalGroups) {
             if (row != 0)
                 return NSDragOperationNone;
             [tv setDropRow:row dropOperation:NSTableViewDropOn];
@@ -993,9 +996,10 @@
     dropOperation:(NSTableViewDropOperation)op{
 	
     NSPasteboard *pboard = [info draggingPasteboard];
-    NSString *type = [pboard availableTypeFromArray:[NSArray arrayWithObjects:BDSKBibItemPboardType, BDSKWeblocFilePboardType, BDSKReferenceMinerStringPboardType, NSStringPboardType, NSFilenamesPboardType, NSURLPboardType, nil]];
     
     if(tv == tableView){
+        NSString *type = [pboard availableTypeFromArray:[NSArray arrayWithObjects:BDSKBibItemPboardType, BDSKWeblocFilePboardType, BDSKReferenceMinerStringPboardType, NSStringPboardType, NSFilenamesPboardType, NSURLPboardType, nil]];
+        
         if([self hasExternalGroupsSelected])
             return NO;
 		if(row != -1){
@@ -1029,6 +1033,8 @@
             return YES;
             
         }else{
+            NSString *type = [pboard availableTypeFromArray:[NSArray arrayWithObjects:BDSKBibItemPboardType, BDSKWeblocFilePboardType, BDSKReferenceMinerStringPboardType, NSFilenamesPboardType, NSURLPboardType, NSStringPboardType, nil]];
+            
             [self selectLibraryGroup:nil];
             
             if([type isEqualToString:NSFilenamesPboardType]){


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

Revision: 12918
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12918&view=rev
Author:   hofman
Date:     2008-03-01 15:01:55 -0800 (Sat, 01 Mar 2008)

Log Message:
-----------
fix typo in last commit.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-03-01 22:15:43 UTC (rev 12917)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-03-01 23:01:55 UTC (rev 12918)
@@ -1033,7 +1033,6 @@
             return YES;
             
         }else{
-            NSString *type = [pboard availableTypeFromArray:[NSArray arrayWithObjects:BDSKBibItemPboardType, BDSKWeblocFilePboardType, BDSKReferenceMinerStringPboardType, NSFilenamesPboardType, NSURLPboardType, NSStringPboardType, nil]];
             
             [self selectLibraryGroup:nil];
             
@@ -1086,6 +1085,7 @@
             return [self addPublicationsFromPasteboard:pboard selectLibrary:YES verbose:YES error:NULL];
         }
     } else if(tv == groupTableView){
+        NSString *type = [pboard availableTypeFromArray:[NSArray arrayWithObjects:BDSKBibItemPboardType, BDSKWeblocFilePboardType, BDSKReferenceMinerStringPboardType, NSFilenamesPboardType, NSURLPboardType, NSStringPboardType, nil]];
         NSArray *pubs = nil;
         BOOL isDragFromMainTable = [[info draggingSource] isEqual:tableView];
         BOOL isDragFromGroupTable = [[info draggingSource] isEqual:groupTableView];


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

Revision: 13167
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=13167&view=rev
Author:   hofman
Date:     2008-04-17 02:32:32 -0700 (Thu, 17 Apr 2008)

Log Message:
-----------
Only use author for category group name when the group field is a person field.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-04-17 09:27:47 UTC (rev 13166)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-04-17 09:32:32 UTC (rev 13167)
@@ -149,7 +149,8 @@
 		if([group isCategory]){
 			NSArray *pubs = [groupedPublications copy];
             // change the name of the group first, so we can preserve the selection
-            [(BDSKCategoryGroup *)group setName:[BibAuthor authorWithName:newName andPub:[[group name] publication]]];
+            id name = [[self currentGroupField] isPersonField] ? [BibAuthor authorWithName:name andPub:[[group name] publication]] : newName;
+            [(BDSKCategoryGroup *)group setName:name];
 			[self movePublications:pubs fromGroup:group toGroupNamed:newName];
 			[pubs release];
 		}else if([group hasEditableName]){


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

Revision: 13177
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=13177&view=rev
Author:   hofman
Date:     2008-04-21 11:13:40 -0700 (Mon, 21 Apr 2008)

Log Message:
-----------
Use correct template for drag/copy. 

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-04-21 05:46:02 UTC (rev 13176)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-04-21 18:13:40 UTC (rev 13177)
@@ -674,7 +674,7 @@
     }
     
     if (dragCopyType == BDSKTemplateDragCopyType) {
-        NSString *dragCopyTemplateKey = ([NSApp currentModifierFlags] & NSAlternateKeyMask) ? BDSKDefaultDragCopyTemplateKey : BDSKAlternateDragCopyTemplateKey;
+        NSString *dragCopyTemplateKey = ([NSApp currentModifierFlags] & NSAlternateKeyMask) ? BDSKAlternateDragCopyTemplateKey : BDSKDefaultDragCopyTemplateKey;
         NSString *template = [sud stringForKey:dragCopyTemplateKey];
         unsigned templateIdx = [[BDSKTemplate allStyleNames] indexOfObject:template];
         if (templateIdx != NSNotFound)


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

Revision: 13181
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=13181&view=rev
Author:   hofman
Date:     2008-04-23 02:08:11 -0700 (Wed, 23 Apr 2008)

Log Message:
-----------
Use correct name variable to replace author name in edited category group.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-04-23 05:45:29 UTC (rev 13180)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-04-23 09:08:11 UTC (rev 13181)
@@ -149,7 +149,7 @@
 		if([group isCategory]){
 			NSArray *pubs = [groupedPublications copy];
             // change the name of the group first, so we can preserve the selection
-            id name = [[self currentGroupField] isPersonField] ? [BibAuthor authorWithName:name andPub:[[group name] publication]] : newName;
+            id name = [[self currentGroupField] isPersonField] ? [BibAuthor authorWithName:newName andPub:[[group name] publication]] : newName;
             [(BDSKCategoryGroup *)group setName:name];
 			[self movePublications:pubs fromGroup:group toGroupNamed:newName];
 			[pubs release];


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

Revision: 13182
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=13182&view=rev
Author:   hofman
Date:     2008-04-23 02:18:06 -0700 (Wed, 23 Apr 2008)

Log Message:
-----------
Remember old category group for changing the field of the pubs.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-04-23 09:08:11 UTC (rev 13181)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-04-23 09:18:06 UTC (rev 13182)
@@ -148,10 +148,11 @@
 			return;
 		if([group isCategory]){
 			NSArray *pubs = [groupedPublications copy];
-            // change the name of the group first, so we can preserve the selection
+            // change the name of the group first, so we can preserve the selection; we need to old group info to move though
+            BDSKCategoryGroup *oldGroup = [[[BDSKCategoryGroup alloc] initWithName:[group name] key:[(BDSKCategoryGroup *)group key] count:[group count]] autorelease];
             id name = [[self currentGroupField] isPersonField] ? [BibAuthor authorWithName:newName andPub:[[group name] publication]] : newName;
             [(BDSKCategoryGroup *)group setName:name];
-			[self movePublications:pubs fromGroup:group toGroupNamed:newName];
+			[self movePublications:pubs fromGroup:oldGroup toGroupNamed:newName];
 			[pubs release];
 		}else if([group hasEditableName]){
 			[(BDSKMutableGroup *)group setName:newName];


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

Revision: 13273
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=13273&view=rev
Author:   hofman
Date:     2008-05-14 04:23:35 -0700 (Wed, 14 May 2008)

Log Message:
-----------
Get all citations from .aux file, as there can be other lines in between.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-05-14 05:45:30 UTC (rev 13272)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-05-14 11:23:35 UTC (rev 13273)
@@ -1067,15 +1067,15 @@
                         
                         command = [command stringByAppendingString:@"{"];
                         
+                        [scanner setScanLocation:[scanner scanLocation] - [command length]];
+                        
                         do {
-                            if ([scanner scanUpToString:@"}" intoString:&key] == NO)
-                                break;
-                            if (items = [publications allItemsForCiteKey:key])
+                            if ([scanner scanString:command intoString:NULL] &&
+                                [scanner scanUpToString:@"}" intoString:&key] &&
+                                (items = [publications allItemsForCiteKey:key]))
                                 [selItems addObjectsFromArray:items];
-                            if ([scanner scanUpToCharactersFromSet:[NSCharacterSet newlineCharacterSet] intoString:NULL] == NO ||
-                                [scanner scanCharactersFromSet:[NSCharacterSet newlineCharacterSet] intoString:NULL] == NO ||
-                                [scanner scanString:command intoString:NULL] == NO)
-                                break;
+                            [scanner scanUpToCharactersFromSet:[NSCharacterSet newlineCharacterSet] intoString:NULL];
+                            [scanner scanCharactersFromSet:[NSCharacterSet newlineCharacterSet] intoString:NULL];
                         } while ([scanner isAtEnd] == NO);
                         
                         if ([selItems count])


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

Revision: 13274
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=13274&view=rev
Author:   hofman
Date:     2008-05-14 04:37:08 -0700 (Wed, 14 May 2008)

Log Message:
-----------
Avoid .aux scanning to get into an infinite loop.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-05-14 11:23:35 UTC (rev 13273)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-05-14 11:37:08 UTC (rev 13274)
@@ -1075,7 +1075,8 @@
                                 (items = [publications allItemsForCiteKey:key]))
                                 [selItems addObjectsFromArray:items];
                             [scanner scanUpToCharactersFromSet:[NSCharacterSet newlineCharacterSet] intoString:NULL];
-                            [scanner scanCharactersFromSet:[NSCharacterSet newlineCharacterSet] intoString:NULL];
+                            if ([scanner scanCharactersFromSet:[NSCharacterSet newlineCharacterSet] intoString:NULL] == NO)
+                                break;
                         } while ([scanner isAtEnd] == NO);
                         
                         if ([selItems count])


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

Revision: 13282
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=13282&view=rev
Author:   hofman
Date:     2008-05-15 03:13:27 -0700 (Thu, 15 May 2008)

Log Message:
-----------
Allow dropping files on a group to add items. Dropping on the whole group table still adds external file groups.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-05-15 01:03:58 UTC (rev 13281)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-05-15 10:13:27 UTC (rev 13282)
@@ -982,7 +982,7 @@
                 return NSDragOperationNone;
         } else if([type isEqualToString:BDSKBibItemPboardType]){
             return NSDragOperationCopy; // @@ can't drag row indexes from another document; should use NSArchiver instead
-        } else if ([[NSSet setWithObjects:BDSKWeblocFilePboardType, NSFilenamesPboardType, NSURLPboardType, nil] containsObject:type]){
+        } else if (row == -1 && [[NSSet setWithObjects:BDSKWeblocFilePboardType, NSFilenamesPboardType, NSURLPboardType, nil] containsObject:type]){
             [tv setDropRow:-1 dropOperation:NSTableViewDropOn];
             return NSDragOperationLink;
         } else {
@@ -1108,7 +1108,7 @@
             // we already have these publications, so we just want to add them to the group, not the document
             
 			pubs = [pboardHelper promisedItemsForPasteboard:[NSPasteboard pasteboardWithName:NSDragPboard]];
-        } else if ([[NSSet setWithObjects:BDSKWeblocFilePboardType, NSFilenamesPboardType, NSURLPboardType, nil] containsObject:type]){
+        } else if (row == -1 && [[NSSet setWithObjects:BDSKWeblocFilePboardType, NSFilenamesPboardType, NSURLPboardType, nil] containsObject:type]){
             NSArray *urls = nil;
             
             if ([type isEqualToString:BDSKWeblocFilePboardType]) {


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

Revision: 13445
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=13445&view=rev
Author:   hofman
Date:     2008-06-17 16:54:37 -0700 (Tue, 17 Jun 2008)

Log Message:
-----------
Backup .aux file parsing with default \\bibcite command

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-06-17 05:45:33 UTC (rev 13444)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-06-17 23:54:37 UTC (rev 13445)
@@ -1073,13 +1073,17 @@
                             [scanner scanUpToCharactersFromSet:[NSCharacterSet newlineCharacterSet] intoString:NULL] == NO ||
                             [scanner scanCharactersFromSet:[NSCharacterSet newlineCharacterSet] intoString:NULL] == NO ||
                             [scanner scanUpToString:@"{" intoString:&command] == NO ||
-                            [scanner scanString:@"{" intoString:NULL] == NO)
-                            return NO;
+                            [scanner scanString:@"{" intoString:NULL] == NO) {
+                            
+                            command = @"\\bibcite{";
+                            [scanner setScanLocation:0];
+                            if ([scanner scanUpToString:command intoString:NULL] == NO)
+                                return NO;
+                        } else {
+                            command = [command stringByAppendingString:@"{"];
+                            [scanner setScanLocation:[scanner scanLocation] - [command length]];
+                        }
                         
-                        command = [command stringByAppendingString:@"{"];
-                        
-                        [scanner setScanLocation:[scanner scanLocation] - [command length]];
-                        
                         do {
                             if ([scanner scanString:command intoString:NULL] &&
                                 [scanner scanUpToString:@"}" intoString:&key] &&


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

Revision: 13447
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=13447&view=rev
Author:   hofman
Date:     2008-06-18 02:13:20 -0700 (Wed, 18 Jun 2008)

Log Message:
-----------
Simplify .aux file parsing. Forget about getting the command for citations by looking after \bibdata. This often won't work because there can be other stuff in between. Just always look for \bibcite, which will work in most cases.

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_DataSource.m

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2008-06-18 05:45:25 UTC (rev 13446)
+++ trunk/bibdesk/BibDocument_DataSource.m	2008-06-18 09:13:20 UTC (rev 13447)
@@ -1057,41 +1057,25 @@
                     NSString *file = [filenames lastObject];
                     if([[file pathExtension] caseInsensitiveCompare:@"aux"] == NSOrderedSame){
                         NSString *auxString = [NSString stringWithContentsOfFile:file encoding:[self documentStringEncoding] guessEncoding:YES];
+                        NSString *command = @"\\bibcite{"; // we used to get the command by looking at the line after \bibdata, but that's unreliable as there can be other stuff in between the \bibcite commands
                         
-                        if (auxString == nil)
+                        if (auxString == nil || [auxString rangeOfString:command].length == 0)
                             return NO;
                         
                         NSScanner *scanner = [NSScanner scannerWithString:auxString];
                         NSString *key = nil;
-                        NSString *command = nil;
                         NSArray *items = nil;
                         NSMutableArray *selItems = [NSMutableArray array];
                         
                         [scanner setCharactersToBeSkipped:nil];
                         
-                        if ([scanner scanUpToString:@"\\bibdata{" intoString:NULL] == NO ||
-                            [scanner scanUpToCharactersFromSet:[NSCharacterSet newlineCharacterSet] intoString:NULL] == NO ||
-                            [scanner scanCharactersFromSet:[NSCharacterSet newlineCharacterSet] intoString:NULL] == NO ||
-                            [scanner scanUpToString:@"{" intoString:&command] == NO ||
-                            [scanner scanString:@"{" intoString:NULL] == NO) {
-                            
-                            command = @"\\bibcite{";
-                            [scanner setScanLocation:0];
-                            if ([scanner scanUpToString:command intoString:NULL] == NO)
-                                return NO;
-                        } else {
-                            command = [command stringByAppendingString:@"{"];
-                            [scanner setScanLocation:[scanner scanLocation] - [command length]];
-                        }
-                        
                         do {
                             if ([scanner scanString:command intoString:NULL] &&
                                 [scanner scanUpToString:@"}" intoString:&key] &&
                                 (items = [publications allItemsForCiteKey:key]))
                                 [selItems addObjectsFromArray:items];
                             [scanner scanUpToCharactersFromSet:[NSCharacterSet newlineCharacterSet] intoString:NULL];
-                            if ([scanner scanCharactersFromSet:[NSCharacterSet newlineCharacterSet] intoString:NULL] == NO)
-                                break;
+                            [scanner scanCharactersFromSet:[NSCharacterSet newlineCharacterSet] intoString:NULL];
                         } while ([scanner isAtEnd] == NO);
                         
                         if ([selItems count])


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