From fc748400d92a0b7874a19eba3fa573cdf1415ee5 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Wed, 3 Jun 2009 20:46:57 +0000 Subject: Various enhancements to relation functionality, including: - Only presenting valid tables for possible relations, that is InnoDB tables. - Only presenting valid columns for possible relations, that is columns of the same data type. - Loads of interface validation. --- Interfaces/English.lproj/DBView.xib | 492 +++++++++++++++++------------------- 1 file changed, 233 insertions(+), 259 deletions(-) (limited to 'Interfaces/English.lproj') diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index ce9d94a3..8a31c76d 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -2,12 +2,14 @@ 1050 - 9G55 + 9J61 677 - 949.43 + 949.46 353.00 YES + + YES @@ -79,7 +81,6 @@ 4352 {212, 393} - YES @@ -176,7 +177,6 @@ {{1, 1}, {212, 393}} - @@ -192,7 +192,6 @@ -2147483392 {{175, 1}, {15, 481}} - _doScroller: 9.979253e-01 @@ -202,7 +201,6 @@ 256 {{-100, -100}, {141, 11}} - 257 _doScroller: @@ -211,7 +209,6 @@ {214, 395} - 530 @@ -234,7 +231,6 @@ 4352 {212, 123} - YES @@ -298,7 +294,6 @@ {{1, 1}, {212, 123}} - @@ -309,7 +304,6 @@ -2147483392 {{175, 1}, {15, 481}} - _doScroller: 9.979253e-01 @@ -319,7 +313,6 @@ 256 {{-100, -100}, {141, 11}} - 257 _doScroller: @@ -328,7 +321,6 @@ {{0, 404}, {214, 125}} - 530 @@ -339,14 +331,12 @@ {{-1, 22}, {214, 529}} - 292 {{0, -1}, {32, 25}} - YES -2080244224 @@ -375,7 +365,6 @@ 292 {{20, 0}, {46, 25}} - YES -2076049856 @@ -384,7 +373,7 @@ -2042609409 35 - + NSImage button_action @@ -399,7 +388,7 @@ 1048576 2147483647 - + NSImage button_action @@ -486,7 +475,6 @@ {{197, 0}, {15, 23}} - YES 130560 @@ -519,7 +507,6 @@ {{93, 0}, {104, 23}} - YES 130560 @@ -540,7 +527,6 @@ 292 {{61, -1}, {32, 25}} - YES -2080244224 @@ -563,7 +549,6 @@ {212, 550} - NSView @@ -576,7 +561,6 @@ 274 {{-7, -10}, {735, 564}} - YES @@ -601,7 +585,6 @@ 257 {{538, 4}, {61, 13}} - YES 68288064 @@ -622,7 +605,6 @@ 257 {{604, 2}, {79, 17}} - YES -1539178944 @@ -731,14 +713,12 @@ 4352 {688, 289} - YES 256 {688, 17} - @@ -746,7 +726,6 @@ -2147483392 {{-26, 0}, {16, 17}} - YES @@ -1279,7 +1258,6 @@ {{1, 17}, {688, 289}} - @@ -1290,7 +1268,6 @@ -2147483392 {{611, 17}, {15, 274}} - _doScroller: 9.858657e-01 @@ -1300,7 +1277,6 @@ -2147483392 {{1, 291}, {610, 15}} - 1 _doScroller: @@ -1315,7 +1291,6 @@ {{1, 0}, {688, 17}} - @@ -1325,7 +1300,6 @@ {{-1, 22}, {690, 307}} - 562 @@ -1340,7 +1314,6 @@ 292 {{-1, -1}, {32, 25}} - YES -1543373312 @@ -1362,7 +1335,6 @@ 292 {{93, -1}, {32, 25}} - YES -2080244224 @@ -1384,7 +1356,6 @@ 292 {{30, -1}, {32, 25}} - YES -1543373312 @@ -1409,7 +1380,6 @@ 292 {{61, -1}, {32, 25}} - YES -1543373312 @@ -1446,7 +1416,6 @@ {{125, 0}, {564, 23}} - YES 130560 @@ -1462,7 +1431,6 @@ {689, 329} - NSView @@ -1475,7 +1443,6 @@ 264 {{7, 183}, {46, 14}} - YES 67239424 @@ -1502,14 +1469,12 @@ 4352 {688, 141} - YES 256 {688, 17} - @@ -1517,7 +1482,6 @@ -2147483392 {{-26, 0}, {16, 17}} - YES @@ -1770,7 +1734,6 @@ {{1, 17}, {688, 141}} - @@ -1781,7 +1744,6 @@ -2147483392 {{611, 17}, {15, 126}} - _doScroller: 8.936170e-01 @@ -1791,7 +1753,6 @@ -2147483392 {{1, 143}, {610, 15}} - 1 _doScroller: @@ -1806,7 +1767,6 @@ {{1, 0}, {688, 17}} - @@ -1816,7 +1776,6 @@ {{-1, 22}, {690, 159}} - 562 @@ -1831,7 +1790,6 @@ 292 {{-1, -1}, {32, 25}} - YES -1543373312 @@ -1853,7 +1811,6 @@ 292 {{61, -1}, {32, 25}} - YES -2080244224 @@ -1875,7 +1832,6 @@ 292 {{30, -1}, {32, 25}} - YES -1543373312 @@ -1909,7 +1865,6 @@ {{670, 183}, {10, 13}} - YES 130560 @@ -1942,7 +1897,6 @@ {{93, 0}, {596, 23}} - YES 130560 @@ -1958,19 +1912,16 @@ {{0, 330}, {689, 201}} - NSView {{7, 10}, {689, 531}} - 2 {{10, 7}, {700, 544}} - Structure @@ -2992,7 +2943,7 @@ -2042609409 35 - + 400 @@ -3004,7 +2955,7 @@ 1048576 2147483647 - + _popUpItemAction: @@ -4432,20 +4383,17 @@ {{221, 0}, {723, 550}} - NSView {944, 550} - YES DBViewSplitter {944, 550} - {{0, 0}, {1440, 878}} {780, 502} @@ -9252,14 +9200,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1 2 - {{196, 203}, {402, 307}} + {{196, 203}, {302, 307}} 1946157056 relationSheet - NSWindow + NSPanel {3.40282e+38, 3.40282e+38} - + 256 YES @@ -9276,7 +9224,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{120, 10}, {231, 22}} + {{80, 10}, {171, 22}} YES @@ -9341,12 +9289,12 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{-1, 15}, {119, 14}} + {{29, 15}, {49, 14}} YES 68288064 - 71435264 + 4326400 Column: @@ -9355,11 +9303,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - {{1, 1}, {366, 40}} + {{1, 1}, {266, 40}} - {{17, 231}, {368, 56}} + {{17, 231}, {268, 56}} {0, 0} @@ -9392,7 +9340,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{120, 40}, {231, 22}} + {{81, 40}, {170, 22}} YES @@ -9477,7 +9425,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{120, 10}, {231, 22}} + {{81, 10}, {170, 22}} YES @@ -9562,13 +9510,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{0, 45}, {118, 14}} + {{15, 45}, {64, 14}} YES 68288064 - 71435264 - On Update: + 4326400 + On update: @@ -9578,13 +9526,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{0, 15}, {118, 14}} + {{19, 15}, {59, 14}} YES 68288064 - 71435264 - On Delete: + 4326400 + On delete: @@ -9592,11 +9540,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - {{1, 1}, {366, 71}} + {{1, 1}, {266, 71}} - {{17, 49}, {368, 87}} + {{17, 49}, {268, 87}} {0, 0} @@ -9629,7 +9577,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{120, 40}, {231, 22}} + {{80, 40}, {171, 22}} YES @@ -9694,7 +9642,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{120, 10}, {231, 22}} + {{80, 10}, {171, 22}} YES @@ -9824,12 +9772,12 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{1, 45}, {117, 14}} + {{41, 45}, {37, 14}} YES 68288064 - 71435264 + 4326400 Table: @@ -9840,12 +9788,12 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{1, 15}, {117, 14}} + {{29, 15}, {49, 14}} YES 68288064 - 71435264 + 4326400 Column: @@ -9854,11 +9802,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - {{1, 1}, {366, 71}} + {{1, 1}, {266, 71}} - {{17, 140}, {368, 87}} + {{17, 140}, {268, 87}} {0, 0} @@ -9881,7 +9829,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{291, 13}, {96, 28}} + {{191, 13}, {96, 28}} 1 YES @@ -9902,7 +9850,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 - {{195, 13}, {96, 28}} + {{97, 13}, {96, 28}} YES @@ -9920,7 +9868,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - {402, 307} + {302, 307} + {{0, 0}, {1440, 878}} {3.40282e+38, 3.40282e+38} @@ -14988,30 +14937,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 5540 - - - addRow: - - - - 5568 - - - - removeRow: - - - - 5569 - - - - removeButton - - - - 5571 - delegate @@ -15028,22 +14953,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 5573 - - - relationsView - - - - 5574 - - - - refresh: - - - - 5575 - tableRelationsInstance @@ -15052,14 +14961,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 5588 - - - labelText - - - - 5591 - tableDocumentInstance @@ -15084,14 +14985,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 5595 - - - relationSheet - - - - 5598 - closeRelationSheet: @@ -15108,70 +15001,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 5605 - - - columnSelect - - - - 5661 - - - - refTableSelect - - - - 5662 - - - - refColumnSelect - - - - 5663 - - - - onUpdateSelect - - - - 5664 - - - - onDeleteSelect - - - - 5665 - - - - addRelation: - - - - 5666 - - - - chooseRefTable: - - - - 5668 - - - - refreshButton - - - - 5669 - saveServerVariables: @@ -15308,22 +15137,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 5706 - - - tableBox - - - - 5710 - - - - addButton - - - - 5711 - tableList @@ -15752,6 +15565,158 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 5901 + + + selectTableColumn: + + + + 5907 + + + + selectReferenceTable: + + + + 5908 + + + + addRelation: + + + + 5909 + + + + removeRelation: + + + + 5910 + + + + refreshRelations: + + + + 5911 + + + + confirmAddRelation: + + + + 5912 + + + + relationsTableView + + + + 5917 + + + + addRelationButton + + + + 5918 + + + + removeRelationButton + + + + 5919 + + + + refreshRelationsButton + + + + 5920 + + + + labelTextField + + + + 5921 + + + + addRelationPanel + + + + 5922 + + + + addRelationTableBox + + + + 5923 + + + + onDeletePopUpButton + + + + 5924 + + + + onUpdatePopUpButton + + + + 5925 + + + + refColumnPopUpButton + + + + 5926 + + + + refTablePopUpButton + + + + 5927 + + + + columnPopUpButton + + + + 5928 + + + + confirmAddRelationButton + + + + 5929 + @@ -24997,8 +24962,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{177, 216}, {944, 550}} - {{177, 216}, {944, 550}} + {{310, 234}, {944, 550}} + {{310, 234}, {944, 550}} {{62, 352}, {845, 504}} @@ -25392,15 +25357,20 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{525, 252}, {402, 307}} - {{525, 252}, {402, 307}} + {{847, 374}, {302, 307}} + {{847, 374}, {302, 307}} com.apple.InterfaceBuilder.CocoaPlugin YES - 1.330000e+02 + 9.200000e+01 + 0 + + + + 2.660000e+02 0 @@ -25852,7 +25822,7 @@ Y2hhbmdlIHRoZSBvcmRlcg - 5906 + 5929 @@ -26373,11 +26343,12 @@ Y2hhbmdlIHRoZSBvcmRlcg YES addRelation: - addRow: - chooseRefTable: closeRelationSheet: - refresh: - removeRow: + confirmAddRelation: + refreshRelations: + removeRelation: + selectReferenceTable: + selectTableColumn: YES @@ -26387,24 +26358,26 @@ Y2hhbmdlIHRoZSBvcmRlcg id id id + id YES YES - addButton - columnSelect - labelText - onDeleteSelect - onUpdateSelect - refColumnSelect - refTableSelect - refreshButton - relationSheet - relationsView - removeButton - tableBox + addRelationButton + addRelationPanel + addRelationTableBox + columnPopUpButton + confirmAddRelationButton + labelTextField + onDeletePopUpButton + onUpdatePopUpButton + refColumnPopUpButton + refTablePopUpButton + refreshRelationsButton + relationsTableView + removeRelationButton tableDataInstance tableDocumentInstance tableList @@ -26413,18 +26386,19 @@ Y2hhbmdlIHRoZSBvcmRlcg YES - id - id - id - id - id - id - id - id - id - id - id - id + NSButton + NSPanel + NSBox + NSPopUpButton + NSButton + NSTextField + NSPopUpButton + NSPopUpButton + NSPopUpButton + NSPopUpButton + NSButton + NSTableView + NSButton id id id -- cgit v1.2.3