From 0810ab9add13a0b3d08e720b09ec50018931dc42 Mon Sep 17 00:00:00 2001 From: Bibiko Date: Fri, 25 Jun 2010 23:08:48 +0000 Subject: =?UTF-8?q?=E2=80=A2=C2=A0further=20progress=20for=20open/save=20s?= =?UTF-8?q?ession=20-=20improved=20remembering=20of=20save=20accessory=20v?= =?UTF-8?q?iew=20settings=20-=20if=20spfs=20file=20was=20saved=20encrypted?= =?UTF-8?q?=20ask=20for=20it=20while=20opening=20only=20once=20=E2=80=A2?= =?UTF-8?q?=20fixed=20typo=20while=20remembering=20the=20save=20accessory?= =?UTF-8?q?=20view=20setting=20for=20"Remember=20Query=20Editor=20content?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/SPAppController.m | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'Source/SPAppController.m') diff --git a/Source/SPAppController.m b/Source/SPAppController.m index f86a77cf..c0bc2818 100644 --- a/Source/SPAppController.m +++ b/Source/SPAppController.m @@ -327,6 +327,16 @@ NSFileManager *fileManager = [NSFileManager defaultManager]; + NSMutableDictionary *spfsDocData = [NSMutableDictionary dictionary]; + [spfsDocData setObject:[NSNumber numberWithBool:[[spfs objectForKey:@"encrypted"] boolValue]] forKey:@"encrypted"]; + [spfsDocData setObject:[NSNumber numberWithBool:[[spfs objectForKey:@"auto_connect"] boolValue]] forKey:@"auto_connect"]; + [spfsDocData setObject:[NSNumber numberWithBool:[[spfs objectForKey:@"save_password"] boolValue]] forKey:@"save_password"]; + [spfsDocData setObject:[NSNumber numberWithBool:[[spfs objectForKey:@"include_session"] boolValue]] forKey:@"include_session"]; + [spfsDocData setObject:[NSNumber numberWithBool:[[spfs objectForKey:@"save_editor_content"] boolValue]] forKey:@"save_editor_content"]; + + [[NSApp delegate] setSpfSessionDocData:spfsDocData]; + [[NSApp delegate] setSessionURL:filename]; + for(NSDictionary *window in [[[spfs objectForKey:@"windows"] reverseObjectEnumerator] allObjects]) { // Create a new window controller, and set up a new connection view within it. @@ -371,8 +381,8 @@ if ([[newWindowController window] isMiniaturized]) [[newWindowController window] deminiaturize:self]; [newWindowController addNewConnection:self]; - [[self frontDocument] initWithConnectionFile:fileName]; [[self frontDocument] setIsSavedInBundle:isBundleFile]; + [[self frontDocument] initWithConnectionFile:fileName]; } } else { @@ -385,16 +395,6 @@ } - NSMutableDictionary *spfsDocData = [NSMutableDictionary dictionary]; - [spfsDocData setObject:[NSNumber numberWithBool:[[spfs objectForKey:@"encrypted"] boolValue]] forKey:@"encrypted"]; - [spfsDocData setObject:[NSNumber numberWithBool:[[spfs objectForKey:@"auto_connect"] boolValue]] forKey:@"auto_connect"]; - [spfsDocData setObject:[NSNumber numberWithBool:[[spfs objectForKey:@"save_password"] boolValue]] forKey:@"save_password"]; - [spfsDocData setObject:[NSNumber numberWithBool:[[spfs objectForKey:@"include_session"] boolValue]] forKey:@"include_session"]; - [spfsDocData setObject:[NSNumber numberWithBool:[[spfs objectForKey:@"save_editor_content"] boolValue]] forKey:@"save_editor_content"]; - - [[NSApp delegate] spfSessionDocData:spfsDocData]; - [[NSApp delegate] setSessionURL:filename]; - } [spfs release]; -- cgit v1.2.3