aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPPreferenceController.m
diff options
context:
space:
mode:
Diffstat (limited to 'Source/SPPreferenceController.m')
-rw-r--r--Source/SPPreferenceController.m53
1 files changed, 13 insertions, 40 deletions
diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m
index 3a67ae80..fad1d95b 100644
--- a/Source/SPPreferenceController.m
+++ b/Source/SPPreferenceController.m
@@ -68,8 +68,6 @@
{
[self _setupToolbar];
- [(SPGeneralPreferencePane *)generalPreferencePane updateDefaultFavoritePopup];
-
preferencePanes = [[NSArray alloc] initWithObjects:
generalPreferencePane,
tablesPreferencePane,
@@ -105,40 +103,9 @@
[toolbar setSelectedItemIdentifier:[preferencePane preferencePaneIdentifier]];
- [self _resizeWindowForContentView:[preferencePane preferencePaneView]];
-}
-
-/**
- * Displays the table preferences pane.
- */
-- (IBAction)displayTablePreferences:(id)sender
-{
- [[self window] setMinSize:NSMakeSize(0, 0)];
- [[self window] setShowsResizeIndicator:[tablesPreferencePane preferencePaneAllowsResizing]];
-
- [toolbar setSelectedItemIdentifier:[tablesPreferencePane preferencePaneIdentifier]];
+ [preferencePane preferencePaneWillBeShown];
- [(SPTablesPreferencePane *)tablesPreferencePane updateDisplayedTableFontName];
-
- [self _resizeWindowForContentView:[tablesPreferencePane preferencePaneView]];
-}
-
-/**
- * Displays the editor preferences pane.
- */
-- (IBAction)displayEditorPreferences:(id)sender
-{
- [(SPEditorPreferencePane *)editorPreferencePane updateColorSchemeSelectionMenu];
- [(SPEditorPreferencePane *)editorPreferencePane updateDisplayColorThemeName];
-
- [[self window] setMinSize:NSMakeSize(0, 0)];
- [[self window] setShowsResizeIndicator:[editorPreferencePane preferencePaneAllowsResizing]];
-
- [toolbar setSelectedItemIdentifier:[editorPreferencePane preferencePaneIdentifier]];
-
- [(SPEditorPreferencePane *)editorPreferencePane updateDisplayedEditorFontName];
-
- [self _resizeWindowForContentView:[editorPreferencePane preferencePaneView]];
+ [self _resizeWindowForContentView:[preferencePane preferencePaneView]];
}
#pragma mark -
@@ -161,14 +128,14 @@
[prefs setObject:[NSArchiver archivedDataWithRootObject:font] forKey:SPGlobalResultTableFont];
- [(SPTablesPreferencePane *)tablesPreferencePane updateDisplayedTableFontName];
+ [tablesPreferencePane updateDisplayedTableFontName];
break;
case SPPrefFontChangeTargetEditor:
font = [[NSFontPanel sharedFontPanel] panelConvertFont:[NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:SPCustomQueryEditorFont]]];
[prefs setObject:[NSArchiver archivedDataWithRootObject:font] forKey:SPCustomQueryEditorFont];
- [(SPEditorPreferencePane *)editorPreferencePane updateDisplayedEditorFontName];
+ [editorPreferencePane updateDisplayedEditorFontName];
break;
}
}
@@ -198,7 +165,7 @@
[tablesItem setLabel:[tablesPreferencePane preferencePaneName]];
[tablesItem setImage:[tablesPreferencePane preferencePaneIcon]];
[tablesItem setTarget:self];
- [tablesItem setAction:@selector(displayTablePreferences:)];
+ [tablesItem setAction:@selector(displayPreferencePane:)];
// Notification preferences
notificationsItem = [[NSToolbarItem alloc] initWithItemIdentifier:[notificationsPreferencePane preferencePaneIdentifier]];
@@ -214,7 +181,7 @@
[editorItem setLabel:[editorPreferencePane preferencePaneName]];
[editorItem setImage:[editorPreferencePane preferencePaneIcon]];
[editorItem setTarget:self];
- [editorItem setAction:@selector(displayEditorPreferences:)];
+ [editorItem setAction:@selector(displayPreferencePane:)];
// AutoUpdate preferences
autoUpdateItem = [[NSToolbarItem alloc] initWithItemIdentifier:[autoUpdatePreferencePane preferencePaneIdentifier]];
@@ -263,7 +230,13 @@
- (void)dealloc
{
- [preferencePanes release], preferencePanes = nil;
+ SPClear(preferencePanes);
+ SPClear(generalItem);
+ SPClear(tablesItem);
+ SPClear(notificationsItem);
+ SPClear(editorItem);
+ SPClear(autoUpdateItem);
+ SPClear(networkItem);
[super dealloc];
}