[Bibdesk-commit] SF.net SVN: bibdesk: [5777] trunk/bibdesk

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

Revision: 5777
Author:   hofman
Date:     2006-03-07 12:02:20 -0800 (Tue, 07 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=5777&view=rev

Log Message:
-----------
Use separate preferences for the main and group table fonts.
Add pref keys for font of the table in the person view. 
Implement delegate methods for the tableView font in the file search controller. 

Modified Paths:
--------------
    trunk/bibdesk/BDSKFileContentSearchController.h
    trunk/bibdesk/BDSKFileContentSearchController.m
    trunk/bibdesk/BibDocument.h
    trunk/bibdesk/BibDocument.m
    trunk/bibdesk/BibDocument_DataSource.m
    trunk/bibdesk/BibPersonController.m
    trunk/bibdesk/BibPrefController.h
    trunk/bibdesk/BibPrefController.m
    trunk/bibdesk/English.lproj/BibDocument.nib/classes.nib
    trunk/bibdesk/English.lproj/BibDocument.nib/info.nib
    trunk/bibdesk/English.lproj/BibDocument.nib/keyedobjects.nib
    trunk/bibdesk/English.lproj/BibDocument.nib/objects.nib
    trunk/bibdesk/Info.plist
Modified: trunk/bibdesk/BDSKFileContentSearchController.h
===================================================================
--- trunk/bibdesk/BDSKFileContentSearchController.h	2006-03-07 19:33:14 UTC (rev 5776)
+++ trunk/bibdesk/BDSKFileContentSearchController.h	2006-03-07 20:02:20 UTC (rev 5777)
@@ -119,7 +119,6 @@
 - (void)saveSortDescriptors;
 - (void)cancelCurrentSearch:(id)sender;
 - (void)restoreDocumentState:(id)sender;
-- (void)setTableFont;
 - (void)setMaxValueWithDouble:(double)doubleValue;
 - (void)setMinValueWithDouble:(double)doubleValue;
 

Modified: trunk/bibdesk/BDSKFileContentSearchController.m
===================================================================
--- trunk/bibdesk/BDSKFileContentSearchController.m	2006-03-07 19:33:14 UTC (rev 5776)
+++ trunk/bibdesk/BDSKFileContentSearchController.m	2006-03-07 20:02:20 UTC (rev 5777)
@@ -100,7 +100,6 @@
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleDocumentCloseNotification:) name:BDSKDocumentWindowWillCloseNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidBecomeMain:) name:NSWindowDidBecomeMainNotification object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(setTableFont) name:BDSKTableViewFontChangedNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleApplicationWillTerminate:) name:NSApplicationWillTerminateNotification object:nil];
     
     // this lock is used any time the mutable indexDictionary ivar is accessed
@@ -172,7 +171,6 @@
     [[tableView tableColumnWithIdentifier:@"name"] setDataCell:textCell];
     [textCell release];
     
-    [self setTableFont];
     [self setupToolbar];
     [[self window] makeFirstResponder:searchField];
     
@@ -616,20 +614,31 @@
     return currentDocument;
 }
 
+#pragma mark TableView delegate
+
 // Use the same font as the document tableview
-- (void)setTableFont
-{
-    NSFont *font = [NSFont fontWithName:[[OFPreferenceWrapper sharedPreferenceWrapper] objectForKey:BDSKTableViewFontKey]
-                                   size:[[OFPreferenceWrapper sharedPreferenceWrapper] floatForKey:BDSKTableViewFontSizeKey]];
-	
-	[tableView setFont:font];
-    NSLayoutManager *lm = [[NSLayoutManager alloc] init];
-    [tableView setRowHeight:([lm defaultLineHeightForFont:font] + 2)];
-    [lm release];
-	[tableView tile];
-    [tableView reloadData]; // otherwise the change isn't immediately visible
+
+- (NSString *)tableViewFontNamePreferenceKey:(NSTableView *)tv {
+    if (tv == tableView)
+        return BDSKMainTableViewFontNameKey;
+    else 
+        return nil;
 }
 
+- (NSString *)tableViewFontSizePreferenceKey:(NSTableView *)tv {
+    if (tv == tableView)
+        return BDSKMainTableViewFontSizeKey;
+    else 
+        return nil;
+}
+
+- (NSString *)tableViewFontChangedNotificationName:(NSTableView *)tv {
+    if (tv == tableView)
+        return BDSKMainTableViewFontChangedNotification;
+    else 
+        return nil;
+}
+
 #pragma mark -
 #pragma mark Toolbar setup
 

Modified: trunk/bibdesk/BibDocument.h
===================================================================
--- trunk/bibdesk/BibDocument.h	2006-03-07 19:33:14 UTC (rev 5776)
+++ trunk/bibdesk/BibDocument.h	2006-03-07 20:02:20 UTC (rev 5777)
@@ -1022,7 +1022,8 @@
 - (void)setStatus:(NSString *)status;
 - (void)setStatus:(NSString *)status immediate:(BOOL)now;
 
-- (IBAction)changeTableFont:(id)sender;
+- (IBAction)changeMainTableFont:(id)sender;
+- (IBAction)changeGroupTableFont:(id)sender;
 
 - (IBAction)toggleShowingCustomCiteDrawer:(id)sender;
 

Modified: trunk/bibdesk/BibDocument.m
===================================================================
--- trunk/bibdesk/BibDocument.m	2006-03-07 19:33:14 UTC (rev 5776)
+++ trunk/bibdesk/BibDocument.m	2006-03-07 20:02:20 UTC (rev 5777)
@@ -2857,17 +2857,28 @@
 		[statusBar performSelector:@selector(setStringValue:) withObject:status afterDelay:0.01];
 }
 
-- (IBAction)changeTableFont:(id)sender{
-    NSString *fontName = [[OFPreferenceWrapper sharedPreferenceWrapper] objectForKey:BDSKTableViewFontKey];
-    float fontSize = [[OFPreferenceWrapper sharedPreferenceWrapper] floatForKey:BDSKTableViewFontSizeKey];
+- (IBAction)changeMainTableFont:(id)sender{
+    NSString *fontName = [[OFPreferenceWrapper sharedPreferenceWrapper] objectForKey:BDSKMainTableViewFontNameKey];
+    float fontSize = [[OFPreferenceWrapper sharedPreferenceWrapper] floatForKey:BDSKMainTableViewFontSizeKey];
 	[[NSFontManager sharedFontManager] setSelectedFont:[NSFont fontWithName:fontName size:fontSize] isMultiple:NO];
     [[NSFontManager sharedFontManager] orderFrontFontPanel:sender];
     
     id firstResponder = [documentWindow firstResponder];
-    if (firstResponder != tableView && firstResponder != groupTableView)
+    if (firstResponder != tableView)
         [documentWindow makeFirstResponder:tableView];
 }
 
+- (IBAction)changeGroupTableFont:(id)sender{
+    NSString *fontName = [[OFPreferenceWrapper sharedPreferenceWrapper] objectForKey:BDSKGroupTableViewFontNameKey];
+    float fontSize = [[OFPreferenceWrapper sharedPreferenceWrapper] floatForKey:BDSKGroupTableViewFontSizeKey];
+	[[NSFontManager sharedFontManager] setSelectedFont:[NSFont fontWithName:fontName size:fontSize] isMultiple:NO];
+    [[NSFontManager sharedFontManager] orderFrontFontPanel:sender];
+    
+    id firstResponder = [documentWindow firstResponder];
+    if (firstResponder != groupTableView)
+        [documentWindow makeFirstResponder:groupTableView];
+}
+
 #pragma mark TeXTask delegate
 
 - (BOOL)texTaskShouldStartRunning:(BDSKTeXTask *)aTexTask{

Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m	2006-03-07 19:33:14 UTC (rev 5776)
+++ trunk/bibdesk/BibDocument_DataSource.m	2006-03-07 20:02:20 UTC (rev 5777)
@@ -306,22 +306,28 @@
 }
 
 - (NSString *)tableViewFontNamePreferenceKey:(NSTableView *)tv {
-    if (tv == tableView || tv == groupTableView)
-        return BDSKTableViewFontKey;
+    if (tv == tableView)
+        return BDSKMainTableViewFontNameKey;
+    else if (tv == groupTableView)
+        return BDSKGroupTableViewFontNameKey;
     else 
         return nil;
 }
 
 - (NSString *)tableViewFontSizePreferenceKey:(NSTableView *)tv {
-    if (tv == tableView || tv == groupTableView)
-        return BDSKTableViewFontSizeKey;
+    if (tv == tableView)
+        return BDSKMainTableViewFontSizeKey;
+    else if (tv == groupTableView)
+        return BDSKGroupTableViewFontSizeKey;
     else 
         return nil;
 }
 
 - (NSString *)tableViewFontChangedNotificationName:(NSTableView *)tv {
-    if (tv == tableView || tv == groupTableView)
-        return BDSKTableViewFontChangedNotification;
+    if (tv == tableView)
+        return BDSKMainTableViewFontChangedNotification;
+    else if (tv == groupTableView)
+        return BDSKGroupTableViewFontChangedNotification;
     else 
         return nil;
 }

Modified: trunk/bibdesk/BibPersonController.m
===================================================================
--- trunk/bibdesk/BibPersonController.m	2006-03-07 19:33:14 UTC (rev 5776)
+++ trunk/bibdesk/BibPersonController.m	2006-03-07 20:02:20 UTC (rev 5777)
@@ -251,6 +251,29 @@
 	[self updateUI];
 }
 
+#pragma mark TableView delegate
+
+- (NSString *)tableViewFontNamePreferenceKey:(NSTableView *)tv {
+    if (tv == pubsTableView)
+        return BDSKPersonTableViewFontNameKey;
+    else 
+        return nil;
+}
+
+- (NSString *)tableViewFontSizePreferenceKey:(NSTableView *)tv {
+    if (tv == pubsTableView)
+        return BDSKPersonTableViewFontSizeKey;
+    else 
+        return nil;
+}
+
+- (NSString *)tableViewFontChangedNotificationName:(NSTableView *)tv {
+    if (tv == pubsTableView)
+        return BDSKPersonTableViewFontChangedNotification;
+    else 
+        return nil;
+}
+
 #pragma mark Dragging delegate methods
 
 - (NSDragOperation)dragImageView:(BDSKDragImageView *)view validateDrop:(id <NSDraggingInfo>)sender {

Modified: trunk/bibdesk/BibPrefController.h
===================================================================
--- trunk/bibdesk/BibPrefController.h	2006-03-07 19:33:14 UTC (rev 5776)
+++ trunk/bibdesk/BibPrefController.h	2006-03-07 20:02:20 UTC (rev 5777)
@@ -81,8 +81,12 @@
 extern NSString *BDSKBooleanFieldsKey;
 extern NSString *BDSKTriStateFieldsKey;
 extern NSString *BDSKOutputTemplateFileKey;
-extern NSString *BDSKTableViewFontKey;
-extern NSString *BDSKTableViewFontSizeKey;
+extern NSString *BDSKMainTableViewFontNameKey;
+extern NSString *BDSKMainTableViewFontSizeKey;
+extern NSString *BDSKGroupTableViewFontNameKey;
+extern NSString *BDSKGroupTableViewFontSizeKey;
+extern NSString *BDSKPersonTableViewFontNameKey;
+extern NSString *BDSKPersonTableViewFontSizeKey;
 extern NSString *BDSKPreviewDisplayKey;
 extern NSString *BDSKPreviewMaxNumberKey;
 extern NSString *BDSKPreviewPDFScaleFactorKey;
@@ -217,7 +221,9 @@
 #pragma mark ||  Notification name strings
 extern NSString *BDSKFinalizeChangesNotification;
 extern NSString *BDSKDocumentWindowWillCloseNotification;
-extern NSString *BDSKTableViewFontChangedNotification;
+extern NSString *BDSKMainTableViewFontChangedNotification;
+extern NSString *BDSKGroupTableViewFontChangedNotification;
+extern NSString *BDSKPersonTableViewFontChangedNotification;
 extern NSString *BDSKPreviewDisplayChangedNotification;
 extern NSString *BDSKPreviewNeedsUpdateNotification;
 extern NSString *BDSKTableColumnChangedNotification;

Modified: trunk/bibdesk/BibPrefController.m
===================================================================
--- trunk/bibdesk/BibPrefController.m	2006-03-07 19:33:14 UTC (rev 5776)
+++ trunk/bibdesk/BibPrefController.m	2006-03-07 20:02:20 UTC (rev 5777)
@@ -112,8 +112,12 @@
 NSString *BDSKShowEditorStatusBarKey = @"Show Editor Status Bar";
 NSString *BDSKShowFindStatusBarKey = @"Show Find Status Bar";
 
-NSString *BDSKTableViewFontKey = @"TableView Font";
-NSString *BDSKTableViewFontSizeKey = @"TableView Font Size";
+NSString *BDSKMainTableViewFontNameKey = @"BDSKMainTableViewFontNameKey";
+NSString *BDSKMainTableViewFontSizeKey = @"BDSKMainTableViewFontSizeKey";
+NSString *BDSKGroupTableViewFontNameKey = @"BDSKGroupTableViewFontNameKey";
+NSString *BDSKGroupTableViewFontSizeKey = @"BDSKGroupTableViewFontSizeKey";
+NSString *BDSKPersonTableViewFontNameKey = @"BDSKPersonTableViewFontNameKey";
+NSString *BDSKPersonTableViewFontSizeKey = @"BDSKPersonTableViewFontSizeKey";
 NSString *BDSKPreviewDisplayKey = @"Preview Pane Displays What?";
 NSString *BDSKPreviewMaxNumberKey = @"Maximum Number of Items in Preview Pane";
 
@@ -232,7 +236,9 @@
 #pragma mark ||  Notification name strings
 NSString *BDSKFinalizeChangesNotification = @"Finalize Changes Notification";
 NSString *BDSKDocumentWindowWillCloseNotification = @"Document Window Will Close Notification";
-NSString *BDSKTableViewFontChangedNotification = @"Tableview font selection is changing Notification";
+NSString *BDSKMainTableViewFontChangedNotification = @"BDSKMainTableViewFontChangedNotification";
+NSString *BDSKGroupTableViewFontChangedNotification = @"BDSKGroupTableViewFontChangedNotification";
+NSString *BDSKPersonTableViewFontChangedNotification = @"BDSKPersonTableViewFontChangedNotification";
 NSString *BDSKPreviewDisplayChangedNotification = @"Preview Pane Preference Change Notification";
 NSString *BDSKPreviewNeedsUpdateNotification = @"Preview Needs Update Notification";
 NSString *BDSKTableColumnChangedNotification = @"TableColumnChangedNotification";

Modified: trunk/bibdesk/English.lproj/BibDocument.nib/classes.nib
===================================================================
--- trunk/bibdesk/English.lproj/BibDocument.nib/classes.nib	2006-03-07 19:33:14 UTC (rev 5776)
+++ trunk/bibdesk/English.lproj/BibDocument.nib/classes.nib	2006-03-07 20:02:20 UTC (rev 5777)
@@ -29,7 +29,8 @@
                 addGroupFieldAction = id; 
                 addSmartGroupAction = id; 
                 changeGroupFieldAction = id; 
-                changeTableFont = id; 
+                changeGroupTableFont = id; 
+                changeMainTableFont = id; 
                 clearQuickSearch = id; 
                 columnsMenuAddTableColumn = id; 
                 columnsMenuSelectTableColumn = id; 

Modified: trunk/bibdesk/English.lproj/BibDocument.nib/info.nib
===================================================================
--- trunk/bibdesk/English.lproj/BibDocument.nib/info.nib	2006-03-07 19:33:14 UTC (rev 5776)
+++ trunk/bibdesk/English.lproj/BibDocument.nib/info.nib	2006-03-07 20:02:20 UTC (rev 5777)
@@ -23,7 +23,7 @@
 		<key>786</key>
 		<string>21 442 178 99 0 0 1440 938 </string>
 		<key>819</key>
-		<string>24 465 179 106 0 0 1440 938 </string>
+		<string>24 465 179 137 0 0 1440 938 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>443.0</string>
@@ -34,18 +34,18 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>819</integer>
 		<integer>777</integer>
+		<integer>641</integer>
+		<integer>626</integer>
+		<integer>433</integer>
+		<integer>786</integer>
 		<integer>5</integer>
-		<integer>626</integer>
+		<integer>303</integer>
+		<integer>819</integer>
 		<integer>702</integer>
-		<integer>303</integer>
-		<integer>641</integer>
 		<integer>324</integer>
 		<integer>277</integer>
 		<integer>661</integer>
-		<integer>433</integer>
-		<integer>786</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8H14</string>

Modified: trunk/bibdesk/English.lproj/BibDocument.nib/keyedobjects.nib
===================================================================
(Binary files differ)

Modified: trunk/bibdesk/English.lproj/BibDocument.nib/objects.nib
===================================================================
(Binary files differ)

Modified: trunk/bibdesk/Info.plist
===================================================================
--- trunk/bibdesk/Info.plist	2006-03-07 19:33:14 UTC (rev 5776)
+++ trunk/bibdesk/Info.plist	2006-03-07 20:02:20 UTC (rev 5777)
@@ -462,10 +462,18 @@
 					<integer>12</integer>
 					<key>Maximum Number of Items in Preview Pane</key>
 					<integer>0</integer>
-					<key>TableView Font</key>
+					<key>BDSKMainTableViewFontNameKey</key>
 					<string>LucidaGrande</string>
-					<key>TableView Font Size</key>
+					<key>BDSKMainTableViewFontSizeKey</key>
 					<real>0.0</real>
+					<key>BDSKGroupTableViewFontNameKey</key>
+					<string>LucidaGrande</string>
+					<key>BDSKGroupTableViewFontSizeKey</key>
+					<real>0.0</real>
+					<key>BDSKPersonTableViewFontNameKey</key>
+					<string>LucidaGrande</string>
+					<key>BDSKPersonTableViewFontSizeKey</key>
+					<real>0.0</real>
 					<key>Terms ignored when sorting</key>
 					<array/>
                     <key>BDSKShouldDisplayFirstNamesKey</key>


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