aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Interfaces/English.lproj/DBView.xib630
-rw-r--r--Interfaces/English.lproj/ImportAccessory.xib18
-rw-r--r--Source/SPAppController.m2
-rw-r--r--Source/SPDataImport.h (renamed from Source/TableDump.h)4
-rw-r--r--Source/SPDataImport.m (renamed from Source/TableDump.m)6
-rw-r--r--Source/SPDatabaseDocument.m10
-rw-r--r--Source/SPFieldMapperController.m2
-rw-r--r--Source/SPTablesList.m2
-rw-r--r--sequel-pro.xcodeproj/project.pbxproj12
9 files changed, 337 insertions, 349 deletions
diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index b78e320b..0ebc1d5b 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -9726,7 +9726,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSClassName">SPTableContent</string>
</object>
<object class="NSCustomObject" id="225526897">
- <string key="NSClassName">TableDump</string>
+ <string key="NSClassName">SPDataImport</string>
</object>
<object class="NSCustomObject" id="438574515">
<string key="NSClassName">SPTablesList</string>
@@ -23735,6 +23735,316 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">SPDataImport</string>
+ <string key="superclassName">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>cancelProgressBar:</string>
+ <string>changeFormat:</string>
+ <string>closeSheet:</string>
+ <string>panelSelectionDidChange:</string>
+ <string>updateExportCompressionSetting:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>cancelProgressBar:</string>
+ <string>changeFormat:</string>
+ <string>closeSheet:</string>
+ <string>panelSelectionDidChange:</string>
+ <string>updateExportCompressionSetting:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">cancelProgressBar:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">changeFormat:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">closeSheet:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">panelSelectionDidChange:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">updateExportCompressionSetting:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>addCreateTableSwitch</string>
+ <string>addDropTableSwitch</string>
+ <string>addErrorsSwitch</string>
+ <string>addTableContentSwitch</string>
+ <string>csvFullStreamingSwitch</string>
+ <string>customQueryInstance</string>
+ <string>errorsSheet</string>
+ <string>errorsView</string>
+ <string>importCSVBox</string>
+ <string>importCSVView</string>
+ <string>importFieldMapperSheetWindow</string>
+ <string>importFieldNamesSwitch</string>
+ <string>importFieldsEnclosedField</string>
+ <string>importFieldsEscapedField</string>
+ <string>importFieldsTerminatedField</string>
+ <string>importFormatPopup</string>
+ <string>importFromClipboardAccessoryView</string>
+ <string>importFromClipboardSheet</string>
+ <string>importFromClipboardTextView</string>
+ <string>importLinesTerminatedField</string>
+ <string>multiCSVFullStreamingSwitch</string>
+ <string>multiXMLFullStreamingSwitch</string>
+ <string>singleProgressBar</string>
+ <string>singleProgressSheet</string>
+ <string>singleProgressText</string>
+ <string>singleProgressTitle</string>
+ <string>sqlCompressionSwitch</string>
+ <string>sqlFullStreamingSwitch</string>
+ <string>tableContentInstance</string>
+ <string>tableDataInstance</string>
+ <string>tableDocumentInstance</string>
+ <string>tableSourceInstance</string>
+ <string>tablesListInstance</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>NSPopUpButton</string>
+ <string>id</string>
+ <string>id</string>
+ <string>NSTextView</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>addCreateTableSwitch</string>
+ <string>addDropTableSwitch</string>
+ <string>addErrorsSwitch</string>
+ <string>addTableContentSwitch</string>
+ <string>csvFullStreamingSwitch</string>
+ <string>customQueryInstance</string>
+ <string>errorsSheet</string>
+ <string>errorsView</string>
+ <string>importCSVBox</string>
+ <string>importCSVView</string>
+ <string>importFieldMapperSheetWindow</string>
+ <string>importFieldNamesSwitch</string>
+ <string>importFieldsEnclosedField</string>
+ <string>importFieldsEscapedField</string>
+ <string>importFieldsTerminatedField</string>
+ <string>importFormatPopup</string>
+ <string>importFromClipboardAccessoryView</string>
+ <string>importFromClipboardSheet</string>
+ <string>importFromClipboardTextView</string>
+ <string>importLinesTerminatedField</string>
+ <string>multiCSVFullStreamingSwitch</string>
+ <string>multiXMLFullStreamingSwitch</string>
+ <string>singleProgressBar</string>
+ <string>singleProgressSheet</string>
+ <string>singleProgressText</string>
+ <string>singleProgressTitle</string>
+ <string>sqlCompressionSwitch</string>
+ <string>sqlFullStreamingSwitch</string>
+ <string>tableContentInstance</string>
+ <string>tableDataInstance</string>
+ <string>tableDocumentInstance</string>
+ <string>tableSourceInstance</string>
+ <string>tablesListInstance</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">addCreateTableSwitch</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">addDropTableSwitch</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">addErrorsSwitch</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">addTableContentSwitch</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">csvFullStreamingSwitch</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">customQueryInstance</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">errorsSheet</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">errorsView</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">importCSVBox</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">importCSVView</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">importFieldMapperSheetWindow</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">importFieldNamesSwitch</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">importFieldsEnclosedField</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">importFieldsEscapedField</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">importFieldsTerminatedField</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">importFormatPopup</string>
+ <string key="candidateClassName">NSPopUpButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">importFromClipboardAccessoryView</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">importFromClipboardSheet</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">importFromClipboardTextView</string>
+ <string key="candidateClassName">NSTextView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">importLinesTerminatedField</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">multiCSVFullStreamingSwitch</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">multiXMLFullStreamingSwitch</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">singleProgressBar</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">singleProgressSheet</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">singleProgressText</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">singleProgressTitle</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">sqlCompressionSwitch</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">sqlFullStreamingSwitch</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">tableContentInstance</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">tableDataInstance</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">tableDocumentInstance</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">tableSourceInstance</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">tablesListInstance</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">SPDatabaseData</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -27207,324 +27517,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="minorKey"/>
</object>
</object>
- <object class="IBPartialClassDescription">
- <string key="className">TableDump</string>
- <string key="superclassName">NSObject</string>
- <object class="NSMutableDictionary" key="actions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>cancelProgressBar:</string>
- <string>changeFormat:</string>
- <string>closeSheet:</string>
- <string>panelSelectionDidChange:</string>
- <string>updateExportCompressionSetting:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>cancelProgressBar:</string>
- <string>changeFormat:</string>
- <string>closeSheet:</string>
- <string>panelSelectionDidChange:</string>
- <string>updateExportCompressionSetting:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBActionInfo">
- <string key="name">cancelProgressBar:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">changeFormat:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">closeSheet:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">panelSelectionDidChange:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">updateExportCompressionSetting:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>addCreateTableSwitch</string>
- <string>addDropTableSwitch</string>
- <string>addErrorsSwitch</string>
- <string>addTableContentSwitch</string>
- <string>csvFullStreamingSwitch</string>
- <string>customQueryInstance</string>
- <string>errorsSheet</string>
- <string>errorsView</string>
- <string>importCSVBox</string>
- <string>importCSVView</string>
- <string>importFieldMapperSheetWindow</string>
- <string>importFieldNamesSwitch</string>
- <string>importFieldsEnclosedField</string>
- <string>importFieldsEscapedField</string>
- <string>importFieldsTerminatedField</string>
- <string>importFormatPopup</string>
- <string>importFromClipboardAccessoryView</string>
- <string>importFromClipboardSheet</string>
- <string>importFromClipboardTextView</string>
- <string>importLinesTerminatedField</string>
- <string>multiCSVFullStreamingSwitch</string>
- <string>multiXMLFullStreamingSwitch</string>
- <string>singleProgressBar</string>
- <string>singleProgressSheet</string>
- <string>singleProgressText</string>
- <string>singleProgressTitle</string>
- <string>sqlCompressionSwitch</string>
- <string>sqlFullStreamingSwitch</string>
- <string>tableContentInstance</string>
- <string>tableDataInstance</string>
- <string>tableDocumentInstance</string>
- <string>tableSourceInstance</string>
- <string>tablesListInstance</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>NSPopUpButton</string>
- <string>id</string>
- <string>id</string>
- <string>NSTextView</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>addCreateTableSwitch</string>
- <string>addDropTableSwitch</string>
- <string>addErrorsSwitch</string>
- <string>addTableContentSwitch</string>
- <string>csvFullStreamingSwitch</string>
- <string>customQueryInstance</string>
- <string>errorsSheet</string>
- <string>errorsView</string>
- <string>importCSVBox</string>
- <string>importCSVView</string>
- <string>importFieldMapperSheetWindow</string>
- <string>importFieldNamesSwitch</string>
- <string>importFieldsEnclosedField</string>
- <string>importFieldsEscapedField</string>
- <string>importFieldsTerminatedField</string>
- <string>importFormatPopup</string>
- <string>importFromClipboardAccessoryView</string>
- <string>importFromClipboardSheet</string>
- <string>importFromClipboardTextView</string>
- <string>importLinesTerminatedField</string>
- <string>multiCSVFullStreamingSwitch</string>
- <string>multiXMLFullStreamingSwitch</string>
- <string>singleProgressBar</string>
- <string>singleProgressSheet</string>
- <string>singleProgressText</string>
- <string>singleProgressTitle</string>
- <string>sqlCompressionSwitch</string>
- <string>sqlFullStreamingSwitch</string>
- <string>tableContentInstance</string>
- <string>tableDataInstance</string>
- <string>tableDocumentInstance</string>
- <string>tableSourceInstance</string>
- <string>tablesListInstance</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBToOneOutletInfo">
- <string key="name">addCreateTableSwitch</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">addDropTableSwitch</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">addErrorsSwitch</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">addTableContentSwitch</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">csvFullStreamingSwitch</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">customQueryInstance</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">errorsSheet</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">errorsView</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">importCSVBox</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">importCSVView</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">importFieldMapperSheetWindow</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">importFieldNamesSwitch</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">importFieldsEnclosedField</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">importFieldsEscapedField</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">importFieldsTerminatedField</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">importFormatPopup</string>
- <string key="candidateClassName">NSPopUpButton</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">importFromClipboardAccessoryView</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">importFromClipboardSheet</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">importFromClipboardTextView</string>
- <string key="candidateClassName">NSTextView</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">importLinesTerminatedField</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">multiCSVFullStreamingSwitch</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">multiXMLFullStreamingSwitch</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">singleProgressBar</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">singleProgressSheet</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">singleProgressText</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">singleProgressTitle</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">sqlCompressionSwitch</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">sqlFullStreamingSwitch</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">tableContentInstance</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">tableDataInstance</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">tableDocumentInstance</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">tableSourceInstance</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">tablesListInstance</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Source/TableDump.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">TableDump</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
<bool key="EncodedWithXMLCoder">YES</bool>
diff --git a/Interfaces/English.lproj/ImportAccessory.xib b/Interfaces/English.lproj/ImportAccessory.xib
index 19e8ed72..e45046af 100644
--- a/Interfaces/English.lproj/ImportAccessory.xib
+++ b/Interfaces/English.lproj/ImportAccessory.xib
@@ -12,8 +12,6 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="1"/>
- <integer value="86"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -31,7 +29,7 @@
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSCustomObject" id="1001">
- <string key="NSClassName">TableDump</string>
+ <string key="NSClassName">SPDataImport</string>
</object>
<object class="NSCustomObject" id="1003">
<string key="NSClassName">FirstResponder</string>
@@ -40,7 +38,7 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="768243701">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -625,7 +623,6 @@
</object>
</object>
<string key="NSFrameSize">{450, 135}</string>
- <reference key="NSSuperview"/>
<object class="NSMutableString" key="NSClassName">
<characters key="NS.bytes">NSView</characters>
</object>
@@ -645,7 +642,7 @@
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMinSize">{500, 353}</string>
<object class="NSView" key="NSWindowView" id="544284300">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -882,7 +879,6 @@
</object>
</object>
<string key="NSFrameSize">{500, 353}</string>
- <reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMinSize">{500, 375}</string>
@@ -1577,10 +1573,10 @@
<int key="maxID">104</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
- <string key="className">TableDump</string>
+ <string key="className">SPDataImport</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2053,8 +2049,8 @@
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBDocumentRelativeSource</string>
- <string key="minorKey">../../Source/TableDump.h</string>
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
</object>
</object>
</object>
diff --git a/Source/SPAppController.m b/Source/SPAppController.m
index c5c2ed2d..fdedc1fe 100644
--- a/Source/SPAppController.m
+++ b/Source/SPAppController.m
@@ -28,7 +28,7 @@
#import "SPDatabaseDocument.h"
#import "SPPreferenceController.h"
#import "SPAboutController.h"
-#import "TableDump.h"
+#import "SPDataImport.h"
#import "SPEncodingPopupAccessory.h"
#import "SPConstants.h"
#import "SPWindowController.h"
diff --git a/Source/TableDump.h b/Source/SPDataImport.h
index 9d27a952..c52ceae5 100644
--- a/Source/TableDump.h
+++ b/Source/SPDataImport.h
@@ -1,7 +1,7 @@
//
// $Id$
//
-// TableDump.h
+// SPDataImport.h
// sequel-pro
//
// Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002.
@@ -28,7 +28,7 @@
@class SPFieldMapperController, SPFileHandle;
-@interface TableDump : NSObject
+@interface SPDataImport : NSObject
{
IBOutlet id tableDocumentInstance;
IBOutlet id tablesListInstance;
diff --git a/Source/TableDump.m b/Source/SPDataImport.m
index feb82a43..7b55c812 100644
--- a/Source/TableDump.m
+++ b/Source/SPDataImport.m
@@ -1,7 +1,7 @@
//
// $Id$
//
-// TableDump.m
+// SPDataImport.m
// sequel-pro
//
// Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002.
@@ -23,7 +23,7 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import "TableDump.h"
+#import "SPDataImport.h"
#import "SPDatabaseDocument.h"
#import "SPTablesList.h"
#import "SPTableStructure.h"
@@ -43,7 +43,7 @@
#import "SPNotLoaded.h"
#import "SPFileHandle.h"
-@implementation TableDump
+@implementation SPDataImport
#pragma mark -
#pragma mark Initialisation
diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m
index 76793e3f..f18385c3 100644
--- a/Source/SPDatabaseDocument.m
+++ b/Source/SPDatabaseDocument.m
@@ -30,7 +30,7 @@
#import "SPTableStructure.h"
#import "SPTableContent.h"
#import "SPCustomQuery.h"
-#import "TableDump.h"
+#import "SPDataImport.h"
#import "ImageAndTextCell.h"
#import "SPGrowlController.h"
#import "SPExportController.h"
@@ -2346,7 +2346,7 @@
*/
- (IBAction)exportSelectedTablesAs:(id)sender
{
- [exportControllerInstance exportTables:[tablesListInstance selectedTableItems] asFormat:[sender tag]];
+ [exportControllerInstance exportTables:[tablesListInstance selectedTableItems] asFormat:[sender tag] usingSource:SPTableExport];
}
#pragma mark -
@@ -3417,7 +3417,7 @@
}
/**
- * Passes the request to the tableDump object
+ * Passes the request to the dataImport object
*/
- (IBAction)import:(id)sender
{
@@ -3425,7 +3425,7 @@
}
/**
- * Passes the request to the tableDump object
+ * Passes the request to the dataImport object
*/
- (IBAction)importFromClipboard:(id)sender
{
@@ -3433,7 +3433,7 @@
}
/**
- * Passes the request to the tableDump object
+ * Passes the request to the dataImport object
*/
- (IBAction)export:(id)sender
{
diff --git a/Source/SPFieldMapperController.m b/Source/SPFieldMapperController.m
index 9f77398d..237da3cf 100644
--- a/Source/SPFieldMapperController.m
+++ b/Source/SPFieldMapperController.m
@@ -24,7 +24,7 @@
#import "SPFieldMapperController.h"
#import "SPTableData.h"
-#import "TableDump.h"
+#import "SPDataImport.h"
#import "SPTablesList.h"
#import "SPArrayAdditions.h"
#import "SPStringAdditions.h"
diff --git a/Source/SPTablesList.m b/Source/SPTablesList.m
index d0d39eec..e1647cf7 100644
--- a/Source/SPTablesList.m
+++ b/Source/SPTablesList.m
@@ -29,7 +29,7 @@
#import "SPTableContent.h"
#import "SPTableData.h"
#import "SPTableInfo.h"
-#import "TableDump.h"
+#import "SPDataImport.h"
#import "ImageAndTextCell.h"
#import "SPStringAdditions.h"
#import "SPArrayAdditions.h"
diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj
index fd105fb1..dc3c5964 100644
--- a/sequel-pro.xcodeproj/project.pbxproj
+++ b/sequel-pro.xcodeproj/project.pbxproj
@@ -101,7 +101,7 @@
17E641580EF01EF6001BC333 /* SPGrowlController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6414D0EF01EF6001BC333 /* SPGrowlController.m */; };
17E641590EF01EF6001BC333 /* SPTableContent.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6414F0EF01EF6001BC333 /* SPTableContent.m */; };
17E6415A0EF01EF6001BC333 /* SPDatabaseDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641510EF01EF6001BC333 /* SPDatabaseDocument.m */; };
- 17E6415B0EF01EF6001BC333 /* TableDump.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641530EF01EF6001BC333 /* TableDump.m */; };
+ 17E6415B0EF01EF6001BC333 /* SPDataImport.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641530EF01EF6001BC333 /* SPDataImport.m */; };
17E6415C0EF01EF6001BC333 /* SPTableStructure.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641550EF01EF6001BC333 /* SPTableStructure.m */; };
17E641640EF01F15001BC333 /* SPTableInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6415F0EF01F15001BC333 /* SPTableInfo.m */; };
17E641650EF01F15001BC333 /* SPTablesList.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641610EF01F15001BC333 /* SPTablesList.m */; };
@@ -592,8 +592,8 @@
17E6414F0EF01EF6001BC333 /* SPTableContent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTableContent.m; sourceTree = "<group>"; };
17E641500EF01EF6001BC333 /* SPDatabaseDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPDatabaseDocument.h; sourceTree = "<group>"; };
17E641510EF01EF6001BC333 /* SPDatabaseDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDatabaseDocument.m; sourceTree = "<group>"; };
- 17E641520EF01EF6001BC333 /* TableDump.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableDump.h; sourceTree = "<group>"; };
- 17E641530EF01EF6001BC333 /* TableDump.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TableDump.m; sourceTree = "<group>"; };
+ 17E641520EF01EF6001BC333 /* SPDataImport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPDataImport.h; sourceTree = "<group>"; };
+ 17E641530EF01EF6001BC333 /* SPDataImport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDataImport.m; sourceTree = "<group>"; };
17E641540EF01EF6001BC333 /* SPTableStructure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTableStructure.h; sourceTree = "<group>"; };
17E641550EF01EF6001BC333 /* SPTableStructure.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTableStructure.m; sourceTree = "<group>"; };
17E6415E0EF01F15001BC333 /* SPTableInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTableInfo.h; sourceTree = "<group>"; };
@@ -1176,8 +1176,8 @@
17E6414F0EF01EF6001BC333 /* SPTableContent.m */,
17E641500EF01EF6001BC333 /* SPDatabaseDocument.h */,
17E641510EF01EF6001BC333 /* SPDatabaseDocument.m */,
- 17E641520EF01EF6001BC333 /* TableDump.h */,
- 17E641530EF01EF6001BC333 /* TableDump.m */,
+ 17E641520EF01EF6001BC333 /* SPDataImport.h */,
+ 17E641530EF01EF6001BC333 /* SPDataImport.m */,
17E641540EF01EF6001BC333 /* SPTableStructure.h */,
17E641550EF01EF6001BC333 /* SPTableStructure.m */,
1792C28910AE1C7200ABE758 /* Controller Categories */,
@@ -2427,7 +2427,7 @@
17E641580EF01EF6001BC333 /* SPGrowlController.m in Sources */,
17E641590EF01EF6001BC333 /* SPTableContent.m in Sources */,
17E6415A0EF01EF6001BC333 /* SPDatabaseDocument.m in Sources */,
- 17E6415B0EF01EF6001BC333 /* TableDump.m in Sources */,
+ 17E6415B0EF01EF6001BC333 /* SPDataImport.m in Sources */,
17E6415C0EF01EF6001BC333 /* SPTableStructure.m in Sources */,
17E641640EF01F15001BC333 /* SPTableInfo.m in Sources */,
17E641650EF01F15001BC333 /* SPTablesList.m in Sources */,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 02:31:25 +0000