diff options
-rw-r--r-- | Interfaces/English.lproj/ExportDialog.xib | 448 | ||||
-rw-r--r-- | Resources/English.lproj/Localizable.strings | bin | 157282 -> 158412 bytes | |||
-rw-r--r-- | Source/SPExportController.h | 5 | ||||
-rw-r--r-- | Source/SPExportController.m | 22 |
4 files changed, 451 insertions, 24 deletions
diff --git a/Interfaces/English.lproj/ExportDialog.xib b/Interfaces/English.lproj/ExportDialog.xib index 5a5a4a3e..bb55a7c9 100644 --- a/Interfaces/English.lproj/ExportDialog.xib +++ b/Interfaces/English.lproj/ExportDialog.xib @@ -3,7 +3,7 @@ <data> <int key="IBDocument.SystemTarget">1050</int> <string key="IBDocument.SystemVersion">10F569</string> - <string key="IBDocument.InterfaceBuilderVersion">762</string> + <string key="IBDocument.InterfaceBuilderVersion">788</string> <string key="IBDocument.AppKitVersion">1038.29</string> <string key="IBDocument.HIToolboxVersion">461.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> @@ -15,14 +15,14 @@ </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>762</string> + <string>788</string> <string>1.2.5</string> </object> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="1111"/> <integer value="1"/> - <integer value="1229"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -834,7 +834,7 @@ <object class="NSTextFieldCell" key="NSCell" id="872070930"> <int key="NSCellFlags">-2077098431</int> <int key="NSCellFlags2">4330496</int> - <string key="NSContents">host,database,table,date,time</string> + <string key="NSContents"/> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="844630128"/> <reference key="NSBackgroundColor" ref="895047516"/> @@ -2600,7 +2600,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <string key="NSFrame">{{1, 17}, {199, 219}}</string> <reference key="NSSuperview" ref="505274803"/> - <reference key="NSNextKeyView" ref="324452213"/> <reference key="NSDocView" ref="324452213"/> <reference key="NSBGColor" ref="985041161"/> <int key="NScvFlags">4</int> @@ -2634,7 +2633,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <string key="NSFrame">{{1, 0}, {199, 17}}</string> <reference key="NSSuperview" ref="505274803"/> - <reference key="NSNextKeyView" ref="181185916"/> <reference key="NSDocView" ref="181185916"/> <reference key="NSBGColor" ref="985041161"/> <int key="NScvFlags">4</int> @@ -2643,7 +2641,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <string key="NSFrame">{{20, 43}, {201, 237}}</string> <reference key="NSSuperview" ref="1039688935"/> - <reference key="NSNextKeyView" ref="475696168"/> <int key="NSsFlags">530</int> <reference key="NSVScroller" ref="695806109"/> <reference key="NSHScroller" ref="681376734"/> @@ -4962,15 +4959,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{476, 171}, {451, 494}}</string> + <string>{{573, 163}, {451, 494}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="NO"/> <boolean value="NO"/> - <string>{{476, 171}, {451, 494}}</string> + <string>{{573, 163}, {451, 494}}</string> <boolean value="NO"/> <boolean value="YES"/> <string>{454, 494}</string> - <string>{{645, 237}, {450, 377}}</string> + <string>{{584, 237}, {450, 377}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> @@ -5403,6 +5400,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string key="NS.key.0">toggleCollapse:</string> <string key="NS.object.0">id</string> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">toggleCollapse:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">toggleCollapse:</string> + <string key="candidateClassName">id</string> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">Source/SPTablesList.h</string> @@ -5445,6 +5449,80 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <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>doDecomposedStringWithCanonicalMapping:</string> + <string>doDecomposedStringWithCompatibilityMapping:</string> + <string>doPrecomposedStringWithCanonicalMapping:</string> + <string>doPrecomposedStringWithCompatibilityMapping:</string> + <string>doRemoveDiacritics:</string> + <string>doSelectionLowerCase:</string> + <string>doSelectionTitleCase:</string> + <string>doSelectionUpperCase:</string> + <string>doTranspose:</string> + <string>insertNULLvalue:</string> + <string>selectCurrentLine:</string> + <string>selectCurrentWord:</string> + <string>selectEnclosingBrackets:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBActionInfo"> + <string key="name">doDecomposedStringWithCanonicalMapping:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">doDecomposedStringWithCompatibilityMapping:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">doPrecomposedStringWithCanonicalMapping:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">doPrecomposedStringWithCompatibilityMapping:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">doRemoveDiacritics:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">doSelectionLowerCase:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">doSelectionTitleCase:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">doSelectionUpperCase:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">doTranspose:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">insertNULLvalue:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">selectCurrentLine:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">selectCurrentWord:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">selectEnclosingBrackets:</string> + <string key="candidateClassName">id</string> + </object> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">Source/SPTextViewAdditions.h</string> @@ -5507,6 +5585,75 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <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>cancelExport:</string> + <string>changeExportOutputPath:</string> + <string>closeSheet:</string> + <string>refreshTableList:</string> + <string>selectDeselectAllTables:</string> + <string>switchInput:</string> + <string>switchTab:</string> + <string>toggleAdvancedExportOptionsView:</string> + <string>toggleCustomFilenameFormatView:</string> + <string>toggleSQLIncludeContent:</string> + <string>toggleSQLIncludeDropSyntax:</string> + <string>toggleSQLIncludeStructure:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBActionInfo"> + <string key="name">cancelExport:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">changeExportOutputPath:</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">refreshTableList:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">selectDeselectAllTables:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">switchInput:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">switchTab:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">toggleAdvancedExportOptionsView:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">toggleCustomFilenameFormatView:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">toggleSQLIncludeContent:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">toggleSQLIncludeDropSyntax:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">toggleSQLIncludeStructure:</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"> @@ -5622,6 +5769,280 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <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>customQueryInstance</string> + <string>errorsTextView</string> + <string>errorsWindow</string> + <string>exportAdvancedOptionsView</string> + <string>exportAdvancedOptionsViewButton</string> + <string>exportAdvancedOptionsViewLabelButton</string> + <string>exportButton</string> + <string>exportCSVFieldsEscapedField</string> + <string>exportCSVFieldsTerminatedField</string> + <string>exportCSVFieldsWrappedField</string> + <string>exportCSVIncludeFieldNamesCheck</string> + <string>exportCSVLinesTerminatedField</string> + <string>exportCSVNULLValuesAsTextField</string> + <string>exportCompressOutputFile</string> + <string>exportCustomFilenameTokenField</string> + <string>exportCustomFilenameTokensField</string> + <string>exportCustomFilenameView</string> + <string>exportCustomFilenameViewButton</string> + <string>exportCustomFilenameViewLabelButton</string> + <string>exportDeselectAllTablesButton</string> + <string>exportExcelSheetOrFilePerTableMatrix</string> + <string>exportFilePerTableCheck</string> + <string>exportFilenameDividerBox</string> + <string>exportHTMLIncludeStructureCheck</string> + <string>exportInputPopUpButton</string> + <string>exportOptionsTabBar</string> + <string>exportPDFIncludeStructureCheck</string> + <string>exportPathField</string> + <string>exportProcessLowMemoryButton</string> + <string>exportProgressIndicator</string> + <string>exportProgressText</string> + <string>exportProgressTitle</string> + <string>exportProgressWindow</string> + <string>exportRefreshTablesButton</string> + <string>exportSQLBLOBFieldsAsHexCheck</string> + <string>exportSQLIncludeContentCheck</string> + <string>exportSQLIncludeDropSyntaxCheck</string> + <string>exportSQLIncludeErrorsCheck</string> + <string>exportSQLIncludeStructureCheck</string> + <string>exportSQLInsertDividerPopUpButton</string> + <string>exportSQLInsertNValueTextField</string> + <string>exportSelectAllTablesButton</string> + <string>exportTableList</string> + <string>exportTableListButtonBar</string> + <string>exportTablelistScrollView</string> + <string>exportTypeTabBar</string> + <string>exportUseUTF8BOMButton</string> + <string>exportXMLNULLValuesAsTextField</string> + <string>exporterView</string> + <string>tableContentInstance</string> + <string>tableDataInstance</string> + <string>tableDocumentInstance</string> + <string>tablesListInstance</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBToOneOutletInfo"> + <string key="name">customQueryInstance</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">errorsTextView</string> + <string key="candidateClassName">NSTextView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">errorsWindow</string> + <string key="candidateClassName">NSWindow</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportAdvancedOptionsView</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportAdvancedOptionsViewButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportAdvancedOptionsViewLabelButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportCSVFieldsEscapedField</string> + <string key="candidateClassName">NSComboBox</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportCSVFieldsTerminatedField</string> + <string key="candidateClassName">NSComboBox</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportCSVFieldsWrappedField</string> + <string key="candidateClassName">NSComboBox</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportCSVIncludeFieldNamesCheck</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportCSVLinesTerminatedField</string> + <string key="candidateClassName">NSComboBox</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportCSVNULLValuesAsTextField</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportCompressOutputFile</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportCustomFilenameTokenField</string> + <string key="candidateClassName">NSTokenField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportCustomFilenameTokensField</string> + <string key="candidateClassName">NSTokenField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportCustomFilenameView</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportCustomFilenameViewButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportCustomFilenameViewLabelButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportDeselectAllTablesButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportExcelSheetOrFilePerTableMatrix</string> + <string key="candidateClassName">NSMatrix</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportFilePerTableCheck</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportFilenameDividerBox</string> + <string key="candidateClassName">NSBox</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportHTMLIncludeStructureCheck</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportInputPopUpButton</string> + <string key="candidateClassName">NSPopUpButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportOptionsTabBar</string> + <string key="candidateClassName">NSTabView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportPDFIncludeStructureCheck</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportPathField</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportProcessLowMemoryButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportProgressIndicator</string> + <string key="candidateClassName">NSProgressIndicator</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportProgressText</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportProgressTitle</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportProgressWindow</string> + <string key="candidateClassName">NSWindow</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportRefreshTablesButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportSQLBLOBFieldsAsHexCheck</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportSQLIncludeContentCheck</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportSQLIncludeDropSyntaxCheck</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportSQLIncludeErrorsCheck</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportSQLIncludeStructureCheck</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportSQLInsertDividerPopUpButton</string> + <string key="candidateClassName">NSPopUpButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportSQLInsertNValueTextField</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportSelectAllTablesButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportTableList</string> + <string key="candidateClassName">NSTableView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportTableListButtonBar</string> + <string key="candidateClassName">BWAnchoredButtonBar</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportTablelistScrollView</string> + <string key="candidateClassName">NSScrollView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportTypeTabBar</string> + <string key="candidateClassName">NSTabView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportUseUTF8BOMButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exportXMLNULLValuesAsTextField</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">exporterView</string> + <string key="candidateClassName">NSView</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">tablesListInstance</string> + <string key="candidateClassName">id</string> + </object> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">Source/SPExportController.h</string> @@ -6429,6 +6850,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string key="NS.key.0">showWindow:</string> <string key="NS.object.0">id</string> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">showWindow:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">showWindow:</string> + <string key="candidateClassName">id</string> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> <string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string> diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings Binary files differindex 75c9a851..840cb0e0 100644 --- a/Resources/English.lproj/Localizable.strings +++ b/Resources/English.lproj/Localizable.strings diff --git a/Source/SPExportController.h b/Source/SPExportController.h index 274da7ed..f1737595 100644 --- a/Source/SPExportController.h +++ b/Source/SPExportController.h @@ -187,11 +187,6 @@ SPExportSource exportSource; /** - * Available filename tokens - */ - NSString *availableFilenameTokens; - - /** * Display advanced view flag */ BOOL showAdvancedView; diff --git a/Source/SPExportController.m b/Source/SPExportController.m index a4851f53..6cee32b7 100644 --- a/Source/SPExportController.m +++ b/Source/SPExportController.m @@ -38,6 +38,7 @@ @interface SPExportController (PrivateAPI) - (void)_updateDisplayedExportFilename; +- (void)_updateAvailableExportFilenameTokens; - (NSString *)_generateDefaultExportFilename; - (NSString *)_currentDefaultExportFileExtension; @@ -94,9 +95,6 @@ windowMinHeigth = [[self window] minSize].height; prefs = [NSUserDefaults standardUserDefaults]; - - // Default filename tokens - availableFilenameTokens = NSLocalizedString(@"host,database,table,date,time", @"default custom export filename tokens"); } return self; @@ -358,6 +356,8 @@ [exportCSVNULLValuesAsTextField setStringValue:[prefs stringForKey:SPNullValue]]; [exportXMLNULLValuesAsTextField setStringValue:[prefs stringForKey:SPNullValue]]; + [self _updateAvailableExportFilenameTokens]; + if (!showCustomFilenameView) [self _updateDisplayedExportFilename]; } @@ -379,8 +379,7 @@ [exportDeselectAllTablesButton setEnabled:isSelectedTables]; [exportRefreshTablesButton setEnabled:isSelectedTables]; - availableFilenameTokens = ([sender indexOfSelectedItem] == SPQueryExport) ? @"host,database,date,time" : @"host,database,table,date,time"; - + [self _updateAvailableExportFilenameTokens]; [self _updateDisplayedExportFilename]; } } @@ -432,10 +431,7 @@ * Opens the open panel when user selects to change the output path. */ - (IBAction)changeExportOutputPath:(id)sender -{ - [exportCustomFilenameTokenField setStringValue:@""]; - [exportCustomFilenameTokensField setStringValue:availableFilenameTokens]; - +{ NSOpenPanel *panel = [NSOpenPanel openPanel]; [panel setCanChooseFiles:NO]; @@ -716,6 +712,14 @@ } /** + * Updates the available export filename tokens. + */ +- (void)_updateAvailableExportFilenameTokens +{ + [exportCustomFilenameTokensField setStringValue:((exportSource == SPQueryExport) || (exportType == SPDotExport)) ? NSLocalizedString(@"host,database,date,time", @"custom export filename tokens without table") : NSLocalizedString(@"host,database,table,date,time", @"default custom export filename tokens")]; +} + +/** * Generates the default export filename based on the selected export options. */ - (NSString *)_generateDefaultExportFilename |