Fix #2457: Use system font as default for table content, not Lucida G…

…rande.
sequelpro · Jan 7, 2017 · fb15b94 · fb15b94
1 parent 29aad59
commit fb15b94
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/Resources/Plists/PreferenceDefaults.plist b/Resources/Plists/PreferenceDefaults.plist
@@ -127,8 +127,6 @@
 	<false/>
 	<key>FilterTableDefaultOperator</key>
 	<string>LIKE &apos;%@%&apos;</string>
-	<key>GlobalResultTableFont</key>
-	<data>BAtzdHJlYW10eXBlZIHoA4QBQISEhAZOU0ZvbnQehIQITlNPYmplY3QAhYQBaSSEBVszNmNdBgAAABoAAAD//kwAdQBjAGkAZABhAEcAcgBhAG4AZABlAAAAhAFmC4QBYwCYAZgAmACG</data>
 	<key>GrowlEnabled</key>
 	<true/>
 	<key>KeepAliveInterval</key>

diff --git a/Source/SPAppController.m b/Source/SPAppController.m
@@ -104,8 +104,16 @@ - (id)init
  */
 + (void)initialize
 {
+	NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
+
+	NSMutableDictionary *preferenceDefaults = [NSMutableDictionary dictionaryWithContentsOfFile:[[NSBundle mainBundle] pathForResource:SPPreferenceDefaultsFile ofType:@"plist"]];
+
+	if (![prefs objectForKey:SPGlobalResultTableFont]) {
+		[preferenceDefaults setObject:[NSArchiver archivedDataWithRootObject:[NSFont systemFontOfSize:11]] forKey:SPGlobalResultTableFont];
+	}
+
 	// Register application defaults
-	[[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"PreferenceDefaults" ofType:@"plist"]]];
+	[prefs registerDefaults:preferenceDefaults];
 
 	// Upgrade prefs before any other parts of the app pick up on the values
 	SPApplyRevisionChanges();

diff --git a/Source/SPConstants.h b/Source/SPConstants.h
@@ -274,6 +274,7 @@ extern NSString *SPFavoritesDataFile;
 extern NSString *SPHTMLPrintTemplate;
 extern NSString *SPHTMLTableInfoPrintTemplate;
 extern NSString *SPHTMLHelpTemplate;
+extern NSString *SPPreferenceDefaultsFile;
 
 // SPF file types
 extern NSString *SPFExportSettingsContentType;

diff --git a/Source/SPConstants.m b/Source/SPConstants.m
@@ -67,6 +67,7 @@
 NSString *SPHTMLPrintTemplate                    = @"SPPrintTemplate";
 NSString *SPHTMLTableInfoPrintTemplate           = @"SPTableInfoPrintTemplate";
 NSString *SPHTMLHelpTemplate                     = @"SPMySQLHelpTemplate";
+NSString *SPPreferenceDefaultsFile               = @"PreferenceDefaults";
 
 // Folder names
 NSString *SPThemesSupportFolder                  = @"Themes";

diff --git a/Source/SPTablesPreferencePane.m b/Source/SPTablesPreferencePane.m
@@ -54,10 +54,8 @@ - (IBAction)showGlobalResultTableFontPanel:(id)sender
  * Updates the displayed font according to the user's preferences.
  */
 - (void)updateDisplayedTableFontName
-{
-	NSFont *font = [NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:SPGlobalResultTableFont]];
-
-	[globalResultTableFontName setFont:font];
+{	
+	[globalResultTableFontName setFont:[NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:SPGlobalResultTableFont]]];
 }
 
 #pragma mark -