From 905dd61bd91f3dce22655bf942302739544dd86c Mon Sep 17 00:00:00 2001 From: Bibiko Date: Thu, 4 Jun 2009 20:19:59 +0000 Subject: =?UTF-8?q?=E2=80=A2=20added:=20the=20"Show=20Create=20Syntax"=20w?= =?UTF-8?q?indow=20now=20follows=20the=20selection=20in=20the=20table=20li?= =?UTF-8?q?st=20if=20it=20was=20already=20opened=20=E2=80=A2=20commented?= =?UTF-8?q?=20out=20the=20NSLog=20"not=20parsed"=20in=20SPTableData.m?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/SPTableData.m | 2 +- Source/TableDocument.h | 1 + Source/TableDocument.m | 16 ++++++++++++++-- Source/TablesList.m | 6 ++++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/Source/SPTableData.m b/Source/SPTableData.m index e1467c2d..ebb03a71 100644 --- a/Source/SPTableData.m +++ b/Source/SPTableData.m @@ -487,7 +487,7 @@ } // who knows else { - NSLog( @"not parsed: %@", [parts objectAtIndex:0] ); + // NSLog( @"not parsed: %@", [parts objectAtIndex:0] ); } } } diff --git a/Source/TableDocument.h b/Source/TableDocument.h index c996a0bd..f492a3bc 100644 --- a/Source/TableDocument.h +++ b/Source/TableDocument.h @@ -183,6 +183,7 @@ - (void)flushPrivileges:(id)sender; - (void)showVariables:(id)sender; - (void)closeConnection; +- (NSWindow *)getCreateTableSyntaxWindow; //getter methods - (NSString *)name; diff --git a/Source/TableDocument.m b/Source/TableDocument.m index ca89d597..28e898a5 100644 --- a/Source/TableDocument.m +++ b/Source/TableDocument.m @@ -1177,13 +1177,17 @@ NSString *TableDocumentFavoritesControllerSelectionIndexDidChange = @"TableDocum if ([tableSyntax isKindOfClass:[NSData class]]) tableSyntax = [[NSString alloc] initWithData:tableSyntax encoding:[mySQLConnection encoding]]; + [syntaxViewContent setEditable:YES]; if([tablesListInstance tableType] == SP_TABLETYPE_VIEW) [syntaxViewContent setString:[tableSyntax createViewSyntaxPrettifier]]; else [syntaxViewContent setString:tableSyntax]; - + [syntaxViewContent setEditable:NO]; + [createTableSyntaxWindow setTitle:createWindowTitle]; - [createTableSyntaxWindow makeKeyAndOrderFront:self]; + + if(![createTableSyntaxWindow isVisible]) + [createTableSyntaxWindow makeKeyAndOrderFront:self]; } /** @@ -1923,6 +1927,14 @@ NSString *TableDocumentFavoritesControllerSelectionIndexDidChange = @"TableDocum } } +/* + * Return the createTableSyntaxWindow + */ +- (NSWindow *)getCreateTableSyntaxWindow +{ + return createTableSyntaxWindow; +} + #pragma mark Toolbar Methods /** diff --git a/Source/TablesList.m b/Source/TablesList.m index fa4db07a..716727d8 100644 --- a/Source/TablesList.m +++ b/Source/TablesList.m @@ -1226,6 +1226,12 @@ // set window title [tableWindow setTitle:[NSString stringWithFormat:@"(MySQL %@) %@/%@/%@", [tableDocumentInstance mySQLVersion], [tableDocumentInstance name], [tableDocumentInstance database], [tables objectAtIndex:[tablesListView selectedRow]]]]; + + // Update the "Show Create Syntax" window if it's already opened + // according to the selected table/view/proc/func + if([[tableDocumentInstance getCreateTableSyntaxWindow] isVisible]) + [tableDocumentInstance showCreateTableSyntax:self]; + } else { [tableSourceInstance loadTable:nil]; [tableContentInstance loadTable:nil]; -- cgit v1.2.3