From fb4e3024ae282b557eef755b974c3e081dac0f3e Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Sun, 7 Mar 2010 16:39:32 +0000 Subject: Add a hidden preference to display or hide the MySQL server version in the window title. --- Resources/PreferenceDefaults.plist | 2 ++ Source/SPConstants.h | 1 + Source/SPConstants.m | 1 + Source/TableDocument.m | 4 ++-- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Resources/PreferenceDefaults.plist b/Resources/PreferenceDefaults.plist index 52abb689..dd4a8a59 100644 --- a/Resources/PreferenceDefaults.plist +++ b/Resources/PreferenceDefaults.plist @@ -143,5 +143,7 @@ CSVFieldImportMappingAlignment 2 + DisplayServerVersionInWindowTitle + diff --git a/Source/SPConstants.h b/Source/SPConstants.h index 07132538..12f2a38f 100644 --- a/Source/SPConstants.h +++ b/Source/SPConstants.h @@ -84,6 +84,7 @@ extern NSString *SPDefaultEncoding; extern NSString *SPUseMonospacedFonts; extern NSString *SPDisplayTableViewVerticalGridlines; extern NSString *SPCustomQueryMaxHistoryItems; +extern NSString *SPDisplayServerVersionInWindowTitle; // Tables Prefpane extern NSString *SPReloadAfterAddingRow; diff --git a/Source/SPConstants.m b/Source/SPConstants.m index c3d45b0a..bea60f8b 100644 --- a/Source/SPConstants.m +++ b/Source/SPConstants.m @@ -52,6 +52,7 @@ NSString *SPDefaultEncoding = @"DefaultEncoding"; NSString *SPUseMonospacedFonts = @"UseMonospacedFonts"; NSString *SPDisplayTableViewVerticalGridlines = @"DisplayTableViewVerticalGridlines"; NSString *SPCustomQueryMaxHistoryItems = @"CustomQueryMaxHistoryItems"; +NSString *SPDisplayServerVersionInWindowTitle = @"DisplayServerVersionInWindowTitle"; // Tables Prefpane NSString *SPReloadAfterAddingRow = @"ReloadAfterAddingRow"; diff --git a/Source/TableDocument.m b/Source/TableDocument.m index 689ee253..c74264c4 100644 --- a/Source/TableDocument.m +++ b/Source/TableDocument.m @@ -3753,9 +3753,9 @@ } - return [NSString stringWithFormat:@"%@(MySQL %@) %@%@%@", + return [NSString stringWithFormat:@"%@%@ %@%@%@", ([[[self fileURL] path] length] && ![self isUntitled]) ? [NSString stringWithFormat:@"%@ — ",[self displayName]] : @"", - mySQLVersion, + ([prefs boolForKey:SPDisplayServerVersionInWindowTitle]) ? [NSString stringWithFormat:@"(MySQL %@)", mySQLVersion] : @"", [self name], ([self database]?[NSString stringWithFormat:@"/%@",[self database]]:@""), ([[self table] length]?[NSString stringWithFormat:@"/%@",[self table]]:@"")]; -- cgit v1.2.3