• 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, 10 insertions, 13 deletions

diff --git a/Source/TablesList.m b/Source/TablesList.m
index 6e34c295..ef308ae7 100644
--- a/Source/TablesList.m
+++ b/Source/TablesList.m
@@ -783,9 +783,9 @@
 			[removeTableContextMenuItem setTitle:NSLocalizedString(@"Remove Function", @"remove func menu title")];
 
 		}
+
 		// set window title
-		[tableWindow setTitle:[NSString stringWithFormat:@"(MySQL %@) %@/%@/%@", [tableDocumentInstance mySQLVersion],
-									[tableDocumentInstance name], [tableDocumentInstance database], selectedTableName]];
+		[tableWindow setTitle:[tableDocumentInstance displayName]];
 
 		// Update the "Show Create Syntax" window if it's already opened
 		// according to the selected table/view/proc/func
@@ -874,8 +874,8 @@
 		[separatorTableContextMenuItem setHidden:YES];
 
 		// set window title
-		[tableWindow setTitle:[NSString stringWithFormat:@"(MySQL %@) %@/%@", [tableDocumentInstance mySQLVersion],
-									[tableDocumentInstance name], [tableDocumentInstance database]]];
+		[tableWindow setTitle:[tableDocumentInstance displayName]];
+
 	}
 
 	[spHistoryControllerInstance updateHistoryEntries];
@@ -1207,8 +1207,8 @@
 			}
 			
 			// Set window title
-			[tableWindow setTitle:[NSString stringWithFormat:@"(MySQL %@) %@/%@/%@", [tableDocumentInstance mySQLVersion],
-								  [tableDocumentInstance name], [tableDocumentInstance database], anObject]];
+			[tableWindow setTitle:[tableDocumentInstance displayName]];
+
 		} 
 		else {
 			// Error while renaming
@@ -1665,8 +1665,7 @@
 	[tablesListView reloadData];
 	
 	// set window title
-	[tableWindow setTitle:[NSString stringWithFormat:@"(MySQL %@) %@/%@", [tableDocumentInstance mySQLVersion],
-						   [tableDocumentInstance name], [tableDocumentInstance database]]];
+	[tableWindow setTitle:[tableDocumentInstance displayName]];
 	
 	if ( error ) {
 		NSBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, tableWindow, self, nil, nil, nil,
@@ -1774,7 +1773,7 @@
 		else if (selectedIndex == 3) {
 			[extendedTableInfoInstance loadTable:tableName];
 			structureLoaded = NO;
-			contentLoaded = NO; 			
+			contentLoaded = NO;
 			statusLoaded = YES;
 		} 
 		else {
@@ -1784,8 +1783,7 @@
 		}
 		
 		// Set window title
-		[tableWindow setTitle:[NSString stringWithFormat:@"(MySQL %@) %@/%@/%@", [tableDocumentInstance mySQLVersion],
-							   [tableDocumentInstance name], [tableDocumentInstance database], tableName]];
+		[tableWindow setTitle:[tableDocumentInstance displayName]];
 	} 
 	else {
 		// Error while creating new table
@@ -2059,8 +2057,7 @@
 	}
 	
 	// Set window title
-	[tableWindow setTitle:[NSString stringWithFormat:@"(MySQL %@) %@/%@/%@", [tableDocumentInstance mySQLVersion],
-						   [tableDocumentInstance name], [tableDocumentInstance database], [tableRenameField stringValue]]];
+	[tableWindow setTitle:[tableDocumentInstance displayName]];
 }
 
 @end