diff options
| author | Max <post@wickenrode.com> | 2017-03-31 02:32:28 +0200 |
|---|---|---|
| committer | Max <post@wickenrode.com> | 2017-03-31 02:32:28 +0200 |
| commit | 004af0c9d13d5c9f29b3e0e08ee7df025ee56026 (patch) | |
| tree | 92df274a41a20570a1ae289646e256066cf517a1 | |
| parent | 5a201e6cf26b26c6fd3dfab9cb18211e75bada26 (diff) | |
| parent | 63eb8781018c094644bc1d46099b42ad27f51670 (diff) | |
| download | sequelpro-004af0c9d13d5c9f29b3e0e08ee7df025ee56026.tar.gz sequelpro-004af0c9d13d5c9f29b3e0e08ee7df025ee56026.tar.bz2 sequelpro-004af0c9d13d5c9f29b3e0e08ee7df025ee56026.zip | |
Merge branch 'master' of https://github.com/sequelpro/sequelpro
| -rw-r--r-- | Interfaces/English.lproj/ConnectionView.xib | 2 | ||||
| -rw-r--r-- | Source/SPDatabaseDocument.m | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/Interfaces/English.lproj/ConnectionView.xib b/Interfaces/English.lproj/ConnectionView.xib index 0dbc13d3..05ced791 100644 --- a/Interfaces/English.lproj/ConnectionView.xib +++ b/Interfaces/English.lproj/ConnectionView.xib @@ -2544,7 +2544,7 @@ DQ <action selector="renameNode:" target="-2" id="5819"/> </connections> </menuItem> - <menuItem title="Remove" id="5794"> + <menuItem title="Delete" id="5794"> <modifierMask key="keyEquivalentModifierMask"/> <connections> <action selector="removeNode:" target="-2" id="5802"/> diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m index 5338d2f7..b57b506f 100644 --- a/Source/SPDatabaseDocument.m +++ b/Source/SPDatabaseDocument.m @@ -4474,6 +4474,7 @@ static int64_t SPDatabaseDocumentInstanceCounter = 0; { // Coax the main split view into actually checking its constraints [contentViewSplitter setPosition:[[[contentViewSplitter subviews] objectAtIndex:0] bounds].size.width ofDividerAtIndex:0]; + // If the task interface is visible, and this tab is frontmost, re-center the task child window if (_isWorkingLevel && [parentWindowController selectedTableDocument] == self) [self centerTaskWindow]; } @@ -4482,17 +4483,19 @@ static int64_t SPDatabaseDocumentInstanceCounter = 0; /** * Set the parent window */ -- (void)setParentWindow:(NSWindow *)aWindow +- (void)setParentWindow:(NSWindow *)window { -#ifndef SP_CODA + NSWindow *favoritesOutlineViewWindow = [(NSView *)[connectionController favoritesOutlineView] window]; + // If the window is being set for the first time - connection controller is visible - update focus - if (!parentWindow && !mySQLConnection) { - [aWindow makeFirstResponder:(NSResponder *)[connectionController favoritesOutlineView]]; + if (!parentWindow && !mySQLConnection && window == favoritesOutlineViewWindow) { + [window makeFirstResponder:(NSResponder *)[connectionController favoritesOutlineView]]; } -#endif - parentWindow = aWindow; + parentWindow = window; + SPSSHTunnel *currentTunnel = [connectionController valueForKeyPath:@"sshTunnel"]; + if (currentTunnel) [currentTunnel setParentWindow:parentWindow]; } |