[Bibdesk-commit] bibdesk BDSKCustomCiteTableView.m,1.3,1.4 BDSKDragTableView.m,1.19,1.20

[Adam M. <ama...@us...>]

Update of /cvsroot/bibdesk/bibdesk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12001

Modified Files:
	BDSKCustomCiteTableView.m BDSKDragTableView.m 
Log Message:
Restore old behavior of putting the bibtex string in the drag image, since it was confusing to me as a long-time user to be dragging citekeys when I know my prefs are set otherwise!  I believe the change was made in order to avoid calling the dragging source method twice, and this patch avoids that by just using the string that's on the drag pboard.  Mike, feel free to back this out if you see other problems.


Index: BDSKDragTableView.m
===================================================================
RCS file: /cvsroot/bibdesk/bibdesk/BDSKDragTableView.m,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** BDSKDragTableView.m	30 Jan 2005 05:36:55 -0000	1.19
--- BDSKDragTableView.m	30 Jan 2005 08:09:29 -0000	1.20
***************
*** 28,34 ****
      NSSize maxSize = NSMakeSize(600,200); // tunable...
      NSSize stringSize;
! 
!     if(s = [[self dataSource] citeStringForRows:dragRows tableViewDragSource:self]){
!         string = [[NSAttributedString alloc] initWithString:s];
          image = [[[NSImage alloc] init] autorelease];
          stringSize = [string size];
--- 28,43 ----
      NSSize maxSize = NSMakeSize(600,200); // tunable...
      NSSize stringSize;
!     
!     NSPasteboard *pb = [NSPasteboard pasteboardWithName:NSDragPboard];
!     NSArray *types = [pb types];
!     
!     if([[pb availableTypeFromArray:types] isEqualToString:NSStringPboardType]){
!         s = [pb stringForType:NSStringPboardType];  // draw the string from the drag pboard, if it's available
!     } else {
!         s = [[self dataSource] citeStringForRows:dragRows tableViewDragSource:self];
!     }
!     
!     if(s){
!         string = [[[NSAttributedString alloc] initWithString:s] autorelease];
          image = [[[NSImage alloc] init] autorelease];
          stringSize = [string size];

Index: BDSKCustomCiteTableView.m
===================================================================
RCS file: /cvsroot/bibdesk/bibdesk/BDSKCustomCiteTableView.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BDSKCustomCiteTableView.m	30 Jan 2005 05:36:54 -0000	1.3
--- BDSKCustomCiteTableView.m	30 Jan 2005 08:09:29 -0000	1.4
***************
*** 23,27 ****
      NSSize stringSize;
      
!     if(s = [[self dataSource] citeStringForRows:dragRows tableViewDragSource:self]){
          string = [[NSAttributedString alloc] initWithString:s];
          image = [[[NSImage alloc] init] autorelease];
--- 23,36 ----
      NSSize stringSize;
      
!     NSPasteboard *pb = [NSPasteboard pasteboardWithName:NSDragPboard];
!     NSArray *types = [pb types];
!     
!     if([[pb availableTypeFromArray:types] isEqualToString:NSStringPboardType]){
!         s = [pb stringForType:NSStringPboardType]; // draw the string from the drag pboard, if it's available
!     } else {
!         s = [[self dataSource] citeStringForRows:dragRows tableViewDragSource:self];
!     }
!             
!     if(s){
          string = [[NSAttributedString alloc] initWithString:s];
          image = [[[NSImage alloc] init] autorelease];