Issue #1519: Fix auto-sizing of export filename and truncate it when it becomes too big.

2 files changed, 42 insertions, 18 deletions

diff --git a/Interfaces/English.lproj/ExportDialog.xib b/Interfaces/English.lproj/ExportDialog.xib
index c8b8e079..dd40622e 100644
--- a/Interfaces/English.lproj/ExportDialog.xib
+++ b/Interfaces/English.lproj/ExportDialog.xib
@@ -12,7 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="444"/>
+			<integer value="1086"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -598,6 +598,7 @@
 							<int key="NSvFlags">264</int>
 							<string key="NSFrame">{{17, 233}, {371, 14}}</string>
 							<reference key="NSSuperview" ref="487307915"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="397581067">
 								<int key="NSCellFlags">67239424</int>
@@ -624,6 +625,7 @@
 											<int key="NSvFlags">2322</int>
 											<string key="NSFrameSize">{352, 14}</string>
 											<reference key="NSSuperview" ref="919560029"/>
+											<reference key="NSWindow"/>
 											<object class="NSTextContainer" key="NSTextContainer" id="577432485">
 												<object class="NSLayoutManager" key="NSLayoutManager">
 													<object class="NSTextStorage" key="NSTextStorage">
@@ -683,6 +685,7 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {352, 178}}</string>
 									<reference key="NSSuperview" ref="835590192"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="195858660"/>
 									<reference key="NSDocView" ref="195858660"/>
 									<reference key="NSBGColor" ref="628696263"/>
@@ -697,6 +700,7 @@
 									<int key="NSvFlags">256</int>
 									<string key="NSFrame">{{353, 1}, {11, 178}}</string>
 									<reference key="NSSuperview" ref="835590192"/>
+									<reference key="NSWindow"/>
 									<int key="NSsFlags">256</int>
 									<reference key="NSTarget" ref="835590192"/>
 									<string key="NSAction">_doScroller:</string>
@@ -707,6 +711,7 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 									<reference key="NSSuperview" ref="835590192"/>
+									<reference key="NSWindow"/>
 									<int key="NSsFlags">257</int>
 									<reference key="NSTarget" ref="835590192"/>
 									<string key="NSAction">_doScroller:</string>
@@ -716,6 +721,7 @@
 							</object>
 							<string key="NSFrame">{{20, 45}, {365, 180}}</string>
 							<reference key="NSSuperview" ref="487307915"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="919560029"/>
 							<int key="NSsFlags">18</int>
 							<reference key="NSVScroller" ref="1025585018"/>
@@ -727,6 +733,7 @@
 							<int key="NSvFlags">257</int>
 							<string key="NSFrame">{{301, 13}, {89, 28}}</string>
 							<reference key="NSSuperview" ref="487307915"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="629298988">
 								<int key="NSCellFlags">67239424</int>
@@ -752,6 +759,7 @@
 							<int key="NSvFlags">257</int>
 							<string key="NSFrame">{{350, -130}, {80, 28}}</string>
 							<reference key="NSSuperview" ref="487307915"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="55236080">
 								<int key="NSCellFlags">67239424</int>
@@ -771,13 +779,14 @@
 					</object>
 					<string key="NSFrameSize">{405, 267}</string>
 					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
 				<string key="NSMinSize">{213, 129}</string>
 				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 			</object>
 			<object class="NSCustomView" id="1039688935">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1130,13 +1139,13 @@
 					</object>
 					<object class="NSButton" id="93580453">
 						<reference key="NSNextResponder" ref="1039688935"/>
-						<int key="NSvFlags">268</int>
+						<int key="NSvFlags">266</int>
 						<string key="NSFrame">{{32, 316}, {467, 28}}</string>
 						<reference key="NSSuperview" ref="1039688935"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="704057245">
-							<int key="NSCellFlags">-2080244224</int>
-							<int key="NSCellFlags2">33685504</int>
+							<int key="NSCellFlags">-2080244160</int>
+							<int key="NSCellFlags2">33687808</int>
 							<string key="NSContents">Customize Filename</string>
 							<reference key="NSSupport" ref="26"/>
 							<reference key="NSControlView" ref="93580453"/>
@@ -2876,6 +2885,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					</object>
 				</object>
 				<string key="NSFrameSize">{517, 378}</string>
+				<reference key="NSSuperview"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSUserDefaultsController" id="965845845">
@@ -6853,9 +6863,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>flushPrivileges:</string>
 							<string>flushTable:</string>
 							<string>focusOnTableContentFilter:</string>
-							<string>focusOnTableListFilter:</string>
 							<string>import:</string>
 							<string>importFromClipboard:</string>
+							<string>makeTableListFilterHaveFocus:</string>
 							<string>openCurrentConnectionInNewWindow:</string>
 							<string>openDatabaseInNewTab:</string>
 							<string>optimizeTable:</string>
@@ -6868,6 +6878,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>setDatabases:</string>
 							<string>showConsole:</string>
 							<string>showCreateTableSyntax:</string>
+							<string>showFilterTable:</string>
 							<string>showMySQLHelp:</string>
 							<string>showNavigator:</string>
 							<string>showServerProcesses:</string>
@@ -6923,6 +6934,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
@@ -6950,9 +6962,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>flushPrivileges:</string>
 							<string>flushTable:</string>
 							<string>focusOnTableContentFilter:</string>
-							<string>focusOnTableListFilter:</string>
 							<string>import:</string>
 							<string>importFromClipboard:</string>
+							<string>makeTableListFilterHaveFocus:</string>
 							<string>openCurrentConnectionInNewWindow:</string>
 							<string>openDatabaseInNewTab:</string>
 							<string>optimizeTable:</string>
@@ -6965,6 +6977,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>setDatabases:</string>
 							<string>showConsole:</string>
 							<string>showCreateTableSyntax:</string>
+							<string>showFilterTable:</string>
 							<string>showMySQLHelp:</string>
 							<string>showNavigator:</string>
 							<string>showServerProcesses:</string>
@@ -7061,15 +7074,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
-								<string key="name">focusOnTableListFilter:</string>
+								<string key="name">import:</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
-								<string key="name">import:</string>
+								<string key="name">importFromClipboard:</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
-								<string key="name">importFromClipboard:</string>
+								<string key="name">makeTableListFilterHaveFocus:</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
@@ -7121,6 +7134,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
+								<string key="name">showFilterTable:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
 								<string key="name">showMySQLHelp:</string>
 								<string key="candidateClassName">id</string>
 							</object>
@@ -8670,13 +8687,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>additionalDragHandleView</string>
 							<string>collapseToggleButton</string>
-							<string>delegate</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NSView</string>
 							<string>NSButton</string>
-							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -8685,7 +8700,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>additionalDragHandleView</string>
 							<string>collapseToggleButton</string>
-							<string>delegate</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -8697,10 +8711,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<string key="name">collapseToggleButton</string>
 								<string key="candidateClassName">NSButton</string>
 							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">delegate</string>
-								<string key="candidateClassName">id</string>
-							</object>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -8880,6 +8890,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>limitRowsStepper</string>
 							<string>multipleLineEditingButton</string>
 							<string>paginationButton</string>
+							<string>paginationGoButton</string>
 							<string>paginationNextButton</string>
 							<string>paginationPageField</string>
 							<string>paginationPageStepper</string>
@@ -8927,6 +8938,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>NSButton</string>
 							<string>NSButton</string>
 							<string>NSButton</string>
+							<string>NSButton</string>
 							<string>NSTextField</string>
 							<string>NSStepper</string>
 							<string>NSButton</string>
@@ -8975,6 +8987,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>limitRowsStepper</string>
 							<string>multipleLineEditingButton</string>
 							<string>paginationButton</string>
+							<string>paginationGoButton</string>
 							<string>paginationNextButton</string>
 							<string>paginationPageField</string>
 							<string>paginationPageStepper</string>
@@ -9106,6 +9119,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<string key="candidateClassName">NSButton</string>
 							</object>
 							<object class="IBToOneOutletInfo">
+								<string key="name">paginationGoButton</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
 								<string key="name">paginationNextButton</string>
 								<string key="candidateClassName">NSButton</string>
 							</object>
@@ -9187,6 +9204,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
+					<string key="className">SPTableContent</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">Source/SPTableContentFilter.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
 					<string key="className">SPTableData</string>
 					<string key="superclassName">NSObject</string>
 					<object class="NSMutableDictionary" key="outlets">
diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj
index 92e2dc4f..e621e077 100644
--- a/sequel-pro.xcodeproj/project.pbxproj
+++ b/sequel-pro.xcodeproj/project.pbxproj
@@ -482,7 +482,7 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = 2A37F4A9FDCFA73011CA2CEA /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 8D15AC270486D014006FF6A4 /* Sequel Pro */;
+			remoteGlobalIDString = 8D15AC270486D014006FF6A4;
 			remoteInfo = "Sequel Pro";
 		};
 		5847571D120A1C6D0057631F /* PBXContainerItemProxy */ = {