From a9be9780875d249019bd0cdf55eba960fb6f44be Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Fri, 5 Nov 2010 21:15:18 +0000 Subject: Complete the implementation of supporting MySQL's XML schema format when exporting. Also, restore our old format and give the user the choice during export (defaults to MySQL schema). Completes the implementation of issue #840. --- Interfaces/English.lproj/ExportDialog.xib | 390 ++++++++++++++++++++++++++++-- 1 file changed, 376 insertions(+), 14 deletions(-) (limited to 'Interfaces/English.lproj') diff --git a/Interfaces/English.lproj/ExportDialog.xib b/Interfaces/English.lproj/ExportDialog.xib index 17f90795..1d2668e2 100644 --- a/Interfaces/English.lproj/ExportDialog.xib +++ b/Interfaces/English.lproj/ExportDialog.xib @@ -21,8 +21,7 @@ YES - - + YES @@ -55,7 +54,7 @@ {3.40282e+38, 3.40282e+38} {449, 480} - + 256 YES @@ -426,7 +425,6 @@ {451, 480} - {{0, 0}, {1680, 1028}} {449, 502} @@ -2311,14 +2309,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA xml - + 256 YES 268 - {{11, 200}, {72, 14}} + {{11, 112}, {72, 14}} YES @@ -2334,11 +2332,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 - {{14, 173}, {55, 19}} + {{14, 85}, {55, 19}} YES - -1804468671 + -1267597759 272761856 @@ -2348,8 +2346,140 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + + 268 + {{11, 152}, {179, 18}} + + YES + + -2080244224 + 131072 + Structure + + + 1211912703 + 2 + + + + + 200 + 25 + + + + + 268 + {{12, 176}, {180, 14}} + + YES + + 68288064 + 272761856 + Include: + + + + + + + + + 268 + {{11, 132}, {179, 18}} + + YES + + -2080244224 + 131072 + Content + + + 1211912703 + 2 + + + + + 200 + 25 + + + + + 268 + {{59, 193}, {119, 22}} + + YES + + -2076049856 + 133120 + + + 109199615 + 129 + + + 400 + 75 + + + MySQL Schema + + 1048576 + 2147483647 + 1 + + + _popUpItemAction: + + + YES + + OtherViews + + YES + + + + Plain Schema + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + + 1 + YES + YES + 2 + + + + + 268 + {{11, 198}, {46, 14}} + + YES + + 68288064 + 272761856 + Format: + + + + + + {{10, 7}, {189, 229}} + XML @@ -2358,10 +2488,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA pdf - + 256 {{10, 7}, {189, 229}} - PDF @@ -2379,14 +2508,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - + 4 YES YES YES - + @@ -3215,6 +3344,38 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1350 + + + exportXMLIncludeContent + + + + 1363 + + + + exportXMLIncludeStructure + + + + 1364 + + + + exportXMLFormatPopUpButton + + + + 1373 + + + + toggleXMLOutputFormat: + + + + 1374 + @@ -4373,6 +4534,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES + + + + + @@ -4664,6 +4830,100 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + 1355 + + + YES + + + + + + 1356 + + + YES + + + + + + 1357 + + + YES + + + + + + 1358 + + + + + 1359 + + + + + 1360 + + + + + 1365 + + + YES + + + + + + 1366 + + + YES + + + + + + 1367 + + + YES + + + + + + + 1368 + + + + + 1369 + + + + + 1371 + + + YES + + + + + + 1372 + + + @@ -4745,10 +5005,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1150.IBPluginDependency 1152.IBPluginDependency 1153.IBPluginDependency + 1153.IBViewBoundsToFrameTransform 1154.IBPluginDependency 1155.IBPluginDependency 1156.IBPluginDependency + 1156.IBViewBoundsToFrameTransform 1157.IBPluginDependency + 1157.IBViewBoundsToFrameTransform 1158.IBPluginDependency 1159.IBPluginDependency 1160.IBPluginDependency @@ -4863,6 +5126,25 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1341.IBPluginDependency 1342.IBPluginDependency 1343.IBPluginDependency + 1355.IBPluginDependency + 1355.IBViewBoundsToFrameTransform + 1356.IBPluginDependency + 1356.IBViewBoundsToFrameTransform + 1357.IBPluginDependency + 1357.IBViewBoundsToFrameTransform + 1358.IBPluginDependency + 1359.IBPluginDependency + 1360.IBPluginDependency + 1365.IBPluginDependency + 1365.IBViewBoundsToFrameTransform + 1366.IBPluginDependency + 1367.IBEditorWindowLastContentRect + 1367.IBPluginDependency + 1368.IBPluginDependency + 1369.IBPluginDependency + 1371.IBPluginDependency + 1371.IBViewBoundsToFrameTransform + 1372.IBPluginDependency 2.IBPluginDependency 2.IBUserGuides 294.IBEditorWindowLastContentRect @@ -4936,7 +5218,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {449, 480} - {{226, 235}, {450, 359}} + {{463, 507}, {450, 359}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -5052,10 +5334,19 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBQAAAwywAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBQAAAw1QAAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBMAAAw0AAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -5219,6 +5510,35 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAADCeAAAwvQAAA + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAADCdAAAww4AAA + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAADCdAAAwswAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABCnAAAwxYAAA + + com.apple.InterfaceBuilder.CocoaPlugin + {{746, 640}, {140, 37}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBMAAAwxIAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin YES @@ -5306,7 +5626,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 1354 + 1374 @@ -5415,6 +5735,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA doSelectionUpperCase: doTranspose: insertNULLvalue: + moveSelectionLineDown: + moveSelectionLineUp: selectCurrentLine: selectCurrentWord: selectEnclosingBrackets: @@ -5434,6 +5756,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA id id id + id + id @@ -5450,6 +5774,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA doSelectionUpperCase: doTranspose: insertNULLvalue: + moveSelectionLineDown: + moveSelectionLineUp: selectCurrentLine: selectCurrentWord: selectEnclosingBrackets: @@ -5496,6 +5822,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA insertNULLvalue: id + + moveSelectionLineDown: + id + + + moveSelectionLineUp: + id + selectCurrentLine: id @@ -5557,6 +5891,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA toggleSQLIncludeContent: toggleSQLIncludeDropSyntax: toggleSQLIncludeStructure: + toggleXMLOutputFormat: YES @@ -5574,6 +5909,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA id id id + id @@ -5594,6 +5930,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA toggleSQLIncludeContent: toggleSQLIncludeDropSyntax: toggleSQLIncludeStructure: + toggleXMLOutputFormat: YES @@ -5653,6 +5990,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA toggleSQLIncludeStructure: id + + toggleXMLOutputFormat: + id + @@ -5704,6 +6045,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA exportTablelistScrollView exportTypeTabBar exportUseUTF8BOMButton + exportXMLFormatPopUpButton + exportXMLIncludeContent + exportXMLIncludeStructure exportXMLNULLValuesAsTextField exporterView tableContentInstance @@ -5758,6 +6102,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSScrollView NSTabView NSButton + NSPopUpButton + NSButton + NSButton NSTextField NSView id @@ -5815,6 +6162,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA exportTablelistScrollView exportTypeTabBar exportUseUTF8BOMButton + exportXMLFormatPopUpButton + exportXMLIncludeContent + exportXMLIncludeStructure exportXMLNULLValuesAsTextField exporterView tableContentInstance @@ -6004,6 +6354,18 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA exportUseUTF8BOMButton NSButton + + exportXMLFormatPopUpButton + NSPopUpButton + + + exportXMLIncludeContent + NSButton + + + exportXMLIncludeStructure + NSButton + exportXMLNULLValuesAsTextField NSTextField -- cgit v1.2.3