• simplified and unified the issue to set the title of a tableWindow

- everything will be configured in [TableDocument displayName]
- to update the title call [TableDocument setTitle:[TableDocument displayName]]
- this removes dozens of lines
• first steps to support more the document-based approach
( a document is nothing else than a connection with view properties and preferences )
- renamed/added/changed in Main Menu items into "New", "Open", "Save", and "Save As"
- if user opened a spf file -> fileURL will be set
- "Save" will save the current connection/view data according to the "Save As" setting - ie if one saved a doc with do not "Remember window state" - "Save" won't save the window state; to enable this hit "Save As" [this works for encrypted file data as well]
- if the current doc was opened from file and the user closes it or quits the entire app all connection/document-based preferences (up to now query favs and history) will be updated silently [not yet implemented fully in CustomQuery] [works for encrypted file as well]
• delete saveSPFAccessory view from DBView since it was outsourced
• fixed some issues for the NSSecureTextField in the Save accessory panel (but still a warning appears)

1 files changed, 17 insertions, 11 deletions

diff --git a/Source/CustomQuery.h b/Source/CustomQuery.h
index 0e6d2bc6..e6c9ad43 100644
--- a/Source/CustomQuery.h
+++ b/Source/CustomQuery.h
@@ -36,10 +36,10 @@
 @class SPQueryFavoriteManager;
 
 @interface CustomQuery : NSObject 
-{	
+{
 	IBOutlet id tableDocumentInstance;
 	IBOutlet id tableWindow;
-	
+
 	IBOutlet id queryFavoritesButton;
 	IBOutlet NSMenuItem *queryFavoritesSearchMenuItem;
 	IBOutlet NSMenuItem *queryFavoritesSaveAsMenuItem;
@@ -49,7 +49,7 @@
 	IBOutlet NSMenuItem *queryHistorySearchMenuItem;
 	IBOutlet id queryHistorySearchFieldView;
 	IBOutlet NSSearchField *queryHistorySearchField;
-	
+
 	IBOutlet CMTextView *textView;
 	IBOutlet CMCopyTable *customQueryView;
 	IBOutlet id errorText;
@@ -76,43 +76,47 @@
 	IBOutlet NSWindow *queryFavoritesSheet;
 	IBOutlet NSButton *saveQueryFavoriteButton;
 	IBOutlet NSTextField *queryFavoriteNameTextField;
-	
+
 	IBOutlet NSWindow *helpWebViewWindow;
 	IBOutlet WebView *helpWebView;
 	IBOutlet NSSearchField *helpSearchField;
 	IBOutlet NSSearchFieldCell *helpSearchFieldCell;
 	IBOutlet NSSegmentedControl *helpNavigator;
 	IBOutlet NSSegmentedControl *helpTargetSelector;
-	
+
 	SPQueryFavoriteManager *favoritesManager;
 
 	NSUserDefaults *prefs;
 	MCPConnection *mySQLConnection;
-	
+
 	NSString *usedQuery;
 	NSRange currentQueryRange;
 	NSArray *currentQueryRanges;
 	BOOL hasBackgroundAttribute;
 	NSString *mySQLversion;
-		
+
 	int queryStartPosition;
-	
+
 	int helpTarget;
 	WebHistory *helpHistory;
 	NSString *helpHTMLTemplate;
-	
+
 	NSMutableArray *fullResult;
 	NSArray *cqColumnDefinition;
 	NSString *lastExecutedQuery;
-	
+
 	BOOL tableReloadAfterEditing;
 	BOOL queryIsTableSorter;
 	BOOL isDesc;
 	NSNumber *sortField;
 
 	NSString *fieldIDQueryString;
-	
+
 	unsigned int numberOfQueries;
+	
+	NSMutableArray *localFavorites;
+	NSMutableArray *localHistoryItems;
+
 }
 
 // IBAction methods
@@ -143,6 +147,8 @@
 // Accessors
 - (NSArray *)currentResult;
 - (void)processResultIntoDataStorage:(MCPStreamingResult *)theResult;
+- (NSArray *)localFavorites;
+- (NSArray *)localHistoryItems;
 
 // MySQL Help
 - (NSString *)getHTMLformattedMySQLHelpFor:(NSString *)aString;