diff options
| author | rowanbeentje <rowan@beent.je> | 2010-09-08 21:36:11 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2010-09-08 21:36:11 +0000 |
| commit | f7a69e2454ca3dd1f1a62875522e9fb3dea572b3 (patch) | |
| tree | 847d2a915dfd496382977fc64799222057a923e3 /Source/SPDatabaseDocument.m | |
| parent | 3f6aa841dd77af2cf8f2818c91cd186aec2ca5e0 (diff) | |
| download | sequelpro-f7a69e2454ca3dd1f1a62875522e9fb3dea572b3.tar.gz sequelpro-f7a69e2454ca3dd1f1a62875522e9fb3dea572b3.tar.bz2 sequelpro-f7a69e2454ca3dd1f1a62875522e9fb3dea572b3.zip | |
- Add support for SSH identity files (public keys) in custom locations
- Update localisable strings
- Fix initial window position
Diffstat (limited to 'Source/SPDatabaseDocument.m')
| -rw-r--r-- | Source/SPDatabaseDocument.m | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m index 7632d50a..47f915c3 100644 --- a/Source/SPDatabaseDocument.m +++ b/Source/SPDatabaseDocument.m @@ -268,6 +268,8 @@ [connectionController setSocket:@""]; [connectionController setSshHost:@""]; [connectionController setSshUser:@""]; + [connectionController setSshKeyLocationEnabled:NSOffState]; + [connectionController setSshKeyLocation:@""]; [connectionController setSshPort:@""]; [connectionController setDatabase:@""]; [connectionController setPassword:nil]; @@ -485,6 +487,10 @@ [connectionController setSshHost:[connection objectForKey:@"ssh_host"]]; if([connection objectForKey:@"ssh_user"]) [connectionController setSshUser:[connection objectForKey:@"ssh_user"]]; + if([connection objectForKey:@"ssh_keyLocationEnabled"]) + [connectionController setSshKeyLocationEnabled:[[connection objectForKey:@"ssh_keyLocationEnabled"] intValue]]; + if([connection objectForKey:@"ssh_keyLocation"]) + [connectionController setSshKeyLocation:[connection objectForKey:@"ssh_keyLocation"]]; if([connection objectForKey:@"ssh_port"]) [connectionController setSshPort:[NSString stringWithFormat:@"%ld", (long)[[connection objectForKey:@"ssh_port"] integerValue]]]; @@ -3293,6 +3299,8 @@ aString = @"SPSSHTunnelConnection"; [connection setObject:[connectionController sshHost] forKey:@"ssh_host"]; [connection setObject:[connectionController sshUser] forKey:@"ssh_user"]; + [connection setObject:[NSNumber numberWithInt:[connectionController sshKeyLocationEnabled]] forKey:@"ssh_keyLocationEnabled"]; + [connection setObject:[connectionController sshKeyLocation] forKey:@"ssh_keyLocation"]; if([connectionController sshPort] && [[connectionController sshPort] length]) [connection setObject:[NSNumber numberWithInteger:[[connectionController sshPort] integerValue]] forKey:@"ssh_port"]; break; |