From 5d61e164670c386e73de8903dace40802f00fc00 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Sun, 5 Dec 2010 00:40:09 +0000 Subject: Apply a tweaked version of a patch by Aaron Linville (http://www.linville.org/) to handle table linking in .dot exports on case-insensitive servers: - Adds a new checkbox on the .dot export interface controlling the case sensitivty of link handling - Improve .dot export to use lowercase link references when the option is enabled, fixing .dot exports of table relations of table names with uppercase characters on case-insensitive servers - Check the server's case-sensitivity setting and use that to control the checkbox when using the export interface to select .dot export This addresses Issue #920. --- Interfaces/English.lproj/ExportDialog.xib | 200 +++++++++++++++++++++++++----- 1 file changed, 170 insertions(+), 30 deletions(-) (limited to 'Interfaces') diff --git a/Interfaces/English.lproj/ExportDialog.xib b/Interfaces/English.lproj/ExportDialog.xib index 1d2668e2..9e2fe8cf 100644 --- a/Interfaces/English.lproj/ExportDialog.xib +++ b/Interfaces/English.lproj/ExportDialog.xib @@ -2,9 +2,9 @@ 1050 - 10F569 - 823 - 1038.29 + 10H574 + 788 + 1038.35 461.00 YES @@ -15,18 +15,18 @@ YES - 823 + 788 1.2.5 YES - + YES - com.brandonwalkin.BWToolkit com.apple.InterfaceBuilder.CocoaPlugin + com.brandonwalkin.BWToolkit PluginDependencyRecalculationVersion @@ -51,7 +51,7 @@ Export NSWindow - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {449, 480} @@ -68,9 +68,10 @@ sql - + 256 {{10, 33}, {447, 359}} + SQL @@ -79,7 +80,7 @@ controlColor 3 - MC42NjY2NjY2ODY1AA + MC42NjY2NjY2NjY3AA @@ -109,17 +110,16 @@ dot - + 256 {{10, 33}, {447, 359}} - Dot - + LucidaGrande 13 @@ -129,7 +129,7 @@ YES YES - + @@ -428,7 +428,7 @@ {{0, 0}, {1680, 1028}} {449, 502} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} SPExportWindow @@ -441,7 +441,7 @@ View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 50} @@ -565,7 +565,7 @@ {{0, 0}, {1680, 1028}} {213, 72} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 9 @@ -577,7 +577,7 @@ View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 107} @@ -764,7 +764,7 @@ {{0, 0}, {1680, 1028}} {213, 129} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} @@ -2289,7 +2289,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - {{10, 7}, {168, 229}} + {{10, 7}, {189, 229}} CSV @@ -2300,7 +2300,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 - {{10, 7}, {168, 229}} + {{10, 7}, {189, 229}} HTML @@ -2309,7 +2309,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA xml - + 256 YES @@ -2479,7 +2479,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{10, 7}, {189, 229}} - XML @@ -2499,23 +2498,48 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA dot - + 256 + + YES + + + 268 + {{2, 198}, {186, 18}} + + YES + + 67239424 + 131072 + Use case-insentive links + + + 1211912703 + 2 + + + + 200 + 25 + + + {{10, 7}, {189, 229}} + Dot - + 4 YES YES YES - + @@ -2748,7 +2772,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - {{20, 43}, {201, 219}} + {{21, 43}, {201, 219}} 530 @@ -3376,6 +3400,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1374 + + + exportDotForceLowerTableNamesCheck + + + + 1377 + @@ -4581,6 +4613,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1225 + + YES + + @@ -4924,6 +4960,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + 1375 + + + YES + + + + + + 1376 + + + @@ -4964,9 +5014,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1107.IBPluginDependency 1108.IBPluginDependency 1109.IBPluginDependency + 1109.IBViewBoundsToFrameTransform 1110.CustomClassName 1110.IBPluginDependency 1111.IBPluginDependency + 1111.IBViewBoundsToFrameTransform 1112.IBPluginDependency 1113.IBPluginDependency 1114.CustomClassName @@ -5065,6 +5117,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1194.ImportedFromIB2 1195.IBPluginDependency 1196.IBPluginDependency + 1196.IBViewBoundsToFrameTransform 1196.ImportedFromIB2 1197.IBPluginDependency 1198.IBPluginDependency @@ -5145,6 +5198,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1371.IBPluginDependency 1371.IBViewBoundsToFrameTransform 1372.IBPluginDependency + 1375.IBPluginDependency + 1375.IBViewBoundsToFrameTransform + 1375.ImportedFromIB2 + 1375.notes + 1376.IBPluginDependency 2.IBPluginDependency 2.IBUserGuides 294.IBEditorWindowLastContentRect @@ -5210,15 +5268,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES com.apple.InterfaceBuilder.CocoaPlugin - {{509, 248}, {451, 480}} + {{354, 248}, {451, 480}} com.apple.InterfaceBuilder.CocoaPlugin - {{509, 248}, {451, 480}} + {{354, 248}, {451, 480}} {449, 480} - {{463, 507}, {450, 359}} + {{391, 418}, {450, 359}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -5266,9 +5324,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + AcEwAADAgAAAA + NSTokenField com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + AUHQAABBIAAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin NSTokenField @@ -5428,6 +5492,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABAoAAAw1YAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -5539,6 +5606,37 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBAAAAwu4AAA + + + + + When the default configuration of MySQL server is running on Windows or Mac OS X, or case sensitivity has been disabled, this option should be enabled to allow table relations to work correctly. + + + YES + + YES + NSColor + NSFont + NSOriginalFont + NSParagraphStyle + + + YES + + + + + 4 + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin YES @@ -5626,7 +5724,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 1374 + 1377 @@ -5638,6 +5736,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA Frameworks/PSMTabBar/PSMTabDragAssistant.h + + NSMenu + + IBProjectSource + Source/SPMenuAdditions.h + + NSObject @@ -5734,6 +5839,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA doSelectionTitleCase: doSelectionUpperCase: doTranspose: + executeBundleItemForInputField: insertNULLvalue: moveSelectionLineDown: moveSelectionLineUp: @@ -5758,6 +5864,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA id id id + id @@ -5773,6 +5880,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA doSelectionTitleCase: doSelectionUpperCase: doTranspose: + executeBundleItemForInputField: insertNULLvalue: moveSelectionLineDown: moveSelectionLineUp: @@ -5818,6 +5926,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA doTranspose: id + + executeBundleItemForInputField: + id + insertNULLvalue: id @@ -6019,6 +6131,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA exportCustomFilenameViewButton exportCustomFilenameViewLabelButton exportDeselectAllTablesButton + exportDotForceLowerTableNamesCheck exportExcelSheetOrFilePerTableMatrix exportFilePerTableCheck exportFilenameDividerBox @@ -6076,6 +6189,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSButton NSButton NSButton + NSButton NSMatrix NSButton NSBox @@ -6136,6 +6250,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA exportCustomFilenameViewButton exportCustomFilenameViewLabelButton exportDeselectAllTablesButton + exportDotForceLowerTableNamesCheck exportExcelSheetOrFilePerTableMatrix exportFilePerTableCheck exportFilenameDividerBox @@ -6250,6 +6365,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA exportDeselectAllTablesButton NSButton + + exportDotForceLowerTableNamesCheck + NSButton + exportExcelSheetOrFilePerTableMatrix NSMatrix @@ -6937,6 +7056,27 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA PrintCore.framework/Headers/PDEPluginInterface.h + + NSObject + + IBFrameworkSource + ShortcutRecorder.framework/Headers/SRRecorderCell.h + + + + NSObject + + IBFrameworkSource + ShortcutRecorder.framework/Headers/SRRecorderControl.h + + + + NSObject + + IBFrameworkSource + ShortcutRecorder.framework/Headers/SRValidator.h + + NSObject -- cgit v1.2.3