diff options
| -rw-r--r-- | Interfaces/English.lproj/DBView.xib | 246 | ||||
| -rw-r--r-- | Source/TableRelations.m | 6 |
2 files changed, 130 insertions, 122 deletions
diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 80c0fc45..5342b649 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -8,7 +8,8 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="25"/> + <integer value="5543"/> + <integer value="5597"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -378,7 +379,7 @@ <string key="NSKeyEquiv"/> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> - <object class="NSCustomResource" key="NSImage" id="978817671"> + <object class="NSCustomResource" key="NSImage" id="704280970"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">button_action</string> </object> @@ -2934,7 +2935,7 @@ <string key="NSKeyEquiv"/> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSImage" ref="978817671"/> + <reference key="NSImage" ref="704280970"/> <string key="NSAction">_popUpItemAction:</string> <reference key="NSTarget" ref="984501775"/> </object> @@ -3711,9 +3712,9 @@ </object> <object class="NSTextFieldCell" key="NSDataCell" id="4990"> <int key="NSCellFlags">338820672</int> - <int key="NSCellFlags2">1024</int> + <int key="NSCellFlags2">132096</int> <string key="NSContents">Text Cell</string> - <reference key="NSSupport" ref="244931163"/> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="952375340"/> <reference key="NSBackgroundColor" ref="449903125"/> <reference key="NSTextColor" ref="454249633"/> @@ -3738,9 +3739,9 @@ </object> <object class="NSTextFieldCell" key="NSDataCell" id="5584"> <int key="NSCellFlags">337772096</int> - <int key="NSCellFlags2">2048</int> + <int key="NSCellFlags2">133120</int> <string key="NSContents">Text Cell</string> - <reference key="NSSupport" ref="244931163"/> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="952375340"/> <reference key="NSBackgroundColor" ref="1024678221"/> <reference key="NSTextColor" ref="454249633"/> @@ -3765,9 +3766,9 @@ </object> <object class="NSTextFieldCell" key="NSDataCell" id="5695"> <int key="NSCellFlags">337772096</int> - <int key="NSCellFlags2">2048</int> + <int key="NSCellFlags2">133120</int> <string key="NSContents">Text Cell</string> - <reference key="NSSupport" ref="244931163"/> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="952375340"/> <reference key="NSBackgroundColor" ref="1024678221"/> <reference key="NSTextColor" ref="454249633"/> @@ -3792,9 +3793,9 @@ </object> <object class="NSTextFieldCell" key="NSDataCell" id="499842993"> <int key="NSCellFlags">337772096</int> - <int key="NSCellFlags2">2048</int> + <int key="NSCellFlags2">133120</int> <string key="NSContents">Text Cell</string> - <reference key="NSSupport" ref="244931163"/> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="952375340"/> <reference key="NSBackgroundColor" ref="1024678221"/> <reference key="NSTextColor" ref="454249633"/> @@ -3819,9 +3820,9 @@ </object> <object class="NSTextFieldCell" key="NSDataCell" id="825647415"> <int key="NSCellFlags">337772096</int> - <int key="NSCellFlags2">2048</int> + <int key="NSCellFlags2">133120</int> <string key="NSContents">Text Cell</string> - <reference key="NSSupport" ref="244931163"/> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="952375340"/> <reference key="NSBackgroundColor" ref="1024678221"/> <reference key="NSTextColor" ref="454249633"/> @@ -3846,9 +3847,9 @@ </object> <object class="NSTextFieldCell" key="NSDataCell" id="384026080"> <int key="NSCellFlags">337772096</int> - <int key="NSCellFlags2">2048</int> + <int key="NSCellFlags2">133120</int> <string key="NSContents">Text Cell</string> - <reference key="NSSupport" ref="244931163"/> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="952375340"/> <reference key="NSBackgroundColor" ref="1024678221"/> <reference key="NSTextColor" ref="454249633"/> @@ -3873,9 +3874,9 @@ </object> <object class="NSTextFieldCell" key="NSDataCell" id="985863790"> <int key="NSCellFlags">337772096</int> - <int key="NSCellFlags2">2048</int> + <int key="NSCellFlags2">133120</int> <string key="NSContents">Text Cell</string> - <reference key="NSSupport" ref="244931163"/> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="952375340"/> <reference key="NSBackgroundColor" ref="1024678221"/> <reference key="NSTextColor" ref="454249633"/> @@ -8667,14 +8668,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <object class="NSWindowTemplate" id="787219800"> <int key="NSWindowStyleMask">1</int> <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{196, 196}, {473, 314}}</string> + <string key="NSWindowRect">{{196, 215}, {473, 295}}</string> <int key="NSWTFlags">1946157056</int> <string key="NSWindowTitle">relationSheet</string> <string key="NSWindowClass">NSWindow</string> <nil key="NSViewClass"/> <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <object class="NSView" key="NSWindowView" id="842408319"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -8691,13 +8692,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <object class="NSPopUpButton" id="1000236670"> <reference key="NSNextResponder" ref="677403043"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{121, 10}, {299, 26}}</string> + <string key="NSFrame">{{121, 10}, {299, 22}}</string> <reference key="NSSuperview" ref="677403043"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="535836876"> <int key="NSCellFlags">-2076049856</int> - <int key="NSCellFlags2">2048</int> - <reference key="NSSupport" ref="244931163"/> + <int key="NSCellFlags2">133120</int> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="1000236670"/> <int key="NSButtonFlags">109199615</int> <int key="NSButtonFlags2">129</int> @@ -8756,25 +8757,25 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <object class="NSTextField" id="242233316"> <reference key="NSNextResponder" ref="677403043"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{-1, 16}, {120, 17}}</string> + <string key="NSFrame">{{-1, 15}, {120, 14}}</string> <reference key="NSSuperview" ref="677403043"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="148999128"> <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">71304192</int> + <int key="NSCellFlags2">71435264</int> <string key="NSContents">Column</string> - <reference key="NSSupport" ref="244931163"/> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="242233316"/> <reference key="NSBackgroundColor" ref="62854682"/> <reference key="NSTextColor" ref="454249633"/> </object> </object> </object> - <string key="NSFrame">{{1, 1}, {435, 44}}</string> + <string key="NSFrame">{{1, 1}, {435, 40}}</string> <reference key="NSSuperview" ref="536822293"/> </object> </object> - <string key="NSFrame">{{17, 246}, {437, 60}}</string> + <string key="NSFrame">{{17, 231}, {437, 56}}</string> <reference key="NSSuperview" ref="842408319"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -8807,13 +8808,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <object class="NSPopUpButton" id="974577035"> <reference key="NSNextResponder" ref="40346767"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{122, 40}, {180, 26}}</string> + <string key="NSFrame">{{122, 40}, {180, 22}}</string> <reference key="NSSuperview" ref="40346767"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="431726441"> <int key="NSCellFlags">-2076049856</int> - <int key="NSCellFlags2">2048</int> - <reference key="NSSupport" ref="244931163"/> + <int key="NSCellFlags2">133120</int> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="974577035"/> <int key="NSButtonFlags">109199615</int> <int key="NSButtonFlags2">129</int> @@ -8892,13 +8893,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <object class="NSPopUpButton" id="220041050"> <reference key="NSNextResponder" ref="40346767"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{122, 10}, {180, 26}}</string> + <string key="NSFrame">{{122, 10}, {180, 22}}</string> <reference key="NSSuperview" ref="40346767"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="181520855"> <int key="NSCellFlags">-2076049856</int> - <int key="NSCellFlags2">2048</int> - <reference key="NSSupport" ref="244931163"/> + <int key="NSCellFlags2">133120</int> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="220041050"/> <int key="NSButtonFlags">109199615</int> <int key="NSButtonFlags2">129</int> @@ -8977,14 +8978,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <object class="NSTextField" id="402062525"> <reference key="NSNextResponder" ref="40346767"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{0, 46}, {120, 17}}</string> + <string key="NSFrame">{{0, 45}, {120, 14}}</string> <reference key="NSSuperview" ref="40346767"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="878239911"> <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">71304192</int> + <int key="NSCellFlags2">71435264</int> <string key="NSContents">On Update</string> - <reference key="NSSupport" ref="244931163"/> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="402062525"/> <reference key="NSBackgroundColor" ref="62854682"/> <reference key="NSTextColor" ref="454249633"/> @@ -8993,25 +8994,25 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <object class="NSTextField" id="230425419"> <reference key="NSNextResponder" ref="40346767"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{0, 16}, {120, 17}}</string> + <string key="NSFrame">{{0, 15}, {120, 14}}</string> <reference key="NSSuperview" ref="40346767"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="5496"> <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">71304192</int> + <int key="NSCellFlags2">71435264</int> <string key="NSContents">On Delete</string> - <reference key="NSSupport" ref="244931163"/> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="230425419"/> <reference key="NSBackgroundColor" ref="62854682"/> <reference key="NSTextColor" ref="454249633"/> </object> </object> </object> - <string key="NSFrame">{{1, 1}, {437, 74}}</string> + <string key="NSFrame">{{1, 1}, {437, 71}}</string> <reference key="NSSuperview" ref="607035293"/> </object> </object> - <string key="NSFrame">{{17, 56}, {439, 90}}</string> + <string key="NSFrame">{{17, 49}, {439, 87}}</string> <reference key="NSSuperview" ref="842408319"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -9044,13 +9045,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <object class="NSPopUpButton" id="13705954"> <reference key="NSNextResponder" ref="931900868"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{123, 40}, {299, 26}}</string> + <string key="NSFrame">{{123, 40}, {299, 22}}</string> <reference key="NSSuperview" ref="931900868"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="141679483"> <int key="NSCellFlags">-2076049856</int> - <int key="NSCellFlags2">2048</int> - <reference key="NSSupport" ref="244931163"/> + <int key="NSCellFlags2">133120</int> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="13705954"/> <int key="NSButtonFlags">109199615</int> <int key="NSButtonFlags2">129</int> @@ -9109,13 +9110,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <object class="NSPopUpButton" id="630409672"> <reference key="NSNextResponder" ref="931900868"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{123, 10}, {299, 26}}</string> + <string key="NSFrame">{{123, 10}, {299, 22}}</string> <reference key="NSSuperview" ref="931900868"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="980368532"> <int key="NSCellFlags">-2076049856</int> - <int key="NSCellFlags2">2048</int> - <reference key="NSSupport" ref="244931163"/> + <int key="NSCellFlags2">133120</int> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="630409672"/> <int key="NSButtonFlags">109199615</int> <int key="NSButtonFlags2">129</int> @@ -9174,7 +9175,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <object class="NSPopUpButton" id="1003691467"> <reference key="NSNextResponder" ref="931900868"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{123, 96}, {299, 26}}</string> + <string key="NSFrame">{{123, 87}, {299, 26}}</string> <reference key="NSSuperview" ref="931900868"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="949968790"> @@ -9236,12 +9237,44 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSArrowPosition">2</int> </object> </object> + <object class="NSTextField" id="355562960"> + <reference key="NSNextResponder" ref="931900868"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{1, 45}, {120, 14}}</string> + <reference key="NSSuperview" ref="931900868"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="725351885"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">71435264</int> + <string key="NSContents">Table</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="355562960"/> + <reference key="NSBackgroundColor" ref="62854682"/> + <reference key="NSTextColor" ref="454249633"/> + </object> + </object> + <object class="NSTextField" id="81525228"> + <reference key="NSNextResponder" ref="931900868"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{1, 15}, {120, 14}}</string> + <reference key="NSSuperview" ref="931900868"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="20664131"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">71435264</int> + <string key="NSContents">Column</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="81525228"/> + <reference key="NSBackgroundColor" ref="62854682"/> + <reference key="NSTextColor" ref="454249633"/> + </object> + </object> </object> - <string key="NSFrame">{{1, 1}, {437, 76}}</string> + <string key="NSFrame">{{1, 1}, {437, 71}}</string> <reference key="NSSuperview" ref="951603292"/> </object> </object> - <string key="NSFrame">{{17, 150}, {439, 92}}</string> + <string key="NSFrame">{{17, 140}, {439, 87}}</string> <reference key="NSSuperview" ref="842408319"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -9264,14 +9297,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <object class="NSButton" id="158114485"> <reference key="NSNextResponder" ref="842408319"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{363, 12}, {96, 32}}</string> + <string key="NSFrame">{{362, 13}, {96, 28}}</string> <reference key="NSSuperview" ref="842408319"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="600004052"> <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> + <int key="NSCellFlags2">134348800</int> <string key="NSContents">Add</string> - <reference key="NSSupport" ref="244931163"/> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="158114485"/> <int key="NSButtonFlags">-2038284033</int> <int key="NSButtonFlags2">129</int> @@ -9284,14 +9317,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <object class="NSButton" id="415754263"> <reference key="NSNextResponder" ref="842408319"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{267, 12}, {96, 32}}</string> + <string key="NSFrame">{{266, 13}, {96, 28}}</string> <reference key="NSSuperview" ref="842408319"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="721913578"> <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> + <int key="NSCellFlags2">134348800</int> <string key="NSContents">Cancel</string> - <reference key="NSSupport" ref="244931163"/> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="415754263"/> <int key="NSButtonFlags">-2038284033</int> <int key="NSButtonFlags2">129</int> @@ -9301,40 +9334,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSPeriodicInterval">25</int> </object> </object> - <object class="NSTextField" id="355562960"> - <reference key="NSNextResponder" ref="842408319"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 199}, {120, 17}}</string> - <reference key="NSSuperview" ref="842408319"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="725351885"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">71304192</int> - <string key="NSContents">Table</string> - <reference key="NSSupport" ref="244931163"/> - <reference key="NSControlView" ref="355562960"/> - <reference key="NSBackgroundColor" ref="62854682"/> - <reference key="NSTextColor" ref="454249633"/> - </object> - </object> - <object class="NSTextField" id="81525228"> - <reference key="NSNextResponder" ref="842408319"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 169}, {120, 17}}</string> - <reference key="NSSuperview" ref="842408319"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="20664131"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">71304192</int> - <string key="NSContents">Column</string> - <reference key="NSSupport" ref="244931163"/> - <reference key="NSControlView" ref="81525228"/> - <reference key="NSBackgroundColor" ref="62854682"/> - <reference key="NSTextColor" ref="454249633"/> - </object> - </object> </object> - <string key="NSFrameSize">{473, 314}</string> + <string key="NSFrameSize">{473, 295}</string> + <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> @@ -20456,8 +20458,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference ref="536822293"/> <reference ref="607035293"/> <reference ref="951603292"/> - <reference ref="355562960"/> - <reference ref="81525228"/> <reference ref="158114485"/> <reference ref="415754263"/> </object> @@ -20492,41 +20492,15 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference key="parent" ref="415754263"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5608</int> - <reference key="object" ref="355562960"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="725351885"/> - </object> - <reference key="parent" ref="842408319"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5609</int> - <reference key="object" ref="725351885"/> - <reference key="parent" ref="355562960"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5642</int> - <reference key="object" ref="81525228"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="20664131"/> - </object> - <reference key="parent" ref="842408319"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5643</int> - <reference key="object" ref="20664131"/> - <reference key="parent" ref="81525228"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">5652</int> <reference key="object" ref="951603292"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="1003691467"/> - <reference ref="630409672"/> <reference ref="13705954"/> + <reference ref="630409672"/> + <reference ref="355562960"/> + <reference ref="81525228"/> </object> <reference key="parent" ref="842408319"/> </object> @@ -20882,6 +20856,34 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference key="object" ref="148999128"/> <reference key="parent" ref="242233316"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">5608</int> + <reference key="object" ref="355562960"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="725351885"/> + </object> + <reference key="parent" ref="951603292"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5609</int> + <reference key="object" ref="725351885"/> + <reference key="parent" ref="355562960"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5642</int> + <reference key="object" ref="81525228"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="20664131"/> + </object> + <reference key="parent" ref="951603292"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5643</int> + <reference key="object" ref="20664131"/> + <reference key="parent" ref="81525228"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -23863,9 +23865,9 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik</string> <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{191, 539}, {473, 314}}</string> + <string>{{191, 558}, {473, 295}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{191, 539}, {473, 314}}</string> + <string>{{191, 558}, {473, 295}}</string> <reference ref="8"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> diff --git a/Source/TableRelations.m b/Source/TableRelations.m index 322ab4e1..8bd204cb 100644 --- a/Source/TableRelations.m +++ b/Source/TableRelations.m @@ -80,6 +80,7 @@ */ - (IBAction)closeRelationSheet:(id)sender { + // 0 = success, [NSApp stopModalWithCode:0]; } @@ -136,6 +137,8 @@ NSDictionary *info = [tableDataInstance informationForTable:table]; NSArray *cols = [info objectForKey:@"columns"]; NSMutableArray *colNames = [[NSMutableArray alloc] init]; + // TODO depending on the selected column type, it would be smart to only + // show columns that are valid to linkage. this.int -> ints only for( int i = 0; i < [cols count]; i++ ) { [colNames addObject:[[cols objectAtIndex:i] objectForKey:@"name"]]; } @@ -149,12 +152,15 @@ */ - (IBAction)addRow:(id)sender { + // TODO check that this is an INNO table + // set up the controls [tableBox setTitle:[NSString stringWithFormat:@"Table: %@",[tablesListInstance tableName] ]]; [columnSelect removeAllItems]; [columnSelect addItemsWithTitles:[tableDataInstance columnNames]]; [refTableSelect removeAllItems]; // grab only real tables + // TODO filter this so it only shows INNO tables NSArray *tables = [tablesListInstance tables]; NSArray *types = [tablesListInstance tableTypes]; NSMutableArray *validTables = [[NSMutableArray alloc] init]; |