[Bibdesk-commit] bibdesk BibEditor.m,1.132,1.133

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

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

Modified Files:
	BibEditor.m 
Log Message:
Update types popup properly.  Removed redundant? call to setupForm, and we now cache the font for the form (and it now matches the font size set in IB).


Index: BibEditor.m
===================================================================
RCS file: /cvsroot/bibdesk/bibdesk/BibEditor.m,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** BibEditor.m	6 Apr 2005 13:28:13 -0000	1.132
--- BibEditor.m	8 Apr 2005 00:15:28 -0000	1.133
***************
*** 64,68 ****
      [theBib setEditorObj:self];
      [citeKeyField setStringValue:[theBib citeKey]];
-     [self setupForm];
      [notesView setString:[theBib valueOfField:BDSKAnnoteString]];
      [abstractView setString:[theBib valueOfField:BDSKAbstractString]];
--- 64,67 ----
***************
*** 82,90 ****
  
  - (void)setupForm{
      BibAppController *appController = (BibAppController *)[NSApp delegate];
      NSString *tmp;
      NSFormCell *entry;
      NSArray *sKeys;
-     NSFont *requiredFont = [NSFont labelFontOfSize:12.0];
      int i=0;
      int numRows;
--- 81,95 ----
  
  - (void)setupForm{
+     static NSFont *requiredFont = nil;
+     if(!requiredFont){
+         requiredFont = [NSFont systemFontOfSize:13.0];
+         [[NSFontManager sharedFontManager] convertFont:requiredFont
+                                            toHaveTrait:NSBoldFontMask];
+     }
+ 
      BibAppController *appController = (BibAppController *)[NSApp delegate];
      NSString *tmp;
      NSFormCell *entry;
      NSArray *sKeys;
      int i=0;
      int numRows;
***************
*** 97,104 ****
      NSDictionary *reqAtt = [NSDictionary dictionaryWithObjects:[NSArray arrayWithObjects:[NSColor redColor],nil]
                                                         forKeys:[NSArray arrayWithObjects:NSForegroundColorAttributeName,nil]];
- 
-     
-     [[NSFontManager sharedFontManager] convertFont:requiredFont
-                                        toHaveTrait:NSBoldFontMask];
  	
  	// set up for adding all items 
--- 102,105 ----
***************
*** 115,118 ****
--- 116,120 ----
      NSMutableSet *addedFields = [NSMutableSet set];
      NSArray *requiredKeys = [theBib requiredFieldNames];
+     NSAssert(requiredKeys != nil, @"Required keys must not be nil."); // it may be empty, though
      e = [requiredKeys objectEnumerator];
      while(tmp = [e nextObject]){
***************
*** 201,204 ****
--- 203,207 ----
      [newFieldName setFormatter:fieldNameFormatter];
  
+     [self setupTypePopUp];
      [self setupForm]; // gets called in window will load...?