From cc24661e6566d5f35e092642fe1fd435b49ad385 Mon Sep 17 00:00:00 2001 From: Bibiko Date: Thu, 24 Jun 2010 11:41:01 +0000 Subject: =?UTF-8?q?=E2=80=A2=20replaced=20@"sql"=20and=20@"spf"=20by=20the?= =?UTF-8?q?ir=20SPConstant=20definitions=20=E2=80=A2=C2=A0further=20Save?= =?UTF-8?q?=20Session=20progress=20-=20store=20"saved=20as=20session=20acc?= =?UTF-8?q?essory=20view=20data"=20globally=20to=20support=20"Save=20Sessi?= =?UTF-8?q?on"=20-=20delete=20global=20"saved=20as=20session=20accessory?= =?UTF-8?q?=20view=20data"=20if=20last=20SP=20window=20will=20be=20closed?= =?UTF-8?q?=20-=20added=20to=20info.plist=20which=20tab=20is=20currently?= =?UTF-8?q?=20selected?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/SPDatabaseDocument.m | 84 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 65 insertions(+), 19 deletions(-) (limited to 'Source/SPDatabaseDocument.m') diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m index 8857924b..85cc2bfb 100644 --- a/Source/SPDatabaseDocument.m +++ b/Source/SPDatabaseDocument.m @@ -86,6 +86,7 @@ _encoding = [[NSString alloc] initWithString:@"utf8"]; _isConnected = NO; _isWorkingLevel = 0; + _isSavedInBundle = NO; databaseListIsSelectable = YES; _queryMode = SPInterfaceQueryMode; chooseDatabaseButton = nil; @@ -2278,7 +2279,7 @@ { NSSavePanel *panel = [NSSavePanel savePanel]; - [panel setRequiredFileType:@"sql"]; + [panel setRequiredFileType:SPFileExtensionSQL]; [panel setExtensionHidden:NO]; [panel setAllowsOtherFileTypes:YES]; @@ -2486,7 +2487,7 @@ */ - (BOOL)isUntitled { - return ([self fileURL] && [[self fileURL] isFileURL]) ? NO : YES; + return (!_isSavedInBundle && [self fileURL] && [[self fileURL] isFileURL]) ? NO : YES; } /** @@ -2670,6 +2671,11 @@ return keyChainID; } +- (BOOL)isSaveInBundle +{ + return _isSavedInBundle; +} + #pragma mark - #pragma mark Notification center methods @@ -2734,7 +2740,7 @@ [panel setAccessoryView:[SPEncodingPopupAccessory encodingAccessory:[prefs integerForKey:SPLastSQLFileEncoding] includeDefaultEntry:NO encodingPopUp:&encodingPopUp]]; // [panel setMessage:NSLocalizedString(@"Save SQL file", @"Save SQL file")]; - [panel setAllowedFileTypes:[NSArray arrayWithObjects:@"sql", nil]]; + [panel setAllowedFileTypes:[NSArray arrayWithObjects:SPFileExtensionSQL, nil]]; if(![prefs stringForKey:@"lastSqlFileName"]) { [prefs setObject:@"" forKey:@"lastSqlFileName"]; [prefs synchronize]; @@ -2769,7 +2775,7 @@ } // Save current session (open connection windows as SPF file) - [panel setAllowedFileTypes:[NSArray arrayWithObjects:@"spf", nil]]; + [panel setAllowedFileTypes:[NSArray arrayWithObjects:SPFileExtensionDefault, nil]]; //Restore accessory view settings if possible if([spfDocData objectForKey:@"save_password"]) @@ -2807,6 +2813,13 @@ // Save Session or Save Session As… else if (sender == nil || [sender tag] == 1020 || [sender tag] == 1021) { + + // Save As Session + if([sender tag] == 1020 && [[NSApp delegate] sessionURL]) { + [self saveConnectionPanelDidEnd:panel returnCode:1 contextInfo:@"saveAsSession"]; + return; + } + // Load accessory nib each time. // Note that the top-level objects aren't released automatically, but are released when the panel ends. if(![NSBundle loadNibNamed:@"SaveSPFAccessory" owner:self]) { @@ -2910,12 +2923,17 @@ } // Save all open windows including all tabs as session - else if(contextInfo == @"saveSession") { + else if(contextInfo == @"saveSession" || contextInfo == @"saveAsSession") { // Sub-folder 'Contents' will contain all untitled connection as single window or tab. // info.plist will contain the opened structure (windows and tabs for each window). Each connection // is linked to a saved spf file either in 'Contents' for unTitled ones or already saved spf files. + if(contextInfo == @"saveAsSession" && [[NSApp delegate] sessionURL]) + fileName = [[[NSApp delegate] sessionURL] path]; + + if(!fileName || ![fileName length]) return; + NSFileManager *fileManager = [NSFileManager defaultManager]; // If bundle exists remove it @@ -2949,32 +2967,45 @@ // retrieve save panel data for passing them to each doc NSMutableDictionary *spfDocData_temp = [NSMutableDictionary dictionary]; - [spfDocData_temp setObject:[NSNumber numberWithBool:([saveConnectionEncrypt state]==NSOnState) ? YES : NO ] forKey:@"encrypted"]; - if([[spfDocData_temp objectForKey:@"encrypted"] boolValue]) - [spfDocData_temp setObject:[saveConnectionEncryptString stringValue] forKey:@"e_string"]; - [spfDocData_temp setObject:[NSNumber numberWithBool:([saveConnectionAutoConnect state]==NSOnState) ? YES : NO ] forKey:@"auto_connect"]; - [spfDocData_temp setObject:[NSNumber numberWithBool:([saveConnectionSavePassword state]==NSOnState) ? YES : NO ] forKey:@"save_password"]; - [spfDocData_temp setObject:[NSNumber numberWithBool:([saveConnectionIncludeData state]==NSOnState) ? YES : NO ] forKey:@"include_session"]; - [spfDocData_temp setObject:[NSNumber numberWithBool:NO] forKey:@"save_editor_content"]; - if([[[[customQueryInstance valueForKeyPath:@"textView"] textStorage] string] length]) - [spfDocData_temp setObject:[NSNumber numberWithBool:([saveConnectionIncludeQuery state]==NSOnState) ? YES : NO ] forKey:@"save_editor_content"]; + if(contextInfo == @"saveAsSession") { + [spfDocData_temp addEntriesFromDictionary:[[NSApp delegate] spfSessionDocData]]; + } else { + [spfDocData_temp setObject:[NSNumber numberWithBool:([saveConnectionEncrypt state]==NSOnState) ? YES : NO ] forKey:@"encrypted"]; + if([[spfDocData_temp objectForKey:@"encrypted"] boolValue]) + [spfDocData_temp setObject:[saveConnectionEncryptString stringValue] forKey:@"e_string"]; + [spfDocData_temp setObject:[NSNumber numberWithBool:([saveConnectionAutoConnect state]==NSOnState) ? YES : NO ] forKey:@"auto_connect"]; + [spfDocData_temp setObject:[NSNumber numberWithBool:([saveConnectionSavePassword state]==NSOnState) ? YES : NO ] forKey:@"save_password"]; + [spfDocData_temp setObject:[NSNumber numberWithBool:([saveConnectionIncludeData state]==NSOnState) ? YES : NO ] forKey:@"include_session"]; + [spfDocData_temp setObject:[NSNumber numberWithBool:NO] forKey:@"save_editor_content"]; + if([[[[customQueryInstance valueForKeyPath:@"textView"] textStorage] string] length]) + [spfDocData_temp setObject:[NSNumber numberWithBool:([saveConnectionIncludeQuery state]==NSOnState) ? YES : NO ] forKey:@"save_editor_content"]; + + // Save the session's accessory view settings + [[NSApp delegate] setSpfSessionDocData:spfDocData_temp]; + + } // Loop through all windows for(NSWindow *window in [[NSApp delegate] orderedDatabaseConnectionWindows]) { + // First window is always the currently key window + NSMutableArray *tabs = [NSMutableArray array]; NSMutableDictionary *win = [NSMutableDictionary dictionary]; // Loop through all tabs of a given window + NSInteger tabCount = 0; + NSInteger selectedTabItem = 0; for(SPDatabaseDocument *doc in [[window windowController] documents]) { NSMutableDictionary *tabData = [NSMutableDictionary dictionary]; if([doc isUntitled]) { // new bundle file name for untitled docs - NSString *newName = [NSString stringWithFormat:@"%@.spf", [NSString stringWithNewUUID]]; + NSString *newName = [NSString stringWithFormat:@"%@.%@", [NSString stringWithNewUUID], SPFileExtensionDefault]; // internal bundle path to store the doc NSString *filePath = [NSString stringWithFormat:@"%@/Contents/%@", fileName, newName]; // save it as temporary spf file inside the bundle with save panel options spfDocData_temp [doc saveDocumentWithFilePath:filePath inBackground:NO onlyPreferences:NO contextInfo:[NSDictionary dictionaryWithDictionary:spfDocData_temp]]; + [doc setIsSavedInBundle:YES]; [tabData setObject:[NSNumber numberWithBool:NO] forKey:@"isAbsolutePath"]; [tabData setObject:newName forKey:@"path"]; } else { @@ -2984,8 +3015,12 @@ [tabData setObject:[[doc fileURL] path] forKey:@"path"]; } [tabs addObject:tabData]; + if([[window windowController] selectedTableDocument] == doc) + selectedTabItem = tabCount; + tabCount++; } [win setObject:tabs forKey:@"tabs"]; + [win setObject:[NSNumber numberWithInteger:selectedTabItem] forKey:@"selectedTabIndex"]; [windows addObject:win]; } [info setObject:windows forKey:@"windows"]; @@ -3017,6 +3052,10 @@ [[NSApp delegate] setSessionURL:fileName]; + // Register spfs bundle in Recent Files + [[NSDocumentController sharedDocumentController] noteNewRecentDocumentURL:[NSURL fileURLWithPath:fileName]]; + + } } } @@ -3075,14 +3114,16 @@ if(!spf || ![spf count] || readError != nil || [convError length] || !(format == NSPropertyListXMLFormat_v1_0 || format == NSPropertyListBinaryFormat_v1_0)) { NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Error while reading connection data file", @"error while reading connection data file")] defaultButton:NSLocalizedString(@"OK", @"OK button") - alternateButton:nil + alternateButton:NSLocalizedString(@"Ignore", @"ignore button") otherButton:nil - informativeTextWithFormat:NSLocalizedString(@"Connection data file couldn't be read. Please try to save the document under a different name.", @"message error while reading connection data file and suggesting to save it under a differnet name")]; + informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"Connection data file “%@” couldn't be read. Please try to save the document under a different name.", @"message error while reading connection data file and suggesting to save it under a differnet name"), [fileName lastPathComponent]]]; [alert setAlertStyle:NSCriticalAlertStyle]; - [alert runModal]; + NSInteger returnCode = [alert runModal]; if (spf) [spf release]; - // [self close]; + if(returnCode == NSAlertAlternateReturn) + return YES; + return NO; } @@ -4473,6 +4514,11 @@ } } +- (void)setIsSavedInBundle:(BOOL)savedInBundle +{ + _isSavedInBundle = savedInBundle; +} + #pragma mark - /** -- cgit v1.2.3