diff options
| author | rowanbeentje <rowan@beent.je> | 2010-09-08 22:16:35 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2010-09-08 22:16:35 +0000 |
| commit | a52f4ee50f43aa8d269326dac045809cd873547d (patch) | |
| tree | 553967990203d8974d7b99632880a686c6c78593 /Source | |
| parent | f7a69e2454ca3dd1f1a62875522e9fb3dea572b3 (diff) | |
| download | sequelpro-a52f4ee50f43aa8d269326dac045809cd873547d.tar.gz sequelpro-a52f4ee50f43aa8d269326dac045809cd873547d.tar.bz2 sequelpro-a52f4ee50f43aa8d269326dac045809cd873547d.zip | |
- Add a further UI hint in the form of a accessory view to the SSH key location dialogs
(Note: r2615 and this commit both shamelessly stole the UI concept from Transmit 4; thanks to Panic for the inspiration!)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/SPConnectionController.h | 1 | ||||
| -rw-r--r-- | Source/SPConnectionController.m | 17 | ||||
| -rw-r--r-- | Source/SPPreferenceController.h | 1 | ||||
| -rw-r--r-- | Source/SPPreferenceController.m | 18 |
4 files changed, 23 insertions, 14 deletions
diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h index 67bdb77b..0a1f8cce 100644 --- a/Source/SPConnectionController.h +++ b/Source/SPConnectionController.h @@ -104,6 +104,7 @@ IBOutlet NSView *standardConnectionFormContainer; IBOutlet NSView *socketConnectionFormContainer; IBOutlet NSView *sshConnectionFormContainer; + IBOutlet NSView *sshKeyLocationHelp; IBOutlet NSTextField *standardSQLHostField; IBOutlet NSTextField *sshSQLHostField; diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m index 7937ef99..a0ee7786 100644 --- a/Source/SPConnectionController.m +++ b/Source/SPConnectionController.m @@ -496,13 +496,16 @@ filePath = [sshKeyLocation lastPathComponent]; directoryPath = [sshKeyLocation stringByDeletingLastPathComponent]; } - [[NSOpenPanel openPanel] beginSheetForDirectory:directoryPath - file:filePath - types:[NSArray arrayWithObjects:@"pem", @"", nil] - modalForWindow:[tableDocument parentWindow] - modalDelegate:self - didEndSelector:@selector(chooseSSHKeySheetDidEnd:returnCode:contextInfo:) - contextInfo:nil]; + + NSOpenPanel *openPanel = [NSOpenPanel openPanel]; + [openPanel setAccessoryView:sshKeyLocationHelp]; + [openPanel beginSheetForDirectory:directoryPath + file:filePath + types:[NSArray arrayWithObjects:@"pem", @"", nil] + modalForWindow:[tableDocument parentWindow] + modalDelegate:self + didEndSelector:@selector(chooseSSHKeySheetDidEnd:returnCode:contextInfo:) + contextInfo:nil]; } /** diff --git a/Source/SPPreferenceController.h b/Source/SPPreferenceController.h index 1683db65..7d8e0375 100644 --- a/Source/SPPreferenceController.h +++ b/Source/SPPreferenceController.h @@ -58,6 +58,7 @@ IBOutlet NSTextField *favoriteUserTextFieldSSH; IBOutlet NSTextField *favoriteHostTextFieldSSH; IBOutlet NSMenuItem *favoritesSortByMenuItem; + IBOutlet NSView *sshKeyLocationHelp; IBOutlet NSWindow *enterNameWindow; IBOutlet NSTextField *enterNameLabel; diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m index 42503649..c1f3877a 100644 --- a/Source/SPPreferenceController.m +++ b/Source/SPPreferenceController.m @@ -704,13 +704,17 @@ filePath = [[favoritesController valueForKeyPath:@"selection.sshKeyLocation"] lastPathComponent]; directoryPath = [[favoritesController valueForKeyPath:@"selection.sshKeyLocation"] stringByDeletingLastPathComponent]; } - [[NSOpenPanel openPanel] beginSheetForDirectory:directoryPath - file:filePath - types:[NSArray arrayWithObjects:@"pem", @"", nil] - modalForWindow:preferencesWindow - modalDelegate:self - didEndSelector:@selector(chooseSSHKeySheetDidEnd:returnCode:contextInfo:) - contextInfo:nil]; + + + NSOpenPanel *openPanel = [NSOpenPanel openPanel]; + [openPanel setAccessoryView:sshKeyLocationHelp]; + [openPanel beginSheetForDirectory:directoryPath + file:filePath + types:[NSArray arrayWithObjects:@"pem", @"", nil] + modalForWindow:preferencesWindow + modalDelegate:self + didEndSelector:@selector(chooseSSHKeySheetDidEnd:returnCode:contextInfo:) + contextInfo:nil]; } /** |