diff options
| author | stuconnolly <stuart02@gmail.com> | 2011-03-08 20:41:11 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2011-03-08 20:41:11 +0000 |
| commit | 4a950f357fb29640b2732ca34c80f81c0b23fbe6 (patch) | |
| tree | 8dab179aa98c223a9791889846032c0e960636b4 /Source/SPDatabaseDocument.h | |
| parent | 2baa01621f83df3c81e6b6ed2310d483962dcf48 (diff) | |
| download | sequelpro-4a950f357fb29640b2732ca34c80f81c0b23fbe6.tar.gz sequelpro-4a950f357fb29640b2732ca34c80f81c0b23fbe6.tar.bz2 sequelpro-4a950f357fb29640b2732ca34c80f81c0b23fbe6.zip | |
Bring outline view branch up to date with trunk (r3227:r3233).
Diffstat (limited to 'Source/SPDatabaseDocument.h')
| -rw-r--r-- | Source/SPDatabaseDocument.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Source/SPDatabaseDocument.h b/Source/SPDatabaseDocument.h index efc3f25e..2b7fb38a 100644 --- a/Source/SPDatabaseDocument.h +++ b/Source/SPDatabaseDocument.h @@ -40,7 +40,7 @@ /** * The SPDatabaseDocument class controls the primary database view window. */ -@interface SPDatabaseDocument : NSObject <NSUserInterfaceValidations, SPConnectionControllerDelegateProtocol> +@interface SPDatabaseDocument : NSObject <SPConnectionControllerDelegateProtocol> { // IBOutlets IBOutlet id tablesListInstance; @@ -121,12 +121,12 @@ IBOutlet NSWindow *connectionErrorDialog; IBOutlet id saveConnectionAccessory; - IBOutlet id saveConnectionIncludeData; - IBOutlet id saveConnectionIncludeQuery; - IBOutlet id saveConnectionSavePassword; + IBOutlet NSButton *saveConnectionIncludeData; + IBOutlet NSButton *saveConnectionIncludeQuery; + IBOutlet NSButton *saveConnectionSavePassword; IBOutlet id saveConnectionSavePasswordAlert; - IBOutlet id saveConnectionEncrypt; - IBOutlet id saveConnectionAutoConnect; + IBOutlet NSButton *saveConnectionEncrypt; + IBOutlet NSButton *saveConnectionAutoConnect; IBOutlet NSSecureTextField *saveConnectionEncryptString; IBOutlet id inputTextWindow; @@ -145,7 +145,7 @@ NSInteger currentTabIndex; NSString *selectedTableName; - NSInteger selectedTableType; + SPTableType selectedTableType; BOOL structureLoaded; BOOL contentLoaded; @@ -303,6 +303,7 @@ - (IBAction)closePasswordSheet:(id)sender; - (IBAction)backForwardInHistory:(id)sender; - (IBAction)showUserManager:(id)sender; +- (void)userManagerSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void*)context; - (IBAction)copyChecksumFromSheet:(id)sender; - (void)setIsSavedInBundle:(BOOL)savedInBundle; - (void)setFileURL:(NSURL *)fileURL; @@ -366,7 +367,6 @@ - (NSWindow *)parentWindow; // Scripting -- (NSString*)doSQLSyntaxHighlightForString:(NSString*)sqlText cssLike:(BOOL)cssLike; - (void)handleSchemeCommand:(NSDictionary*)commandDict; - (void)registerActivity:(NSDictionary*)commandDict; - (void)removeRegisteredActivity:(NSInteger)pid; @@ -378,5 +378,6 @@ - (NSDictionary *) stateIncludingDetails:(NSDictionary *)detailsToReturn; - (BOOL)setState:(NSDictionary *)stateDetails; - (void)setStateFromConnectionFile:(NSString *)path; +- (void)restoreSession; @end |