[Bibdesk-commit] bibdesk BibEditor.h,1.47.2.1.2.3,1.47.2.1.2.4 BibEditor.m,1.159.2.2.2.20,1.159.2.2.2.21

[Christiaan H. <ho...@us...>]

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

Modified Files:
      Tag: TRY_CMH_CROSSREF_BR_1x
	BibEditor.h BibEditor.m 
Log Message:
Remove action to stop editing a formcell. We use the notification for that.

Index: BibEditor.h
===================================================================
RCS file: /cvsroot/bibdesk/bibdesk/BibEditor.h,v
retrieving revision 1.47.2.1.2.3
retrieving revision 1.47.2.1.2.4
diff -C2 -d -r1.47.2.1.2.3 -r1.47.2.1.2.4
*** BibEditor.h	28 May 2005 18:29:43 -0000	1.47.2.1.2.3
--- BibEditor.h	30 May 2005 13:54:07 -0000	1.47.2.1.2.4
***************
*** 336,342 ****
  */
  - (void)updateTypePopup;
- //- (IBAction)textFieldDidChange:(id)sender;
- - (IBAction)textFieldDidEndEditing:(id)sender;
- //- (void)closeSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void  *)contextInfo;
  
  /*!
--- 336,339 ----

Index: BibEditor.m
===================================================================
RCS file: /cvsroot/bibdesk/bibdesk/BibEditor.m,v
retrieving revision 1.159.2.2.2.20
retrieving revision 1.159.2.2.2.21
diff -C2 -d -r1.159.2.2.2.20 -r1.159.2.2.2.21
*** BibEditor.m	30 May 2005 10:19:44 -0000	1.159.2.2.2.20
--- BibEditor.m	30 May 2005 13:54:07 -0000	1.159.2.2.2.21
***************
*** 1102,1107 ****
  		contextInfo:nil];
  		int rv = [NSApp runModalForWindow:editInheritedWarningSheet];
! 		[NSApp endSheet:editInheritedWarningSheet];
! 		[editInheritedWarningSheet orderOut:self];
  		
  		if (rv == NSAlertAlternateReturn) {
--- 1102,1106 ----
  		contextInfo:nil];
  		int rv = [NSApp runModalForWindow:editInheritedWarningSheet];
! 		
  		
  		if (rv == NSAlertAlternateReturn) {
***************
*** 1121,1124 ****
--- 1120,1125 ----
  - (IBAction)dismissEditInheritedSheet:(id)sender{
  	[NSApp stopModalWithCode:[sender tag]];
+ 	[NSApp endSheet:editInheritedWarningSheet];
+ 	[editInheritedWarningSheet orderOut:self];
  }
  
***************
*** 1279,1290 ****
      // here for undo
      currentControl = nil; // if a control doesn't have focus, set this to nil; this allows us to set the textview(s) as first responder
! }
! 
! // sent by the NSForm when we are done editing a field if we used the formcell.
! - (IBAction)textFieldDidEndEditing:(id)sender{
! 	if ([sender indexOfSelectedItem] == -1)
  		return;
  	
!     NSCell *sel = [sender cellAtIndex: [sender indexOfSelectedItem]];
      NSString *title = [sel title];
  	NSString *value = [sel stringValue];
--- 1280,1289 ----
      // here for undo
      currentControl = nil; // if a control doesn't have focus, set this to nil; this allows us to set the textview(s) as first responder
! 	
! 	id control = [aNotification object];
! 	if (control != bibFields || [control indexOfSelectedItem] == -1)
  		return;
  	
!     NSCell *sel = [control cellAtIndex: [control indexOfSelectedItem]];
      NSString *title = [sel title];
  	NSString *value = [sel stringValue];