From bbe0f861dd4e3ab99aa3d555d3fc5db5ee5ae39d Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Mon, 24 May 2010 18:07:43 +0000 Subject: Merge export redesign branch back into trunk. Includes a completely redesign approach to all export data types based on the use of NSOperation subclasses. CSV, SQL, XML and dot export types are currently functional, while the source files for PDF and HTML export types exist they are to be implemented, but are currently hidden from the interface. Also includes the following: - Completely redesigned export interface. - The ability to customize CSV NULL values. - The ability to specify whether the UTF-8 BOM should be used in SQL dumps. - The ability to specify whether BLOB fields are output as hex or plain text during SQL dumps. Defaults to hex. - Exporting currently selected tables via the tables list context menu. Outstanding issues: - Not all progress indicators for all export types are functional (or functioning correctly). - A few issues related to the introduction of only exporting the content and create and drop syntax of specific tables during SQL dumps. Needs some serious testing and benchmarking to ensure it replicates the current export functionality. --- Interfaces/English.lproj/DBView.xib | 467 ++++- Interfaces/English.lproj/ExportDialog.xib | 3222 +++++++++++++++++++++-------- Interfaces/English.lproj/MainMenu.xib | 530 +---- 3 files changed, 2712 insertions(+), 1507 deletions(-) (limited to 'Interfaces') diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 731850fe..c78192b9 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -2,7 +2,7 @@ 1050 - 10D2094 + 10D573 762 1038.29 460.00 @@ -23,14 +23,13 @@ YES - - + YES com.brandonwalkin.BWToolkit - com.apple.InterfaceBuilder.CocoaPlugin com.apple.WebKitIBPlugin + com.apple.InterfaceBuilder.CocoaPlugin YES @@ -92,6 +91,7 @@ 290 {{5, 2}, {204, 19}} + YES 343014976 @@ -184,6 +184,7 @@ 4362 {218, 38} + YES @@ -228,7 +229,7 @@ controlColor 3 - MC42NjY2NjY2NjY3AA + MC42NjY2NjY2ODY1AA @@ -273,6 +274,7 @@ {{1, 1}, {218, 38}} + @@ -288,6 +290,7 @@ -2147483392 {{-100, -100}, {15, 8}} + _doScroller: 0.42105263471603394 @@ -297,6 +300,7 @@ -2147483392 {{-100, -100}, {223, 15}} + 1 _doScroller: @@ -305,6 +309,7 @@ {{-1, -13}, {220, 40}} + 2 @@ -315,6 +320,7 @@ {214, 26} + NSView @@ -337,6 +343,7 @@ 4352 {214, 354} + YES @@ -403,6 +410,7 @@ {214, 354} + @@ -413,6 +421,7 @@ -2147483392 {{197, 0}, {15, 292}} + _doScroller: 0.096045196056365967 @@ -423,6 +432,7 @@ -2147483392 {{-100, -100}, {141, 11}} + 257 _doScroller: @@ -431,6 +441,7 @@ {214, 354} + 528 @@ -441,11 +452,13 @@ {{0, 27}, {214, 354}} + NSView {214, 381} + 2 6 @@ -479,6 +492,7 @@ {214, 381} + NSView @@ -501,6 +515,7 @@ 4352 {214, 145} + YES @@ -567,6 +582,7 @@ {214, 145} + @@ -577,6 +593,7 @@ -2147483392 {{-100, -100}, {15, 20}} + _doScroller: 0.48965516686439514 @@ -587,6 +604,7 @@ -2147483392 {{-100, -100}, {141, 11}} + 257 _doScroller: @@ -595,6 +613,7 @@ {214, 145} + 512 @@ -605,11 +624,13 @@ {{0, 382}, {214, 145}} + NSView {{0, 23}, {214, 527}} + 2 NO @@ -660,6 +681,7 @@ 268 {{-1, -1}, {32, 24}} + YES 67239424 @@ -684,6 +706,7 @@ 268 {{30, -1}, {32, 24}} + YES 71433792 @@ -811,6 +834,7 @@ 268 {{61, -1}, {32, 24}} + YES 67239424 @@ -835,6 +859,7 @@ 268 {{92, -1}, {32, 24}} + YES -2080244224 @@ -861,6 +886,7 @@ {214, 23} + YES YES NO @@ -869,6 +895,7 @@ {214, 550} + NSView @@ -881,6 +908,7 @@ 274 {{-7, -10}, {741, 564}} + YES @@ -3932,6 +3960,7 @@ {542, 14} + @@ -3996,6 +4025,7 @@ {{1, 1}, {542, 69}} + @@ -4007,6 +4037,7 @@ 256 {{543, 1}, {11, 69}} + 256 _doScroller: @@ -4017,6 +4048,7 @@ -2147483392 {{-100, -100}, {87, 18}} + 1 _doScroller: @@ -4026,6 +4058,7 @@ {{96, 0}, {555, 71}} + 18 @@ -4037,6 +4070,7 @@ 268 {{22, 57}, {69, 14}} + YES 68288064 @@ -4051,6 +4085,7 @@ {651, 71} + NSView @@ -4073,6 +4108,7 @@ 2322 {542, 14} + @@ -4134,6 +4170,7 @@ {{1, 1}, {542, 196}} + @@ -4145,6 +4182,7 @@ 256 {{543, 1}, {11, 196}} + 256 _doScroller: @@ -4155,6 +4193,7 @@ -2147483392 {{-100, -100}, {87, 18}} + 1 _doScroller: @@ -4164,6 +4203,7 @@ {{96, 0}, {555, 198}} + 18 @@ -4175,6 +4215,7 @@ 268 {{10, 184}, {81, 14}} + YES 68288064 @@ -4189,11 +4230,13 @@ {{0, 80}, {651, 198}} + NSView {{24, 30}, {651, 278}} + TableInfoSplitter @@ -4201,6 +4244,7 @@ 268 {{79, 499}, {34, 14}} + YES 68288064 @@ -4217,6 +4261,7 @@ 266 {{300, 473}, {375, 14}} + YES 68288064 @@ -4233,6 +4278,7 @@ 266 {{303, 498}, {372, 14}} + YES 68288064 @@ -4249,6 +4295,7 @@ 268 {{56, 473}, {57, 14}} + YES 68288064 @@ -4265,6 +4312,7 @@ 268 {{57, 448}, {57, 14}} + YES 68288064 @@ -4281,6 +4329,7 @@ 268 {{115, 494}, {161, 22}} + YES -1539178944 @@ -4313,6 +4362,7 @@ 268 {{115, 469}, {161, 22}} + YES -1539178944 @@ -4345,6 +4395,7 @@ 268 {{115, 444}, {161, 22}} + YES -1539178944 @@ -4377,6 +4428,7 @@ 10 {{25, 425}, {650, 5}} + {0, 0} 67239424 @@ -4399,6 +4451,7 @@ 10 {{24, 314}, {650, 5}} + {0, 0} 67239424 @@ -4421,6 +4474,7 @@ 270 {{49, 398}, {251, 14}} + YES 68288064 @@ -4437,6 +4491,7 @@ 270 {{73, 376}, {227, 14}} + YES 68288064 @@ -4453,6 +4508,7 @@ 270 {{50, 354}, {250, 14}} + YES 68288064 @@ -4469,6 +4525,7 @@ 268 {{140, 332}, {160, 14}} + YES 68288064 @@ -4556,6 +4613,7 @@ 270 {{328, 398}, {347, 14}} + YES 68288064 @@ -4572,6 +4630,7 @@ 270 {{304, 376}, {371, 14}} + YES 68288064 @@ -4588,6 +4647,7 @@ 266 {{323, 354}, {352, 14}} + YES 68288064 @@ -4604,6 +4664,7 @@ 266 {{303, 332}, {372, 14}} + YES 68288064 @@ -4620,6 +4681,7 @@ 268 {{26, 330}, {20, 20}} + YES 71433792 @@ -4693,6 +4755,7 @@ 268 {{53, 332}, {90, 14}} + YES 68288064 @@ -4707,6 +4770,7 @@ {{10, 7}, {706, 544}} + Status @@ -5554,11 +5618,13 @@ {{215, 0}, {729, 550}} + NSView {{0, -1}, {944, 550}} + YES 2 DBViewSplitter @@ -5566,6 +5632,7 @@ {943, 549} + NSView @@ -6153,7 +6220,7 @@ {292, 112} {292, 108} - + 256 YES @@ -6162,7 +6229,6 @@ 256 {{17, 76}, {258, 14}} - YES 68288064 @@ -6179,7 +6245,6 @@ 258 {{20, 50}, {252, 18}} - YES -1804468671 @@ -6197,7 +6262,6 @@ 259 {{207, 13}, {70, 28}} - 1 YES @@ -6221,7 +6285,6 @@ 259 {{139, 13}, {70, 28}} - YES 67239424 @@ -6240,8 +6303,6 @@ {292, 110} - - {{0, 0}, {1920, 1178}} {292, 130} @@ -6870,7 +6931,7 @@ View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 107} @@ -7150,7 +7211,7 @@ {{0, 0}, {1440, 878}} {213, 129} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 1 @@ -7162,7 +7223,7 @@ View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 107} @@ -7318,7 +7379,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1440, 878}} {213, 129} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 7 @@ -7328,7 +7389,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Reset Auto Increment NSWindow - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {255, 95} @@ -7491,7 +7552,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1280, 1002}} {255, 117} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 1 @@ -7501,7 +7562,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 New Relation NSPanel - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 256 @@ -8102,7 +8163,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {302, 307} {{0, 0}, {1440, 878}} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 9 @@ -8112,7 +8173,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 New Trigger NSPanel - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {329, 348} @@ -8519,7 +8580,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1680, 1028}} {329, 370} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 3 @@ -8531,7 +8592,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 50} @@ -8651,7 +8712,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1920, 1178}} {213, 72} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 9 @@ -8663,7 +8724,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 107} @@ -8798,7 +8859,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1440, 878}} {213, 129} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 15 @@ -8810,7 +8871,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {350, 200} @@ -9033,7 +9094,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1680, 1028}} {350, 222} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 9 @@ -9045,7 +9106,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 107} @@ -9215,7 +9276,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1440, 878}} {213, 129} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 31 @@ -9225,7 +9286,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 MySQL Help NSPanel - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {351, 120} @@ -9619,7 +9680,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {1280, 1002}} {351, 136} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} MYSQL_HELP_WINDOW @@ -9753,7 +9814,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Secure Text Input Sheet NSPanel - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 256 @@ -9857,7 +9918,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {338, 138} {{0, 0}, {1280, 778}} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} @@ -11570,7 +11631,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 NSResponder - + 301 YES @@ -11696,7 +11757,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {269, 32} - NSView @@ -11751,7 +11811,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 disabledControlTextColor 3 - MC4zMzMzMzMzMzMzAA + MC4zMzMzMzMzNDMzAA @@ -12155,6 +12215,58 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 + + + Export + + 2147483647 + + + submenuAction: + + Export + + YES + + + As SQL dump... + + 2147483647 + + + 1 + + + + As CSV file... + + 2147483647 + + + 2 + + + + As XML file... + + 2147483647 + + + 3 + + + + + + + YES + YES + + + 2147483647 + + + Show Create Table Syntax... @@ -16793,6 +16905,30 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 7049 + + + exportSelectedTablesAs: + + + + 7057 + + + + exportSelectedTablesAs: + + + + 7058 + + + + exportSelectedTablesAs: + + + + 7059 + @@ -19471,6 +19607,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 + + Table List Menu @@ -23620,6 +23758,46 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 + + 7051 + + + YES + + + + + + 7052 + + + YES + + + + + + + + 7053 + + + + + 7054 + + + + + 7055 + + + + + 7056 + + + @@ -25048,6 +25226,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 7002.IBPluginDependency 7043.IBEditorWindowLastContentRect 7043.IBPluginDependency + 7051.IBPluginDependency + 7052.IBEditorWindowLastContentRect + 7052.IBPluginDependency + 7053.IBPluginDependency + 7054.IBPluginDependency + 7055.IBPluginDependency + 7056.IBPluginDependency 711.IBPluginDependency 711.ImportedFromIB2 713.IBPluginDependency @@ -26502,7 +26687,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit - {{774, 479}, {241, 123}} + {{545, 532}, {241, 153}} com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -27097,7 +27282,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{62, 45}, {943, 549}} + {{300, 144}, {943, 549}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{786, 522}, {157, 63}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -27242,7 +27434,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - 7049 + 7059 @@ -27656,7 +27848,21 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 SPExportController - NSObject + + IBProjectSource + Source/SPCSVExporterDelegate.h + + + + SPExportController + + IBProjectSource + Source/SPDotExporterDelegate.h + + + + SPExportController + NSWindowController YES @@ -27664,8 +27870,15 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 cancelExport: changeExportOutputPath: closeSheet: + refreshTableList: + selectDeselectAllTables: switchInput: switchTab: + toggleAdvancedExportOptionsView: + toggleCustomFilenameFormat: + toggleSQLIncludeContent: + toggleSQLIncludeDropSyntax: + toggleSQLIncludeStructure: YES @@ -27674,77 +27887,116 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 id id id + id + id + id + id + id + id + id YES YES - exampleNameLabel + customQueryInstance + errorsTextView + errorsWindow + exportAdvancedOptionsView + exportAdvancedOptionsViewButton + exportAdvancedOptionsViewLabelButton + exportButton exportCSVFieldsEscapedField exportCSVFieldsTerminatedField exportCSVFieldsWrappedField exportCSVIncludeFieldNamesCheck exportCSVLinesTerminatedField + exportCSVNULLValuesAsTextField + exportCompressOutputFile + exportCustomFilenameButton + exportCustomFilenameExampleTextField + exportCustomFilenameTokenField + exportCustomFilenameTokensField + exportCustomFilenameView + exportDeselectAllTablesButton exportExcelSheetOrFilePerTableMatrix exportFilePerTableCheck exportFilePerTableNote - exportHTMLIncludeHeadAndBodyTagsCheck exportHTMLIncludeStructureCheck exportInputMatrix exportPDFIncludeStructureCheck exportPathField - exportProcessLowMemory + exportProcessLowMemoryButton exportProgressIndicator exportProgressText exportProgressTitle exportProgressWindow + exportRefreshTablesButton + exportSQLBLOBFieldsAsHexCheck + exportSQLIncludeContentCheck exportSQLIncludeDropSyntaxCheck exportSQLIncludeErrorsCheck exportSQLIncludeStructureCheck + exportSelectAllTablesButton exportTabBar exportTableList + exportTableListButtonBar + exportTablelistScrollView exportToolbar - exportWindow - exportXMLIncludeStructureCheck + exportUseUTF8BOMButton + tableContentInstance tableDataInstance tableDocumentInstance tablesListInstance - tokenNameField - tokenNameTokensField - tokenNameView YES id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id + NSTextView + NSWindow + NSView + NSButton + NSButton + NSButton + NSComboBox + NSComboBox + NSComboBox + NSButton + NSComboBox + NSTextField + NSButton + NSButton + NSTextField + NSTokenField + NSTokenField + NSView + NSButton + NSMatrix + NSButton + NSTextField + NSButton + NSMatrix + NSButton + NSTextField + NSButton + NSProgressIndicator + NSTextField + NSTextField + NSWindow + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSTabView + NSTableView + BWAnchoredButtonBar + NSScrollView + NSToolbar + NSButton id id id @@ -27756,6 +28008,41 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Source/SPExportController.h + + SPExportController + + IBProjectSource + Source/SPExportInitializer.h + + + + SPExportController + + IBProjectSource + Source/SPHTMLExporterDelegate.h + + + + SPExportController + + IBProjectSource + Source/SPPDFExporterDelegate.h + + + + SPExportController + + IBProjectSource + Source/SPSQLExporterDelegate.h + + + + SPExportController + + IBProjectSource + Source/SPXMLExporterDelegate.h + + SPExtendedTableInfo NSObject @@ -28296,6 +28583,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 copyDatabase: export: exportMultipleTables: + exportSelectedTablesAs: exportTable: flushPrivileges: flushTable: @@ -28379,6 +28667,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 id id id + id @@ -29189,6 +29478,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 AppKit.framework/Headers/NSImageView.h + + NSMatrix + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSMatrix.h + + NSMenu NSObject @@ -29779,6 +30076,22 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 AppKit.framework/Headers/NSTextView.h + + NSTokenField + NSTextField + + IBFrameworkSource + AppKit.framework/Headers/NSTokenField.h + + + + NSToolbar + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbar.h + + NSTreeController NSObjectController diff --git a/Interfaces/English.lproj/ExportDialog.xib b/Interfaces/English.lproj/ExportDialog.xib index 3fe193b3..7280a41a 100644 --- a/Interfaces/English.lproj/ExportDialog.xib +++ b/Interfaces/English.lproj/ExportDialog.xib @@ -2,20 +2,30 @@ 1050 - 10C540 - 740 - 1038.25 - 458.00 + 10D573 + 762 + 1038.29 + 460.00 - com.apple.InterfaceBuilder.CocoaPlugin - 740 + YES + + YES + com.apple.InterfaceBuilder.CocoaPlugin + com.brandonwalkin.BWToolkit + + + YES + 762 + 1.2.5 + YES - + YES + com.brandonwalkin.BWToolkit com.apple.InterfaceBuilder.CocoaPlugin @@ -39,10 +49,10 @@ NSApplication - 4103 + 4111 2 - {{196, 53}, {450, 442}} - 603980800 + {{610, 309}, {450, 462}} + 611845120 Export NSWindow @@ -60,70 +70,24 @@ YES YES - 71D44334-3FBC-45B1-B724-01DC3CF04BC0 - 8029B183-E568-4575-BF79-8BF794BC1220 - B32841E9-2134-410A-847B-50A6C9EDC7D3 + 03BD47C1-9B50-40D4-A080-1A484AE7E779 D1BEB476-6BC7-4EC6-B7A0-34E53F5FE278 F3AE5F30-CB07-4A72-A032-5479D912598E FDB9B04C-C512-4453-833E-DBA4C5716E3E YES - - - 71D44334-3FBC-45B1-B724-01DC3CF04BC0 - - HTML - HTML - - - - NSImage - toolbar-export-html - - - - {0, 0} - {0, 0} - YES - YES - 5 - YES - 0 - - - - 8029B183-E568-4575-BF79-8BF794BC1220 - - PDF - PDF - - - - NSImage - toolbar-export-pdf - - - - {0, 0} - {0, 0} - YES - YES - 4 - YES - 0 - - + - B32841E9-2134-410A-847B-50A6C9EDC7D3 + 03BD47C1-9B50-40D4-A080-1A484AE7E779 - Excel - Excel + Dot + Dot - + NSImage - toolbar-export-xls + toolbar-export-xml @@ -131,7 +95,7 @@ {0, 0} YES YES - 6 + 7 YES 0 @@ -143,10 +107,7 @@ XML - - NSImage - toolbar-export-xml - + {0, 0} @@ -206,26 +167,23 @@ YES - - - + YES - - - + YES {3.40282e+38, 3.40282e+38} + {450, 462} 256 @@ -233,7 +191,7 @@ YES - 4364 + 4370 YES @@ -244,32 +202,46 @@ 4352 - {158, 228} + {179, 212} - - + YES + + + 256 + {179, 17} + + + + + -2147483392 {{144, 0}, {16, 17}} + YES - - switch - 15 - 15 + + tables + 122 + 10 1000 - 612499008 + 75628096 2048 - + Table LucidaGrande 11 3100 - - 3 - MC4zMzMzMzI5ODU2AA + + 6 + System + headerColor + + 3 + MQA + 6 @@ -281,15 +253,56 @@ - - 604110336 + + 67239488 + 133120 + Text Cell + + + YES + 1 + + 6 + System + controlBackgroundColor + + 3 + MC42NjY2NjY2ODY1AA + + + + 6 + System + controlTextColor + + + + 3 + YES + + + + structure + 15 + 15 + 15 + + 75628096 + 2048 + S + + + + + + 67239424 131072 - + Check 1211912703 2 - + NSImage NSSwitch @@ -306,53 +319,70 @@ YES - - tables - 137 - 10 - 3.4028230607370965e+38 + + content + 15 + 15 + 15 - 612499008 + 75628096 2048 - + C - - 6 - System - headerColor - - 3 - MQA - - + - - 604110400 - 133120 - Text Cell + + 67239424 + 131072 + Check - YES - 1 - - 6 - System - controlBackgroundColor - - 3 - MC42NjY2NjY2ODY1AA - - - - 6 - System - selectedInactiveColor - - + 1211912703 + 2 + + + + + 200 + 25 + + 3 + YES + YES + + + + drop + 15 + 15 + 15 + + 75628096 + 2048 + D + + + + + + 67239424 + 131072 + Check + + + 1211912703 + 2 + + + + + 200 + 25 3 YES + YES @@ -372,14 +402,14 @@ 306184192 - 4 + 5 15 0 YES 0 - {{1, 1}, {158, 228}} + {{1, 17}, {179, 212}} @@ -394,7 +424,7 @@ 256 _doScroller: - 0.99563318490982056 + 0.99530518054962158 @@ -406,20 +436,37 @@ _doScroller: 0.99479168653488159 + + + 2304 + + YES + + + {{1, 0}, {179, 17}} + + + + + 4 + + - {{40, 82}, {160, 230}} + {{40, 102}, {181, 230}} 530 + + QSAAAEEgAABBmAAAQZgAAA 268 - {{20, 318}, {104, 64}} + {{20, 338}, {104, 64}} YES 3 @@ -427,7 +474,7 @@ YES - -2080244224 + 67239424 131072 Filtered Results @@ -446,7 +493,7 @@ 67239424 131072 - Custom Query + Query Results 2 @@ -515,7 +562,7 @@ ZSwgSW5jLiwgMjAwOQA 75 - 67239424 + -2080244224 131072 Selected Tables @@ -631,7 +678,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 400 75 - + 2 + 6 System @@ -647,22 +695,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 12 - {{204, 78}, {230, 236}} + 17 + {{225, 76}, {209, 259}} YES sql - + 256 YES 268 - {{12, 163}, {71, 18}} + {{12, 186}, {71, 18}} YES @@ -673,7 +721,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1211912703 2 - + @@ -684,7 +732,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 - {{11, 187}, {53, 14}} + {{12, 210}, {47, 14}} YES @@ -694,29 +742,40 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - - 6 - System - controlTextColor - - + + + + + + 268 + {{12, 106}, {60, 14}} + + YES + + 68288064 + 272761856 + Advanced: + + + + 268 - {{12, 143}, {152, 18}} + {{12, 146}, {127, 18}} YES -2080244224 131072 - Add DROP TABLE syntax + DROP TABLE syntax 1211912703 2 - + @@ -727,18 +786,106 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 - {{12, 123}, {79, 18}} + {{12, 126}, {79, 18}} YES - -2080244224 + 67239424 131072 - Add errors + Errors 1211912703 2 - + + + + + 200 + 25 + + + + + 268 + {{12, 166}, {71, 18}} + + YES + + -2080244224 + 131072 + Content + + + 1211912703 + 2 + + + + + 200 + 25 + + + + + 292 + {{12, 62}, {162, 18}} + + YES + + 67239424 + 131072 + Add UTF-8 BOM to output + + + 1211912703 + 2 + + + + + 200 + 25 + + + + + 268 + {{12, 82}, {149, 18}} + + YES + + 67239424 + 131072 + Compress output (gzip) + + + 1211912703 + 2 + + + + + 200 + 25 + + + + + 268 + {{12, 42}, {161, 18}} + + YES + + -2080244224 + 131072 + Output BLOB fields as hex + + + 1211912703 + 2 + @@ -747,7 +894,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - {{10, 7}, {210, 216}} + {{10, 7}, {189, 239}} + SQL @@ -756,14 +904,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA excel - + 256 YES 268 - {{11, 103}, {106, 100}} + {{14, 126}, {106, 100}} YES 2 @@ -955,7 +1103,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 - {{30, 134}, {168, 42}} + {{33, 157}, {154, 42}} YES @@ -971,7 +1119,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 - {{30, 53}, {168, 42}} + {{33, 76}, {154, 42}} YES @@ -985,8 +1133,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - {{10, 7}, {210, 216}} - + {{10, 7}, {189, 239}} Excel @@ -1002,7 +1149,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 - {{11, 153}, {39, 14}} + {{5, 188}, {39, 14}} YES @@ -1018,7 +1165,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 - {{11, 39}, {36, 14}} + {{5, 89}, {36, 14}} YES @@ -1033,8 +1180,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 256 - {{52, 100}, {31, 17}} + 268 + {{46, 135}, {31, 17}} YES @@ -1049,8 +1196,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 256 - {{52, 125}, {59, 17}} + 268 + {{46, 160}, {59, 17}} YES @@ -1065,8 +1212,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 256 - {{14, 124}, {36, 22}} + 268 + {{8, 159}, {36, 22}} YES @@ -1157,8 +1304,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 256 - {{14, 99}, {36, 22}} + 268 + {{8, 134}, {36, 22}} YES @@ -1239,8 +1386,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 257 - {{14, 72}, {36, 22}} + 268 + {{8, 107}, {36, 22}} YES @@ -1321,8 +1468,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 257 - {{52, 73}, {41, 17}} + 268 + {{46, 108}, {41, 17}} YES @@ -1337,8 +1484,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 257 - {{14, 10}, {36, 22}} + 268 + {{8, 60}, {36, 22}} YES @@ -1420,8 +1567,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 257 - {{52, 11}, {59, 17}} + 268 + {{46, 61}, {59, 17}} YES @@ -1436,8 +1583,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 256 - {{11, 185}, {172, 18}} + 268 + {{5, 208}, {172, 18}} YES @@ -1455,8 +1602,46 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 25 + + + 268 + {{5, 39}, {88, 14}} + + YES + + 68288064 + 272761856 + NULL values: + + + + + + + + + 268 + {{8, 12}, {55, 19}} + + YES + + -1804468671 + 272761856 + + + + YES + + + 6 + System + textColor + + + + - {{10, 7}, {210, 216}} + {{10, 7}, {189, 239}} CSV @@ -1472,7 +1657,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 - {{12, 163}, {71, 18}} + {{12, 186}, {71, 18}} YES @@ -1483,7 +1668,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1211912703 2 - + @@ -1494,7 +1679,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 - {{11, 187}, {53, 14}} + {{11, 210}, {53, 14}} YES @@ -1507,30 +1692,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - - - 268 - {{12, 143}, {163, 18}} - - YES - - -2080244224 - 131072 - <head> and <body> tags - - - 1211912703 - 2 - - - - - 200 - 25 - - - {{10, 7}, {210, 216}} + {{10, 7}, {189, 239}} HTML @@ -1541,48 +1704,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 - - YES - - - 268 - {{12, 163}, {71, 18}} - - YES - - -2080244224 - 131072 - Structure - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 268 - {{11, 187}, {53, 14}} - - YES - - 68288064 - 272761856 - Include: - - - - - - - - {{10, 7}, {210, 216}} + {{10, 7}, {189, 239}} XML @@ -1598,7 +1720,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 - {{12, 163}, {71, 18}} + {{12, 186}, {71, 18}} YES @@ -1609,7 +1731,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1211912703 2 - + @@ -1620,7 +1742,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 - {{11, 187}, {53, 14}} + {{11, 210}, {53, 14}} YES @@ -1634,26 +1756,37 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - {{10, 7}, {210, 216}} + {{10, 7}, {189, 239}} PDF + + dot + + + 256 + {{10, 7}, {189, 239}} + + Dot + + + - + 4 YES YES YES - + - 268 + 289 {{340, 12}, {96, 32}} 1 @@ -1674,8 +1807,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 268 - {{34, 12}, {96, 32}} + 289 + {{248, 12}, {96, 32}} YES @@ -1692,10 +1825,99 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 25 + + + -2147483358 + + YES + + + 34 + + YES + + + 256 + + YES + + + 292 + {{10, 12}, {230, 18}} + + YES + + 67239424 + 131072 + Low memory export (may block server) + + + 1211912703 + 2 + + + + + 200 + 25 + + + + {{1, 1}, {394, 40}} + + + + {{-3, -4}, {396, 42}} + + {0, 0} + + 67239424 + 0 + Box + + + + 3 + MCAwLjgwMDAwMDAxMTkAA + + + + 1 + 0 + 0 + NO + + + + 268 + {{-103, 10}, {100, 18}} + + YES + + 67239424 + 131072 + LOW_PRIORITY + + + 1211912703 + 2 + + + + + 200 + 25 + + + + {{40, 9}, {390, 36}} + + NSView + - 268 - {{226, 366}, {116, 18}} + -2147483380 + {{226, 386}, {116, 18}} YES @@ -1706,7 +1928,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1211912703 2 - + @@ -1716,8 +1938,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 268 - {{246, 321}, {168, 42}} + -2147483380 + {{246, 341}, {187, 42}} YES @@ -1733,7 +1955,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 - {{17, 408}, {31, 14}} + {{17, 428}, {31, 14}} YES @@ -1748,8 +1970,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 268 - {{53, 406}, {285, 19}} + 266 + {{53, 426}, {285, 19}} YES @@ -1760,18 +1982,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - - 6 - System - textColor - - + - 12 - {{20, 395}, {410, 5}} + 10 + {{20, 415}, {410, 5}} {0, 0} @@ -1792,8 +2009,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 268 - {{341, 400}, {94, 28}} + 265 + {{341, 420}, {94, 28}} YES @@ -1810,70 +2027,185 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 25 - + - 268 - {{37, 58}, {230, 18}} + 290 + + YES + + + 289 + {{118, 0}, {32, 24}} + + YES + + 67239424 + 134348800 + + + + 113524991 + 163 + + NSImage + selectnone + + + + 200 + 25 + + + + + 289 + {{149, 0}, {32, 24}} + + 1 + YES + + 67239424 + 134348800 + + + + 114049279 + 163 + + NSImage + selectall + + + + 200 + 25 + + + + + 292 + {32, 24} + + YES + + 67239424 + 134348800 + + + + 113524991 + 163 + + NSImage + NSRefreshTemplate + + + + 200 + 25 + + + + {{40, 79}, {181, 24}} + + NO + NO + NO + 2 + + + + 292 + {{30, 45}, {29, 26}} YES - + 67239424 - 131072 - Low memory export (may block server) + 134217728 + + + + -1195491073 + 402653253 + + + a + 400 + 75 + + + + + 292 + {{53, 46}, {56, 22}} + + YES + + -2080244224 + 134348800 + Advanced - - 1211912703 - 2 - - + + -2046410497 + 1 + + LucidaGrande-Bold + 11 + 16 + - 200 - 25 + 400 + 75 - {450, 442} + {450, 462} - {{0, 0}, {1920, 1178}} + {{0, 0}, {1680, 1028}} + {450, 539} {3.40282e+38, 3.40282e+38} - + 299 YES - + 268 - {{17, 136}, {91, 17}} + {{18, 134}, {184, 18}} - YES - - 68288064 - 272630784 - Name format: + + 67239424 + 0 + Custom Filename Format: - - - + + 1211912703 + 2 + + + + + 200 + 25 - + - 268 - {{17, 20}, {106, 14}} + 266 + {{17, 20}, {390, 14}} - YES - + 68288064 272761856 - Example file name: + Example: - + @@ -1893,12 +2225,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 258 {{4, 7}, {383, 22}} - YES - -2077098431 - 4195328 - database,table,date,time,server + -1540227519 + 4199424 + host,database,table,date,time @@ -1908,12 +2239,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {388, 38}} - {{17, 60}, {390, 40}} - {0, 0} 67239424 @@ -1935,14 +2264,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 - {{17, 42}, {215, 14}} + {{17, 42}, {226, 14}} - YES 68288064 272761856 - Drag the tokens to customize a format. + Drag the tokens to customize the format. @@ -1954,10 +2282,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 266 {{20, 106}, {384, 22}} - YES - -1804468671 + -1267597759 272630784 @@ -1967,27 +2294,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - - - 270 - {{125, 20}, {282, 14}} - - - YES - - 68288064 - 272761856 - <name> - - - - - - {424, 164} - - NSCustomView NSResponder @@ -2004,7 +2312,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {3.40282e+38, 3.40282e+38} {213, 50} - + 256 YES @@ -2014,7 +2322,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{18, 56}, {343, 20}} - 16394 100 @@ -2023,7 +2330,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 {{59, 84}, {300, 17}} - YES 67239488 @@ -2050,7 +2356,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 {{279, 12}, {83, 32}} - YES 67239424 @@ -2076,7 +2381,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 {{59, 104}, {300, 17}} - YES 67239488 @@ -2109,7 +2413,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{20, 87}, {32, 32}} - YES 130560 @@ -2127,80 +2430,269 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {379, 139} - - {{0, 0}, {1680, 1028}} {213, 72} {3.40282e+38, 3.40282e+38} - - - - YES - - - exportWindow - - - - 241 - - - - exportToolbar - - - - 242 - - - - switchTab: - - - - 243 - - - - exportTableList - - - - 244 - - - - exportTabBar - - - - 245 - - - - switchInput: - - - - 246 - - - - exportInputMatrix - - - - 247 - - - - exportFilePerTableCheck - - - - 248 + + 9 + 2 + {{467, 379}, {405, 267}} + 1886912512 + Error + NSWindow + + View + + {3.40282e+38, 3.40282e+38} + {213, 107} + + + 256 + + YES + + + 264 + {{17, 233}, {217, 14}} + + YES + + 67239424 + 4194304 + The following export errors occurred: + + + + + + + + + 274 + + YES + + + 2304 + + YES + + + 2322 + {352, 14} + + + + + + + + + + + YES + + + 6 + + + + 352 + 1 + + + 2305 + 0 + + + + YES + + YES + NSBackgroundColor + NSColor + + + YES + + 6 + System + selectedTextBackgroundColor + + + + 6 + System + selectedTextColor + + + + + + + + + 6 + {717, 1e+07} + {64, 0} + + + + {{1, 1}, {352, 178}} + + + + + + {4, -5} + 1 + + 4 + + + + 256 + {{353, 1}, {11, 178}} + + 256 + + _doScroller: + 1 + + + + -2147483392 + {{-100, -100}, {87, 18}} + + 257 + + _doScroller: + 1 + 0.94565218687057495 + + + {{20, 45}, {365, 180}} + + + 18 + + + + + + + 257 + {{301, 13}, {89, 28}} + + YES + + 67239424 + 138051584 + Close + + + -2038284033 + 1 + + Helvetica + 11 + 16 + + + DQ + 200 + 25 + + + + + 257 + {{350, -130}, {80, 28}} + + YES + + 67239424 + 138051584 + Close + + + -2038284033 + 1 + + + Gw + 200 + 25 + + + + {405, 267} + + {{0, 0}, {1680, 1028}} + {213, 129} + {3.40282e+38, 3.40282e+38} + + + + + YES + + + exportToolbar + + + + 242 + + + + switchTab: + + + + 243 + + + + exportTableList + + + + 244 + + + + exportTabBar + + + + 245 + + + + switchInput: + + + + 246 + + + + exportInputMatrix + + + + 247 + + + + exportFilePerTableCheck + + + + 248 @@ -2290,22 +2782,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 259 - - - exportHTMLIncludeHeadAndBodyTagsCheck - - - - 260 - - - - exportXMLIncludeStructureCheck - - - - 261 - exportPDFIncludeStructureCheck @@ -2330,14 +2806,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 266 - - - switchTab: - - - - 267 - switchTab: @@ -2346,14 +2814,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 - - - switchTab: - - - - 269 - switchTab: @@ -2362,46 +2822,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 270 - - - switchTab: - - - - 271 - - - - tokenNameView - - - - 272 - - - - exampleNameLabel - - - - 273 - - - - tokenNameTokensField - - - - 274 - - - - tokenNameField - - - - 275 - delegate @@ -2492,68 +2912,359 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - exportProcessLowMemory + exportSelectAllTablesButton - + - 312 + 345 - - - - YES - - 0 - - - + + + exportDeselectAllTablesButton + + - - -2 - - - File's Owner + 346 + + + + exportRefreshTablesButton + + - - -1 - - - First Responder + 347 + + + + selectDeselectAllTables: + + - - -3 - - - Application + 348 + + + + selectDeselectAllTables: + + - - 1 - - - YES - - - - - Export Window + 349 + + + + refreshTableList: + + - - 2 - - - YES - - - - - - - - - + 350 + + + + toggleAdvancedExportOptionsView: + + + + 388 + + + + exportAdvancedOptionsView + + + + 389 + + + + window + + + + 390 + + + + exportTablelistScrollView + + + + 391 + + + + exportTableListButtonBar + + + + 392 + + + + exportAdvancedOptionsViewButton + + + + 393 + + + + toggleSQLIncludeStructure: + + + + 410 + + + + toggleSQLIncludeContent: + + + + 411 + + + + toggleSQLIncludeDropSyntax: + + + + 412 + + + + exportProcessLowMemoryButton + + + + 415 + + + + exportCustomFilenameView + + + + 417 + + + + exportCustomFilenameTokenField + + + + 419 + + + + exportCustomFilenameTokensField + + + + 420 + + + + exportSQLIncludeContentCheck + + + + 428 + + + + exportButton + + + + 429 + + + + exportAdvancedOptionsViewLabelButton + + + + 432 + + + + toggleAdvancedExportOptionsView: + + + + 433 + + + + initialFirstResponder + + + + 453 + + + + errorsWindow + + + + 454 + + + + delegate + + + + 455 + + + + errorsTextView + + + + 456 + + + + closeSheet: + + + + 457 + + + + switchTab: + + + + 461 + + + + exportCustomFilenameExampleTextField + + + + 464 + + + + toggleCustomFilenameFormat: + + + + 467 + + + + delegate + + + + 468 + + + + exportCustomFilenameButton + + + + 469 + + + + exportSQLBLOBFieldsAsHexCheck + + + + 484 + + + + exportCSVNULLValuesAsTextField + + + + 485 + + + + exportUseUTF8BOMButton + + + + 486 + + + + exportCompressOutputFile + + + + 487 + + + + + YES + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 1 + + + YES + + + + + Export Window + + + 2 + + + YES + + + + + + - + + + + + + + @@ -2563,11 +3274,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - - - - + + @@ -2576,31 +3285,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - - 5 - - - - - 6 - - - - - 7 - - - 8 - - 9 - - - 10 @@ -2609,6 +3298,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + @@ -2641,6 +3331,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + @@ -2801,39 +3492,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - - - - 35 - - - YES - - - - - - 36 - - - YES - - - - - - 37 - - - - - 38 - - - 39 @@ -2841,7 +3502,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - @@ -2864,23 +3524,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 42 - - - YES - - - - - - 43 - - - - - 44 - - + 44 + + 45 @@ -2903,6 +3549,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + @@ -3134,375 +3782,728 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + + + + - 79 - + 79 + + + YES + + + + + + 80 + + + YES + + + + + + 81 + + + YES + + + + + + 82 + + + YES + + + + + + 83 + + + + + 84 + + + + + 85 + + + + + 86 + + + + + 87 + + + + + 88 + + + + + 89 + + + YES + + + + + + + + + 90 + + + + + 91 + + + + + 93 + + + YES + + + + + + 94 + + + + + 97 + + + YES + + + + + + + + Token Name View + + + 180 + + + YES + + + + + + 162 + + + YES + + + + + + 179 + + + YES + + + + + + 130 + + + YES + + + + + + 131 + + + + + 163 + + + + + 181 + + + + + 285 + + + YES + + + + + + 286 + + + + + 287 + + + YES + + + + + + 288 + + + + + 289 + + + + + 290 + + + YES + + + + + + 291 + + + + + 294 + + + YES + + + + Export Progress Sheet + + + 295 + + + YES + + + + + + + + + + 296 + + + YES + + + + + + 297 + + + YES + + + + + + 298 + + + + + 299 + + + YES + + + + + + 300 + + + YES + + + + + + 301 + + + + + 302 + + + + + 303 + + + + + 304 + + + + + 317 + + + YES + + + + + + 318 + + + + + 327 + + + YES + + + + + + + + 329 + + + YES + + + + + + 331 + + + YES + + + + + + 332 + + + + + 341 + + + + + 343 + YES - + - + - 80 - - - YES - - - + 344 + + - 81 - + 351 + YES - + - + - 82 - + 353 + YES - + - + - 83 - - + 357 + + - 84 - - + 358 + + + YES + + + - 85 - - + 360 + + - 86 - - + 361 + + + YES + + + + + Advanced View for INSERT - 87 - - + 367 + + + YES + + + - 88 - - + 370 + + - 89 - + 382 + YES - - + - - - - 90 - - + - 91 - - + 385 + + - 92 - + 404 + YES - + - + - 93 - + 405 + YES - + - + - 94 - - + 408 + + - 95 - - + 356 + + - 97 - - - YES - - - - - - - - - Token Name View + 413 + + - 184 - + 430 + YES - + - + - 164 - + 431 + + + + + 441 + YES - + - + + Error Sheet - 180 - + 442 + YES - + + + + - + - 162 - + 443 + YES - + - + + Push Button (Close Dummy for ESC) - 179 - + 444 + YES - + + + - + - 160 - + 445 + YES - + - - - - 161 - - + - 130 - + 446 + YES - + - + - 131 - - + 447 + + - 163 - - + 448 + + - 181 - - + 449 + + - 165 - - + 450 + + - 185 - - + 451 + + - 285 - - - YES - - - + 452 + + - 286 - - + 458 + + - 287 - + 459 + YES - + - + - 288 - - + 460 + + - 289 - - + 6 + + - 290 - + 462 + YES - + - + - 291 - - + 463 + + - 294 - + 465 + YES - + - - Export Progress Sheet + - 295 - - - YES - - - - - - - + 466 + + - 296 - + 472 + YES - + - + - 297 - + 473 + + + + + 474 + YES - + - + - 298 - - + 475 + + - 299 - + 476 + YES - + - + - 300 - + 477 + + + + + 478 + YES - + - - - - 301 - - + - 302 - - + 479 + + - 303 - - + 480 + + + YES + + + - 304 - - + 481 + + - 310 - + 482 + YES - + - + - 311 - - + 483 + + @@ -3517,6 +4518,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1.IBViewEditorWindowController.showingLayoutRectangles 1.IBWindowTemplateEditedContentRect 1.NSWindowTemplate.visibleAtLaunch + 1.windowTemplate.hasMinSize + 1.windowTemplate.minSize 10.IBPluginDependency 11.IBPluginDependency 12.IBPluginDependency @@ -3530,20 +4533,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 14.IBPluginDependency 15.IBPluginDependency 16.IBPluginDependency - 160.IBPluginDependency - 161.IBPluginDependency 162.IBPluginDependency 163.IBPluginDependency - 164.IBPluginDependency - 165.IBPluginDependency 17.IBPluginDependency 179.IBPluginDependency 18.IBPluginDependency 180.CustomClassName 180.IBPluginDependency 181.IBPluginDependency - 184.IBPluginDependency - 185.IBPluginDependency 19.IBPluginDependency 2.IBPluginDependency 2.IBUserGuides @@ -3590,31 +4587,99 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 303.IBPluginDependency 304.IBPluginDependency 31.IBPluginDependency - 310.IBPluginDependency - 311.IBPluginDependency + 317.IBPluginDependency + 318.IBPluginDependency 32.IBPluginDependency + 327.IBPluginDependency + 329.IBAttributePlaceholdersKey + 329.IBPluginDependency 33.IBPluginDependency + 331.IBAttributePlaceholdersKey + 331.IBPluginDependency + 332.IBPluginDependency 34.IBPluginDependency - 35.IBPluginDependency - 36.IBPluginDependency - 37.IBPluginDependency - 38.IBPluginDependency + 341.IBPluginDependency + 343.IBAttributePlaceholdersKey + 343.IBPluginDependency + 344.IBPluginDependency + 351.IBPluginDependency + 353.IBPluginDependency + 356.IBPluginDependency + 357.IBPluginDependency + 358.IBPluginDependency + 360.IBPluginDependency + 361.IBEditorWindowLastContentRect + 361.IBPluginDependency + 367.IBPluginDependency + 370.IBPluginDependency + 382.IBAttributePlaceholdersKey + 382.IBPluginDependency + 385.IBPluginDependency 39.IBPluginDependency 4.IBPluginDependency 40.IBPluginDependency + 404.IBPluginDependency + 405.IBPluginDependency + 408.IBPluginDependency 41.IBPluginDependency - 42.IBPluginDependency - 43.IBPluginDependency + 413.IBPluginDependency + 430.IBPluginDependency + 431.IBPluginDependency 44.IBPluginDependency + 441.IBEditorWindowLastContentRect + 441.IBPluginDependency + 441.IBWindowTemplateEditedContentRect + 441.ImportedFromIB2 + 441.windowTemplate.hasMaxSize + 441.windowTemplate.hasMinSize + 441.windowTemplate.maxSize + 441.windowTemplate.minSize + 442.IBPluginDependency + 442.ImportedFromIB2 + 443.IBPluginDependency + 443.ImportedFromIB2 + 444.IBPluginDependency + 444.ImportedFromIB2 + 445.IBPluginDependency + 445.ImportedFromIB2 + 446.IBPluginDependency + 446.ImportedFromIB2 + 447.IBPluginDependency + 448.IBPluginDependency + 449.IBPluginDependency + 449.IBShouldRemoveOnLegacySave 45.IBPluginDependency + 450.IBPluginDependency + 450.IBShouldRemoveOnLegacySave + 451.IBPluginDependency + 451.ImportedFromIB2 + 452.IBPluginDependency + 458.IBPluginDependency + 459.IBPluginDependency 46.IBPluginDependency + 460.IBPluginDependency + 462.IBPluginDependency + 463.IBPluginDependency + 465.IBPluginDependency + 466.IBPluginDependency 47.IBPluginDependency 47.ImportedFromIB2 + 472.IBPluginDependency + 473.IBPluginDependency + 474.IBPluginDependency + 475.IBPluginDependency + 476.IBPluginDependency + 477.IBPluginDependency + 478.IBPluginDependency + 479.IBPluginDependency 48.IBPluginDependency + 480.IBPluginDependency + 481.IBPluginDependency + 482.IBPluginDependency + 483.IBPluginDependency 49.IBAttributePlaceholdersKey 49.IBPluginDependency 49.ImportedFromIB2 - 5.IBPluginDependency 50.IBPluginDependency 50.ImportedFromIB2 51.IBPluginDependency @@ -3646,7 +4711,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 67.IBPluginDependency 68.IBPluginDependency 69.IBPluginDependency - 7.IBPluginDependency 70.IBPluginDependency 71.IBPluginDependency 72.IBPluginDependency @@ -3668,13 +4732,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 87.IBPluginDependency 88.IBPluginDependency 89.IBPluginDependency - 9.IBPluginDependency 90.IBPluginDependency 91.IBPluginDependency - 92.IBPluginDependency 93.IBPluginDependency 94.IBPluginDependency - 95.IBPluginDependency 97.IBEditorWindowLastContentRect 97.IBPluginDependency 97.ImportedFromIB2 @@ -3682,12 +4743,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES com.apple.InterfaceBuilder.CocoaPlugin - {{357, 311}, {450, 442}} + {{360, 183}, {450, 462}} com.apple.InterfaceBuilder.CocoaPlugin - {{357, 311}, {450, 442}} + {{360, 183}, {450, 462}} + + {450, 462} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -3719,23 +4782,111 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + NSTokenField + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + YES + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{523, 449}, {379, 139}} + com.apple.InterfaceBuilder.CocoaPlugin + {{523, 449}, {379, 139}} + + + {213, 50} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{277, 476}, {616, 169}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - NSTokenField + com.brandonwalkin.BWToolkit + + ToolTip + + ToolTip + + Refresh table list + + + com.brandonwalkin.BWToolkit + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Unmark all tables + + + com.brandonwalkin.BWToolkit + com.brandonwalkin.BWToolkit + com.apple.InterfaceBuilder.CocoaPlugin + com.brandonwalkin.BWToolkit + + ToolTip + + ToolTip + + Mark all tables + + + com.brandonwalkin.BWToolkit + com.brandonwalkin.BWToolkit com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - YES - + {{63, 565}, {360, 157}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Advanced export settings + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -3749,30 +4900,33 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + {{503, 186}, {405, 267}} com.apple.InterfaceBuilder.CocoaPlugin - {{523, 449}, {379, 139}} + {{503, 186}, {405, 267}} + + + + {3.40282e+38, 3.40282e+38} + {213, 107} com.apple.InterfaceBuilder.CocoaPlugin - {{523, 449}, {379, 139}} - - - {213, 50} + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - - {{458, 613}, {616, 0}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -3783,6 +4937,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -3795,7 +4950,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -3808,7 +4962,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -3885,11 +5038,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{454, 460}, {424, 164}} + {{424, 446}, {424, 164}} com.apple.InterfaceBuilder.CocoaPlugin @@ -3910,7 +5059,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 312 + 491 @@ -3950,6 +5099,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA Source/SPContentFilterManager.h + + NSObject + + IBProjectSource + Source/SPMainThreadTrampoline.h + + NSObject @@ -3975,6 +5131,48 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA Source/TablesList.h + + NSTextView + + YES + + YES + doDecomposedStringWithCanonicalMapping: + doDecomposedStringWithCompatibilityMapping: + doPrecomposedStringWithCanonicalMapping: + doPrecomposedStringWithCompatibilityMapping: + doRemoveDiacritics: + doSelectionLowerCase: + doSelectionTitleCase: + doSelectionUpperCase: + doTranspose: + insertNULLvalue: + selectCurrentLine: + selectCurrentWord: + selectEnclosingBrackets: + + + YES + id + id + id + id + id + id + id + id + id + id + id + id + id + + + + IBProjectSource + Source/SPTextViewAdditions.h + + NSWindow @@ -3984,7 +5182,21 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA SPExportController - NSObject + + IBProjectSource + Source/SPCSVExporterDelegate.h + + + + SPExportController + + IBProjectSource + Source/SPDotExporterDelegate.h + + + + SPExportController + NSWindowController YES @@ -3992,8 +5204,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA cancelExport: changeExportOutputPath: closeSheet: + refreshTableList: + selectDeselectAllTables: switchInput: switchTab: + toggleAdvancedExportOptionsView: + toggleCustomFilenameFormat: + toggleSQLIncludeContent: + toggleSQLIncludeDropSyntax: + toggleSQLIncludeStructure: YES @@ -4002,79 +5221,116 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA id id id + id + id + id + id + id + id + id YES YES - exampleNameLabel + customQueryInstance + errorsTextView + errorsWindow + exportAdvancedOptionsView + exportAdvancedOptionsViewButton + exportAdvancedOptionsViewLabelButton + exportButton exportCSVFieldsEscapedField exportCSVFieldsTerminatedField exportCSVFieldsWrappedField exportCSVIncludeFieldNamesCheck exportCSVLinesTerminatedField + exportCSVNULLValuesAsTextField + exportCompressOutputFile + exportCustomFilenameButton + exportCustomFilenameExampleTextField + exportCustomFilenameTokenField + exportCustomFilenameTokensField + exportCustomFilenameView + exportDeselectAllTablesButton exportExcelSheetOrFilePerTableMatrix exportFilePerTableCheck exportFilePerTableNote - exportHTMLIncludeHeadAndBodyTagsCheck exportHTMLIncludeStructureCheck exportInputMatrix exportPDFIncludeStructureCheck exportPathField - exportProcessLowMemory + exportProcessLowMemoryButton exportProgressIndicator exportProgressText exportProgressTitle exportProgressWindow + exportRefreshTablesButton + exportSQLBLOBFieldsAsHexCheck + exportSQLIncludeContentCheck exportSQLIncludeDropSyntaxCheck exportSQLIncludeErrorsCheck exportSQLIncludeStructureCheck + exportSelectAllTablesButton exportTabBar exportTableList + exportTableListButtonBar + exportTablelistScrollView exportToolbar - exportWindow - exportXMLIncludeStructureCheck + exportUseUTF8BOMButton + tableContentInstance tableDataInstance tableDocumentInstance - tableWindow tablesListInstance - tokenNameField - tokenNameTokensField - tokenNameView YES id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id + NSTextView + NSWindow + NSView + NSButton + NSButton + NSButton + NSComboBox + NSComboBox + NSComboBox + NSButton + NSComboBox + NSTextField + NSButton + NSButton + NSTextField + NSTokenField + NSTokenField + NSView + NSButton + NSMatrix + NSButton + NSTextField + NSButton + NSMatrix + NSButton + NSTextField + NSButton + NSProgressIndicator + NSTextField + NSTextField + NSWindow + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSTabView + NSTableView + BWAnchoredButtonBar + NSScrollView + NSToolbar + NSButton id id id @@ -4086,9 +5342,68 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA Source/SPExportController.h + + SPExportController + + IBProjectSource + Source/SPExportInitializer.h + + + + SPExportController + + IBProjectSource + Source/SPHTMLExporterDelegate.h + + + + SPExportController + + IBProjectSource + Source/SPPDFExporterDelegate.h + + + + SPExportController + + IBProjectSource + Source/SPSQLExporterDelegate.h + + + + SPExportController + + IBProjectSource + Source/SPXMLExporterDelegate.h + + YES + + BWAnchoredButton + NSButton + + IBFrameworkSource + BWToolkitFramework.framework/Headers/BWAnchoredButton.h + + + + BWAnchoredButtonBar + NSView + + IBFrameworkSource + BWToolkitFramework.framework/Headers/BWAnchoredButtonBar.h + + + + BWAnchoredButtonCell + NSButtonCell + + IBFrameworkSource + BWToolkitFramework.framework/Headers/BWAnchoredButtonCell.h + + NSActionCell NSCell @@ -4140,6 +5455,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA AppKit.framework/Headers/NSUserInterfaceItemSearching.h + + NSApplication + + IBFrameworkSource + BWToolkitFramework.framework/Headers/NSApplication+BWAdditions.h + + NSBox NSView @@ -4487,6 +5809,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA Growl.framework/Headers/GrowlApplicationBridge.h + + NSObject + + IBFrameworkSource + PSMTabBar.framework/Headers/PSMTabBarCell.h + + + + NSObject + + IBFrameworkSource + PSMTabBar.framework/Headers/PSMTabBarControl.h + + NSObject @@ -4642,11 +5978,27 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA AppKit.framework/Headers/NSTableColumn.h + + NSTableHeaderView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSTableHeaderView.h + + NSTableView NSControl + + NSText + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSText.h + + NSTextField NSControl @@ -4663,6 +6015,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA AppKit.framework/Headers/NSTextFieldCell.h + + NSTextView + NSText + + IBFrameworkSource + AppKit.framework/Headers/NSTextView.h + + NSTokenField NSTextField @@ -4710,6 +6070,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSResponder + + NSView + + IBFrameworkSource + BWToolkitFramework.framework/Headers/NSView+BWAdditions.h + + NSWindow @@ -4732,9 +6099,29 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA AppKit.framework/Headers/NSWindowScripting.h + + NSWindow + + IBFrameworkSource + BWToolkitFramework.framework/Headers/NSWindow+BWAdditions.h + + + + NSWindowController + NSResponder + + showWindow: + id + + + IBFrameworkSource + AppKit.framework/Headers/NSWindowController.h + + 0 + IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx @@ -4750,5 +6137,30 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES ../../sequel-pro.xcodeproj 3 + + YES + + YES + NSApplicationIcon + NSRefreshTemplate + NSSwitch + selectall + selectnone + toolbar-export-csv + toolbar-export-sql + toolbar-export-xml + + + YES + {128, 128} + {10, 12} + {15, 15} + {14, 17} + {14, 17} + {32, 32} + {32, 32} + {32, 32} + + diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib index 26ba4dc4..6b7962a2 100644 --- a/Interfaces/English.lproj/MainMenu.xib +++ b/Interfaces/English.lproj/MainMenu.xib @@ -2,7 +2,7 @@ 1050 - 10D2094 + 10D573 762 1038.29 460.00 @@ -12,7 +12,7 @@ YES - + YES @@ -407,8 +407,6 @@ - YES - YES Export… E 1048576 @@ -417,196 +415,6 @@ -1 - - - Export - - 1048576 - 2147483647 - - - submenuAction: - - Export - - YES - - - MySQL dump… - - 1048576 - 2147483647 - - - 5 - - - - Graphviz dot file... - - 2147483647 - - - 14 - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Current Table - - 1048576 - 2147483647 - - - submenuAction: - - Current Table - - YES - - - CSV file... - - 1048576 - 2147483647 - - - 6 - - - - XML file... - - 1048576 - 2147483647 - - - 7 - - - - - - - Current Browse View - - 1048576 - 2147483647 - - - submenuAction: - - Current Browse View - - YES - - - CSV file... - - 1048576 - 2147483647 - - - 8 - - - - XML file... - - 1048576 - 2147483647 - - - 9 - - - - - - - Custom Query Result - - 1048576 - 2147483647 - - - submenuAction: - - Custom Query Result - - YES - - - CSV file... - - 1048576 - 2147483647 - - - 10 - - - - XML file... - - 1048576 - 2147483647 - - - 11 - - - - - - - Multiple Tables - - 1048576 - 2147483647 - - - submenuAction: - - Multiple Tables - - YES - - - CSV file... - - 1048576 - 2147483647 - - - 12 - - - - XML file... - - 1048576 - 2147483647 - - - 13 - - - - - - - YES @@ -2175,30 +1983,6 @@ 218 - - - export: - - - - 427 - - - - export: - - - - 430 - - - - export: - - - - 434 - donate: @@ -2407,22 +2191,6 @@ 677 - - - exportMultipleTables: - - - - 681 - - - - exportMultipleTables: - - - - 682 - checkTable: @@ -2759,14 +2527,6 @@ 929 - - - export: - - - - 931 - selectEnclosingBrackets: @@ -2991,38 +2751,6 @@ 1072 - - - exportTable: - - - - 1073 - - - - exportTable: - - - - 1074 - - - - exportTable: - - - - 1075 - - - - exportTable: - - - - 1076 - copyDatabase: @@ -3270,7 +2998,6 @@ - @@ -3333,107 +3060,6 @@ - - 372 - - - YES - - - - - - 373 - - - YES - - - - - - - - - - - - 377 - - - - - 378 - - - - - 385 - - - YES - - - - - - 394 - - - YES - - - - - - 395 - - - YES - - - - - - - 405 - - - - - 433 - - - - - 400 - - - YES - - - - - - 401 - - - YES - - - - - - - 407 - - - - - 408 - - - 103 @@ -3731,55 +3357,6 @@ - - 386 - - - YES - - - - - - - 404 - - - - - 403 - - - - - 821 - - - YES - - - - - - 822 - - - YES - - - - - - - 823 - - - - - 824 - - - 833 @@ -4180,11 +3757,6 @@ - - 930 - - - 932 @@ -4644,43 +4216,6 @@ 324.ImportedFromIB2 369.IBPluginDependency 369.ImportedFromIB2 - 372.IBPluginDependency - 372.ImportedFromIB2 - 373.IBEditorWindowLastContentRect - 373.IBPluginDependency - 373.ImportedFromIB2 - 373.editorWindowContentRectSynchronizationRect - 377.IBPluginDependency - 377.ImportedFromIB2 - 378.IBPluginDependency - 378.ImportedFromIB2 - 385.IBPluginDependency - 385.ImportedFromIB2 - 386.IBEditorWindowLastContentRect - 386.IBPluginDependency - 386.ImportedFromIB2 - 394.IBPluginDependency - 394.ImportedFromIB2 - 395.IBEditorWindowLastContentRect - 395.IBPluginDependency - 395.ImportedFromIB2 - 400.IBPluginDependency - 400.ImportedFromIB2 - 401.IBEditorWindowLastContentRect - 401.IBPluginDependency - 401.ImportedFromIB2 - 403.IBPluginDependency - 403.ImportedFromIB2 - 404.IBPluginDependency - 404.ImportedFromIB2 - 405.IBPluginDependency - 405.ImportedFromIB2 - 407.IBPluginDependency - 407.ImportedFromIB2 - 408.IBPluginDependency - 408.ImportedFromIB2 - 433.IBPluginDependency - 433.ImportedFromIB2 435.IBPluginDependency 435.ImportedFromIB2 438.IBPluginDependency @@ -4815,15 +4350,6 @@ 81.editorWindowContentRectSynchronizationRect 82.IBPluginDependency 82.ImportedFromIB2 - 821.IBPluginDependency - 821.ImportedFromIB2 - 822.IBEditorWindowLastContentRect - 822.IBPluginDependency - 822.ImportedFromIB2 - 823.IBPluginDependency - 823.ImportedFromIB2 - 824.IBPluginDependency - 824.ImportedFromIB2 83.IBPluginDependency 83.ImportedFromIB2 833.IBPluginDependency @@ -4868,7 +4394,6 @@ 926.IBPluginDependency 926.ImportedFromIB2 928.IBPluginDependency - 930.IBPluginDependency 932.IBPluginDependency 935.IBPluginDependency 938.IBPluginDependency @@ -5024,43 +4549,6 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{795, 182}, {210, 133}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{399, 465}, {213, 93}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{819, 131}, {133, 43}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{819, 91}, {133, 43}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{819, 71}, {133, 43}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -5187,7 +4675,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{460, 127}, {287, 403}} + {{460, 147}, {287, 383}} com.apple.InterfaceBuilder.CocoaPlugin {{180, 535}, {182, 253}} @@ -5195,15 +4683,6 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{819, 111}, {133, 43}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -5293,7 +4772,6 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -6304,6 +5782,7 @@ copyDatabase: export: exportMultipleTables: + exportSelectedTablesAs: exportTable: flushPrivileges: flushTable: @@ -6387,6 +5866,7 @@ id id id + id -- cgit v1.2.3