diff options
| author | stuconnolly <stuart02@gmail.com> | 2010-07-05 21:37:07 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2010-07-05 21:37:07 +0000 |
| commit | ee39747795b41551509a11fa770d8a937feb5f39 (patch) | |
| tree | 61bd893251378660fec1b490227fadf9419bab02 | |
| parent | 081cc9ece186c7c097ee51617a73780e2228eeea (diff) | |
| download | sequelpro-ee39747795b41551509a11fa770d8a937feb5f39.tar.gz sequelpro-ee39747795b41551509a11fa770d8a937feb5f39.tar.bz2 sequelpro-ee39747795b41551509a11fa770d8a937feb5f39.zip | |
Fix the resizing of the export dialog when the sheet is already accommodating all available space. Also, change the cancel button's shortcut to escape. Thanks Hans.
| -rw-r--r-- | Interfaces/English.lproj/ExportDialog.xib | 10 | ||||
| -rw-r--r-- | Source/SPExportController.m | 14 |
2 files changed, 19 insertions, 5 deletions
diff --git a/Interfaces/English.lproj/ExportDialog.xib b/Interfaces/English.lproj/ExportDialog.xib index 25a0b0cd..bf47c1a1 100644 --- a/Interfaces/English.lproj/ExportDialog.xib +++ b/Interfaces/English.lproj/ExportDialog.xib @@ -21,10 +21,10 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="1109"/> - <integer value="295"/> - <integer value="442"/> <integer value="2"/> + <integer value="442"/> + <integer value="295"/> + <integer value="1109"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -174,9 +174,9 @@ <reference key="NSSupport" ref="695505032"/> <reference key="NSControlView" ref="840756827"/> <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">268435585</int> + <int key="NSButtonFlags2">129</int> <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent">.</string> + <string type="base64-UTF8" key="NSKeyEquivalent">Gw</string> <int key="NSPeriodicDelay">200</int> <int key="NSPeriodicInterval">25</int> </object> diff --git a/Source/SPExportController.m b/Source/SPExportController.m index 6cee32b7..e8bbf1a4 100644 --- a/Source/SPExportController.m +++ b/Source/SPExportController.m @@ -875,6 +875,13 @@ NSRect frame = [[self window] frame]; + if (frame.size.height > 600 && delta > heightOffset1) { + frame.origin.y += [exportCustomFilenameView frame].size.height; + frame.size.height -= [exportCustomFilenameView frame].size.height; + + [[self window] setFrame:frame display:YES animate:YES]; + } + [exportInputPopUpButton setAutoresizingMask:NSViewNotSizable | NSViewMaxYMargin]; [exportFilePerTableCheck setAutoresizingMask:NSViewNotSizable | NSViewMaxYMargin]; [exportTablelistScrollView setAutoresizingMask:NSViewNotSizable | NSViewMaxYMargin]; @@ -924,6 +931,13 @@ NSRect frame = [[self window] frame]; + if (frame.size.height > 600 && delta > heightOffset2) { + frame.origin.y += [exportAdvancedOptionsView frame].size.height; + frame.size.height -= [exportAdvancedOptionsView frame].size.height; + + [[self window] setFrame:frame display:YES animate:YES]; + } + [exportTablelistScrollView setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin]; [exportTableListButtonBar setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin]; [exportTypeTabBar setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin]; |