diff options
| -rw-r--r-- | Source/SPConnectionController.h | 16 | ||||
| -rw-r--r-- | Source/SPConstants.h | 3 | ||||
| -rw-r--r-- | Source/SPConstants.m | 3 | ||||
| -rw-r--r-- | Source/SPDatabaseDocument.m | 3 | ||||
| -rw-r--r-- | Source/SPFieldEditorController.m | 2 |
5 files changed, 14 insertions, 13 deletions
diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h index 2fa28019..e6d933ed 100644 --- a/Source/SPConnectionController.h +++ b/Source/SPConnectionController.h @@ -49,26 +49,27 @@ @end +#endif + @interface SPConnectionController : NSObject { id <SPConnectionControllerDelegateProtocol, NSObject> delegate; SPDatabaseDocument *dbDocument; SPSSHTunnel *sshTunnel; + +#ifndef SP_REFACTOR /* ivars */ SPKeychain *keychain; +#endif MCPConnection *mySQLConnection; #ifndef SP_REFACTOR /* ivars */ NSView *databaseConnectionSuperview; NSSplitView *databaseConnectionView; - SPKeychain *keychain; NSUserDefaults *prefs; NSMutableArray *favorites; -#endif - SPSSHTunnel *sshTunnel; - MCPConnection *mySQLConnection; -#ifndef SP_REFACTOR /* ivars */ + BOOL automaticFavoriteSelection; #endif BOOL cancellingConnection; @@ -161,18 +162,13 @@ IBOutlet NSMenuItem *favoritesSortByMenuItem; BOOL isEditing; - BOOL isConnecting; - BOOL cancellingConnection; BOOL reverseFavoritesSort; #endif - BOOL mySQLConnectionCancelled; - BOOL automaticFavoriteSelection; BOOL favoriteNameFieldWasTouched; #ifndef SP_REFACTOR /* ivars */ NSImage *folderImage; - NSUserDefaults *prefs; SPTreeNode *favoritesRoot; SPFavoriteNode *currentFavorite; diff --git a/Source/SPConstants.h b/Source/SPConstants.h index 8e9c31b5..d1329758 100644 --- a/Source/SPConstants.h +++ b/Source/SPConstants.h @@ -285,6 +285,9 @@ extern NSString *SPGlobalResultTableFont; extern NSString *SPFilterTableDefaultOperator; extern NSString *SPFilterTableDefaultOperatorLastItems; +// Favorites Prefpane +extern NSString *SPFavorites; + // Notifications Prefpane extern NSString *SPGrowlEnabled; extern NSString *SPShowNoAffectedRowsError; diff --git a/Source/SPConstants.m b/Source/SPConstants.m index 31ac3806..d1b4bc45 100644 --- a/Source/SPConstants.m +++ b/Source/SPConstants.m @@ -91,6 +91,9 @@ NSString *SPGlobalResultTableFont = @"GlobalResultTableFont"; NSString *SPFilterTableDefaultOperator = @"FilterTableDefaultOperator"; NSString *SPFilterTableDefaultOperatorLastItems = @"FilterTableDefaultOperatorLastItems"; +// Favorites Prefpane +NSString *SPFavorites = @"favorites"; + // Notifications Prefpane NSString *SPGrowlEnabled = @"GrowlEnabled"; NSString *SPShowNoAffectedRowsError = @"ShowNoAffectedRowsError"; diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m index 8c05daa0..d8eaa100 100644 --- a/Source/SPDatabaseDocument.m +++ b/Source/SPDatabaseDocument.m @@ -70,6 +70,7 @@ #ifndef SP_REFACTOR /* headers */ #import "SPBundleHTMLOutputController.h" #import "SPConnectionDelegate.h" +#import "SPConnectionHandler.h" #endif #ifdef SP_REFACTOR /* headers */ @@ -3866,7 +3867,6 @@ */ - (void)parentTabDidClose { - // Cancel autocompletion trigger if([prefs boolForKey:SPCustomQueryAutoComplete]) [NSObject cancelPreviousPerformRequestsWithTarget:[customQueryInstance valueForKeyPath:@"textView"] @@ -3885,7 +3885,6 @@ [createTableSyntaxWindow orderOut:nil]; [[NSNotificationCenter defaultCenter] removeObserver:self]; [self setParentWindow:nil]; - } /** diff --git a/Source/SPFieldEditorController.m b/Source/SPFieldEditorController.m index 52a90fcd..bf48ec80 100644 --- a/Source/SPFieldEditorController.m +++ b/Source/SPFieldEditorController.m @@ -571,7 +571,7 @@ // and suppress closing the sheet if(sender == editSheetOkButton) { if (maxTextLength > 0 && [[editTextView textStorage] length] > maxTextLength && ![[[editTextView textStorage] string] isEqualToString:[prefs objectForKey:SPNullValue]]) { - [editTextView setSelectedRange:NSMakeRange(maxTextLength, [[editTextView textStorage] length] - maxTextLength)]; + [editTextView setSelectedRange:NSMakeRange((NSUInteger)maxTextLength, [[editTextView textStorage] length] - (NSUInteger)maxTextLength)]; [editTextView scrollRangeToVisible:NSMakeRange([editTextView selectedRange].location,0)]; [SPTooltip showWithObject:[NSString stringWithFormat:NSLocalizedString(@"Text is too long. Maximum text length is set to %llu.", @"Text is too long. Maximum text length is set to %llu."), maxTextLength]]; return; |