From f0d8ef187a76e01d1dad3b576b302f9ed445f363 Mon Sep 17 00:00:00 2001 From: Marius Ursache Date: Mon, 11 Nov 2013 20:54:44 +1100 Subject: Updated Save Create Syntax panel sheet to 10.6+ SDK --- Source/SPDatabaseDocument.m | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m index 05c25e92..6a3e4151 100644 --- a/Source/SPDatabaseDocument.m +++ b/Source/SPDatabaseDocument.m @@ -2305,7 +2305,18 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase"; [panel setAllowsOtherFileTypes:YES]; [panel setCanSelectHiddenExtension:YES]; - [panel beginSheetForDirectory:nil file:@"CreateSyntax" modalForWindow:createTableSyntaxWindow modalDelegate:self didEndSelector:@selector(savePanelDidEnd:returnCode:contextInfo:) contextInfo:SPCreateSyntx]; + [panel setNameFieldStringValue:[NSString stringWithFormat:@"CreateSyntax-%@", [self table]]]; + [panel beginSheetModalForWindow:createTableSyntaxWindow completionHandler:^(NSInteger returnCode) { + if (returnCode == NSOKButton) { + NSString *createSyntax = [createTableSyntaxTextView string]; + + if ([createSyntax length] > 0) { + NSString *output = [NSString stringWithFormat:@"-- %@ '%@'\n\n%@\n", NSLocalizedString(@"Create syntax for", @"create syntax for table comment"), [self table], createSyntax]; + + [output writeToURL:[panel URL] atomically:YES encoding:NSUTF8StringEncoding error:NULL]; + } + } + }]; } /** @@ -3685,27 +3696,6 @@ static NSString *SPAlterDatabaseAction = @"SPAlterDatabase"; #endif } -/** - * Called when the NSSavePanel sheet ends. Writes the server variables to the selected file if required. - */ -- (void)savePanelDidEnd:(NSSavePanel *)sheet returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo -{ -#ifndef SP_CODA - if (returnCode == NSOKButton) { - if ([contextInfo isEqualToString:SPCreateSyntx]) { - - NSString *createSyntax = [createTableSyntaxTextView string]; - - if ([createSyntax length] > 0) { - NSString *output = [NSString stringWithFormat:@"-- %@ '%@'\n\n%@\n", NSLocalizedString(@"Create syntax for", @"create syntax for table comment"), [self table], createSyntax]; - - [output writeToURL:[sheet URL] atomically:YES encoding:NSUTF8StringEncoding error:NULL]; - } - } - } -#endif -} - /** * Return the createTableSyntaxWindow */ -- cgit v1.2.3