aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPEditorPreferencePane.m
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2011-03-07 20:12:52 +0000
committerstuconnolly <stuart02@gmail.com>2011-03-07 20:12:52 +0000
commit1e5288e9840e201a00bcb5ca3035d7aa807f1f8d (patch)
tree0c1a47953f57b71c41cc7a63e156629c6c9d645b /Source/SPEditorPreferencePane.m
parent915a3831525bf3a9350648d82f86dd54ae366292 (diff)
downloadsequelpro-1e5288e9840e201a00bcb5ca3035d7aa807f1f8d.tar.gz
sequelpro-1e5288e9840e201a00bcb5ca3035d7aa807f1f8d.tar.bz2
sequelpro-1e5288e9840e201a00bcb5ca3035d7aa807f1f8d.zip
Bring outline view branch up to date with trunk (r3203:r3224).
Diffstat (limited to 'Source/SPEditorPreferencePane.m')
-rw-r--r--Source/SPEditorPreferencePane.m26
1 files changed, 11 insertions, 15 deletions
diff --git a/Source/SPEditorPreferencePane.m b/Source/SPEditorPreferencePane.m
index 50388e8a..0cae1217 100644
--- a/Source/SPEditorPreferencePane.m
+++ b/Source/SPEditorPreferencePane.m
@@ -30,14 +30,14 @@
#import "SPCategoryAdditions.h"
// Constants
-static const NSString *SPImportColorScheme = @"ImportColorScheme";
-static const NSString *SPExportColorScheme = @"ExportColorScheme";
-static const NSString *SPSaveColorScheme = @"SaveColorScheme";
-static const NSString *SPDefaultColorSchemeName = @"Default";
-static const NSString *SPDefaultColorSchemeNameLC = @"default";
-static const NSString *SPCustomColorSchemeName = @"User-defined";
-static const NSString *SPCustomColorSchemeNameLC = @"user-defined";
-static const NSString *SPDefaultExportColourSchemeName = @"MyTheme";
+static NSString *SPImportColorScheme = @"ImportColorScheme";
+static NSString *SPExportColorScheme = @"ExportColorScheme";
+static NSString *SPSaveColorScheme = @"SaveColorScheme";
+static NSString *SPDefaultColorSchemeName = @"Default";
+static NSString *SPDefaultColorSchemeNameLC = @"default";
+static NSString *SPCustomColorSchemeName = @"User-defined";
+static NSString *SPCustomColorSchemeNameLC = @"user-defined";
+static NSString *SPDefaultExportColourSchemeName = @"MyTheme";
@interface SPEditorPreferencePane (PrivateAPI)
@@ -517,7 +517,7 @@ static const NSString *SPDefaultExportColourSchemeName = @"MyTheme";
}
}
-- (void)panelDidEnd:(NSSavePanel *)panel returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo
+- (void)panelDidEnd:(NSOpenPanel *)panel returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo
{
if ([contextInfo isEqualToString:SPExportColorScheme]) {
if (returnCode == NSOKButton) {
@@ -546,7 +546,7 @@ static const NSString *SPDefaultExportColourSchemeName = @"MyTheme";
return [editThemeListItems count];
}
- return nil;
+ return 0;
}
- (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex
@@ -806,11 +806,7 @@ static const NSString *SPDefaultExportColourSchemeName = @"MyTheme";
NSMutableDictionary *scheme = [NSMutableDictionary dictionary];
NSMutableDictionary *mainsettings = [NSMutableDictionary dictionary];
NSMutableArray *settings = [NSMutableArray array];
-
- CGFloat red, green, blue, alpha;
- NSInteger redInt, greenInt, blueInt, alphaInt;
- NSString *redHexValue, *greenHexValue, *blueHexValue, *alphaHexValue;
-
+
[prefs synchronize];
NSColor *aColor = [NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:SPCustomQueryEditorBackgroundColor]];