From 546f436290721d208381769bef646a8ab9d42212 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Mon, 21 Oct 2013 14:43:10 +0000 Subject: Issue #1369: Fix the display of cross database relations. --- Interfaces/English.lproj/DBView.xib | 281 ++++++++++++++++-------------------- 1 file changed, 122 insertions(+), 159 deletions(-) (limited to 'Interfaces') diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 6c9f83dc..7de677dc 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -21,19 +21,12 @@ YES - - - - - - - - + YES - com.apple.InterfaceBuilder.CocoaPlugin com.apple.WebKitIBPlugin + com.apple.InterfaceBuilder.CocoaPlugin PluginDependencyRecalculationVersion @@ -100,7 +93,6 @@ 4362 {218, 38} - YES @@ -152,7 +144,7 @@ controlColor 3 - MC42NjY2NjY2NjY3AA + MC42NjY2NjY2ODY1AA @@ -217,7 +209,6 @@ -2147483392 {{-100, -100}, {15, 8}} - _doScroller: 0.42105263471603394 @@ -227,7 +218,6 @@ -2147483392 {{-100, -100}, {223, 15}} - 1 _doScroller: @@ -248,7 +238,6 @@ 290 {{5, 2}, {204, 19}} - YES 342884416 @@ -317,7 +306,6 @@ {214, 24} - @@ -339,7 +327,6 @@ 4352 {214, 334} - YES @@ -416,7 +403,6 @@ -2147483392 {{197, 0}, {15, 292}} - _doScroller: 0.096045196056365967 @@ -427,7 +413,6 @@ -2147483392 {{-100, -100}, {141, 11}} - 257 _doScroller: @@ -446,18 +431,15 @@ {{0, 25}, {214, 334}} - {214, 359} - 2 {214, 359} - @@ -479,7 +461,6 @@ 4352 {216, 166} - YES @@ -556,7 +537,6 @@ -2147483392 {{-100, -100}, {15, 20}} - _doScroller: 0.99315071105957031 @@ -566,7 +546,6 @@ -2147483392 {{-100, -100}, {141, 11}} - 257 _doScroller: @@ -597,7 +576,6 @@ 4352 {214, 166} - YES @@ -674,7 +652,6 @@ -2147483392 {{-100, -100}, {15, 20}} - _doScroller: 0.48965516686439514 @@ -685,7 +662,6 @@ -2147483392 {{-100, -100}, {141, 11}} - 257 _doScroller: @@ -704,12 +680,10 @@ {{0, 360}, {214, 166}} - {{0, 23}, {214, 526}} - 2 @@ -729,7 +703,6 @@ {214, 23} - YES 134217728 @@ -762,7 +735,6 @@ {{199, 0}, {15, 23}} - YES 134217728 @@ -783,7 +755,6 @@ 260 {{-1, -1}, {32, 25}} - YES 67108864 @@ -808,7 +779,6 @@ 260 {{92, -1}, {32, 25}} - YES 67108864 @@ -837,7 +807,6 @@ 260 {{30, -1}, {36, 25}} - YES 71433792 @@ -1058,7 +1027,6 @@ 260 {{61, -0.5}, {32, 25}} - YES 67108864 @@ -1081,7 +1049,6 @@ {214, 549} - @@ -3288,7 +3255,7 @@ customQuery - + 256 YES @@ -3309,7 +3276,6 @@ {{6, 10}, {695, 23}} - YES 134217728 @@ -3327,7 +3293,6 @@ 292 {{36, 9}, {36, 25}} - YES 71433792 @@ -3411,7 +3376,6 @@ 292 {{6, 9}, {32, 25}} - YES 67108864 @@ -3434,7 +3398,6 @@ 292 {{67, 9}, {32, 25}} - YES 67108864 @@ -3485,29 +3448,6 @@ 6418 - - YES - - YES - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - Apple URL pasteboard type - CorePasteboardFlavorType 0x6D6F6F76 - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - NeXT font pasteboard type - NeXT ruler pasteboard type - WebURLsWithTitlesPboardType - public.url - - {693, 141} @@ -3604,7 +3544,7 @@ _doScroller: - 0.95488721804511278 + 0.95488721132278442 @@ -3743,14 +3683,12 @@ 4352 {693, 197} - YES 256 {693, 17} - @@ -3817,7 +3755,6 @@ -2147483392 {{680, 17}, {15, 199}} - _doScroller: 0.98507463932037354 @@ -3827,7 +3764,6 @@ -2147483392 {{1, 207}, {688, 15}} - 1 _doScroller: @@ -3978,7 +3914,6 @@ 264 {{38, 214}, {108, 22}} - YES -2076049856 @@ -4093,7 +4028,6 @@ 268 {{-11, 213}, {48, 25}} - YES -2076049856 @@ -4406,7 +4340,6 @@ {{26, 214}, {669, 23}} - YES 134217728 @@ -4422,18 +4355,15 @@ {{0, 152}, {695, 237}} - NSView {695, 389} - {695, 391} - @@ -4546,7 +4476,7 @@ _doScroller: - 0.95488721804511278 + 0.95488721132278442 @@ -4571,12 +4501,10 @@ {{0, 392}, {695, 117}} - {{6, 33}, {695, 509}} - 2 @@ -4597,8 +4525,6 @@ {{10, 7}, {705, 544}} - - Custom Query @@ -4713,7 +4639,7 @@ 256 _doScroller: - 0.99248120300751874 + 0.99248123168945312 @@ -4853,7 +4779,7 @@ 256 _doScroller: - 0.98496240601503759 + 0.98496240377426147 @@ -5242,8 +5168,8 @@ YES YES - , - . + . + , YES YES YES @@ -5560,7 +5486,7 @@ relations - + 256 YES @@ -5597,7 +5523,7 @@ YES name - 135 + 125 8 1000 @@ -5627,7 +5553,7 @@ columns - 120 + 89 10 3.4028230607370965e+38 @@ -5652,9 +5578,36 @@ YES + + fk_database + 86 + 10 + 3.4028234663852886e+38 + + 75628096 + 2048 + FK Database + + + + + + 337772096 + 133120 + Text Cell + + + + + + 3 + YES + YES + + fk_table - 105 + 95 10 3.4028230607370965e+38 @@ -5681,7 +5634,7 @@ fk_columns - 140 + 130 10 3.4028230607370965e+38 @@ -5708,7 +5661,7 @@ on_update - 86 + 76 10 3.4028230607370965e+38 @@ -5735,7 +5688,7 @@ on_delete - 89 + 71 10 3.4028230607370965e+38 @@ -5790,7 +5743,7 @@ _doScroller: - 0.96794867515563965 + 0.9669603705406189 @@ -5800,7 +5753,7 @@ 1 _doScroller: - 0.99854862689971924 + 0.91184210777282715 @@ -5939,6 +5892,7 @@ {{10, 7}, {705, 544}} + Relations @@ -6356,25 +6310,23 @@ - + 134217731 YES YES YES - + {{215, 0}, {728, 549}} - {943, 549} - YES 2 DBViewSplitter @@ -6382,7 +6334,6 @@ {943, 549} - NSView @@ -6949,7 +6900,7 @@ {650, 112} {292, 112} - + 256 YES @@ -7032,7 +6983,6 @@ {314, 112} - {{0, 0}, {2560, 1418}} {292, 134} @@ -7305,7 +7255,7 @@ {600, 127} {260, 127} - + 256 YES @@ -7409,7 +7359,6 @@ {260, 127} - {{0, 0}, {2560, 1418}} {260, 149} @@ -7425,7 +7374,7 @@ View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 107} @@ -7570,7 +7519,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {2560, 1418}} {213, 129} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 7 @@ -7580,7 +7529,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Reset Auto Increment NSWindow - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {255, 95} @@ -7704,8 +7653,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES YES - , - . + . + , NO YES NO @@ -7743,7 +7692,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {2560, 1418}} {255, 117} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 1 @@ -7753,7 +7702,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 New Relation NSPanel - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 256 @@ -8455,7 +8404,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {379, 369} {{0, 0}, {2560, 1418}} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 9 @@ -8465,10 +8414,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 New Trigger NSPanel - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {360, 348} - + 256 YES @@ -8846,7 +8795,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 256 _doScroller: - 0.99248120300751874 + 0.99248123168945312 @@ -8870,11 +8819,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {360, 348} - {{0, 0}, {2560, 1418}} {360, 370} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 3 @@ -8886,7 +8834,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 50} @@ -9005,7 +8953,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {2560, 1418}} {213, 72} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 9 @@ -9017,10 +8965,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 107} - + 256 YES @@ -9138,7 +9086,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 256 _doScroller: - 0.99248120300751874 + 0.99248123168945312 @@ -9162,11 +9110,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {381, 247} - {{0, 0}, {2560, 1418}} {213, 129} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 15 @@ -9178,10 +9125,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {350, 200} - + 256 YES @@ -9375,7 +9322,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 256 _doScroller: - 0.99248120300751874 + 0.99248123168945312 @@ -9399,11 +9346,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {411, 341} - {{0, 0}, {2560, 1418}} {350, 222} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} SPCreateSyntaxSheet @@ -9416,10 +9362,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 107} - + 256 YES @@ -9572,7 +9518,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 256 _doScroller: - 0.99248120300751874 + 0.99248123168945312 @@ -9596,11 +9542,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {405, 267} - {{0, 0}, {2560, 1418}} {213, 129} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 31 @@ -9610,7 +9555,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 MySQL Help NSPanel - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {351, 120} @@ -10008,7 +9953,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 0}, {2560, 1418}} {351, 136} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} MYSQL_HELP_WINDOW @@ -10019,10 +9964,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Advanced Filter NSPanel - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {600, 317} - + 256 YES @@ -10267,7 +10212,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 _doScroller: - 0.99248120300751874 + 0.99248123168945312 @@ -10324,7 +10269,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 disabledControlTextColor 3 - MC4zMzMzMzMzMzMzAA + MC4zMzMzMzMzNDMzAA @@ -10510,11 +10455,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {752, 317} - {{0, 0}, {2560, 1418}} {600, 339} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} SPTableFilterPanel @@ -10821,7 +10765,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Secure Text Input Sheet NSPanel - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 256 @@ -10925,7 +10869,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {338, 150} {{0, 0}, {2560, 1418}} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} @@ -21875,12 +21819,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES - + + @@ -21899,15 +21844,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - - 5586 - - - YES - - - - 5584 @@ -21978,11 +21914,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - - 5587 - - - 5590 @@ -23690,6 +23621,34 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 + + 5586 + + + YES + + + + + + 5587 + + + + + 8335 + + + YES + + + + + + 8336 + + + @@ -23978,6 +23937,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 5542.IBPluginDependency 5543.IBPluginDependency 5544.IBPluginDependency + 5544.IBViewBoundsToFrameTransform 5545.IBPluginDependency 5545.IBShouldRemoveOnLegacySave 5546.IBPluginDependency @@ -25272,6 +25232,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABAwAAAw/uAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -25898,7 +25861,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{329, 296}, {943, 549}} + {{127, 199}, {943, 549}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -26526,7 +26489,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - 8334 + 8336 -- cgit v1.2.3