aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBibiko <bibiko@eva.mpg.de>2009-07-17 12:48:24 +0000
committerBibiko <bibiko@eva.mpg.de>2009-07-17 12:48:24 +0000
commitea68a07c5b1e2167f17ee8528faf43650997511a (patch)
tree5c8bde110fea2f34ec2457ecae679a3884e8e75f
parente924f11978d280345572960636e5ffc42b53b5b2 (diff)
downloadsequelpro-ea68a07c5b1e2167f17ee8528faf43650997511a.tar.gz
sequelpro-ea68a07c5b1e2167f17ee8528faf43650997511a.tar.bz2
sequelpro-ea68a07c5b1e2167f17ee8528faf43650997511a.zip
• applied the new class SPFieldEditorController to TableContent
• deleted in DBVview.xib Field Editor Sheet (out-sourced)
Diffstat
-rw-r--r--Interfaces/English.lproj/DBView.xib1253
-rw-r--r--Interfaces/English.lproj/FieldEditorSheet.xib38
-rw-r--r--Source/SPFieldEditorController.h8
-rw-r--r--Source/SPFieldEditorController.m102
-rw-r--r--Source/TableContent.h26
-rw-r--r--Source/TableContent.m522
6 files changed, 121 insertions, 1828 deletions
diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index 766b7ea2..b0c9e362 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -7032,611 +7032,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSMinSize">{213, 72}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
</object>
- <object class="NSWindowTemplate" id="400229091">
- <int key="NSWindowStyleMask">9</int>
- <int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{115, 389}, {667, 416}}</string>
- <int key="NSWTFlags">1886912512</int>
- <string key="NSWindowTitle">Field Editor</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">{560, 200}</string>
- <object class="NSView" key="NSWindowView" id="999543752">
- <nil key="NSNextResponder"/>
- <int key="NSvFlags">4370</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSBox" id="427523434">
- <reference key="NSNextResponder" ref="999543752"/>
- <int key="NSvFlags">34</int>
- <string key="NSFrame">{{0, 36}, {667, 5}}</string>
- <reference key="NSSuperview" ref="999543752"/>
- <string key="NSOffsets">{0, 0}</string>
- <object class="NSTextFieldCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Box</string>
- <reference key="NSSupport" ref="244931163"/>
- <reference key="NSBackgroundColor" ref="480189472"/>
- <object class="NSColor" key="NSTextColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
- </object>
- </object>
- <int key="NSBorderType">3</int>
- <int key="NSBoxType">2</int>
- <int key="NSTitlePosition">0</int>
- <bool key="NSTransparent">NO</bool>
- </object>
- <object class="NSButton" id="253418976">
- <reference key="NSNextResponder" ref="999543752"/>
- <int key="NSvFlags">257</int>
- <string key="NSFrame">{{581, 7}, {66, 25}}</string>
- <reference key="NSSuperview" ref="999543752"/>
- <int key="NSTag">1</int>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="614204575">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">134348800</int>
- <string key="NSContents">OK</string>
- <reference key="NSSupport" ref="26"/>
- <int key="NSTag">1</int>
- <reference key="NSControlView" ref="253418976"/>
- <int key="NSButtonFlags">-2038284033</int>
- <int key="NSButtonFlags2">35</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="87722169">
- <reference key="NSNextResponder" ref="999543752"/>
- <int key="NSvFlags">257</int>
- <string key="NSFrame">{{507, 7}, {66, 25}}</string>
- <reference key="NSSuperview" ref="999543752"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="888101847">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">134348800</int>
- <string key="NSContents">Cancel</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="87722169"/>
- <int key="NSButtonFlags">-2038284033</int>
- <int key="NSButtonFlags2">35</int>
- <reference key="NSAlternateImage" ref="790379580"/>
- <string key="NSAlternateContents"/>
- <string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSButton" id="871440870">
- <reference key="NSNextResponder" ref="999543752"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{94, 7}, {66, 25}}</string>
- <reference key="NSSuperview" ref="999543752"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="46380971">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">134348800</int>
- <string key="NSContents">Save...</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="871440870"/>
- <int key="NSButtonFlags">-2038284033</int>
- <int key="NSButtonFlags2">268435491</int>
- <reference key="NSAlternateImage" ref="790379580"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent">s</string>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSButton" id="938738159">
- <reference key="NSNextResponder" ref="999543752"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{20, 7}, {66, 25}}</string>
- <reference key="NSSuperview" ref="999543752"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="544799467">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">134348800</int>
- <string key="NSContents">Open...</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="938738159"/>
- <int key="NSButtonFlags">-2038284033</int>
- <int key="NSButtonFlags2">268435491</int>
- <reference key="NSAlternateImage" ref="790379580"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent">o</string>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSPopUpButton" id="620882358">
- <reference key="NSNextResponder" ref="999543752"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{328, 7}, {48, 25}}</string>
- <reference key="NSSuperview" ref="999543752"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="1049067135">
- <int key="NSCellFlags">71433792</int>
- <int key="NSCellFlags2">134350848</int>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="620882358"/>
- <int key="NSButtonFlags">-2031075073</int>
- <int key="NSButtonFlags2">33554467</int>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="414896542">
- <reference key="NSMenu" ref="330923656"/>
- <bool key="NSIsHidden">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <object class="NSCustomResource" key="NSImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSQuickLookTemplate</string>
- </object>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1049067135"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="330923656">
- <string key="NSTitle">OtherViews</string>
- <object class="NSMutableArray" key="NSMenuItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="414896542"/>
- <object class="NSMenuItem" id="651311563">
- <reference key="NSMenu" ref="330923656"/>
- <string key="NSTitle">Image</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1049067135"/>
- </object>
- <object class="NSMenuItem" id="290675907">
- <reference key="NSMenu" ref="330923656"/>
- <string key="NSTitle">Sound (m4a)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">1</int>
- <reference key="NSTarget" ref="1049067135"/>
- </object>
- <object class="NSMenuItem" id="60551315">
- <reference key="NSMenu" ref="330923656"/>
- <string key="NSTitle">Sound (mp3)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">2</int>
- <reference key="NSTarget" ref="1049067135"/>
- </object>
- <object class="NSMenuItem" id="313658995">
- <reference key="NSMenu" ref="330923656"/>
- <string key="NSTitle">Sound (linear)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">3</int>
- <reference key="NSTarget" ref="1049067135"/>
- </object>
- <object class="NSMenuItem" id="405291739">
- <reference key="NSMenu" ref="330923656"/>
- <string key="NSTitle">Movie</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">4</int>
- <reference key="NSTarget" ref="1049067135"/>
- </object>
- <object class="NSMenuItem" id="624314986">
- <reference key="NSMenu" ref="330923656"/>
- <string key="NSTitle">pdf</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">5</int>
- <reference key="NSTarget" ref="1049067135"/>
- </object>
- <object class="NSMenuItem" id="337614031">
- <reference key="NSMenu" ref="330923656"/>
- <string key="NSTitle">html</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">6</int>
- <reference key="NSTarget" ref="1049067135"/>
- </object>
- <object class="NSMenuItem" id="950803686">
- <reference key="NSMenu" ref="330923656"/>
- <string key="NSTitle">doc</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">7</int>
- <reference key="NSTarget" ref="1049067135"/>
- </object>
- <object class="NSMenuItem" id="182514031">
- <reference key="NSMenu" ref="330923656"/>
- <string key="NSTitle">rtf</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">8</int>
- <reference key="NSTarget" ref="1049067135"/>
- </object>
- </object>
- </object>
- <bool key="NSPullDown">YES</bool>
- <int key="NSPreferredEdge">1</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">2</int>
- </object>
- </object>
- <object class="NSSegmentedControl" id="175886676">
- <reference key="NSNextResponder" ref="999543752"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{183, 10}, {137, 19}}</string>
- <reference key="NSSuperview" ref="999543752"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSSegmentedCell" key="NSCell" id="438375364">
- <int key="NSCellFlags">-2080244224</int>
- <int key="NSCellFlags2">131072</int>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="175886676"/>
- <object class="NSMutableArray" key="NSSegmentImages">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSSegmentItem">
- <double key="NSSegmentItemWidth">4.500000e+01</double>
- <string key="NSSegmentItemLabel">Text</string>
- <string key="NSSegmentItemTooltip">Show data as text</string>
- <int key="NSSegmentItemImageScaling">0</int>
- </object>
- <object class="NSSegmentItem">
- <double key="NSSegmentItemWidth">4.400000e+01</double>
- <string key="NSSegmentItemLabel">Image</string>
- <string key="NSSegmentItemTooltip">Try to show data as image</string>
- <int key="NSSegmentItemTag">1</int>
- <bool key="NSSegmentItemSelected">YES</bool>
- <int key="NSSegmentItemImageScaling">0</int>
- </object>
- <object class="NSSegmentItem">
- <double key="NSSegmentItemWidth">4.400000e+01</double>
- <string key="NSSegmentItemLabel">Hex</string>
- <string key="NSSegmentItemTooltip">Show data hexadecimal</string>
- <int key="NSSegmentItemImageScaling">0</int>
- </object>
- </object>
- <int key="NSSelectedSegment">1</int>
- <int key="NSSegmentStyle">2</int>
- </object>
- </object>
- <object class="NSScrollView" id="533559056">
- <reference key="NSNextResponder" ref="999543752"/>
- <int key="NSvFlags">274</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSClipView" id="106608808">
- <reference key="NSNextResponder" ref="533559056"/>
- <int key="NSvFlags">2304</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSTextView" id="283256023">
- <reference key="NSNextResponder" ref="106608808"/>
- <int key="NSvFlags">2322</int>
- <object class="NSMutableSet" key="NSDragTypes">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" 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>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>
- </object>
- </object>
- <string key="NSFrameSize">{667, 14}</string>
- <reference key="NSSuperview" ref="106608808"/>
- <object class="NSTextContainer" key="NSTextContainer" id="883111283">
- <object class="NSLayoutManager" key="NSLayoutManager">
- <object class="NSTextStorage" key="NSTextStorage">
- <object class="NSMutableString" key="NSString">
- <characters key="NS.bytes"/>
- </object>
- <nil key="NSDelegate"/>
- </object>
- <object class="NSMutableArray" key="NSTextContainers">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="883111283"/>
- </object>
- <int key="NSLMFlags">6</int>
- <nil key="NSDelegate"/>
- </object>
- <reference key="NSTextView" ref="283256023"/>
- <double key="NSWidth">6.670000e+02</double>
- <int key="NSTCFlags">1</int>
- </object>
- <object class="NSTextViewSharedData" key="NSSharedData">
- <int key="NSFlags">2917</int>
- <reference key="NSBackgroundColor" ref="449903125"/>
- <reference key="NSInsertionColor" ref="304829493"/>
- <object class="NSDictionary" key="NSSelectedAttributes">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSBackgroundColor</string>
- <string>NSColor</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="905060551"/>
- <reference ref="63182758"/>
- </object>
- </object>
- <nil key="NSMarkedAttributes"/>
- <nil key="NSLinkAttributes"/>
- <nil key="NSDefaultParagraphStyle"/>
- </object>
- <int key="NSTVFlags">6</int>
- <string key="NSMaxSize">{1334, 1e+07}</string>
- <string key="NSMinize">{283, 0}</string>
- <nil key="NSDelegate"/>
- </object>
- </object>
- <string key="NSFrameSize">{667, 370}</string>
- <reference key="NSSuperview" ref="533559056"/>
- <reference key="NSNextKeyView" ref="283256023"/>
- <reference key="NSDocView" ref="283256023"/>
- <reference key="NSBGColor" ref="449903125"/>
- <reference key="NSCursor" ref="32917531"/>
- <int key="NScvFlags">4</int>
- </object>
- <object class="NSScroller" id="945638943">
- <reference key="NSNextResponder" ref="533559056"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{220, 1}, {11, 141}}</string>
- <reference key="NSSuperview" ref="533559056"/>
- <int key="NSsFlags">256</int>
- <reference key="NSTarget" ref="533559056"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSPercent">9.929578e-01</double>
- </object>
- <object class="NSScroller" id="685320182">
- <reference key="NSNextResponder" ref="533559056"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{-100, -100}, {87, 18}}</string>
- <reference key="NSSuperview" ref="533559056"/>
- <int key="NSsFlags">257</int>
- <reference key="NSTarget" ref="533559056"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSCurValue">1.000000e+00</double>
- <double key="NSPercent">9.456522e-01</double>
- </object>
- </object>
- <string key="NSFrame">{{0, 39}, {667, 370}}</string>
- <reference key="NSSuperview" ref="999543752"/>
- <reference key="NSNextKeyView" ref="106608808"/>
- <int key="NSsFlags">528</int>
- <reference key="NSVScroller" ref="945638943"/>
- <reference key="NSHScroller" ref="685320182"/>
- <reference key="NSContentView" ref="106608808"/>
- </object>
- <object class="NSImageView" id="976680482">
- <reference key="NSNextResponder" ref="999543752"/>
- <int key="NSvFlags">274</int>
- <object class="NSMutableSet" key="NSDragTypes">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="set.sortedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>Apple PDF pasteboard type</string>
- <string>Apple PICT pasteboard type</string>
- <string>Apple PNG pasteboard type</string>
- <string>NSFilenamesPboardType</string>
- <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
- <string>NeXT TIFF v4.0 pasteboard type</string>
- </object>
- </object>
- <string key="NSFrame">{{0, 39}, {667, 370}}</string>
- <reference key="NSSuperview" ref="999543752"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSImageCell" key="NSCell" id="11045283">
- <int key="NSCellFlags">270663168</int>
- <int key="NSCellFlags2">32768</int>
- <int key="NSAlign">0</int>
- <int key="NSScale">0</int>
- <int key="NSStyle">0</int>
- <bool key="NSAnimates">YES</bool>
- </object>
- <bool key="NSEditable">YES</bool>
- </object>
- <object class="NSScrollView" id="1020679422">
- <reference key="NSNextResponder" ref="999543752"/>
- <int key="NSvFlags">274</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSClipView" id="134546146">
- <reference key="NSNextResponder" ref="1020679422"/>
- <int key="NSvFlags">2304</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSTextView" id="1011820278">
- <reference key="NSNextResponder" ref="134546146"/>
- <int key="NSvFlags">2322</int>
- <string key="NSFrameSize">{667, 14}</string>
- <reference key="NSSuperview" ref="134546146"/>
- <object class="NSTextContainer" key="NSTextContainer" id="609699272">
- <object class="NSLayoutManager" key="NSLayoutManager">
- <object class="NSTextStorage" key="NSTextStorage">
- <object class="NSMutableString" key="NSString">
- <characters key="NS.bytes"/>
- </object>
- <nil key="NSDelegate"/>
- </object>
- <object class="NSMutableArray" key="NSTextContainers">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="609699272"/>
- </object>
- <int key="NSLMFlags">6</int>
- <nil key="NSDelegate"/>
- </object>
- <reference key="NSTextView" ref="1011820278"/>
- <double key="NSWidth">6.670000e+02</double>
- <int key="NSTCFlags">1</int>
- </object>
- <object class="NSTextViewSharedData" key="NSSharedData">
- <int key="NSFlags">4067</int>
- <reference key="NSBackgroundColor" ref="449903125"/>
- <reference key="NSInsertionColor" ref="304829493"/>
- <object class="NSDictionary" key="NSSelectedAttributes">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSBackgroundColor</string>
- <string>NSColor</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="905060551"/>
- <reference ref="63182758"/>
- </object>
- </object>
- <nil key="NSMarkedAttributes"/>
- <object class="NSDictionary" key="NSLinkAttributes">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSColor</string>
- <string>NSCursor</string>
- <string>NSUnderline</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="114422645"/>
- <object class="NSCursor">
- <string key="NSHotSpot">{8, -8}</string>
- <int key="NSCursorType">13</int>
- </object>
- <reference ref="9"/>
- </object>
- </object>
- <nil key="NSDefaultParagraphStyle"/>
- </object>
- <int key="NSTVFlags">6</int>
- <string key="NSMaxSize">{1334, 1e+07}</string>
- <string key="NSMinize">{87, 0}</string>
- <nil key="NSDelegate"/>
- </object>
- </object>
- <string key="NSFrameSize">{667, 370}</string>
- <reference key="NSSuperview" ref="1020679422"/>
- <reference key="NSNextKeyView" ref="1011820278"/>
- <reference key="NSDocView" ref="1011820278"/>
- <reference key="NSBGColor" ref="449903125"/>
- <reference key="NSCursor" ref="32917531"/>
- <int key="NScvFlags">4</int>
- </object>
- <object class="NSScroller" id="435247014">
- <reference key="NSNextResponder" ref="1020679422"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{639, 2}, {11, 359}}</string>
- <reference key="NSSuperview" ref="1020679422"/>
- <int key="NSsFlags">256</int>
- <reference key="NSTarget" ref="1020679422"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSPercent">6.016427e-01</double>
- </object>
- <object class="NSScroller" id="767953750">
- <reference key="NSNextResponder" ref="1020679422"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{-100, -100}, {87, 18}}</string>
- <reference key="NSSuperview" ref="1020679422"/>
- <int key="NSsFlags">257</int>
- <reference key="NSTarget" ref="1020679422"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSCurValue">1.000000e+00</double>
- <double key="NSPercent">9.456522e-01</double>
- </object>
- </object>
- <string key="NSFrame">{{0, 39}, {667, 370}}</string>
- <reference key="NSSuperview" ref="999543752"/>
- <reference key="NSNextKeyView" ref="134546146"/>
- <int key="NSsFlags">528</int>
- <reference key="NSVScroller" ref="435247014"/>
- <reference key="NSHScroller" ref="767953750"/>
- <reference key="NSContentView" ref="134546146"/>
- </object>
- <object class="NSProgressIndicator" id="943659835">
- <reference key="NSNextResponder" ref="999543752"/>
- <int key="NSvFlags">1325</int>
- <object class="NSPSMatrix" key="NSDrawMatrix"/>
- <string key="NSFrame">{{325, 220}, {32, 32}}</string>
- <reference key="NSSuperview" ref="999543752"/>
- <int key="NSpiFlags">28682</int>
- <double key="NSMinValue">1.600000e+01</double>
- <double key="NSMaxValue">1.000000e+02</double>
- </object>
- <object class="NSBox" id="1064737236">
- <reference key="NSNextResponder" ref="999543752"/>
- <int key="NSvFlags">10</int>
- <string key="NSFrame">{{0, 407}, {667, 5}}</string>
- <reference key="NSSuperview" ref="999543752"/>
- <string key="NSOffsets">{0, 0}</string>
- <object class="NSTextFieldCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Box</string>
- <reference key="NSSupport" ref="244931163"/>
- <reference key="NSBackgroundColor" ref="480189472"/>
- <object class="NSColor" key="NSTextColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
- </object>
- </object>
- <int key="NSBorderType">3</int>
- <int key="NSBoxType">2</int>
- <int key="NSTitlePosition">0</int>
- <bool key="NSTransparent">NO</bool>
- </object>
- </object>
- <string key="NSFrameSize">{667, 416}</string>
- </object>
- <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
- <string key="NSMinSize">{560, 222}</string>
- <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
- <string key="NSFrameAutosaveName">SPEditSheet</string>
- </object>
<object class="NSWindowTemplate" id="553728448">
<int key="NSWindowStyleMask">9</int>
<int key="NSWindowBacking">2</int>
@@ -11381,7 +10776,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSExtension">NSResponder</string>
</object>
<object class="NSCustomView" id="884983195">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">301</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -11390,7 +10785,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">298</int>
<string key="NSFrame">{{0, 3}, {200, 26}}</string>
<reference key="NSSuperview" ref="884983195"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="931032347">
<int key="NSCellFlags">-2076049856</int>
@@ -11466,8 +10860,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
</object>
<string key="NSFrameSize">{200, 32}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="730777562">
@@ -12133,30 +11525,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">editSheet</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="400229091"/>
- </object>
- <int key="connectionID">610</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">closeEditSheet:</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="253418976"/>
- </object>
- <int key="connectionID">611</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">closeEditSheet:</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="87722169"/>
- </object>
- <int key="connectionID">612</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">tableDumpInstance</string>
<reference key="source" ref="438574515"/>
<reference key="destination" ref="225526897"/>
@@ -12717,46 +12085,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">editImage</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="976680482"/>
- </object>
- <int key="connectionID">1233</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">saveEditSheet:</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="871440870"/>
- </object>
- <int key="connectionID">1235</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">openEditSheet:</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="938738159"/>
- </object>
- <int key="connectionID">1236</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">dropImage:</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="976680482"/>
- </object>
- <int key="connectionID">1237</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="1011820278"/>
- <reference key="destination" ref="392169872"/>
- </object>
- <int key="connectionID">1238</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">tableTabView</string>
<reference key="source" ref="427689665"/>
<reference key="destination" ref="714795046"/>
@@ -13196,14 +12524,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="connectionID">4781</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="976680482"/>
- <reference key="destination" ref="427689665"/>
- </object>
- <int key="connectionID">4796</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">runSelectedQueries:</string>
<reference key="source" ref="601471102"/>
@@ -14533,142 +13853,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">editTextView</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="1011820278"/>
- </object>
- <int key="connectionID">5960</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">hexTextView</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="283256023"/>
- </object>
- <int key="connectionID">5961</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">editSheetSegmentControl</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="175886676"/>
- </object>
- <int key="connectionID">5963</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">segmentControllerChanged:</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="175886676"/>
- </object>
- <int key="connectionID">5964</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">editTextScrollView</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="1020679422"/>
- </object>
- <int key="connectionID">5965</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">hexTextScrollView</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="533559056"/>
- </object>
- <int key="connectionID">5966</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">editSheetProgressBar</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="943659835"/>
- </object>
- <int key="connectionID">5985</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">editSheetQuickLookButton</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="620882358"/>
- </object>
- <int key="connectionID">5988</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">quickLookFormatButton:</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="651311563"/>
- </object>
- <int key="connectionID">5990</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">quickLookFormatButton:</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="290675907"/>
- </object>
- <int key="connectionID">5991</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">quickLookFormatButton:</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="60551315"/>
- </object>
- <int key="connectionID">5992</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">quickLookFormatButton:</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="313658995"/>
- </object>
- <int key="connectionID">5993</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">quickLookFormatButton:</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="405291739"/>
- </object>
- <int key="connectionID">5994</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">quickLookFormatButton:</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="624314986"/>
- </object>
- <int key="connectionID">5995</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">quickLookFormatButton:</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="337614031"/>
- </object>
- <int key="connectionID">5996</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">quickLookFormatButton:</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="950803686"/>
- </object>
- <int key="connectionID">5997</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">quickLookFormatButton:</string>
- <reference key="source" ref="392169872"/>
- <reference key="destination" ref="182514031"/>
- </object>
- <int key="connectionID">5998</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">titleAccessoryView</string>
<reference key="source" ref="427689665"/>
<reference key="destination" ref="730777562"/>
@@ -15515,72 +14699,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<reference key="parent" ref="70075497"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">604</int>
- <reference key="object" ref="400229091"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="999543752"/>
- </object>
- <reference key="parent" ref="1043842561"/>
- <string key="objectName">Field Edit Sheet</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">605</int>
- <reference key="object" ref="999543752"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="427523434"/>
- <reference ref="253418976"/>
- <reference ref="938738159"/>
- <reference ref="871440870"/>
- <reference ref="87722169"/>
- <reference ref="175886676"/>
- <reference ref="620882358"/>
- <reference ref="976680482"/>
- <reference ref="533559056"/>
- <reference ref="1020679422"/>
- <reference ref="943659835"/>
- <reference ref="1064737236"/>
- </object>
- <reference key="parent" ref="400229091"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">608</int>
- <reference key="object" ref="253418976"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="614204575"/>
- </object>
- <reference key="parent" ref="999543752"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">609</int>
- <reference key="object" ref="87722169"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="888101847"/>
- </object>
- <reference key="parent" ref="999543752"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">1225</int>
- <reference key="object" ref="871440870"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="46380971"/>
- </object>
- <reference key="parent" ref="999543752"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">1226</int>
- <reference key="object" ref="938738159"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="544799467"/>
- </object>
- <reference key="parent" ref="999543752"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">714</int>
<reference key="object" ref="553728448"/>
<object class="NSMutableArray" key="children">
@@ -16384,26 +15502,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<reference key="parent" ref="681100483"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">3839</int>
- <reference key="object" ref="614204575"/>
- <reference key="parent" ref="253418976"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">3840</int>
- <reference key="object" ref="888101847"/>
- <reference key="parent" ref="87722169"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">3842</int>
- <reference key="object" ref="46380971"/>
- <reference key="parent" ref="871440870"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">3843</int>
- <reference key="object" ref="544799467"/>
- <reference key="parent" ref="938738159"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">3844</int>
<reference key="object" ref="660726210"/>
<reference key="parent" ref="534696980"/>
@@ -20512,187 +19610,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<reference key="parent" ref="231853805"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">5943</int>
- <reference key="object" ref="620882358"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="1049067135"/>
- </object>
- <reference key="parent" ref="999543752"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5944</int>
- <reference key="object" ref="1049067135"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="330923656"/>
- </object>
- <reference key="parent" ref="620882358"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5945</int>
- <reference key="object" ref="330923656"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="290675907"/>
- <reference ref="414896542"/>
- <reference ref="651311563"/>
- <reference ref="405291739"/>
- <reference ref="950803686"/>
- <reference ref="313658995"/>
- <reference ref="60551315"/>
- <reference ref="624314986"/>
- <reference ref="337614031"/>
- <reference ref="182514031"/>
- </object>
- <reference key="parent" ref="1049067135"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5946</int>
- <reference key="object" ref="290675907"/>
- <reference key="parent" ref="330923656"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5947</int>
- <reference key="object" ref="651311563"/>
- <reference key="parent" ref="330923656"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5948</int>
- <reference key="object" ref="624314986"/>
- <reference key="parent" ref="330923656"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5949</int>
- <reference key="object" ref="414896542"/>
- <reference key="parent" ref="330923656"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5951</int>
- <reference key="object" ref="427523434"/>
- <reference key="parent" ref="999543752"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5952</int>
- <reference key="object" ref="175886676"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="438375364"/>
- </object>
- <reference key="parent" ref="999543752"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5953</int>
- <reference key="object" ref="438375364"/>
- <reference key="parent" ref="175886676"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">1230</int>
- <reference key="object" ref="533559056"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="283256023"/>
- <reference ref="945638943"/>
- <reference ref="685320182"/>
- </object>
- <reference key="parent" ref="999543752"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">1231</int>
- <reference key="object" ref="283256023"/>
- <reference key="parent" ref="533559056"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">3937</int>
- <reference key="object" ref="945638943"/>
- <reference key="parent" ref="533559056"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">3938</int>
- <reference key="object" ref="685320182"/>
- <reference key="parent" ref="533559056"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">1227</int>
- <reference key="object" ref="976680482"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="11045283"/>
- </object>
- <reference key="parent" ref="999543752"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">3841</int>
- <reference key="object" ref="11045283"/>
- <reference key="parent" ref="976680482"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">1221</int>
- <reference key="object" ref="1020679422"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="767953750"/>
- <reference ref="435247014"/>
- <reference ref="1011820278"/>
- </object>
- <reference key="parent" ref="999543752"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">3936</int>
- <reference key="object" ref="767953750"/>
- <reference key="parent" ref="1020679422"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">3935</int>
- <reference key="object" ref="435247014"/>
- <reference key="parent" ref="1020679422"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">1222</int>
- <reference key="object" ref="1011820278"/>
- <reference key="parent" ref="1020679422"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5972</int>
- <reference key="object" ref="405291739"/>
- <reference key="parent" ref="330923656"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5974</int>
- <reference key="object" ref="950803686"/>
- <reference key="parent" ref="330923656"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5975</int>
- <reference key="object" ref="182514031"/>
- <reference key="parent" ref="330923656"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5978</int>
- <reference key="object" ref="313658995"/>
- <reference key="parent" ref="330923656"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5981</int>
- <reference key="object" ref="60551315"/>
- <reference key="parent" ref="330923656"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5984</int>
- <reference key="object" ref="943659835"/>
- <reference key="parent" ref="999543752"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5986</int>
- <reference key="object" ref="337614031"/>
- <reference key="parent" ref="330923656"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5989</int>
- <reference key="object" ref="1064737236"/>
- <reference key="parent" ref="999543752"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">5999</int>
<reference key="object" ref="730777562"/>
<object class="NSMutableArray" key="children">
@@ -21501,22 +20418,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>122.CustomClassName</string>
<string>122.IBPluginDependency</string>
<string>122.ImportedFromIB2</string>
- <string>1221.IBPluginDependency</string>
- <string>1221.ImportedFromIB2</string>
- <string>1222.CustomClassName</string>
- <string>1222.IBPluginDependency</string>
- <string>1222.ImportedFromIB2</string>
- <string>1225.IBPluginDependency</string>
- <string>1225.ImportedFromIB2</string>
- <string>1226.IBPluginDependency</string>
- <string>1226.ImportedFromIB2</string>
- <string>1227.CustomClassName</string>
- <string>1227.IBPluginDependency</string>
- <string>1227.ImportedFromIB2</string>
- <string>1230.IBPluginDependency</string>
- <string>1230.ImportedFromIB2</string>
- <string>1231.IBPluginDependency</string>
- <string>1231.ImportedFromIB2</string>
<string>1245.IBPluginDependency</string>
<string>1245.ImportedFromIB2</string>
<string>1246.IBPluginDependency</string>
@@ -21730,11 +20631,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>3836.IBPluginDependency</string>
<string>3837.IBPluginDependency</string>
<string>3838.IBPluginDependency</string>
- <string>3839.IBPluginDependency</string>
- <string>3840.IBPluginDependency</string>
- <string>3841.IBPluginDependency</string>
- <string>3842.IBPluginDependency</string>
- <string>3843.IBPluginDependency</string>
<string>3844.IBPluginDependency</string>
<string>3849.IBPluginDependency</string>
<string>3850.IBPluginDependency</string>
@@ -21822,14 +20718,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>3930.IBShouldRemoveOnLegacySave</string>
<string>3931.IBPluginDependency</string>
<string>3931.IBShouldRemoveOnLegacySave</string>
- <string>3935.IBPluginDependency</string>
- <string>3935.IBShouldRemoveOnLegacySave</string>
- <string>3936.IBPluginDependency</string>
- <string>3936.IBShouldRemoveOnLegacySave</string>
- <string>3937.IBPluginDependency</string>
- <string>3937.IBShouldRemoveOnLegacySave</string>
- <string>3938.IBPluginDependency</string>
- <string>3938.IBShouldRemoveOnLegacySave</string>
<string>3939.IBPluginDependency</string>
<string>3939.IBShouldRemoveOnLegacySave</string>
<string>3940.IBPluginDependency</string>
@@ -22521,28 +21409,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>5904.IBPluginDependency</string>
<string>5905.IBPluginDependency</string>
<string>5906.IBPluginDependency</string>
- <string>5943.IBAttributePlaceholdersKey</string>
- <string>5943.IBPluginDependency</string>
- <string>5944.IBPluginDependency</string>
- <string>5945.IBEditorWindowLastContentRect</string>
- <string>5945.IBPluginDependency</string>
- <string>5946.IBPluginDependency</string>
- <string>5947.IBPluginDependency</string>
- <string>5948.IBPluginDependency</string>
- <string>5949.IBPluginDependency</string>
- <string>5951.IBPluginDependency</string>
- <string>5952.IBPluginDependency</string>
- <string>5952.IBSegmentedControlTracker.RoundRobinState</string>
- <string>5952.IBSegmentedControlTracker.WasGrowing</string>
- <string>5953.IBPluginDependency</string>
- <string>5972.IBPluginDependency</string>
- <string>5974.IBPluginDependency</string>
- <string>5975.IBPluginDependency</string>
- <string>5978.IBPluginDependency</string>
- <string>5981.IBPluginDependency</string>
- <string>5984.IBPluginDependency</string>
- <string>5986.IBPluginDependency</string>
- <string>5989.IBPluginDependency</string>
<string>5999.IBEditorWindowLastContentRect</string>
<string>5999.IBPluginDependency</string>
<string>6.IBPluginDependency</string>
@@ -22558,25 +21424,12 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>6032.IBPluginDependency</string>
<string>6033.IBPluginDependency</string>
<string>6034.IBPluginDependency</string>
- <string>604.IBEditorWindowLastContentRect</string>
- <string>604.IBWindowTemplateEditedContentRect</string>
- <string>604.ImportedFromIB2</string>
- <string>604.windowTemplate.hasMaxSize</string>
- <string>604.windowTemplate.hasMinSize</string>
- <string>604.windowTemplate.maxSize</string>
- <string>604.windowTemplate.minSize</string>
- <string>605.IBPluginDependency</string>
- <string>605.ImportedFromIB2</string>
<string>6067.IBPluginDependency</string>
<string>6068.IBPluginDependency</string>
- <string>608.IBPluginDependency</string>
- <string>608.ImportedFromIB2</string>
<string>6083.IBPluginDependency</string>
<string>6084.IBPluginDependency</string>
<string>6085.IBPluginDependency</string>
<string>6086.IBPluginDependency</string>
- <string>609.IBPluginDependency</string>
- <string>609.ImportedFromIB2</string>
<string>6094.IBPluginDependency</string>
<string>6100.IBPluginDependency</string>
<string>6101.IBPluginDependency</string>
@@ -23044,22 +21897,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>SPEditSheetTextView</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
- <string>CMImageView</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -23360,19 +22197,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</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>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
@@ -24275,35 +23099,6 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <object class="NSMutableDictionary">
- <string key="NS.key.0">ToolTip</string>
- <object class="IBToolTipAttribute" key="NS.object.0">
- <string key="name">ToolTip</string>
- <reference key="object" ref="620882358"/>
- <string key="toolTip">Choose a data format to display the current data by using QuickLook</string>
- </object>
- </object>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{705, 112}, {126, 173}}</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>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="8"/>
- <reference ref="9"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</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>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{567, 305}, {110, 20}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -24326,25 +23121,12 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik</string>
<string>com.brandonwalkin.BWToolkit</string>
<string>com.brandonwalkin.BWToolkit</string>
<string>com.brandonwalkin.BWToolkit</string>
- <string>{{42, 39}, {667, 416}}</string>
- <string>{{42, 39}, {667, 416}}</string>
- <reference ref="9"/>
- <reference ref="8"/>
- <reference ref="9"/>
- <string>{3.40282e+38, 3.40282e+38}</string>
- <string>{560, 200}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
<string>com.brandonwalkin.BWToolkit</string>
<string>com.brandonwalkin.BWToolkit</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
<string>com.brandonwalkin.BWToolkit</string>
<string>com.brandonwalkin.BWToolkit</string>
<string>com.brandonwalkin.BWToolkit</string>
<string>com.brandonwalkin.BWToolkit</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
<string>com.brandonwalkin.BWToolkit</string>
<string>com.brandonwalkin.BWToolkit</string>
<string>com.brandonwalkin.BWToolkit</string>
@@ -24774,26 +23556,6 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">CMImageView</string>
- <string key="superclassName">NSImageView</string>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">delegate</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="520743177">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Source/CMImageView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">CMImageView</string>
- <string key="superclassName">NSImageView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">CMTextView</string>
<string key="superclassName">NSTextView</string>
<object class="NSMutableDictionary" key="actions">
@@ -24983,7 +23745,10 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="520743177"/>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/CMImageView.h</string>
+ </object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
@@ -25048,14 +23813,6 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">SPEditSheetTextView</string>
- <string key="superclassName">NSTextView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Source/SPEditSheetTextView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">SPExportController</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="actions">
diff --git a/Interfaces/English.lproj/FieldEditorSheet.xib b/Interfaces/English.lproj/FieldEditorSheet.xib
index f4c44148..fd7a21f9 100644
--- a/Interfaces/English.lproj/FieldEditorSheet.xib
+++ b/Interfaces/English.lproj/FieldEditorSheet.xib
@@ -37,7 +37,7 @@
<int key="NSWindowStyleMask">9</int>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{364, 195}, {667, 416}}</string>
- <int key="NSWTFlags">1618477056</int>
+ <int key="NSWTFlags">544735232</int>
<string key="NSWindowTitle">Field Editor</string>
<string key="NSWindowClass">NSPanel</string>
<object class="NSMutableString" key="NSViewClass">
@@ -464,6 +464,7 @@
</object>
<string key="NSFrameSize">{667, 370}</string>
<reference key="NSSuperview" ref="983787914"/>
+ <reference key="NSNextKeyView" ref="459839028"/>
<reference key="NSDocView" ref="459839028"/>
<reference key="NSBGColor" ref="940290613"/>
<object class="NSCursor" key="NSCursor" id="956874367">
@@ -496,6 +497,7 @@
</object>
<string key="NSFrame">{{0, 39}, {667, 370}}</string>
<reference key="NSSuperview" ref="559857537"/>
+ <reference key="NSNextKeyView" ref="1068411389"/>
<int key="NSsFlags">528</int>
<reference key="NSVScroller" ref="977735067"/>
<reference key="NSHScroller" ref="426249328"/>
@@ -612,6 +614,7 @@
</object>
<string key="NSFrameSize">{667, 370}</string>
<reference key="NSSuperview" ref="604699677"/>
+ <reference key="NSNextKeyView" ref="702566211"/>
<reference key="NSDocView" ref="702566211"/>
<reference key="NSBGColor" ref="940290613"/>
<reference key="NSCursor" ref="956874367"/>
@@ -641,6 +644,7 @@
</object>
<string key="NSFrame">{{0, 39}, {667, 370}}</string>
<reference key="NSSuperview" ref="559857537"/>
+ <reference key="NSNextKeyView" ref="967441740"/>
<int key="NSsFlags">528</int>
<reference key="NSVScroller" ref="699979333"/>
<reference key="NSHScroller" ref="393370468"/>
@@ -882,6 +886,30 @@
</object>
<int key="connectionID">63</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">quickLookFormatButton:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="364525587"/>
+ </object>
+ <int key="connectionID">64</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">quickLookFormatButton:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="800624537"/>
+ </object>
+ <int key="connectionID">65</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">quickLookFormatButton:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="964663224"/>
+ </object>
+ <int key="connectionID">66</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -1258,8 +1286,8 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{232, 340}, {667, 416}}</string>
- <string>{{232, 340}, {667, 416}}</string>
+ <string>{{452, 157}, {667, 416}}</string>
+ <string>{{452, 157}, {667, 416}}</string>
<reference ref="9"/>
<integer value="0" id="8"/>
<reference ref="9"/>
@@ -1282,7 +1310,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{543, -49}, {126, 173}}</string>
+ <string>{{769, 16}, {126, 173}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1351,7 +1379,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">63</int>
+ <int key="maxID">66</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/Source/SPFieldEditorController.h b/Source/SPFieldEditorController.h
index 4867276f..51956bc0 100644
--- a/Source/SPFieldEditorController.h
+++ b/Source/SPFieldEditorController.h
@@ -38,15 +38,13 @@
IBOutlet id editSheet;
id sheetEditData;
-
- NSString *stringValue;
-
BOOL editSheetWillBeInitialized;
BOOL isBlob;
int quickLookCloseMarker;
NSStringEncoding encoding;
+ NSString *stringValue;
-
+ NSUserDefaults *prefs;
}
- (IBAction)closeEditSheet:(id)sender;
@@ -68,6 +66,4 @@
- (BOOL)textView:(NSTextView *)aTextView doCommandBySelector:(SEL)aSelector;
- (void)textViewDidChangeSelection:(NSNotification *)notification;
-- (void)clean;
-
@end
diff --git a/Source/SPFieldEditorController.m b/Source/SPFieldEditorController.m
index ed2f941e..2f169ebd 100644
--- a/Source/SPFieldEditorController.m
+++ b/Source/SPFieldEditorController.m
@@ -44,13 +44,24 @@
- (void) dealloc
{
+ if ( sheetEditData ) [sheetEditData release];
[super dealloc];
}
-- (id)editWithObject:(id)data usingEncoding:(NSStringEncoding)anEncoding isObjectBlob:(BOOL)isFieldBlob withWindow:(NSWindow *)tableWindow
+- (id)editWithObject:(id)data usingEncoding:(NSStringEncoding)anEncoding
+ isObjectBlob:(BOOL)isFieldBlob withWindow:(NSWindow *)tableWindow
{
-
- [self clean];
+
+ prefs = [NSUserDefaults standardUserDefaults];
+
+ if ( [prefs boolForKey:@"UseMonospacedFonts"] ) {
+ [editTextView setFont:[NSFont fontWithName:@"Monaco" size:[NSFont smallSystemFontSize]]];
+ } else {
+ [editTextView setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
+ }
+ [hexTextView setFont:[NSFont fontWithName:@"Monaco" size:[NSFont smallSystemFontSize]]];
+
+
// hide all views in editSheet
[hexTextView setHidden:YES];
[hexTextScrollView setHidden:YES];
@@ -64,8 +75,7 @@
isBlob = isFieldBlob;
- // sheetEditData = data;
- sheetEditData = [data copy];
+ sheetEditData = [data retain];
// hide all views in editSheet
[hexTextView setHidden:YES];
@@ -149,8 +159,6 @@
[stringValue release];
}
-
-
editSheetWillBeInitialized = NO;
[editSheetProgressBar stopAnimation:self];
@@ -161,27 +169,12 @@
[NSApp endSheet:editSheet];
[editSheet orderOut:nil];
-
// For safety reasons inform QuickLook to quit
quickLookCloseMarker = 1;
- if ( code ) return [sheetEditData autorelease];
-
- [self clean];
-
- return nil;
+ return ( code ) ? [sheetEditData retain] : nil;
}
-- (void)clean
-{
- [hexTextView setString:@""];
- [editTextView setString:@""];
- [editImage setImage:nil];
- if ( sheetEditData ) {
- [sheetEditData release];
- }
-
-}
- (IBAction)closeEditSheet:(id)sender
{
@@ -265,7 +258,7 @@
[editImage setHidden:YES];
[hexTextView setHidden:YES];
[hexTextScrollView setHidden:YES];
- // [self makeFirstResponder:editTextView];
+ [[self window] makeFirstResponder:editTextView];
break;
case 1: // image
[editTextView setHidden:YES];
@@ -273,7 +266,7 @@
[editImage setHidden:NO];
[hexTextView setHidden:YES];
[hexTextScrollView setHidden:YES];
- // [self makeFirstResponder:editImage];
+ [[self window] makeFirstResponder:editImage];
break;
case 2: // hex - load on demand
if([sheetEditData length] && [[hexTextView string] isEqualToString:@""]) {
@@ -286,7 +279,7 @@
[editImage setHidden:YES];
[hexTextView setHidden:NO];
[hexTextScrollView setHidden:NO];
- // [self makeFirstResponder:hexTextView];
+ [[self window] makeFirstResponder:hexTextView];
break;
}
}
@@ -305,11 +298,10 @@
NSString *fileName = [panel filename];
// Write binary field types directly to the file
- //// || [editSheetBinaryButton state] == NSOnState
if ( [sheetEditData isKindOfClass:[NSData class]] ) {
[sheetEditData writeToFile:fileName atomically:YES];
-
- // Write other field types' representations to the file via the current encoding
+
+ // Write other field types' representations to the file via the current encoding
} else {
[[sheetEditData description] writeToFile:fileName
atomically:YES
@@ -356,22 +348,47 @@
// since QuickLook only works on files.
NSString *tmpFileName = [NSString stringWithFormat:@"/tmp/SequelProQuickLook.%@", type];
+ [self removeQuickLooksTempFile:tmpFileName];
+
// if data are binary
- if ( [sheetEditData isKindOfClass:[NSData class]] || !isText) {
+ if ( [sheetEditData isKindOfClass:[NSData class]] && !isText) {
[sheetEditData writeToFile:tmpFileName atomically:YES];
- // write other field types' representations to the file via the current encoding
+ // write other field types' representations to the file via the current encoding
} else {
- [[sheetEditData description] writeToFile:tmpFileName
- atomically:YES
- encoding:encoding
- error:NULL];
+
+ // if "html" type try to set the HTML charset - not yet completed
+ if([type isEqualToString:@"html"]) {
+
+ NSString *enc;
+ switch(encoding) {
+ case NSASCIIStringEncoding:
+ enc = @"US-ASCII";break;
+ case NSUTF8StringEncoding:
+ enc = @"UTF-8";break;
+ case NSISOLatin1StringEncoding:
+ enc = @"ISO-8859-1";break;
+ default:
+ enc = @"US-ASCII";
+ }
+
+ [[NSString stringWithFormat:@"<META HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=%@'>%@", enc, [editTextView string]] writeToFile:tmpFileName
+ atomically:YES
+ encoding:encoding
+ error:NULL];
+ } else {
+ [[sheetEditData description] writeToFile:tmpFileName
+ atomically:YES
+ encoding:encoding
+ error:NULL];
+ }
}
+ // Init QuickLook
id ql = [NSClassFromString(@"QLPreviewPanel") sharedPreviewPanel];
- // Init QuickLook
- [[ql delegate] setDelegate:self];
+ [[ql windowController] setDelegate:self];
+
[ql setURLs:[NSArray arrayWithObject:
[NSURL fileURLWithPath:tmpFileName]] currentIndex:0 preservingDisplayState:YES];
// TODO: No interaction with iChat and iPhoto due to .scriptSuite warning:
@@ -404,14 +421,16 @@
}
[NSApp endModalSession:session];
+ // set ql's delegate to nil for dealloc
+ [[ql windowController] setDelegate:nil];
+
+
// Remove temp file after closing the sheet to allow double-click event at the QuickLook preview.
// The afterDelay: time is a kind of dummy, because after double-clicking the model session loop
// will break (ql not visible) and returns the event handling back to the editSheet which by itself
// blocks the execution of removeQuickLooksTempFile: until the editSheet is closed.
[self performSelector:@selector(removeQuickLooksTempFile:) withObject:tmpFileName afterDelay:2];
-
- // [[NSFileManager defaultManager] removeItemAtPath:tmpFileName error:NULL];
-
+
}
}
@@ -453,6 +472,7 @@
[editImage setImage:image];
+ if( sheetEditData ) [sheetEditData release];
sheetEditData = [[NSData alloc] initWithData:[image TIFFRepresentationUsingCompression:NSTIFFCompressionLZW factor:1]];
NSString *contents = [[NSString alloc] initWithData:sheetEditData encoding:encoding];
@@ -521,10 +541,10 @@
}
}
-- (void)textViewDidChangeSelection:(NSNotification *)notification
/*
invoked when the user changes the string in the editSheet
*/
+- (void)textViewDidChangeSelection:(NSNotification *)notification
{
// Do nothing if user really didn't changed text (e.g. for font size changing return)
diff --git a/Source/TableContent.h b/Source/TableContent.h
index 7224b361..e2bc5730 100644
--- a/Source/TableContent.h
+++ b/Source/TableContent.h
@@ -36,18 +36,8 @@
IBOutlet id tablesListInstance;
IBOutlet id tableDataInstance;
- IBOutlet id editSheetProgressBar;
-
IBOutlet id tableWindow;
IBOutlet CMCopyTable *tableContentView;
- IBOutlet id editSheet;
- IBOutlet id editSheetSegmentControl;
- IBOutlet id editSheetQuickLookButton;
- IBOutlet id editImage;
- IBOutlet id editTextView;
- IBOutlet id hexTextView;
- IBOutlet id editTextScrollView;
- IBOutlet id hexTextScrollView;
IBOutlet id fieldField;
IBOutlet id compareField;
IBOutlet id argumentField;
@@ -64,7 +54,6 @@
CMMCPConnection *mySQLConnection;
- id editData;
NSString *selectedTable, *usedQuery;
NSMutableArray *fullResult, *filteredResult, *keys, *oldRow;
NSString *compareType, *lastField;
@@ -74,9 +63,6 @@
int numRows, currentlyEditingRow, maxNumRowsOfCurrentTable;
bool areShowingAllRows;
- BOOL editSheetWillBeInitialized;
-
- int quickLookCloseMarker;
}
//table methods
@@ -94,16 +80,6 @@
- (IBAction)copyRow:(id)sender;
- (IBAction)removeRow:(id)sender;
-//editSheet methods
-- (IBAction)closeEditSheet:(id)sender;
-- (IBAction)openEditSheet:(id)sender;
-- (IBAction)saveEditSheet:(id)sender;
-- (IBAction)segmentControllerChanged:(id)sender;
-- (IBAction)quickLookFormatButton:(id)sender;
-- (void)invokeQuickLookOfType:(NSString *)type treatAsText:(BOOL)isText;
-- (void)processUpdatedImageData:(NSData *)data;
-- (IBAction)dropImage:(id)sender;
-- (void)textViewDidChangeSelection:(NSNotification *)aNotification;
//getter methods
- (NSArray *)currentResult;
@@ -143,6 +119,6 @@ objectValueForTableColumn:(NSTableColumn *)aTableColumn
- (BOOL)control:(NSControl *)control textView:(NSTextView *)textView doCommandBySelector:(SEL)command;
//textView delegate methods
-- (BOOL)textView:(NSTextView *)aTextView doCommandBySelector:(SEL)aSelector;
+// - (BOOL)textView:(NSTextView *)aTextView doCommandBySelector:(SEL)aSelector;
@end
diff --git a/Source/TableContent.m b/Source/TableContent.m
index 4f519e5a..e6381555 100644
--- a/Source/TableContent.m
+++ b/Source/TableContent.m
@@ -39,7 +39,7 @@
#import "SPArrayAdditions.h"
#import "SPTextViewAdditions.h"
#import "SPDataAdditions.h"
-#import "QLPreviewPanel.h"
+#import "SPFieldEditorController.h"
@implementation TableContent
@@ -58,7 +58,7 @@
selectedTable = nil;
sortCol = nil;
lastField = nil;
- editData = nil;
+ // editData = nil;
keys = nil;
areShowingAllRows = false;
@@ -858,370 +858,6 @@
[alert beginSheetModalForWindow:tableWindow modalDelegate:self didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:) contextInfo:contextInfo];
}
-//editSheet methods
-- (IBAction)closeEditSheet:(id)sender
-{
- [NSApp stopModalWithCode:[sender tag]];
-}
-
-- (IBAction)openEditSheet:(id)sender
-/*
- loads a file into the editSheet
- */
-{
- NSOpenPanel *panel = [NSOpenPanel openPanel];
-
- if ( [panel runModal] == NSOKButton ) {
- NSString *fileName = [panel filename];
- NSString *contents = nil;
-
- editSheetWillBeInitialized = YES;
-
- [editSheetProgressBar startAnimation:self];
-
- // free old data
- if ( editData != nil ) {
- [editData release];
- }
-
- // load new data/images
- editData = [[NSData alloc] initWithContentsOfFile:fileName];
-
- NSImage *image = [[NSImage alloc] initWithData:editData];
- contents = [[NSString alloc] initWithData:editData encoding:[mySQLConnection encoding]];
- if (contents == nil)
- contents = [[NSString alloc] initWithData:editData encoding:NSASCIIStringEncoding];
-
- // set the image preview, string contents and hex representation
- [editImage setImage:image];
-
-
- if(contents)
- [editTextView setString:contents];
- else
- [editTextView setString:@""];
-
- // Load hex data only if user has already displayed them
- if(![[hexTextView string] isEqualToString:@""])
- [hexTextView setString:[editData dataToFormattedHexString]];
-
- // If the image cell now contains a valid image, select the image view
- if (image) {
- [editSheetSegmentControl setSelectedSegment:1];
- [hexTextView setHidden:YES];
- [hexTextScrollView setHidden:YES];
- [editImage setHidden:NO];
- [editTextView setHidden:YES];
- [editTextScrollView setHidden:YES];
-
- // Otherwise deselect the image view
- } else {
- [editSheetSegmentControl setSelectedSegment:0];
- [hexTextView setHidden:YES];
- [hexTextScrollView setHidden:YES];
- [editImage setHidden:YES];
- [editTextView setHidden:NO];
- [editTextScrollView setHidden:NO];
- }
-
- [image release];
- if(contents)
- [contents release];
- [editSheetProgressBar stopAnimation:self];
- editSheetWillBeInitialized = NO;
- }
-}
-
-/*
- * Segement controller for text/image/hex buttons in editSheet
- */
-- (IBAction)segmentControllerChanged:(id)sender
-{
- switch([sender selectedSegment]){
- case 0: // text
- [editTextView setHidden:NO];
- [editTextScrollView setHidden:NO];
- [editImage setHidden:YES];
- [hexTextView setHidden:YES];
- [hexTextScrollView setHidden:YES];
- [editSheet makeFirstResponder:editTextView];
- break;
- case 1: // image
- [editTextView setHidden:YES];
- [editTextScrollView setHidden:YES];
- [editImage setHidden:NO];
- [hexTextView setHidden:YES];
- [hexTextScrollView setHidden:YES];
- [editSheet makeFirstResponder:editImage];
- break;
- case 2: // hex - load on demand
- if(editData && [editData length] && [[hexTextView string] isEqualToString:@""]) {
- [editSheetProgressBar startAnimation:self];
- [hexTextView setString:[editData dataToFormattedHexString]];
- [editSheetProgressBar stopAnimation:self];
- }
- [editTextView setHidden:YES];
- [editTextScrollView setHidden:YES];
- [editImage setHidden:YES];
- [hexTextView setHidden:NO];
- [hexTextScrollView setHidden:NO];
- [editSheet makeFirstResponder:hexTextView];
- break;
- }
-}
-
-/*
- * Saves a file containing the content of the editSheet
- */
-- (IBAction)saveEditSheet:(id)sender
-{
- NSSavePanel *panel = [NSSavePanel savePanel];
-
- if ( [panel runModal] == NSOKButton ) {
-
- [editSheetProgressBar startAnimation:self];
-
- NSString *fileName = [panel filename];
-
- // Write binary field types directly to the file
- //// || [editSheetBinaryButton state] == NSOnState
- if ( [editData isKindOfClass:[NSData class]] ) {
- [editData writeToFile:fileName atomically:YES];
-
- // Write other field types' representations to the file via the current encoding
- } else {
- [[editData description] writeToFile:fileName
- atomically:YES
- encoding:[CMMCPConnection encodingForMySQLEncoding:[[tableDocumentInstance connectionEncoding] UTF8String]]
- error:NULL];
- }
-
- [editSheetProgressBar stopAnimation:self];
-
- }
-}
-
-#pragma mark -
-#pragma mark QuickLook
-
-- (IBAction)quickLookFormatButton:(id)sender
-{
- switch([sender tag]) {
- case 0: [self invokeQuickLookOfType:@"pict" treatAsText:NO]; break;
- case 1: [self invokeQuickLookOfType:@"m4a" treatAsText:NO]; break;
- case 2: [self invokeQuickLookOfType:@"mp3" treatAsText:NO]; break;
- case 3: [self invokeQuickLookOfType:@"wav" treatAsText:NO]; break;
- case 4: [self invokeQuickLookOfType:@"mov" treatAsText:NO]; break;
- case 5: [self invokeQuickLookOfType:@"pdf" treatAsText:NO]; break;
- case 6: [self invokeQuickLookOfType:@"html" treatAsText:YES]; break;
- case 7: [self invokeQuickLookOfType:@"doc" treatAsText:NO]; break;
- case 8: [self invokeQuickLookOfType:@"rtf" treatAsText:YES]; break;
- }
-}
-
-/*
- * Opens QuickLook for current data if QuickLook is available
- */
-- (void)invokeQuickLookOfType:(NSString *)type treatAsText:(BOOL)isText
-{
-
- // Load private framework
- if([[NSBundle bundleWithPath:@"/System/Library/PrivateFrameworks/QuickLookUI.framework"] load]) {
-
- [editSheetProgressBar startAnimation:self];
-
- // Create a temporary file name to store the data as file
- // since QuickLook only works on files.
- NSString *tmpFileName = [NSString stringWithFormat:@"/tmp/SequelProQuickLook.%@", type];
-
- // if data are binary
- if ( [editData isKindOfClass:[NSData class]] || !isText) {
- [editData writeToFile:tmpFileName atomically:YES];
-
- // write other field types' representations to the file via the current encoding
- } else {
- [[editData description] writeToFile:tmpFileName
- atomically:YES
- encoding:[CMMCPConnection encodingForMySQLEncoding:[[tableDocumentInstance connectionEncoding] UTF8String]]
- error:NULL];
- }
-
- id ql = [NSClassFromString(@"QLPreviewPanel") sharedPreviewPanel];
-
- // Init QuickLook
- [[ql delegate] setDelegate:self];
- [ql setURLs:[NSArray arrayWithObject:
- [NSURL fileURLWithPath:tmpFileName]] currentIndex:0 preservingDisplayState:YES];
- // TODO: No interaction with iChat and iPhoto due to .scriptSuite warning:
- // for superclass of class 'MainController' in suite 'Sequel Pro': 'NSCoreSuite.NSAbstractObject' is not a valid class name.
- [ql setShowsAddToiPhotoButton:NO];
- [ql setShowsiChatTheaterButton:NO];
- // Since we are inside of editSheet we have to avoid full-screen zooming
- // otherwise QuickLook hangs
- [ql setShowsFullscreenButton:NO];
- [ql setEnableDragNDrop:NO];
- // Order out QuickLook with animation effect according to self:previewPanel:frameForURL:
- [ql makeKeyAndOrderFrontWithEffect:2]; // 1 = fade in
-
- // quickLookCloseMarker == 1 break the modal session
- quickLookCloseMarker = 0;
-
- [editSheetProgressBar stopAnimation:self];
-
- // Run QuickLook in its own modal seesion for event handling
- NSModalSession session = [NSApp beginModalSessionForWindow:ql];
- for (;;) {
- // Conditions for closing QuickLook
- if ([NSApp runModalSession:session] != NSRunContinuesResponse
- || quickLookCloseMarker == 1
- || ![ql isVisible])
- break;
- [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode
- beforeDate:[NSDate distantFuture]];
-
- }
- [NSApp endModalSession:session];
-
- // Remove temp file after closing the sheet to allow double-click event at the QuickLook preview.
- // The afterDelay: time is a kind of dummy, because after double-clicking the model session loop
- // will break (ql not visible) and returns the event handling back to the editSheet which by itself
- // blocks the execution of removeQuickLooksTempFile: until the editSheet is closed.
- [self performSelector:@selector(removeQuickLooksTempFile:) withObject:tmpFileName afterDelay:2];
-
- // [[NSFileManager defaultManager] removeItemAtPath:tmpFileName error:NULL];
-
- }
-
-}
-
-- (void)removeQuickLooksTempFile:(NSString*)aPath
-{
- [[NSFileManager defaultManager] removeItemAtPath:aPath error:NULL];
-}
-
-// This is the delegate method
-// It should return the frame for the item represented by the URL
-// If an empty frame is returned then the panel will fade in/out instead
-- (NSRect)previewPanel:(NSPanel*)panel frameForURL:(NSURL*)URL
-{
-
- // Close modal session defined in invokeQuickLookOfType:
- // if user closes the QuickLook view
- quickLookCloseMarker = 1;
-
- // Return the App's middle point
- NSRect mwf = [[NSApp mainWindow] frame];
- return NSMakeRect(
- mwf.origin.x+mwf.size.width/2,
- mwf.origin.y+mwf.size.height/2,
- 5, 5);
-
-}
-
--(void)processPasteImageData
-{
- editSheetWillBeInitialized = YES;
-
- NSImage *image = nil;
-
- image = [[[NSImage alloc] initWithPasteboard:[NSPasteboard generalPasteboard]] autorelease];
- if (image) {
-
- if (editData) [editData release];
-
- [editImage setImage:image];
-
- editData = [[NSData alloc] initWithData:[image TIFFRepresentationUsingCompression:NSTIFFCompressionLZW factor:1]];
-
- NSString *contents = [[NSString alloc] initWithData:editData encoding:[CMMCPConnection encodingForMySQLEncoding:[[tableDocumentInstance connectionEncoding] UTF8String]]];
- if (contents == nil)
- contents = [[NSString alloc] initWithData:editData encoding:NSASCIIStringEncoding];
-
- // Set the string contents and hex representation
- if(contents)
- [editTextView setString:contents];
- if(![[hexTextView string] isEqualToString:@""])
- [hexTextView setString:[editData dataToFormattedHexString]];
-
- [contents release];
-
- }
-
- editSheetWillBeInitialized = NO;
-}
-/*
- * Invoked when the imageView in the connection sheet has the contents deleted
- * or a file dragged and dropped onto it.
- */
-- (void)processUpdatedImageData:(NSData *)data
-{
-
- editSheetWillBeInitialized = YES;
-
- if (editData) [editData release];
-
- // If the image was not processed, set a blank string as the contents of the edit and hex views.
- if ( data == nil ) {
- editData = [[NSData alloc] init];
- [editTextView setString:@""];
- [hexTextView setString:@""];
- editSheetWillBeInitialized = NO;
- return;
- }
-
- // Process the provided image
- editData = [[NSData alloc] initWithData:data];
- NSString *contents = [[NSString alloc] initWithData:data encoding:[CMMCPConnection encodingForMySQLEncoding:[[tableDocumentInstance connectionEncoding] UTF8String]]];
- if (contents == nil)
- contents = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];
-
- // Set the string contents and hex representation
- if(contents)
- [editTextView setString:contents];
- if(![[hexTextView string] isEqualToString:@""])
- [hexTextView setString:[editData dataToFormattedHexString]];
-
- [contents release];
- editSheetWillBeInitialized = NO;
-}
-
-- (IBAction)dropImage:(id)sender
-{
-
- // If the image was deleted, set a blank string as the contents of the edit and hex views.
- // The actual dropped image processing is handled by processUpdatedImageData:.
- if ( [editImage image] == nil ) {
- if (editData) [editData release];
- editData = [[NSData alloc] init];
- [editTextView setString:@""];
- [hexTextView setString:@""];
- return;
- }
-}
-
-- (void)textViewDidChangeSelection:(NSNotification *)notification
-/*
- invoked when the user changes the string in the editSheet
- */
-{
-
- // Do nothing if user really didn't changed text (e.g. for font size changing return)
- if(editSheetWillBeInitialized || ([[[notification object] textStorage] changeInLength]==0))
- return;
-
- // clear the image and hex (since i doubt someone can "type" a gif)
- [editImage setImage:nil];
- [hexTextView setString:@""];
-
- // free old data
- if ( editData ) [editData release];
-
- // set edit data to text
- editData = [[editTextView string] retain];
-
-}
-
-
//getter methods
- (NSArray *)currentDataResult
/*
@@ -1332,13 +968,10 @@
if ( [prefs boolForKey:@"UseMonospacedFonts"] ) {
[argumentField setFont:[NSFont fontWithName:@"Monaco" size:10]];
[limitRowsField setFont:[NSFont fontWithName:@"Monaco" size:[NSFont smallSystemFontSize]]];
- [editTextView setFont:[NSFont fontWithName:@"Monaco" size:[NSFont smallSystemFontSize]]];
} else {
- [editTextView setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
[limitRowsField setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
[argumentField setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
}
- [hexTextView setFont:[NSFont fontWithName:@"Monaco" size:[NSFont smallSystemFontSize]]];
[limitRowsStepper setEnabled:NO];
if ( [prefs boolForKey:@"LimitResults"] ) {
[limitRowsText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Limited to %d rows starting with row", @"text showing the number of rows the result is limited to"),
@@ -2259,12 +1892,12 @@ objectValueForTableColumn:(NSTableColumn *)aTableColumn
*/
- (BOOL)tableView:(NSTableView *)aTableView shouldEditTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
{
- int i, code;
- NSString *query, *stringValue = nil, *wherePart = nil;
+ int i;
+ NSString *query, *wherePart = nil;
NSArray *tempRow;
NSMutableArray *modifiedRow = [NSMutableArray array];
- id theValue;
+ // id theValue;
CMMCPResult *tempResult;
// If not isEditingRow and the preference value for not showing blobs is set, check whether the row contains any blobs.
@@ -2299,126 +1932,29 @@ objectValueForTableColumn:(NSTableColumn *)aTableColumn
// Open the sheet if the multipleLineEditingButton is enabled or the column was a blob or a text.
if ( [multipleLineEditingButton state] == NSOnState || isBlob ) {
- editSheetWillBeInitialized = YES;
-
- theValue = [[filteredResult objectAtIndex:rowIndex] objectAtIndex:[[aTableColumn identifier] intValue]];
- NSImage *image = nil;
- if (editData) [editData release];
- editData = [theValue retain];
+ SPFieldEditorController *fieldEditor = [[SPFieldEditorController alloc] init];
+ id editData = [[fieldEditor editWithObject:[[filteredResult objectAtIndex:rowIndex] objectAtIndex:[[aTableColumn identifier] intValue]]
+ usingEncoding:[mySQLConnection encoding] isObjectBlob:isBlob withWindow:tableWindow] retain];
- // hide all views in editSheet
- [hexTextView setHidden:YES];
- [hexTextScrollView setHidden:YES];
- [editImage setHidden:YES];
- [editTextView setHidden:YES];
- [editTextScrollView setHidden:YES];
-
- // Hide QuickLook button and text/iamge/hex control for text data
- [editSheetQuickLookButton setHidden:(!isBlob)];
- [editSheetSegmentControl setHidden:(!isBlob)];
-
- // order out editSheet to inform the user that SP is working
- [NSApp beginSheet:editSheet modalForWindow:tableWindow modalDelegate:self didEndSelector:nil contextInfo:nil];
-
- [editSheetProgressBar startAnimation:self];
-
- if ( [theValue isKindOfClass:[NSData class]] ) {
- image = [[[NSImage alloc] initWithData:theValue] autorelease];
-
- // Set hex view to "" - load on demand only
- [hexTextView setString:@""];
-
- stringValue = [[NSString alloc] initWithData:theValue encoding:[mySQLConnection encoding]];
- if (stringValue == nil)
- stringValue = [[NSString alloc] initWithData:theValue encoding:NSASCIIStringEncoding];
-
- [hexTextView setHidden:NO];
- [hexTextScrollView setHidden:NO];
- [editImage setHidden:YES];
- [editTextView setHidden:YES];
- [editTextScrollView setHidden:YES];
- [editSheetSegmentControl setSelectedSegment:2];
- } else {
- stringValue = [[NSString alloc] initWithString:theValue];
-
- [hexTextView setString:@""];
-
- [hexTextView setHidden:YES];
- [hexTextScrollView setHidden:YES];
- [editImage setHidden:YES];
- [editTextView setHidden:NO];
- [editTextScrollView setHidden:NO];
- [editSheetSegmentControl setSelectedSegment:0];
- }
-
- if (image) {
- [editImage setImage:image];
-
- [hexTextView setHidden:YES];
- [hexTextScrollView setHidden:YES];
- [editImage setHidden:NO];
- [editTextView setHidden:YES];
- [editTextScrollView setHidden:YES];
- [editSheetSegmentControl setSelectedSegment:1];
- } else {
- [editImage setImage:nil];
- }
- if (stringValue) {
- [editTextView setString:stringValue];
-
- if(image == nil) {
- [hexTextView setHidden:YES];
- [hexTextScrollView setHidden:YES];
- [editImage setHidden:YES];
- [editTextView setHidden:NO];
- [editTextScrollView setHidden:NO];
- [editSheetSegmentControl setSelectedSegment:0];
- }
-
- // Locate the caret in editTextView
- // (to select all takes a bit time for large data)
- [editTextView setSelectedRange:NSMakeRange(0,0)];
-
- // Set focus
- if(image == nil)
- [editSheet makeFirstResponder:editTextView];
- else
- [editSheet makeFirstResponder:editImage];
-
- [stringValue release];
- }
-
- editSheetWillBeInitialized = NO;
-
- [editSheetProgressBar stopAnimation:self];
-
- // wait for editSheet
- code = [NSApp runModalForWindow:editSheet];
-
- [NSApp endSheet:editSheet];
- [editSheet orderOut:nil];
-
- // For safety reasons inform QuickLook to quit
- quickLookCloseMarker = 1;
-
- if ( code ) {
+ if ( editData ) {
if ( !isEditingRow ) {
[oldRow setArray:[filteredResult objectAtIndex:rowIndex]];
isEditingRow = YES;
currentlyEditingRow = rowIndex;
}
-
- [[filteredResult objectAtIndex:rowIndex] replaceObjectAtIndex:[[aTableColumn identifier] intValue] withObject:[[editData copy] autorelease]];
-
- // Clean up
- [editImage setImage:nil];
- [editTextView setString:@""];
- [hexTextView setString:@""];
- if ( editData ) [editData release], editData = nil;
+ [[filteredResult objectAtIndex:rowIndex] replaceObjectAtIndex:[[aTableColumn identifier] intValue] withObject:[editData copy]];
}
+
+ [fieldEditor release];
+
+ if ( editData ) [editData release];
+
return NO;
+
} else {
+
return YES;
+
}
}
@@ -2525,26 +2061,6 @@ objectValueForTableColumn:(NSTableColumn *)aTableColumn
}
}
-// TextView delegate methods
-
-/**
- * Traps enter and return key and closes editSheet instead of inserting a linebreak when user hits return.
- */
-- (BOOL)textView:(NSTextView *)aTextView doCommandBySelector:(SEL)aSelector
-{
- if ( aTextView == editTextView ) {
- if ( [aTextView methodForSelector:aSelector] == [aTextView methodForSelector:@selector(insertNewline:)] &&
- [[[NSApp currentEvent] characters] isEqualToString:@"\003"] )
- {
- [NSApp stopModalWithCode:1];
- return YES;
- }
- else
- return NO;
- }
- return NO;
-}
-
/**
* This method is called as part of Key Value Observing which is used to watch for prefernce changes which effect the interface.
*/
@@ -2581,7 +2097,7 @@ objectValueForTableColumn:(NSTableColumn *)aTableColumn
[fullResult release];
[filteredResult release];
[oldRow release];
- if (editData) [editData release];
+ // if (editData) [editData release];
if (keys) [keys release];
if (sortCol) [sortCol release];
if (lastField) [lastField release];
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 16:00:39 +0000