diff options
author | stuconnolly <stuart02@gmail.com> | 2009-10-01 12:12:48 +0000 |
---|---|---|
committer | stuconnolly <stuart02@gmail.com> | 2009-10-01 12:12:48 +0000 |
commit | 9f7b5dccfae711371970031b3e79f671213441d6 (patch) | |
tree | 206bad35d400a2ddf2717f5fd81f1b5d58f16f9e | |
parent | 67d16c468fe2a7e182e19e1cea24961a735ec05e (diff) | |
download | sequelpro-9f7b5dccfae711371970031b3e79f671213441d6.tar.gz sequelpro-9f7b5dccfae711371970031b3e79f671213441d6.tar.bz2 sequelpro-9f7b5dccfae711371970031b3e79f671213441d6.zip |
- Replace the create syntax transparent HUD panel with a standard sheet, which displays the create syntax in the same non-editable version of the custom query editor. Addresses issue #411.
- Add the ability to save the displayed create syntax to a file on disk.
- Change the 'Show Create Syntax' shortcut from shift+cmd+S (its already in use) to alt+cmd+S.
- Make both the create syntax and server variables sheets not run application modally and thus prevent them from blocking the main thread. Part of issue #351.
-rw-r--r-- | Interfaces/English.lproj/DBView.xib | 920 | ||||
-rw-r--r-- | Interfaces/English.lproj/MainMenu.xib | 25 | ||||
-rw-r--r-- | Source/TableDocument.h | 7 | ||||
-rw-r--r-- | Source/TableDocument.m | 145 |
4 files changed, 522 insertions, 575 deletions
diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 76960f90..31e8191a 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -23,12 +23,13 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="849"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.brandonwalkin.BWToolkit</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.WebKitIBPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> <object class="NSMutableDictionary" key="IBDocument.Metadata"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -58,10 +59,10 @@ <string key="NSWindowTitle">Connecting...</string> <string key="NSWindowClass">NSWindow</string> <string key="NSViewClass">View</string> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{780, 480}</string> <object class="NSView" key="NSWindowView" id="579726586"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -100,7 +101,6 @@ <int key="NSvFlags">266</int> <string key="NSFrame">{{5, 2}, {202, 19}}</string> <reference key="NSSuperview" ref="801427893"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSSearchFieldCell" key="NSCell" id="134854992"> <int key="NSCellFlags">343014976</int> @@ -193,7 +193,6 @@ <int key="NSvFlags">256</int> <string key="NSFrameSize">{212, 26}</string> <reference key="NSSuperview" ref="965350222"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="_NSCornerView" key="NSCornerView"> <nil key="NSNextResponder"/> @@ -238,7 +237,7 @@ <string key="NSColorName">controlColor</string> <object class="NSColor" key="NSColor" id="1001122760"> <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes> + <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes> </object> </object> <reference key="NSTextColor" ref="454249633"/> @@ -282,7 +281,6 @@ </object> <string key="NSFrameSize">{212, 26}</string> <reference key="NSSuperview" ref="299440250"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="687169829"/> <reference key="NSDocView" ref="687169829"/> <object class="NSColor" key="NSBGColor" id="1024678221"> @@ -298,7 +296,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {15, 102}}</string> <reference key="NSSuperview" ref="299440250"/> - <reference key="NSWindow"/> <reference key="NSTarget" ref="299440250"/> <string key="NSAction">_doScroller:</string> <double key="NSCurValue">37</double> @@ -309,7 +306,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {223, 15}}</string> <reference key="NSSuperview" ref="299440250"/> - <reference key="NSWindow"/> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="299440250"/> <string key="NSAction">_doScroller:</string> @@ -318,7 +314,6 @@ </object> <string key="NSFrameSize">{212, 26}</string> <reference key="NSSuperview" ref="801427893"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="965350222"/> <int key="NSsFlags">0</int> <reference key="NSVScroller" ref="622721581"/> @@ -329,7 +324,6 @@ </object> <string key="NSFrameSize">{212, 26}</string> <reference key="NSSuperview" ref="213762440"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="BWCustomView" id="1017775084"> @@ -352,7 +346,6 @@ <int key="NSvFlags">4352</int> <string key="NSFrameSize">{212, 354}</string> <reference key="NSSuperview" ref="73685676"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="_NSCornerView" key="NSCornerView"> <nil key="NSNextResponder"/> @@ -419,7 +412,6 @@ </object> <string key="NSFrameSize">{212, 354}</string> <reference key="NSSuperview" ref="233472824"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="251040077"/> <reference key="NSDocView" ref="251040077"/> <reference key="NSBGColor" ref="1024678221"/> @@ -430,7 +422,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{197, 0}, {15, 292}}</string> <reference key="NSSuperview" ref="233472824"/> - <reference key="NSWindow"/> <reference key="NSTarget" ref="233472824"/> <string key="NSAction">_doScroller:</string> <double key="NSPercent">0.99658697843551636</double> @@ -440,7 +431,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {141, 11}}</string> <reference key="NSSuperview" ref="233472824"/> - <reference key="NSWindow"/> <int key="NSsFlags">257</int> <reference key="NSTarget" ref="233472824"/> <string key="NSAction">_doScroller:</string> @@ -449,7 +439,6 @@ </object> <string key="NSFrameSize">{212, 354}</string> <reference key="NSSuperview" ref="1017775084"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="73685676"/> <int key="NSsFlags">528</int> <reference key="NSVScroller" ref="693168867"/> @@ -460,13 +449,11 @@ </object> <string key="NSFrame">{{0, 27}, {212, 354}}</string> <reference key="NSSuperview" ref="213762440"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> </object> <string key="NSFrameSize">{212, 381}</string> <reference key="NSSuperview" ref="131633443"/> - <reference key="NSWindow"/> <int key="NSDividerStyle">2</int> <object class="NSColor" key="BWSVColor"> <int key="NSColorSpace">6</int> @@ -500,7 +487,6 @@ </object> <string key="NSFrameSize">{212, 381}</string> <reference key="NSSuperview" ref="298095498"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="BWCustomView" id="192579410"> @@ -523,7 +509,6 @@ <int key="NSvFlags">4352</int> <string key="NSFrameSize">{212, 145}</string> <reference key="NSSuperview" ref="685057119"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="_NSCornerView" key="NSCornerView"> <nil key="NSNextResponder"/> @@ -590,7 +575,6 @@ </object> <string key="NSFrameSize">{212, 145}</string> <reference key="NSSuperview" ref="298226231"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="347093764"/> <reference key="NSDocView" ref="347093764"/> <reference key="NSBGColor" ref="1024678221"/> @@ -601,7 +585,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {15, 20}}</string> <reference key="NSSuperview" ref="298226231"/> - <reference key="NSWindow"/> <reference key="NSTarget" ref="298226231"/> <string key="NSAction">_doScroller:</string> <double key="NSPercent">0.94736838340759277</double> @@ -611,7 +594,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {141, 11}}</string> <reference key="NSSuperview" ref="298226231"/> - <reference key="NSWindow"/> <int key="NSsFlags">257</int> <reference key="NSTarget" ref="298226231"/> <string key="NSAction">_doScroller:</string> @@ -620,7 +602,6 @@ </object> <string key="NSFrameSize">{212, 145}</string> <reference key="NSSuperview" ref="192579410"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="685057119"/> <int key="NSsFlags">512</int> <reference key="NSVScroller" ref="245346414"/> @@ -631,13 +612,11 @@ </object> <string key="NSFrame">{{0, 382}, {212, 145}}</string> <reference key="NSSuperview" ref="298095498"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> </object> <string key="NSFrame">{{0, 23}, {212, 527}}</string> <reference key="NSSuperview" ref="372294785"/> - <reference key="NSWindow"/> <int key="NSDividerStyle">2</int> <reference key="BWSVColor" ref="304829493"/> <bool key="BWSVColorIsEnabled">NO</bool> @@ -688,7 +667,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{-1, -1}, {32, 24}}</string> <reference key="NSSuperview" ref="28219887"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="BWAnchoredButtonCell" key="NSCell" id="283448047"> <int key="NSCellFlags">67239424</int> @@ -713,7 +691,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{30, -1}, {32, 24}}</string> <reference key="NSSuperview" ref="28219887"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="BWAnchoredPopUpButtonCell" key="NSCell" id="321871356"> <int key="NSCellFlags">71433792</int> @@ -819,7 +796,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{61, -1}, {32, 24}}</string> <reference key="NSSuperview" ref="28219887"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="BWAnchoredButtonCell" key="NSCell" id="227511715"> <int key="NSCellFlags">67239424</int> @@ -844,7 +820,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{92, -1}, {32, 24}}</string> <reference key="NSSuperview" ref="28219887"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="BWAnchoredButtonCell" key="NSCell" id="708016222"> <int key="NSCellFlags">-2080244224</int> @@ -871,7 +846,6 @@ </object> <string key="NSFrameSize">{212, 23}</string> <reference key="NSSuperview" ref="372294785"/> - <reference key="NSWindow"/> <bool key="BWABBIsResizable">YES</bool> <bool key="BWABBIsAtBottom">YES</bool> <bool key="BWABBHandleIsRightAligned">NO</bool> @@ -880,7 +854,6 @@ </object> <string key="NSFrameSize">{212, 550}</string> <reference key="NSSuperview" ref="937377983"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="604818293"> @@ -893,13 +866,12 @@ <int key="NSvFlags">274</int> <string key="NSFrame">{{-7, -10}, {735, 564}}</string> <reference key="NSSuperview" ref="604818293"/> - <reference key="NSWindow"/> <object class="NSMutableArray" key="NSTabViewItems"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTabViewItem" id="831053945"> <string key="NSIdentifier">source</string> <object class="NSView" key="NSView" id="461236772"> - <reference key="NSNextResponder" ref="714795046"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -928,14 +900,12 @@ <int key="NSvFlags">4352</int> <string key="NSFrameSize">{688, 289}</string> <reference key="NSSuperview" ref="16936123"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTableHeaderView" key="NSHeaderView" id="926883367"> <reference key="NSNextResponder" ref="639957061"/> <int key="NSvFlags">256</int> <string key="NSFrameSize">{688, 17}</string> <reference key="NSSuperview" ref="639957061"/> - <reference key="NSWindow"/> <reference key="NSTableView" ref="715508012"/> </object> <object class="_NSCornerView" key="NSCornerView" id="868771861"> @@ -943,7 +913,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-26, 0}, {16, 17}}</string> <reference key="NSSuperview" ref="22340145"/> - <reference key="NSWindow"/> </object> <object class="NSMutableArray" key="NSTableColumns"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1417,7 +1386,6 @@ </object> <string key="NSFrame">{{1, 17}, {688, 289}}</string> <reference key="NSSuperview" ref="22340145"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="715508012"/> <reference key="NSDocView" ref="715508012"/> <reference key="NSBGColor" ref="1024678221"/> @@ -1428,7 +1396,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{674, 17}, {15, 274}}</string> <reference key="NSSuperview" ref="22340145"/> - <reference key="NSWindow"/> <reference key="NSTarget" ref="22340145"/> <string key="NSAction">_doScroller:</string> <double key="NSPercent">0.98586571216583252</double> @@ -1438,7 +1405,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{1, 291}, {673, 15}}</string> <reference key="NSSuperview" ref="22340145"/> - <reference key="NSWindow"/> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="22340145"/> <string key="NSAction">_doScroller:</string> @@ -1453,7 +1419,6 @@ </object> <string key="NSFrame">{{1, 0}, {688, 17}}</string> <reference key="NSSuperview" ref="22340145"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="926883367"/> <reference key="NSDocView" ref="926883367"/> <reference key="NSBGColor" ref="1024678221"/> @@ -1463,7 +1428,6 @@ </object> <string key="NSFrame">{{-1, 22}, {690, 307}}</string> <reference key="NSSuperview" ref="220777809"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="16936123"/> <int key="NSsFlags">562</int> <reference key="NSVScroller" ref="943144555"/> @@ -1478,7 +1442,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{-1, -1}, {32, 25}}</string> <reference key="NSSuperview" ref="220777809"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="413143172"> <int key="NSCellFlags">-1543373312</int> @@ -1503,7 +1466,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{93, -1}, {32, 25}}</string> <reference key="NSSuperview" ref="220777809"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="917381158"> <int key="NSCellFlags">-2080244224</int> @@ -1528,7 +1490,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{30, -1}, {32, 25}}</string> <reference key="NSSuperview" ref="220777809"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="578226656"> <int key="NSCellFlags">-1543373312</int> @@ -1553,7 +1514,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{61, -1}, {32, 25}}</string> <reference key="NSSuperview" ref="220777809"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="626480887"> <int key="NSCellFlags">-1543373312</int> @@ -1590,7 +1550,6 @@ </object> <string key="NSFrame">{{125, 0}, {532, 23}}</string> <reference key="NSSuperview" ref="220777809"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSImageCell" key="NSCell" id="4715"> <int key="NSCellFlags">130560</int> @@ -1611,7 +1570,6 @@ <int key="NSvFlags">289</int> <string key="NSFrame">{{657, -1}, {32, 25}}</string> <reference key="NSSuperview" ref="220777809"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="1072754876"> <int key="NSCellFlags">-1543373312</int> @@ -1634,7 +1592,6 @@ </object> <string key="NSFrameSize">{689, 329}</string> <reference key="NSSuperview" ref="628830973"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="1063281455"> @@ -1652,7 +1609,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{3, 3}, {49, 14}}</string> <reference key="NSSuperview" ref="813716908"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="907218783"> <int key="NSCellFlags">68288064</int> @@ -1691,7 +1647,6 @@ </object> <string key="NSFrame">{{672, 4}, {10, 13}}</string> <reference key="NSSuperview" ref="813716908"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSImageCell" key="NSCell" id="545156725"> <int key="NSCellFlags">130560</int> @@ -1710,7 +1665,6 @@ </object> <string key="NSFrame">{{0, 181}, {689, 20}}</string> <reference key="NSSuperview" ref="1063281455"/> - <reference key="NSWindow"/> <object class="NSColor" key="BWGBFillStartingColor"> <int key="NSColorSpace">1</int> <bytes key="NSRGB">MC42NzU3Njg0OTQ2IDAuNzIxOTQ4MTQ2OCAwLjc2NTMwNjExNTIAA</bytes> @@ -1752,14 +1706,12 @@ <int key="NSvFlags">4352</int> <string key="NSFrameSize">{688, 142}</string> <reference key="NSSuperview" ref="794929378"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTableHeaderView" key="NSHeaderView" id="459548655"> <reference key="NSNextResponder" ref="1038672854"/> <int key="NSvFlags">256</int> <string key="NSFrameSize">{688, 17}</string> <reference key="NSSuperview" ref="1038672854"/> - <reference key="NSWindow"/> <reference key="NSTableView" ref="584834515"/> </object> <object class="_NSCornerView" key="NSCornerView" id="476444025"> @@ -1767,7 +1719,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-26, 0}, {16, 17}}</string> <reference key="NSSuperview" ref="376224367"/> - <reference key="NSWindow"/> </object> <object class="NSMutableArray" key="NSTableColumns"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -2023,7 +1974,6 @@ </object> <string key="NSFrame">{{1, 17}, {688, 142}}</string> <reference key="NSSuperview" ref="376224367"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="584834515"/> <reference key="NSDocView" ref="584834515"/> <reference key="NSBGColor" ref="1024678221"/> @@ -2034,7 +1984,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{611, 17}, {15, 126}}</string> <reference key="NSSuperview" ref="376224367"/> - <reference key="NSWindow"/> <reference key="NSTarget" ref="376224367"/> <string key="NSAction">_doScroller:</string> <double key="NSPercent">0.89361697435379028</double> @@ -2044,7 +1993,6 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{1, 143}, {610, 15}}</string> <reference key="NSSuperview" ref="376224367"/> - <reference key="NSWindow"/> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="376224367"/> <string key="NSAction">_doScroller:</string> @@ -2059,7 +2007,6 @@ </object> <string key="NSFrame">{{1, 0}, {688, 17}}</string> <reference key="NSSuperview" ref="376224367"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="459548655"/> <reference key="NSDocView" ref="459548655"/> <reference key="NSBGColor" ref="1024678221"/> @@ -2069,7 +2016,6 @@ </object> <string key="NSFrame">{{-1, 22}, {690, 160}}</string> <reference key="NSSuperview" ref="1063281455"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="794929378"/> <int key="NSsFlags">562</int> <reference key="NSVScroller" ref="1019209947"/> @@ -2084,7 +2030,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{-1, -1}, {32, 25}}</string> <reference key="NSSuperview" ref="1063281455"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="326048025"> <int key="NSCellFlags">-1543373312</int> @@ -2106,7 +2051,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{61, -1}, {32, 25}}</string> <reference key="NSSuperview" ref="1063281455"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="153146827"> <int key="NSCellFlags">-2080244224</int> @@ -2128,7 +2072,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{30, -1}, {32, 25}}</string> <reference key="NSSuperview" ref="1063281455"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="345927225"> <int key="NSCellFlags">-1543373312</int> @@ -2162,7 +2105,6 @@ </object> <string key="NSFrame">{{93, 0}, {596, 23}}</string> <reference key="NSSuperview" ref="1063281455"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSImageCell" key="NSCell" id="372723860"> <int key="NSCellFlags">130560</int> @@ -2178,19 +2120,15 @@ </object> <string key="NSFrame">{{0, 330}, {689, 201}}</string> <reference key="NSSuperview" ref="628830973"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> </object> <string key="NSFrame">{{7, 10}, {689, 531}}</string> <reference key="NSSuperview" ref="461236772"/> - <reference key="NSWindow"/> <int key="NSDividerStyle">2</int> </object> </object> <string key="NSFrame">{{10, 7}, {700, 544}}</string> - <reference key="NSSuperview" ref="714795046"/> - <reference key="NSWindow"/> </object> <string key="NSLabel">Structure</string> <reference key="NSColor" ref="62854682"/> @@ -3842,7 +3780,7 @@ <object class="NSTabViewItem" id="94659530"> <string key="NSIdentifier">status</string> <object class="NSView" key="NSView" id="730602982"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder" ref="714795046"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -3869,6 +3807,29 @@ <object class="NSTextView" id="69074373"> <reference key="NSNextResponder" ref="78677381"/> <int key="NSvFlags">2322</int> + <object class="NSMutableSet" key="NSDragTypes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="set.sortedObjects"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>Apple HTML pasteboard type</string> + <string>Apple PDF pasteboard type</string> + <string>Apple PICT pasteboard type</string> + <string>Apple PNG pasteboard type</string> + <string>Apple URL pasteboard type</string> + <string>CorePasteboardFlavorType 0x6D6F6F76</string> + <string>NSColor pasteboard type</string> + <string>NSFilenamesPboardType</string> + <string>NSStringPboardType</string> + <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string> + <string>NeXT RTFD pasteboard type</string> + <string>NeXT Rich Text Format v1.0 pasteboard type</string> + <string>NeXT TIFF v4.0 pasteboard type</string> + <string>NeXT font pasteboard type</string> + <string>NeXT ruler pasteboard type</string> + <string>WebURLsWithTitlesPboardType</string> + <string>public.url</string> + </object> + </object> <string key="NSFrameSize">{536, 14}</string> <reference key="NSSuperview" ref="78677381"/> <object class="NSTextContainer" key="NSTextContainer" id="708157837"> @@ -4485,6 +4446,7 @@ </object> </object> <string key="NSFrame">{{10, 7}, {700, 544}}</string> + <reference key="NSSuperview" ref="714795046"/> </object> <string key="NSLabel">Status</string> <reference key="NSColor" ref="62854682"/> @@ -4878,37 +4840,33 @@ <reference key="NSTabView" ref="714795046"/> </object> </object> - <reference key="NSSelectedTabViewItem" ref="831053945"/> + <reference key="NSSelectedTabViewItem" ref="94659530"/> <reference key="NSFont" ref="26"/> <int key="NSTvFlags">134217731</int> <bool key="NSAllowTruncatedLabels">YES</bool> <bool key="NSDrawsBackground">YES</bool> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="461236772"/> + <reference ref="730602982"/> </object> </object> </object> <string key="NSFrame">{{221, 0}, {723, 550}}</string> <reference key="NSSuperview" ref="937377983"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> </object> <string key="NSFrameSize">{944, 550}</string> <reference key="NSSuperview" ref="579726586"/> - <reference key="NSWindow"/> <bool key="NSIsVertical">YES</bool> <string key="NSAutosaveName">DBViewSplitter</string> </object> </object> <string key="NSFrameSize">{944, 550}</string> - <reference key="NSSuperview"/> - <reference key="NSWindow"/> </object> <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string> <string key="NSMinSize">{780, 502}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSFrameAutosaveName"/> </object> <object class="NSWindowTemplate" id="554105051"> @@ -6079,7 +6037,7 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{213, 107}</string> <object class="NSView" key="NSWindowView" id="329225443"> <nil key="NSNextResponder"/> @@ -6358,7 +6316,7 @@ </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{213, 129}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> </object> <object class="NSWindowTemplate" id="734744289"> <int key="NSWindowStyleMask">1</int> @@ -6370,7 +6328,7 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{213, 107}</string> <object class="NSView" key="NSWindowView" id="234287744"> <nil key="NSNextResponder"/> @@ -6526,7 +6484,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{213, 129}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> </object> <object class="NSWindowTemplate" id="787219800"> <int key="NSWindowStyleMask">1</int> @@ -6536,7 +6494,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string key="NSWindowTitle">New Relation</string> <string key="NSWindowClass">NSPanel</string> <nil key="NSViewClass"/> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <object class="NSView" key="NSWindowView" id="842408319"> <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> @@ -7137,7 +7095,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string key="NSFrameSize">{302, 307}</string> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> </object> <object class="NSWindowTemplate" id="1066802919"> <int key="NSWindowStyleMask">3</int> @@ -7149,7 +7107,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{213, 50}</string> <object class="NSView" key="NSWindowView" id="525490268"> <nil key="NSNextResponder"/> @@ -7269,7 +7227,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string> <string key="NSMinSize">{213, 72}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> </object> <object class="NSWindowTemplate" id="553728448"> <int key="NSWindowStyleMask">9</int> @@ -7281,7 +7239,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{213, 107}</string> <object class="NSView" key="NSWindowView" id="1052076676"> <nil key="NSNextResponder"/> @@ -7416,7 +7374,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{213, 129}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> </object> <object class="NSWindowTemplate" id="202784209"> <int key="NSWindowStyleMask">15</int> @@ -7428,10 +7386,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{350, 200}</string> <object class="NSView" key="NSWindowView" id="226131408"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -7729,38 +7687,62 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> </object> <string key="NSFrameSize">{411, 341}</string> + <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{350, 222}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> </object> - <object class="NSWindowTemplate" id="135079060"> - <int key="NSWindowStyleMask">8219</int> + <object class="NSWindowTemplate" id="828950706"> + <int key="NSWindowStyleMask">15</int> <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{196, 348}, {280, 162}}</string> - <int key="NSWTFlags">-469761024</int> - <string key="NSWindowTitle">Create Table Syntax</string> - <string key="NSWindowClass">NSPanel</string> - <nil key="NSViewClass"/> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> - <string key="NSWindowContentMinSize">{120, 100}</string> - <object class="NSView" key="NSWindowView" id="661948784"> + <string key="NSWindowRect">{{386, 508}, {411, 341}}</string> + <int key="NSWTFlags">1886912512</int> + <string key="NSWindowTitle">Variables</string> + <string key="NSWindowClass">NSWindow</string> + <object class="NSMutableString" key="NSViewClass"> + <characters key="NS.bytes">View</characters> + </object> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSWindowContentMinSize">{350, 200}</string> + <object class="NSView" key="NSWindowView" id="749598685"> <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="BWTransparentButton" id="568453839"> - <reference key="NSNextResponder" ref="661948784"/> - <int key="NSvFlags">289</int> - <string key="NSFrame">{{180, -1}, {81, 27}}</string> - <reference key="NSSuperview" ref="661948784"/> + <object class="NSButton" id="281286750"> + <reference key="NSNextResponder" ref="749598685"/> + <int key="NSvFlags">257</int> + <string key="NSFrame">{{320, 5}, {76, 28}}</string> + <reference key="NSSuperview" ref="749598685"/> <bool key="NSEnabled">YES</bool> - <object class="BWTransparentButtonCell" key="NSCell" id="295636063"> + <object class="NSButtonCell" key="NSCell" id="849738207"> <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">138018816</int> + <string key="NSContents">Close</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="281286750"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">1</int> + <reference key="NSAlternateImage" ref="932958253"/> + <string key="NSAlternateContents"/> + <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="1045688777"> + <reference key="NSNextResponder" ref="749598685"/> + <int key="NSvFlags">260</int> + <string key="NSFrame">{{15, 5}, {111, 28}}</string> + <reference key="NSSuperview" ref="749598685"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="116117289"> + <int key="NSCellFlags">-2080244224</int> <int key="NSCellFlags2">134348800</int> - <string key="NSContents">Copy</string> + <string key="NSContents">Save As...</string> <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="568453839"/> + <reference key="NSControlView" ref="1045688777"/> <int key="NSButtonFlags">-2038284033</int> <int key="NSButtonFlags2">129</int> <string key="NSAlternateContents"/> @@ -7769,227 +7751,58 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSPeriodicInterval">25</int> </object> </object> - <object class="BWTransparentScrollView" id="992507944"> - <reference key="NSNextResponder" ref="661948784"/> - <int key="NSvFlags">4370</int> + <object class="BWInsetTextField" id="964799848"> + <reference key="NSNextResponder" ref="749598685"/> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{9, 316}, {385, 14}}</string> + <reference key="NSSuperview" ref="749598685"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="187876153"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272761856</int> + <string key="NSContents">Create syntax for object</string> + <reference key="NSSupport" ref="935342005"/> + <reference key="NSControlView" ref="964799848"/> + <reference key="NSBackgroundColor" ref="62854682"/> + <reference key="NSTextColor" ref="454249633"/> + </object> + </object> + <object class="NSScrollView" id="666283614"> + <reference key="NSNextResponder" ref="749598685"/> + <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSClipView" id="856231100"> - <reference key="NSNextResponder" ref="992507944"/> + <object class="NSClipView" id="789153540"> + <reference key="NSNextResponder" ref="666283614"/> <int key="NSvFlags">2304</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextView" id="852390500"> - <reference key="NSNextResponder" ref="856231100"/> - <int key="NSvFlags">6418</int> - <string key="NSFrameSize">{266, 144}</string> - <reference key="NSSuperview" ref="856231100"/> - <object class="NSTextContainer" key="NSTextContainer" id="649289743"> + <object class="NSTextView" id="843242867"> + <reference key="NSNextResponder" ref="789153540"/> + <int key="NSvFlags">2322</int> + <string key="NSFrameSize">{411, 14}</string> + <reference key="NSSuperview" ref="789153540"/> + <object class="NSTextContainer" key="NSTextContainer" id="297140751"> <object class="NSLayoutManager" key="NSLayoutManager"> <object class="NSTextStorage" key="NSTextStorage"> <object class="NSMutableString" key="NSString"> - <characters key="NS.bytes">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum Et harumd und lookum like Greek to me, dereud facilis est er expedit distinct. Nam liber te conscient to factor tum poen legum odioque civiuda</characters> - </object> - <object class="NSMutableArray" key="NSAttributes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSDictionary"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSColor</string> - <string>NSFont</string> - <string>NSParagraphStyle</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSColor" id="1029043619"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MC45MDE5NjA3OSAwLjkwMTk2MDc5IDAuOTAxOTYwNzkAA</bytes> - </object> - <object class="NSFont" id="188091016"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">10</double> - <int key="NSfFlags">2843</int> - </object> - <object class="NSParagraphStyle"> - <int key="NSAlignment">3</int> - <object class="NSArray" key="NSTabStops"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextTab" id="501503456"> - <double key="NSLocation">0.0</double> - </object> - <object class="NSTextTab" id="901963619"> - <double key="NSLocation">56</double> - </object> - <object class="NSTextTab" id="1001591936"> - <double key="NSLocation">112</double> - </object> - <object class="NSTextTab" id="711834680"> - <double key="NSLocation">168</double> - </object> - <object class="NSTextTab" id="593043090"> - <double key="NSLocation">224</double> - </object> - <object class="NSTextTab" id="980925360"> - <double key="NSLocation">280</double> - </object> - <object class="NSTextTab" id="682662534"> - <double key="NSLocation">336</double> - </object> - <object class="NSTextTab" id="201209351"> - <double key="NSLocation">392</double> - </object> - <object class="NSTextTab" id="231585962"> - <double key="NSLocation">448</double> - </object> - <object class="NSTextTab" id="759866559"> - <double key="NSLocation">504</double> - </object> - <object class="NSTextTab" id="501838998"> - <double key="NSLocation">560</double> - </object> - <object class="NSTextTab" id="328935456"> - <double key="NSLocation">616</double> - </object> - <object class="NSTextTab" id="291303009"> - <double key="NSLocation">672</double> - </object> - <object class="NSTextTab" id="944565393"> - <double key="NSLocation">728</double> - </object> - <object class="NSTextTab" id="116932563"> - <double key="NSLocation">784</double> - </object> - <object class="NSTextTab" id="313453674"> - <double key="NSLocation">840</double> - </object> - <object class="NSTextTab" id="874483567"> - <double key="NSLocation">896</double> - </object> - <object class="NSTextTab" id="220229491"> - <double key="NSLocation">952</double> - </object> - <object class="NSTextTab" id="400827970"> - <double key="NSLocation">1008</double> - </object> - <object class="NSTextTab" id="217167976"> - <double key="NSLocation">1064</double> - </object> - <object class="NSTextTab" id="448353934"> - <double key="NSLocation">1120</double> - </object> - <object class="NSTextTab" id="83303773"> - <double key="NSLocation">1176</double> - </object> - <object class="NSTextTab" id="166588966"> - <double key="NSLocation">1232</double> - </object> - <object class="NSTextTab" id="231896704"> - <double key="NSLocation">1288</double> - </object> - <object class="NSTextTab" id="934279505"> - <double key="NSLocation">1344</double> - </object> - <object class="NSTextTab" id="455349703"> - <double key="NSLocation">1400</double> - </object> - <object class="NSTextTab" id="1039519016"> - <double key="NSLocation">1456</double> - </object> - <object class="NSTextTab" id="402422982"> - <double key="NSLocation">1512</double> - </object> - <object class="NSTextTab" id="1048572155"> - <double key="NSLocation">1568</double> - </object> - <object class="NSTextTab" id="795190615"> - <double key="NSLocation">1624</double> - </object> - <object class="NSTextTab" id="870916292"> - <double key="NSLocation">1680</double> - </object> - <object class="NSTextTab" id="476331788"> - <double key="NSLocation">1736</double> - </object> - </object> - </object> - </object> - </object> - <object class="NSDictionary"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSColor</string> - <string>NSFont</string> - <string>NSParagraphStyle</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1029043619"/> - <object class="NSFont" id="25"> - <string key="NSName">LucidaGrande-Bold</string> - <double key="NSSize">10</double> - <int key="NSfFlags">16</int> - </object> - <object class="NSParagraphStyle"> - <int key="NSAlignment">3</int> - <object class="NSArray" key="NSTabStops"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="501503456"/> - <reference ref="901963619"/> - <reference ref="1001591936"/> - <reference ref="711834680"/> - <reference ref="593043090"/> - <reference ref="980925360"/> - <reference ref="682662534"/> - <reference ref="201209351"/> - <reference ref="231585962"/> - <reference ref="759866559"/> - <reference ref="501838998"/> - <reference ref="328935456"/> - <reference ref="291303009"/> - <reference ref="944565393"/> - <reference ref="116932563"/> - <reference ref="313453674"/> - <reference ref="874483567"/> - <reference ref="220229491"/> - <reference ref="400827970"/> - <reference ref="217167976"/> - <reference ref="448353934"/> - <reference ref="83303773"/> - <reference ref="166588966"/> - <reference ref="231896704"/> - <reference ref="934279505"/> - <reference ref="455349703"/> - <reference ref="1039519016"/> - <reference ref="402422982"/> - <reference ref="1048572155"/> - <reference ref="795190615"/> - <reference ref="870916292"/> - <reference ref="476331788"/> - </object> - </object> - </object> - </object> - </object> - <object class="NSMutableData" key="NSAttributeInfo"> - <bytes key="NS.bytes">GQAEAQgADAEiAAcBhAQAA</bytes> + <characters key="NS.bytes"/> </object> <nil key="NSDelegate"/> </object> <object class="NSMutableArray" key="NSTextContainers"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="649289743"/> + <reference ref="297140751"/> </object> <int key="NSLMFlags">6</int> <nil key="NSDelegate"/> </object> - <reference key="NSTextView" ref="852390500"/> - <double key="NSWidth">266</double> + <reference key="NSTextView" ref="843242867"/> + <double key="NSWidth">411</double> <int key="NSTCFlags">1</int> </object> <object class="NSTextViewSharedData" key="NSSharedData"> - <int key="NSFlags">2049</int> + <int key="NSFlags">2305</int> <int key="NSTextCheckingTypes">0</int> <nil key="NSMarkedAttributes"/> <reference key="NSBackgroundColor" ref="449903125"/> @@ -8022,58 +7835,54 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <nil key="NSDefaultParagraphStyle"/> </object> - <int key="NSTVFlags">7</int> - <string key="NSMaxSize">{1144, 1e+07}</string> - <string key="NSMinize">{86, 0}</string> + <int key="NSTVFlags">6</int> + <string key="NSMaxSize">{824, 1e+07}</string> + <string key="NSMinize">{180, 0}</string> <nil key="NSDelegate"/> </object> </object> - <string key="NSFrameSize">{266, 121}</string> - <reference key="NSSuperview" ref="992507944"/> - <reference key="NSNextKeyView" ref="852390500"/> - <reference key="NSDocView" ref="852390500"/> + <string key="NSFrame">{{1, 1}, {411, 264}}</string> + <reference key="NSSuperview" ref="666283614"/> + <reference key="NSDocView" ref="843242867"/> <reference key="NSBGColor" ref="449903125"/> <reference key="NSCursor" ref="32917531"/> - <int key="NScvFlags">2</int> + <int key="NScvFlags">4</int> </object> - <object class="BWTransparentScroller" id="775434024"> - <reference key="NSNextResponder" ref="992507944"/> + <object class="NSScroller" id="497829974"> + <reference key="NSNextResponder" ref="666283614"/> <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{266, 0}, {12, 121}}</string> - <reference key="NSSuperview" ref="992507944"/> - <bool key="NSEnabled">YES</bool> - <int key="NSArrowsLoc">2</int> - <reference key="NSTarget" ref="992507944"/> + <string key="NSFrame">{{-100, -100}, {11, 133}}</string> + <reference key="NSSuperview" ref="666283614"/> + <int key="NSsFlags">256</int> + <reference key="NSTarget" ref="666283614"/> <string key="NSAction">_doScroller:</string> - <double key="NSPercent">0.84027777777777779</double> + <double key="NSPercent">0.73888891935348511</double> </object> - <object class="NSScroller" id="655849727"> - <reference key="NSNextResponder" ref="992507944"/> + <object class="NSScroller" id="246464134"> + <reference key="NSNextResponder" ref="666283614"/> <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{-100, -100}, {574, 15}}</string> - <reference key="NSSuperview" ref="992507944"/> + <string key="NSFrame">{{-100, -100}, {87, 18}}</string> + <reference key="NSSuperview" ref="666283614"/> <int key="NSsFlags">1</int> - <reference key="NSTarget" ref="992507944"/> + <reference key="NSTarget" ref="666283614"/> <string key="NSAction">_doScroller:</string> <double key="NSCurValue">1</double> <double key="NSPercent">0.94565218687057495</double> </object> </object> - <string key="NSFrame">{{1, 34}, {278, 121}}</string> - <reference key="NSSuperview" ref="661948784"/> - <reference key="NSNextKeyView" ref="856231100"/> - <int key="NSsFlags">592</int> - <reference key="NSVScroller" ref="775434024"/> - <reference key="NSHScroller" ref="655849727"/> - <reference key="NSContentView" ref="856231100"/> + <string key="NSFrame">{{-1, 42}, {413, 266}}</string> + <reference key="NSSuperview" ref="749598685"/> + <int key="NSsFlags">514</int> + <reference key="NSVScroller" ref="497829974"/> + <reference key="NSHScroller" ref="246464134"/> + <reference key="NSContentView" ref="789153540"/> </object> </object> - <string key="NSFrameSize">{280, 162}</string> + <string key="NSFrameSize">{411, 341}</string> </object> - <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> - <string key="NSMinSize">{120, 119}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> - <string key="NSFrameAutosaveName">createTableSyntaxWindow</string> + <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> + <string key="NSMinSize">{350, 222}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> </object> <object class="NSWindowTemplate" id="466147946"> <int key="NSWindowStyleMask">9</int> @@ -8085,7 +7894,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{213, 107}</string> <object class="NSView" key="NSWindowView" id="860968037"> <nil key="NSNextResponder"/> @@ -8234,7 +8043,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{213, 129}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> </object> <object class="NSWindowTemplate" id="78186995"> <int key="NSWindowStyleMask">31</int> @@ -8244,7 +8053,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string key="NSWindowTitle">MySQL Help</string> <string key="NSWindowClass">NSPanel</string> <nil key="NSViewClass"/> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{351, 120}</string> <object class="NSView" key="NSWindowView" id="539508428"> <nil key="NSNextResponder"/> @@ -8638,7 +8447,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <string key="NSScreenRect">{{0, 0}, {1280, 1002}}</string> <string key="NSMinSize">{351, 136}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSFrameAutosaveName">MYSQL_HELP_WINDOW</string> </object> <object class="NSWindowTemplate" id="176945499"> @@ -8651,7 +8460,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{350, 250}</string> <object class="NSView" key="NSWindowView" id="1024486775"> <nil key="NSNextResponder"/> @@ -8913,7 +8722,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">4194304</int> <string key="NSContents">Please choose field mapping</string> - <reference key="NSSupport" ref="25"/> + <object class="NSFont" key="NSSupport"> + <string key="NSName">LucidaGrande-Bold</string> + <double key="NSSize">10</double> + <int key="NSfFlags">16</int> + </object> <reference key="NSControlView" ref="940196687"/> <reference key="NSBackgroundColor" ref="62854682"/> <reference key="NSTextColor" ref="454249633"/> @@ -9038,7 +8851,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string> <string key="NSMinSize">{350, 272}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> </object> <object class="NSWindowTemplate" id="434046103"> <int key="NSWindowStyleMask">9</int> @@ -9053,7 +8866,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string key="NSWindowContentMaxSize">{600, 127}</string> <string key="NSWindowContentMinSize">{260, 127}</string> <object class="NSView" key="NSWindowView" id="965040184"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -9062,7 +8875,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">266</int> <string key="NSFrame">{{17, 93}, {235, 14}}</string> <reference key="NSSuperview" ref="965040184"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="582381689"> <int key="NSCellFlags">67239488</int> @@ -9079,7 +8891,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">266</int> <string key="NSFrame">{{19, 67}, {220, 18}}</string> <reference key="NSSuperview" ref="965040184"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="341924224"> <int key="NSCellFlags">-1804468671</int> @@ -9097,7 +8908,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">289</int> <string key="NSFrame">{{166, 13}, {79, 28}}</string> <reference key="NSSuperview" ref="965040184"/> - <reference key="NSWindow"/> <int key="NSTag">1</int> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="434997641"> @@ -9121,7 +8931,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">257</int> <string key="NSFrame">{{91, 13}, {77, 28}}</string> <reference key="NSSuperview" ref="965040184"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="50497565"> <int key="NSCellFlags">67239424</int> @@ -9143,7 +8952,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSvFlags">266</int> <string key="NSFrame">{{18, 43}, {224, 18}}</string> <reference key="NSSuperview" ref="965040184"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="168974419"> <int key="NSCellFlags">67239424</int> @@ -9163,8 +8971,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> </object> <string key="NSFrameSize">{260, 127}</string> - <reference key="NSSuperview"/> - <reference key="NSWindow"/> </object> <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> <string key="NSMinSize">{260, 149}</string> @@ -9178,7 +8984,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string key="NSWindowTitle">Secure Text Input Sheet</string> <string key="NSWindowClass">NSPanel</string> <nil key="NSViewClass"/> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <object class="NSView" key="NSWindowView" id="978976687"> <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> @@ -9282,7 +9088,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string key="NSFrameSize">{338, 138}</string> </object> <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> </object> <object class="NSCustomView" id="139279766"> <nil key="NSNextResponder"/> @@ -9873,7 +9679,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">134348800</int> <string key="NSContents">reload</string> - <reference key="NSSupport" ref="188091016"/> + <object class="NSFont" key="NSSupport" id="188091016"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">10</double> + <int key="NSfFlags">2843</int> + </object> <reference key="NSControlView" ref="496993033"/> <int key="NSButtonFlags">113508607</int> <int key="NSButtonFlags2">2</int> @@ -11678,7 +11488,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string key="NSColorName">disabledControlTextColor</string> <object class="NSColor" key="NSColor"> <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC4zMzMzMzMzMzMzAA</bytes> + <bytes key="NSWhite">MC4zMzMzMzMzNDMzAA</bytes> </object> </object> </object> @@ -12569,14 +12379,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="connectionID">819</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">closeSheet:</string> - <reference key="source" ref="427689665"/> - <reference key="destination" ref="448933484"/> - </object> - <int key="connectionID">851</int> - </object> - <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">variablesTableView</string> <reference key="source" ref="427689665"/> @@ -13010,14 +12812,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">createTableSyntaxWindow</string> - <reference key="source" ref="427689665"/> - <reference key="destination" ref="135079060"/> - </object> - <int key="connectionID">3989</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">chooseDatabaseButton</string> <reference key="source" ref="427689665"/> <reference key="destination" ref="359419551"/> @@ -14761,30 +14555,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="connectionID">6012</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">copyCreateTableSyntax:</string> - <reference key="source" ref="444826705"/> - <reference key="destination" ref="568453839"/> - </object> - <int key="connectionID">6069</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">syntaxViewContent</string> - <reference key="source" ref="427689665"/> - <reference key="destination" ref="852390500"/> - </object> - <int key="connectionID">6087</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">syntaxView</string> - <reference key="source" ref="427689665"/> - <reference key="destination" ref="992507944"/> - </object> - <int key="connectionID">6088</int> - </object> - <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">singleProgressBar</string> <reference key="source" ref="225526897"/> @@ -15001,26 +14771,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <int key="connectionID">6206</int> </object> <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">font: values.CustomQueryEditorFont</string> - <reference key="source" ref="852390500"/> - <reference key="destination" ref="461189245"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="852390500"/> - <reference key="NSDestination" ref="461189245"/> - <string key="NSLabel">font: values.CustomQueryEditorFont</string> - <string key="NSBinding">font</string> - <string key="NSKeyPath">values.CustomQueryEditorFont</string> - <object class="NSDictionary" key="NSOptions"> - <string key="NS.key.0">NSValueTransformerName</string> - <string key="NS.object.0">NSUnarchiveFromData</string> - </object> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">6208</int> - </object> - <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">databaseDataInstance</string> <reference key="source" ref="438574515"/> @@ -15813,6 +15563,90 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <int key="connectionID">6536</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">scrollView</string> + <reference key="source" ref="843242867"/> + <reference key="destination" ref="666283614"/> + </object> + <int key="connectionID">6586</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">createTableSyntaxWindow</string> + <reference key="source" ref="427689665"/> + <reference key="destination" ref="828950706"/> + </object> + <int key="connectionID">6587</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">font: values.CustomQueryEditorFont</string> + <reference key="source" ref="843242867"/> + <reference key="destination" ref="461189245"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="843242867"/> + <reference key="NSDestination" ref="461189245"/> + <string key="NSLabel">font: values.CustomQueryEditorFont</string> + <string key="NSBinding">font</string> + <string key="NSKeyPath">values.CustomQueryEditorFont</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSValueTransformerName</string> + <string key="NS.object.0">NSUnarchiveFromData</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">6593</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">createTableSyntaxTextView</string> + <reference key="source" ref="427689665"/> + <reference key="destination" ref="843242867"/> + </object> + <int key="connectionID">6596</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">createTableSyntaxTextField</string> + <reference key="source" ref="427689665"/> + <reference key="destination" ref="964799848"/> + </object> + <int key="connectionID">6597</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">saveCreateSyntax:</string> + <reference key="source" ref="427689665"/> + <reference key="destination" ref="1045688777"/> + </object> + <int key="connectionID">6598</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">closePanelSheet:</string> + <reference key="source" ref="427689665"/> + <reference key="destination" ref="281286750"/> + </object> + <int key="connectionID">6599</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">closePanelSheet:</string> + <reference key="source" ref="427689665"/> + <reference key="destination" ref="448933484"/> + </object> + <int key="connectionID">6600</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="460727716"/> + <reference key="destination" ref="427689665"/> + </object> + <int key="connectionID">6601</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -17276,26 +17110,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference key="parent" ref="448100292"/> </object> <object class="IBObjectRecord"> - <int key="objectID">3987</int> - <reference key="object" ref="135079060"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="661948784"/> - </object> - <reference key="parent" ref="0"/> - <string key="objectName">Create Table Syntax HUD</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">3988</int> - <reference key="object" ref="661948784"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="992507944"/> - <reference ref="568453839"/> - </object> - <reference key="parent" ref="135079060"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">850</int> <reference key="object" ref="448933484"/> <object class="NSMutableArray" key="children"> @@ -21041,46 +20855,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference key="parent" ref="298095498"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6067</int> - <reference key="object" ref="568453839"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="295636063"/> - </object> - <reference key="parent" ref="661948784"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6068</int> - <reference key="object" ref="295636063"/> - <reference key="parent" ref="568453839"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6083</int> - <reference key="object" ref="992507944"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="775434024"/> - <reference ref="655849727"/> - <reference ref="852390500"/> - </object> - <reference key="parent" ref="661948784"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6084</int> - <reference key="object" ref="775434024"/> - <reference key="parent" ref="992507944"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6085</int> - <reference key="object" ref="655849727"/> - <reference key="parent" ref="992507944"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6086</int> - <reference key="object" ref="852390500"/> - <reference key="parent" ref="992507944"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">6116</int> <reference key="object" ref="770676933"/> <object class="NSMutableArray" key="children"> @@ -22186,6 +21960,96 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <reference key="object" ref="134854992"/> <reference key="parent" ref="727834078"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">6557</int> + <reference key="object" ref="828950706"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="749598685"/> + </object> + <reference key="parent" ref="0"/> + <string key="objectName">Create Table Syntax</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">6558</int> + <reference key="object" ref="749598685"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="964799848"/> + <reference ref="1045688777"/> + <reference ref="281286750"/> + <reference ref="666283614"/> + </object> + <reference key="parent" ref="828950706"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">6562</int> + <reference key="object" ref="964799848"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="187876153"/> + </object> + <reference key="parent" ref="749598685"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">6563</int> + <reference key="object" ref="1045688777"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="116117289"/> + </object> + <reference key="parent" ref="749598685"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">6564</int> + <reference key="object" ref="281286750"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="849738207"/> + </object> + <reference key="parent" ref="749598685"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">6565</int> + <reference key="object" ref="849738207"/> + <reference key="parent" ref="281286750"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">6566</int> + <reference key="object" ref="116117289"/> + <reference key="parent" ref="1045688777"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">6567</int> + <reference key="object" ref="187876153"/> + <reference key="parent" ref="964799848"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">6582</int> + <reference key="object" ref="666283614"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="843242867"/> + <reference ref="246464134"/> + <reference ref="497829974"/> + </object> + <reference key="parent" ref="749598685"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">6583</int> + <reference key="object" ref="843242867"/> + <reference key="parent" ref="666283614"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">6584</int> + <reference key="object" ref="246464134"/> + <reference key="parent" ref="666283614"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">6585</int> + <reference key="object" ref="497829974"/> + <reference key="parent" ref="666283614"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -22641,16 +22505,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>3974.IBPluginDependency</string> <string>3976.IBNumberFormatterLocalizesFormatMetadataKey</string> <string>3976.IBPluginDependency</string> - <string>3987.IBEditorWindowLastContentRect</string> - <string>3987.IBPluginDependency</string> - <string>3987.IBWindowTemplateEditedContentRect</string> - <string>3987.NSWindowTemplate.visibleAtLaunch</string> - <string>3987.editorWindowContentRectSynchronizationRect</string> - <string>3987.windowTemplate.hasMaxSize</string> - <string>3987.windowTemplate.hasMinSize</string> - <string>3987.windowTemplate.maxSize</string> - <string>3987.windowTemplate.minSize</string> - <string>3988.IBPluginDependency</string> <string>3994.IBEditorWindowLastContentRect</string> <string>3994.IBPluginDependency</string> <string>3994.WindowOrigin</string> @@ -23306,12 +23160,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>6032.IBPluginDependency</string> <string>6033.IBPluginDependency</string> <string>6034.IBPluginDependency</string> - <string>6067.IBPluginDependency</string> - <string>6068.IBPluginDependency</string> - <string>6083.IBPluginDependency</string> - <string>6084.IBPluginDependency</string> - <string>6085.IBPluginDependency</string> - <string>6086.IBPluginDependency</string> <string>6116.IBPluginDependency</string> <string>6117.IBPluginDependency</string> <string>6125.IBEditorWindowLastContentRect</string> @@ -23511,6 +23359,29 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>655.ImportedFromIB2</string> <string>6551.IBPluginDependency</string> <string>6554.IBPluginDependency</string> + <string>6557.IBEditorWindowLastContentRect</string> + <string>6557.IBPluginDependency</string> + <string>6557.IBWindowTemplateEditedContentRect</string> + <string>6557.ImportedFromIB2</string> + <string>6557.editorWindowContentRectSynchronizationRect</string> + <string>6557.windowTemplate.hasMaxSize</string> + <string>6557.windowTemplate.hasMinSize</string> + <string>6557.windowTemplate.maxSize</string> + <string>6557.windowTemplate.minSize</string> + <string>6558.IBPluginDependency</string> + <string>6558.ImportedFromIB2</string> + <string>6562.IBPluginDependency</string> + <string>6563.IBPluginDependency</string> + <string>6564.IBPluginDependency</string> + <string>6564.ImportedFromIB2</string> + <string>6565.IBPluginDependency</string> + <string>6566.IBPluginDependency</string> + <string>6567.IBPluginDependency</string> + <string>6582.IBPluginDependency</string> + <string>6583.CustomClassName</string> + <string>6583.IBPluginDependency</string> + <string>6584.IBPluginDependency</string> + <string>6585.IBPluginDependency</string> <string>662.IBPluginDependency</string> <string>662.ImportedFromIB2</string> <string>663.IBPluginDependency</string> @@ -24256,16 +24127,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{172, 622}, {280, 162}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{172, 622}, {280, 162}}</string> - <integer value="0"/> - <string>{{115, 214}, {588, 350}}</string> - <integer value="0"/> - <boolean value="YES"/> - <string>{3.40282e+38, 3.40282e+38}</string> - <string>{120, 100}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{339, 92}, {269, 32}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{628, 654}</string> @@ -25089,12 +24950,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>com.brandonwalkin.BWToolkit</string> <string>com.brandonwalkin.BWToolkit</string> <string>com.brandonwalkin.BWToolkit</string> - <string>com.brandonwalkin.BWToolkit</string> - <string>com.brandonwalkin.BWToolkit</string> - <string>com.brandonwalkin.BWToolkit</string> - <string>com.brandonwalkin.BWToolkit</string> - <string>com.brandonwalkin.BWToolkit</string> - <string>com.brandonwalkin.BWToolkit</string> <string>{{717, 615}, {379, 139}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{717, 615}, {379, 139}}</string> @@ -25423,6 +25278,29 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{766, 311}, {411, 341}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{766, 311}, {411, 341}}</string> + <integer value="1"/> + <string>{{321, 508}, {411, 341}}</string> + <integer value="0"/> + <integer value="1"/> + <string>{3.40282e+38, 3.40282e+38}</string> + <string>{350, 200}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.brandonwalkin.BWToolkit</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.brandonwalkin.BWToolkit</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>CMTextView</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -25473,9 +25351,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{356, 287}, {411, 341}}</string> + <string>{{795, 383}, {411, 341}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{356, 287}, {411, 341}}</string> + <string>{{795, 383}, {411, 341}}</string> <integer value="1"/> <string>{{321, 508}, {411, 341}}</string> <integer value="0"/> @@ -25611,7 +25489,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> </object> <nil key="sourceID"/> - <int key="maxID">6556</int> + <int key="maxID">6601</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -26414,6 +26292,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>chooseEncoding:</string> <string>closeDatabaseSheet:</string> <string>closeErrorConnectionSheet:</string> + <string>closePanelSheet:</string> <string>closePasswordSheet:</string> <string>closeSheet:</string> <string>copyCreateTableSyntax:</string> @@ -26427,6 +26306,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>removeDatabase:</string> <string>repairTable:</string> <string>saveConnectionSheet:</string> + <string>saveCreateSyntax:</string> <string>saveServerVariables:</string> <string>setDatabases:</string> <string>showCreateTableSyntax:</string> @@ -26477,6 +26357,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>id</string> <string>id</string> <string>id</string> + <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> @@ -26487,6 +26369,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>chooseDatabaseButton</string> <string>connectionErrorDialog</string> <string>contentViewSplitter</string> + <string>createTableSyntaxTextField</string> + <string>createTableSyntaxTextView</string> <string>createTableSyntaxWindow</string> <string>customQueryInstance</string> <string>customQueryTextView</string> @@ -26517,8 +26401,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>sidebarGrabber</string> <string>spExportControllerInstance</string> <string>spHistoryControllerInstance</string> - <string>syntaxView</string> - <string>syntaxViewContent</string> <string>tableContentInstance</string> <string>tableDataInstance</string> <string>tableDumpInstance</string> @@ -26544,6 +26426,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>id</string> <string>NSWindow</string> <string>NSSplitView</string> + <string>NSTextField</string> + <string>NSTextView</string> <string>NSWindow</string> <string>id</string> <string>NSTextView</string> @@ -26577,8 +26461,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string>id</string> <string>id</string> <string>id</string> - <string>id</string> - <string>id</string> <string>NSButton</string> <string>NSTableView</string> <string>NSSplitView</string> diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib index 2b06848f..d719e5b6 100644 --- a/Interfaces/English.lproj/MainMenu.xib +++ b/Interfaces/English.lproj/MainMenu.xib @@ -12,7 +12,7 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="498"/> + <integer value="758"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1570,8 +1570,8 @@ <object class="NSMenuItem" id="638185532"> <reference key="NSMenu" ref="1056168652"/> <string key="NSTitle">Show Create Table Syntax</string> - <string key="NSKeyEquiv">S</string> - <int key="NSKeyEquivModMask">1048576</int> + <string key="NSKeyEquiv">s</string> + <int key="NSKeyEquivModMask">1572864</int> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="625762401"/> <reference key="NSMixedImage" ref="315854375"/> @@ -4952,6 +4952,13 @@ <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> + <string key="minorKey">Source/SPContentFilterManager.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> <string key="minorKey">Source/SPExporter.h</string> </object> </object> @@ -5215,6 +5222,7 @@ <string>chooseEncoding:</string> <string>closeDatabaseSheet:</string> <string>closeErrorConnectionSheet:</string> + <string>closePanelSheet:</string> <string>closePasswordSheet:</string> <string>closeSheet:</string> <string>copyCreateTableSyntax:</string> @@ -5228,6 +5236,7 @@ <string>removeDatabase:</string> <string>repairTable:</string> <string>saveConnectionSheet:</string> + <string>saveCreateSyntax:</string> <string>saveServerVariables:</string> <string>setDatabases:</string> <string>showCreateTableSyntax:</string> @@ -5278,6 +5287,8 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> @@ -5288,6 +5299,8 @@ <string>chooseDatabaseButton</string> <string>connectionErrorDialog</string> <string>contentViewSplitter</string> + <string>createTableSyntaxTextField</string> + <string>createTableSyntaxTextView</string> <string>createTableSyntaxWindow</string> <string>customQueryInstance</string> <string>customQueryTextView</string> @@ -5318,8 +5331,6 @@ <string>sidebarGrabber</string> <string>spExportControllerInstance</string> <string>spHistoryControllerInstance</string> - <string>syntaxView</string> - <string>syntaxViewContent</string> <string>tableContentInstance</string> <string>tableDataInstance</string> <string>tableDumpInstance</string> @@ -5345,6 +5356,8 @@ <string>id</string> <string>NSWindow</string> <string>NSSplitView</string> + <string>NSTextField</string> + <string>NSTextView</string> <string>NSWindow</string> <string>id</string> <string>NSTextView</string> @@ -5378,8 +5391,6 @@ <string>id</string> <string>id</string> <string>id</string> - <string>id</string> - <string>id</string> <string>NSButton</string> <string>NSTableView</string> <string>NSSplitView</string> diff --git a/Source/TableDocument.h b/Source/TableDocument.h index 57cbeb4f..89603085 100644 --- a/Source/TableDocument.h +++ b/Source/TableDocument.h @@ -93,8 +93,8 @@ enum sp_current_query_mode IBOutlet NSTableView *dbTablesTableView; - IBOutlet id syntaxView; - IBOutlet id syntaxViewContent; + IBOutlet NSTextField *createTableSyntaxTextField; + IBOutlet NSTextView *createTableSyntaxTextView; IBOutlet NSWindow *createTableSyntaxWindow; IBOutlet NSWindow *connectionErrorDialog; @@ -144,7 +144,6 @@ enum sp_current_query_mode NSDictionary *spfSession; NSMutableDictionary *spfPreferences; NSMutableDictionary *spfDocData; - } - (NSString *)getHTMLforPrint; @@ -188,12 +187,14 @@ enum sp_current_query_mode - (IBAction)repairTable:(id)sender; - (IBAction)flushTable:(id)sender; - (IBAction)checksumTable:(id)sender; +- (IBAction)saveCreateSyntax:(id)sender; // Other methods - (void) setQueryMode:(int)theQueryMode; - (NSString *)host; - (IBAction)closeSheet:(id)sender; - (IBAction)closeErrorConnectionSheet:(id)sender; +- (IBAction)closePanelSheet:(id)sender; - (void)doPerformQueryService:(NSString *)query; - (void)doPerformLoadQueryService:(NSString *)query; - (void)flushPrivileges:(id)sender; diff --git a/Source/TableDocument.m b/Source/TableDocument.m index 6c1bd042..c685c89b 100644 --- a/Source/TableDocument.m +++ b/Source/TableDocument.m @@ -175,11 +175,23 @@ av.size.height); [titleAccessoryView setFrame:initialAccessoryViewFrame]; [windowFrame addSubview:titleAccessoryView]; + + // Bind the background color of the create syntax text view to the users preference + [createTableSyntaxTextView setAllowsDocumentBackgroundColorChange:YES]; + + NSMutableDictionary *bindingOptions = [NSMutableDictionary dictionary]; + + [bindingOptions setObject:NSUnarchiveFromDataTransformerName forKey:@"NSValueTransformerName"]; + + [createTableSyntaxTextView bind:@"backgroundColor" + toObject:[NSUserDefaultsController sharedUserDefaultsController] + withKeyPath:@"values.CustomQueryEditorBackgroundColor" + options:bindingOptions]; // Load additional nibs if (![NSBundle loadNibNamed:@"ConnectionErrorDialog" owner:self]) { NSLog(@"Connection error dialog could not be loaded; connection failure handling will not function correctly."); - } + } } - (void)initWithConnectionFile:(NSString *)path @@ -1327,31 +1339,30 @@ - (IBAction)showCreateTableSyntax:(id)sender { //Create the query and get results - NSString *query = nil; - NSString *createWindowTitle; int colOffs = 1; + NSString *query = nil; + NSString *typeString = @""; if( [tablesListInstance tableType] == SP_TABLETYPE_TABLE ) { query = [NSString stringWithFormat:@"SHOW CREATE TABLE %@", [[self table] backtickQuotedString]]; - createWindowTitle = @"Create Table Syntax"; + typeString = @"table"; } else if( [tablesListInstance tableType] == SP_TABLETYPE_VIEW ) { query = [NSString stringWithFormat:@"SHOW CREATE VIEW %@", [[self table] backtickQuotedString]]; - createWindowTitle = @"Create View Syntax"; + typeString = @"view"; } else if( [tablesListInstance tableType] == SP_TABLETYPE_PROC ) { query = [NSString stringWithFormat:@"SHOW CREATE PROCEDURE %@", [[self table] backtickQuotedString]]; - createWindowTitle = @"Create Procedure Syntax"; + typeString = @"procedure"; colOffs = 2; } else if( [tablesListInstance tableType] == SP_TABLETYPE_FUNC ) { query = [NSString stringWithFormat:@"SHOW CREATE FUNCTION %@", [[self table] backtickQuotedString]]; - createWindowTitle = @"Create Function Syntax"; + typeString = @"function"; colOffs = 2; } - if( query == nil ) - return; + if (query == nil) return; MCPResult *theResult = [mySQLConnection queryString:query]; @@ -1360,6 +1371,7 @@ if ([mySQLConnection isConnected]) { NSRunAlertPanel(@"Error", [NSString stringWithFormat:@"An error occured while creating table syntax.\n\n: %@",[mySQLConnection getLastErrorMessage]], @"OK", nil, nil); } + return; } @@ -1367,18 +1379,20 @@ if ([tableSyntax isKindOfClass:[NSData class]]) tableSyntax = [[NSString alloc] initWithData:tableSyntax encoding:[mySQLConnection encoding]]; - - if([tablesListInstance tableType] == SP_TABLETYPE_VIEW) - [syntaxViewContent setString:[tableSyntax createViewSyntaxPrettifier]]; - else - [syntaxViewContent setString:tableSyntax]; - - [syntaxViewContent setEditable:NO]; - [createTableSyntaxWindow setTitle:createWindowTitle]; - - if(![createTableSyntaxWindow isVisible]) - [createTableSyntaxWindow makeKeyAndOrderFront:self]; + [createTableSyntaxTextField setStringValue:[NSString stringWithFormat:@"Create syntax for %@ '%@'", typeString, [self table]]]; + + [createTableSyntaxTextView setEditable:YES]; + [createTableSyntaxTextView setString:@""]; + [createTableSyntaxTextView insertText:([tablesListInstance tableType] == SP_TABLETYPE_VIEW) ? [tableSyntax createViewSyntaxPrettifier] : tableSyntax]; + [createTableSyntaxTextView setEditable:NO]; + + // Show variables sheet + [NSApp beginSheet:createTableSyntaxWindow + modalForWindow:tableWindow + modalDelegate:self + didEndSelector:nil + contextInfo:nil]; } /** @@ -1713,6 +1727,22 @@ contextInfo:NULL]; } +/** + * Saves the current tables create syntax to the selected file. + */ +- (IBAction)saveCreateSyntax:(id)sender +{ + NSSavePanel *panel = [NSSavePanel savePanel]; + + [panel setRequiredFileType:@"sql"]; + + [panel setExtensionHidden:NO]; + [panel setAllowsOtherFileTypes:YES]; + [panel setCanSelectHiddenExtension:YES]; + + [panel beginSheetForDirectory:nil file:@"CreateSyntax" modalForWindow:createTableSyntaxWindow modalDelegate:self didEndSelector:@selector(savePanelDidEnd:returnCode:contextInfo:) contextInfo:@"CreateSyntax"]; +} + #pragma mark - #pragma mark Other Methods @@ -1731,7 +1761,7 @@ * dialogs such as the variableSheet or the createTableSyntaxSheet */ - (IBAction)closeSheet:(id)sender -{ +{ [NSApp stopModalWithCode:0]; } @@ -1744,6 +1774,25 @@ } /** + * + */ +- (IBAction)closePanelSheet:(id)sender +{ + [NSApp endSheet:[sender window] returnCode:[sender tag]]; + [[sender window] orderOut:self]; + + // If it was the server variables sheet that was closed release the relevant arrays if necessary + if ([sender window] == variablesSheet) { + // If the filtered array is allocated and its not a reference to the variables array get rid of it + if ((variablesFiltered) && (variablesFiltered != variables)) { + [variablesFiltered release], variablesFiltered = nil; + } + + if (variables) [variables release], variables = nil; + } +} + +/** * Passes query to tablesListInstance */ - (void)doPerformQueryService:(NSString *)query @@ -1812,20 +1861,10 @@ // Show variables sheet [NSApp beginSheet:variablesSheet - modalForWindow:tableWindow modalDelegate:self - didEndSelector:nil contextInfo:nil]; - - [NSApp runModalForWindow:variablesSheet]; - [NSApp endSheet:variablesSheet]; - - [variablesSheet orderOut:nil]; - - // If the filtered array is allocated and its not a reference to the variables array get rid of it - if ((variablesFiltered) && (variablesFiltered != variables)) { - [variablesFiltered release], variablesFiltered = nil; - } - - if (variables) [variables release], variables = nil; + modalForWindow:tableWindow + modalDelegate:self + didEndSelector:nil + contextInfo:nil]; } - (void)closeConnection @@ -2461,7 +2500,7 @@ [panel setAllowsOtherFileTypes:YES]; [panel setCanSelectHiddenExtension:YES]; - [panel beginSheetForDirectory:nil file:@"ServerVariables" modalForWindow:variablesSheet modalDelegate:self didEndSelector:@selector(savePanelDidEnd:returnCode:contextInfo:) contextInfo:NULL]; + [panel beginSheetForDirectory:nil file:@"ServerVariables" modalForWindow:variablesSheet modalDelegate:self didEndSelector:@selector(savePanelDidEnd:returnCode:contextInfo:) contextInfo:@"ServerVariables"]; } /** @@ -2655,18 +2694,31 @@ /** * Called when the NSSavePanel sheet ends. Writes the server variables to the selected file if required. */ -- (void)savePanelDidEnd:(NSSavePanel *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo +- (void)savePanelDidEnd:(NSSavePanel *)sheet returnCode:(int)returnCode contextInfo:(NSString *)contextInfo { if (returnCode == NSOKButton) { - if ([variablesFiltered count] > 0) { - NSMutableString *variablesString = [NSMutableString stringWithFormat:@"# MySQL server variables for %@\n\n", [self host]]; - - for (NSDictionary *variable in variablesFiltered) - { - [variablesString appendString:[NSString stringWithFormat:@"%@ = %@\n", [variable objectForKey:@"Variable_name"], [variable objectForKey:@"Value"]]]; + if ([contextInfo isEqualToString:@"ServerVariables"]) { + if ([variablesFiltered count] > 0) { + NSMutableString *variablesString = [NSMutableString stringWithFormat:@"# MySQL server variables for %@\n\n", [self host]]; + + for (NSDictionary *variable in variablesFiltered) + { + [variablesString appendString:[NSString stringWithFormat:@"%@ = %@\n", [variable objectForKey:@"Variable_name"], [variable objectForKey:@"Value"]]]; + } + + [variablesString writeToFile:[sheet filename] atomically:YES encoding:NSUTF8StringEncoding error:NULL]; } + } + else if ([contextInfo isEqualToString:@"CreateSyntax"]) { + - [variablesString writeToFile:[sheet filename] atomically:YES encoding:NSUTF8StringEncoding error:NULL]; + NSString *createSyntax = [createTableSyntaxTextView string]; + + if ([createSyntax length] > 0) { + NSString *output = [NSString stringWithFormat:@"-- Create syntax for '%@'\n\n%@\n", [self table], createSyntax]; + + [output writeToFile:[sheet filename] atomically:YES encoding:NSUTF8StringEncoding error:NULL]; + } } } } @@ -2976,14 +3028,13 @@ //set up interface if ( [prefs boolForKey:@"UseMonospacedFonts"] ) { [[SPQueryController sharedQueryController] setConsoleFont:[NSFont fontWithName:@"Monaco" size:[NSFont smallSystemFontSize]]]; - [syntaxViewContent setFont:[NSFont fontWithName:@"Monaco" size:[NSFont smallSystemFontSize]]]; while ( (theCol = [theCols nextObject]) ) { [[theCol dataCell] setFont:[NSFont fontWithName:@"Monaco" size:10]]; } } else { [[SPQueryController sharedQueryController] setConsoleFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; - [syntaxViewContent setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; + while ( (theCol = [theCols nextObject]) ) { [[theCol dataCell] setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; } @@ -3249,6 +3300,8 @@ return theValue; } +#pragma mark - + - (void)dealloc { |