- part 4 of merge from 'avenjamin' branch into trunk.

- committing Source

1 files changed, 9 insertions, 43 deletions

diff --git a/Source/MainController.h b/Source/MainController.h
index b47bb457..656cf8c0 100644
--- a/Source/MainController.h
+++ b/Source/MainController.h
@@ -24,63 +24,29 @@
 
 #import <Cocoa/Cocoa.h>
 
+@class SPPreferenceController;
+
 @interface MainController : NSObject 
 {
-	IBOutlet id keyChainInstance;
-
-	IBOutlet id preferencesWindow;
-	IBOutlet id favoriteSheet;
-	IBOutlet id reloadAfterAddingSwitch;
-	IBOutlet id reloadAfterEditingSwitch;
-	IBOutlet id reloadAfterRemovingSwitch;
-	IBOutlet id showErrorSwitch;
-	IBOutlet id dontShowBlobSwitch;
-	IBOutlet id useMonospacedFontsSwitch;
-	IBOutlet id fetchRowCountSwitch;
-	IBOutlet id limitRowsSwitch;
-	IBOutlet id limitRowsField;
-	IBOutlet id nullValueField;
-	IBOutlet id tableView;
-	IBOutlet id nameField;
-	IBOutlet id hostField;
-	IBOutlet id socketField;
-	IBOutlet id userField;
-	IBOutlet id passwordField;
-	IBOutlet id portField;
-	IBOutlet id databaseField;
-	IBOutlet id sshCheckbox;
-	IBOutlet id sshUserField;
-	IBOutlet id sshPasswordField;
-	IBOutlet id sshHostField;
-	IBOutlet id sshPortField;
-	IBOutlet id encodingPopUpButton;
-
+	BOOL isNewFavorite;
+	
 	NSMutableArray *favorites;
-	NSUserDefaults *prefs;
 	
-	BOOL isNewFavorite;
+	SPPreferenceController *prefsController;
 }
 
-//IBAction methods
+// IBAction methods
 - (IBAction)openPreferences:(id)sender;
-- (IBAction)addFavorite:(id)sender;
-- (IBAction)removeFavorite:(id)sender;
-- (IBAction)copyFavorite:(id)sender;
-- (IBAction)chooseLimitRows:(id)sender;
-- (IBAction)closeFavoriteSheet:(id)sender;
-- (IBAction)toggleUseSSH:(id)sender;
 
-//services menu methods
+// Services menu methods
 - (void)doPerformQueryService:(NSPasteboard *)pboard userData:(NSString *)data error:(NSString **)error;
 
-//menu methods
+// Menu methods
 - (IBAction)donate:(id)sender;
 - (IBAction)visitWebsite:(id)sender;
 - (IBAction)visitHelpWebsite:(id)sender;
-- (IBAction)checkForUpdates:(id)sender;
 
-//SSHTunnel methods
-- (id)authenticate:(NSScriptCommand *)command;
+// Other
 - (id)handleQuitScriptCommand:(NSScriptCommand *)command;
 
 @end