diff options
95 files changed, 3930 insertions, 2888 deletions
diff --git a/Interfaces/English.lproj/BundleEditor.xib b/Interfaces/English.lproj/BundleEditor.xib index e7542cce..66d2969f 100644 --- a/Interfaces/English.lproj/BundleEditor.xib +++ b/Interfaces/English.lproj/BundleEditor.xib @@ -2,10 +2,10 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10J567</string> + <string key="IBDocument.SystemVersion">10K540</string> <string key="IBDocument.InterfaceBuilderVersion">823</string> - <string key="IBDocument.AppKitVersion">1038.35</string> - <string key="IBDocument.HIToolboxVersion">462.00</string> + <string key="IBDocument.AppKitVersion">1038.36</string> + <string key="IBDocument.HIToolboxVersion">461.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> @@ -23,7 +23,8 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="521"/> + <integer value="522"/> + <integer value="899"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -54,13 +55,13 @@ <object class="NSWindowTemplate" id="600836447"> <int key="NSWindowStyleMask">15</int> <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{235, 76}, {691, 444}}</string> + <string key="NSWindowRect">{{341, 207}, {900, 550}}</string> <int key="NSWTFlags">611844096</int> <string key="NSWindowTitle">Bundle Editor</string> <string key="NSWindowClass">SPWindow</string> <nil key="NSViewClass"/> <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> - <string key="NSWindowContentMinSize">{691, 444}</string> + <string key="NSWindowContentMinSize">{730, 494}</string> <object class="NSView" key="NSWindowView" id="391663674"> <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> @@ -251,7 +252,7 @@ </object> </object> </object> - <string key="NSFrameSize">{142, 23}</string> + <string key="NSFrame">{{0, 2}, {142, 23}}</string> <reference key="NSSuperview" ref="69213598"/> <bool key="BWABBIsResizable">YES</bool> <bool key="BWABBIsAtBottom">YES</bool> @@ -271,7 +272,7 @@ <object class="NSOutlineView" id="472206854"> <reference key="NSNextResponder" ref="34907435"/> <int key="NSvFlags">4370</int> - <string key="NSFrameSize">{143, 421}</string> + <string key="NSFrameSize">{143, 529}</string> <reference key="NSSuperview" ref="34907435"/> <bool key="NSEnabled">YES</bool> <object class="_NSCornerView" key="NSCornerView"> @@ -371,7 +372,7 @@ <float key="NSOutlineViewIndentationPerLevelKey">14</float> </object> </object> - <string key="NSFrame">{{1, 1}, {143, 421}}</string> + <string key="NSFrame">{{1, 1}, {143, 529}}</string> <reference key="NSSuperview" ref="802985400"/> <reference key="NSNextKeyView" ref="472206854"/> <reference key="NSDocView" ref="472206854"/> @@ -398,7 +399,7 @@ <double key="NSPercent">0.98947370052337646</double> </object> </object> - <string key="NSFrame">{{-2, 22}, {145, 423}}</string> + <string key="NSFrame">{{-2, 22}, {145, 531}}</string> <reference key="NSSuperview" ref="69213598"/> <reference key="NSNextKeyView" ref="34907435"/> <int key="NSsFlags">530</int> @@ -408,7 +409,7 @@ <bytes key="NSScrollAmts">QSAAAEEgAABBoAAAQaAAAA</bytes> </object> </object> - <string key="NSFrameSize">{142, 444}</string> + <string key="NSFrameSize">{142, 552}</string> <reference key="NSSuperview" ref="358491109"/> <string key="NSClassName">NSView</string> </object> @@ -417,104 +418,18 @@ <int key="NSvFlags">4370</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSPopUpButton" id="284549777"> - <reference key="NSNextResponder" ref="338542681"/> - <int key="NSvFlags">288</int> - <string key="NSFrame">{{17, 16}, {167, 22}}</string> - <reference key="NSSuperview" ref="338542681"/> - <bool key="NSEnabled">YES</bool> - <object class="NSPopUpButtonCell" key="NSCell" id="1019011390"> - <int key="NSCellFlags">-2076049856</int> - <int key="NSCellFlags2">133120</int> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="284549777"/> - <int key="NSButtonFlags">109199615</int> - <int key="NSButtonFlags2">129</int> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> - <nil key="NSMenuItem"/> - <bool key="NSMenuItemRespectAlignment">YES</bool> - <object class="NSMenu" key="NSMenu" id="132896527"> - <string key="NSTitle">OtherViews</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - <reference key="NSMenuFont" ref="604392898"/> - </object> - <int key="NSSelectedIndex">-1</int> - <int key="NSPreferredEdge">1</int> - <bool key="NSUsesItemFromMenu">YES</bool> - <bool key="NSAltersState">YES</bool> - <int key="NSArrowPosition">2</int> - </object> - </object> - <object class="NSTextField" id="907530964"> - <reference key="NSNextResponder" ref="338542681"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 280}, {167, 14}}</string> - <reference key="NSSuperview" ref="338542681"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="494412820"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272761856</int> - <string key="NSContents">Description:</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="907530964"/> - <object class="NSColor" key="NSBackgroundColor" id="90467341"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">controlColor</string> - <reference key="NSColor" ref="752361275"/> - </object> - <reference key="NSTextColor" ref="576381864"/> - </object> - </object> - <object class="NSTextField" id="877783258"> - <reference key="NSNextResponder" ref="338542681"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{236, 332}, {167, 14}}</string> - <reference key="NSSuperview" ref="338542681"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="312288989"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272761856</int> - <string key="NSContents">Contact:</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="877783258"/> - <reference key="NSBackgroundColor" ref="90467341"/> - <reference key="NSTextColor" ref="576381864"/> - </object> - </object> - <object class="NSTextField" id="303422413"> - <reference key="NSNextResponder" ref="338542681"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 332}, {167, 14}}</string> - <reference key="NSSuperview" ref="338542681"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="201087110"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272761856</int> - <string key="NSContents">Author:</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="303422413"/> - <reference key="NSBackgroundColor" ref="90467341"/> - <reference key="NSTextColor" ref="576381864"/> - </object> - </object> - <object class="NSScrollView" id="737548631"> + <object class="NSScrollView" id="221738058"> <reference key="NSNextResponder" ref="338542681"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSClipView" id="593193785"> - <reference key="NSNextResponder" ref="737548631"/> + <object class="NSClipView" id="148424706"> + <reference key="NSNextResponder" ref="221738058"/> <int key="NSvFlags">2304</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextView" id="367533279"> - <reference key="NSNextResponder" ref="593193785"/> + <object class="NSTextView" id="256802597"> + <reference key="NSNextResponder" ref="148424706"/> <int key="NSvFlags">2322</int> <object class="NSMutableSet" key="NSDragTypes"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -539,9 +454,9 @@ <string>public.url</string> </object> </object> - <string key="NSFrameSize">{504, 110}</string> - <reference key="NSSuperview" ref="593193785"/> - <object class="NSTextContainer" key="NSTextContainer" id="1024719458"> + <string key="NSFrameSize">{715, 289}</string> + <reference key="NSSuperview" ref="148424706"/> + <object class="NSTextContainer" key="NSTextContainer" id="199092126"> <object class="NSLayoutManager" key="NSLayoutManager"> <object class="NSTextStorage" key="NSTextStorage"> <object class="NSMutableString" key="NSString"> @@ -551,17 +466,17 @@ </object> <object class="NSMutableArray" key="NSTextContainers"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1024719458"/> + <reference ref="199092126"/> </object> <int key="NSLMFlags">134</int> <nil key="NSDelegate"/> </object> - <reference key="NSTextView" ref="367533279"/> - <double key="NSWidth">504</double> + <reference key="NSTextView" ref="256802597"/> + <double key="NSWidth">715</double> <int key="NSTCFlags">1</int> </object> <object class="NSTextViewSharedData" key="NSSharedData"> - <int key="NSFlags">12163</int> + <int key="NSFlags">11299</int> <int key="NSTextCheckingTypes">0</int> <nil key="NSMarkedAttributes"/> <object class="NSColor" key="NSBackgroundColor" id="856229010"> @@ -577,13 +492,13 @@ </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSColor" id="171968145"> + <object class="NSColor" id="392580074"> <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> <string key="NSColorName">selectedTextBackgroundColor</string> <reference key="NSColor" ref="752361275"/> </object> - <object class="NSColor" id="1064701164"> + <object class="NSColor" id="25407839"> <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> <string key="NSColorName">selectedTextColor</string> @@ -602,11 +517,11 @@ </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSColor" id="377341055"> + <object class="NSColor" id="810396678"> <int key="NSColorSpace">1</int> <bytes key="NSRGB">MCAwIDEAA</bytes> </object> - <object class="NSCursor" id="713837989"> + <object class="NSCursor" id="193422018"> <string key="NSHotSpot">{8, -8}</string> <int key="NSCursorType">13</int> </object> @@ -616,126 +531,140 @@ <nil key="NSDefaultParagraphStyle"/> </object> <int key="NSTVFlags">6</int> - <string key="NSMaxSize">{504, 1e+07}</string> - <string key="NSMinize">{223, 110}</string> + <string key="NSMaxSize">{1e+07, 1e+07}</string> + <string key="NSMinize">{223, 289}</string> <nil key="NSDelegate"/> </object> </object> - <string key="NSFrame">{{1, 1}, {504, 133}}</string> - <reference key="NSSuperview" ref="737548631"/> - <reference key="NSNextKeyView" ref="367533279"/> - <reference key="NSDocView" ref="367533279"/> + <string key="NSFrame">{{1, 1}, {715, 289}}</string> + <reference key="NSSuperview" ref="221738058"/> + <reference key="NSNextKeyView" ref="256802597"/> + <reference key="NSDocView" ref="256802597"/> <reference key="NSBGColor" ref="856229010"/> - <object class="NSCursor" key="NSCursor" id="1050936617"> + <object class="NSCursor" key="NSCursor" id="873465698"> <string key="NSHotSpot">{4, -5}</string> <int key="NSCursorType">1</int> </object> <int key="NScvFlags">4</int> </object> - <object class="NSScroller" id="245045448"> - <reference key="NSNextResponder" ref="737548631"/> + <object class="NSScroller" id="881611086"> + <reference key="NSNextResponder" ref="221738058"/> <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{490, 1}, {15, 140}}</string> - <reference key="NSSuperview" ref="737548631"/> - <reference key="NSTarget" ref="737548631"/> + <string key="NSFrame">{{701, 1}, {15, 289}}</string> + <reference key="NSSuperview" ref="221738058"/> + <reference key="NSTarget" ref="221738058"/> <string key="NSAction">_doScroller:</string> - <double key="NSCurValue">1</double> - <double key="NSPercent">0.85256409645080566</double> + <double key="NSPercent">0.9965517520904541</double> </object> - <object class="NSScroller" id="262238498"> - <reference key="NSNextResponder" ref="737548631"/> + <object class="NSScroller" id="877826884"> + <reference key="NSNextResponder" ref="221738058"/> <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {87, 18}}</string> - <reference key="NSSuperview" ref="737548631"/> + <reference key="NSSuperview" ref="221738058"/> <int key="NSsFlags">1</int> - <reference key="NSTarget" ref="737548631"/> + <reference key="NSTarget" ref="221738058"/> <string key="NSAction">_doScroller:</string> <double key="NSCurValue">1</double> <double key="NSPercent">0.94565218687057495</double> </object> </object> - <string key="NSFrame">{{20, 140}, {506, 135}}</string> + <string key="NSFrame">{{20, 52}, {717, 291}}</string> <reference key="NSSuperview" ref="338542681"/> - <reference key="NSNextKeyView" ref="593193785"/> + <reference key="NSNextKeyView" ref="148424706"/> <int key="NSsFlags">530</int> - <reference key="NSVScroller" ref="245045448"/> - <reference key="NSHScroller" ref="262238498"/> - <reference key="NSContentView" ref="593193785"/> + <reference key="NSVScroller" ref="881611086"/> + <reference key="NSHScroller" ref="877826884"/> + <reference key="NSContentView" ref="148424706"/> </object> - <object class="NSTextField" id="978939688"> + <object class="NSTextField" id="941704409"> <reference key="NSNextResponder" ref="338542681"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{239, 309}, {161, 19}}</string> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{23, 518}, {556, 14}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="59154256"> - <int key="NSCellFlags">-1804468671</int> - <int key="NSCellFlags2">272761856</int> - <string key="NSContents"/> + <object class="NSTextFieldCell" key="NSCell" id="834019448"> + <int key="NSCellFlags">67239488</int> + <int key="NSCellFlags2">4327424</int> + <string key="NSContents">[bundle summary]</string> <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="978939688"/> - <bool key="NSDrawsBackground">YES</bool> - <object class="NSColor" key="NSBackgroundColor" id="957408670"> + <reference key="NSControlView" ref="941704409"/> + <object class="NSColor" key="NSBackgroundColor" id="90467341"> <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> - <string key="NSColorName">textBackgroundColor</string> - <reference key="NSColor" ref="856229010"/> + <string key="NSColorName">controlColor</string> + <reference key="NSColor" ref="752361275"/> </object> - <object class="NSColor" key="NSTextColor" id="676992401"> + <object class="NSColor" key="NSTextColor"> <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> - <string key="NSColorName">textColor</string> - <reference key="NSColor" ref="760623067"/> + <string key="NSColorName">headerColor</string> + <reference key="NSColor" ref="856229010"/> </object> </object> </object> - <object class="NSTextField" id="145924516"> + <object class="NSButton" id="825494863"> <reference key="NSNextResponder" ref="338542681"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{20, 309}, {161, 19}}</string> + <int key="NSvFlags">265</int> + <string key="NSFrame">{{579, 510}, {163, 28}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="552732389"> - <int key="NSCellFlags">-1804468671</int> - <int key="NSCellFlags2">272761856</int> - <string key="NSContents"/> + <object class="NSButtonCell" key="NSCell" id="313211695"> + <int key="NSCellFlags">604110336</int> + <int key="NSCellFlags2">134348800</int> + <string key="NSContents">Bundle Info</string> <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="145924516"/> - <bool key="NSDrawsBackground">YES</bool> - <reference key="NSBackgroundColor" ref="957408670"/> - <reference key="NSTextColor" ref="676992401"/> + <reference key="NSControlView" ref="825494863"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">129</int> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> </object> </object> - <object class="NSButton" id="791474888"> + <object class="NSPopUpButton" id="284549777"> <reference key="NSNextResponder" ref="338542681"/> - <int key="NSvFlags">265</int> - <string key="NSFrame">{{440, 394}, {86, 17}}</string> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{411, 487}, {159, 22}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="315187981"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134348800</int> - <string key="NSContents">Meta Data</string> + <object class="NSPopUpButtonCell" key="NSCell" id="1019011390"> + <int key="NSCellFlags">-2076049856</int> + <int key="NSCellFlags2">133120</int> <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="791474888"/> - <int key="NSButtonFlags">-1232846593</int> - <int key="NSButtonFlags2">164</int> + <reference key="NSControlView" ref="284549777"/> + <int key="NSButtonFlags">109199615</int> + <int key="NSButtonFlags2">129</int> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> <int key="NSPeriodicDelay">400</int> <int key="NSPeriodicInterval">75</int> + <nil key="NSMenuItem"/> + <bool key="NSMenuItemRespectAlignment">YES</bool> + <object class="NSMenu" key="NSMenu" id="132896527"> + <string key="NSTitle">OtherViews</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <reference key="NSMenuFont" ref="604392898"/> + </object> + <int key="NSSelectedIndex">-1</int> + <int key="NSPreferredEdge">1</int> + <bool key="NSUsesItemFromMenu">YES</bool> + <bool key="NSAltersState">YES</bool> + <int key="NSArrowPosition">2</int> </object> </object> <object class="NSButton" id="587735074"> <reference key="NSNextResponder" ref="338542681"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{236, 330}, {292, 18}}</string> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{17, 21}, {248, 18}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="702004127"> - <int key="NSCellFlags">-2080244224</int> + <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">131072</int> - <string key="NSContents">Disable Command</string> + <string key="NSContents">Disable Bundle</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="587735074"/> <int key="NSButtonFlags">1211912703</int> @@ -753,146 +682,10 @@ <int key="NSPeriodicInterval">25</int> </object> </object> - <object class="NSScrollView" id="179792134"> - <reference key="NSNextResponder" ref="338542681"/> - <int key="NSvFlags">274</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSClipView" id="971406968"> - <reference key="NSNextResponder" ref="179792134"/> - <int key="NSvFlags">2304</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextView" id="965862131"> - <reference key="NSNextResponder" ref="971406968"/> - <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">{138, 69}</string> - <reference key="NSSuperview" ref="971406968"/> - <object class="NSTextContainer" key="NSTextContainer" id="1001899575"> - <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="1001899575"/> - </object> - <int key="NSLMFlags">134</int> - <nil key="NSDelegate"/> - </object> - <reference key="NSTextView" ref="965862131"/> - <double key="NSWidth">138</double> - <int key="NSTCFlags">1</int> - </object> - <object class="NSTextViewSharedData" key="NSSharedData"> - <int key="NSFlags">11299</int> - <int key="NSTextCheckingTypes">0</int> - <nil key="NSMarkedAttributes"/> - <reference key="NSBackgroundColor" ref="856229010"/> - <object class="NSDictionary" key="NSSelectedAttributes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" 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="171968145"/> - <reference ref="1064701164"/> - </object> - </object> - <reference key="NSInsertionColor" ref="760623067"/> - <object class="NSDictionary" key="NSLinkAttributes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" 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="377341055"/> - <reference ref="713837989"/> - <integer value="1"/> - </object> - </object> - <nil key="NSDefaultParagraphStyle"/> - </object> - <int key="NSTVFlags">7</int> - <string key="NSMaxSize">{468, 1e+07}</string> - <nil key="NSDelegate"/> - </object> - </object> - <string key="NSFrame">{{1, 1}, {504, 187}}</string> - <reference key="NSSuperview" ref="179792134"/> - <reference key="NSNextKeyView" ref="965862131"/> - <reference key="NSDocView" ref="965862131"/> - <reference key="NSBGColor" ref="856229010"/> - <reference key="NSCursor" ref="1050936617"/> - <int key="NScvFlags">4</int> - </object> - <object class="NSScroller" id="414961522"> - <reference key="NSNextResponder" ref="179792134"/> - <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{454, 1}, {15, 190}}</string> - <reference key="NSSuperview" ref="179792134"/> - <reference key="NSTarget" ref="179792134"/> - <string key="NSAction">_doScroller:</string> - <double key="NSCurValue">1</double> - <double key="NSPercent">0.85256409645080566</double> - </object> - <object class="NSScroller" id="724741922"> - <reference key="NSNextResponder" ref="179792134"/> - <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{-100, -100}, {87, 18}}</string> - <reference key="NSSuperview" ref="179792134"/> - <int key="NSsFlags">1</int> - <reference key="NSTarget" ref="179792134"/> - <string key="NSAction">_doScroller:</string> - <double key="NSCurValue">1</double> - <double key="NSPercent">0.94565218687057495</double> - </object> - </object> - <string key="NSFrame">{{20, 140}, {506, 189}}</string> - <reference key="NSSuperview" ref="338542681"/> - <reference key="NSNextKeyView" ref="971406968"/> - <int key="NSsFlags">530</int> - <reference key="NSVScroller" ref="414961522"/> - <reference key="NSHScroller" ref="724741922"/> - <reference key="NSContentView" ref="971406968"/> - </object> <object class="NSButton" id="552615839"> <reference key="NSNextResponder" ref="338542681"/> <int key="NSvFlags">289</int> - <string key="NSFrame">{{435, 13}, {96, 28}}</string> + <string key="NSFrame">{{617, 15}, {125, 28}}</string> <reference key="NSSuperview" ref="338542681"/> <int key="NSTag">1</int> <bool key="NSEnabled">YES</bool> @@ -913,7 +706,7 @@ <object class="NSButton" id="679408795"> <reference key="NSNextResponder" ref="338542681"/> <int key="NSvFlags">289</int> - <string key="NSFrame">{{309, 13}, {96, 28}}</string> + <string key="NSFrame">{{494, 15}, {125, 28}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="697434956"> @@ -932,14 +725,19 @@ </object> <object class="SRRecorderControl" id="62695080"> <reference key="NSNextResponder" ref="338542681"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{20, 55}, {161, 22}}</string> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{127, 436}, {157, 22}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="SRRecorderCell" key="NSCell" id="670400760"> <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <reference key="NSSupport" ref="26"/> + <int key="NSCellFlags2">262144</int> + <string key="NSContents"/> + <object class="NSFont" key="NSSupport"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">9</double> + <int key="NSfFlags">3614</int> + </object> <reference key="NSControlView" ref="62695080"/> <nil key="autosaveName"/> <integer value="-1" key="keyComboCode"/> @@ -955,7 +753,7 @@ <object class="NSPopUpButton" id="710770414"> <reference key="NSNextResponder" ref="338542681"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{236, 356}, {167, 22}}</string> + <string key="NSFrame">{{411, 394}, {159, 22}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="68459104"> @@ -988,7 +786,7 @@ <object class="NSPopUpButton" id="1013555552"> <reference key="NSNextResponder" ref="338542681"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{236, 356}, {167, 22}}</string> + <string key="NSFrame">{{411, 394}, {159, 22}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="4363123"> @@ -1020,8 +818,8 @@ </object> <object class="NSPopUpButton" id="570587248"> <reference key="NSNextResponder" ref="338542681"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{17, 96}, {167, 22}}</string> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{126, 369}, {159, 22}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="299353121"> @@ -1054,7 +852,7 @@ <object class="NSPopUpButton" id="904079305"> <reference key="NSNextResponder" ref="338542681"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{236, 391}, {167, 22}}</string> + <string key="NSFrame">{{126, 487}, {159, 22}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="886363818"> @@ -1087,7 +885,7 @@ <object class="NSPopUpButton" id="117047836"> <reference key="NSNextResponder" ref="338542681"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 356}, {167, 22}}</string> + <string key="NSFrame">{{126, 394}, {159, 22}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="131002945"> @@ -1119,8 +917,8 @@ </object> <object class="NSButton" id="277233496"> <reference key="NSNextResponder" ref="338542681"/> - <int key="NSvFlags">265</int> - <string key="NSFrame">{{504, 354}, {25, 25}}</string> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{465, 16}, {25, 25}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="1021110085"> @@ -1140,13 +938,13 @@ <object class="NSTextField" id="703222741"> <reference key="NSNextResponder" ref="338542681"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{186, 360}, {48, 14}}</string> + <string key="NSFrame">{{332, 400}, {32, 14}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="116371218"> <int key="NSCellFlags">68288064</int> <int key="NSCellFlags2">138544128</int> - <string key="NSContents">and</string> + <string key="NSContents">AND</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="703222741"/> <reference key="NSBackgroundColor" ref="90467341"/> @@ -1156,13 +954,13 @@ <object class="NSTextField" id="411989314"> <reference key="NSNextResponder" ref="338542681"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{186, 360}, {48, 14}}</string> + <string key="NSFrame">{{332, 400}, {32, 14}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="679867674"> <int key="NSCellFlags">68288064</int> <int key="NSCellFlags2">138544128</int> - <string key="NSContents">or</string> + <string key="NSContents">OR</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="411989314"/> <reference key="NSBackgroundColor" ref="90467341"/> @@ -1171,8 +969,8 @@ </object> <object class="NSTextField" id="233794614"> <reference key="NSNextResponder" ref="338542681"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{239, 98}, {161, 19}}</string> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{414, 464}, {323, 19}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="748268806"> @@ -1183,35 +981,29 @@ <string key="NSPlaceholderString">[sub menu category]</string> <reference key="NSControlView" ref="233794614"/> <bool key="NSDrawsBackground">YES</bool> - <reference key="NSBackgroundColor" ref="957408670"/> - <reference key="NSTextColor" ref="676992401"/> - </object> - </object> - <object class="NSTextField" id="728794970"> - <reference key="NSNextResponder" ref="338542681"/> - <int key="NSvFlags">288</int> - <string key="NSFrame">{{17, 78}, {167, 14}}</string> - <reference key="NSSuperview" ref="338542681"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="38136759"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">4326400</int> - <string key="NSContents">Key Equivalent:</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="728794970"/> - <reference key="NSBackgroundColor" ref="90467341"/> - <reference key="NSTextColor" ref="576381864"/> + <object class="NSColor" key="NSBackgroundColor" id="957408670"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">textBackgroundColor</string> + <reference key="NSColor" ref="856229010"/> + </object> + <object class="NSColor" key="NSTextColor" id="676992401"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">textColor</string> + <reference key="NSColor" ref="760623067"/> + </object> </object> </object> <object class="NSTextField" id="413102423"> <reference key="NSNextResponder" ref="338542681"/> - <int key="NSvFlags">288</int> - <string key="NSFrame">{{17, 38}, {167, 14}}</string> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{287, 493}, {122, 14}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="75217064"> <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">4326400</int> + <int key="NSCellFlags2">71435264</int> <string key="NSContents">Trigger:</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="413102423"/> @@ -1221,13 +1013,13 @@ </object> <object class="NSTextField" id="994416682"> <reference key="NSNextResponder" ref="338542681"/> - <int key="NSvFlags">288</int> - <string key="NSFrame">{{17, 118}, {167, 14}}</string> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{21, 374}, {103, 14}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="849546250"> <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">4326400</int> + <int key="NSCellFlags2">71435264</int> <string key="NSContents">Output:</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="994416682"/> @@ -1237,13 +1029,13 @@ </object> <object class="NSTextField" id="430446404"> <reference key="NSNextResponder" ref="338542681"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{236, 118}, {167, 14}}</string> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{287, 466}, {122, 14}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="622343774"> <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">4326400</int> + <int key="NSCellFlags2">71435264</int> <string key="NSContents">Menu Category:</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="430446404"/> @@ -1254,13 +1046,13 @@ <object class="NSTextField" id="669651343"> <reference key="NSNextResponder" ref="338542681"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{236, 414}, {167, 14}}</string> + <string key="NSFrame">{{21, 492}, {103, 14}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="44795332"> <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">4326400</int> - <string key="NSContents">Scope:</string> + <int key="NSCellFlags2">71435264</int> + <string key="NSContents">Bundle Scope:</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="669651343"/> <reference key="NSBackgroundColor" ref="90467341"/> @@ -1270,7 +1062,7 @@ <object class="NSTextField" id="864339274"> <reference key="NSNextResponder" ref="338542681"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 332}, {167, 14}}</string> + <string key="NSFrame">{{17, 351}, {447, 14}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="553916693"> @@ -1286,12 +1078,12 @@ <object class="NSTextField" id="931989616"> <reference key="NSNextResponder" ref="338542681"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 379}, {167, 14}}</string> + <string key="NSFrame">{{21, 400}, {103, 14}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="370999655"> <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">4326400</int> + <int key="NSCellFlags2">71435264</int> <string key="NSContents">Input:</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="931989616"/> @@ -1301,13 +1093,13 @@ </object> <object class="NSTextField" id="334638351"> <reference key="NSNextResponder" ref="338542681"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{236, 78}, {167, 14}}</string> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{287, 439}, {122, 14}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="627233937"> <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">4326400</int> + <int key="NSCellFlags2">71435264</int> <string key="NSContents">Tooltip:</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="334638351"/> @@ -1317,8 +1109,8 @@ </object> <object class="NSTextField" id="70452502"> <reference key="NSNextResponder" ref="338542681"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{239, 57}, {161, 19}}</string> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{414, 437}, {323, 19}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="43525095"> @@ -1335,13 +1127,13 @@ </object> <object class="NSTextField" id="1032857532"> <reference key="NSNextResponder" ref="338542681"/> - <int key="NSvFlags">264</int> - <string key="NSFrame">{{17, 414}, {167, 14}}</string> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{21, 466}, {103, 14}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="434303900"> <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">4326400</int> + <int key="NSCellFlags2">71435264</int> <string key="NSContents">Menu Label:</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="1032857532"/> @@ -1352,7 +1144,7 @@ <object class="NSTextField" id="209604501"> <reference key="NSNextResponder" ref="338542681"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{20, 394}, {161, 19}}</string> + <string key="NSFrame">{{129, 464}, {153, 19}}</string> <reference key="NSSuperview" ref="338542681"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="1025501303"> @@ -1368,12 +1160,12 @@ </object> </object> </object> - <string key="NSFrame">{{143, 0}, {548, 444}}</string> + <string key="NSFrame">{{143, 0}, {757, 552}}</string> <reference key="NSSuperview" ref="358491109"/> <string key="NSClassName">NSView</string> </object> </object> - <string key="NSFrameSize">{691, 444}</string> + <string key="NSFrame">{{0, -2}, {900, 552}}</string> <reference key="NSSuperview" ref="391663674"/> <bool key="NSIsVertical">YES</bool> <int key="NSDividerStyle">2</int> @@ -1392,8 +1184,8 @@ </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="148"/> - <integer value="548"/> + <integer value="122"/> + <integer value="588"/> </object> </object> <object class="NSMutableDictionary" key="BWSVMaxValues"> @@ -1439,11 +1231,11 @@ <bool key="BWSVDividerCanCollapse">NO</bool> </object> </object> - <string key="NSFrameSize">{691, 444}</string> + <string key="NSFrameSize">{900, 550}</string> <reference key="NSSuperview"/> </object> - <string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string> - <string key="NSMinSize">{691, 466}</string> + <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> + <string key="NSMinSize">{730, 516}</string> <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSFrameAutosaveName">SPBundleEditor</string> </object> @@ -1453,9 +1245,8 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMenuItem" id="850254010"> <reference key="NSMenu" ref="655873624"/> - <string key="NSTitle">Add Bundle</string> - <string key="NSKeyEquiv">a</string> - <int key="NSKeyEquivModMask">1572864</int> + <string key="NSTitle">Bundle Info</string> + <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="545549031"/> <reference key="NSMixedImage" ref="20147930"/> @@ -1720,6 +1511,245 @@ <bool key="NSSelectsInsertedObjects">YES</bool> <string key="NSTreeContentChildrenKey">_children_</string> </object> + <object class="NSWindowTemplate" id="796555432"> + <int key="NSWindowStyleMask">15</int> + <int key="NSWindowBacking">2</int> + <string key="NSWindowRect">{{196, 266}, {297, 244}}</string> + <int key="NSWTFlags">611844096</int> + <string key="NSWindowTitle">Window</string> + <string key="NSWindowClass">NSWindow</string> + <nil key="NSViewClass"/> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSWindowContentMinSize">{297, 244}</string> + <object class="NSView" key="NSWindowView" id="841396186"> + <nil key="NSNextResponder"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextField" id="916632433"> + <reference key="NSNextResponder" ref="841396186"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{41, 207}, {45, 14}}</string> + <reference key="NSSuperview" ref="841396186"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="951541811"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272761856</int> + <string key="NSContents">Author:</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="916632433"/> + <reference key="NSBackgroundColor" ref="90467341"/> + <reference key="NSTextColor" ref="576381864"/> + </object> + </object> + <object class="NSTextField" id="623620101"> + <reference key="NSNextResponder" ref="841396186"/> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{91, 205}, {186, 19}}</string> + <reference key="NSSuperview" ref="841396186"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="464624197"> + <int key="NSCellFlags">-1804468671</int> + <int key="NSCellFlags2">272761856</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="623620101"/> + <bool key="NSDrawsBackground">YES</bool> + <reference key="NSBackgroundColor" ref="957408670"/> + <reference key="NSTextColor" ref="676992401"/> + </object> + </object> + <object class="NSTextField" id="581164352"> + <reference key="NSNextResponder" ref="841396186"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{37, 182}, {49, 14}}</string> + <reference key="NSSuperview" ref="841396186"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="72567029"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272761856</int> + <string key="NSContents">Contact:</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="581164352"/> + <reference key="NSBackgroundColor" ref="90467341"/> + <reference key="NSTextColor" ref="576381864"/> + </object> + </object> + <object class="NSTextField" id="448539706"> + <reference key="NSNextResponder" ref="841396186"/> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{91, 180}, {186, 19}}</string> + <reference key="NSSuperview" ref="841396186"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="561460655"> + <int key="NSCellFlags">-1804468671</int> + <int key="NSCellFlags2">272761856</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="448539706"/> + <bool key="NSDrawsBackground">YES</bool> + <reference key="NSBackgroundColor" ref="957408670"/> + <reference key="NSTextColor" ref="676992401"/> + </object> + </object> + <object class="NSTextField" id="564934514"> + <reference key="NSNextResponder" ref="841396186"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{17, 158}, {69, 14}}</string> + <reference key="NSSuperview" ref="841396186"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="910146059"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272761856</int> + <string key="NSContents">Description:</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="564934514"/> + <reference key="NSBackgroundColor" ref="90467341"/> + <reference key="NSTextColor" ref="576381864"/> + </object> + </object> + <object class="NSScrollView" id="895160325"> + <reference key="NSNextResponder" ref="841396186"/> + <int key="NSvFlags">274</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSClipView" id="932944055"> + <reference key="NSNextResponder" ref="895160325"/> + <int key="NSvFlags">2304</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextView" id="817598796"> + <reference key="NSNextResponder" ref="932944055"/> + <int key="NSvFlags">2322</int> + <string key="NSFrameSize">{255, 92}</string> + <reference key="NSSuperview" ref="932944055"/> + <object class="NSTextContainer" key="NSTextContainer" id="407119071"> + <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="407119071"/> + </object> + <int key="NSLMFlags">134</int> + <nil key="NSDelegate"/> + </object> + <reference key="NSTextView" ref="817598796"/> + <double key="NSWidth">255</double> + <int key="NSTCFlags">1</int> + </object> + <object class="NSTextViewSharedData" key="NSSharedData"> + <int key="NSFlags">2305</int> + <int key="NSTextCheckingTypes">0</int> + <nil key="NSMarkedAttributes"/> + <reference key="NSBackgroundColor" ref="856229010"/> + <object class="NSDictionary" key="NSSelectedAttributes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" 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="392580074"/> + <reference ref="25407839"/> + </object> + </object> + <reference key="NSInsertionColor" ref="760623067"/> + <object class="NSDictionary" key="NSLinkAttributes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" 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="810396678"/> + <reference ref="193422018"/> + <integer value="1"/> + </object> + </object> + <nil key="NSDefaultParagraphStyle"/> + </object> + <int key="NSTVFlags">6</int> + <string key="NSMaxSize">{463, 1e+07}</string> + <string key="NSMinize">{223, 92}</string> + <nil key="NSDelegate"/> + </object> + </object> + <string key="NSFrame">{{1, 1}, {255, 92}}</string> + <reference key="NSSuperview" ref="895160325"/> + <reference key="NSNextKeyView" ref="817598796"/> + <reference key="NSDocView" ref="817598796"/> + <reference key="NSBGColor" ref="856229010"/> + <reference key="NSCursor" ref="873465698"/> + <int key="NScvFlags">4</int> + </object> + <object class="NSScroller" id="308688517"> + <reference key="NSNextResponder" ref="895160325"/> + <int key="NSvFlags">-2147483392</int> + <string key="NSFrame">{{245, 1}, {11, 92}}</string> + <reference key="NSSuperview" ref="895160325"/> + <int key="NSsFlags">256</int> + <reference key="NSTarget" ref="895160325"/> + <string key="NSAction">_doScroller:</string> + <double key="NSCurValue">1</double> + <double key="NSPercent">0.85256409645080566</double> + </object> + <object class="NSScroller" id="900588956"> + <reference key="NSNextResponder" ref="895160325"/> + <int key="NSvFlags">-2147483392</int> + <string key="NSFrame">{{-100, -100}, {87, 18}}</string> + <reference key="NSSuperview" ref="895160325"/> + <int key="NSsFlags">1</int> + <reference key="NSTarget" ref="895160325"/> + <string key="NSAction">_doScroller:</string> + <double key="NSCurValue">1</double> + <double key="NSPercent">0.94565218687057495</double> + </object> + </object> + <string key="NSFrame">{{20, 56}, {257, 94}}</string> + <reference key="NSSuperview" ref="841396186"/> + <reference key="NSNextKeyView" ref="932944055"/> + <int key="NSsFlags">530</int> + <reference key="NSVScroller" ref="308688517"/> + <reference key="NSHScroller" ref="900588956"/> + <reference key="NSContentView" ref="932944055"/> + </object> + <object class="NSButton" id="431948010"> + <reference key="NSNextResponder" ref="841396186"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{186, 13}, {96, 28}}</string> + <reference key="NSSuperview" ref="841396186"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="347466531"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134348800</int> + <string key="NSContents">Close</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="431948010"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">129</int> + <string key="NSAlternateContents"/> + <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + </object> + <string key="NSFrameSize">{297, 244}</string> + </object> + <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> + <string key="NSMinSize">{297, 266}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> + </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> <object class="NSMutableArray" key="connectionRecords"> @@ -1934,94 +1964,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">commandTextView</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="965862131"/> - </object> - <int key="connectionID">925</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="965862131"/> - <reference key="destination" ref="1001"/> - </object> - <int key="connectionID">929</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">commandScrollView</string> - <reference key="source" ref="965862131"/> - <reference key="destination" ref="179792134"/> - </object> - <int key="connectionID">931</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="209604501"/> - <reference key="destination" ref="904079305"/> - </object> - <int key="connectionID">941</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="904079305"/> - <reference key="destination" ref="117047836"/> - </object> - <int key="connectionID">942</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="117047836"/> - <reference key="destination" ref="1013555552"/> - </object> - <int key="connectionID">943</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="1013555552"/> - <reference key="destination" ref="965862131"/> - </object> - <int key="connectionID">944</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="965862131"/> - <reference key="destination" ref="570587248"/> - </object> - <int key="connectionID">945</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="570587248"/> - <reference key="destination" ref="233794614"/> - </object> - <int key="connectionID">946</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="233794614"/> - <reference key="destination" ref="70452502"/> - </object> - <int key="connectionID">948</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="70452502"/> - <reference key="destination" ref="552615839"/> - </object> - <int key="connectionID">949</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">nextKeyView</string> <reference key="source" ref="552615839"/> <reference key="destination" ref="679408795"/> @@ -2126,38 +2068,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.command</string> - <reference key="source" ref="965862131"/> - <reference key="destination" ref="645644012"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="965862131"/> - <reference key="NSDestination" ref="645644012"/> - <string key="NSLabel">value: selection.command</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.command</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">987</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.category</string> - <reference key="source" ref="233794614"/> - <reference key="destination" ref="645644012"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="233794614"/> - <reference key="NSDestination" ref="645644012"/> - <string key="NSLabel">value: selection.category</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.category</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">988</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> <string key="label">value: selection.tooltip</string> <reference key="source" ref="70452502"/> <reference key="destination" ref="645644012"/> @@ -2213,14 +2123,6 @@ <int key="connectionID">993</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">addCommandBundle:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="850254010"/> - </object> - <int key="connectionID">995</int> - </object> - <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> <string key="label">value: selection.disabled</string> <reference key="source" ref="587735074"/> @@ -2294,99 +2196,243 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">authorTextField</string> + <string key="label">tooltipTextField</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="145924516"/> + <reference key="destination" ref="70452502"/> </object> - <int key="connectionID">1056</int> + <int key="connectionID">1072</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">contactTextField</string> + <string key="label">triggerPopupButton</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="284549777"/> + </object> + <int key="connectionID">1086</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">triggerButtonChanged:</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="978939688"/> + <reference key="destination" ref="284549777"/> </object> - <int key="connectionID">1057</int> + <int key="connectionID">1087</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">contactLabelField</string> + <string key="label">withBlobLabelField</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="877783258"/> + <reference key="destination" ref="703222741"/> </object> - <int key="connectionID">1058</int> + <int key="connectionID">1090</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">authorLabelField</string> + <string key="label">withBlobPopupButton</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="303422413"/> + <reference key="destination" ref="710770414"/> </object> - <int key="connectionID">1059</int> + <int key="connectionID">1096</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">withBlobButtonChanged:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="710770414"/> + </object> + <int key="connectionID">1097</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">performClose:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="679408795"/> + </object> + <int key="connectionID">1098</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">undeleteDefaultBundles:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="637895342"/> + </object> + <int key="connectionID">1100</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">descriptionLabelField</string> + <string key="label">undeleteTableView</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="907530964"/> + <reference key="destination" ref="703923380"/> </object> - <int key="connectionID">1060</int> + <int key="connectionID">1116</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">dataSource</string> + <reference key="source" ref="703923380"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">1119</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="703923380"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">1120</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">undeleteSheet</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="602640146"/> + </object> + <int key="connectionID">1123</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">closeUndeleteDefaultBundlesSheet:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="4858278"/> + </object> + <int key="connectionID">1124</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">closeUndeleteDefaultBundlesSheet:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="887016115"/> + </object> + <int key="connectionID">1125</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="602640146"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">1126</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">initialFirstResponder</string> + <reference key="source" ref="602640146"/> + <reference key="destination" ref="703923380"/> + </object> + <int key="connectionID">1127</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="358491109"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">1128</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">splitView</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="358491109"/> + </object> + <int key="connectionID">1130</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">authorTextField</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="623620101"/> + </object> + <int key="connectionID">1150</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">contactTextField</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="448539706"/> + </object> + <int key="connectionID">1151</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">descriptionTextView</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="367533279"/> + <reference key="destination" ref="817598796"/> </object> - <int key="connectionID">1061</int> + <int key="connectionID">1152</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">showHideMetaButton</string> + <string key="label">metaInfoSheet</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="791474888"/> + <reference key="destination" ref="796555432"/> + </object> + <int key="connectionID">1153</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">displayBundleMetaInfo:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="825494863"/> + </object> + <int key="connectionID">1158</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">closeSheet:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="431948010"/> + </object> + <int key="connectionID">1159</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">displayBundleMetaInfo:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="850254010"/> </object> - <int key="connectionID">1062</int> + <int key="connectionID">1160</int> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.contact</string> - <reference key="source" ref="978939688"/> + <string key="label">value: selection.author</string> + <reference key="source" ref="623620101"/> <reference key="destination" ref="645644012"/> <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="978939688"/> + <reference key="NSSource" ref="623620101"/> <reference key="NSDestination" ref="645644012"/> - <string key="NSLabel">value: selection.contact</string> + <string key="NSLabel">value: selection.author</string> <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.contact</string> + <string key="NSKeyPath">selection.author</string> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">1064</int> + <int key="connectionID">1162</int> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.author</string> - <reference key="source" ref="145924516"/> + <string key="label">value: selection.contact</string> + <reference key="source" ref="448539706"/> <reference key="destination" ref="645644012"/> <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="145924516"/> + <reference key="NSSource" ref="448539706"/> <reference key="NSDestination" ref="645644012"/> - <string key="NSLabel">value: selection.author</string> + <string key="NSLabel">value: selection.contact</string> <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.author</string> + <string key="NSKeyPath">selection.contact</string> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">1066</int> + <int key="connectionID">1164</int> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> <string key="label">value: selection.description</string> - <reference key="source" ref="367533279"/> + <reference key="source" ref="817598796"/> <reference key="destination" ref="645644012"/> <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="367533279"/> + <reference key="NSSource" ref="817598796"/> <reference key="NSDestination" ref="645644012"/> <string key="NSLabel">value: selection.description</string> <string key="NSBinding">value</string> @@ -2394,183 +2440,379 @@ <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">1068</int> + <int key="connectionID">1166</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">metaButtonChanged:</string> + <object class="IBOutletConnection" key="connection"> + <string key="label">displayMetaInfoButton</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="791474888"/> + <reference key="destination" ref="825494863"/> </object> - <int key="connectionID">1069</int> + <int key="connectionID">1167</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">commandScrollView</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="179792134"/> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: selection.category</string> + <reference key="source" ref="233794614"/> + <reference key="destination" ref="645644012"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="233794614"/> + <reference key="NSDestination" ref="645644012"/> + <string key="NSLabel">value: selection.category</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">selection.category</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSNullPlaceholder</string> + <string key="NS.object.0">optional</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> </object> - <int key="connectionID">1070</int> + <int key="connectionID">1170</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">descriptionScrollView</string> + <string key="label">metaInfoSummary</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="737548631"/> + <reference key="destination" ref="941704409"/> </object> - <int key="connectionID">1071</int> + <int key="connectionID">1173</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">tooltipTextField</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="70452502"/> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: selection.disabled</string> + <reference key="source" ref="904079305"/> + <reference key="destination" ref="645644012"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="904079305"/> + <reference key="NSDestination" ref="645644012"/> + <string key="NSLabel">enabled: selection.disabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">selection.disabled</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSValueTransformerName</string> + <string key="NS.object.0">NSNegateBoolean</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> </object> - <int key="connectionID">1072</int> + <int key="connectionID">1183</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">triggerPopupButton</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="284549777"/> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: selection.disabled</string> + <reference key="source" ref="284549777"/> + <reference key="destination" ref="645644012"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="284549777"/> + <reference key="NSDestination" ref="645644012"/> + <string key="NSLabel">enabled: selection.disabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">selection.disabled</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSValueTransformerName</string> + <string key="NS.object.0">NSNegateBoolean</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> </object> - <int key="connectionID">1086</int> + <int key="connectionID">1186</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">triggerButtonChanged:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="284549777"/> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: selection.disabled</string> + <reference key="source" ref="209604501"/> + <reference key="destination" ref="645644012"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="209604501"/> + <reference key="NSDestination" ref="645644012"/> + <string key="NSLabel">enabled: selection.disabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">selection.disabled</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSValueTransformerName</string> + <string key="NS.object.0">NSNegateBoolean</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> </object> - <int key="connectionID">1087</int> + <int key="connectionID">1191</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">withBlobLabelField</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="703222741"/> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: selection.disabled</string> + <reference key="source" ref="233794614"/> + <reference key="destination" ref="645644012"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="233794614"/> + <reference key="NSDestination" ref="645644012"/> + <string key="NSLabel">enabled: selection.disabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">selection.disabled</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSValueTransformerName</string> + <string key="NS.object.0">NSNegateBoolean</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> </object> - <int key="connectionID">1090</int> + <int key="connectionID">1194</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: selection.disabled</string> + <reference key="source" ref="62695080"/> + <reference key="destination" ref="645644012"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="62695080"/> + <reference key="NSDestination" ref="645644012"/> + <string key="NSLabel">enabled: selection.disabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">selection.disabled</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSValueTransformerName</string> + <string key="NS.object.0">NSNegateBoolean</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1199</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: selection.disabled</string> + <reference key="source" ref="70452502"/> + <reference key="destination" ref="645644012"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="70452502"/> + <reference key="NSDestination" ref="645644012"/> + <string key="NSLabel">enabled: selection.disabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">selection.disabled</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSValueTransformerName</string> + <string key="NS.object.0">NSNegateBoolean</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1202</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: selection.disabled</string> + <reference key="source" ref="117047836"/> + <reference key="destination" ref="645644012"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="117047836"/> + <reference key="NSDestination" ref="645644012"/> + <string key="NSLabel">enabled: selection.disabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">selection.disabled</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSValueTransformerName</string> + <string key="NS.object.0">NSNegateBoolean</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1205</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: selection.disabled</string> <reference key="source" ref="710770414"/> - <reference key="destination" ref="965862131"/> + <reference key="destination" ref="645644012"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="710770414"/> + <reference key="NSDestination" ref="645644012"/> + <string key="NSLabel">enabled: selection.disabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">selection.disabled</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSValueTransformerName</string> + <string key="NS.object.0">NSNegateBoolean</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> </object> - <int key="connectionID">1094</int> + <int key="connectionID">1208</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">withBlobPopupButton</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="710770414"/> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: selection.disabled</string> + <reference key="source" ref="570587248"/> + <reference key="destination" ref="645644012"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="570587248"/> + <reference key="NSDestination" ref="645644012"/> + <string key="NSLabel">enabled: selection.disabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">selection.disabled</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSValueTransformerName</string> + <string key="NS.object.0">NSNegateBoolean</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> </object> - <int key="connectionID">1096</int> + <int key="connectionID">1211</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">withBlobButtonChanged:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="710770414"/> + <object class="IBBindingConnection" key="connection"> + <string key="label">fontBold: selection.disabled</string> + <reference key="source" ref="587735074"/> + <reference key="destination" ref="645644012"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="587735074"/> + <reference key="NSDestination" ref="645644012"/> + <string key="NSLabel">fontBold: selection.disabled</string> + <string key="NSBinding">fontBold</string> + <string key="NSKeyPath">selection.disabled</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> </object> - <int key="connectionID">1097</int> + <int key="connectionID">1213</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">performClose:</string> + <object class="IBOutletConnection" key="connection"> + <string key="label">commandTextView</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="679408795"/> + <reference key="destination" ref="256802597"/> </object> - <int key="connectionID">1098</int> + <int key="connectionID">1219</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">undeleteDefaultBundles:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="637895342"/> + <object class="IBOutletConnection" key="connection"> + <string key="label">commandScrollView</string> + <reference key="source" ref="256802597"/> + <reference key="destination" ref="221738058"/> </object> - <int key="connectionID">1100</int> + <int key="connectionID">1220</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">undeleteTableView</string> + <string key="label">commandScrollView</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="703923380"/> + <reference key="destination" ref="221738058"/> </object> - <int key="connectionID">1116</int> + <int key="connectionID">1221</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">dataSource</string> - <reference key="source" ref="703923380"/> + <string key="label">delegate</string> + <reference key="source" ref="256802597"/> <reference key="destination" ref="1001"/> </object> - <int key="connectionID">1119</int> + <int key="connectionID">1222</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="703923380"/> - <reference key="destination" ref="1001"/> + <string key="label">nextKeyView</string> + <reference key="source" ref="904079305"/> + <reference key="destination" ref="284549777"/> </object> - <int key="connectionID">1120</int> + <int key="connectionID">1227</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">undeleteSheet</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="602640146"/> + <string key="label">nextKeyView</string> + <reference key="source" ref="284549777"/> + <reference key="destination" ref="209604501"/> </object> - <int key="connectionID">1123</int> + <int key="connectionID">1228</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">closeUndeleteDefaultBundlesSheet:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="4858278"/> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="209604501"/> + <reference key="destination" ref="233794614"/> </object> - <int key="connectionID">1124</int> + <int key="connectionID">1229</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">closeUndeleteDefaultBundlesSheet:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="887016115"/> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="233794614"/> + <reference key="destination" ref="70452502"/> </object> - <int key="connectionID">1125</int> + <int key="connectionID">1231</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="602640146"/> - <reference key="destination" ref="1001"/> + <string key="label">nextKeyView</string> + <reference key="source" ref="70452502"/> + <reference key="destination" ref="117047836"/> </object> - <int key="connectionID">1126</int> + <int key="connectionID">1232</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">initialFirstResponder</string> - <reference key="source" ref="602640146"/> - <reference key="destination" ref="703923380"/> + <string key="label">nextKeyView</string> + <reference key="source" ref="117047836"/> + <reference key="destination" ref="570587248"/> </object> - <int key="connectionID">1127</int> + <int key="connectionID">1233</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="358491109"/> - <reference key="destination" ref="1001"/> + <string key="label">nextKeyView</string> + <reference key="source" ref="570587248"/> + <reference key="destination" ref="256802597"/> </object> - <int key="connectionID">1128</int> + <int key="connectionID">1234</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">splitView</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="358491109"/> + <string key="label">nextKeyView</string> + <reference key="source" ref="256802597"/> + <reference key="destination" ref="587735074"/> </object> - <int key="connectionID">1130</int> + <int key="connectionID">1235</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="587735074"/> + <reference key="destination" ref="552615839"/> + </object> + <int key="connectionID">1236</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: selection.command</string> + <reference key="source" ref="256802597"/> + <reference key="destination" ref="645644012"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="256802597"/> + <reference key="NSDestination" ref="645644012"/> + <string key="NSLabel">value: selection.command</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">selection.command</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1241</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">editable: selection.disabled</string> + <reference key="source" ref="256802597"/> + <reference key="destination" ref="645644012"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="256802597"/> + <reference key="NSDestination" ref="645644012"/> + <string key="NSLabel">editable: selection.disabled</string> + <string key="NSBinding">editable</string> + <string key="NSKeyPath">selection.disabled</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSValueTransformerName</string> + <string key="NS.object.0">NSNegateBoolean</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1244</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -2826,527 +3068,507 @@ <reference key="parent" ref="685938371"/> </object> <object class="IBObjectRecord"> - <int key="objectID">686</int> - <reference key="object" ref="338542681"/> + <int key="objectID">994</int> + <reference key="object" ref="850254010"/> + <reference key="parent" ref="655873624"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1099</int> + <reference key="object" ref="637895342"/> + <reference key="parent" ref="973574710"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1101</int> + <reference key="object" ref="602640146"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="179792134"/> - <reference ref="864339274"/> - <reference ref="904079305"/> - <reference ref="277233496"/> - <reference ref="62695080"/> - <reference ref="117047836"/> - <reference ref="334638351"/> - <reference ref="70452502"/> - <reference ref="430446404"/> - <reference ref="233794614"/> - <reference ref="1013555552"/> - <reference ref="931989616"/> - <reference ref="411989314"/> - <reference ref="209604501"/> - <reference ref="1032857532"/> - <reference ref="994416682"/> - <reference ref="570587248"/> - <reference ref="587735074"/> - <reference ref="791474888"/> - <reference ref="978939688"/> - <reference ref="145924516"/> - <reference ref="737548631"/> - <reference ref="303422413"/> - <reference ref="877783258"/> - <reference ref="907530964"/> - <reference ref="728794970"/> - <reference ref="669651343"/> - <reference ref="552615839"/> - <reference ref="284549777"/> - <reference ref="413102423"/> - <reference ref="679408795"/> - <reference ref="703222741"/> - <reference ref="710770414"/> + <reference ref="856429814"/> </object> - <reference key="parent" ref="358491109"/> - <string key="objectName">Bundle Content View</string> + <reference key="parent" ref="0"/> + <string key="objectName">Undelete Default Bundles Sheet</string> </object> <object class="IBObjectRecord"> - <int key="objectID">820</int> - <reference key="object" ref="179792134"/> + <int key="objectID">1102</int> + <reference key="object" ref="856429814"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="965862131"/> - <reference ref="724741922"/> - <reference ref="414961522"/> + <reference ref="364471408"/> + <reference ref="4858278"/> + <reference ref="887016115"/> </object> - <reference key="parent" ref="338542681"/> - <string key="objectName">Bordered Scroll View (Command Text View)</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">823</int> - <reference key="object" ref="965862131"/> - <reference key="parent" ref="179792134"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">822</int> - <reference key="object" ref="724741922"/> - <reference key="parent" ref="179792134"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">821</int> - <reference key="object" ref="414961522"/> - <reference key="parent" ref="179792134"/> + <reference key="parent" ref="602640146"/> </object> <object class="IBObjectRecord"> - <int key="objectID">938</int> - <reference key="object" ref="864339274"/> + <int key="objectID">1103</int> + <reference key="object" ref="364471408"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="553916693"/> + <reference ref="1021684639"/> + <reference ref="790140081"/> + <reference ref="703923380"/> + <reference ref="448210001"/> </object> - <reference key="parent" ref="338542681"/> + <reference key="parent" ref="856429814"/> </object> <object class="IBObjectRecord"> - <int key="objectID">939</int> - <reference key="object" ref="553916693"/> - <reference key="parent" ref="864339274"/> + <int key="objectID">1104</int> + <reference key="object" ref="1021684639"/> + <reference key="parent" ref="364471408"/> </object> <object class="IBObjectRecord"> - <int key="objectID">932</int> - <reference key="object" ref="904079305"/> + <int key="objectID">1105</int> + <reference key="object" ref="790140081"/> + <reference key="parent" ref="364471408"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1106</int> + <reference key="object" ref="703923380"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="886363818"/> + <reference ref="405769812"/> </object> - <reference key="parent" ref="338542681"/> - <string key="objectName">Pop Up Button (Input)</string> + <reference key="parent" ref="364471408"/> </object> <object class="IBObjectRecord"> - <int key="objectID">933</int> - <reference key="object" ref="886363818"/> + <int key="objectID">1108</int> + <reference key="object" ref="405769812"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="416241867"/> + <reference ref="37538636"/> </object> - <reference key="parent" ref="904079305"/> + <reference key="parent" ref="703923380"/> </object> <object class="IBObjectRecord"> - <int key="objectID">934</int> - <reference key="object" ref="416241867"/> - <reference key="parent" ref="886363818"/> + <int key="objectID">1111</int> + <reference key="object" ref="37538636"/> + <reference key="parent" ref="405769812"/> </object> <object class="IBObjectRecord"> - <int key="objectID">936</int> - <reference key="object" ref="669651343"/> + <int key="objectID">1112</int> + <reference key="object" ref="4858278"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="44795332"/> + <reference ref="521920114"/> </object> - <reference key="parent" ref="338542681"/> + <reference key="parent" ref="856429814"/> </object> <object class="IBObjectRecord"> - <int key="objectID">937</int> - <reference key="object" ref="44795332"/> - <reference key="parent" ref="669651343"/> + <int key="objectID">1113</int> + <reference key="object" ref="521920114"/> + <reference key="parent" ref="4858278"/> </object> <object class="IBObjectRecord"> - <int key="objectID">859</int> - <reference key="object" ref="552615839"/> + <int key="objectID">1114</int> + <reference key="object" ref="887016115"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1051503991"/> + <reference ref="517185919"/> </object> - <reference key="parent" ref="338542681"/> + <reference key="parent" ref="856429814"/> </object> <object class="IBObjectRecord"> - <int key="objectID">860</int> - <reference key="object" ref="1051503991"/> - <reference key="parent" ref="552615839"/> + <int key="objectID">1115</int> + <reference key="object" ref="517185919"/> + <reference key="parent" ref="887016115"/> </object> <object class="IBObjectRecord"> - <int key="objectID">690</int> - <reference key="object" ref="277233496"/> + <int key="objectID">1118</int> + <reference key="object" ref="448210001"/> + <reference key="parent" ref="364471408"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1132</int> + <reference key="object" ref="796555432"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1021110085"/> + <reference ref="841396186"/> </object> - <reference key="parent" ref="338542681"/> + <reference key="parent" ref="0"/> + <string key="objectName">Meta Info</string> </object> <object class="IBObjectRecord"> - <int key="objectID">703</int> - <reference key="object" ref="1021110085"/> - <reference key="parent" ref="277233496"/> + <int key="objectID">1133</int> + <reference key="object" ref="841396186"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="623620101"/> + <reference ref="916632433"/> + <reference ref="581164352"/> + <reference ref="448539706"/> + <reference ref="564934514"/> + <reference ref="895160325"/> + <reference ref="431948010"/> + </object> + <reference key="parent" ref="796555432"/> </object> <object class="IBObjectRecord"> - <int key="objectID">817</int> - <reference key="object" ref="679408795"/> + <int key="objectID">1134</int> + <reference key="object" ref="916632433"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="697434956"/> + <reference ref="951541811"/> </object> - <reference key="parent" ref="338542681"/> + <reference key="parent" ref="841396186"/> </object> <object class="IBObjectRecord"> - <int key="objectID">818</int> - <reference key="object" ref="697434956"/> - <reference key="parent" ref="679408795"/> + <int key="objectID">1135</int> + <reference key="object" ref="951541811"/> + <reference key="parent" ref="916632433"/> </object> <object class="IBObjectRecord"> - <int key="objectID">804</int> - <reference key="object" ref="62695080"/> + <int key="objectID">1136</int> + <reference key="object" ref="623620101"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="670400760"/> + <reference ref="464624197"/> </object> - <reference key="parent" ref="338542681"/> + <reference key="parent" ref="841396186"/> </object> <object class="IBObjectRecord"> - <int key="objectID">824</int> - <reference key="object" ref="670400760"/> - <reference key="parent" ref="62695080"/> + <int key="objectID">1137</int> + <reference key="object" ref="464624197"/> + <reference key="parent" ref="623620101"/> </object> <object class="IBObjectRecord"> - <int key="objectID">768</int> - <reference key="object" ref="117047836"/> + <int key="objectID">1138</int> + <reference key="object" ref="581164352"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="131002945"/> + <reference ref="72567029"/> </object> - <reference key="parent" ref="338542681"/> - <string key="objectName">Pop Up Button (Input)</string> + <reference key="parent" ref="841396186"/> </object> <object class="IBObjectRecord"> - <int key="objectID">769</int> - <reference key="object" ref="131002945"/> + <int key="objectID">1139</int> + <reference key="object" ref="448539706"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="378188111"/> + <reference ref="561460655"/> </object> - <reference key="parent" ref="117047836"/> + <reference key="parent" ref="841396186"/> </object> <object class="IBObjectRecord"> - <int key="objectID">770</int> - <reference key="object" ref="378188111"/> - <reference key="parent" ref="131002945"/> + <int key="objectID">1140</int> + <reference key="object" ref="561460655"/> + <reference key="parent" ref="448539706"/> </object> <object class="IBObjectRecord"> - <int key="objectID">800</int> - <reference key="object" ref="334638351"/> + <int key="objectID">1141</int> + <reference key="object" ref="72567029"/> + <reference key="parent" ref="581164352"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1142</int> + <reference key="object" ref="564934514"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="627233937"/> + <reference ref="910146059"/> </object> - <reference key="parent" ref="338542681"/> + <reference key="parent" ref="841396186"/> </object> <object class="IBObjectRecord"> - <int key="objectID">801</int> - <reference key="object" ref="627233937"/> - <reference key="parent" ref="334638351"/> + <int key="objectID">1143</int> + <reference key="object" ref="910146059"/> + <reference key="parent" ref="564934514"/> </object> <object class="IBObjectRecord"> - <int key="objectID">799</int> - <reference key="object" ref="70452502"/> + <int key="objectID">1144</int> + <reference key="object" ref="895160325"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="43525095"/> + <reference ref="308688517"/> + <reference ref="900588956"/> + <reference ref="817598796"/> </object> - <reference key="parent" ref="338542681"/> - <string key="objectName">Text Field (Tooltip)</string> + <reference key="parent" ref="841396186"/> </object> <object class="IBObjectRecord"> - <int key="objectID">802</int> - <reference key="object" ref="43525095"/> - <reference key="parent" ref="70452502"/> + <int key="objectID">1145</int> + <reference key="object" ref="308688517"/> + <reference key="parent" ref="895160325"/> </object> <object class="IBObjectRecord"> - <int key="objectID">692</int> - <reference key="object" ref="430446404"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="622343774"/> - </object> - <reference key="parent" ref="338542681"/> + <int key="objectID">1146</int> + <reference key="object" ref="900588956"/> + <reference key="parent" ref="895160325"/> </object> <object class="IBObjectRecord"> - <int key="objectID">701</int> - <reference key="object" ref="622343774"/> - <reference key="parent" ref="430446404"/> + <int key="objectID">1147</int> + <reference key="object" ref="817598796"/> + <reference key="parent" ref="895160325"/> </object> <object class="IBObjectRecord"> - <int key="objectID">691</int> - <reference key="object" ref="233794614"/> + <int key="objectID">1148</int> + <reference key="object" ref="431948010"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="748268806"/> + <reference ref="347466531"/> </object> - <reference key="parent" ref="338542681"/> - <string key="objectName">Text Field (Menu Category)</string> + <reference key="parent" ref="841396186"/> </object> <object class="IBObjectRecord"> - <int key="objectID">702</int> - <reference key="object" ref="748268806"/> - <reference key="parent" ref="233794614"/> + <int key="objectID">1149</int> + <reference key="object" ref="347466531"/> + <reference key="parent" ref="431948010"/> </object> <object class="IBObjectRecord"> - <int key="objectID">780</int> - <reference key="object" ref="1013555552"/> + <int key="objectID">686</int> + <reference key="object" ref="338542681"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="4363123"/> + <reference ref="552615839"/> + <reference ref="825494863"/> + <reference ref="941704409"/> + <reference ref="669651343"/> + <reference ref="904079305"/> + <reference ref="587735074"/> + <reference ref="209604501"/> + <reference ref="1032857532"/> + <reference ref="430446404"/> + <reference ref="233794614"/> + <reference ref="70452502"/> + <reference ref="334638351"/> + <reference ref="62695080"/> + <reference ref="413102423"/> + <reference ref="284549777"/> + <reference ref="931989616"/> + <reference ref="117047836"/> + <reference ref="411989314"/> + <reference ref="703222741"/> + <reference ref="1013555552"/> + <reference ref="710770414"/> + <reference ref="570587248"/> + <reference ref="994416682"/> + <reference ref="864339274"/> + <reference ref="679408795"/> + <reference ref="277233496"/> + <reference ref="221738058"/> </object> - <reference key="parent" ref="338542681"/> - <string key="objectName">Pop Up Button (Input Fallback)</string> + <reference key="parent" ref="358491109"/> + <string key="objectName">Bundle Content View</string> </object> <object class="IBObjectRecord"> - <int key="objectID">781</int> - <reference key="object" ref="4363123"/> + <int key="objectID">932</int> + <reference key="object" ref="904079305"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="730171686"/> + <reference ref="886363818"/> </object> - <reference key="parent" ref="1013555552"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">782</int> - <reference key="object" ref="730171686"/> - <reference key="parent" ref="4363123"/> + <reference key="parent" ref="338542681"/> + <string key="objectName">Pop Up Button (Input)</string> </object> <object class="IBObjectRecord"> - <int key="objectID">797</int> - <reference key="object" ref="931989616"/> + <int key="objectID">933</int> + <reference key="object" ref="886363818"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="370999655"/> + <reference ref="416241867"/> </object> - <reference key="parent" ref="338542681"/> + <reference key="parent" ref="904079305"/> </object> <object class="IBObjectRecord"> - <int key="objectID">798</int> - <reference key="object" ref="370999655"/> - <reference key="parent" ref="931989616"/> + <int key="objectID">934</int> + <reference key="object" ref="416241867"/> + <reference key="parent" ref="886363818"/> </object> <object class="IBObjectRecord"> - <int key="objectID">795</int> - <reference key="object" ref="411989314"/> + <int key="objectID">936</int> + <reference key="object" ref="669651343"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="679867674"/> + <reference ref="44795332"/> </object> <reference key="parent" ref="338542681"/> </object> <object class="IBObjectRecord"> - <int key="objectID">796</int> - <reference key="object" ref="679867674"/> - <reference key="parent" ref="411989314"/> + <int key="objectID">937</int> + <reference key="object" ref="44795332"/> + <reference key="parent" ref="669651343"/> </object> <object class="IBObjectRecord"> - <int key="objectID">695</int> - <reference key="object" ref="209604501"/> + <int key="objectID">1156</int> + <reference key="object" ref="825494863"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1025501303"/> + <reference ref="313211695"/> </object> <reference key="parent" ref="338542681"/> - <string key="objectName">Text Field (Menu Label)</string> </object> <object class="IBObjectRecord"> - <int key="objectID">696</int> - <reference key="object" ref="1025501303"/> - <reference key="parent" ref="209604501"/> + <int key="objectID">1157</int> + <reference key="object" ref="313211695"/> + <reference key="parent" ref="825494863"/> </object> <object class="IBObjectRecord"> - <int key="objectID">693</int> - <reference key="object" ref="1032857532"/> + <int key="objectID">1091</int> + <reference key="object" ref="710770414"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="434303900"/> + <reference ref="68459104"/> </object> <reference key="parent" ref="338542681"/> + <string key="objectName">Pop Up Button (Input Fallback)</string> </object> <object class="IBObjectRecord"> - <int key="objectID">700</int> - <reference key="object" ref="434303900"/> - <reference key="parent" ref="1032857532"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">788</int> - <reference key="object" ref="994416682"/> + <int key="objectID">1092</int> + <reference key="object" ref="68459104"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="849546250"/> + <reference ref="979150328"/> </object> - <reference key="parent" ref="338542681"/> + <reference key="parent" ref="710770414"/> </object> <object class="IBObjectRecord"> - <int key="objectID">789</int> - <reference key="object" ref="849546250"/> - <reference key="parent" ref="994416682"/> + <int key="objectID">1093</int> + <reference key="object" ref="979150328"/> + <reference key="parent" ref="68459104"/> </object> <object class="IBObjectRecord"> - <int key="objectID">774</int> - <reference key="object" ref="570587248"/> + <int key="objectID">780</int> + <reference key="object" ref="1013555552"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="299353121"/> + <reference ref="4363123"/> </object> <reference key="parent" ref="338542681"/> - <string key="objectName">Pop Up Button (Output)</string> + <string key="objectName">Pop Up Button (Input Fallback)</string> </object> <object class="IBObjectRecord"> - <int key="objectID">775</int> - <reference key="object" ref="299353121"/> + <int key="objectID">781</int> + <reference key="object" ref="4363123"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="47835238"/> + <reference ref="730171686"/> </object> - <reference key="parent" ref="570587248"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">776</int> - <reference key="object" ref="47835238"/> - <reference key="parent" ref="299353121"/> + <reference key="parent" ref="1013555552"/> </object> <object class="IBObjectRecord"> - <int key="objectID">994</int> - <reference key="object" ref="850254010"/> - <reference key="parent" ref="655873624"/> + <int key="objectID">782</int> + <reference key="object" ref="730171686"/> + <reference key="parent" ref="4363123"/> </object> <object class="IBObjectRecord"> - <int key="objectID">996</int> - <reference key="object" ref="587735074"/> + <int key="objectID">804</int> + <reference key="object" ref="62695080"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="702004127"/> + <reference ref="670400760"/> </object> <reference key="parent" ref="338542681"/> </object> <object class="IBObjectRecord"> - <int key="objectID">997</int> - <reference key="object" ref="702004127"/> - <reference key="parent" ref="587735074"/> + <int key="objectID">824</int> + <reference key="object" ref="670400760"/> + <reference key="parent" ref="62695080"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1040</int> - <reference key="object" ref="791474888"/> + <int key="objectID">1088</int> + <reference key="object" ref="703222741"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="315187981"/> + <reference ref="116371218"/> </object> <reference key="parent" ref="338542681"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1041</int> - <reference key="object" ref="315187981"/> - <reference key="parent" ref="791474888"/> + <int key="objectID">1089</int> + <reference key="object" ref="116371218"/> + <reference key="parent" ref="703222741"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1042</int> - <reference key="object" ref="145924516"/> + <int key="objectID">795</int> + <reference key="object" ref="411989314"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="552732389"/> + <reference ref="679867674"/> </object> <reference key="parent" ref="338542681"/> - <string key="objectName">Text Field (Author)</string> </object> <object class="IBObjectRecord"> - <int key="objectID">1043</int> - <reference key="object" ref="552732389"/> - <reference key="parent" ref="145924516"/> + <int key="objectID">796</int> + <reference key="object" ref="679867674"/> + <reference key="parent" ref="411989314"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1044</int> - <reference key="object" ref="978939688"/> + <int key="objectID">797</int> + <reference key="object" ref="931989616"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="59154256"/> + <reference ref="370999655"/> </object> <reference key="parent" ref="338542681"/> - <string key="objectName">Text Field (Contact)</string> </object> <object class="IBObjectRecord"> - <int key="objectID">1045</int> - <reference key="object" ref="59154256"/> - <reference key="parent" ref="978939688"/> + <int key="objectID">798</int> + <reference key="object" ref="370999655"/> + <reference key="parent" ref="931989616"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1046</int> - <reference key="object" ref="737548631"/> + <int key="objectID">768</int> + <reference key="object" ref="117047836"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="245045448"/> - <reference ref="262238498"/> - <reference ref="367533279"/> + <reference ref="131002945"/> </object> <reference key="parent" ref="338542681"/> + <string key="objectName">Pop Up Button (Input)</string> </object> <object class="IBObjectRecord"> - <int key="objectID">1047</int> - <reference key="object" ref="245045448"/> - <reference key="parent" ref="737548631"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1048</int> - <reference key="object" ref="262238498"/> - <reference key="parent" ref="737548631"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1049</int> - <reference key="object" ref="367533279"/> - <reference key="parent" ref="737548631"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1050</int> - <reference key="object" ref="303422413"/> + <int key="objectID">769</int> + <reference key="object" ref="131002945"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="201087110"/> + <reference ref="378188111"/> </object> - <reference key="parent" ref="338542681"/> + <reference key="parent" ref="117047836"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1051</int> - <reference key="object" ref="201087110"/> - <reference key="parent" ref="303422413"/> + <int key="objectID">770</int> + <reference key="object" ref="378188111"/> + <reference key="parent" ref="131002945"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1052</int> - <reference key="object" ref="877783258"/> + <int key="objectID">695</int> + <reference key="object" ref="209604501"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="312288989"/> + <reference ref="1025501303"/> </object> <reference key="parent" ref="338542681"/> + <string key="objectName">Text Field (Menu Label)</string> </object> <object class="IBObjectRecord"> - <int key="objectID">1053</int> - <reference key="object" ref="312288989"/> - <reference key="parent" ref="877783258"/> + <int key="objectID">696</int> + <reference key="object" ref="1025501303"/> + <reference key="parent" ref="209604501"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1054</int> - <reference key="object" ref="907530964"/> + <int key="objectID">690</int> + <reference key="object" ref="277233496"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="494412820"/> + <reference ref="1021110085"/> </object> <reference key="parent" ref="338542681"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1055</int> - <reference key="object" ref="494412820"/> - <reference key="parent" ref="907530964"/> + <int key="objectID">703</int> + <reference key="object" ref="1021110085"/> + <reference key="parent" ref="277233496"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1073</int> - <reference key="object" ref="728794970"/> + <int key="objectID">1083</int> + <reference key="object" ref="413102423"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="38136759"/> + <reference ref="75217064"/> </object> <reference key="parent" ref="338542681"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1074</int> - <reference key="object" ref="38136759"/> - <reference key="parent" ref="728794970"/> + <int key="objectID">1084</int> + <reference key="object" ref="75217064"/> + <reference key="parent" ref="413102423"/> </object> <object class="IBObjectRecord"> <int key="objectID">1077</int> @@ -3369,166 +3591,213 @@ <object class="IBObjectRecord"> <int key="objectID">1079</int> <reference key="object" ref="132896527"/> + <reference key="parent" ref="1019011390"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">774</int> + <reference key="object" ref="570587248"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="299353121"/> </object> - <reference key="parent" ref="1019011390"/> + <reference key="parent" ref="338542681"/> + <string key="objectName">Pop Up Button (Output)</string> </object> <object class="IBObjectRecord"> - <int key="objectID">1083</int> - <reference key="object" ref="413102423"/> + <int key="objectID">775</int> + <reference key="object" ref="299353121"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="75217064"/> + <reference ref="47835238"/> </object> - <reference key="parent" ref="338542681"/> + <reference key="parent" ref="570587248"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1084</int> - <reference key="object" ref="75217064"/> - <reference key="parent" ref="413102423"/> + <int key="objectID">776</int> + <reference key="object" ref="47835238"/> + <reference key="parent" ref="299353121"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1088</int> - <reference key="object" ref="703222741"/> + <int key="objectID">800</int> + <reference key="object" ref="334638351"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="116371218"/> + <reference ref="627233937"/> </object> <reference key="parent" ref="338542681"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1089</int> - <reference key="object" ref="116371218"/> - <reference key="parent" ref="703222741"/> + <int key="objectID">801</int> + <reference key="object" ref="627233937"/> + <reference key="parent" ref="334638351"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1091</int> - <reference key="object" ref="710770414"/> + <int key="objectID">799</int> + <reference key="object" ref="70452502"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="68459104"/> + <reference ref="43525095"/> </object> <reference key="parent" ref="338542681"/> - <string key="objectName">Pop Up Button (Input Fallback)</string> + <string key="objectName">Text Field (Tooltip)</string> </object> <object class="IBObjectRecord"> - <int key="objectID">1092</int> - <reference key="object" ref="68459104"/> + <int key="objectID">802</int> + <reference key="object" ref="43525095"/> + <reference key="parent" ref="70452502"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">691</int> + <reference key="object" ref="233794614"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="979150328"/> + <reference ref="748268806"/> </object> - <reference key="parent" ref="710770414"/> + <reference key="parent" ref="338542681"/> + <string key="objectName">Text Field (Menu Category)</string> </object> <object class="IBObjectRecord"> - <int key="objectID">1093</int> - <reference key="object" ref="979150328"/> - <reference key="parent" ref="68459104"/> + <int key="objectID">702</int> + <reference key="object" ref="748268806"/> + <reference key="parent" ref="233794614"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1099</int> - <reference key="object" ref="637895342"/> - <reference key="parent" ref="973574710"/> + <int key="objectID">817</int> + <reference key="object" ref="679408795"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="697434956"/> + </object> + <reference key="parent" ref="338542681"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1101</int> - <reference key="object" ref="602640146"/> + <int key="objectID">818</int> + <reference key="object" ref="697434956"/> + <reference key="parent" ref="679408795"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">859</int> + <reference key="object" ref="552615839"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="856429814"/> + <reference ref="1051503991"/> </object> - <reference key="parent" ref="0"/> - <string key="objectName">Undelete Default Bundles Sheet</string> + <reference key="parent" ref="338542681"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1102</int> - <reference key="object" ref="856429814"/> + <int key="objectID">860</int> + <reference key="object" ref="1051503991"/> + <reference key="parent" ref="552615839"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">996</int> + <reference key="object" ref="587735074"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="364471408"/> - <reference ref="4858278"/> - <reference ref="887016115"/> + <reference ref="702004127"/> </object> - <reference key="parent" ref="602640146"/> + <reference key="parent" ref="338542681"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1103</int> - <reference key="object" ref="364471408"/> + <int key="objectID">997</int> + <reference key="object" ref="702004127"/> + <reference key="parent" ref="587735074"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">788</int> + <reference key="object" ref="994416682"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1021684639"/> - <reference ref="790140081"/> - <reference ref="703923380"/> - <reference ref="448210001"/> + <reference ref="849546250"/> </object> - <reference key="parent" ref="856429814"/> + <reference key="parent" ref="338542681"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1104</int> - <reference key="object" ref="1021684639"/> - <reference key="parent" ref="364471408"/> + <int key="objectID">789</int> + <reference key="object" ref="849546250"/> + <reference key="parent" ref="994416682"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1105</int> - <reference key="object" ref="790140081"/> - <reference key="parent" ref="364471408"/> + <int key="objectID">693</int> + <reference key="object" ref="1032857532"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="434303900"/> + </object> + <reference key="parent" ref="338542681"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1106</int> - <reference key="object" ref="703923380"/> + <int key="objectID">700</int> + <reference key="object" ref="434303900"/> + <reference key="parent" ref="1032857532"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">692</int> + <reference key="object" ref="430446404"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="405769812"/> + <reference ref="622343774"/> </object> - <reference key="parent" ref="364471408"/> + <reference key="parent" ref="338542681"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1108</int> - <reference key="object" ref="405769812"/> + <int key="objectID">701</int> + <reference key="object" ref="622343774"/> + <reference key="parent" ref="430446404"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">938</int> + <reference key="object" ref="864339274"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="37538636"/> + <reference ref="553916693"/> </object> - <reference key="parent" ref="703923380"/> + <reference key="parent" ref="338542681"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1111</int> - <reference key="object" ref="37538636"/> - <reference key="parent" ref="405769812"/> + <int key="objectID">939</int> + <reference key="object" ref="553916693"/> + <reference key="parent" ref="864339274"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1112</int> - <reference key="object" ref="4858278"/> + <int key="objectID">1171</int> + <reference key="object" ref="941704409"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="521920114"/> + <reference ref="834019448"/> </object> - <reference key="parent" ref="856429814"/> + <reference key="parent" ref="338542681"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1113</int> - <reference key="object" ref="521920114"/> - <reference key="parent" ref="4858278"/> + <int key="objectID">1172</int> + <reference key="object" ref="834019448"/> + <reference key="parent" ref="941704409"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1114</int> - <reference key="object" ref="887016115"/> + <int key="objectID">1214</int> + <reference key="object" ref="221738058"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="517185919"/> + <reference ref="881611086"/> + <reference ref="877826884"/> + <reference ref="256802597"/> </object> - <reference key="parent" ref="856429814"/> + <reference key="parent" ref="338542681"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1115</int> - <reference key="object" ref="517185919"/> - <reference key="parent" ref="887016115"/> + <int key="objectID">1215</int> + <reference key="object" ref="881611086"/> + <reference key="parent" ref="221738058"/> </object> <object class="IBObjectRecord"> - <int key="objectID">1118</int> - <reference key="object" ref="448210001"/> - <reference key="parent" ref="364471408"/> + <int key="objectID">1216</int> + <reference key="object" ref="877826884"/> + <reference key="parent" ref="221738058"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1217</int> + <reference key="object" ref="256802597"/> + <reference key="parent" ref="221738058"/> </object> </object> </object> @@ -3537,38 +3806,22 @@ <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>-3.IBPluginDependency</string> - <string>1040.IBAttributePlaceholdersKey</string> - <string>1040.IBPluginDependency</string> - <string>1041.IBPluginDependency</string> - <string>1042.IBPluginDependency</string> - <string>1043.IBPluginDependency</string> - <string>1044.IBPluginDependency</string> - <string>1045.IBPluginDependency</string> - <string>1046.IBPluginDependency</string> - <string>1047.IBPluginDependency</string> - <string>1048.IBPluginDependency</string> - <string>1049.IBPluginDependency</string> - <string>1050.IBPluginDependency</string> - <string>1051.IBPluginDependency</string> - <string>1052.IBPluginDependency</string> - <string>1053.IBPluginDependency</string> - <string>1054.IBPluginDependency</string> - <string>1055.IBPluginDependency</string> - <string>1073.IBAttributePlaceholdersKey</string> - <string>1073.IBPluginDependency</string> - <string>1074.IBPluginDependency</string> <string>1077.IBPluginDependency</string> + <string>1077.IBViewBoundsToFrameTransform</string> <string>1078.IBPluginDependency</string> <string>1079.IBEditorWindowLastContentRect</string> <string>1079.IBPluginDependency</string> <string>1083.IBAttributePlaceholdersKey</string> <string>1083.IBPluginDependency</string> + <string>1083.IBViewBoundsToFrameTransform</string> <string>1084.IBPluginDependency</string> <string>1088.IBAttributePlaceholdersKey</string> <string>1088.IBPluginDependency</string> + <string>1088.IBViewBoundsToFrameTransform</string> <string>1089.IBPluginDependency</string> <string>1091.IBAttributePlaceholdersKey</string> <string>1091.IBPluginDependency</string> + <string>1091.IBViewBoundsToFrameTransform</string> <string>1092.IBPluginDependency</string> <string>1093.IBEditorWindowLastContentRect</string> <string>1093.IBPluginDependency</string> @@ -3591,6 +3844,47 @@ <string>1113.IBPluginDependency</string> <string>1114.IBPluginDependency</string> <string>1115.IBPluginDependency</string> + <string>1132.IBEditorWindowLastContentRect</string> + <string>1132.IBPluginDependency</string> + <string>1132.IBWindowTemplateEditedContentRect</string> + <string>1132.NSWindowTemplate.visibleAtLaunch</string> + <string>1132.windowTemplate.hasMinSize</string> + <string>1132.windowTemplate.minSize</string> + <string>1133.IBPluginDependency</string> + <string>1134.IBPluginDependency</string> + <string>1134.IBViewBoundsToFrameTransform</string> + <string>1135.IBPluginDependency</string> + <string>1136.IBPluginDependency</string> + <string>1136.IBViewBoundsToFrameTransform</string> + <string>1137.IBPluginDependency</string> + <string>1138.IBPluginDependency</string> + <string>1138.IBViewBoundsToFrameTransform</string> + <string>1139.IBPluginDependency</string> + <string>1139.IBViewBoundsToFrameTransform</string> + <string>1140.IBPluginDependency</string> + <string>1141.IBPluginDependency</string> + <string>1142.IBPluginDependency</string> + <string>1142.IBViewBoundsToFrameTransform</string> + <string>1143.IBPluginDependency</string> + <string>1144.IBPluginDependency</string> + <string>1145.IBPluginDependency</string> + <string>1146.IBPluginDependency</string> + <string>1147.IBPluginDependency</string> + <string>1148.IBPluginDependency</string> + <string>1148.IBViewBoundsToFrameTransform</string> + <string>1149.IBPluginDependency</string> + <string>1156.IBPluginDependency</string> + <string>1156.IBViewBoundsToFrameTransform</string> + <string>1157.IBPluginDependency</string> + <string>1171.IBPluginDependency</string> + <string>1171.IBViewBoundsToFrameTransform</string> + <string>1172.IBPluginDependency</string> + <string>1214.IBPluginDependency</string> + <string>1214.IBViewBoundsToFrameTransform</string> + <string>1215.IBPluginDependency</string> + <string>1216.IBPluginDependency</string> + <string>1217.CustomClassName</string> + <string>1217.IBPluginDependency</string> <string>521.IBEditorWindowLastContentRect</string> <string>521.IBPluginDependency</string> <string>521.IBWindowTemplateEditedContentRect</string> @@ -3599,16 +3893,23 @@ <string>521.windowTemplate.minSize</string> <string>522.IBPluginDependency</string> <string>683.IBPluginDependency</string> + <string>683.IBViewBoundsToFrameTransform</string> <string>685.IBPluginDependency</string> <string>686.IBPluginDependency</string> + <string>686.IBViewBoundsToFrameTransform</string> <string>690.IBPluginDependency</string> + <string>690.IBViewBoundsToFrameTransform</string> <string>691.IBAttributePlaceholdersKey</string> <string>691.IBPluginDependency</string> + <string>691.IBViewBoundsToFrameTransform</string> <string>692.IBAttributePlaceholdersKey</string> <string>692.IBPluginDependency</string> + <string>692.IBViewBoundsToFrameTransform</string> <string>693.IBPluginDependency</string> + <string>693.IBViewBoundsToFrameTransform</string> <string>695.IBAttributePlaceholdersKey</string> <string>695.IBPluginDependency</string> + <string>695.IBViewBoundsToFrameTransform</string> <string>696.IBPluginDependency</string> <string>700.IBPluginDependency</string> <string>701.IBPluginDependency</string> @@ -3630,42 +3931,47 @@ <string>741.IBPluginDependency</string> <string>768.IBAttributePlaceholdersKey</string> <string>768.IBPluginDependency</string> + <string>768.IBViewBoundsToFrameTransform</string> <string>769.IBPluginDependency</string> <string>770.IBEditorWindowLastContentRect</string> <string>770.IBPluginDependency</string> <string>774.IBAttributePlaceholdersKey</string> <string>774.IBPluginDependency</string> + <string>774.IBViewBoundsToFrameTransform</string> <string>775.IBPluginDependency</string> <string>776.IBEditorWindowLastContentRect</string> <string>776.IBPluginDependency</string> <string>780.IBAttributePlaceholdersKey</string> <string>780.IBPluginDependency</string> + <string>780.IBViewBoundsToFrameTransform</string> <string>781.IBPluginDependency</string> <string>782.IBEditorWindowLastContentRect</string> <string>782.IBPluginDependency</string> <string>788.IBAttributePlaceholdersKey</string> <string>788.IBPluginDependency</string> + <string>788.IBViewBoundsToFrameTransform</string> <string>789.IBPluginDependency</string> <string>795.IBAttributePlaceholdersKey</string> <string>795.IBPluginDependency</string> + <string>795.IBViewBoundsToFrameTransform</string> <string>796.IBPluginDependency</string> <string>797.IBPluginDependency</string> + <string>797.IBViewBoundsToFrameTransform</string> <string>798.IBPluginDependency</string> <string>799.IBAttributePlaceholdersKey</string> <string>799.IBPluginDependency</string> + <string>799.IBViewBoundsToFrameTransform</string> <string>800.IBPluginDependency</string> + <string>800.IBViewBoundsToFrameTransform</string> <string>801.IBPluginDependency</string> <string>802.IBPluginDependency</string> <string>804.IBAttributePlaceholdersKey</string> <string>804.IBPluginDependency</string> + <string>804.IBViewBoundsToFrameTransform</string> <string>817.IBAttributePlaceholdersKey</string> <string>817.IBPluginDependency</string> + <string>817.IBViewBoundsToFrameTransform</string> <string>818.IBPluginDependency</string> - <string>820.IBPluginDependency</string> - <string>821.IBPluginDependency</string> - <string>822.IBPluginDependency</string> - <string>823.CustomClassName</string> - <string>823.IBPluginDependency</string> <string>859.IBAttributePlaceholdersKey</string> <string>859.IBPluginDependency</string> <string>860.IBPluginDependency</string> @@ -3680,12 +3986,15 @@ <string>920.IBPluginDependency</string> <string>932.IBAttributePlaceholdersKey</string> <string>932.IBPluginDependency</string> + <string>932.IBViewBoundsToFrameTransform</string> <string>933.IBPluginDependency</string> <string>934.IBEditorWindowLastContentRect</string> <string>934.IBPluginDependency</string> <string>936.IBPluginDependency</string> + <string>936.IBViewBoundsToFrameTransform</string> <string>937.IBPluginDependency</string> <string>938.IBPluginDependency</string> + <string>938.IBViewBoundsToFrameTransform</string> <string>939.IBPluginDependency</string> <string>957.IBPluginDependency</string> <string>958.IBPluginDependency</string> @@ -3699,47 +4008,17 @@ <string>982.IBPluginDependency</string> <string>994.IBPluginDependency</string> <string>996.IBPluginDependency</string> + <string>996.IBViewBoundsToFrameTransform</string> <string>997.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <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="791474888"/> - <string key="toolTip">Show / Hide Meta Data input fields Author, Contact, and Description</string> - </object> - </object> - <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>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> - <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="728794970"/> - <string key="toolTip">Alphanumeric character string which inserts the favorite query string after expansion by pressing the ⇥ key.</string> - </object> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABCmgAAwt4AAA</bytes> </object> <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>{{321, 332}, {167, 4}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> @@ -3751,6 +4030,9 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABBiAAAwtoAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -3760,6 +4042,9 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABD7AAAwwwAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> @@ -3770,13 +4055,16 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDl4AAwu4AAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{430, 598}, {167, 4}}</string> + <string>{{652, 644}, {159, 6}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{175, 541}, {341, 198}}</string> + <string>{{446, 443}, {341, 198}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{175, 541}, {341, 198}}</string> + <string>{{446, 443}, {341, 198}}</string> <boolean value="NO"/> <boolean value="YES"/> <string>{341, 198}</string> @@ -3799,17 +4087,85 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{130, 108}, {691, 444}}</string> + <string>{{607, 482}, {297, 244}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{130, 108}, {691, 444}}</string> + <string>{{607, 482}, {297, 244}}</string> <boolean value="NO"/> <boolean value="YES"/> - <string>{691, 444}</string> + <string>{297, 244}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABBiAAAwwsAAA</bytes> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABChgAAww4AAA</bytes> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABBsAAAwwYAAA</bytes> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABCkAAAwwkAAA</bytes> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABCkgAAwxEAAA</bytes> + </object> + <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> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDOgAAwmAAAA</bytes> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABD7IAAw+MAAA</bytes> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDIAAAw9+AAA</bytes> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABD2QAAw84AAA</bytes> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>SPBundleCommandTextView</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{109, 206}, {900, 550}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{109, 206}, {900, 550}}</string> + <boolean value="NO"/> + <boolean value="YES"/> + <string>{730, 494}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.brandonwalkin.BWToolkit</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAxBEAAA</bytes> + </object> <string>com.brandonwalkin.BWToolkit</string> <string>com.brandonwalkin.BWToolkit</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">AUMPAAAAAAAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDggAAwhgAAA</bytes> + </object> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> <object class="IBToolTipAttribute" key="NS.object.0"> @@ -3819,6 +4175,9 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDzgAAw8uAAA</bytes> + </object> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> <object class="IBToolTipAttribute" key="NS.object.0"> @@ -3828,7 +4187,13 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDmgAAw8oAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABBqAAAw8iAAA</bytes> + </object> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> <object class="IBToolTipAttribute" key="NS.object.0"> @@ -3838,6 +4203,9 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDAQAAw8oAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3874,7 +4242,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.brandonwalkin.BWToolkit</string> - <string>{{199, 139}, {243, 115}}</string> + <string>{{212, 94}, {243, 115}}</string> <string>com.brandonwalkin.BWToolkit</string> <string>com.brandonwalkin.BWToolkit</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3887,6 +4255,9 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDl4AAwxAAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{211, 598}, {167, 4}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3899,6 +4270,9 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABCmgAAwwoAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{211, 312}, {167, 4}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3911,6 +4285,9 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDl4AAwu4AAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{430, 598}, {167, 4}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3922,6 +4299,9 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABCigAAw6UAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -3931,8 +4311,14 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABD7AAAwwwAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDXgAAww4AAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> @@ -3943,7 +4329,13 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDAwAAw72AAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDawAAw8YAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> @@ -3955,6 +4347,9 @@ </object> </object> <string>net.wafflesoftware.ShortcutRecorder.IB.Leopard</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">AUPAgABDpgAAA</bytes> + </object> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> <object class="IBToolTipAttribute" key="NS.object.0"> @@ -3964,11 +4359,9 @@ </object> </object> <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>SPBundleCommandTextView</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDvgAAwiQAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> @@ -3981,7 +4374,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{127, 543}, {261, 93}}</string> + <string>{{721, 663}, {261, 93}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -4005,12 +4398,21 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABC3gAAw9GAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{211, 598}, {167, 4}}</string> + <string>{{675, 675}, {111, 6}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABAwAAAw9EAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABBiAAAw5oAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -4024,6 +4426,9 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABBqAAAw+0AAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> </object> @@ -4043,7 +4448,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">1130</int> + <int key="maxID">1244</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -4095,6 +4500,13 @@ <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> + <string key="minorKey">Frameworks/PSMTabBar/PSMTabBarController.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/SPConnectionController.h</string> </object> </object> @@ -4322,11 +4734,12 @@ <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>addCommandBundle:</string> + <string>closeSheet:</string> <string>closeUndeleteDefaultBundlesSheet:</string> + <string>displayBundleMetaInfo:</string> <string>duplicateCommandBundle:</string> <string>inputFallbackPopupButtonChanged:</string> <string>inputPopupButtonChanged:</string> - <string>metaButtonChanged:</string> <string>outputPopupButtonChanged:</string> <string>performClose:</string> <string>reloadBundles:</string> @@ -4360,6 +4773,7 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="actionInfosByName"> @@ -4367,11 +4781,12 @@ <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>addCommandBundle:</string> + <string>closeSheet:</string> <string>closeUndeleteDefaultBundlesSheet:</string> + <string>displayBundleMetaInfo:</string> <string>duplicateCommandBundle:</string> <string>inputFallbackPopupButtonChanged:</string> <string>inputPopupButtonChanged:</string> - <string>metaButtonChanged:</string> <string>outputPopupButtonChanged:</string> <string>performClose:</string> <string>reloadBundles:</string> @@ -4392,23 +4807,27 @@ <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> + <string key="name">closeSheet:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> <string key="name">closeUndeleteDefaultBundlesSheet:</string> <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> - <string key="name">duplicateCommandBundle:</string> + <string key="name">displayBundleMetaInfo:</string> <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> - <string key="name">inputFallbackPopupButtonChanged:</string> + <string key="name">duplicateCommandBundle:</string> <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> - <string key="name">inputPopupButtonChanged:</string> + <string key="name">inputFallbackPopupButtonChanged:</string> <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> - <string key="name">metaButtonChanged:</string> + <string key="name">inputPopupButtonChanged:</string> <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> @@ -4466,7 +4885,6 @@ <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>addButton</string> - <string>authorLabelField</string> <string>authorTextField</string> <string>cancelButton</string> <string>categoryTextField</string> @@ -4475,25 +4893,24 @@ <string>commandScrollView</string> <string>commandTextView</string> <string>commandsOutlineView</string> - <string>contactLabelField</string> <string>contactTextField</string> - <string>descriptionLabelField</string> - <string>descriptionScrollView</string> <string>descriptionTextView</string> <string>disabledCheckbox</string> + <string>displayMetaInfoButton</string> <string>duplicateMenuItem</string> <string>fallbackLabelField</string> <string>helpButton</string> <string>inputFallbackPopupButton</string> <string>inputPopupButton</string> <string>keyEquivalentField</string> + <string>metaInfoSheet</string> + <string>metaInfoSummary</string> <string>nameTextField</string> <string>outputPopupButton</string> <string>removeButton</string> <string>revealInFinderMenuItem</string> <string>saveButton</string> <string>scopePopupButton</string> - <string>showHideMetaButton</string> <string>splitView</string> <string>tooltipTextField</string> <string>triggerPopupButton</string> @@ -4506,7 +4923,6 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>NSButton</string> <string>NSTextField</string> - <string>NSTextField</string> <string>NSButton</string> <string>NSTextField</string> <string>NSTreeController</string> @@ -4515,28 +4931,27 @@ <string>SPBundleCommandTextView</string> <string>SPOutlineView</string> <string>NSTextField</string> - <string>NSTextField</string> - <string>NSTextField</string> - <string>NSScrollView</string> <string>NSTextView</string> <string>NSButton</string> + <string>NSButton</string> <string>NSMenuItem</string> <string>NSTextField</string> <string>NSButton</string> <string>NSPopUpButton</string> <string>NSPopUpButton</string> <string>SRRecorderControl</string> + <string>NSWindow</string> + <string>NSTextField</string> <string>NSTextField</string> <string>NSPopUpButton</string> <string>NSButton</string> <string>NSMenuItem</string> <string>NSButton</string> <string>NSPopUpButton</string> - <string>NSButton</string> <string>BWSplitView</string> <string>NSTextField</string> <string>NSPopUpButton</string> - <string>id</string> + <string>NSWindow</string> <string>NSTableView</string> <string>NSTextField</string> <string>NSPopUpButton</string> @@ -4547,7 +4962,6 @@ <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>addButton</string> - <string>authorLabelField</string> <string>authorTextField</string> <string>cancelButton</string> <string>categoryTextField</string> @@ -4556,25 +4970,24 @@ <string>commandScrollView</string> <string>commandTextView</string> <string>commandsOutlineView</string> - <string>contactLabelField</string> <string>contactTextField</string> - <string>descriptionLabelField</string> - <string>descriptionScrollView</string> <string>descriptionTextView</string> <string>disabledCheckbox</string> + <string>displayMetaInfoButton</string> <string>duplicateMenuItem</string> <string>fallbackLabelField</string> <string>helpButton</string> <string>inputFallbackPopupButton</string> <string>inputPopupButton</string> <string>keyEquivalentField</string> + <string>metaInfoSheet</string> + <string>metaInfoSummary</string> <string>nameTextField</string> <string>outputPopupButton</string> <string>removeButton</string> <string>revealInFinderMenuItem</string> <string>saveButton</string> <string>scopePopupButton</string> - <string>showHideMetaButton</string> <string>splitView</string> <string>tooltipTextField</string> <string>triggerPopupButton</string> @@ -4590,10 +5003,6 @@ <string key="candidateClassName">NSButton</string> </object> <object class="IBToOneOutletInfo"> - <string key="name">authorLabelField</string> - <string key="candidateClassName">NSTextField</string> - </object> - <object class="IBToOneOutletInfo"> <string key="name">authorTextField</string> <string key="candidateClassName">NSTextField</string> </object> @@ -4626,22 +5035,10 @@ <string key="candidateClassName">SPOutlineView</string> </object> <object class="IBToOneOutletInfo"> - <string key="name">contactLabelField</string> - <string key="candidateClassName">NSTextField</string> - </object> - <object class="IBToOneOutletInfo"> <string key="name">contactTextField</string> <string key="candidateClassName">NSTextField</string> </object> <object class="IBToOneOutletInfo"> - <string key="name">descriptionLabelField</string> - <string key="candidateClassName">NSTextField</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">descriptionScrollView</string> - <string key="candidateClassName">NSScrollView</string> - </object> - <object class="IBToOneOutletInfo"> <string key="name">descriptionTextView</string> <string key="candidateClassName">NSTextView</string> </object> @@ -4650,6 +5047,10 @@ <string key="candidateClassName">NSButton</string> </object> <object class="IBToOneOutletInfo"> + <string key="name">displayMetaInfoButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> <string key="name">duplicateMenuItem</string> <string key="candidateClassName">NSMenuItem</string> </object> @@ -4674,6 +5075,14 @@ <string key="candidateClassName">SRRecorderControl</string> </object> <object class="IBToOneOutletInfo"> + <string key="name">metaInfoSheet</string> + <string key="candidateClassName">NSWindow</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">metaInfoSummary</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> <string key="name">nameTextField</string> <string key="candidateClassName">NSTextField</string> </object> @@ -4698,10 +5107,6 @@ <string key="candidateClassName">NSPopUpButton</string> </object> <object class="IBToOneOutletInfo"> - <string key="name">showHideMetaButton</string> - <string key="candidateClassName">NSButton</string> - </object> - <object class="IBToOneOutletInfo"> <string key="name">splitView</string> <string key="candidateClassName">BWSplitView</string> </object> @@ -4715,7 +5120,7 @@ </object> <object class="IBToOneOutletInfo"> <string key="name">undeleteSheet</string> - <string key="candidateClassName">id</string> + <string key="candidateClassName">NSWindow</string> </object> <object class="IBToOneOutletInfo"> <string key="name">undeleteTableView</string> @@ -4744,15 +5149,12 @@ <string key="minorKey">Source/SPOutlineView.h</string> </object> </object> - </object> - <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+"> - <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBPartialClassDescription"> <string key="className">SPWindow</string> <string key="superclassName">NSWindow</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBDocumentRelativeSource</string> - <string key="minorKey">../../Source/SPWindow.h</string> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">Source/SPWindow.h</string> </object> </object> </object> diff --git a/Interfaces/English.lproj/ConnectionView.xib b/Interfaces/English.lproj/ConnectionView.xib index ae3050ac..ea5eaa54 100644 --- a/Interfaces/English.lproj/ConnectionView.xib +++ b/Interfaces/English.lproj/ConnectionView.xib @@ -21,7 +21,8 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="5743"/> + <integer value="5788"/> + <integer value="4888"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -109,7 +110,7 @@ </object> </object> <object class="NSTextFieldCell" key="NSDataCell" id="93569184"> - <int key="NSCellFlags">69336641</int> + <int key="NSCellFlags">337772097</int> <int key="NSCellFlags2">137216</int> <string key="NSContents">Text Cell</string> <reference key="NSSupport" ref="26"/> @@ -183,7 +184,7 @@ <reference key="NSSuperview" ref="524598165"/> <reference key="NSTarget" ref="524598165"/> <string key="NSAction">_doScroller:</string> - <double key="NSPercent">0.99812382459640503</double> + <double key="NSPercent">0.99778270721435547</double> </object> <object class="NSScroller" id="802793151"> <reference key="NSNextResponder" ref="524598165"/> @@ -193,7 +194,7 @@ <int key="NSsFlags">1</int> <reference key="NSTarget" ref="524598165"/> <string key="NSAction">_doScroller:</string> - <double key="NSPercent">0.99590158462524414</double> + <double key="NSPercent">0.99507391452789307</double> </object> </object> <string key="NSFrame">{{0, 24}, {202, 450}}</string> @@ -3421,14 +3422,6 @@ <int key="connectionID">5439</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">addFavorite:</string> - <reference key="source" ref="545410097"/> - <reference key="destination" ref="476973680"/> - </object> - <int key="connectionID">5443</int> - </object> - <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">connectButton</string> <reference key="source" ref="545410097"/> @@ -4749,14 +4742,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">renameFavorite:</string> - <reference key="source" ref="545410097"/> - <reference key="destination" ref="280923461"/> - </object> - <int key="connectionID">5801</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> <string key="label">removeNode:</string> <reference key="source" ref="545410097"/> <reference key="destination" ref="131625888"/> @@ -4867,6 +4852,22 @@ </object> <int key="connectionID">5818</int> </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">renameNode:</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="280923461"/> + </object> + <int key="connectionID">5819</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">addFavoriteUsingCurrentDetails:</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="476973680"/> + </object> + <int key="connectionID">5821</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -7497,7 +7498,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">5818</int> + <int key="maxID">5821</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -7775,7 +7776,7 @@ <string>makeSelectedFavoriteDefault:</string> <string>nodeDoubleClicked:</string> <string>removeNode:</string> - <string>renameFavorite:</string> + <string>renameNode:</string> <string>reverseSortFavorites:</string> <string>showHelp:</string> <string>sortFavorites:</string> @@ -7822,7 +7823,7 @@ <string>makeSelectedFavoriteDefault:</string> <string>nodeDoubleClicked:</string> <string>removeNode:</string> - <string>renameFavorite:</string> + <string>renameNode:</string> <string>reverseSortFavorites:</string> <string>showHelp:</string> <string>sortFavorites:</string> @@ -7881,7 +7882,7 @@ <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> - <string key="name">renameFavorite:</string> + <string key="name">renameNode:</string> <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> diff --git a/Interfaces/English.lproj/FieldEditorSheet.xib b/Interfaces/English.lproj/FieldEditorSheet.xib index 2b1c98a0..cd2e4b51 100644 --- a/Interfaces/English.lproj/FieldEditorSheet.xib +++ b/Interfaces/English.lproj/FieldEditorSheet.xib @@ -2,18 +2,18 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10J567</string> - <string key="IBDocument.InterfaceBuilderVersion">823</string> + <string key="IBDocument.SystemVersion">10J869</string> + <string key="IBDocument.InterfaceBuilderVersion">851</string> <string key="IBDocument.AppKitVersion">1038.35</string> - <string key="IBDocument.HIToolboxVersion">462.00</string> + <string key="IBDocument.HIToolboxVersion">461.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">823</string> + <string key="NS.object.0">851</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="80"/> <integer value="1"/> - <integer value="81"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -44,7 +44,7 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> <object class="NSView" key="NSWindowView" id="559857537"> <reference key="NSNextResponder"/> <int key="NSvFlags">4370</int> @@ -141,7 +141,7 @@ <object class="NSButton" id="760872156"> <reference key="NSNextResponder" ref="559857537"/> <int key="NSvFlags">257</int> - <string key="NSFrame">{{507, 13}, {66, 25}}</string> + <string key="NSFrame">{{498, 13}, {75, 25}}</string> <reference key="NSSuperview" ref="559857537"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="617021739"> @@ -166,7 +166,7 @@ <object class="NSButton" id="212849560"> <reference key="NSNextResponder" ref="559857537"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{94, 13}, {66, 25}}</string> + <string key="NSFrame">{{102, 13}, {82, 25}}</string> <reference key="NSSuperview" ref="559857537"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="1054617135"> @@ -187,7 +187,7 @@ <object class="NSButton" id="16151679"> <reference key="NSNextResponder" ref="559857537"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{20, 13}, {66, 25}}</string> + <string key="NSFrame">{{12, 13}, {82, 25}}</string> <reference key="NSSuperview" ref="559857537"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="369856023"> @@ -208,7 +208,7 @@ <object class="NSPopUpButton" id="766971294"> <reference key="NSNextResponder" ref="559857537"/> <int key="NSvFlags">292</int> - <string key="NSFrame">{{328, 13}, {48, 25}}</string> + <string key="NSFrame">{{401, 12}, {48, 25}}</string> <reference key="NSSuperview" ref="559857537"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="583599991"> @@ -253,7 +253,7 @@ <object class="NSSegmentedControl" id="13679998"> <reference key="NSNextResponder" ref="559857537"/> <int key="NSvFlags">292</int> - <string key="NSFrame">{{183, 16}, {137, 19}}</string> + <string key="NSFrame">{{230, 15}, {163, 19}}</string> <reference key="NSSuperview" ref="559857537"/> <bool key="NSEnabled">YES</bool> <object class="NSSegmentedCell" key="NSCell" id="772630454"> @@ -264,13 +264,13 @@ <object class="NSMutableArray" key="NSSegmentImages"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSSegmentItem"> - <double key="NSSegmentItemWidth">45</double> + <double key="NSSegmentItemWidth">39</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">44</double> + <double key="NSSegmentItemWidth">83</double> <string key="NSSegmentItemLabel">Image</string> <string key="NSSegmentItemTooltip">Try to show data as image</string> <int key="NSSegmentItemTag">1</int> @@ -278,7 +278,7 @@ <int key="NSSegmentItemImageScaling">0</int> </object> <object class="NSSegmentItem"> - <double key="NSSegmentItemWidth">44</double> + <double key="NSSegmentItemWidth">37</double> <string key="NSSegmentItemLabel">Hex</string> <string key="NSSegmentItemTooltip">Show data hexadecimal</string> <int key="NSSegmentItemImageScaling">0</int> @@ -359,7 +359,7 @@ <string key="NSColorName">selectedTextBackgroundColor</string> <object class="NSColor" key="NSColor" id="394290367"> <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes> + <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes> </object> </object> <object class="NSColor" id="935002176"> @@ -659,18 +659,18 @@ <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string> - <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> <string key="NSFrameAutosaveName"/> </object> <object class="NSWindowTemplate" id="620871617"> <int key="NSWindowStyleMask">1</int> <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{196, 292}, {411, 218}}</string> + <string key="NSWindowRect">{{196, 292}, {439, 218}}</string> <int key="NSWTFlags">544735232</int> <string key="NSWindowTitle">BIT Editor</string> <string key="NSWindowClass">NSPanel</string> <nil key="NSViewClass"/> - <string key="NSWindowContentMaxSize">{411, 218}</string> + <string key="NSWindowContentMaxSize">{439, 218}</string> <string key="NSWindowContentMinSize">{411, 218}</string> <object class="NSView" key="NSWindowView" id="539487490"> <reference key="NSNextResponder"/> @@ -680,7 +680,7 @@ <object class="NSButton" id="850912280"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{296, 157}, {10, 24}}</string> + <string key="NSFrame">{{309, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">39</int> <bool key="NSEnabled">YES</bool> @@ -713,7 +713,7 @@ <object class="NSButton" id="1020939074"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{307, 157}, {10, 24}}</string> + <string key="NSFrame">{{320, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">38</int> <bool key="NSEnabled">YES</bool> @@ -736,7 +736,7 @@ <object class="NSButton" id="915877029"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{318, 157}, {10, 24}}</string> + <string key="NSFrame">{{331, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">37</int> <bool key="NSEnabled">YES</bool> @@ -759,7 +759,7 @@ <object class="NSButton" id="831736344"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{329, 157}, {10, 24}}</string> + <string key="NSFrame">{{342, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">36</int> <bool key="NSEnabled">YES</bool> @@ -782,7 +782,7 @@ <object class="NSButton" id="34135677"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{342, 157}, {10, 24}}</string> + <string key="NSFrame">{{355, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">35</int> <bool key="NSEnabled">YES</bool> @@ -805,7 +805,7 @@ <object class="NSButton" id="819243992"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{353, 157}, {10, 24}}</string> + <string key="NSFrame">{{366, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">34</int> <bool key="NSEnabled">YES</bool> @@ -828,7 +828,7 @@ <object class="NSButton" id="916226541"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{364, 157}, {10, 24}}</string> + <string key="NSFrame">{{377, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">33</int> <bool key="NSEnabled">YES</bool> @@ -852,7 +852,7 @@ <object class="NSButton" id="799769487"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{375, 157}, {10, 24}}</string> + <string key="NSFrame">{{388, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">32</int> <bool key="NSEnabled">YES</bool> @@ -875,7 +875,7 @@ <object class="NSButton" id="391329711"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{250, 157}, {10, 24}}</string> + <string key="NSFrame">{{263, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">43</int> <bool key="NSEnabled">YES</bool> @@ -898,7 +898,7 @@ <object class="NSButton" id="729208752"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{261, 157}, {10, 24}}</string> + <string key="NSFrame">{{274, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">42</int> <bool key="NSEnabled">YES</bool> @@ -921,7 +921,7 @@ <object class="NSButton" id="532822879"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{272, 157}, {10, 24}}</string> + <string key="NSFrame">{{285, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">41</int> <bool key="NSEnabled">YES</bool> @@ -945,7 +945,7 @@ <object class="NSButton" id="1034801838"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{283, 157}, {10, 24}}</string> + <string key="NSFrame">{{296, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">40</int> <bool key="NSEnabled">YES</bool> @@ -968,7 +968,7 @@ <object class="NSButton" id="632136132"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{204, 157}, {10, 24}}</string> + <string key="NSFrame">{{217, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">47</int> <bool key="NSEnabled">YES</bool> @@ -991,7 +991,7 @@ <object class="NSButton" id="725658970"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{215, 157}, {10, 24}}</string> + <string key="NSFrame">{{228, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">46</int> <bool key="NSEnabled">YES</bool> @@ -1014,7 +1014,7 @@ <object class="NSButton" id="1060916167"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{226, 157}, {10, 24}}</string> + <string key="NSFrame">{{239, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">45</int> <bool key="NSEnabled">YES</bool> @@ -1038,7 +1038,7 @@ <object class="NSButton" id="18034505"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{237, 157}, {10, 24}}</string> + <string key="NSFrame">{{250, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">44</int> <bool key="NSEnabled">YES</bool> @@ -1061,7 +1061,7 @@ <object class="NSButton" id="988607368"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{158, 157}, {10, 24}}</string> + <string key="NSFrame">{{171, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">51</int> <bool key="NSEnabled">YES</bool> @@ -1084,7 +1084,7 @@ <object class="NSButton" id="836523460"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{169, 157}, {10, 24}}</string> + <string key="NSFrame">{{182, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">50</int> <bool key="NSEnabled">YES</bool> @@ -1107,7 +1107,7 @@ <object class="NSButton" id="982969106"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{180, 157}, {10, 24}}</string> + <string key="NSFrame">{{193, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">49</int> <bool key="NSEnabled">YES</bool> @@ -1131,7 +1131,7 @@ <object class="NSButton" id="321531805"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{191, 157}, {10, 24}}</string> + <string key="NSFrame">{{204, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">48</int> <bool key="NSEnabled">YES</bool> @@ -1154,7 +1154,7 @@ <object class="NSButton" id="642132759"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{112, 157}, {10, 24}}</string> + <string key="NSFrame">{{125, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">55</int> <bool key="NSEnabled">YES</bool> @@ -1177,7 +1177,7 @@ <object class="NSButton" id="663034542"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{123, 157}, {10, 24}}</string> + <string key="NSFrame">{{136, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">54</int> <bool key="NSEnabled">YES</bool> @@ -1200,7 +1200,7 @@ <object class="NSButton" id="229758853"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{134, 157}, {10, 24}}</string> + <string key="NSFrame">{{147, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">53</int> <bool key="NSEnabled">YES</bool> @@ -1224,7 +1224,7 @@ <object class="NSButton" id="321225405"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{145, 157}, {10, 24}}</string> + <string key="NSFrame">{{158, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">52</int> <bool key="NSEnabled">YES</bool> @@ -1247,7 +1247,7 @@ <object class="NSButton" id="301024458"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{66, 157}, {10, 24}}</string> + <string key="NSFrame">{{79, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">59</int> <bool key="NSEnabled">YES</bool> @@ -1270,7 +1270,7 @@ <object class="NSButton" id="223387181"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{77, 157}, {10, 24}}</string> + <string key="NSFrame">{{90, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">58</int> <bool key="NSEnabled">YES</bool> @@ -1293,7 +1293,7 @@ <object class="NSButton" id="278009702"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{88, 157}, {10, 24}}</string> + <string key="NSFrame">{{101, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">57</int> <bool key="NSEnabled">YES</bool> @@ -1317,7 +1317,7 @@ <object class="NSButton" id="831512500"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{99, 157}, {10, 24}}</string> + <string key="NSFrame">{{112, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">56</int> <bool key="NSEnabled">YES</bool> @@ -1340,7 +1340,7 @@ <object class="NSButton" id="762873671"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{20, 157}, {10, 24}}</string> + <string key="NSFrame">{{33, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">63</int> <bool key="NSEnabled">YES</bool> @@ -1363,7 +1363,7 @@ <object class="NSButton" id="55180157"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{31, 157}, {10, 24}}</string> + <string key="NSFrame">{{44, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">62</int> <bool key="NSEnabled">YES</bool> @@ -1386,7 +1386,7 @@ <object class="NSButton" id="778707752"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{42, 157}, {10, 24}}</string> + <string key="NSFrame">{{55, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">61</int> <bool key="NSEnabled">YES</bool> @@ -1410,7 +1410,7 @@ <object class="NSButton" id="1035567393"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{53, 157}, {10, 24}}</string> + <string key="NSFrame">{{66, 157}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">60</int> <bool key="NSEnabled">YES</bool> @@ -1433,7 +1433,7 @@ <object class="NSButton" id="878038505"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{296, 129}, {10, 24}}</string> + <string key="NSFrame">{{309, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">7</int> <bool key="NSEnabled">YES</bool> @@ -1457,7 +1457,7 @@ <object class="NSButton" id="620840958"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{307, 129}, {10, 24}}</string> + <string key="NSFrame">{{320, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">6</int> <bool key="NSEnabled">YES</bool> @@ -1480,7 +1480,7 @@ <object class="NSButton" id="793559915"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{318, 129}, {10, 24}}</string> + <string key="NSFrame">{{331, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">5</int> <bool key="NSEnabled">YES</bool> @@ -1503,7 +1503,7 @@ <object class="NSButton" id="912173182"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{329, 129}, {10, 24}}</string> + <string key="NSFrame">{{342, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">4</int> <bool key="NSEnabled">YES</bool> @@ -1526,7 +1526,7 @@ <object class="NSButton" id="366341128"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{342, 129}, {10, 24}}</string> + <string key="NSFrame">{{355, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">3</int> <bool key="NSEnabled">YES</bool> @@ -1549,7 +1549,7 @@ <object class="NSButton" id="636044631"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{353, 129}, {10, 24}}</string> + <string key="NSFrame">{{366, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">2</int> <bool key="NSEnabled">YES</bool> @@ -1572,7 +1572,7 @@ <object class="NSButton" id="638198847"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{364, 129}, {10, 24}}</string> + <string key="NSFrame">{{377, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">1</int> <bool key="NSEnabled">YES</bool> @@ -1596,7 +1596,7 @@ <object class="NSButton" id="757669839"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{375, 129}, {10, 24}}</string> + <string key="NSFrame">{{388, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="154059622"> @@ -1618,7 +1618,7 @@ <object class="NSButton" id="291509561"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{250, 129}, {10, 24}}</string> + <string key="NSFrame">{{263, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">11</int> <bool key="NSEnabled">YES</bool> @@ -1641,7 +1641,7 @@ <object class="NSButton" id="97277903"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{261, 129}, {10, 24}}</string> + <string key="NSFrame">{{274, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">10</int> <bool key="NSEnabled">YES</bool> @@ -1664,7 +1664,7 @@ <object class="NSButton" id="718727854"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{272, 129}, {10, 24}}</string> + <string key="NSFrame">{{285, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">9</int> <bool key="NSEnabled">YES</bool> @@ -1688,7 +1688,7 @@ <object class="NSButton" id="923644693"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{283, 129}, {10, 24}}</string> + <string key="NSFrame">{{296, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">8</int> <bool key="NSEnabled">YES</bool> @@ -1711,7 +1711,7 @@ <object class="NSButton" id="822935873"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{204, 129}, {10, 24}}</string> + <string key="NSFrame">{{217, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">15</int> <bool key="NSEnabled">YES</bool> @@ -1734,7 +1734,7 @@ <object class="NSButton" id="705900199"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{215, 129}, {10, 24}}</string> + <string key="NSFrame">{{228, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">14</int> <bool key="NSEnabled">YES</bool> @@ -1757,7 +1757,7 @@ <object class="NSButton" id="941676201"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{226, 129}, {10, 24}}</string> + <string key="NSFrame">{{239, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">13</int> <bool key="NSEnabled">YES</bool> @@ -1781,7 +1781,7 @@ <object class="NSButton" id="737799418"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{237, 129}, {10, 24}}</string> + <string key="NSFrame">{{250, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">12</int> <bool key="NSEnabled">YES</bool> @@ -1804,7 +1804,7 @@ <object class="NSButton" id="468679836"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{158, 129}, {10, 24}}</string> + <string key="NSFrame">{{171, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">19</int> <bool key="NSEnabled">YES</bool> @@ -1827,7 +1827,7 @@ <object class="NSButton" id="850901484"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{169, 129}, {10, 24}}</string> + <string key="NSFrame">{{182, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">18</int> <bool key="NSEnabled">YES</bool> @@ -1850,7 +1850,7 @@ <object class="NSButton" id="1059330224"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{180, 129}, {10, 24}}</string> + <string key="NSFrame">{{193, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">17</int> <bool key="NSEnabled">YES</bool> @@ -1874,7 +1874,7 @@ <object class="NSButton" id="37070771"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{191, 129}, {10, 24}}</string> + <string key="NSFrame">{{204, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">16</int> <bool key="NSEnabled">YES</bool> @@ -1897,7 +1897,7 @@ <object class="NSButton" id="440192203"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{112, 129}, {10, 24}}</string> + <string key="NSFrame">{{125, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">23</int> <bool key="NSEnabled">YES</bool> @@ -1920,7 +1920,7 @@ <object class="NSButton" id="215345254"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{123, 129}, {10, 24}}</string> + <string key="NSFrame">{{136, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">22</int> <bool key="NSEnabled">YES</bool> @@ -1943,7 +1943,7 @@ <object class="NSButton" id="358295176"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{134, 129}, {10, 24}}</string> + <string key="NSFrame">{{147, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">21</int> <bool key="NSEnabled">YES</bool> @@ -1967,7 +1967,7 @@ <object class="NSButton" id="741215661"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{145, 129}, {10, 24}}</string> + <string key="NSFrame">{{158, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">20</int> <bool key="NSEnabled">YES</bool> @@ -1990,7 +1990,7 @@ <object class="NSButton" id="438731436"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{66, 129}, {10, 24}}</string> + <string key="NSFrame">{{79, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">27</int> <bool key="NSEnabled">YES</bool> @@ -2013,7 +2013,7 @@ <object class="NSButton" id="636303878"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{77, 129}, {10, 24}}</string> + <string key="NSFrame">{{90, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">26</int> <bool key="NSEnabled">YES</bool> @@ -2036,7 +2036,7 @@ <object class="NSButton" id="498984339"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{88, 129}, {10, 24}}</string> + <string key="NSFrame">{{101, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">25</int> <bool key="NSEnabled">YES</bool> @@ -2060,7 +2060,7 @@ <object class="NSButton" id="127861284"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{99, 129}, {10, 24}}</string> + <string key="NSFrame">{{112, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">24</int> <bool key="NSEnabled">YES</bool> @@ -2083,7 +2083,7 @@ <object class="NSButton" id="691481038"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{20, 129}, {10, 24}}</string> + <string key="NSFrame">{{33, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">31</int> <bool key="NSEnabled">YES</bool> @@ -2106,7 +2106,7 @@ <object class="NSButton" id="203948268"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{31, 129}, {10, 24}}</string> + <string key="NSFrame">{{44, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">30</int> <bool key="NSEnabled">YES</bool> @@ -2129,7 +2129,7 @@ <object class="NSButton" id="89686853"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{42, 129}, {10, 24}}</string> + <string key="NSFrame">{{55, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">29</int> <bool key="NSEnabled">YES</bool> @@ -2153,7 +2153,7 @@ <object class="NSButton" id="495777718"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{53, 129}, {10, 24}}</string> + <string key="NSFrame">{{66, 129}, {10, 24}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">28</int> <bool key="NSEnabled">YES</bool> @@ -2176,7 +2176,7 @@ <object class="NSButton" id="824786228"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">257</int> - <string key="NSFrame">{{318, 13}, {66, 25}}</string> + <string key="NSFrame">{{353, 13}, {66, 25}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">1</int> <bool key="NSEnabled">YES</bool> @@ -2198,8 +2198,8 @@ </object> <object class="NSButton" id="883245768"> <reference key="NSNextResponder" ref="539487490"/> - <int key="NSvFlags">257</int> - <string key="NSFrame">{{244, 13}, {66, 25}}</string> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{8, 13}, {85, 25}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="657939390"> @@ -2220,7 +2220,7 @@ <object class="NSTextField" id="334207077"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">266</int> - <string key="NSFrame">{{19, 198}, {368, 14}}</string> + <string key="NSFrame">{{5, 198}, {417, 14}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="176710024"> @@ -2235,8 +2235,8 @@ </object> <object class="NSTextField" id="972404924"> <reference key="NSNextResponder" ref="539487490"/> - <int key="NSvFlags">266</int> - <string key="NSFrame">{{5, 104}, {90, 14}}</string> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{5, 104}, {131, 14}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="48849739"> @@ -2251,8 +2251,8 @@ </object> <object class="NSTextField" id="875052373"> <reference key="NSNextResponder" ref="539487490"/> - <int key="NSvFlags">266</int> - <string key="NSFrame">{{5, 85}, {91, 14}}</string> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{5, 85}, {131, 14}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="339711087"> @@ -2268,7 +2268,7 @@ <object class="NSTextField" id="737055137"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{96, 102}, {138, 16}}</string> + <string key="NSFrame">{{139, 102}, {138, 16}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="838692428"> @@ -2290,7 +2290,7 @@ <object class="NSTextField" id="1069681827"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{96, 84}, {138, 16}}</string> + <string key="NSFrame">{{139, 84}, {138, 16}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="578793622"> @@ -2306,8 +2306,8 @@ </object> <object class="NSTextField" id="586956008"> <reference key="NSNextResponder" ref="539487490"/> - <int key="NSvFlags">266</int> - <string key="NSFrame">{{5, 67}, {91, 14}}</string> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{5, 67}, {131, 14}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="1016233566"> @@ -2323,7 +2323,7 @@ <object class="NSTextField" id="818873877"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{96, 66}, {138, 16}}</string> + <string key="NSFrame">{{139, 66}, {138, 16}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="683860128"> @@ -2337,10 +2337,10 @@ <reference key="NSTextColor" ref="520036404"/> </object> </object> - <object class="NSBox" id="468515874"> + <object class="NSBox" id="232048045"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">12</int> - <string key="NSFrame">{{0, 188}, {411, 5}}</string> + <string key="NSFrame">{{0, 48}, {439, 5}}</string> <reference key="NSSuperview" ref="539487490"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -2359,10 +2359,10 @@ <int key="NSTitlePosition">0</int> <bool key="NSTransparent">NO</bool> </object> - <object class="NSBox" id="232048045"> + <object class="NSBox" id="472349216"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">12</int> - <string key="NSFrame">{{0, 48}, {411, 5}}</string> + <string key="NSFrame">{{0, 188}, {439, 5}}</string> <reference key="NSSuperview" ref="539487490"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -2384,7 +2384,7 @@ <object class="NSButton" id="701892060"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{412, 92}, {96, 32}}</string> + <string key="NSFrame">{{504, 118}, {96, 32}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="134477272"> @@ -2404,7 +2404,7 @@ <object class="NSButton" id="200934833"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{412, 71}, {96, 32}}</string> + <string key="NSFrame">{{504, 97}, {96, 32}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="597603505"> @@ -2424,7 +2424,7 @@ <object class="NSButton" id="640772395"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{412, 50}, {96, 32}}</string> + <string key="NSFrame">{{504, 76}, {96, 32}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="768373557"> @@ -2444,7 +2444,7 @@ <object class="NSButton" id="656999524"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{416, 32}, {96, 32}}</string> + <string key="NSFrame">{{508, 58}, {96, 32}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="813850010"> @@ -2464,7 +2464,7 @@ <object class="NSTextField" id="977177763"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{367, 142}, {27, 11}}</string> + <string key="NSFrame">{{380, 142}, {27, 11}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="309959795"> @@ -2480,7 +2480,7 @@ <object class="NSTextField" id="1007925532"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{275, 142}, {27, 11}}</string> + <string key="NSFrame">{{288, 142}, {27, 11}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="172013395"> @@ -2496,7 +2496,7 @@ <object class="NSTextField" id="132698442"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{183, 142}, {27, 11}}</string> + <string key="NSFrame">{{196, 142}, {27, 11}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="22770677"> @@ -2512,7 +2512,7 @@ <object class="NSTextField" id="585309656"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{91, 142}, {27, 11}}</string> + <string key="NSFrame">{{104, 142}, {27, 11}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="864220812"> @@ -2528,7 +2528,7 @@ <object class="NSTextField" id="83548399"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{367, 171}, {27, 11}}</string> + <string key="NSFrame">{{380, 171}, {27, 11}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="232460769"> @@ -2544,7 +2544,7 @@ <object class="NSTextField" id="499814835"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{275, 171}, {27, 11}}</string> + <string key="NSFrame">{{288, 171}, {27, 11}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="220465815"> @@ -2560,7 +2560,7 @@ <object class="NSTextField" id="786559393"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{183, 171}, {27, 11}}</string> + <string key="NSFrame">{{196, 171}, {27, 11}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="452748686"> @@ -2576,7 +2576,7 @@ <object class="NSTextField" id="180106869"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{91, 171}, {27, 11}}</string> + <string key="NSFrame">{{104, 171}, {27, 11}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="934351829"> @@ -2592,7 +2592,7 @@ <object class="NSButton" id="912777084"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{245, 103}, {39, 15}}</string> + <string key="NSFrame">{{288, 103}, {39, 15}}</string> <reference key="NSSuperview" ref="539487490"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="421399648"> @@ -2612,7 +2612,7 @@ <object class="NSButton" id="317620485"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{337, 103}, {39, 15}}</string> + <string key="NSFrame">{{380, 103}, {39, 15}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">4</int> <bool key="NSEnabled">YES</bool> @@ -2633,7 +2633,7 @@ <object class="NSButton" id="496168724"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{291, 103}, {39, 15}}</string> + <string key="NSFrame">{{334, 103}, {39, 15}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">3</int> <bool key="NSEnabled">YES</bool> @@ -2654,7 +2654,7 @@ <object class="NSButton" id="293046073"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{245, 85}, {39, 15}}</string> + <string key="NSFrame">{{288, 85}, {39, 15}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">1</int> <bool key="NSEnabled">YES</bool> @@ -2675,7 +2675,7 @@ <object class="NSButton" id="45609934"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{245, 67}, {39, 15}}</string> + <string key="NSFrame">{{288, 67}, {39, 15}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">2</int> <bool key="NSEnabled">YES</bool> @@ -2696,7 +2696,7 @@ <object class="NSButton" id="817754450"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{337, 85}, {39, 15}}</string> + <string key="NSFrame">{{380, 85}, {39, 15}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">6</int> <bool key="NSEnabled">YES</bool> @@ -2717,7 +2717,7 @@ <object class="NSButton" id="173283216"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{337, 66}, {39, 15}}</string> + <string key="NSFrame">{{380, 66}, {39, 15}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">7</int> <bool key="NSEnabled">YES</bool> @@ -2738,7 +2738,7 @@ <object class="NSButton" id="557422946"> <reference key="NSNextResponder" ref="539487490"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{291, 85}, {39, 15}}</string> + <string key="NSFrame">{{334, 85}, {39, 15}}</string> <reference key="NSSuperview" ref="539487490"/> <int key="NSTag">5</int> <bool key="NSEnabled">YES</bool> @@ -2757,12 +2757,12 @@ </object> </object> </object> - <string key="NSFrameSize">{411, 218}</string> + <string key="NSFrameSize">{439, 218}</string> <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string> <string key="NSMinSize">{411, 240}</string> - <string key="NSMaxSize">{411, 240}</string> + <string key="NSMaxSize">{439, 240}</string> </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> @@ -4946,15 +4946,15 @@ <reference ref="604699677"/> <reference ref="983787914"/> <reference ref="189033461"/> - <reference ref="766971294"/> - <reference ref="13679998"/> - <reference ref="760872156"/> - <reference ref="212849560"/> - <reference ref="16151679"/> <reference ref="315097820"/> <reference ref="92171076"/> <reference ref="730447074"/> <reference ref="1049865951"/> + <reference ref="16151679"/> + <reference ref="760872156"/> + <reference ref="212849560"/> + <reference ref="13679998"/> + <reference ref="766971294"/> </object> <reference key="parent" ref="172882781"/> </object> @@ -5185,84 +5185,82 @@ <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="232048045"/> - <reference ref="468515874"/> - <reference ref="883245768"/> - <reference ref="824786228"/> - <reference ref="818873877"/> - <reference ref="586956008"/> - <reference ref="875052373"/> - <reference ref="972404924"/> - <reference ref="1069681827"/> - <reference ref="737055137"/> <reference ref="334207077"/> - <reference ref="495777718"/> - <reference ref="89686853"/> - <reference ref="203948268"/> - <reference ref="691481038"/> - <reference ref="127861284"/> - <reference ref="498984339"/> - <reference ref="636303878"/> - <reference ref="438731436"/> - <reference ref="741215661"/> - <reference ref="358295176"/> - <reference ref="215345254"/> - <reference ref="440192203"/> - <reference ref="37070771"/> - <reference ref="1059330224"/> - <reference ref="850901484"/> - <reference ref="468679836"/> - <reference ref="737799418"/> - <reference ref="941676201"/> - <reference ref="705900199"/> - <reference ref="822935873"/> - <reference ref="923644693"/> - <reference ref="718727854"/> - <reference ref="97277903"/> - <reference ref="291509561"/> - <reference ref="757669839"/> - <reference ref="638198847"/> - <reference ref="636044631"/> - <reference ref="366341128"/> - <reference ref="912173182"/> - <reference ref="793559915"/> - <reference ref="620840958"/> - <reference ref="878038505"/> - <reference ref="1035567393"/> - <reference ref="778707752"/> - <reference ref="55180157"/> - <reference ref="762873671"/> - <reference ref="831512500"/> - <reference ref="278009702"/> - <reference ref="223387181"/> - <reference ref="301024458"/> - <reference ref="321225405"/> - <reference ref="229758853"/> - <reference ref="663034542"/> - <reference ref="642132759"/> - <reference ref="321531805"/> - <reference ref="982969106"/> - <reference ref="836523460"/> - <reference ref="988607368"/> - <reference ref="18034505"/> - <reference ref="1060916167"/> - <reference ref="725658970"/> - <reference ref="632136132"/> - <reference ref="1034801838"/> - <reference ref="532822879"/> - <reference ref="729208752"/> - <reference ref="391329711"/> - <reference ref="799769487"/> - <reference ref="916226541"/> - <reference ref="819243992"/> - <reference ref="34135677"/> - <reference ref="831736344"/> - <reference ref="915877029"/> - <reference ref="1020939074"/> - <reference ref="850912280"/> + <reference ref="883245768"/> <reference ref="701892060"/> <reference ref="200934833"/> <reference ref="640772395"/> <reference ref="656999524"/> + <reference ref="850912280"/> + <reference ref="1020939074"/> + <reference ref="915877029"/> + <reference ref="831736344"/> + <reference ref="34135677"/> + <reference ref="819243992"/> + <reference ref="916226541"/> + <reference ref="799769487"/> + <reference ref="391329711"/> + <reference ref="729208752"/> + <reference ref="532822879"/> + <reference ref="1034801838"/> + <reference ref="632136132"/> + <reference ref="725658970"/> + <reference ref="1060916167"/> + <reference ref="18034505"/> + <reference ref="988607368"/> + <reference ref="836523460"/> + <reference ref="982969106"/> + <reference ref="321531805"/> + <reference ref="642132759"/> + <reference ref="663034542"/> + <reference ref="229758853"/> + <reference ref="321225405"/> + <reference ref="301024458"/> + <reference ref="223387181"/> + <reference ref="278009702"/> + <reference ref="831512500"/> + <reference ref="762873671"/> + <reference ref="55180157"/> + <reference ref="778707752"/> + <reference ref="1035567393"/> + <reference ref="878038505"/> + <reference ref="620840958"/> + <reference ref="793559915"/> + <reference ref="912173182"/> + <reference ref="366341128"/> + <reference ref="636044631"/> + <reference ref="638198847"/> + <reference ref="757669839"/> + <reference ref="291509561"/> + <reference ref="97277903"/> + <reference ref="718727854"/> + <reference ref="923644693"/> + <reference ref="822935873"/> + <reference ref="705900199"/> + <reference ref="941676201"/> + <reference ref="737799418"/> + <reference ref="468679836"/> + <reference ref="850901484"/> + <reference ref="1059330224"/> + <reference ref="37070771"/> + <reference ref="440192203"/> + <reference ref="215345254"/> + <reference ref="358295176"/> + <reference ref="741215661"/> + <reference ref="438731436"/> + <reference ref="636303878"/> + <reference ref="498984339"/> + <reference ref="127861284"/> + <reference ref="691481038"/> + <reference ref="203948268"/> + <reference ref="89686853"/> + <reference ref="495777718"/> + <reference ref="972404924"/> + <reference ref="875052373"/> + <reference ref="737055137"/> + <reference ref="1069681827"/> + <reference ref="586956008"/> + <reference ref="818873877"/> <reference ref="977177763"/> <reference ref="1007925532"/> <reference ref="132698442"/> @@ -5272,13 +5270,15 @@ <reference ref="786559393"/> <reference ref="180106869"/> <reference ref="912777084"/> + <reference ref="317620485"/> + <reference ref="496168724"/> <reference ref="293046073"/> <reference ref="45609934"/> - <reference ref="496168724"/> - <reference ref="317620485"/> <reference ref="817754450"/> - <reference ref="557422946"/> <reference ref="173283216"/> + <reference ref="557422946"/> + <reference ref="824786228"/> + <reference ref="472349216"/> </object> <reference key="parent" ref="620871617"/> </object> @@ -5288,11 +5288,6 @@ <reference key="parent" ref="539487490"/> </object> <object class="IBObjectRecord"> - <int key="objectID">83</int> - <reference key="object" ref="468515874"/> - <reference key="parent" ref="539487490"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">84</int> <reference key="object" ref="883245768"/> <object class="NSMutableArray" key="children"> @@ -6594,6 +6589,11 @@ <reference key="object" ref="566456802"/> <reference key="parent" ref="173283216"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">532</int> + <reference key="object" ref="472349216"/> + <reference key="parent" ref="539487490"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -6610,72 +6610,132 @@ <string>1.windowTemplate.maxSize</string> <string>1.windowTemplate.minSize</string> <string>10.IBPluginDependency</string> + <string>10.IBViewBoundsToFrameTransform</string> <string>10.ImportedFromIB2</string> <string>100.IBPluginDependency</string> + <string>100.IBViewBoundsToFrameTransform</string> <string>101.IBPluginDependency</string> + <string>101.IBViewBoundsToFrameTransform</string> <string>102.IBPluginDependency</string> + <string>102.IBViewBoundsToFrameTransform</string> <string>103.IBPluginDependency</string> + <string>103.IBViewBoundsToFrameTransform</string> <string>104.IBPluginDependency</string> + <string>104.IBViewBoundsToFrameTransform</string> <string>105.IBPluginDependency</string> + <string>105.IBViewBoundsToFrameTransform</string> <string>106.IBPluginDependency</string> + <string>106.IBViewBoundsToFrameTransform</string> <string>107.IBPluginDependency</string> + <string>107.IBViewBoundsToFrameTransform</string> <string>108.IBPluginDependency</string> + <string>108.IBViewBoundsToFrameTransform</string> <string>109.IBPluginDependency</string> + <string>109.IBViewBoundsToFrameTransform</string> <string>11.IBPluginDependency</string> + <string>11.IBViewBoundsToFrameTransform</string> <string>11.ImportedFromIB2</string> <string>110.IBPluginDependency</string> + <string>110.IBViewBoundsToFrameTransform</string> <string>111.IBPluginDependency</string> + <string>111.IBViewBoundsToFrameTransform</string> <string>112.IBPluginDependency</string> + <string>112.IBViewBoundsToFrameTransform</string> <string>113.IBPluginDependency</string> + <string>113.IBViewBoundsToFrameTransform</string> <string>114.IBPluginDependency</string> + <string>114.IBViewBoundsToFrameTransform</string> <string>115.IBPluginDependency</string> + <string>115.IBViewBoundsToFrameTransform</string> <string>116.IBPluginDependency</string> + <string>116.IBViewBoundsToFrameTransform</string> <string>117.IBPluginDependency</string> + <string>117.IBViewBoundsToFrameTransform</string> <string>118.IBPluginDependency</string> + <string>118.IBViewBoundsToFrameTransform</string> <string>119.IBPluginDependency</string> + <string>119.IBViewBoundsToFrameTransform</string> <string>12.IBPluginDependency</string> + <string>12.IBViewBoundsToFrameTransform</string> <string>12.ImportedFromIB2</string> <string>120.IBPluginDependency</string> + <string>120.IBViewBoundsToFrameTransform</string> <string>121.IBPluginDependency</string> + <string>121.IBViewBoundsToFrameTransform</string> <string>122.IBPluginDependency</string> + <string>122.IBViewBoundsToFrameTransform</string> <string>123.IBPluginDependency</string> + <string>123.IBViewBoundsToFrameTransform</string> <string>124.IBPluginDependency</string> + <string>124.IBViewBoundsToFrameTransform</string> <string>125.IBPluginDependency</string> + <string>125.IBViewBoundsToFrameTransform</string> <string>126.IBPluginDependency</string> + <string>126.IBViewBoundsToFrameTransform</string> <string>127.IBPluginDependency</string> + <string>127.IBViewBoundsToFrameTransform</string> <string>128.IBPluginDependency</string> + <string>128.IBViewBoundsToFrameTransform</string> <string>129.IBPluginDependency</string> + <string>129.IBViewBoundsToFrameTransform</string> <string>13.IBPluginDependency</string> <string>13.ImportedFromIB2</string> <string>130.IBPluginDependency</string> + <string>130.IBViewBoundsToFrameTransform</string> <string>131.IBPluginDependency</string> + <string>131.IBViewBoundsToFrameTransform</string> <string>132.IBPluginDependency</string> + <string>132.IBViewBoundsToFrameTransform</string> <string>133.IBPluginDependency</string> + <string>133.IBViewBoundsToFrameTransform</string> <string>134.IBPluginDependency</string> + <string>134.IBViewBoundsToFrameTransform</string> <string>135.IBPluginDependency</string> + <string>135.IBViewBoundsToFrameTransform</string> <string>136.IBPluginDependency</string> + <string>136.IBViewBoundsToFrameTransform</string> <string>137.IBPluginDependency</string> + <string>137.IBViewBoundsToFrameTransform</string> <string>138.IBPluginDependency</string> + <string>138.IBViewBoundsToFrameTransform</string> <string>139.IBPluginDependency</string> + <string>139.IBViewBoundsToFrameTransform</string> <string>14.IBPluginDependency</string> <string>140.IBPluginDependency</string> + <string>140.IBViewBoundsToFrameTransform</string> <string>141.IBPluginDependency</string> + <string>141.IBViewBoundsToFrameTransform</string> <string>142.IBPluginDependency</string> + <string>142.IBViewBoundsToFrameTransform</string> <string>143.IBPluginDependency</string> + <string>143.IBViewBoundsToFrameTransform</string> <string>144.IBPluginDependency</string> + <string>144.IBViewBoundsToFrameTransform</string> <string>145.IBPluginDependency</string> + <string>145.IBViewBoundsToFrameTransform</string> <string>146.IBPluginDependency</string> + <string>146.IBViewBoundsToFrameTransform</string> <string>147.IBPluginDependency</string> + <string>147.IBViewBoundsToFrameTransform</string> <string>148.IBPluginDependency</string> + <string>148.IBViewBoundsToFrameTransform</string> <string>149.IBPluginDependency</string> + <string>149.IBViewBoundsToFrameTransform</string> <string>15.IBPluginDependency</string> <string>150.IBPluginDependency</string> + <string>150.IBViewBoundsToFrameTransform</string> <string>151.IBPluginDependency</string> + <string>151.IBViewBoundsToFrameTransform</string> <string>152.IBPluginDependency</string> + <string>152.IBViewBoundsToFrameTransform</string> <string>153.IBPluginDependency</string> + <string>153.IBViewBoundsToFrameTransform</string> <string>154.IBPluginDependency</string> + <string>154.IBViewBoundsToFrameTransform</string> <string>155.IBPluginDependency</string> + <string>155.IBViewBoundsToFrameTransform</string> <string>156.IBPluginDependency</string> + <string>156.IBViewBoundsToFrameTransform</string> <string>157.IBPluginDependency</string> <string>158.IBPluginDependency</string> <string>159.IBPluginDependency</string> @@ -6713,6 +6773,7 @@ <string>188.IBPluginDependency</string> <string>189.IBPluginDependency</string> <string>19.IBPluginDependency</string> + <string>19.IBSegmentedControlInspectorSelectedSegmentMetadataKey</string> <string>190.IBPluginDependency</string> <string>191.IBPluginDependency</string> <string>192.IBPluginDependency</string> @@ -6759,12 +6820,16 @@ <string>228.IBPluginDependency</string> <string>229.IBPluginDependency</string> <string>240.IBPluginDependency</string> + <string>240.IBViewBoundsToFrameTransform</string> <string>241.IBPluginDependency</string> <string>242.IBPluginDependency</string> + <string>242.IBViewBoundsToFrameTransform</string> <string>243.IBPluginDependency</string> <string>244.IBPluginDependency</string> + <string>244.IBViewBoundsToFrameTransform</string> <string>245.IBPluginDependency</string> <string>249.IBPluginDependency</string> + <string>249.IBViewBoundsToFrameTransform</string> <string>250.IBPluginDependency</string> <string>3.IBPluginDependency</string> <string>30.IBPluginDependency</string> @@ -6776,20 +6841,28 @@ <string>35.IBPluginDependency</string> <string>35.ImportedFromIB2</string> <string>352.IBPluginDependency</string> + <string>352.IBViewBoundsToFrameTransform</string> <string>353.IBPluginDependency</string> <string>354.IBPluginDependency</string> + <string>354.IBViewBoundsToFrameTransform</string> <string>355.IBPluginDependency</string> <string>356.IBPluginDependency</string> + <string>356.IBViewBoundsToFrameTransform</string> <string>357.IBPluginDependency</string> <string>358.IBPluginDependency</string> + <string>358.IBViewBoundsToFrameTransform</string> <string>359.IBPluginDependency</string> <string>36.CustomClassName</string> <string>36.IBPluginDependency</string> <string>36.ImportedFromIB2</string> <string>360.IBPluginDependency</string> + <string>360.IBViewBoundsToFrameTransform</string> <string>361.IBPluginDependency</string> + <string>361.IBViewBoundsToFrameTransform</string> <string>362.IBPluginDependency</string> + <string>362.IBViewBoundsToFrameTransform</string> <string>363.IBPluginDependency</string> + <string>363.IBViewBoundsToFrameTransform</string> <string>364.IBPluginDependency</string> <string>365.IBPluginDependency</string> <string>366.IBPluginDependency</string> @@ -6798,33 +6871,43 @@ <string>37.IBShouldRemoveOnLegacySave</string> <string>376.IBAttributePlaceholdersKey</string> <string>376.IBPluginDependency</string> + <string>376.IBViewBoundsToFrameTransform</string> <string>377.IBPluginDependency</string> <string>378.IBAttributePlaceholdersKey</string> <string>378.IBPluginDependency</string> + <string>378.IBViewBoundsToFrameTransform</string> <string>379.IBPluginDependency</string> <string>38.IBPluginDependency</string> <string>38.IBShouldRemoveOnLegacySave</string> <string>380.IBAttributePlaceholdersKey</string> <string>380.IBPluginDependency</string> + <string>380.IBViewBoundsToFrameTransform</string> <string>381.IBPluginDependency</string> <string>382.IBAttributePlaceholdersKey</string> <string>382.IBPluginDependency</string> + <string>382.IBViewBoundsToFrameTransform</string> <string>383.IBPluginDependency</string> <string>384.IBAttributePlaceholdersKey</string> <string>384.IBPluginDependency</string> + <string>384.IBViewBoundsToFrameTransform</string> <string>385.IBPluginDependency</string> <string>386.IBAttributePlaceholdersKey</string> <string>386.IBPluginDependency</string> + <string>386.IBViewBoundsToFrameTransform</string> <string>387.IBPluginDependency</string> <string>388.IBAttributePlaceholdersKey</string> <string>388.IBPluginDependency</string> + <string>388.IBViewBoundsToFrameTransform</string> <string>389.IBPluginDependency</string> <string>4.IBPluginDependency</string> <string>5.IBPluginDependency</string> <string>5.ImportedFromIB2</string> <string>520.IBAttributePlaceholdersKey</string> <string>520.IBPluginDependency</string> + <string>520.IBViewBoundsToFrameTransform</string> <string>521.IBPluginDependency</string> + <string>532.IBPluginDependency</string> + <string>532.IBViewBoundsToFrameTransform</string> <string>6.IBPluginDependency</string> <string>6.ImportedFromIB2</string> <string>7.CustomClassName</string> @@ -6837,6 +6920,7 @@ <string>77.IBPluginDependency</string> <string>8.IBAttributePlaceholdersKey</string> <string>8.IBPluginDependency</string> + <string>8.IBViewBoundsToFrameTransform</string> <string>80.IBEditorWindowLastContentRect</string> <string>80.IBPluginDependency</string> <string>80.IBWindowTemplateEditedContentRect</string> @@ -6849,110 +6933,306 @@ <string>80.windowTemplate.minSize</string> <string>81.IBPluginDependency</string> <string>82.IBPluginDependency</string> - <string>83.IBPluginDependency</string> + <string>82.IBViewBoundsToFrameTransform</string> <string>84.IBPluginDependency</string> + <string>84.IBViewBoundsToFrameTransform</string> <string>84.ImportedFromIB2</string> <string>85.IBPluginDependency</string> + <string>85.IBViewBoundsToFrameTransform</string> <string>85.ImportedFromIB2</string> <string>86.IBAttributePlaceholdersKey</string> <string>86.IBPluginDependency</string> + <string>86.IBViewBoundsToFrameTransform</string> <string>87.IBPluginDependency</string> + <string>87.IBViewBoundsToFrameTransform</string> <string>88.IBPluginDependency</string> + <string>88.IBViewBoundsToFrameTransform</string> <string>89.IBPluginDependency</string> + <string>89.IBViewBoundsToFrameTransform</string> <string>9.IBPluginDependency</string> <string>9.IBSegmentedControlTracker.RoundRobinState</string> <string>9.IBSegmentedControlTracker.WasGrowing</string> + <string>9.IBViewBoundsToFrameTransform</string> <string>90.IBAttributePlaceholdersKey</string> <string>90.IBPluginDependency</string> + <string>90.IBViewBoundsToFrameTransform</string> <string>91.IBAttributePlaceholdersKey</string> <string>91.IBPluginDependency</string> + <string>91.IBViewBoundsToFrameTransform</string> <string>92.IBPluginDependency</string> <string>93.IBPluginDependency</string> + <string>93.IBViewBoundsToFrameTransform</string> <string>94.IBPluginDependency</string> + <string>94.IBViewBoundsToFrameTransform</string> <string>95.IBPluginDependency</string> + <string>95.IBViewBoundsToFrameTransform</string> <string>96.IBPluginDependency</string> + <string>96.IBViewBoundsToFrameTransform</string> <string>97.IBPluginDependency</string> + <string>97.IBViewBoundsToFrameTransform</string> <string>98.IBPluginDependency</string> + <string>98.IBViewBoundsToFrameTransform</string> <string>99.IBPluginDependency</string> + <string>99.IBViewBoundsToFrameTransform</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{242, 231}, {667, 428}}</string> + <string>{{374, 169}, {667, 428}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{242, 231}, {667, 428}}</string> + <string>{{374, 169}, {667, 428}}</string> <integer value="1"/> - <integer value="0"/> <boolean value="NO"/> - <string>{3.40282e+38, 3.40282e+38}</string> + <boolean value="NO"/> + <string>{667, 428}</string> <string>{560, 200}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABD/IAAwhAAAA</bytes> + </object> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABCwAAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDLwAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDJAAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDGQAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDDgAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDXQAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDUgAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDRwAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDPAAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDhYAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABCxAAAwhAAAA</bytes> + </object> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDgAAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDdQAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDagAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDnIAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDlwAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDkYAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDjAAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDyoAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDxQAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDv4AAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABBmAAAwhAAAA</bytes> + </object> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDugAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDs4AAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDrgAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDqIAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDowAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABCpgAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABCkAAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABCdAAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABCSAAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDAQAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABC7AAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABC1gAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABCwAAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDLwAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDJAAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDGQAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDDgAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDXQAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDUgAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDRwAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDPAAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDhYAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDgAAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDdQAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDagAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDnIAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDlwAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDkYAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDjAAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDyoAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDxQAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDv4AAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDugAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDs4AAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDrgAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDqIAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDowAAwzMAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -6990,6 +7270,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="0"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -7036,12 +7317,24 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDzgAAwvQAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDzgAAwsoAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDzgAAwqAAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABD0AAAwngAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -7053,20 +7346,44 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDxoAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDmIAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDVQAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABC8gAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>SPEditSheetTextView</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDxoAAwzQAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDmIAAwzQAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDVQAAwzQAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABC8gAAwzQAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -7082,6 +7399,9 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDiYAAwugAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> @@ -7092,6 +7412,9 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDiYAAwsQAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -7104,6 +7427,9 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDiYAAwqAAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> @@ -7114,6 +7440,9 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDt4AAwugAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> @@ -7124,6 +7453,9 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDoIAAwugAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> @@ -7134,6 +7466,9 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDt4AAwsQAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> @@ -7144,6 +7479,9 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDoIAAwsQAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -7157,8 +7495,15 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDt4AAwp4AAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">AUCgAABCLAAAA</bytes> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>SPImageView</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -7177,22 +7522,33 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{344, 538}, {411, 218}}</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDyIAAwhAAAA</bytes> + </object> + <string>{{535, 638}, {439, 218}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{344, 538}, {411, 218}}</string> + <string>{{535, 638}, {439, 218}}</string> <boolean value="NO"/> <string>{196, 240}</string> <string>{{357, 418}, {480, 270}}</string> <boolean value="YES"/> <boolean value="YES"/> + <string>{439, 218}</string> <string>{411, 218}</string> - <string>{411, 218}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">AQAAAABCQAAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAAC/gAAAwhAAAA</bytes> + </object> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDrQAAwhAAAA</bytes> + </object> <integer value="1"/> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> @@ -7203,12 +7559,27 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABC/AAAwqAAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABCDAAAwp4AAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABAoAAAwsIAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABAoAAAwugAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="0"/> <integer value="1"/> + <integer value="1"/> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDUAAAwgQAAA</bytes> + </object> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> <object class="IBToolTipAttribute" key="NS.object.0"> @@ -7218,6 +7589,9 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABC/AAAwsQAAA</bytes> + </object> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> <object class="IBToolTipAttribute" key="NS.object.0"> @@ -7227,14 +7601,38 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABC/AAAwugAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABCpgAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABCkAAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABCdAAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABCSAAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABDAQAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABC7AAAwxcAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABC1gAAwxcAAA</bytes> + </object> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> @@ -7253,7 +7651,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">531</int> + <int key="maxID">532</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -7297,6 +7695,13 @@ <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> + <string key="minorKey">Frameworks/PSMTabBar/PSMTabBarController.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/SPConnectionController.h</string> </object> </object> @@ -8330,15 +8735,12 @@ <string key="minorKey"/> </object> </object> - </object> - <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+"> - <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBPartialClassDescription"> <string key="className">SPWindow</string> <string key="superclassName">NSWindow</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBDocumentRelativeSource</string> - <string key="minorKey">../../Source/SPWindow.h</string> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">Source/SPWindow.h</string> </object> </object> </object> diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib index 9b2d90a0..be398c23 100644 --- a/Interfaces/English.lproj/MainMenu.xib +++ b/Interfaces/English.lproj/MainMenu.xib @@ -2,17 +2,17 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10J567</string> - <string key="IBDocument.InterfaceBuilderVersion">788</string> + <string key="IBDocument.SystemVersion">10J869</string> + <string key="IBDocument.InterfaceBuilderVersion">851</string> <string key="IBDocument.AppKitVersion">1038.35</string> - <string key="IBDocument.HIToolboxVersion">462.00</string> + <string key="IBDocument.HIToolboxVersion">461.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">788</string> + <string key="NS.object.0">851</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="498"/> + <integer value="169"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -671,6 +671,14 @@ <reference key="NSOnImage" ref="625762401"/> <reference key="NSMixedImage" ref="315854375"/> </object> + <object class="NSMenuItem" id="513095088"> + <reference key="NSMenu" ref="71086556"/> + <string key="NSTitle">Edit all fields in pop-up sheets</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="625762401"/> + <reference key="NSMixedImage" ref="315854375"/> + </object> <object class="NSMenuItem" id="16954220"> <reference key="NSMenu" ref="71086556"/> <bool key="NSIsDisabled">YES</bool> @@ -1201,6 +1209,16 @@ <reference key="NSOnImage" ref="625762401"/> <reference key="NSMixedImage" ref="315854375"/> </object> + <object class="NSMenuItem" id="74844157"> + <reference key="NSMenu" ref="172963563"/> + <bool key="NSIsAlternate">YES</bool> + <string key="NSTitle">Drop Database...</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="625762401"/> + <reference key="NSMixedImage" ref="315854375"/> + </object> <object class="NSMenuItem" id="817548288"> <reference key="NSMenu" ref="172963563"/> <bool key="NSIsDisabled">YES</bool> @@ -2070,6 +2088,13 @@ </object> </object> </object> + <object class="NSUserDefaultsController" id="461495932"> + <object class="NSMutableArray" key="NSDeclaredKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>EditInSheetEnabled</string> + </object> + <bool key="NSSharedInstance">YES</bool> + </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> <object class="NSMutableArray" key="connectionRecords"> @@ -3130,6 +3155,30 @@ </object> <int key="connectionID">1193</int> </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">removeDatabase:</string> + <reference key="source" ref="63651044"/> + <reference key="destination" ref="74844157"/> + </object> + <int key="connectionID">1208</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: values.EditInSheetEnabled</string> + <reference key="source" ref="513095088"/> + <reference key="destination" ref="461495932"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="513095088"/> + <reference key="NSDestination" ref="461495932"/> + <string key="NSLabel">value: values.EditInSheetEnabled</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">values.EditInSheetEnabled</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1212</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -3497,6 +3546,7 @@ <reference ref="219440274"/> <reference ref="929597005"/> <reference ref="988156931"/> + <reference ref="74844157"/> </object> <reference key="parent" ref="693420496"/> </object> @@ -3748,6 +3798,7 @@ <reference ref="765987997"/> <reference ref="784426029"/> <reference ref="496107824"/> + <reference ref="513095088"/> </object> <reference key="parent" ref="119995921"/> </object> @@ -4575,6 +4626,21 @@ <reference key="object" ref="988156931"/> <reference key="parent" ref="172963563"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">1207</int> + <reference key="object" ref="74844157"/> + <reference key="parent" ref="172963563"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1209</int> + <reference key="object" ref="513095088"/> + <reference key="parent" ref="71086556"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1210</int> + <reference key="object" ref="461495932"/> + <reference key="parent" ref="0"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -4623,7 +4689,9 @@ <string>1095.IBPluginDependency</string> <string>1101.IBPluginDependency</string> <string>1102.IBPluginDependency</string> + <string>1103.IBAttributePlaceholdersKey</string> <string>1103.IBPluginDependency</string> + <string>1104.IBAttributePlaceholdersKey</string> <string>1104.IBPluginDependency</string> <string>111.IBPluginDependency</string> <string>111.ImportedFromIB2</string> @@ -4654,6 +4722,11 @@ <string>1189.IBPluginDependency</string> <string>1194.IBPluginDependency</string> <string>1195.IBPluginDependency</string> + <string>1207.IBAttributePlaceholdersKey</string> + <string>1207.IBPluginDependency</string> + <string>1207.ImportedFromIB2</string> + <string>1207.notes</string> + <string>1209.IBPluginDependency</string> <string>129.IBPluginDependency</string> <string>129.ImportedFromIB2</string> <string>130.IBEditorWindowLastContentRect</string> @@ -4780,8 +4853,10 @@ <string>628.editorWindowContentRectSynchronizationRect</string> <string>629.IBPluginDependency</string> <string>629.ImportedFromIB2</string> + <string>631.IBAttributePlaceholdersKey</string> <string>631.IBPluginDependency</string> <string>631.ImportedFromIB2</string> + <string>631.notes</string> <string>633.IBPluginDependency</string> <string>633.ImportedFromIB2</string> <string>634.IBPluginDependency</string> @@ -4990,7 +5065,23 @@ <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="952513030"/> + <string key="toolTip">Select the next tab in this window. Can also be accessed via ⇧⌘] or ⌥⌘→</string> + </object> + </object> <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="591568093"/> + <string key="toolTip">Select the previous tab in this window. Can also be accessed via ⇧⌘[ or ⌥⌘←</string> + </object> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -5041,7 +5132,7 @@ </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{704, 478}, {64, 6}}</string> + <string>{{633, 476}, {64, 6}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> @@ -5056,6 +5147,21 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSMutableDictionary"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference key="dict.sortedKeys" ref="0"/> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <object class="NSMutableAttributedString"> + <object class="NSMutableString" key="NSString"> + <characters key="NS.bytes"/> + </object> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{562, 439}, {64, 6}}</string> @@ -5102,7 +5208,7 @@ <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{402, 179}, {280, 303}}</string> + <string>{{402, 159}, {313, 323}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{654, 613}, {157, 223}}</string> @@ -5176,14 +5282,26 @@ <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{567, 171}, {273, 313}}</string> + <string>{{496, 149}, {273, 333}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{312, 683}, {231, 153}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> + <object class="NSMutableDictionary"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference key="dict.sortedKeys" ref="0"/> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> + <object class="NSMutableAttributedString"> + <object class="NSMutableString" key="NSString"> + <characters key="NS.bytes"/> + </object> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -5243,7 +5361,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{648, 251}, {292, 233}}</string> + <string>{{577, 249}, {292, 233}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{829, 663}, {268, 173}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -5442,7 +5560,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">1206</int> + <int key="maxID">1212</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -5721,6 +5839,13 @@ </object> <object class="IBPartialClassDescription"> <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">Frameworks/PSMTabBar/PSMTabBarController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier" id="296977353"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">Source/SPConnectionController.h</string> @@ -5937,6 +6062,38 @@ <object class="IBPartialClassDescription"> <string key="className">PSMTabBarControl</string> <string key="superclassName">NSControl</string> + <object class="NSMutableDictionary" key="actions"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>overflowMenuAction:</string> + <string>tabClick:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>id</string> + </object> + </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>overflowMenuAction:</string> + <string>tabClick:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBActionInfo"> + <string key="name">overflowMenuAction:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">tabClick:</string> + <string key="candidateClassName">id</string> + </object> + </object> + </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> @@ -7064,35 +7221,14 @@ </object> </object> <object class="NSMutableDictionary" key="outlets"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>mySQLConnection</string> - <string>tableInstance</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> - </object> + <string key="NS.key.0">mySQLConnection</string> + <string key="NS.object.0">id</string> </object> <object class="NSMutableDictionary" key="toOneOutletInfosByName"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>mySQLConnection</string> - <string>tableInstance</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBToOneOutletInfo"> - <string key="name">mySQLConnection</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">tableInstance</string> - <string key="candidateClassName">id</string> - </object> + <string key="NS.key.0">mySQLConnection</string> + <object class="IBToOneOutletInfo" key="NS.object.0"> + <string key="name">mySQLConnection</string> + <string key="candidateClassName">id</string> </object> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -7109,590 +7245,6 @@ </object> </object> <object class="IBPartialClassDescription"> - <string key="className">SPCustomQuery</string> - <string key="superclassName">NSObject</string> - <object class="NSMutableDictionary" key="actions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>chooseQueryFavorite:</string> - <string>chooseQueryHistory:</string> - <string>clearQueryHistory:</string> - <string>closeSheet:</string> - <string>copyQueryHistory:</string> - <string>filterQueryFavorites:</string> - <string>filterQueryHistory:</string> - <string>gearMenuItemSelected:</string> - <string>helpSearchFindNextInPage:</string> - <string>helpSearchFindPreviousInPage:</string> - <string>helpSegmentDispatcher:</string> - <string>helpSelectHelpTargetMySQL:</string> - <string>helpSelectHelpTargetPage:</string> - <string>helpSelectHelpTargetWeb:</string> - <string>helpTargetDispatcher:</string> - <string>runAllQueries:</string> - <string>runSelectedQueries:</string> - <string>saveQueryHistory:</string> - <string>showAutoHelpForCurrentWord:</string> - <string>showCompletionList:</string> - <string>showHelpForCurrentWord:</string> - <string>showHelpForSearchString:</string> - <string>toggleQueryInfoPaneCollapse:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - </object> - </object> - <object class="NSMutableDictionary" key="actionInfosByName"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>chooseQueryFavorite:</string> - <string>chooseQueryHistory:</string> - <string>clearQueryHistory:</string> - <string>closeSheet:</string> - <string>copyQueryHistory:</string> - <string>filterQueryFavorites:</string> - <string>filterQueryHistory:</string> - <string>gearMenuItemSelected:</string> - <string>helpSearchFindNextInPage:</string> - <string>helpSearchFindPreviousInPage:</string> - <string>helpSegmentDispatcher:</string> - <string>helpSelectHelpTargetMySQL:</string> - <string>helpSelectHelpTargetPage:</string> - <string>helpSelectHelpTargetWeb:</string> - <string>helpTargetDispatcher:</string> - <string>runAllQueries:</string> - <string>runSelectedQueries:</string> - <string>saveQueryHistory:</string> - <string>showAutoHelpForCurrentWord:</string> - <string>showCompletionList:</string> - <string>showHelpForCurrentWord:</string> - <string>showHelpForSearchString:</string> - <string>toggleQueryInfoPaneCollapse:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBActionInfo"> - <string key="name">chooseQueryFavorite:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">chooseQueryHistory:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">clearQueryHistory:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">closeSheet:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">copyQueryHistory:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">filterQueryFavorites:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">filterQueryHistory:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">gearMenuItemSelected:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">helpSearchFindNextInPage:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">helpSearchFindPreviousInPage:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">helpSegmentDispatcher:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">helpSelectHelpTargetMySQL:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">helpSelectHelpTargetPage:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">helpSelectHelpTargetWeb:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">helpTargetDispatcher:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">runAllQueries:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">runSelectedQueries:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">saveQueryHistory:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">showAutoHelpForCurrentWord:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">showCompletionList:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">showHelpForCurrentWord:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">showHelpForSearchString:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">toggleQueryInfoPaneCollapse:</string> - <string key="candidateClassName">id</string> - </object> - </object> - </object> - <object class="NSMutableDictionary" key="outlets"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>affectedRowsText</string> - <string>autohelpMenuItem</string> - <string>autoindentMenuItem</string> - <string>autopairMenuItem</string> - <string>autouppercaseKeywordsMenuItem</string> - <string>clearHistoryMenuItem</string> - <string>commentCurrentQueryMenuItem</string> - <string>commentLineOrSelectionMenuItem</string> - <string>completionListMenuItem</string> - <string>copyHistoryMenuItem</string> - <string>customQueryScrollView</string> - <string>customQueryView</string> - <string>editorFontMenuItem</string> - <string>encodingPopUp</string> - <string>errorText</string> - <string>errorTextScrollView</string> - <string>helpNavigator</string> - <string>helpSearchField</string> - <string>helpSearchFieldCell</string> - <string>helpTargetSelector</string> - <string>helpWebView</string> - <string>helpWebViewWindow</string> - <string>multipleLineEditingButton</string> - <string>nextHistoryMenuItem</string> - <string>previousHistoryMenuItem</string> - <string>queryFavoriteNameTextField</string> - <string>queryFavoritesButton</string> - <string>queryFavoritesSaveAllMenuItem</string> - <string>queryFavoritesSaveAsMenuItem</string> - <string>queryFavoritesSearchField</string> - <string>queryFavoritesSearchFieldView</string> - <string>queryFavoritesSearchMenuItem</string> - <string>queryFavoritesSheet</string> - <string>queryHistoryButton</string> - <string>queryHistorySearchField</string> - <string>queryHistorySearchFieldView</string> - <string>queryHistorySearchMenuItem</string> - <string>queryInfoButton</string> - <string>queryInfoPaneSplitView</string> - <string>runAllButton</string> - <string>runAllMenuItem</string> - <string>runSelectionButton</string> - <string>runSelectionMenuItem</string> - <string>saveHistoryMenuItem</string> - <string>saveQueryFavoriteButton</string> - <string>saveQueryFavoriteGlobal</string> - <string>shiftLeftMenuItem</string> - <string>shiftRightMenuItem</string> - <string>tableDocumentInstance</string> - <string>tablesListInstance</string> - <string>textView</string> - <string>valueSheet</string> - <string>valueTextField</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>NSMenuItem</string> - <string>NSMenuItem</string> - <string>NSMenuItem</string> - <string>NSMenuItem</string> - <string>NSMenuItem</string> - <string>NSMenuItem</string> - <string>NSMenuItem</string> - <string>NSMenuItem</string> - <string>NSMenuItem</string> - <string>NSScrollView</string> - <string>SPCopyTable</string> - <string>NSMenuItem</string> - <string>NSPopUpButton</string> - <string>id</string> - <string>NSScrollView</string> - <string>NSSegmentedControl</string> - <string>NSSearchField</string> - <string>NSSearchFieldCell</string> - <string>NSSegmentedControl</string> - <string>WebView</string> - <string>NSWindow</string> - <string>id</string> - <string>NSMenuItem</string> - <string>NSMenuItem</string> - <string>NSTextField</string> - <string>id</string> - <string>NSMenuItem</string> - <string>NSMenuItem</string> - <string>NSSearchField</string> - <string>id</string> - <string>NSMenuItem</string> - <string>NSWindow</string> - <string>id</string> - <string>NSSearchField</string> - <string>id</string> - <string>NSMenuItem</string> - <string>NSButton</string> - <string>BWSplitView</string> - <string>id</string> - <string>NSMenuItem</string> - <string>id</string> - <string>NSMenuItem</string> - <string>NSMenuItem</string> - <string>NSButton</string> - <string>id</string> - <string>NSMenuItem</string> - <string>NSMenuItem</string> - <string>id</string> - <string>id</string> - <string>SPTextView</string> - <string>id</string> - <string>id</string> - </object> - </object> - <object class="NSMutableDictionary" key="toOneOutletInfosByName"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>affectedRowsText</string> - <string>autohelpMenuItem</string> - <string>autoindentMenuItem</string> - <string>autopairMenuItem</string> - <string>autouppercaseKeywordsMenuItem</string> - <string>clearHistoryMenuItem</string> - <string>commentCurrentQueryMenuItem</string> - <string>commentLineOrSelectionMenuItem</string> - <string>completionListMenuItem</string> - <string>copyHistoryMenuItem</string> - <string>customQueryScrollView</string> - <string>customQueryView</string> - <string>editorFontMenuItem</string> - <string>encodingPopUp</string> - <string>errorText</string> - <string>errorTextScrollView</string> - <string>helpNavigator</string> - <string>helpSearchField</string> - <string>helpSearchFieldCell</string> - <string>helpTargetSelector</string> - <string>helpWebView</string> - <string>helpWebViewWindow</string> - <string>multipleLineEditingButton</string> - <string>nextHistoryMenuItem</string> - <string>previousHistoryMenuItem</string> - <string>queryFavoriteNameTextField</string> - <string>queryFavoritesButton</string> - <string>queryFavoritesSaveAllMenuItem</string> - <string>queryFavoritesSaveAsMenuItem</string> - <string>queryFavoritesSearchField</string> - <string>queryFavoritesSearchFieldView</string> - <string>queryFavoritesSearchMenuItem</string> - <string>queryFavoritesSheet</string> - <string>queryHistoryButton</string> - <string>queryHistorySearchField</string> - <string>queryHistorySearchFieldView</string> - <string>queryHistorySearchMenuItem</string> - <string>queryInfoButton</string> - <string>queryInfoPaneSplitView</string> - <string>runAllButton</string> - <string>runAllMenuItem</string> - <string>runSelectionButton</string> - <string>runSelectionMenuItem</string> - <string>saveHistoryMenuItem</string> - <string>saveQueryFavoriteButton</string> - <string>saveQueryFavoriteGlobal</string> - <string>shiftLeftMenuItem</string> - <string>shiftRightMenuItem</string> - <string>tableDocumentInstance</string> - <string>tablesListInstance</string> - <string>textView</string> - <string>valueSheet</string> - <string>valueTextField</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBToOneOutletInfo"> - <string key="name">affectedRowsText</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">autohelpMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">autoindentMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">autopairMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">autouppercaseKeywordsMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">clearHistoryMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">commentCurrentQueryMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">commentLineOrSelectionMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">completionListMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">copyHistoryMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">customQueryScrollView</string> - <string key="candidateClassName">NSScrollView</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">customQueryView</string> - <string key="candidateClassName">SPCopyTable</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">editorFontMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">encodingPopUp</string> - <string key="candidateClassName">NSPopUpButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">errorText</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">errorTextScrollView</string> - <string key="candidateClassName">NSScrollView</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">helpNavigator</string> - <string key="candidateClassName">NSSegmentedControl</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">helpSearchField</string> - <string key="candidateClassName">NSSearchField</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">helpSearchFieldCell</string> - <string key="candidateClassName">NSSearchFieldCell</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">helpTargetSelector</string> - <string key="candidateClassName">NSSegmentedControl</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">helpWebView</string> - <string key="candidateClassName">WebView</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">helpWebViewWindow</string> - <string key="candidateClassName">NSWindow</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">multipleLineEditingButton</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">nextHistoryMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">previousHistoryMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">queryFavoriteNameTextField</string> - <string key="candidateClassName">NSTextField</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">queryFavoritesButton</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">queryFavoritesSaveAllMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">queryFavoritesSaveAsMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">queryFavoritesSearchField</string> - <string key="candidateClassName">NSSearchField</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">queryFavoritesSearchFieldView</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">queryFavoritesSearchMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">queryFavoritesSheet</string> - <string key="candidateClassName">NSWindow</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">queryHistoryButton</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">queryHistorySearchField</string> - <string key="candidateClassName">NSSearchField</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">queryHistorySearchFieldView</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">queryHistorySearchMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">queryInfoButton</string> - <string key="candidateClassName">NSButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">queryInfoPaneSplitView</string> - <string key="candidateClassName">BWSplitView</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">runAllButton</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">runAllMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">runSelectionButton</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">runSelectionMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">saveHistoryMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">saveQueryFavoriteButton</string> - <string key="candidateClassName">NSButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">saveQueryFavoriteGlobal</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">shiftLeftMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">shiftRightMenuItem</string> - <string key="candidateClassName">NSMenuItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">tableDocumentInstance</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">tablesListInstance</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">textView</string> - <string key="candidateClassName">SPTextView</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">valueSheet</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">valueTextField</string> - <string key="candidateClassName">id</string> - </object> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Source/SPCustomQuery.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">SPCustomQuery</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBUserSource</string> - <string key="minorKey"/> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">SPDatabaseDocument</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> @@ -8032,7 +7584,6 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>activitiesScrollView</string> <string>addDatabaseButton</string> <string>chooseDatabaseButton</string> <string>connectionErrorDialog</string> @@ -8054,6 +7605,8 @@ <string>databaseRenameSheet</string> <string>databaseSheet</string> <string>dbTablesTableView</string> + <string>delegate</string> + <string>documentActivityScrollView</string> <string>encodingPopUp</string> <string>exportControllerInstance</string> <string>extendedTableInfoInstance</string> @@ -8105,7 +7658,6 @@ </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSScrollView</string> <string>id</string> <string>id</string> <string>NSWindow</string> @@ -8127,6 +7679,8 @@ <string>id</string> <string>id</string> <string>NSTableView</string> + <string>id</string> + <string>NSScrollView</string> <string>NSPopUpButton</string> <string>id</string> <string>id</string> @@ -8138,13 +7692,16 @@ <string>id</string> <string>NSSearchField</string> <string>NSView</string> + <string>NSProgressIndicator</string> <string>id</string> <string>id</string> <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> + <string>NSButton</string> + <string>NSButton</string> <string>NSSecureTextField</string> + <string>NSButton</string> + <string>NSButton</string> + <string>NSButton</string> <string>id</string> <string>id</string> <string>id</string> @@ -8152,21 +7709,18 @@ <string>id</string> <string>id</string> <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> + <string>SPTableContent</string> + <string>SPTableData</string> <string>id</string> <string>NSButton</string> <string>NSScrollView</string> <string>NSTableView</string> <string>NSSplitView</string> <string>id</string> - <string>id</string> + <string>SPTableStructure</string> <string>NSTabView</string> <string>id</string> - <string>id</string> + <string>SPTablesList</string> <string>NSButton</string> <string>id</string> <string>id</string> @@ -8181,7 +7735,6 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>activitiesScrollView</string> <string>addDatabaseButton</string> <string>chooseDatabaseButton</string> <string>connectionErrorDialog</string> @@ -8203,6 +7756,8 @@ <string>databaseRenameSheet</string> <string>databaseSheet</string> <string>dbTablesTableView</string> + <string>delegate</string> + <string>documentActivityScrollView</string> <string>encodingPopUp</string> <string>exportControllerInstance</string> <string>extendedTableInfoInstance</string> @@ -8255,10 +7810,6 @@ <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBToOneOutletInfo"> - <string key="name">activitiesScrollView</string> - <string key="candidateClassName">NSScrollView</string> - </object> - <object class="IBToOneOutletInfo"> <string key="name">addDatabaseButton</string> <string key="candidateClassName">id</string> </object> @@ -8343,6 +7894,14 @@ <string key="candidateClassName">NSTableView</string> </object> <object class="IBToOneOutletInfo"> + <string key="name">delegate</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">documentActivityScrollView</string> + <string key="candidateClassName">NSScrollView</string> + </object> + <object class="IBToOneOutletInfo"> <string key="name">encodingPopUp</string> <string key="candidateClassName">NSPopUpButton</string> </object> @@ -8388,7 +7947,7 @@ </object> <object class="IBToOneOutletInfo"> <string key="name">queryProgressBar</string> - <string key="candidateClassName">id</string> + <string key="candidateClassName">NSProgressIndicator</string> </object> <object class="IBToOneOutletInfo"> <string key="name">renameDatabaseButton</string> @@ -8404,11 +7963,11 @@ </object> <object class="IBToOneOutletInfo"> <string key="name">saveConnectionAutoConnect</string> - <string key="candidateClassName">id</string> + <string key="candidateClassName">NSButton</string> </object> <object class="IBToOneOutletInfo"> <string key="name">saveConnectionEncrypt</string> - <string key="candidateClassName">id</string> + <string key="candidateClassName">NSButton</string> </object> <object class="IBToOneOutletInfo"> <string key="name">saveConnectionEncryptString</string> @@ -8416,15 +7975,15 @@ </object> <object class="IBToOneOutletInfo"> <string key="name">saveConnectionIncludeData</string> - <string key="candidateClassName">id</string> + <string key="candidateClassName">NSButton</string> </object> <object class="IBToOneOutletInfo"> <string key="name">saveConnectionIncludeQuery</string> - <string key="candidateClassName">id</string> + <string key="candidateClassName">NSButton</string> </object> <object class="IBToOneOutletInfo"> <string key="name">saveConnectionSavePassword</string> - <string key="candidateClassName">id</string> + <string key="candidateClassName">NSButton</string> </object> <object class="IBToOneOutletInfo"> <string key="name">saveConnectionSavePasswordAlert</string> @@ -8456,11 +8015,11 @@ </object> <object class="IBToOneOutletInfo"> <string key="name">tableContentInstance</string> - <string key="candidateClassName">id</string> + <string key="candidateClassName">SPTableContent</string> </object> <object class="IBToOneOutletInfo"> <string key="name">tableDataInstance</string> - <string key="candidateClassName">id</string> + <string key="candidateClassName">SPTableData</string> </object> <object class="IBToOneOutletInfo"> <string key="name">tableDumpInstance</string> @@ -8488,7 +8047,7 @@ </object> <object class="IBToOneOutletInfo"> <string key="name">tableSourceInstance</string> - <string key="candidateClassName">id</string> + <string key="candidateClassName">SPTableStructure</string> </object> <object class="IBToOneOutletInfo"> <string key="name">tableTabView</string> @@ -8500,7 +8059,7 @@ </object> <object class="IBToOneOutletInfo"> <string key="name">tablesListInstance</string> - <string key="candidateClassName">id</string> + <string key="candidateClassName">SPTablesList</string> </object> <object class="IBToOneOutletInfo"> <string key="name">taskCancelButton</string> @@ -8666,6 +8225,7 @@ <string>switchInput:</string> <string>toggleAdvancedExportOptionsView:</string> <string>toggleCustomFilenameFormatView:</string> + <string>toggleNewFilePerTable:</string> <string>toggleSQLIncludeContent:</string> <string>toggleSQLIncludeDropSyntax:</string> <string>toggleSQLIncludeStructure:</string> @@ -8688,6 +8248,7 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="actionInfosByName"> @@ -8705,6 +8266,7 @@ <string>switchInput:</string> <string>toggleAdvancedExportOptionsView:</string> <string>toggleCustomFilenameFormatView:</string> + <string>toggleNewFilePerTable:</string> <string>toggleSQLIncludeContent:</string> <string>toggleSQLIncludeDropSyntax:</string> <string>toggleSQLIncludeStructure:</string> @@ -8757,6 +8319,10 @@ <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> + <string key="name">toggleNewFilePerTable:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> <string key="name">toggleSQLIncludeContent:</string> <string key="candidateClassName">id</string> </object> @@ -8801,6 +8367,7 @@ <string>exportExcelSheetOrFilePerTableMatrix</string> <string>exportFilePerTableCheck</string> <string>exportFilenameDividerBox</string> + <string>exportFormatInfoText</string> <string>exportInputPopUpButton</string> <string>exportOptionsTabBar</string> <string>exportOutputCompressionFormatPopupButton</string> @@ -8859,6 +8426,7 @@ <string>NSMatrix</string> <string>NSButton</string> <string>NSBox</string> + <string>NSTextField</string> <string>NSPopUpButton</string> <string>NSTabView</string> <string>NSPopUpButton</string> @@ -8920,6 +8488,7 @@ <string>exportExcelSheetOrFilePerTableMatrix</string> <string>exportFilePerTableCheck</string> <string>exportFilenameDividerBox</string> + <string>exportFormatInfoText</string> <string>exportInputPopUpButton</string> <string>exportOptionsTabBar</string> <string>exportOutputCompressionFormatPopupButton</string> @@ -9048,6 +8617,10 @@ <string key="candidateClassName">NSBox</string> </object> <object class="IBToOneOutletInfo"> + <string key="name">exportFormatInfoText</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> <string key="name">exportInputPopUpButton</string> <string key="candidateClassName">NSPopUpButton</string> </object> @@ -9320,6 +8893,7 @@ <string>saveServerProcesses:</string> <string>setAutoRefreshInterval:</string> <string>setCustomAutoRefreshInterval:</string> + <string>toggeleShowFullProcessList:</string> <string>toggleProcessListAutoRefresh:</string> <string>toggleShowProcessID:</string> </object> @@ -9335,6 +8909,7 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="actionInfosByName"> @@ -9349,6 +8924,7 @@ <string>saveServerProcesses:</string> <string>setAutoRefreshInterval:</string> <string>setCustomAutoRefreshInterval:</string> + <string>toggeleShowFullProcessList:</string> <string>toggleProcessListAutoRefresh:</string> <string>toggleShowProcessID:</string> </object> @@ -9387,6 +8963,10 @@ <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> + <string key="name">toggeleShowFullProcessList:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> <string key="name">toggleProcessListAutoRefresh:</string> <string key="candidateClassName">id</string> </object> @@ -9750,80 +9330,6 @@ </object> </object> </object> - <object class="NSMutableDictionary" key="outlets"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>encodingPopUp</string> - <string>favoriteNameTextField</string> - <string>favoriteQueryTextView</string> - <string>favoriteTabTriggerTextField</string> - <string>favoritesArrayController</string> - <string>favoritesTableView</string> - <string>removeButton</string> - <string>splitViewButtonBar</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSPopUpButton</string> - <string>NSTextField</string> - <string>SPTextView</string> - <string>NSTextField</string> - <string>NSArrayController</string> - <string>NSTableView</string> - <string>NSButton</string> - <string>BWAnchoredButtonBar</string> - </object> - </object> - <object class="NSMutableDictionary" key="toOneOutletInfosByName"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>encodingPopUp</string> - <string>favoriteNameTextField</string> - <string>favoriteQueryTextView</string> - <string>favoriteTabTriggerTextField</string> - <string>favoritesArrayController</string> - <string>favoritesTableView</string> - <string>removeButton</string> - <string>splitViewButtonBar</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBToOneOutletInfo"> - <string key="name">encodingPopUp</string> - <string key="candidateClassName">NSPopUpButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">favoriteNameTextField</string> - <string key="candidateClassName">NSTextField</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">favoriteQueryTextView</string> - <string key="candidateClassName">SPTextView</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">favoriteTabTriggerTextField</string> - <string key="candidateClassName">NSTextField</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">favoritesArrayController</string> - <string key="candidateClassName">NSArrayController</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">favoritesTableView</string> - <string key="candidateClassName">NSTableView</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">removeButton</string> - <string key="candidateClassName">NSButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">splitViewButtonBar</string> - <string key="candidateClassName">BWAnchoredButtonBar</string> - </object> - </object> - </object> <reference key="sourceIdentifier" ref="381988713"/> </object> <object class="IBPartialClassDescription"> @@ -9934,6 +9440,287 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">SPTableContent</string> + <string key="superclassName">NSObject</string> + <object class="NSMutableDictionary" key="actions"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>addRow:</string> + <string>closeSheet:</string> + <string>copyRow:</string> + <string>filterTable:</string> + <string>navigatePaginationFromButton:</string> + <string>reloadTable:</string> + <string>removeRow:</string> + <string>setCompareTypes:</string> + <string>setDefaultOperator:</string> + <string>showFilterTable:</string> + <string>swapFilterTable:</string> + <string>tableFilterClear:</string> + <string>toggleDistinctSelect:</string> + <string>toggleFilterField:</string> + <string>toggleLookAllFieldsMode:</string> + <string>toggleNegateClause:</string> + <string>togglePagination:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + </object> + </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>addRow:</string> + <string>closeSheet:</string> + <string>copyRow:</string> + <string>filterTable:</string> + <string>navigatePaginationFromButton:</string> + <string>reloadTable:</string> + <string>removeRow:</string> + <string>setCompareTypes:</string> + <string>setDefaultOperator:</string> + <string>showFilterTable:</string> + <string>swapFilterTable:</string> + <string>tableFilterClear:</string> + <string>toggleDistinctSelect:</string> + <string>toggleFilterField:</string> + <string>toggleLookAllFieldsMode:</string> + <string>toggleNegateClause:</string> + <string>togglePagination:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBActionInfo"> + <string key="name">addRow:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">closeSheet:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">copyRow:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">filterTable:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">navigatePaginationFromButton:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">reloadTable:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">removeRow:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">setCompareTypes:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">setDefaultOperator:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">showFilterTable:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">swapFilterTable:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">tableFilterClear:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">toggleDistinctSelect:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">toggleFilterField:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">toggleLookAllFieldsMode:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">toggleNegateClause:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">togglePagination:</string> + <string key="candidateClassName">id</string> + </object> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">Source/SPTableContent.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">SPTableData</string> + <string key="superclassName">NSObject</string> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>tableDocumentInstance</string> + <string>tableListInstance</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>SPDatabaseDocument</string> + <string>SPTablesList</string> + </object> + </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>tableDocumentInstance</string> + <string>tableListInstance</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBToOneOutletInfo"> + <string key="name">tableDocumentInstance</string> + <string key="candidateClassName">SPDatabaseDocument</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">tableListInstance</string> + <string key="candidateClassName">SPTablesList</string> + </object> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">Source/SPTableData.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">SPTableStructure</string> + <string key="superclassName">NSObject</string> + <object class="NSMutableDictionary" key="actions"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>addField:</string> + <string>closeSheet:</string> + <string>copyField:</string> + <string>reloadTable:</string> + <string>removeField:</string> + <string>resetAutoIncrement:</string> + <string>showOptimizedFieldType:</string> + <string>toggleColumnView:</string> + <string>unhideIndexesView:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + </object> + </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>addField:</string> + <string>closeSheet:</string> + <string>copyField:</string> + <string>reloadTable:</string> + <string>removeField:</string> + <string>resetAutoIncrement:</string> + <string>showOptimizedFieldType:</string> + <string>toggleColumnView:</string> + <string>unhideIndexesView:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBActionInfo"> + <string key="name">addField:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">closeSheet:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">copyField:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">reloadTable:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">removeField:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">resetAutoIncrement:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">showOptimizedFieldType:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">toggleColumnView:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">unhideIndexesView:</string> + <string key="candidateClassName">id</string> + </object> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">Source/SPTableStructure.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">SPTableStructure</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">Source/SPTableStructureDelegate.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">SPTableView</string> <string key="superclassName">NSTableView</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -10056,8 +9843,10 @@ <string>renameTableMenuItem</string> <string>separatorTableContextMenuItem</string> <string>separatorTableContextMenuItem2</string> + <string>separatorTableContextMenuItem3</string> <string>separatorTableMenuItem</string> <string>separatorTableMenuItem2</string> + <string>separatorTableMenuItem3</string> <string>showCreateSyntaxContextMenuItem</string> <string>showCreateSyntaxMenuItem</string> <string>spHistoryControllerInstance</string> @@ -10086,7 +9875,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>id</string> <string>id</string> - <string>id</string> + <string>NSButton</string> <string>id</string> <string>id</string> <string>id</string> @@ -10108,10 +9897,12 @@ <string>NSMenuItem</string> <string>NSMenuItem</string> <string>NSMenuItem</string> + <string>NSMenuItem</string> + <string>NSMenuItem</string> <string>SPHistoryController</string> <string>id</string> <string>id</string> - <string>id</string> + <string>SPDatabaseDocument</string> <string>id</string> <string>id</string> <string>NSButton</string> @@ -10123,7 +9914,7 @@ <string>id</string> <string>id</string> <string>id</string> - <string>id</string> + <string>SPTableView</string> <string>id</string> <string>id</string> <string>id</string> @@ -10155,8 +9946,10 @@ <string>renameTableMenuItem</string> <string>separatorTableContextMenuItem</string> <string>separatorTableContextMenuItem2</string> + <string>separatorTableContextMenuItem3</string> <string>separatorTableMenuItem</string> <string>separatorTableMenuItem2</string> + <string>separatorTableMenuItem3</string> <string>showCreateSyntaxContextMenuItem</string> <string>showCreateSyntaxMenuItem</string> <string>spHistoryControllerInstance</string> @@ -10193,7 +9986,7 @@ </object> <object class="IBToOneOutletInfo"> <string key="name">copyTableContentSwitch</string> - <string key="candidateClassName">id</string> + <string key="candidateClassName">NSButton</string> </object> <object class="IBToOneOutletInfo"> <string key="name">copyTableMessageField</string> @@ -10264,6 +10057,10 @@ <string key="candidateClassName">NSMenuItem</string> </object> <object class="IBToOneOutletInfo"> + <string key="name">separatorTableContextMenuItem3</string> + <string key="candidateClassName">NSMenuItem</string> + </object> + <object class="IBToOneOutletInfo"> <string key="name">separatorTableMenuItem</string> <string key="candidateClassName">NSMenuItem</string> </object> @@ -10272,6 +10069,10 @@ <string key="candidateClassName">NSMenuItem</string> </object> <object class="IBToOneOutletInfo"> + <string key="name">separatorTableMenuItem3</string> + <string key="candidateClassName">NSMenuItem</string> + </object> + <object class="IBToOneOutletInfo"> <string key="name">showCreateSyntaxContextMenuItem</string> <string key="candidateClassName">NSMenuItem</string> </object> @@ -10293,7 +10094,7 @@ </object> <object class="IBToOneOutletInfo"> <string key="name">tableDocumentInstance</string> - <string key="candidateClassName">id</string> + <string key="candidateClassName">SPDatabaseDocument</string> </object> <object class="IBToOneOutletInfo"> <string key="name">tableDumpInstance</string> @@ -10341,7 +10142,7 @@ </object> <object class="IBToOneOutletInfo"> <string key="name">tablesListView</string> - <string key="candidateClassName">id</string> + <string key="candidateClassName">SPTableView</string> </object> <object class="IBToOneOutletInfo"> <string key="name">toolbarActionsButton</string> @@ -10376,79 +10177,6 @@ </object> </object> <object class="IBPartialClassDescription"> - <string key="className">SPTextView</string> - <string key="superclassName">NSTextView</string> - <object class="NSMutableDictionary" key="actions"> - <string key="NS.key.0">showMySQLHelpForCurrentWord:</string> - <string key="NS.object.0">id</string> - </object> - <object class="NSMutableDictionary" key="actionInfosByName"> - <string key="NS.key.0">showMySQLHelpForCurrentWord:</string> - <object class="IBActionInfo" key="NS.object.0"> - <string key="name">showMySQLHelpForCurrentWord:</string> - <string key="candidateClassName">id</string> - </object> - </object> - <object class="NSMutableDictionary" key="outlets"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>customQueryInstance</string> - <string>scrollView</string> - <string>tableDocumentInstance</string> - <string>tablesListInstance</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>SPCustomQuery</string> - <string>NSScrollView</string> - <string>SPDatabaseDocument</string> - <string>SPTablesList</string> - </object> - </object> - <object class="NSMutableDictionary" key="toOneOutletInfosByName"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>customQueryInstance</string> - <string>scrollView</string> - <string>tableDocumentInstance</string> - <string>tablesListInstance</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBToOneOutletInfo"> - <string key="name">customQueryInstance</string> - <string key="candidateClassName">SPCustomQuery</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">scrollView</string> - <string key="candidateClassName">NSScrollView</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">tableDocumentInstance</string> - <string key="candidateClassName">SPDatabaseDocument</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">tablesListInstance</string> - <string key="candidateClassName">SPTablesList</string> - </object> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Source/SPTextView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">SPTextView</string> - <string key="superclassName">NSTextView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBUserSource</string> - <string key="minorKey"/> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">SPUserManager</string> <string key="superclassName">NSWindowController</string> <object class="NSMutableDictionary" key="actions"> @@ -10462,6 +10190,7 @@ <string>closeErrorsSheet:</string> <string>doApply:</string> <string>doCancel:</string> + <string>doubleClickSchemaPriv:</string> <string>refresh:</string> <string>removeHost:</string> <string>removeSchemaPriv:</string> @@ -10482,6 +10211,7 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="actionInfosByName"> @@ -10495,6 +10225,7 @@ <string>closeErrorsSheet:</string> <string>doApply:</string> <string>doCancel:</string> + <string>doubleClickSchemaPriv:</string> <string>refresh:</string> <string>removeHost:</string> <string>removeSchemaPriv:</string> @@ -10532,6 +10263,10 @@ <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> + <string key="name">doubleClickSchemaPriv:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> <string key="name">refresh:</string> <string key="candidateClassName">id</string> </object> @@ -10884,14 +10619,6 @@ </object> </object> <object class="IBPartialClassDescription"> - <string key="className">NSActionCell</string> - <string key="superclassName">NSCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">NSApplication</string> <string key="superclassName">NSResponder</string> <object class="IBClassDescriptionSource" key="sourceIdentifier" id="984586479"> @@ -10974,14 +10701,6 @@ </object> </object> <object class="IBPartialClassDescription"> - <string key="className">NSCell</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">NSComboBox</string> <string key="superclassName">NSTextField</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -11644,14 +11363,6 @@ </object> </object> <object class="IBPartialClassDescription"> - <string key="className">NSSearchFieldCell</string> - <string key="superclassName">NSTextFieldCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSearchFieldCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">NSSecureTextField</string> <string key="superclassName">NSTextField</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -11705,14 +11416,6 @@ </object> </object> <object class="IBPartialClassDescription"> - <string key="className">NSTextFieldCell</string> - <string key="superclassName">NSActionCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">NSTextView</string> <string key="superclassName">NSText</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -11737,6 +11440,14 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">NSUserDefaultsController</string> + <string key="superclassName">NSController</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSUserDefaultsController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">NSView</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> diff --git a/Interfaces/English.lproj/SSHQuestionDialog.xib b/Interfaces/English.lproj/SSHQuestionDialog.xib index fc8bd36f..debb5f60 100644 --- a/Interfaces/English.lproj/SSHQuestionDialog.xib +++ b/Interfaces/English.lproj/SSHQuestionDialog.xib @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10C540</string> - <string key="IBDocument.InterfaceBuilderVersion">740</string> - <string key="IBDocument.AppKitVersion">1038.25</string> - <string key="IBDocument.HIToolboxVersion">458.00</string> + <string key="IBDocument.SystemVersion">10K540</string> + <string key="IBDocument.InterfaceBuilderVersion">851</string> + <string key="IBDocument.AppKitVersion">1038.36</string> + <string key="IBDocument.HIToolboxVersion">461.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">740</string> + <string key="NS.object.0">851</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -47,7 +47,7 @@ <string key="NSWindowTitle">SSH Tunnel Query</string> <string key="NSWindowClass">NSWindow</string> <nil key="NSViewClass"/> - <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> <object class="NSView" key="NSWindowView" id="414427165"> <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> @@ -75,7 +75,7 @@ <string key="NSColorName">controlColor</string> <object class="NSColor" key="NSColor"> <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes> + <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes> </object> </object> <object class="NSColor" key="NSTextColor" id="1062846423"> @@ -109,7 +109,7 @@ <int key="NSButtonFlags">-2038284033</int> <int key="NSButtonFlags2">129</int> <string key="NSAlternateContents"/> - <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string> + <string key="NSKeyEquivalent"/> <int key="NSPeriodicDelay">200</int> <int key="NSPeriodicInterval">25</int> </object> @@ -159,9 +159,9 @@ <reference key="NSSupport" ref="313221240"/> <reference key="NSControlView" ref="472545742"/> <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">268435585</int> + <int key="NSButtonFlags2">129</int> <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent">.</string> + <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string> <int key="NSPeriodicDelay">200</int> <int key="NSPeriodicInterval">25</int> </object> @@ -203,7 +203,7 @@ <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string> - <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> </object> <object class="NSWindowTemplate" id="317330000"> <int key="NSWindowStyleMask">1</int> @@ -213,7 +213,7 @@ <string key="NSWindowTitle">SSH Tunnel Password Query</string> <string key="NSWindowClass">NSWindow</string> <nil key="NSViewClass"/> - <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> <object class="NSView" key="NSWindowView" id="800993241"> <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> @@ -420,7 +420,7 @@ <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> - <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> @@ -506,6 +506,70 @@ </object> <int key="connectionID">497</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="819605912"/> + <reference key="destination" ref="472545742"/> + </object> + <int key="connectionID">499</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="472545742"/> + <reference key="destination" ref="819605912"/> + </object> + <int key="connectionID">500</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">initialFirstResponder</string> + <reference key="source" ref="513744381"/> + <reference key="destination" ref="819605912"/> + </object> + <int key="connectionID">501</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">initialFirstResponder</string> + <reference key="source" ref="317330000"/> + <reference key="destination" ref="951010250"/> + </object> + <int key="connectionID">502</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="920337090"/> + <reference key="destination" ref="881553485"/> + </object> + <int key="connectionID">508</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="881553485"/> + <reference key="destination" ref="951010250"/> + </object> + <int key="connectionID">509</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="951010250"/> + <reference key="destination" ref="107237198"/> + </object> + <int key="connectionID">510</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">nextKeyView</string> + <reference key="source" ref="107237198"/> + <reference key="destination" ref="920337090"/> + </object> + <int key="connectionID">511</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -812,9 +876,9 @@ <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{187, 404}, {620, 209}}</string> + <string>{{525, 498}, {620, 209}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{187, 404}, {620, 209}}</string> + <string>{{525, 498}, {620, 209}}</string> <boolean value="NO"/> <string>{{11, 666}, {480, 270}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -828,9 +892,9 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{127, 251}, {471, 209}}</string> + <string>{{638, 189}, {471, 209}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{127, 251}, {471, 209}}</string> + <string>{{638, 189}, {471, 209}}</string> <boolean value="NO"/> <string>{{11, 666}, {480, 270}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -868,13 +932,20 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">497</int> + <int key="maxID">511</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBPartialClassDescription"> <string key="className">NSApplication</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">Frameworks/PSMTabBar/PSMTabDragAssistant.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSApplication</string> <string key="superclassName">NSResponder</string> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -889,16 +960,35 @@ <string>NSTextField</string> </object> </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>sshQuestionDialog</string> + <string>sshQuestionText</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBToOneOutletInfo"> + <string key="name">sshQuestionDialog</string> + <string key="candidateClassName">NSWindow</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">sshQuestionText</string> + <string key="candidateClassName">NSTextField</string> + </object> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBUserSource</string> <string key="minorKey"/> </object> </object> <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> + <string key="className">NSMenu</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h</string> + <string key="minorKey">Source/SPMenuAdditions.h</string> </object> </object> <object class="IBPartialClassDescription"> @@ -912,7 +1002,21 @@ <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Source/CMImageView.h</string> + <string key="minorKey">Frameworks/PSMTabBar/PSMTabBarCell.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">Frameworks/PSMTabBar/PSMTabBarControl.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">Frameworks/PSMTabBar/PSMTabBarController.h</string> </object> </object> <object class="IBPartialClassDescription"> @@ -933,6 +1037,20 @@ <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> + <string key="minorKey">Source/SPImageView.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/SPMainThreadTrampoline.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/SPNotLoaded.h</string> </object> </object> @@ -949,9 +1067,16 @@ <string key="NS.key.0">toggleCollapse:</string> <string key="NS.object.0">id</string> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">toggleCollapse:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">toggleCollapse:</string> + <string key="candidateClassName">id</string> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Source/TablesList.h</string> + <string key="minorKey">Source/SPTablesList.h</string> </object> </object> <object class="IBPartialClassDescription"> @@ -960,6 +1085,13 @@ <string key="NS.key.0">closeSheet:</string> <string key="NS.object.0">id</string> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">closeSheet:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">closeSheet:</string> + <string key="candidateClassName">id</string> + </object> + </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> @@ -981,6 +1113,45 @@ <string>NSTextField</string> </object> </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>sshPasswordDialog</string> + <string>sshPasswordField</string> + <string>sshPasswordKeychainCheckbox</string> + <string>sshPasswordText</string> + <string>sshQuestionDialog</string> + <string>sshQuestionText</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBToOneOutletInfo"> + <string key="name">sshPasswordDialog</string> + <string key="candidateClassName">NSWindow</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">sshPasswordField</string> + <string key="candidateClassName">NSSecureTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">sshPasswordKeychainCheckbox</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">sshPasswordText</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">sshQuestionDialog</string> + <string key="candidateClassName">NSWindow</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">sshQuestionText</string> + <string key="candidateClassName">NSTextField</string> + </object> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBUserSource</string> <string key="minorKey"/> @@ -1009,6 +1180,25 @@ <string>id</string> </object> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>closeSSHPasswordSheet:</string> + <string>closeSSHQuestionSheet:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBActionInfo"> + <string key="name">closeSSHPasswordSheet:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">closeSSHQuestionSheet:</string> + <string key="candidateClassName">id</string> + </object> + </object> + </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> @@ -1032,6 +1222,50 @@ <string>NSTextField</string> </object> </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>delegate</string> + <string>sshPasswordDialog</string> + <string>sshPasswordField</string> + <string>sshPasswordKeychainCheckbox</string> + <string>sshPasswordText</string> + <string>sshQuestionDialog</string> + <string>sshQuestionText</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBToOneOutletInfo"> + <string key="name">delegate</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">sshPasswordDialog</string> + <string key="candidateClassName">NSWindow</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">sshPasswordField</string> + <string key="candidateClassName">NSSecureTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">sshPasswordKeychainCheckbox</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">sshPasswordText</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">sshQuestionDialog</string> + <string key="candidateClassName">NSWindow</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">sshQuestionText</string> + <string key="candidateClassName">NSTextField</string> + </object> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">Source/SPSSHTunnel.h</string> @@ -1417,6 +1651,41 @@ <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">Print.framework/Headers/PDEPluginInterface.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">PrintCore.framework/Headers/PDEPluginInterface.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">ShortcutRecorder.framework/Headers/SRRecorderCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">ShortcutRecorder.framework/Headers/SRRecorderControl.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">ShortcutRecorder.framework/Headers/SRValidator.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> <string key="minorKey">Sparkle.framework/Headers/SUAppcast.h</string> </object> </object> @@ -1606,6 +1875,7 @@ </object> </object> <int key="IBDocument.localizationMode">0</int> + <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> <integer value="1050" key="NS.object.0"/> @@ -1621,5 +1891,20 @@ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <string key="IBDocument.LastKnownRelativeProjectPath">../../sequel-pro.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> + <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSSwitch</string> + <string>appicon</string> + <string>toolbar-preferences-network</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>{15, 15}</string> + <string>{512, 512}</string> + <string>{32, 32}</string> + </object> + </object> </data> </archive> diff --git a/Resources/English.lproj/BundleEditor.strings b/Resources/English.lproj/BundleEditor.strings Binary files differindex 56496dce..ba33da1a 100644 --- a/Resources/English.lproj/BundleEditor.strings +++ b/Resources/English.lproj/BundleEditor.strings diff --git a/Resources/English.lproj/FieldEditorSheet.strings b/Resources/English.lproj/FieldEditorSheet.strings Binary files differindex ebd17ce7..7c326a49 100644 --- a/Resources/English.lproj/FieldEditorSheet.strings +++ b/Resources/English.lproj/FieldEditorSheet.strings diff --git a/Resources/English.lproj/MainMenu.strings b/Resources/English.lproj/MainMenu.strings Binary files differindex 7b4f37c1..3d149080 100644 --- a/Resources/English.lproj/MainMenu.strings +++ b/Resources/English.lproj/MainMenu.strings diff --git a/Resources/German.lproj/AboutPanel.strings b/Resources/German.lproj/AboutPanel.strings Binary files differnew file mode 100755 index 00000000..9cbcf9aa --- /dev/null +++ b/Resources/German.lproj/AboutPanel.strings diff --git a/Resources/German.lproj/BundleEditor.strings b/Resources/German.lproj/BundleEditor.strings Binary files differnew file mode 100755 index 00000000..3e9b8e48 --- /dev/null +++ b/Resources/German.lproj/BundleEditor.strings diff --git a/Resources/German.lproj/ConnectionErrorDialog.strings b/Resources/German.lproj/ConnectionErrorDialog.strings Binary files differnew file mode 100755 index 00000000..634e307d --- /dev/null +++ b/Resources/German.lproj/ConnectionErrorDialog.strings diff --git a/Resources/German.lproj/ConnectionView.strings b/Resources/German.lproj/ConnectionView.strings Binary files differnew file mode 100755 index 00000000..63ac49c5 --- /dev/null +++ b/Resources/German.lproj/ConnectionView.strings diff --git a/Resources/German.lproj/Console.strings b/Resources/German.lproj/Console.strings Binary files differnew file mode 100755 index 00000000..5e29e0e7 --- /dev/null +++ b/Resources/German.lproj/Console.strings diff --git a/Resources/German.lproj/ContentFilterManager.strings b/Resources/German.lproj/ContentFilterManager.strings Binary files differnew file mode 100755 index 00000000..dbd5ba75 --- /dev/null +++ b/Resources/German.lproj/ContentFilterManager.strings diff --git a/Resources/German.lproj/ContentPaginationView.strings b/Resources/German.lproj/ContentPaginationView.strings Binary files differnew file mode 100755 index 00000000..c76f071b --- /dev/null +++ b/Resources/German.lproj/ContentPaginationView.strings diff --git a/Resources/German.lproj/Credits.rtf b/Resources/German.lproj/Credits.rtf new file mode 100755 index 00000000..2144aef8 --- /dev/null +++ b/Resources/German.lproj/Credits.rtf @@ -0,0 +1,163 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +{\fonttbl\f0\fnil\fcharset0 LucidaGrande;} +{\colortbl;\red255\green255\blue255;\red25\green25\blue25;\red0\green27\blue199;} +\vieww9000\viewh8400\viewkind0 +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural + +\f0\b\fs30 \cf2 Aktuelle Entwickler +\fs22 \ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural + +\b0 \cf0 \ +{\field{\*\fldinst{HYPERLINK "http://www.abhibeckert.com/"}}{\fldrslt Abhi Beckert}}\ +{\field{\*\fldinst{HYPERLINK "http://mattlangtree.com.au/"}}{\fldrslt Matt Langtree}}\ +{\field{\*\fldinst{HYPERLINK "http://www.benperry.com.au/"}}{\fldrslt Ben Perry}}\ +{\field{\*\fldinst{HYPERLINK "http://www.markltownsend.com"}}{\fldrslt Mark Townsend}}\ +Rowan Beentje \ +\pard\pardeftab720\qc +{\field{\*\fldinst{HYPERLINK "http://stuconnolly.com/"}}{\fldrslt \cf0 Stuart Connolly}}\ +\pard\pardeftab720\qc +{\field{\*\fldinst{HYPERLINK "http://marius.me.uk/"}}{\fldrslt \cf0 Marius Ursache}}\ +Jakob Egger\ +\pard\pardeftab720\qc +{\field{\*\fldinst{HYPERLINK "http://www.bibiko.de/"}}{\fldrslt \cf3 \ul \ulc3 Hans-J\'f6rg Bibiko}}\ +Jim Knight\ +\pard\pardeftab720\qc +{\field{\*\fldinst{HYPERLINK "http://www.rekowski.info"}}{\fldrslt \cf0 David Rekowski}}\ +\ +\pard\pardeftab720\qc + +\b\fs30 \cf0 \'dcbersetzungen +\fs22 \ +\pard\pardeftab720\qc + +\b0 \cf0 \ +\pard\pardeftab720\qc + +\b \cf0 Deutsch +\b0 \ +Max Lohrmann\ +Mit Hilfe von\ +Hans-J\'f6rg Bibiko\ +\ + +\b Russisch\ +\pard\pardeftab720\qc + +\b0 \cf0 \uc0\u1040 \u1083 \u1077 \u1082 \u1089 \u1072 \u1085 \u1076 \u1088 \u1042 \u1072 \u1089 \u1080 \u1083 \u1100 \u1077 \u1074 (Alexander Vasiliev) \ +Mit Hilfe von\ +\uc0\u1071 \u1088 \u1086 \u1089 \u1083 \u1072 \u1074 \u1050 \u1086 \u1085 \u1094 \u1077 \u1074 \u1086 \u1081 (Jaroslav Koncevojj)\ +\uc0\u1052 \u1077 \u1076 \u1103 \u1085 \u1085 \u1080 \u1082 \u1044 \u1084 \u1080 \u1090 \u1088 \u1080 \u1081 \u1042 \u1080 \u1082 \u1090 \u1086 \u1088 \u1086 \u1074 \u1080 \u1095 (Medyannik Dmitry Viktorovich)\ +\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural + +\b \cf0 Vorherige Entwickler +\b0 \ +Lorenz Textor <lorenz@textor.ch>\ +Jeff Skrysak\ +\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural + +\b\fs30 \cf0 Zus\'e4tzlicher Code +\fs22 \ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural + +\b0 \cf0 \ +Serge Cohen und\ +Bertrand Mansion\ +(SMySQL framework)\ +Tristan O'Tierney\ +Kotaro Funakoshi\ +David Buxton\ +Stuart B. Glenn\ +Jason Hallford\ +Carsten Bl\'fcm\ +Andrea Salomoni\ +Greg Hulands\ +Paul Kim\ +(NoodleLineNumberView)\ +Alex King\ +Matt Gemmell\ +(MGTemplateEngine)\ +Joachim M\'e5rtensson, Allan Odgaard\ +(TMDIncrementalPopUp)\ +Ci\'e1ran Walsh, Allan Odgaard\ +(TMDHTMLtip)\ +Matt Gallagher\ +(NSFileManagerAddition)\ +Aaron Linville\ +\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural + +\b \cf0 RegexKitLite +\b0 \ +\pard\pardeftab720\qc +\cf0 Copyright (c) 2008-2010\ +\pard\pardeftab720\qc +{\field{\*\fldinst{HYPERLINK "http://regexkit.sourceforge.net/RegexKitLite/"}}{\fldrslt \cf0 John Engelhart}}\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural +\cf0 Alle Rechte vorbehalten.\ +\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural + +\b \cf0 AQDataExtension +\b0 \ +\pard\pardeftab720\qc +\cf0 Copyright (c) 2005\ +\pard\pardeftab720\qc +{\field{\*\fldinst{HYPERLINK "http://aquaticmac.com/cocoa.php"}}{\fldrslt \cf0 Lucas Newman}}\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural +\cf0 Alle Rechte vorbehalten.\ +\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural + +\b \cf0 BWToolkitFramework +\b0 \ +\pard\pardeftab720\qc +\cf0 Copyright (c) 2009\ +\pard\pardeftab720\qc +{\field{\*\fldinst{HYPERLINK "http://brandonwalkin.com/bwtoolkit/"}}{\fldrslt \cf0 Brandon Walkin}}\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural +\cf0 Alle Rechte vorbehalten.\ +\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural + +\b \cf0 FeedbackReporter +\b0 \ +Copyright (c) 2009\ +\pard\pardeftab720\qc +{\field{\*\fldinst{HYPERLINK "http://vafer.org/"}}{\fldrslt \cf0 Torsten Curdt}}\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural +\cf0 Alle Rechte vorbehalten.\ +\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural + +\b \cf0 ShortcutRecorderFramework +\b0 \ +Copyright (c) 2006-2010\ +\pard\pardeftab720\qc +{\field{\*\fldinst{HYPERLINK "http://code.google.com/p/shortcutrecorder/"}}{\fldrslt \cf0 Jesper, Dauer, Kirkpatrick}}\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural +\cf0 Alle Rechte vorbehalten.\ +\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural + +\b \cf0 Sparkle\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural + +\b0 \cf0 Copyright \'a9 2006\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural +{\field{\*\fldinst{HYPERLINK "http://sparkle.andymatuschak.org/"}}{\fldrslt \cf0 Andy Matuschak}}\ +Alle Rechte vorbehalten.\ +\ +\pard\pardeftab720\qc + +\b\fs30 \cf0 Grafiken +\fs22 \ +\pard\pardeftab720\qc + +\b0 \cf0 \ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural +\cf0 Icon von {\field{\*\fldinst{HYPERLINK "http://nadesign.net/"}}{\fldrslt Na Wong}} und {\field{\*\fldinst{HYPERLINK "http://www.benperry.com.au/"}}{\fldrslt Ben Perry}}\ +GUI-Design vom {\field{\*\fldinst{HYPERLINK "http://www.sequelpro.com/"}}{\fldrslt Sequel Pro}}-Team.\ +}
\ No newline at end of file diff --git a/Resources/German.lproj/DBView.strings b/Resources/German.lproj/DBView.strings Binary files differnew file mode 100755 index 00000000..66e35844 --- /dev/null +++ b/Resources/German.lproj/DBView.strings diff --git a/Resources/German.lproj/DataMigrationDialog.strings b/Resources/German.lproj/DataMigrationDialog.strings Binary files differnew file mode 100755 index 00000000..ef4d042f --- /dev/null +++ b/Resources/German.lproj/DataMigrationDialog.strings diff --git a/Resources/German.lproj/DatabaseProcessList.strings b/Resources/German.lproj/DatabaseProcessList.strings Binary files differnew file mode 100755 index 00000000..b29011db --- /dev/null +++ b/Resources/German.lproj/DatabaseProcessList.strings diff --git a/Resources/German.lproj/DatabaseServerVariables.strings b/Resources/German.lproj/DatabaseServerVariables.strings Binary files differnew file mode 100755 index 00000000..a2f84ffa --- /dev/null +++ b/Resources/German.lproj/DatabaseServerVariables.strings diff --git a/Resources/German.lproj/EncodingPopupView.strings b/Resources/German.lproj/EncodingPopupView.strings Binary files differnew file mode 100755 index 00000000..b177b9f0 --- /dev/null +++ b/Resources/German.lproj/EncodingPopupView.strings diff --git a/Resources/German.lproj/ExportDialog.strings b/Resources/German.lproj/ExportDialog.strings Binary files differnew file mode 100755 index 00000000..be9f76bd --- /dev/null +++ b/Resources/German.lproj/ExportDialog.strings diff --git a/Resources/German.lproj/FieldEditorSheet.strings b/Resources/German.lproj/FieldEditorSheet.strings Binary files differnew file mode 100755 index 00000000..8e6e77a1 --- /dev/null +++ b/Resources/German.lproj/FieldEditorSheet.strings diff --git a/Resources/German.lproj/ImportAccessory.strings b/Resources/German.lproj/ImportAccessory.strings Binary files differnew file mode 100755 index 00000000..d485c9b8 --- /dev/null +++ b/Resources/German.lproj/ImportAccessory.strings diff --git a/Resources/German.lproj/IndexesView.strings b/Resources/German.lproj/IndexesView.strings Binary files differnew file mode 100755 index 00000000..e16f7232 --- /dev/null +++ b/Resources/German.lproj/IndexesView.strings diff --git a/Resources/German.lproj/Localizable.strings b/Resources/German.lproj/Localizable.strings Binary files differnew file mode 100755 index 00000000..fb319f88 --- /dev/null +++ b/Resources/German.lproj/Localizable.strings diff --git a/Resources/German.lproj/MainMenu.strings b/Resources/German.lproj/MainMenu.strings Binary files differnew file mode 100755 index 00000000..3ae7a5d2 --- /dev/null +++ b/Resources/German.lproj/MainMenu.strings diff --git a/Resources/German.lproj/MainWindow.strings b/Resources/German.lproj/MainWindow.strings new file mode 100755 index 00000000..e69de29b --- /dev/null +++ b/Resources/German.lproj/MainWindow.strings diff --git a/Resources/German.lproj/Navigator.strings b/Resources/German.lproj/Navigator.strings Binary files differnew file mode 100755 index 00000000..4972bd8e --- /dev/null +++ b/Resources/German.lproj/Navigator.strings diff --git a/Resources/German.lproj/Preferences.strings b/Resources/German.lproj/Preferences.strings Binary files differnew file mode 100755 index 00000000..c18a2be9 --- /dev/null +++ b/Resources/German.lproj/Preferences.strings diff --git a/Resources/German.lproj/PrintAccessory.strings b/Resources/German.lproj/PrintAccessory.strings Binary files differnew file mode 100755 index 00000000..fdc112b1 --- /dev/null +++ b/Resources/German.lproj/PrintAccessory.strings diff --git a/Resources/German.lproj/ProgressIndicatorLayer.strings b/Resources/German.lproj/ProgressIndicatorLayer.strings Binary files differnew file mode 100755 index 00000000..d4574cd8 --- /dev/null +++ b/Resources/German.lproj/ProgressIndicatorLayer.strings diff --git a/Resources/German.lproj/QueryFavoriteManager.strings b/Resources/German.lproj/QueryFavoriteManager.strings Binary files differnew file mode 100755 index 00000000..24b1c747 --- /dev/null +++ b/Resources/German.lproj/QueryFavoriteManager.strings diff --git a/Resources/German.lproj/SSHQuestionDialog.strings b/Resources/German.lproj/SSHQuestionDialog.strings Binary files differnew file mode 100755 index 00000000..9f0a510f --- /dev/null +++ b/Resources/German.lproj/SSHQuestionDialog.strings diff --git a/Resources/German.lproj/SaveSPFAccessory.strings b/Resources/German.lproj/SaveSPFAccessory.strings Binary files differnew file mode 100755 index 00000000..aedb97d3 --- /dev/null +++ b/Resources/German.lproj/SaveSPFAccessory.strings diff --git a/Resources/German.lproj/UserManagerView.strings b/Resources/German.lproj/UserManagerView.strings Binary files differnew file mode 100755 index 00000000..76e625ab --- /dev/null +++ b/Resources/German.lproj/UserManagerView.strings diff --git a/SharedSupport/Default Bundles/CopySingleLineQuoted.spBundle/command.plist b/SharedSupport/Default Bundles/CopySingleLineQuoted.spBundle/command.plist index 56cdd9c4..8983a3ae 100644 --- a/SharedSupport/Default Bundles/CopySingleLineQuoted.spBundle/command.plist +++ b/SharedSupport/Default Bundles/CopySingleLineQuoted.spBundle/command.plist @@ -7,7 +7,34 @@ <key>category</key> <string>Query Editor</string> <key>command</key> - <string>cat | perl -ne 'chomp;s/\t/ /g;s/"/\\"/g;print "\"".$_."\" . \"\\n\" .\n"' | sed '$ s/.........$//' | sed '$ s/$/;/' | __CF_USER_TEXT_ENCODING=$UID:0x8000100:0x8000100 pbcopy</string> + <string># read STDIN which contains the string data coming from the Query Editor +# and pipe it to the following perl script +cat | perl -ne ' + +# delete final line ending +chomp; + +# substitute TABs by SPACEs +s/\t/ /g; + +# escape " +s/"/\\"/g; + +# output text and pipe it to sed +print "\"".$_."\" . \"\\n\" .\n"' | + +# delete last ‘"\n" .’ (the 9 last characters) +sed '$ s/.........$//' | + +# append ; +sed '$ s/$/;/' | + +# pipe the result to the UNIX command pbcopy which pastes +# the result into the clipboard; +# __CF_USER_TEXT_ENCODING=$UID:0x8000100:0x8000100 tells pbcopy +# that the string is UTF-8 encoded +__CF_USER_TEXT_ENCODING=$UID:0x8000100:0x8000100 pbcopy +</string> <key>contact</key> <string>znvy@ovovxb.qr</string> <key>description</key> diff --git a/SharedSupport/Default Bundles/MD5 Hash.spBundle/command.plist b/SharedSupport/Default Bundles/MD5 Hash.spBundle/command.plist new file mode 100644 index 00000000..110231c2 --- /dev/null +++ b/SharedSupport/Default Bundles/MD5 Hash.spBundle/command.plist @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>author</key> + <string>Abhi Beckert</string> + <key>category</key> + <string>Hash</string> + <key>command</key> + <string>#!/usr/bin/ruby + +# fetch selected text from STDIN +selectedText = gets + +# create sha1 hash +require 'digest/md5' +hash = Digest::MD5.hexdigest(selectedText) + +# output hash +print hash +</string> + <key>description</key> + <string>Convert the selected text to an MD5 hash.</string> + <key>input</key> + <string>selectedtext</string> + <key>input_fallback</key> + <string>entirecontent</string> + <key>keyEquivalent</key> + <string></string> + <key>name</key> + <string>MD5</string> + <key>output</key> + <string>replaceselection</string> + <key>scope</key> + <string>inputfield</string> + <key>uuid</key> + <string>8CAA33B3-D168-47FC-A9BE-EA5A8576E380</string> + <key>isDefaultBundle</key> + <true/> +</dict> +</plist> diff --git a/SharedSupport/Default Bundles/SHA1 Hash.spBundle/command.plist b/SharedSupport/Default Bundles/SHA1 Hash.spBundle/command.plist new file mode 100644 index 00000000..e2dd0c70 --- /dev/null +++ b/SharedSupport/Default Bundles/SHA1 Hash.spBundle/command.plist @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>author</key> + <string>Abhi Beckert</string> + <key>category</key> + <string>Hash</string> + <key>command</key> + <string>#!/usr/bin/ruby + +# fetch selected text from STDIN +selectedText = gets + +# create sha1 hash +require 'digest/sha1' +hash = Digest::SHA1.hexdigest(selectedText) + +# output hash +print hash +</string> + <key>description</key> + <string>Convert the selected text to a sha1 hash.</string> + <key>input</key> + <string>selectedtext</string> + <key>input_fallback</key> + <string>entirecontent</string> + <key>name</key> + <string>SHA1</string> + <key>output</key> + <string>replaceselection</string> + <key>scope</key> + <string>inputfield</string> + <key>uuid</key> + <string>19F272BA-1369-48A7-B10A-4F25EF5B9DD3</string> + <key>isDefaultBundle</key> + <true/> +</dict> +</plist> diff --git a/SharedSupport/Default Bundles/WrapInDelimiter.spBundle/command.plist b/SharedSupport/Default Bundles/WrapInDelimiter.spBundle/command.plist index 3588396e..b3eb463b 100644 --- a/SharedSupport/Default Bundles/WrapInDelimiter.spBundle/command.plist +++ b/SharedSupport/Default Bundles/WrapInDelimiter.spBundle/command.plist @@ -7,8 +7,15 @@ <key>category</key> <string>Query Editor</string> <key>command</key> - <string>echo "DELIMITER \${0:;;}" + <string># write DELIMITER plus ;; as suggestion selected as snippet +echo "DELIMITER \${0:;;}" + +# `cat` reads the STDIN which contains the selected +# text from the Query Editor and write it as selected +# snippet plus the mirrowed suggested delimiter echo "\${1:`cat`}\${1:\$0}" + +# write DELIMITER plus ; echo "DELIMITER ;"</string> <key>contact</key> <string>znvy@ovovxb.qr</string> diff --git a/Source/ImageAndTextCell.m b/Source/ImageAndTextCell.m index e3c835f0..61c37564 100644 --- a/Source/ImageAndTextCell.m +++ b/Source/ImageAndTextCell.m @@ -167,12 +167,10 @@ - (NSSize)cellSize { NSSize cellSize = [super cellSize]; + cellSize.width += (image ? [image size].width : 0) + ((1 - MIN(1,INDENT_AMOUNT)) * 3) + (INDENT_AMOUNT * _indentationLevel) + 2; - // TODO : this has to be generalized yet - if (image != nil) - cellSize.height += 2; - else - cellSize.height += 8; + cellSize.height += image ? 2 : 8; + return cellSize; } diff --git a/Source/SPAboutController.m b/Source/SPAboutController.m index 0e0e7a09..1e0c82c2 100644 --- a/Source/SPAboutController.m +++ b/Source/SPAboutController.m @@ -25,6 +25,9 @@ #import "SPAboutController.h" +static NSString *SPCreditsFilename = @"Credits"; +static NSString *SPLicenseFilename = @"License"; + @implementation SPAboutController /** @@ -52,10 +55,10 @@ [appBuildVersionTextField setStringValue:[NSString stringWithFormat:@"%@ %@", (isNightly) ? NSLocalizedString(@"Nightly Build", @"nightly build label") : NSLocalizedString(@"Build", @"build label") , [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]]]; // Get the credits file contents - NSAttributedString *credits = [[[NSAttributedString alloc] initWithPath:[[NSBundle mainBundle] pathForResource:@"Credits" ofType:@"rtf"] documentAttributes:nil] autorelease]; + NSAttributedString *credits = [[[NSAttributedString alloc] initWithPath:[[NSBundle mainBundle] pathForResource:SPCreditsFilename ofType:@"rtf"] documentAttributes:nil] autorelease]; // Get the license file contents - NSAttributedString *license = [[[NSAttributedString alloc] initWithPath:[[NSBundle mainBundle] pathForResource:@"License" ofType:@"rtf"] documentAttributes:nil] autorelease]; + NSAttributedString *license = [[[NSAttributedString alloc] initWithPath:[[NSBundle mainBundle] pathForResource:SPLicenseFilename ofType:@"rtf"] documentAttributes:nil] autorelease]; // Set the credits [[appCreditsTextView textStorage] appendAttributedString:credits]; diff --git a/Source/SPAlertSheets.m b/Source/SPAlertSheets.m index b9ac1136..41b07e00 100644 --- a/Source/SPAlertSheets.m +++ b/Source/SPAlertSheets.m @@ -161,6 +161,6 @@ void SPBeginWaitingAlertSheet( } - [NSApp endModalSession:session]; - [NSApp endSheet:[alert window]]; + [[NSApp onMainThread] endModalSession:session]; + [[NSApp onMainThread] endSheet:[alert window]]; } diff --git a/Source/SPAppController.h b/Source/SPAppController.h index 87ae8e9e..b96b1d75 100644 --- a/Source/SPAppController.h +++ b/Source/SPAppController.h @@ -32,6 +32,7 @@ @interface SPAppController : NSObject <FRFeedbackReporterDelegate> { + IBOutlet NSWindow* bundleEditorWindow; BOOL isNewFavorite; @@ -56,6 +57,7 @@ NSMutableArray *runningActivitiesArray; NSString *lastBundleBlobFilesDirectory; + } @property (readwrite, retain) NSString *lastBundleBlobFilesDirectory; diff --git a/Source/SPAppleScriptSupport.m b/Source/SPAppleScriptSupport.m index 90ab240e..337a14dc 100644 --- a/Source/SPAppleScriptSupport.m +++ b/Source/SPAppleScriptSupport.m @@ -31,23 +31,6 @@ @implementation SPAppController (SPAppleScriptSupport) -//////////////// Examples to catch AS core events - maybe for further stuff -// - (void)handleQuitEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent -// { -// [NSApp terminate:self]; -// } -// - (void)handleOpenEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent -// { -// NSLog(@"OPEN "); -// } -// -// - (void)applicationWillFinishLaunching:(NSNotification *)aNotification -// { -// NSAppleEventManager *aeManager = [NSAppleEventManager sharedAppleEventManager]; -// [aeManager setEventHandler:self andSelector:@selector(handleQuitEvent:withReplyEvent:) forEventClass:kCoreEventClass andEventID:kAEQuitApplication]; -// [aeManager setEventHandler:self andSelector:@selector(handleOpenEvent:withReplyEvent:) forEventClass:kCoreEventClass andEventID:kAEOpenApplication]; -// } - /** * Is needed to interact with AppleScript for set/get internal SP variables */ diff --git a/Source/SPBundleEditorController.h b/Source/SPBundleEditorController.h index 5ea1658f..7bcf84e2 100644 --- a/Source/SPBundleEditorController.h +++ b/Source/SPBundleEditorController.h @@ -42,9 +42,6 @@ IBOutlet NSTextField *fallbackLabelField; IBOutlet NSTextField *withBlobLabelField; IBOutlet NSTextField *commandLabelField; - IBOutlet NSTextField *authorLabelField; - IBOutlet NSTextField *contactLabelField; - IBOutlet NSTextField *descriptionLabelField; IBOutlet NSPopUpButton *inputPopupButton; IBOutlet NSPopUpButton *inputFallbackPopupButton; IBOutlet NSPopUpButton *outputPopupButton; @@ -56,16 +53,17 @@ IBOutlet NSButton *saveButton; IBOutlet NSButton *cancelButton; IBOutlet NSButton *helpButton; - IBOutlet NSButton *showHideMetaButton; + IBOutlet NSTextField *metaInfoSummary; + IBOutlet NSButton *displayMetaInfoButton; IBOutlet NSMenuItem *duplicateMenuItem; IBOutlet NSMenuItem *revealInFinderMenuItem; IBOutlet SRRecorderControl *keyEquivalentField; IBOutlet NSButton *disabledCheckbox; IBOutlet NSScrollView *commandScrollView; - IBOutlet NSScrollView *descriptionScrollView; IBOutlet BWSplitView *splitView; - IBOutlet id undeleteSheet; + IBOutlet NSWindow *undeleteSheet; + IBOutlet NSWindow *metaInfoSheet; IBOutlet NSTableView *undeleteTableView; IBOutlet NSTreeController *commandBundleTreeController; @@ -128,10 +126,11 @@ - (IBAction)showHelp:(id)sender; - (IBAction)saveAndCloseWindow:(id)sender; - (IBAction)reloadBundles:(id)sender; -- (IBAction)metaButtonChanged:(id)sender; - (IBAction)performClose:(id)sender; - (IBAction)undeleteDefaultBundles:(id)sender; - (IBAction)closeUndeleteDefaultBundlesSheet:(id)sender; +- (IBAction)displayBundleMetaInfo:(id)sender; +- (IBAction)closeSheet:(id)sender; - (BOOL)saveBundle:(NSDictionary*)bundle atPath:(NSString*)aPath; - (BOOL)cancelRowEditing; diff --git a/Source/SPBundleEditorController.m b/Source/SPBundleEditorController.m index 387bfcf1..8d4d1c65 100644 --- a/Source/SPBundleEditorController.m +++ b/Source/SPBundleEditorController.m @@ -40,17 +40,18 @@ #define SP_BUNDLEEDITOR_SPLITVIEW_AUTOSAVE_STRING @"SPBundleEditorSplitView" -@interface SPBundleEditorController (PrivateAPI) +@interface SPBundleEditorController () - (void)_updateBundleDataView; +- (void)_updateBundleMetaSummary; - (id)_currentSelectedObject; - (id)_currentSelectedNode; -- (void)_enableBundleDataInput:(BOOL)enabled; -- (void)_enableMetaDataInput:(BOOL)enabled; +- (void)_enableBundleDataInput:(BOOL)enabled bundleEnabled:(BOOL)bundleEnabled; - (void)_initTree; - (NSUInteger)_arrangedScopeIndexForScopeIndex:(NSUInteger)scopeIndex; - (NSUInteger)_scopeIndexForArrangedScopeIndex:(NSUInteger)scopeIndex; - (NSUInteger)_arrangedCategoryIndexForScopeIndex:(NSUInteger)scopeIndex andCategory:(NSString*)category; +- (void)_metaSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo; @end @@ -73,12 +74,10 @@ } return self; - } - (void)dealloc { - [inputGeneralScopePopUpMenu release]; [inputInputFieldScopePopUpMenu release]; [inputDataTableScopePopUpMenu release]; @@ -106,14 +105,13 @@ [shellVariableSuggestions release]; [deletedDefaultBundles release]; - if(touchedBundleArray) [touchedBundleArray release], touchedBundleArray = nil; - if(commandBundleTree) [commandBundleTree release], commandBundleTree = nil; - if(sortDescriptor) [sortDescriptor release], sortDescriptor = nil; - if(bundlePath) [bundlePath release], bundlePath = nil; + if (touchedBundleArray) [touchedBundleArray release], touchedBundleArray = nil; + if (commandBundleTree) [commandBundleTree release], commandBundleTree = nil; + if (sortDescriptor) [sortDescriptor release], sortDescriptor = nil; + if (bundlePath) [bundlePath release], bundlePath = nil; if (esUndoManager) [esUndoManager release], esUndoManager = nil; [super dealloc]; - } - (void)awakeFromNib @@ -800,14 +798,6 @@ } /** - * Show/Hide meta data input fields - */ -- (IBAction)metaButtonChanged:(id)sender -{ - [self _enableMetaDataInput:([sender state] == NSOnState) ? YES : NO]; -} - -/** * Read all installed bundles and order front the Bundle Editor */ - (IBAction)showWindow:(id)sender @@ -841,7 +831,21 @@ [sender orderOut:nil]; else if ([sender respondsToSelector:@selector(window)]) [[sender window] orderOut:nil]; +} +- (IBAction)displayBundleMetaInfo:(id)sender +{ + [NSApp beginSheet:metaInfoSheet + modalForWindow:[self window] + modalDelegate:self + didEndSelector:@selector(_metaSheetDidEnd:returnCode:contextInfo:) + contextInfo:nil]; +} + +- (IBAction)closeSheet:(id)sender +{ + [NSApp endSheet:[sender window] returnCode:[sender tag]]; + [[sender window] orderOut:self]; } /** @@ -849,7 +853,6 @@ */ - (IBAction)saveAndCloseWindow:(id)sender { - // Commit all pending edits if([commandBundleTreeController commitEditing]) { @@ -1283,7 +1286,6 @@ */ - (void)outlineViewSelectionDidChange:(NSNotification *)aNotification { - if([aNotification object] != commandsOutlineView) return; // Remember selected bundle name to reset the name if the user cancelled @@ -1291,9 +1293,9 @@ if(oldBundleName) [oldBundleName release], oldBundleName = nil; if(![[self _currentSelectedObject] objectForKey:kChildrenKey]) { oldBundleName = [[[self _currentSelectedObject] objectForKey:kBundleNameKey] retain]; - [self _enableBundleDataInput:YES]; + [self _enableBundleDataInput:YES bundleEnabled:![[[self _currentSelectedObject] objectForKey:@"disabled"] boolValue]]; } else { - [self _enableBundleDataInput:NO]; + [self _enableBundleDataInput:NO bundleEnabled:NO]; if(oldBundleName) [oldBundleName release], oldBundleName = nil; } @@ -1303,6 +1305,7 @@ [touchedBundleArray addObject:oldBundleName]; [self _updateBundleDataView]; + [commandTextView setSelectedRange:NSMakeRange(0,0)]; } @@ -1478,7 +1481,6 @@ [commandBundleTreeController rearrangeObjects]; [commandsOutlineView reloadData]; } - } #pragma mark - @@ -1489,17 +1491,17 @@ */ - (BOOL)validateMenuItem:(NSMenuItem *)menuItem { - SEL action = [menuItem action]; - if ( (action == @selector(duplicateCommandBundle:)) - || (action == @selector(revealCommandBundleInFinder:)) - || (action == @selector(saveBundle:)) - || (action == @selector(removeCommandBundle:)) - ) + if ((action == @selector(duplicateCommandBundle:)) || + (action == @selector(revealCommandBundleInFinder:)) || + (action == @selector(saveBundle:)) || + (action == @selector(removeCommandBundle:)) || + (action == @selector(displayBundleMetaInfo:))) { // Allow to record short-cuts used by the Bundle Editor if([[NSApp mainWindow] firstResponder] == keyEquivalentField) return NO; + return ([[commandBundleTreeController selectedObjects] count] == 1 && ![[[commandBundleTreeController selectedObjects] objectAtIndex:0] objectForKey:kChildrenKey]); } @@ -1508,7 +1510,6 @@ } return YES; - } #pragma mark - @@ -1675,18 +1676,8 @@ doGroupDueToChars = YES; } -@end - -#pragma mark - - -@implementation SPBundleEditorController (PrivateAPI) - - (void)_initTree { - - [showHideMetaButton setState:NSOffState]; - [self _enableMetaDataInput:NO]; - // Re-init commandBundleTree [[[commandBundleTree objectForKey:kChildrenKey] objectAtIndex:kInputFieldScopeArrayIndex] setObject:[NSMutableArray array] forKey:kChildrenKey]; [[[commandBundleTree objectForKey:kChildrenKey] objectAtIndex:kDataTableScopeArrayIndex] setObject:[NSMutableArray array] forKey:kChildrenKey]; @@ -1814,7 +1805,7 @@ [commandsOutlineView expandItem:[commandsOutlineView itemAtRow:0] expandChildren:NO]; [self _updateBundleDataView]; - [self _enableBundleDataInput:NO]; + [self _enableBundleDataInput:NO bundleEnabled:NO]; } /** @@ -1822,7 +1813,6 @@ */ - (void)_updateBundleDataView { - NSInteger anIndex; if([commandsOutlineView selectedRow] < 0) return; @@ -1963,6 +1953,9 @@ [fallbackLabelField setHidden:YES]; } + // Update the bundle summary text + [self _updateBundleMetaSummary]; + // Validate add and remove bundle button in left bar [removeButton setEnabled:([[commandBundleTreeController selectedObjects] count] == 1 && ![[[commandBundleTreeController selectedObjects] objectAtIndex:0] objectForKey:kChildrenKey])]; [addButton setEnabled:([[commandBundleTreeController selectionIndexPath] length] > 1)]; @@ -1970,6 +1963,29 @@ } /** + * Update the bundle meta summary text + */ +- (void)_updateBundleMetaSummary +{ + NSDictionary *currentDict = [self _currentSelectedObject]; + if (!currentDict) { + [metaInfoSummary setStringValue:@""]; + return; + } + + NSMutableString *metaString = [[[NSMutableString alloc] init] autorelease]; + if ([currentDict objectForKey:@"author"]) { + [metaString appendFormat:@"(%@) ", [currentDict objectForKey:@"author"]]; + } else if ([currentDict objectForKey:@"contact"]) { + [metaString appendFormat:@"(%@) ", [currentDict objectForKey:@"contact"]]; + } + + if ([currentDict objectForKey:@"description"]) [metaString appendString:[currentDict objectForKey:@"description"]]; + + [metaInfoSummary setStringValue:metaString]; +} + +/** * Return the current selected object as NSDictionary */ - (id)_currentSelectedObject @@ -1990,7 +2006,6 @@ */ - (NSUInteger)_arrangedScopeIndexForScopeIndex:(NSUInteger)scopeIndex { - NSString *unsortedBundleName = [[[commandBundleTree objectForKey:kChildrenKey] objectAtIndex:scopeIndex] objectForKey:kBundleNameKey]; if(!unsortedBundleName || ![unsortedBundleName length]) return scopeIndex; @@ -2005,7 +2020,6 @@ } return k; - } /** @@ -2013,7 +2027,6 @@ */ - (NSUInteger)_scopeIndexForArrangedScopeIndex:(NSUInteger)scopeIndex { - NSString *bName = [[[[[[[commandBundleTreeController arrangedObjects] childNodes] objectAtIndex:0] childNodes] objectAtIndex:scopeIndex] representedObject] objectForKey:kBundleNameKey]; NSUInteger k = 0; for(id i in [commandBundleTree objectForKey:kChildrenKey]) { @@ -2027,40 +2040,29 @@ /** * Enable / disable data input */ -- (void)_enableBundleDataInput:(BOOL)enabled -{ - [nameTextField setEnabled:enabled]; - [inputPopupButton setEnabled:enabled]; - [inputFallbackPopupButton setEnabled:enabled]; - [scopePopupButton setEnabled:enabled]; - [commandTextView setEditable:enabled]; - [outputPopupButton setEnabled:enabled]; - [triggerPopupButton setEnabled:enabled]; - [disabledCheckbox setEnabled:enabled]; - [keyEquivalentField setEnabled:enabled]; - [categoryTextField setEnabled:enabled]; - [tooltipTextField setEnabled:enabled]; +- (void)_enableBundleDataInput:(BOOL)enabled bundleEnabled:(BOOL)bundleEnabled +{ + + // Most of the interface requires both a bundle selected and enabled + BOOL enableInterface = enabled && bundleEnabled; + [nameTextField setEnabled:enableInterface]; + [inputPopupButton setEnabled:enableInterface]; + [inputFallbackPopupButton setEnabled:enableInterface]; + [scopePopupButton setEnabled:enableInterface]; + [commandTextView setEditable:enableInterface]; + [outputPopupButton setEnabled:enableInterface]; + [triggerPopupButton setEnabled:enableInterface]; + [keyEquivalentField setEnabled:enableInterface]; + [categoryTextField setEnabled:enableInterface]; + [tooltipTextField setEnabled:enableInterface]; + + // Always leave the meta fields enabled, and the disabled checkbox. [authorTextField setEnabled:enabled]; [contactTextField setEnabled:enabled]; [descriptionTextView setEditable:enabled]; -} + [displayMetaInfoButton setEnabled:enabled]; -/** - * Enable / disable meta input - */ -- (void)_enableMetaDataInput:(BOOL)enabled -{ - [commandTextView setHidden:enabled]; - [disabledCheckbox setHidden:enabled]; - [commandLabelField setHidden:enabled]; - [commandScrollView setHidden:enabled]; - [authorLabelField setHidden:!enabled]; - [contactLabelField setHidden:!enabled]; - [descriptionLabelField setHidden:!enabled]; - [descriptionTextView setHidden:!enabled]; - [authorTextField setHidden:!enabled]; - [contactTextField setHidden:!enabled]; - [descriptionScrollView setHidden:!enabled]; + [disabledCheckbox setEnabled:enabled]; } /** @@ -2117,5 +2119,12 @@ return returnIndex; } +- (void)_metaSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo +{ + [sheet makeFirstResponder:nil]; + + [self _updateBundleMetaSummary]; +} + @end diff --git a/Source/SPBundleHTMLOutputController.h b/Source/SPBundleHTMLOutputController.h index de67799c..01460a85 100644 --- a/Source/SPBundleHTMLOutputController.h +++ b/Source/SPBundleHTMLOutputController.h @@ -22,11 +22,10 @@ // // More info at <http://code.google.com/p/sequel-pro/> -#import <Cocoa/Cocoa.h> #import <WebKit/WebKit.h> -@interface SPBundleHTMLOutputController : NSWindowController { - +@interface SPBundleHTMLOutputController : NSWindowController +{ IBOutlet WebView *webView; NSString *docTitle; @@ -35,7 +34,6 @@ NSString *docUUID; BOOL suppressExceptionAlerting; WebPreferences *webPreferences; - } @property(readwrite,retain) NSString *docTitle; diff --git a/Source/SPCSVExporter.m b/Source/SPCSVExporter.m index 7850e7ec..4bf6c651 100644 --- a/Source/SPCSVExporter.m +++ b/Source/SPCSVExporter.m @@ -118,7 +118,37 @@ [self setExportProcessIsRunning:YES]; lastProgressValue = 0; - + + // Before the streaming query is started, build an array of numeric columns if a table + // is being exported + if ([self csvTableName] && (![self csvDataArray])) { + NSDictionary *tableDetails = nil; + + // Determine whether the supplied table is actually a table or a view via the CREATE TABLE command, and get the table details + SPMySQLResult *queryResult = [connection queryString:[NSString stringWithFormat:@"SHOW CREATE TABLE %@", [[self csvTableName] backtickQuotedString]]]; + [queryResult setReturnDataAsStrings:YES]; + + if ([queryResult numberOfRows]) { + id object = [[queryResult getRowAsDictionary] objectForKey:@"Create View"]; + + tableDetails = [[NSDictionary alloc] initWithDictionary:(object) ? [[self csvTableData] informationForView:[self csvTableName]] : [[self csvTableData] informationForTable:[self csvTableName]]]; + } + + // Retrieve the table details via the data class, and use it to build an array containing column numeric status + for (NSDictionary *column in [tableDetails objectForKey:@"columns"]) + { + NSString *tableColumnTypeGrouping = [column objectForKey:@"typegrouping"]; + + [tableColumnNumericStatus addObject:[NSNumber numberWithBool: + ([tableColumnTypeGrouping isEqualToString:@"bit"] + || [tableColumnTypeGrouping isEqualToString:@"integer"] + || [tableColumnTypeGrouping isEqualToString:@"float"]) + ]]; + } + + [tableDetails release]; + } + // Make a streaming request for the data if the data array isn't set if ((![self csvDataArray]) && [self csvTableName]) { totalRows = [[connection getFirstFieldFromQuery:[NSString stringWithFormat:@"SELECT COUNT(1) FROM %@", [[self csvTableName] backtickQuotedString]]] integerValue]; @@ -177,35 +207,7 @@ if ([self csvDataArray]) totalRows = [[self csvDataArray] count]; if (([self csvDataArray]) && (![self csvOutputFieldNames])) currentRowIndex++; - - if ([self csvTableName] && (![self csvDataArray])) { - - NSDictionary *tableDetails = nil; - - // Determine whether the supplied table is actually a table or a view via the CREATE TABLE command, and get the table details - SPMySQLResult *queryResult = [connection queryString:[NSString stringWithFormat:@"SHOW CREATE TABLE %@", [[self csvTableName] backtickQuotedString]]]; - - [queryResult setReturnDataAsStrings:YES]; - - if ([queryResult numberOfRows]) { - id object = [[queryResult getRowAsDictionary] objectForKey:@"Create View"]; - - tableDetails = [[NSDictionary alloc] initWithDictionary:(object) ? [[self csvTableData] informationForView:[self csvTableName]] : [[self csvTableData] informationForTable:[self csvTableName]]]; - } - // Retrieve the table details via the data class, and use it to build an array containing column numeric status - for (NSDictionary *column in [tableDetails objectForKey:@"columns"]) - { - NSString *tableColumnTypeGrouping = [column objectForKey:@"typegrouping"]; - - [tableColumnNumericStatus addObject:[NSNumber numberWithBool:([tableColumnTypeGrouping isEqualToString:@"bit"] || - [tableColumnTypeGrouping isEqualToString:@"integer"] || - [tableColumnTypeGrouping isEqualToString:@"float"])]]; - } - - [tableDetails release]; - } - // Drop into the processing loop NSAutoreleasePool *csvExportPool = [[NSAutoreleasePool alloc] init]; @@ -291,12 +293,8 @@ [csvCellString setString:[csvCell description]]; } - // For NULL values supplied via an array add the unenclosed null string as set in preferences - if ([csvCellString isEqualToString:[self csvNULLString]]) { - [csvString appendString:[self csvNULLString]]; - } // Add empty strings as a pair of enclosing characters. - else if ([csvCellString length] == 0) { + if ([csvCellString length] == 0) { [csvString appendString:[self csvEnclosingCharacterString]]; [csvString appendString:[self csvEnclosingCharacterString]]; } diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h index d6599b55..eeb7f2d0 100644 --- a/Source/SPConnectionController.h +++ b/Source/SPConnectionController.h @@ -238,7 +238,7 @@ - (IBAction)addGroup:(id)sender; - (IBAction)removeNode:(id)sender; - (IBAction)duplicateFavorite:(id)sender; -- (IBAction)renameFavorite:(id)sender; +- (IBAction)renameNode:(id)sender; - (IBAction)makeSelectedFavoriteDefault:(id)sender; // Import/export favorites diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m index af46f564..6b43f01a 100644 --- a/Source/SPConnectionController.m +++ b/Source/SPConnectionController.m @@ -863,7 +863,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, /** * Switches the selected favorite/group to editing mode so it can be renamed. */ -- (IBAction)renameFavorite:(id)sender +- (IBAction)renameNode:(id)sender { if ([favoritesOutlineView numberOfSelectedRows] == 1) { [favoritesOutlineView editColumn:0 row:[favoritesOutlineView selectedRow] withEvent:nil select:YES]; diff --git a/Source/SPConnectionControllerDelegate.m b/Source/SPConnectionControllerDelegate.m index e2557601..352836e3 100644 --- a/Source/SPConnectionControllerDelegate.m +++ b/Source/SPConnectionControllerDelegate.m @@ -283,10 +283,10 @@ static NSString *SPDatabaseImage = @"database-small"; { id field = [notification object]; - [field setStringValue:[self _stripInvalidCharactersFromString:[field stringValue]]]; - if (((field == standardNameField) || (field == socketNameField) || (field == sshNameField)) && [self selectedFavoriteNode]) { + [field setStringValue:[self _stripInvalidCharactersFromString:[field stringValue]]]; + favoriteNameFieldWasTouched = YES; BOOL nameFieldIsEmpty = [[field stringValue] isEqualToString:@""]; diff --git a/Source/SPConnectionDelegate.m b/Source/SPConnectionDelegate.m index 74f1d407..0d41a3ac 100644 --- a/Source/SPConnectionDelegate.m +++ b/Source/SPConnectionDelegate.m @@ -71,7 +71,7 @@ { // If no keychain item is available, return an empty password - if (![connectionController connectionKeychainItemName]) return @""; + if (![connectionController connectionKeychainItemName]) return nil; // Otherwise, pull the password from the keychain using the details from this connection SPKeychain *keychain = [[SPKeychain alloc] init]; diff --git a/Source/SPConstants.m b/Source/SPConstants.m index 4f41531c..79de29a8 100644 --- a/Source/SPConstants.m +++ b/Source/SPConstants.m @@ -65,7 +65,7 @@ NSString *SPDataSupportFolder = @"Data"; // General Prefpane NSString *SPDefaultFavorite = @"DefaultFavorite"; NSString *SPSelectLastFavoriteUsed = @"SelectLastFavoriteUsed"; -NSString *SPLastFavoriteID = @"LastFavoriteID"; +NSString *SPLastFavoriteID = @"SPLastFavoriteID"; NSString *SPAutoConnectToDefault = @"AutoConnectToDefault"; NSString *SPDefaultViewMode = @"DefaultViewMode"; NSString *SPLastViewMode = @"LastViewMode"; @@ -108,9 +108,15 @@ NSString *SPConsoleEnableImportExportLogging = @"ConsoleEnableImportExportLo NSString *SPConsoleEnableErrorLogging = @"ConsoleEnableErrorLogging"; // Network Prefpane +#ifndef SP_REFACTOR NSString *SPConnectionTimeoutValue = @"ConnectionTimeoutValue"; NSString *SPUseKeepAlive = @"UseKeepAlive"; NSString *SPKeepAliveInterval = @"KeepAliveInterval"; +#else +NSString *SPConnectionTimeoutValue = @"SPConnectionTimeoutValue"; +NSString *SPUseKeepAlive = @"SPUseKeepAlive"; +NSString *SPKeepAliveInterval = @"SPKeepAliveInterval"; +#endif // Editor Prefpane NSString *SPCustomQueryEditorFont = @"CustomQueryEditorFont"; @@ -206,7 +212,7 @@ NSString *SPSelectionDetailTypePrimaryKeyed = @"SelectionDetailTypePrimaryK // URLs NSString *SPDonationsURL = @"http://www.sequelpro.com/donate/"; -NSString *SPMySQLSearchURL = @"http://search.mysql.com/search/query/search?q=%@&group=refman-%@"; +NSString *SPMySQLSearchURL = @"http://dev.mysql.com/doc/refman/%@/%@/%@.html"; NSString *SPDevURL = @"http://code.google.com/p/sequel-pro/"; // Toolbar constants diff --git a/Source/SPContentFilterManager.h b/Source/SPContentFilterManager.h index ec23afe6..dda8995c 100644 --- a/Source/SPContentFilterManager.h +++ b/Source/SPContentFilterManager.h @@ -31,10 +31,9 @@ @end -#ifndef SP_REFACTOR /* ivars */ @interface SPContentFilterManager : NSWindowController -#else -@interface SPContentFilterManager : NSWindowController <NSOpenSavePanelDelegate> +#ifdef SP_REFACTOR /* ivars */ +<NSOpenSavePanelDelegate> #endif { #ifndef SP_REFACTOR /* ivars */ diff --git a/Source/SPCopyTable.h b/Source/SPCopyTable.h index 6e9187f5..84db1e9d 100644 --- a/Source/SPCopyTable.h +++ b/Source/SPCopyTable.h @@ -24,11 +24,15 @@ #import "SPTableView.h" +@class SPDataStorage; +@class SPTableContent; + #define SP_MAX_CELL_WIDTH_MULTICOLUMN 200 #define SP_MAX_CELL_WIDTH 400 -@class SPDataStorage; -@class SPTableContent; +extern NSInteger SPEditMenuCopy; +extern NSInteger SPEditMenuCopyWithColumns; +extern NSInteger SPEditCopyAsSQL; /*! @class copyTable @@ -50,7 +54,6 @@ NSRange fieldEditorSelectedRange; NSString *tmpBlobFileDirectory; - } @property(readwrite,assign) NSString *tmpBlobFileDirectory; @@ -189,7 +192,3 @@ - (BOOL)control:(NSControl *)control textView:(NSTextView *)textView doCommandBySelector:(SEL)command; @end - -extern NSInteger MENU_EDIT_COPY; -extern NSInteger MENU_EDIT_COPY_WITH_COLUMN; -extern NSInteger MENU_EDIT_COPY_AS_SQL; diff --git a/Source/SPCopyTable.m b/Source/SPCopyTable.m index 4460630c..ea0fe720 100644 --- a/Source/SPCopyTable.m +++ b/Source/SPCopyTable.m @@ -42,18 +42,17 @@ #import "SPTablesList.h" #import <SPMySQL/SPMySQL.h> -NSInteger MENU_EDIT_COPY = 2001; -NSInteger MENU_EDIT_COPY_WITH_COLUMN = 2002; -NSInteger MENU_EDIT_COPY_AS_SQL = 2003; +NSInteger SPEditMenuCopy = 2001; +NSInteger SPEditMenuCopyWithColumns = 2002; +NSInteger SPEditCopyAsSQL = 2003; -NSInteger kBlobExclude = 1; -NSInteger kBlobInclude = 2; -NSInteger kBlobAsFile = 3; -NSInteger kBlobAsImageFile = 4; +static const NSInteger kBlobExclude = 1; +static const NSInteger kBlobInclude = 2; +static const NSInteger kBlobAsFile = 3; +static const NSInteger kBlobAsImageFile = 4; @implementation SPCopyTable - /** * Hold the selected range of the current table cell editor to be able to set this passed * selection in the field editor's editTextView @@ -64,25 +63,21 @@ NSInteger kBlobAsImageFile = 4; /** * Cell editing in SPCustomQuery or for views in SPTableContent */ -- (BOOL) isCellEditingMode +- (BOOL)isCellEditingMode { - return ([[self delegate] isKindOfClass:[SPCustomQuery class]] || ([[self delegate] isKindOfClass:[SPTableContent class]] && [(NSObject*)[self delegate] valueForKeyPath:@"tablesListInstance"] && [(SPTablesList*)([(NSObject*)[self delegate] valueForKeyPath:@"tablesListInstance"]) tableType] == SPTableTypeView)); - } /** * Check if current edited cell represents a class other than a normal NSString * like pop-up menus for enum or set */ -- (BOOL) isCellComplex +- (BOOL)isCellComplex { - return (![[self preparedCellAtColumn:[self editedColumn] row:[self editedRow]] isKindOfClass:[SPTextAndLinkCell class]]); - } #pragma mark - @@ -90,33 +85,29 @@ NSInteger kBlobAsImageFile = 4; /** * Handles the general Copy action of selected rows in the table according to sender */ -- (void) copy:(id)sender +- (void)copy:(id)sender { #ifndef SP_REFACTOR /* copy table rows */ NSString *tmp = nil; - if([sender tag] == MENU_EDIT_COPY_AS_SQL) { + if ([sender tag] == SPEditCopyAsSQL) { tmp = [self rowsAsSqlInsertsOnlySelectedRows:YES]; - if ( nil != tmp ) - { + + if (tmp != nil){ NSPasteboard *pb = [NSPasteboard generalPasteboard]; - [pb declareTypes:[NSArray arrayWithObjects: NSStringPboardType, nil] - owner:nil]; + [pb declareTypes:[NSArray arrayWithObjects: NSStringPboardType, nil] owner:nil]; [pb setString:tmp forType:NSStringPboardType]; } - } else { - tmp = [self rowsAsTabStringWithHeaders:([sender tag] == MENU_EDIT_COPY_WITH_COLUMN) onlySelectedRows:YES blobHandling:kBlobInclude]; - if ( nil != tmp ) - { + } + else { + tmp = [self rowsAsTabStringWithHeaders:([sender tag] == SPEditMenuCopyWithColumns) onlySelectedRows:YES blobHandling:kBlobInclude]; + + if (tmp != nil) { NSPasteboard *pb = [NSPasteboard generalPasteboard]; - [pb declareTypes:[NSArray arrayWithObjects: - NSTabularTextPboardType, - NSStringPboardType, - nil] - owner:nil]; + [pb declareTypes:[NSArray arrayWithObjects:NSTabularTextPboardType, NSStringPboardType, nil] owner:nil]; [pb setString:tmp forType:NSStringPboardType]; [pb setString:tmp forType:NSTabularTextPboardType]; @@ -139,7 +130,7 @@ NSInteger kBlobAsImageFile = 4; * the value in each field is from the objects description method */ #ifndef SP_REFACTOR /* get rows as string */ -- (NSString *) rowsAsTabStringWithHeaders:(BOOL)withHeaders onlySelectedRows:(BOOL)onlySelected blobHandling:(NSInteger)withBlobHandling +- (NSString *)rowsAsTabStringWithHeaders:(BOOL)withHeaders onlySelectedRows:(BOOL)onlySelected blobHandling:(NSInteger)withBlobHandling { if (onlySelected && [self numberOfSelectedRows] == 0) return nil; @@ -277,7 +268,7 @@ NSInteger kBlobAsImageFile = 4; * Get selected rows a string of newline separated lines of , separated fields wrapped into quotes * the value in each field is from the objects description method */ -- (NSString *) rowsAsCsvStringWithHeaders:(BOOL)withHeaders onlySelectedRows:(BOOL)onlySelected blobHandling:(NSInteger)withBlobHandling +- (NSString *)rowsAsCsvStringWithHeaders:(BOOL)withHeaders onlySelectedRows:(BOOL)onlySelected blobHandling:(NSInteger)withBlobHandling { if (onlySelected && [self numberOfSelectedRows] == 0) return nil; @@ -417,21 +408,15 @@ NSInteger kBlobAsImageFile = 4; * Return selected rows as SQL INSERT INTO `foo` VALUES (baz) string. * If no selected table name is given `<table>` will be used instead. */ -- (NSString *) rowsAsSqlInsertsOnlySelectedRows:(BOOL)onlySelected +- (NSString *)rowsAsSqlInsertsOnlySelectedRows:(BOOL)onlySelected { - if (onlySelected && [self numberOfSelectedRows] == 0) return nil; - NSIndexSet *selectedRows; - if(onlySelected) - selectedRows = [self selectedRowIndexes]; - else - selectedRows = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [tableStorage count])]; + NSIndexSet *selectedRows = (onlySelected) ? [self selectedRowIndexes] : [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [tableStorage count])]; - NSArray *columns = [self tableColumns]; - NSUInteger numColumns = [columns count]; - - NSMutableString *value = [NSMutableString stringWithCapacity:10]; + NSArray *columns = [self tableColumns]; + NSUInteger numColumns = [columns count]; + NSMutableString *value = [NSMutableString stringWithCapacity:10]; id cellData = nil; @@ -443,14 +428,18 @@ NSInteger kBlobAsImageFile = 4; // Create an array of table column names NSMutableArray *tbHeader = [NSMutableArray arrayWithCapacity:numColumns]; - for (id enumObj in columns) { + + for (id enumObj in columns) + { [tbHeader addObject:[[enumObj headerCell] stringValue]]; } // Create arrays of table column mappings and types for fast iteration NSUInteger *columnMappings = malloc(numColumns * sizeof(NSUInteger)); NSUInteger *columnTypes = malloc(numColumns * sizeof(NSUInteger)); - for ( c = 0; c < numColumns; c++) { + + for (c = 0; c < numColumns; c++) + { columnMappings[c] = (NSUInteger)[[NSArrayObjectAtIndex(columns, c) identifier] integerValue]; NSString *t = [NSArrayObjectAtIndex(columnDefinitions, columnMappings[c]) objectForKey:@"typegrouping"]; @@ -479,12 +468,12 @@ NSInteger kBlobAsImageFile = 4; NSUInteger rowIndex = [selectedRows firstIndex]; Class spTableContentClass = [SPTableContent class]; Class nsDataClass = [NSData class]; - while ( rowIndex != NSNotFound ) + + while (rowIndex != NSNotFound) { [value appendString:@"\t("]; cellData = nil; rowCounter++; - NSMutableArray *rowValues = [[NSMutableArray alloc] initWithCapacity:numColumns]; for (c = 0; c < numColumns; c++) @@ -516,10 +505,11 @@ NSInteger kBlobAsImageFile = 4; [rowValues addObject:@"NULL"]; continue; - } else if (cellData) { + } + else if (cellData) { // Check column type and insert the data accordingly - switch(columnTypes[c]) { + switch (columnTypes[c]) { // Convert numeric types to unquoted strings case 0: @@ -550,13 +540,12 @@ NSInteger kBlobAsImageFile = 4; } // If nil is encountered, abort - } else { + } + else { NSBeep(); free(columnMappings); free(columnTypes); - [rowValues release]; - return nil; } } @@ -566,7 +555,7 @@ NSInteger kBlobAsImageFile = 4; [rowValues release]; // Close this VALUES group and set up the next one if appropriate - if ( rowCounter != penultimateRowIndex ) { + if (rowCounter != penultimateRowIndex) { // Add a new INSERT starter command every ~250k of data. if ([value length] > 250000) { @@ -575,23 +564,25 @@ NSInteger kBlobAsImageFile = 4; [(selectedTable == nil) ? @"<table>" : selectedTable backtickQuotedString], [tbHeader componentsJoinedAndBacktickQuoted]]; [value setString:@""]; - } else { + } + else { [value appendString:@"),\n"]; } - } else { + } + else { [value appendString:@"),\n"]; [result appendString:value]; } // Get the next selected row index rowIndex = [selectedRows indexGreaterThanIndex:rowIndex]; - } // Remove the trailing ",\n" from the query string - if ( [result length] > 3 ) + if ([result length] > 3) { [result deleteCharactersInRange:NSMakeRange([result length]-2, 2)]; + } [result appendString:@";\n"]; @@ -873,7 +864,6 @@ NSInteger kBlobAsImageFile = 4; - (NSMenu *)menuForEvent:(NSEvent *)event { - NSMenu *menu = [self menu]; #ifndef SP_REFACTOR /* menuForEvent: */ @@ -941,7 +931,6 @@ NSInteger kBlobAsImageFile = 4; } [bundleSubMenuItem release]; - } #endif return menu; @@ -950,8 +939,7 @@ NSInteger kBlobAsImageFile = 4; - (void)selectTableRows:(NSArray*)rowIndices { - - if(!rowIndices || ![rowIndices count]) return; + if (!rowIndices || ![rowIndices count]) return; NSMutableIndexSet *selection = [NSMutableIndexSet indexSet]; #ifndef SP_REFACTOR @@ -969,14 +957,13 @@ NSInteger kBlobAsImageFile = 4; [self selectRowIndexes:selection byExtendingSelection:NO]; } - } /** * Only have the copy menu item enabled when row(s) are selected in * supported tables. */ -- (BOOL) validateMenuItem:(NSMenuItem*)anItem +- (BOOL)validateMenuItem:(NSMenuItem*)anItem { #ifndef SP_REFACTOR /* validateMenuItem: */ NSInteger menuItemTag = [anItem tag]; @@ -986,7 +973,7 @@ NSInteger kBlobAsImageFile = 4; } // Don't validate anything other than the copy commands - if (menuItemTag != MENU_EDIT_COPY && menuItemTag != MENU_EDIT_COPY_WITH_COLUMN && menuItemTag != MENU_EDIT_COPY_AS_SQL) { + if (menuItemTag != SPEditMenuCopy && menuItemTag != SPEditMenuCopyWithColumns && menuItemTag != SPEditCopyAsSQL) { return YES; } @@ -996,12 +983,12 @@ NSInteger kBlobAsImageFile = 4; } // Enable the Copy [with column names] commands if a row is selected - if (menuItemTag == MENU_EDIT_COPY || menuItemTag == MENU_EDIT_COPY_WITH_COLUMN) { + if (menuItemTag == SPEditMenuCopy || menuItemTag == SPEditMenuCopyWithColumns) { return ([self numberOfSelectedRows] > 0); } // Enable the Copy as SQL commands if rows are selected and column definitions are available - if (menuItemTag == MENU_EDIT_COPY_AS_SQL) { + if (menuItemTag == SPEditCopyAsSQL) { return (columnDefinitions != nil && [self numberOfSelectedRows] > 0); } #endif @@ -1022,9 +1009,8 @@ NSInteger kBlobAsImageFile = 4; * Trap the enter, escape, tab and arrow keys, overriding default behaviour and continuing/ending editing, * only within the current row. */ -- (BOOL) control:(NSControl *)control textView:(NSTextView *)textView doCommandBySelector:(SEL)command +- (BOOL)control:(NSControl *)control textView:(NSTextView *)textView doCommandBySelector:(SEL)command { - NSInteger row, column; row = [self editedRow]; @@ -1152,9 +1138,8 @@ NSInteger kBlobAsImageFile = 4; return NO; } -- (void) keyDown:(NSEvent *)theEvent +- (void)keyDown:(NSEvent *)theEvent { - // RETURN or ENTER invoke editing mode for selected row // by calling tableView:shouldEditTableColumn: to validate @@ -1511,28 +1496,26 @@ NSInteger kBlobAsImageFile = 4; SPBeginAlertSheet(NSLocalizedString(@"BASH Error", @"bash error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [self window], self, nil, nil, [NSString stringWithFormat:@"%@ “%@”:\n%@", NSLocalizedString(@"Error for", @"error for message"), [cmdData objectForKey:@"name"], errorMessage]); } - } if (cmdData) [cmdData release]; - } #endif } #pragma mark - -- (void) awakeFromNib +- (void)awakeFromNib { columnDefinitions = nil; prefs = [[NSUserDefaults standardUserDefaults] retain]; - if ([NSTableView instancesRespondToSelector:@selector(awakeFromNib)]) + if ([NSTableView instancesRespondToSelector:@selector(awakeFromNib)]) { [super awakeFromNib]; - + } } -- (void) dealloc +- (void)dealloc { if (columnDefinitions) [columnDefinitions release]; #ifndef SP_REFACTOR diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m index f7f31088..8a2bc021 100644 --- a/Source/SPCustomQuery.m +++ b/Source/SPCustomQuery.m @@ -36,7 +36,9 @@ #import "SPFieldEditorController.h" #import "SPTextAndLinkCell.h" #import "SPTooltip.h" +#ifndef SP_REFACTOR /* headers */ #import "SPQueryFavoriteManager.h" +#endif #import "SPQueryController.h" #import "SPQueryDocumentsController.h" #import "SPEncodingPopupAccessory.h" @@ -269,7 +271,7 @@ // init query favorites controller #ifndef SP_REFACTOR [prefs synchronize]; -#endif + if(favoritesManager) [favoritesManager release]; favoritesManager = [[SPQueryFavoriteManager alloc] initWithDelegate:self]; @@ -279,6 +281,7 @@ modalDelegate:favoritesManager didEndSelector:nil contextInfo:nil]; +#endif } else if ([queryFavoritesButton indexOfSelectedItem] > 5) { // Choose favorite @@ -1484,22 +1487,28 @@ { [tempRow addObject:[[tableColumn headerCell] stringValue]]; } - + NSMutableArray *currentResult = [NSMutableArray array]; [currentResult addObject:[NSArray arrayWithArray:tempRow]]; - //add rows - for ( i = 0 ; i < [self numberOfRowsInTableView:customQueryView] ; i++) { + // Add rows + for (i = 0; i < [self numberOfRowsInTableView:customQueryView]; i++) + { [tempRow removeAllObjects]; + NSEnumerator *enumerator = [[customQueryView tableColumns] objectEnumerator]; - while ( (tableColumn = [enumerator nextObject]) ) { + + while ((tableColumn = [enumerator nextObject])) + { id value = [self _resultDataItemAtRow:i columnIndex:[[tableColumn identifier] integerValue]]; [tempRow addObject:[self _convertResultDataValueToDisplayableRepresentation:value whilePreservingNULLs:includeNULLs truncateDataFields:truncate]]; } + [currentResult addObject:[NSArray arrayWithArray:tempRow]]; } + [tempRow release]; return currentResult; @@ -1830,10 +1839,6 @@ [columnsInSpecifiedTable addObject:field]; } - // Try to identify the field bijectively - NSMutableString *fieldIDQueryStr = [NSMutableString string]; - [fieldIDQueryStr setString:@"WHERE ("]; - // --- Build WHERE clause --- dataRow = [resultData rowContentsAtIndex:rowIndex]; @@ -1858,30 +1863,26 @@ // Build up the argument for (field in columnsToQuery) { id aValue = [dataRow objectAtIndex:[[field objectForKey:@"datacolumnindex"] integerValue]]; - if ([aValue isNSNull]) { [argumentParts addObject:[NSString stringWithFormat:@"%@ IS NULL", [[field objectForKey:@"org_name"] backtickQuotedString]]]; - } - else { + } else { NSString *fieldTypeGrouping = [field objectForKey:@"typegrouping"]; - + // Skip blob-type fields if requested if (!includeBlobs - && ([fieldTypeGrouping isEqualToString:@"textdata"] || - [fieldTypeGrouping isEqualToString:@"blobdata"] || - [[field objectForKey:@"type"] isEqualToString:@"BINARY"] || - [[field objectForKey:@"type"] isEqualToString:@"VARBINARY"])) + && ([fieldTypeGrouping isEqualToString:@"textdata"] + || [fieldTypeGrouping isEqualToString:@"blobdata"] + || [[field objectForKey:@"type"] isEqualToString:@"BINARY"] + || [[field objectForKey:@"type"] isEqualToString:@"VARBINARY"])) { continue; } - - if ([[field objectForKey:@"typegrouping"] isEqualToString:@"bit"]) { + + // If the field is of type BIT then it needs a binary prefix + if ([fieldTypeGrouping isEqualToString:@"bit"]) { [argumentParts addObject:[NSString stringWithFormat:@"%@=b'%@'", [[field objectForKey:@"org_name"] backtickQuotedString], [aValue description]]]; } - else if ([[field objectForKey:@"typegrouping"] isEqualToString:@"integer"]) { - [fieldIDQueryStr appendFormat:@"%@=%@ AND ", [[field objectForKey:@"org_name"] backtickQuotedString], [aValue description]]; - } - else if ([[field objectForKey:@"typegrouping"] isEqualToString:@"geometry"]) { + else if ([fieldTypeGrouping isEqualToString:@"geometry"]) { [argumentParts addObject:[NSString stringWithFormat:@"%@=%@", [[field objectForKey:@"org_name"] backtickQuotedString], [mySQLConnection escapeAndQuoteData:[aValue data]]]]; } // BLOB/TEXT data @@ -3054,15 +3055,16 @@ { NSString *version = nil; if([[mySQLversion stringByReplacingOccurrencesOfString:@"." withString:@""] integerValue] < 42) - version = @"41"; + version = @"4.1"; else - version = [mySQLversion stringByReplacingOccurrencesOfString:@"." withString:@""]; + version = [NSString stringWithString:mySQLversion]; + [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString: [[NSString stringWithFormat: SPMySQLSearchURL, - searchString, version, - NSLocalizedString(@"en", @"MySQL search language code - eg in http://search.mysql.com/search?q=select&site=refman-50&lr=lang_en")] + NSLocalizedString(@"en", @"MySQL search language code - eg in http://search.mysql.com/search?q=select&site=refman-50&lr=lang_en"), + searchString] stringByAddingPercentEscapesUsingEncoding:NSASCIIStringEncoding]]]; } @@ -3389,7 +3391,9 @@ initWithString:([favorite objectForKey:@"tabtrigger"] && [(NSString*)[favorite objectForKey:@"tabtrigger"] length]) ? [NSString stringWithFormat:@"%@\t%@⇥", [favorite objectForKey:@"name"], [favorite objectForKey:@"tabtrigger"]] : [favorite objectForKey:@"name"] attributes:attributes] autorelease]; NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:@""]; - [item setToolTip:[NSString stringWithString:[favorite objectForKey:@"query"]]]; + if ([favorite objectForKey:@"query"]) { + [item setToolTip:[NSString stringWithString:[favorite objectForKey:@"query"]]]; + } [item setAttributedTitle:titleString]; [item setIndentationLevel:1]; [menu addItem:item]; @@ -3414,7 +3418,9 @@ initWithString:([favorite objectForKey:@"tabtrigger"] && [(NSString*)[favorite objectForKey:@"tabtrigger"] length]) ? [NSString stringWithFormat:@"%@\t%@⇥", [favorite objectForKey:@"name"], [favorite objectForKey:@"tabtrigger"]] : [favorite objectForKey:@"name"] attributes:attributes] autorelease]; NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:@""]; - [item setToolTip:[NSString stringWithString:[favorite objectForKey:@"query"]]]; + if ([favorite objectForKey:@"query"]) { + [item setToolTip:[NSString stringWithString:[favorite objectForKey:@"query"]]]; + } [item setAttributedTitle:titleString]; [item setIndentationLevel:1]; [menu addItem:item]; diff --git a/Source/SPDataCellFormatter.h b/Source/SPDataCellFormatter.h index c5d9cd99..a2710bf6 100644 --- a/Source/SPDataCellFormatter.h +++ b/Source/SPDataCellFormatter.h @@ -29,7 +29,7 @@ NSString *fieldType; } -@property(readwrite, assign) NSInteger textLimit; -@property(readwrite, retain) NSString* fieldType; +@property (readwrite, assign) NSInteger textLimit; +@property (readwrite, retain) NSString* fieldType; @end diff --git a/Source/SPDataImport.m b/Source/SPDataImport.m index 6d8f701d..89c5b86e 100644 --- a/Source/SPDataImport.m +++ b/Source/SPDataImport.m @@ -45,10 +45,10 @@ #define SP_FILE_READ_ERROR_STRING NSLocalizedString(@"File read error", @"File read error title (Import Dialog)") -@interface SPDataImport (PrivateAPI) +@interface SPDataImport () -- (void) _importBackgroundProcess:(NSString *)filename; -- (void) _resetFieldMappingGlobals; +- (void)_importBackgroundProcess:(NSString *)filename; +- (void)_resetFieldMappingGlobals; @end @@ -1699,56 +1699,29 @@ } #pragma mark - - -/** - * Dealloc. - */ -- (void)dealloc -{ - if (fieldMappingImportArray) [fieldMappingImportArray release]; - if (geometryFields) [geometryFields release]; - if (geometryFieldsMapIndex) [geometryFieldsMapIndex release]; - if (bitFields) [bitFields release]; - if (nullableNumericFields) [nullableNumericFields release]; - if (bitFieldsMapIndex) [bitFieldsMapIndex release]; - if (nullableNumericFieldsMapIndex) [nullableNumericFieldsMapIndex release]; - - if (lastFilename) [lastFilename release]; - if (prefs) [prefs release]; - if(selectedTableTarget) [selectedTableTarget release]; - - for (id retainedObject in nibObjectsToRelease) [retainedObject release]; - - [nibObjectsToRelease release]; - - [super dealloc]; -} - -@end - -@implementation SPDataImport (PrivateAPI) +#pragma mark Private API /** * Starts the import process on a background thread. */ -- (void) _importBackgroundProcess:(NSString *)filename +- (void)_importBackgroundProcess:(NSString *)filename { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSString *fileType = [[importFormatPopup selectedItem] title]; - + // Use the appropriate processing function for the file type if ([fileType isEqualToString:@"SQL"]) [self importSQLFile:filename]; else if ([fileType isEqualToString:@"CSV"]) [self importCSVFile:filename]; - + [pool release]; } /** * Release and reset any field mapping global variables. */ -- (void) _resetFieldMappingGlobals +- (void)_resetFieldMappingGlobals { if (csvImportTailString) [csvImportTailString release], csvImportTailString = nil; if (csvImportHeaderString) [csvImportHeaderString release], csvImportHeaderString = nil; @@ -1759,4 +1732,30 @@ if (fieldMapperOperator) [fieldMapperOperator release], fieldMapperOperator = nil; } +#pragma mark - + +/** + * Dealloc. + */ +- (void)dealloc +{ + if (fieldMappingImportArray) [fieldMappingImportArray release]; + if (geometryFields) [geometryFields release]; + if (geometryFieldsMapIndex) [geometryFieldsMapIndex release]; + if (bitFields) [bitFields release]; + if (nullableNumericFields) [nullableNumericFields release]; + if (bitFieldsMapIndex) [bitFieldsMapIndex release]; + if (nullableNumericFieldsMapIndex) [nullableNumericFieldsMapIndex release]; + + if (lastFilename) [lastFilename release]; + if (prefs) [prefs release]; + if(selectedTableTarget) [selectedTableTarget release]; + + for (id retainedObject in nibObjectsToRelease) [retainedObject release]; + + [nibObjectsToRelease release]; + + [super dealloc]; +} + @end diff --git a/Source/SPDatabaseCopy.m b/Source/SPDatabaseCopy.m index 4dcb4966..ea45c4af 100644 --- a/Source/SPDatabaseCopy.m +++ b/Source/SPDatabaseCopy.m @@ -65,21 +65,15 @@ return NO; } - BOOL success = [self createDatabase:targetDatabaseName]; + //abort here if database creation failed + if(![self createDatabase:targetDatabaseName]) + return NO; SPTableCopy *dbActionTableCopy = [[SPTableCopy alloc] init]; [dbActionTableCopy setConnection:connection]; - for (NSString *currentTable in tables) { - if ([dbActionTableCopy copyTable:currentTable - from:sourceDatabaseName - to:targetDatabaseName - withContent:copyWithContent]) { - } else { - success = NO; - } - } + BOOL success = [dbActionTableCopy copyTables:tables from:sourceDatabaseName to:targetDatabaseName withContent:copyWithContent]; [dbActionTableCopy release]; diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m index d43be841..53dfb908 100644 --- a/Source/SPDatabaseDocument.m +++ b/Source/SPDatabaseDocument.m @@ -34,10 +34,9 @@ enum { #import "SPDatabaseDocument.h" #import "SPConnectionController.h" +#import "SPConnectionHandler.h" #import "SPConnectionControllerInitializer.h" -#import <SPMySQL/SPMySQL.h> - #import "SPTablesList.h" #import "SPTableStructure.h" #ifndef SP_REFACTOR /* headers */ @@ -87,7 +86,6 @@ enum { #ifndef SP_REFACTOR /* headers */ #import "SPBundleHTMLOutputController.h" #import "SPConnectionDelegate.h" -#import "SPConnectionHandler.h" #endif #ifdef SP_REFACTOR /* headers */ @@ -97,6 +95,8 @@ enum { #import "SPDatabaseRename.h" #endif +#import <SPMySQL/SPMySQL.h> + // Constants #ifndef SP_REFACTOR static NSString *SPCreateSyntx = @"SPCreateSyntax"; @@ -258,6 +258,7 @@ static NSString *SPRenameDatabaseAction = @"SPRenameDatabase"; #endif + - (void)awakeFromNib { #ifndef SP_REFACTOR @@ -4019,6 +4020,7 @@ static NSString *SPRenameDatabaseAction = @"SPRenameDatabase"; [createTableSyntaxWindow orderOut:nil]; [[NSNotificationCenter defaultCenter] removeObserver:self]; [self setParentWindow:nil]; + } #ifndef SP_REFACTOR @@ -4103,7 +4105,7 @@ static NSString *SPRenameDatabaseAction = @"SPRenameDatabase"; // If the window is being set for the first time - connection controller is visible - update focus if (!parentWindow && !mySQLConnection) { #ifndef SP_REFACTOR - [aWindow makeFirstResponder:(NSView *)[connectionController favoritesOutlineView]]; + [aWindow makeFirstResponder:(NSResponder *)[connectionController favoritesOutlineView]]; #endif [connectionController performSelector:@selector(updateFavoriteSelection:) withObject:self afterDelay:0.0]; } diff --git a/Source/SPDatabaseViewController.m b/Source/SPDatabaseViewController.m index 4d0548d5..da20b967 100644 --- a/Source/SPDatabaseViewController.m +++ b/Source/SPDatabaseViewController.m @@ -46,7 +46,6 @@ @end - @implementation SPDatabaseDocument (SPDatabaseViewController) #pragma mark - diff --git a/Source/SPExportController.m b/Source/SPExportController.m index ace630b6..315df604 100644 --- a/Source/SPExportController.m +++ b/Source/SPExportController.m @@ -44,8 +44,8 @@ static const NSString *SPTableViewContentColumnID = @"content"; static const NSString *SPTableViewDropColumnID = @"drop"; static const NSString *SPSQLExportStructureEnabled = @"SQLExportStructureEnabled"; -static const NSString *SPSQLExportContentEnabled = @"SQLExportContentEnabled"; -static const NSString *SPSQLExportDropEnabled = @"SQLExportDropEnabled"; +static const NSString *SPSQLExportContentEnabled = @"SQLExportContentEnabled"; +static const NSString *SPSQLExportDropEnabled = @"SQLExportDropEnabled"; @interface SPExportController (PrivateAPI) @@ -642,7 +642,7 @@ static const NSString *SPSQLExportDropEnabled = @"SQLExportDropEnabled"; // Check whether to save the export filename. Save it if it's not blank and contains at least one // token - this suggests it's not a one-off filename - if (![exportCustomFilenameTokenField stringValue]) { + if ([[exportCustomFilenameTokenField stringValue] length] < 1) { [prefs removeObjectForKey:SPExportFilenameFormat]; } else { diff --git a/Source/SPExportFile.m b/Source/SPExportFile.m index 09d3b6af..6fd4e217 100644 --- a/Source/SPExportFile.m +++ b/Source/SPExportFile.m @@ -98,7 +98,10 @@ - (BOOL)delete { if ((![self exportFilePath]) || (![self exportFileHandle]) || ([[self exportFilePath] length] == 0)) return NO; - + + // Ensure the file is closed to allow all processing threads to close + [self close]; + NSFileManager *fileManager = [NSFileManager defaultManager]; if ([fileManager fileExistsAtPath:[self exportFilePath]]) { diff --git a/Source/SPExportFileNameTokenObject.h b/Source/SPExportFileNameTokenObject.h index 24022745..76c8fa2e 100644 --- a/Source/SPExportFileNameTokenObject.h +++ b/Source/SPExportFileNameTokenObject.h @@ -22,13 +22,11 @@ // // More info at <http://code.google.com/p/sequel-pro/> -#import <Cocoa/Cocoa.h> - - -@interface SPExportFileNameTokenObject : NSObject<NSCoding> { +@interface SPExportFileNameTokenObject : NSObject<NSCoding> +{ NSString *tokenContent; } -@property(retain) NSString *tokenContent; +@property (retain) NSString *tokenContent; @end diff --git a/Source/SPExportFileNameTokenObject.m b/Source/SPExportFileNameTokenObject.m index 9e589f79..f62c50d2 100644 --- a/Source/SPExportFileNameTokenObject.m +++ b/Source/SPExportFileNameTokenObject.m @@ -24,7 +24,6 @@ #import "SPExportFileNameTokenObject.h" - @implementation SPExportFileNameTokenObject @synthesize tokenContent; @@ -37,6 +36,7 @@ if ((self = [super init])) { [self setTokenContent:[decoder decodeObjectForKey:@"TokenContent"]]; } + return self; } diff --git a/Source/SPExportFileUtilities.m b/Source/SPExportFileUtilities.m index 561c5340..c14fd7e0 100644 --- a/Source/SPExportFileUtilities.m +++ b/Source/SPExportFileUtilities.m @@ -36,10 +36,13 @@ typedef enum SPExportErrorCancelExport = 0, SPExportErrorReplaceFiles = 1, SPExportErrorSkipErrorFiles = 2 -} SPExportErrorChoice; +} +SPExportErrorChoice; @interface SPExportController (SPExportFileUtilitiesPrivateAPI) - - (void)_reopenExportSheet; + +- (void)_reopenExportSheet; + @end @implementation SPExportController (SPExportFileUtilities) @@ -130,7 +133,7 @@ typedef enum */ - (void)errorCreatingExportFileHandles:(NSArray *)files { - // Get the number of files that already exists as well as couldn't be created because of other reasons + // Get the number of files that already exist as well as couldn't be created because of other reasons NSUInteger filesAlreadyExisting = 0; NSUInteger filesFailed = 0; @@ -138,17 +141,25 @@ typedef enum { if ([file exportFileHandleStatus] == SPExportFileHandleExists) { filesAlreadyExisting++; - + } // For file handles that we failed to create for some unknown reason, ignore them and remove any // exporters that are associated with them. - } else if ([file exportFileHandleStatus] == SPExportFileHandleFailed) { + else if ([file exportFileHandleStatus] == SPExportFileHandleFailed) { + filesFailed++; + + NSMutableArray *exportersToRemove = [[NSMutableArray alloc] init]; + for (SPExporter *exporter in exporters) { if ([[exporter exportOutputFile] isEqualTo:file]) { - [exporters removeObject:exporter]; + [exportersToRemove addObject:exporter]; } } + + [exporters removeObjectsInArray:exportersToRemove]; + + [exportersToRemove release]; } } @@ -164,10 +175,12 @@ typedef enum if (filesAlreadyExisting == 1) { [alert setMessageText:[NSString stringWithFormat:NSLocalizedString(@"“%@” already exists. Do you want to replace it?", @"Export file already exists message"), [[[files objectAtIndex:0] exportFilePath] lastPathComponent]]]; [alert setInformativeText:[NSString stringWithFormat:@"%@%@", NSLocalizedString(@"A file with the same name already exists in the target folder. Replacing it will overwrite its current contents.", @"Export file already exists explanatory text"), additionalErrors]]; - } else if (filesAlreadyExisting == [exportFiles count]) { + } + else if (filesAlreadyExisting == [exportFiles count]) { [alert setMessageText:[NSString stringWithFormat:NSLocalizedString(@"All the export files already exist. Do you want to replace them?", @"All export files already exist message")]]; [alert setInformativeText:[NSString stringWithFormat:@"%@%@", NSLocalizedString(@"Files with the same names already exist in the target folder. Replacing them will overwrite their current contents.", @"All export files already exist explanatory text"), additionalErrors]]; - } else { + } + else { [alert setMessageText:[NSString stringWithFormat:NSLocalizedString(@"%lu files already exist. Do you want to replace them?", @"Export file already exists message"), filesAlreadyExisting]]; [alert setInformativeText:[NSString stringWithFormat:@"%@%@", [NSString stringWithFormat:NSLocalizedString(@"%lu files with the same names already exist in the target folder. Replacing them will overwrite their current contents.", @"Some export files already exist explanatory text"), filesAlreadyExisting], additionalErrors]]; } @@ -187,20 +200,21 @@ typedef enum [[[alert buttons] objectAtIndex:2] setKeyEquivalent:@"s"]; [[[alert buttons] objectAtIndex:2] setKeyEquivalentModifierMask:NSCommandKeyMask]; } - + } // If one or multiple files failed, but only due to unhandled errors, show a short dialog - } else { + else { if (filesFailed == 1) { [alert setMessageText:[NSString stringWithFormat:NSLocalizedString(@"“%@” could not be created", @"Export file creation error title"), [[[files objectAtIndex:0] exportFilePath] lastPathComponent]]]; [alert setInformativeText:NSLocalizedString(@"An unhandled error occurred when attempting to create the export file. Please check the details and try again.", @"Export file creation error explanatory text")]; - } else if (filesFailed == [exportFiles count]) { + } + else if (filesFailed == [exportFiles count]) { [alert setMessageText:[NSString stringWithFormat:NSLocalizedString(@"No files could be created", @"All export files creation error title")]]; [alert setInformativeText:NSLocalizedString(@"An unhandled error occurred when attempting to create each of the export files. Please check the details and try again.", @"All export files creation error explanatory text")]; - } else { + } + else { [alert setMessageText:[NSString stringWithFormat:NSLocalizedString(@"%lu files could not be created", @"Export files creation error title"), filesFailed]]; [alert setInformativeText:[NSString stringWithFormat:NSLocalizedString(@"An unhandled error occurred when attempting to create %lu of the export files. Please check the details and try again.", @"Export files creation error explanatory text"), filesFailed]]; } - [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"cancel button")]; [[[alert buttons] objectAtIndex:0] setTag:SPExportErrorCancelExport]; @@ -303,10 +317,6 @@ typedef enum } } -@end - -@implementation SPExportController (SPExportFileUtilitiesPrivateAPI) - /** * Re-open the export sheet without resetting the interface - for use on error. */ diff --git a/Source/SPExportInitializer.m b/Source/SPExportInitializer.m index a0c0ef41..b02ef927 100644 --- a/Source/SPExportInitializer.m +++ b/Source/SPExportInitializer.m @@ -25,13 +25,14 @@ #import "SPExportInitializer.h" #import "SPTableData.h" -#import "SPTableContent.h" #import "SPDatabaseDocument.h" #import "SPTablesList.h" #import "SPGrowlController.h" #import "SPDatabaseDocument.h" #import "SPCustomQuery.h" #import "SPAlertSheets.h" +#import "SPTableContent.h" + #import "SPCSVExporter.h" #import "SPSQLExporter.h" #import "SPXMLExporter.h" @@ -41,7 +42,6 @@ #import "SPExportFileUtilities.h" #import "SPExportFilenameUtilities.h" #import "SPExportFileNameTokenObject.h" - #import <SPMySQL/SPMySQL.h> @implementation SPExportController (SPExportInitializer) @@ -276,6 +276,7 @@ [sqlExporter setSqlOutputIncludeUTF8BOM:[exportUseUTF8BOMButton state]]; [sqlExporter setSqlOutputEncodeBLOBasHex:[exportSQLBLOBFieldsAsHexCheck state]]; [sqlExporter setSqlOutputIncludeErrors:[exportSQLIncludeErrorsCheck state]]; + [sqlExporter setSqlOutputIncludeAutoIncrement:([exportSQLIncludeStructureCheck state] && [exportSQLIncludeAutoIncrementValueButton state])]; [sqlExporter setSqlInsertAfterNValue:[exportSQLInsertNValueTextField integerValue]]; [sqlExporter setSqlInsertDivider:[exportSQLInsertDividerPopUpButton indexOfSelectedItem]]; diff --git a/Source/SPFieldEditorController.h b/Source/SPFieldEditorController.h index da78785b..1fc3f812 100644 --- a/Source/SPFieldEditorController.h +++ b/Source/SPFieldEditorController.h @@ -32,10 +32,9 @@ * This class offers a sheet for editing different kind of data such as text, blobs (including images) as * editSheet and bit fields as bitSheet. */ -#ifndef SP_REFACTOR @interface SPFieldEditorController : NSWindowController -#else -@interface SPFieldEditorController : NSWindowController <NSComboBoxDataSource> +#ifdef SP_REFACTOR +<NSComboBoxDataSource> #endif { IBOutlet id editSheetProgressBar; @@ -161,7 +160,9 @@ NSUserDefaults *prefs; +#ifndef SP_REFACTOR NSDictionary *qlTypes; +#endif NSInteger editSheetReturnCode; BOOL _isGeometry; diff --git a/Source/SPFieldMapperController.m b/Source/SPFieldMapperController.m index aabdc171..374bd3dd 100644 --- a/Source/SPFieldMapperController.m +++ b/Source/SPFieldMapperController.m @@ -145,10 +145,9 @@ static NSString *SPTableViewSqlColumnID = @"sql"; [tableTargetPopup addItemsWithTitles:allTableNames]; // Select either the currently selected table, or the first item in the list, or if no table in db switch to "New Table" mode - if ([[theDelegate valueForKeyPath:@"tableDocumentInstance"] table] != nil - && ![[tablesListInstance tableName] isEqualToString:@""] - && [allTableNames containsObject:[tablesListInstance tableName]]) { - [tableTargetPopup selectItemWithTitle:[tablesListInstance tableName]]; + if ([[tablesListInstance selectedTableNames] count] + && [allTableNames containsObject:[[tablesListInstance selectedTableNames] objectAtIndex:0]]) { + [tableTargetPopup selectItemWithTitle:[[tablesListInstance selectedTableNames] objectAtIndex:0]]; } else { if([allTableNames count]) [tableTargetPopup selectItemAtIndex:3]; @@ -515,10 +514,9 @@ static NSString *SPTableViewSqlColumnID = @"sql"; } // Select either the currently selected table, or the first item in the list, or if no table in db switch to "New Table" mode - if ([[theDelegate valueForKeyPath:@"tableDocumentInstance"] table] != nil - && ![[tablesListInstance tableName] isEqualToString:@""] - && [allTableNames containsObject:[tablesListInstance tableName]]) { - [tableTargetPopup selectItemWithTitle:[tablesListInstance tableName]]; + if ([[tablesListInstance selectedTableNames] count] + && [allTableNames containsObject:[[tablesListInstance selectedTableNames] objectAtIndex:0]]) { + [tableTargetPopup selectItemWithTitle:[[tablesListInstance selectedTableNames] objectAtIndex:0]]; } else { if([allTableNames count]) [tableTargetPopup selectItemAtIndex:3]; diff --git a/Source/SPGeneralPreferencePane.h b/Source/SPGeneralPreferencePane.h index c573b84a..a23b6bb8 100644 --- a/Source/SPGeneralPreferencePane.h +++ b/Source/SPGeneralPreferencePane.h @@ -34,13 +34,14 @@ */ @interface SPGeneralPreferencePane : SPPreferencePane <SPPreferencePaneProtocol> { - NSImage *folderImage; - IBOutlet NSPopUpButton *defaultFavoritePopup; + + IBOutlet NSArrayController *favoritesController; } - (IBAction)updateDefaultFavorite:(id)sender; - (void)updateDefaultFavoritePopup; +- (void)updateDefaultFavoritePopupSelection; @end diff --git a/Source/SPGeneralPreferencePane.m b/Source/SPGeneralPreferencePane.m index f24dec54..67c43881 100644 --- a/Source/SPGeneralPreferencePane.m +++ b/Source/SPGeneralPreferencePane.m @@ -24,51 +24,21 @@ // More info at <http://code.google.com/p/sequel-pro/> #import "SPGeneralPreferencePane.h" -#import "SPFavoritesController.h" -#import "SPTreeNode.h" -#import "SPFavoriteNode.h" -#import "SPGroupNode.h" - -static NSString *SPDatabaseImage = @"database-small"; - -@interface SPGeneralPreferencePane () - -- (NSArray *)_constructMenuItemsForNode:(SPTreeNode *)node atLevel:(NSUInteger)level; - -@end @implementation SPGeneralPreferencePane #pragma mark - -#pragma mark Initialisation - -- (void)awakeFromNib -{ - // Generic folder image for use in the outline view's groups - folderImage = [[[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeForHFSTypeCode(kGenericFolderIcon)] retain]; - - [folderImage setSize:NSMakeSize(16, 16)]; -} - -#pragma mark - #pragma mark IB action methods /** * Updates the default favorite. */ - (IBAction)updateDefaultFavorite:(id)sender -{ - for (NSMenuItem *item in [defaultFavoritePopup itemArray]) - { - [item setState:NSOffState]; - } - - [sender setState:NSOnState]; - [defaultFavoritePopup setTitle:[sender title]]; - +{ [prefs setBool:([defaultFavoritePopup indexOfSelectedItem] == 0) forKey:SPSelectLastFavoriteUsed]; - - [prefs setInteger:[sender tag] forKey:SPDefaultFavorite]; + + // Minus 2 from index to account for the "Last Used" and separator items + [prefs setInteger:([defaultFavoritePopup indexOfSelectedItem] - 2) forKey:SPDefaultFavorite]; } #pragma mark - @@ -81,79 +51,43 @@ static NSString *SPDatabaseImage = @"database-small"; { [defaultFavoritePopup removeAllItems]; + // Use the last used favorite [defaultFavoritePopup addItemWithTitle:NSLocalizedString(@"Last Used", @"Last Used entry in favorites menu")]; [[defaultFavoritePopup menu] addItem:[NSMenuItem separatorItem]]; // Add all favorites to the menu - for (SPTreeNode *node in [[[[[SPFavoritesController sharedFavoritesController] favoritesTree] childNodes] objectAtIndex:0] childNodes]) + for (NSString *favorite in [[favoritesController arrangedObjects] valueForKeyPath:@"name"]) { - NSArray *items = [self _constructMenuItemsForNode:node atLevel:0]; + NSMenuItem *favoriteMenuItem = [[NSMenuItem alloc] initWithTitle:favorite action:NULL keyEquivalent:@""]; + + [[defaultFavoritePopup menu] addItem:favoriteMenuItem]; - for (NSMenuItem *item in items) - { - [[defaultFavoritePopup menu] addItem:item]; - } + [favoriteMenuItem release]; } - // Select the default favorite from prefs - [defaultFavoritePopup selectItemWithTag:[prefs boolForKey:SPSelectLastFavoriteUsed] ? 0 : [prefs integerForKey:SPDefaultFavorite]]; + // Add item to switch to edit favorites pane + [[defaultFavoritePopup menu] addItem:[NSMenuItem separatorItem]]; + + NSMenuItem *editMenuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Edit Favorites…", @"edit favorites menu item") action:@selector(displayFavoritePreferences:) keyEquivalent:@""]; + + [editMenuItem setTarget:[[[self view] window] delegate]]; + + [[defaultFavoritePopup menu] addItem:editMenuItem]; + + [editMenuItem release]; + + // Select the default favorite from prefs + [self updateDefaultFavoritePopupSelection]; } -#pragma mark - -#pragma mark Private API - /** - * Builds a menu item and sub-menu (if required) of the supplied tree node. - * - * @param node The node to build the menu item for - * - * @return The menu item + * Resets the default favorite popup button selection based on the user's preferences. */ -- (NSArray *)_constructMenuItemsForNode:(SPTreeNode *)node atLevel:(NSUInteger)level -{ - NSMutableArray *items = [NSMutableArray array]; - - if ([node isGroup]) { - - level++; - - SPGroupNode *groupNode = (SPGroupNode *)[node representedObject]; - - NSMenuItem *groupItem = [[NSMenuItem alloc] initWithTitle:[groupNode nodeName] action:NULL keyEquivalent:@""]; - - NSUInteger groupLevel = (level - 1); - - [groupItem setEnabled:NO]; - [groupItem setImage:folderImage]; - [groupItem setIndentationLevel:groupLevel]; - - [items addObject:groupItem]; - - [groupItem release]; - - for (SPTreeNode *childNode in [node childNodes]) - { - NSArray *innerItems = [self _constructMenuItemsForNode:childNode atLevel:level]; - - [items addObjectsFromArray:innerItems]; - } - } - else { - NSDictionary *favorite = [(SPFavoriteNode *)[node representedObject] nodeFavorite]; - - NSMenuItem *menuItem = [[NSMenuItem alloc] initWithTitle:[favorite objectForKey:SPFavoriteNameKey] action:@selector(updateDefaultFavorite:) keyEquivalent:@""]; - - [menuItem setTag:[[favorite objectForKey:SPFavoriteIDKey] integerValue]]; - [menuItem setImage:[NSImage imageNamed:SPDatabaseImage]]; - [menuItem setIndentationLevel:level]; - [menuItem setTarget:self]; - - [items addObject:menuItem]; - - [menuItem release]; - } +- (void)updateDefaultFavoritePopupSelection +{ + NSUInteger index = [prefs integerForKey:SPDefaultFavorite]; - return items; + [defaultFavoritePopup selectItemAtIndex:(![prefs boolForKey:SPSelectLastFavoriteUsed] && index > 0 && index < [[defaultFavoritePopup itemArray] count]) ? index + 2 : 0]; } #pragma mark - @@ -189,13 +123,4 @@ static NSString *SPDatabaseImage = @"database-small"; return NO; } -#pragma mark - - -- (void)dealloc -{ - [folderImage release], folderImage = nil; - - [super dealloc]; -} - @end diff --git a/Source/SPNotLoaded.m b/Source/SPNotLoaded.m index 3938823f..99a5a1d0 100644 --- a/Source/SPNotLoaded.m +++ b/Source/SPNotLoaded.m @@ -30,7 +30,7 @@ static SPNotLoaded *notLoaded = nil; @implementation SPNotLoaded // Return the singleton object -+ (SPNotLoaded *)notLoaded ++ (SPNotLoaded *) notLoaded { @synchronized(self) { if (notLoaded == nil) { @@ -40,19 +40,17 @@ static SPNotLoaded *notLoaded = nil; return notLoaded; } -+ (id)allocWithZone:(NSZone *)zone ++ (id) allocWithZone:(NSZone *)zone { @synchronized(self) { return [[self notLoaded] retain]; } - return nil; } -- (id)init +- (id) init { Class notLoadedClass = [self class]; - @synchronized(notLoadedClass) { if (notLoaded == nil) { if ((self = [super init])) { @@ -60,19 +58,18 @@ static SPNotLoaded *notLoaded = nil; } } } - return notLoaded; } -- (id)copyWithZone:(NSZone *)zone { return self; } +- (id) copyWithZone:(NSZone *)zone { return self; } -- (id)retain { return self; } +- (id) retain { return self; } -- (NSUInteger)retainCount { return NSUIntegerMax; } +- (NSUInteger) retainCount { return NSUIntegerMax; } -- (oneway void)release {} +- (oneway void) release {} -- (id)autorelease { return self; } +- (id) autorelease { return self; } @end @@ -82,13 +79,11 @@ static SPNotLoaded *notLoaded = nil; */ @implementation NSObject (SPNotLoadedTest) -- (BOOL)isSPNotLoaded +- (BOOL) isSPNotLoaded { static id SPNotLoadedForComparison; - if (!SPNotLoadedForComparison) SPNotLoadedForComparison = [SPNotLoaded notLoaded]; - - return (self == SPNotLoadedForComparison); + return (self == SPNotLoadedForComparison); } @end diff --git a/Source/SPPreferencesUpgrade.m b/Source/SPPreferencesUpgrade.m index a4e15c6b..10a86a5d 100644 --- a/Source/SPPreferencesUpgrade.m +++ b/Source/SPPreferencesUpgrade.m @@ -329,7 +329,7 @@ void SPMigrateConnectionFavoritesData(void) [prefs setInteger:[[[favorites objectAtIndex:defaultFavoriteIndex] objectForKey:SPFavoriteIDKey] integerValue] forKey:SPDefaultFavorite]; } - // TOOD: Only uncomment when migration is complete + // TOOD: Favorites migration - only uncomment when we want to remove backwards compatibility //[prefs removeObjectForKey:@"LastFavoriteIndex"]; } @@ -360,7 +360,7 @@ void SPMigrateConnectionFavoritesData(void) NSLog(@"Error migrating favorites data: %@", [error localizedDescription]); } else { - // TODO: Only uncomment when migration is complete + // TOOD: Favorites migration - only uncomment when we want to remove backwards compatibility //[prefs removeObjectForKey:SPOldFavoritesKey]; } } diff --git a/Source/SPPrintController.m b/Source/SPPrintController.m index a3a0a343..38071ba7 100644 --- a/Source/SPPrintController.m +++ b/Source/SPPrintController.m @@ -211,8 +211,10 @@ NSMutableDictionary *printData = [NSMutableDictionary dictionary]; + NSUInteger view = [tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]]; + // Table source view - if ([tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]] == 0) { + if (view == 0) { NSDictionary *tableSource = [tableSourceInstance tableSourceForPrinting]; @@ -249,7 +251,7 @@ [indexes release]; } // Table content view - else if ([tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]] == 1) { + else if (view == 1) { NSArray *data = [tableContentInstance currentDataResultWithNULLs:NO hideBLOBs:YES]; @@ -266,7 +268,7 @@ [rows release]; } // Custom query view - else if ([tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]] == 2) { + else if (view == 2) { NSArray *data = [customQueryInstance currentResult]; @@ -283,7 +285,7 @@ [rows release]; } // Table relations view - else if ([tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]] == 4) { + else if (view == 4) { NSArray *data = [tableRelationsInstance relationDataForPrinting]; @@ -299,7 +301,7 @@ [rows release]; } // Table triggers view - else if ([tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]] == 5) { + else if (view == 5) { NSArray *data = [tableTriggersInstance triggerDataForPrinting]; @@ -384,33 +386,30 @@ { NSArray *columns = nil; + NSUInteger view = [tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]]; + // Table source view - if ([tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]] == 0 - && [[tableSourceInstance tableSourceForPrinting] count] > 0) { + if ((view == 0) && ([[tableSourceInstance tableSourceForPrinting] count] > 0)) { columns = [[NSArray alloc] initWithArray:[[[tableSourceInstance tableSourceForPrinting] objectForKey:@"structure"] objectAtIndex:0] copyItems:YES]; } // Table content view - else if ([tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]] == 1 - && [[tableContentInstance currentResult] count] > 0) { + else if ((view == 1) && ([[tableContentInstance currentResult] count] > 0)) { columns = [[NSArray alloc] initWithArray:[[tableContentInstance currentResult] objectAtIndex:0] copyItems:YES]; } // Custom query view - else if ([tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]] == 2 - && [[customQueryInstance currentResult] count] > 0) { + else if ((view == 2) && ([[customQueryInstance currentResult] count] > 0)) { columns = [[NSArray alloc] initWithArray:[[customQueryInstance currentResult] objectAtIndex:0] copyItems:YES]; } // Table relations view - else if ([tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]] == 4 - && [[tableRelationsInstance relationDataForPrinting] count] > 0) { + else if ((view == 4) && ([[tableRelationsInstance relationDataForPrinting] count] > 0)) { columns = [[NSArray alloc] initWithArray:[[tableRelationsInstance relationDataForPrinting] objectAtIndex:0] copyItems:YES]; } // Table triggers view - else if ([tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]] == 5 - && [[tableTriggersInstance triggerDataForPrinting] count] > 0) { + else if ((view == 5) && ([[tableTriggersInstance triggerDataForPrinting] count] > 0)) { columns = [[NSArray alloc] initWithArray:[[tableTriggersInstance triggerDataForPrinting] objectAtIndex:0] copyItems:YES]; } diff --git a/Source/SPProcessListController.m b/Source/SPProcessListController.m index 5b68586d..cc1b40c4 100644 --- a/Source/SPProcessListController.m +++ b/Source/SPProcessListController.m @@ -71,6 +71,8 @@ static NSString *SPTableViewIDColumnIdentifier = @"Id"; processes = [[NSMutableArray alloc] init]; prefs = [NSUserDefaults standardUserDefaults]; + + showFullProcessList = [prefs boolForKey:SPProcessListShowFullProcessList]; } return self; diff --git a/Source/SPQueryController.h b/Source/SPQueryController.h index 58858ddd..8ac4570d 100644 --- a/Source/SPQueryController.h +++ b/Source/SPQueryController.h @@ -33,6 +33,7 @@ static NSString *SPTableViewConnectionColumnID = @"messageConnection"; @interface SPQueryController : NSWindowController { +#ifndef SP_REFACTOR /* ivars */ IBOutlet NSView *saveLogView; IBOutlet NSTableView *consoleTableView; IBOutlet NSSearchField *consoleSearchField; @@ -55,6 +56,7 @@ static NSString *SPTableViewConnectionColumnID = @"messageConnection"; NSMutableDictionary *historyContainer; NSMutableDictionary *contentFilterContainer; NSUInteger numberOfMaxAllowedHistory; +#endif NSArray *completionKeywordList; NSArray *completionFunctionList; @@ -62,10 +64,10 @@ static NSString *SPTableViewConnectionColumnID = @"messageConnection"; #ifndef SP_REFACTOR /* ivars */ NSUserDefaults *prefs; -#endif NSDateFormatter *dateFormatter; pthread_mutex_t consoleLock; +#endif } #ifndef SP_REFACTOR diff --git a/Source/SPQueryFavoriteManager.h b/Source/SPQueryFavoriteManager.h index 0ebdc837..66d43778 100644 --- a/Source/SPQueryFavoriteManager.h +++ b/Source/SPQueryFavoriteManager.h @@ -31,10 +31,9 @@ @end -#ifndef SP_REFACTOR @interface SPQueryFavoriteManager : NSWindowController -#else -@interface SPQueryFavoriteManager : NSWindowController <NSOpenSavePanelDelegate> +#ifdef SP_REFACTOR +<NSOpenSavePanelDelegate> #endif { #ifndef SP_REFACTOR /* ivars */ diff --git a/Source/SPQueryFavoriteManager.m b/Source/SPQueryFavoriteManager.m index 625f9855..be63e2a4 100644 --- a/Source/SPQueryFavoriteManager.m +++ b/Source/SPQueryFavoriteManager.m @@ -585,7 +585,7 @@ */ - (void)tableView:(NSTableView*)tableView didClickTableColumn:(NSTableColumn *)tableColumn { - // TODO: Not yet implemented + // TODO: Implement me return; } diff --git a/Source/SPSQLExporter.h b/Source/SPSQLExporter.h index 559cdc9e..b5621bd1 100644 --- a/Source/SPSQLExporter.h +++ b/Source/SPSQLExporter.h @@ -50,6 +50,7 @@ BOOL sqlOutputIncludeUTF8BOM; BOOL sqlOutputEncodeBLOBasHex; BOOL sqlOutputIncludeErrors; + BOOL sqlOutputIncludeAutoIncrement; SPSQLExportInsertDivider sqlInsertDivider; @@ -110,6 +111,11 @@ @property(readwrite, assign) BOOL sqlOutputIncludeErrors; /** + * @property sqlOutputIncludeAutoIncrement Include auto increment in structure definition + */ +@property(readwrite, assign) BOOL sqlOutputIncludeAutoIncrement; + +/** * @property sqlCurrentTableExportIndex Number of tables processed by exporter */ @property(readwrite, assign) NSUInteger sqlCurrentTableExportIndex; diff --git a/Source/SPSQLExporter.m b/Source/SPSQLExporter.m index dab27872..907360ea 100644 --- a/Source/SPSQLExporter.m +++ b/Source/SPSQLExporter.m @@ -29,9 +29,10 @@ #import "SPExportUtilities.h" #import "SPExportFile.h" #import "SPTableData.h" +#import "RegexKitLite.h" #import <SPMySQL/SPMySQL.h> -@interface SPSQLExporter (PrivateAPI) +@interface SPSQLExporter () - (NSString *)_createViewPlaceholderSyntaxForView:(NSString *)viewName; @@ -49,6 +50,7 @@ @synthesize sqlOutputIncludeUTF8BOM; @synthesize sqlOutputEncodeBLOBasHex; @synthesize sqlOutputIncludeErrors; +@synthesize sqlOutputIncludeAutoIncrement; @synthesize sqlCurrentTableExportIndex; @synthesize sqlInsertAfterNValue; @synthesize sqlInsertDivider; @@ -261,6 +263,11 @@ createTableSyntax = [[[NSString alloc] initWithData:createTableSyntax encoding:[self exportOutputEncoding]] autorelease]; } + // If necessary strip out the AUTO_INCREMENT from the table structure definition + if (![self sqlOutputIncludeAutoIncrement]) { + createTableSyntax = [createTableSyntax stringByReplacingOccurrencesOfRegex:[NSString stringWithFormat:@"AUTO_INCREMENT=[0-9]+ "] withString:@""]; + } + [[self exportOutputFile] writeData:[createTableSyntax dataUsingEncoding:NSUTF8StringEncoding]]; [[self exportOutputFile] writeData:[[NSString stringWithString:@";\n\n"] dataUsingEncoding:NSUTF8StringEncoding]]; } diff --git a/Source/SPSSHTunnel.m b/Source/SPSSHTunnel.m index aae71891..4839c886 100644 --- a/Source/SPSSHTunnel.m +++ b/Source/SPSSHTunnel.m @@ -356,19 +356,6 @@ // Launch and run the tunnel [task launch]; - // TODO: The below code doesn't actually appear to work. We will probably have to switch to system()/exec() for grouped children... - // Apply the process group to the child task to ensure it quits with the parent process. - // Note that if run from within Xcode, Xcode is the parent process! -/* pid_t group = setsid(); - if (group == -1) group = getpgrp(); - if(setpgid([task processIdentifier], group) == -1) { - connectionState = SPSSH_STATE_IDLE; - [task terminate]; - if (lastError) [lastError release]; - lastError = [[NSString alloc] initWithFormat:NSLocalizedString(@"The SSH Tunnel could not safely be marked as belonging to Sequel Pro, and so has been shut down for security reasons. Please try again.\n\n(Error %i)", @"SSH tunnel could not be security marked by Sequel Pro"), errno]; - if (delegate) [delegate performSelectorOnMainThread:stateChangeSelector withObject:self waitUntilDone:NO]; - }*/ - // Listen for output [task waitUntilExit]; diff --git a/Source/SPTableCopy.h b/Source/SPTableCopy.h index 32eadcfc..56e1da8c 100644 --- a/Source/SPTableCopy.h +++ b/Source/SPTableCopy.h @@ -35,6 +35,7 @@ * @param name name of the table in the source database * @param sourceDB name of the source database * @param targetDB name of the target database + * @return YES on success, NO on any kind of error (unspecified) */ - (BOOL)copyTable:(NSString *)name from: (NSString *)sourceDB to: (NSString *)targetDB; @@ -54,7 +55,21 @@ * @param sourceDB name of the source database * @param targetDB name of the target database * @param copyWithContent whether to copy the content too, otherwise only structure + * @return YES on success, NO on any kind of error (unspecified) */ - (BOOL)copyTable:(NSString *)tableName from: (NSString *)sourceDB to: (NSString *)targetDB withContent:(BOOL)copyWithContent; +/** + * This method copies a bunch of tables including their data from one db to another. + * + * @param tableArray array of NSStrings with the table names in the sourceDB + * @param sourceDB name of the source database + * @param targetDB name of the target database + * @param copyWithContent whether to copy the content too, otherwise only structure + * @return YES on success, NO on any kind of error (unspecified) + * + * This method is able to copy InnoDB tables with foreign key constraints. + */ +- (BOOL)copyTables:(NSArray *)tablesArray from:(NSString *)sourceDB to:(NSString *)targetDB withContent:(BOOL)copyWithContent; + @end diff --git a/Source/SPTableCopy.m b/Source/SPTableCopy.m index 137e18a6..fd9b9055 100644 --- a/Source/SPTableCopy.m +++ b/Source/SPTableCopy.m @@ -56,7 +56,7 @@ [createTableStatement release]; - return [connection queryErrored]; + return ![connection queryErrored]; } [createTableStatement release]; @@ -67,10 +67,10 @@ - (BOOL)copyTable:(NSString *)tableName from:(NSString *)sourceDB to:(NSString *)targetDB withContent:(BOOL)copyWithContent { // Copy the table structure - BOOL structureCopyResult = [self copyTable:tableName from:sourceDB to:targetDB]; + BOOL structureCopySuccess = [self copyTable:tableName from:sourceDB to:targetDB]; // Optionally copy the table data using an insert select - if (structureCopyResult && structureCopyResult && copyWithContent) { + if (structureCopySuccess && copyWithContent) { NSString *copyDataStatement = [NSString stringWithFormat:@"INSERT INTO %@.%@ SELECT * FROM %@.%@", [targetDB backtickQuotedString], @@ -81,12 +81,38 @@ [connection queryString:copyDataStatement]; - if ([connection queryErrored]) return NO; - - return YES; + return ![connection queryErrored]; } - return structureCopyResult; + return structureCopySuccess; +} + +- (BOOL)copyTables:(NSArray *)tablesArray from:(NSString *)sourceDB to:(NSString *)targetDB withContent:(BOOL)copyWithContent +{ + BOOL success = YES; + + // Disable foreign key checks + [connection queryString:@"/*!32352 SET foreign_key_checks=0 */"]; + + if ([connection queryErrored]) { + success = NO; + } + + for (NSString *tableName in tablesArray) + { + if (![self copyTable:tableName from:sourceDB to:targetDB withContent:copyWithContent]) { + success = NO; + } + } + + // Enable foreign key checks + [connection queryString:@"/*!32352 SET foreign_key_checks=1 */"]; + + if ([connection queryErrored]) { + success = NO; + } + + return success; } - (BOOL)moveTable:(NSString *)tableName from:(NSString *)sourceDB to:(NSString *)targetDB @@ -97,12 +123,10 @@ [targetDB backtickQuotedString], [tableName backtickQuotedString] ]; - // Move the table + [connection queryString:moveStatement]; - if ([connection queryErrored]) return NO; - - return YES; + return ![connection queryErrored]; } @end diff --git a/Source/SPTableFieldValidation.m b/Source/SPTableFieldValidation.m index ceee9b3b..0811aa33 100644 --- a/Source/SPTableFieldValidation.m +++ b/Source/SPTableFieldValidation.m @@ -25,7 +25,7 @@ #import "SPTableFieldValidation.h" -@interface SPTableFieldValidation (PrivateAPI) +@interface SPTableFieldValidation () - (NSString *)_formatType:(NSString *)type; diff --git a/Source/SPTableInfo.m b/Source/SPTableInfo.m index d06198b4..bb9abacd 100644 --- a/Source/SPTableInfo.m +++ b/Source/SPTableInfo.m @@ -126,9 +126,11 @@ [info removeAllObjects]; - if ([[tableListInstance tableName] isEqualToString:@""]) { + if (![tableListInstance tableName]) { [info addObject:NSLocalizedString(@"INFORMATION", @"header for blank info pane")]; - [info addObject:NSLocalizedString(@"multiple selection", @"multiple selection")]; + if ([[tableListInstance selectedTableItems] count]) { + [info addObject:NSLocalizedString(@"multiple selection", @"multiple selection")]; + } [infoTable reloadData]; return; } diff --git a/Source/SPTableStructureDelegate.m b/Source/SPTableStructureDelegate.m index 6fc5e7b6..383a7474 100644 --- a/Source/SPTableStructureDelegate.m +++ b/Source/SPTableStructureDelegate.m @@ -128,12 +128,14 @@ // Asks the user to add an index to query if AUTO_INCREMENT is set and field isn't indexed if ((![currentRow objectForKey:@"Key"] || [[currentRow objectForKey:@"Key"] isEqualToString:@""])) { +#ifndef SP_REFACTOR [chooseKeyButton selectItemWithTag:SPPrimaryKeyMenuTag]; [NSApp beginSheet:keySheet modalForWindow:[tableDocumentInstance parentWindow] modalDelegate:self didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:) contextInfo:@"autoincrementindex" ]; +#endif } } else { autoIncrementIndex = nil; diff --git a/Source/SPTableTriggers.m b/Source/SPTableTriggers.m index d798a76b..ad412061 100644 --- a/Source/SPTableTriggers.m +++ b/Source/SPTableTriggers.m @@ -42,7 +42,7 @@ static const NSString *SPTriggerDefiner = @"TriggerDefiner"; static const NSString *SPTriggerCreated = @"TriggerCreated"; static const NSString *SPTriggerSQLMode = @"TriggerSQLMode"; -@interface SPTableTriggers (PrivateAPI) +@interface SPTableTriggers () - (void)_editTriggerAtIndex:(NSInteger)index; - (void)_toggleConfirmAddTriggerButtonEnabled; @@ -268,7 +268,6 @@ static const NSString *SPTriggerSQLMode = @"TriggerSQLMode"; */ - (IBAction)addTrigger:(id)sender { - // Check whether table editing is permitted (necessary as some actions - eg table double-click - bypass validation) if ([tableDocumentInstance isWorking] || [tablesListInstance tableType] != SPTableTypeTable) return; diff --git a/Source/SPTextView.m b/Source/SPTextView.m index a1b80ab4..5466bd83 100644 --- a/Source/SPTextView.m +++ b/Source/SPTextView.m @@ -1972,10 +1972,10 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) [self insertText:snip]; // If autopair is enabled check whether snip begins with ( and ends with ), if so mark ) as pair-linked + if ( #ifndef SP_REFACTOR - if ([prefs boolForKey:SPCustomQueryAutoPairCharacters] && + [prefs boolForKey:SPCustomQueryAutoPairCharacters] && #else - if ( #endif (([snip hasPrefix:@"("] && [snip hasSuffix:@")"]) || ([snip hasPrefix:@"`"] && [snip hasSuffix:@"`"]) @@ -2189,8 +2189,10 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) // Check for {SHIFT}TAB to try to insert query favorite via TAB trigger if SPTextView belongs to SPCustomQuery // and TAB as soft indention if ([theEvent keyCode] == 48 && [self isEditable] && [[self delegate] isKindOfClass:[SPCustomQuery class]]){ +#ifndef SP_REFACTOR NSRange targetRange = [self getRangeForCurrentWord]; NSString *tabTrigger = [[self string] substringWithRange:targetRange]; +#endif // Is TAB trigger active change selection according to {SHIFT}TAB if(snippetControlCounter > -1){ @@ -2233,6 +2235,7 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) } +#ifndef SP_REFACTOR // Check if tab trigger is defined; if so insert it, otherwise pass through event if(snippetControlCounter < 0 && [tabTrigger length] && [tableDocumentInstance fileURL]) { NSArray *snippets = [[SPQueryController sharedQueryController] queryFavoritesForFileURL:[tableDocumentInstance fileURL] andTabTrigger:tabTrigger includeGlobals:YES]; @@ -2244,7 +2247,6 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) // Check for TAB as indention for current line, i.e. left of the caret there are only white spaces // but only if Soft Indent is set -#ifndef SP_REFACTOR if([prefs boolForKey:SPCustomQuerySoftIndent] && [self isCaretAtIndentPositionIgnoreLineStart:YES]) { if([self shiftSelectionRight]) return; } @@ -2426,7 +2428,13 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) } return; } + +// Let Xcode 3 match braces correctly... +#ifndef SP_REFACTOR + } +#else } +#endif // break down the undo grouping level for better undo behavior [self breakUndoCoalescing]; @@ -3234,8 +3242,8 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) } // Disable "Copy with Column Names" and "Copy as SQL INSERT" // in the main menu - if ( [menuItem tag] == MENU_EDIT_COPY_WITH_COLUMN - || [menuItem tag] == MENU_EDIT_COPY_AS_SQL ) { + if ( [menuItem tag] == SPEditMenuCopyWithColumns + || [menuItem tag] == SPEditCopyAsSQL ) { return NO; } @@ -3437,7 +3445,11 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) } // Check size and NSFileType +#ifndef SP_REFACTOR NSDictionary *attr = [[NSFileManager defaultManager] fileAttributesAtPath:filepath traverseLink:YES]; +#else + NSDictionary *attr = [[NSFileManager defaultManager] attributesOfItemAtPath:filepath error:nil]; +#endif if(attr) { NSNumber *filesize = [attr objectForKey:NSFileSize]; diff --git a/Source/SPUserMO.m b/Source/SPUserMO.m index a9e9ddbb..d952f9da 100644 --- a/Source/SPUserMO.m +++ b/Source/SPUserMO.m @@ -24,6 +24,11 @@ #import "SPUserMO.h" +static NSString *SPUserMOParentKey = @"parent"; +static NSString *SPUserMOUserKey = @"user"; +static NSString *SPUserMOHostKey = @"host"; +static NSString *SPUserMOChildrenKey = @"children"; + @implementation NSManagedObject (CoreDataGeneratedAccessors) @dynamic user; @@ -33,23 +38,17 @@ - (NSString *)displayName { - return ([self valueForKey:@"parent"] == nil) ? self.user : self.host; + return ([self valueForKey:SPUserMOParentKey] == nil) ? self.user : self.host; } - (void)setDisplayName:(NSString *)value { - if ([self valueForKey:@"parent"] == nil) - [self setValue:value forKey:@"user"]; + if ([self valueForKey:SPUserMOParentKey] == nil) { + [self setValue:value forKey:SPUserMOUserKey]; + } else { - if (value == nil) - { - [self setValue:@"%" forKey:@"host"]; - } - else - { - [self setValue:value forKey:@"host"]; - } + [self setValue:(value == nil) ? @"%" : value forKey:SPUserMOHostKey]; } } @@ -57,11 +56,12 @@ { NSSet *changedObjects = [[NSSet alloc] initWithObjects:&value count:1]; - [self willChangeValueForKey:@"children" withSetMutation:NSKeyValueUnionSetMutation usingObjects:changedObjects]; - [[self primitiveValueForKey:@"children"] addObject:value]; - [self didChangeValueForKey:@"children" withSetMutation:NSKeyValueUnionSetMutation usingObjects:changedObjects]; + [self willChangeValueForKey:SPUserMOChildrenKey withSetMutation:NSKeyValueUnionSetMutation usingObjects:changedObjects]; + [[self primitiveValueForKey:SPUserMOChildrenKey] addObject:value]; + [self didChangeValueForKey:SPUserMOChildrenKey withSetMutation:NSKeyValueUnionSetMutation usingObjects:changedObjects]; [changedObjects release]; + value.user = self.user; } @@ -69,9 +69,9 @@ { NSSet *changedObjects = [[NSSet alloc] initWithObjects:&value count:1]; - [self willChangeValueForKey:@"children" withSetMutation:NSKeyValueMinusSetMutation usingObjects:changedObjects]; - [[self primitiveValueForKey:@"children"] removeObject:value]; - [self didChangeValueForKey:@"children" withSetMutation:NSKeyValueMinusSetMutation usingObjects:changedObjects]; + [self willChangeValueForKey:SPUserMOChildrenKey withSetMutation:NSKeyValueMinusSetMutation usingObjects:changedObjects]; + [[self primitiveValueForKey:SPUserMOChildrenKey] removeObject:value]; + [self didChangeValueForKey:SPUserMOChildrenKey withSetMutation:NSKeyValueMinusSetMutation usingObjects:changedObjects]; [changedObjects release]; } diff --git a/Source/SPUserManager.m b/Source/SPUserManager.m index 224b36c6..ac539624 100644 --- a/Source/SPUserManager.m +++ b/Source/SPUserManager.m @@ -477,9 +477,9 @@ static const NSString *SPTableViewNameColumnID = @"NameColumn"; NSError *error = nil; errorsString = [[NSMutableString alloc] init]; - //Change the first responder to end editing in any field - [[self window] makeFirstResponder:self]; - + // Change the first responder to end editing in any field + [[self window] makeFirstResponder:self]; + isSaving = YES; [[self managedObjectContext] save:&error]; diff --git a/Source/SPWindow.m b/Source/SPWindow.m index d023b7b4..213d7740 100644 --- a/Source/SPWindow.m +++ b/Source/SPWindow.m @@ -39,7 +39,6 @@ */ - (void) sendEvent:(NSEvent *)theEvent { - if ([theEvent type] == NSKeyDown && [[theEvent charactersIgnoringModifiers] length]) { unichar theCharacter = [[theEvent charactersIgnoringModifiers] characterAtIndex:0]; diff --git a/sequel-pro.xcodeproj/TemplateIcon.icns b/sequel-pro.xcodeproj/TemplateIcon.icns Binary files differdeleted file mode 100644 index 62cb7015..00000000 --- a/sequel-pro.xcodeproj/TemplateIcon.icns +++ /dev/null diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index 6ae0bdac..0b02478c 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -59,17 +59,6 @@ 173C839411AAD32A00B8B084 /* SPSQLExporterDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 173C838D11AAD32A00B8B084 /* SPSQLExporterDelegate.m */; }; 173C839511AAD32A00B8B084 /* SPXMLExporterDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 173C838F11AAD32A00B8B084 /* SPXMLExporterDelegate.m */; }; 1740FABB0FC4372F00CF3699 /* SPDatabaseData.m in Sources */ = {isa = PBXBuildFile; fileRef = 1740FABA0FC4372F00CF3699 /* SPDatabaseData.m */; }; - 174136771516283100DF1EE6 /* SPGroupNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 174136721516283100DF1EE6 /* SPGroupNode.m */; }; - 174136791516283100DF1EE6 /* SPTreeNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 174136761516283100DF1EE6 /* SPTreeNode.m */; }; - 1741367C1516285B00DF1EE6 /* SPFlippedView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1741367B1516285B00DF1EE6 /* SPFlippedView.m */; }; - 1741367F151628A400DF1EE6 /* SPMutableArrayAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 1741367E151628A400DF1EE6 /* SPMutableArrayAdditions.m */; }; - 17413682151628EC00DF1EE6 /* SPMutableArrayAdditionsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 17413681151628EC00DF1EE6 /* SPMutableArrayAdditionsTest.m */; }; - 174136891516290D00DF1EE6 /* SPConnectionControllerDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 174136841516290D00DF1EE6 /* SPConnectionControllerDataSource.m */; }; - 1741368A1516290D00DF1EE6 /* SPConnectionControllerInitializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 174136861516290D00DF1EE6 /* SPConnectionControllerInitializer.m */; }; - 1741368B1516290D00DF1EE6 /* SPConnectionHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 174136881516290D00DF1EE6 /* SPConnectionHandler.m */; }; - 174136931516294000DF1EE6 /* SPFavoritesExporter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1741368E1516294000DF1EE6 /* SPFavoritesExporter.m */; }; - 174136941516294000DF1EE6 /* SPFavoritesImporter.m in Sources */ = {isa = PBXBuildFile; fileRef = 174136911516294000DF1EE6 /* SPFavoritesImporter.m */; }; - 174137641516793B00DF1EE6 /* SPDataBase64EncodingAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 174137631516793B00DF1EE6 /* SPDataBase64EncodingAdditions.m */; }; 174CE11E10AB80B5008F892B /* DatabaseProcessList.xib in Resources */ = {isa = PBXBuildFile; fileRef = 174CE11C10AB80B5008F892B /* DatabaseProcessList.xib */; }; 174CE14210AB9281008F892B /* SPProcessListController.m in Sources */ = {isa = PBXBuildFile; fileRef = 174CE14110AB9281008F892B /* SPProcessListController.m */; }; 175EC63512733B36009A7C0F /* SPExportControllerDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 175EC63412733B36009A7C0F /* SPExportControllerDelegate.m */; }; @@ -96,6 +85,16 @@ 1792C13710AD75C800ABE758 /* SPServerVariablesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1792C13610AD75C800ABE758 /* SPServerVariablesController.m */; }; 1792C26110AE1A2D00ABE758 /* SPConnectionDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1792C26010AE1A2D00ABE758 /* SPConnectionDelegate.m */; }; 1798AB911267924D000D946A /* SPAppleScriptSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 1798AB901267924D000D946A /* SPAppleScriptSupport.m */; }; + 1798F1871550175B004B0AB8 /* SPFavoritesExporter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1798F1821550175B004B0AB8 /* SPFavoritesExporter.m */; }; + 1798F1881550175B004B0AB8 /* SPFavoritesImporter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1798F1851550175B004B0AB8 /* SPFavoritesImporter.m */; }; + 1798F18F1550178E004B0AB8 /* SPConnectionControllerDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 1798F18A1550178E004B0AB8 /* SPConnectionControllerDataSource.m */; }; + 1798F1901550178E004B0AB8 /* SPConnectionControllerInitializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 1798F18C1550178E004B0AB8 /* SPConnectionControllerInitializer.m */; }; + 1798F1911550178E004B0AB8 /* SPConnectionHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 1798F18E1550178E004B0AB8 /* SPConnectionHandler.m */; }; + 1798F1951550181B004B0AB8 /* SPGroupNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 1798F1941550181B004B0AB8 /* SPGroupNode.m */; }; + 1798F19815501838004B0AB8 /* SPMutableArrayAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 1798F19715501838004B0AB8 /* SPMutableArrayAdditions.m */; }; + 1798F19B1550185B004B0AB8 /* SPTreeNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 1798F19A1550185B004B0AB8 /* SPTreeNode.m */; }; + 1798F19E15501892004B0AB8 /* SPFlippedView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1798F19D15501892004B0AB8 /* SPFlippedView.m */; }; + 1798F1C4155018E2004B0AB8 /* SPMutableArrayAdditionsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1798F1C2155018D4004B0AB8 /* SPMutableArrayAdditionsTest.m */; }; 179ECECA11F265FC009C6A40 /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 179ECEC611F265EE009C6A40 /* libbz2.dylib */; }; 179F15060F7C433C00579954 /* SPEditorTokens.l in Sources */ = {isa = PBXBuildFile; fileRef = 179F15050F7C433C00579954 /* SPEditorTokens.l */; }; 17A20AC6124F9B110095CEFB /* SPServerSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 17A20AC5124F9B110095CEFB /* SPServerSupport.m */; }; @@ -230,6 +229,7 @@ 584D88AA1515034200F24774 /* NSNotificationCenterThreadingAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 584D88A81515034200F24774 /* NSNotificationCenterThreadingAdditions.m */; }; 584D88AB1515034200F24774 /* NSNotificationCenterThreadingAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 584D88A71515034200F24774 /* NSNotificationCenterThreadingAdditions.h */; }; 584D88AC1515034200F24774 /* NSNotificationCenterThreadingAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 584D88A81515034200F24774 /* NSNotificationCenterThreadingAdditions.m */; }; + 584D899D15162CBE00F24774 /* SPDataBase64EncodingAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 584D899C15162CBE00F24774 /* SPDataBase64EncodingAdditions.m */; }; 584F5F8F0F50ACD800036517 /* table-view-small.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 584F5F8E0F50ACD800036517 /* table-view-small.tiff */; }; 586AAB1514FAD3AF007F82BF /* QueryKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17E5955314F304000054EE08 /* QueryKit.framework */; }; 586AAB9314FAD40D007F82BF /* QueryKit.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 17E5955314F304000054EE08 /* QueryKit.framework */; }; @@ -667,31 +667,6 @@ 173C838F11AAD32A00B8B084 /* SPXMLExporterDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPXMLExporterDelegate.m; sourceTree = "<group>"; }; 1740FAB90FC4372F00CF3699 /* SPDatabaseData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPDatabaseData.h; sourceTree = "<group>"; }; 1740FABA0FC4372F00CF3699 /* SPDatabaseData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDatabaseData.m; sourceTree = "<group>"; }; - 1741366F151627F600DF1EE6 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; }; - 174136711516283100DF1EE6 /* SPGroupNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPGroupNode.h; sourceTree = "<group>"; }; - 174136721516283100DF1EE6 /* SPGroupNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPGroupNode.m; sourceTree = "<group>"; }; - 174136751516283100DF1EE6 /* SPTreeNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTreeNode.h; sourceTree = "<group>"; }; - 174136761516283100DF1EE6 /* SPTreeNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTreeNode.m; sourceTree = "<group>"; }; - 1741367A1516285B00DF1EE6 /* SPFlippedView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPFlippedView.h; sourceTree = "<group>"; }; - 1741367B1516285B00DF1EE6 /* SPFlippedView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPFlippedView.m; sourceTree = "<group>"; }; - 1741367D151628A400DF1EE6 /* SPMutableArrayAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPMutableArrayAdditions.h; sourceTree = "<group>"; }; - 1741367E151628A400DF1EE6 /* SPMutableArrayAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPMutableArrayAdditions.m; sourceTree = "<group>"; }; - 17413680151628EC00DF1EE6 /* SPMutableArrayAdditionsTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPMutableArrayAdditionsTest.h; sourceTree = "<group>"; }; - 17413681151628EC00DF1EE6 /* SPMutableArrayAdditionsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPMutableArrayAdditionsTest.m; sourceTree = "<group>"; }; - 174136831516290D00DF1EE6 /* SPConnectionControllerDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPConnectionControllerDataSource.h; sourceTree = "<group>"; }; - 174136841516290D00DF1EE6 /* SPConnectionControllerDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPConnectionControllerDataSource.m; sourceTree = "<group>"; }; - 174136851516290D00DF1EE6 /* SPConnectionControllerInitializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPConnectionControllerInitializer.h; sourceTree = "<group>"; }; - 174136861516290D00DF1EE6 /* SPConnectionControllerInitializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPConnectionControllerInitializer.m; sourceTree = "<group>"; }; - 174136871516290D00DF1EE6 /* SPConnectionHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPConnectionHandler.h; sourceTree = "<group>"; }; - 174136881516290D00DF1EE6 /* SPConnectionHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPConnectionHandler.m; sourceTree = "<group>"; }; - 1741368D1516294000DF1EE6 /* SPFavoritesExporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPFavoritesExporter.h; sourceTree = "<group>"; }; - 1741368E1516294000DF1EE6 /* SPFavoritesExporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPFavoritesExporter.m; sourceTree = "<group>"; }; - 1741368F1516294000DF1EE6 /* SPFavoritesExportProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPFavoritesExportProtocol.h; sourceTree = "<group>"; }; - 174136901516294000DF1EE6 /* SPFavoritesImporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPFavoritesImporter.h; sourceTree = "<group>"; }; - 174136911516294000DF1EE6 /* SPFavoritesImporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPFavoritesImporter.m; sourceTree = "<group>"; }; - 174136921516294000DF1EE6 /* SPFavoritesImportProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPFavoritesImportProtocol.h; sourceTree = "<group>"; }; - 174137621516793B00DF1EE6 /* SPDataBase64EncodingAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPDataBase64EncodingAdditions.h; sourceTree = "<group>"; }; - 174137631516793B00DF1EE6 /* SPDataBase64EncodingAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDataBase64EncodingAdditions.m; sourceTree = "<group>"; }; 174A345112DA4ED000DB0ADE /* create-test-stubs.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = "create-test-stubs.pl"; sourceTree = "<group>"; }; 174CE11D10AB80B5008F892B /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Interfaces/English.lproj/DatabaseProcessList.xib; sourceTree = "<group>"; }; 174CE14010AB9281008F892B /* SPProcessListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPProcessListController.h; sourceTree = "<group>"; }; @@ -736,6 +711,29 @@ 1798AB0C12676CD9000D946A /* localize.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = localize.sh; sourceTree = "<group>"; }; 1798AB8F1267924D000D946A /* SPAppleScriptSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPAppleScriptSupport.h; sourceTree = "<group>"; }; 1798AB901267924D000D946A /* SPAppleScriptSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPAppleScriptSupport.m; sourceTree = "<group>"; }; + 1798F17E1550171B004B0AB8 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; }; + 1798F1811550175B004B0AB8 /* SPFavoritesExporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPFavoritesExporter.h; sourceTree = "<group>"; }; + 1798F1821550175B004B0AB8 /* SPFavoritesExporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPFavoritesExporter.m; sourceTree = "<group>"; }; + 1798F1831550175B004B0AB8 /* SPFavoritesExportProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPFavoritesExportProtocol.h; sourceTree = "<group>"; }; + 1798F1841550175B004B0AB8 /* SPFavoritesImporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPFavoritesImporter.h; sourceTree = "<group>"; }; + 1798F1851550175B004B0AB8 /* SPFavoritesImporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPFavoritesImporter.m; sourceTree = "<group>"; }; + 1798F1861550175B004B0AB8 /* SPFavoritesImportProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPFavoritesImportProtocol.h; sourceTree = "<group>"; }; + 1798F1891550178E004B0AB8 /* SPConnectionControllerDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPConnectionControllerDataSource.h; sourceTree = "<group>"; }; + 1798F18A1550178E004B0AB8 /* SPConnectionControllerDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPConnectionControllerDataSource.m; sourceTree = "<group>"; }; + 1798F18B1550178E004B0AB8 /* SPConnectionControllerInitializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPConnectionControllerInitializer.h; sourceTree = "<group>"; }; + 1798F18C1550178E004B0AB8 /* SPConnectionControllerInitializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPConnectionControllerInitializer.m; sourceTree = "<group>"; }; + 1798F18D1550178E004B0AB8 /* SPConnectionHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPConnectionHandler.h; sourceTree = "<group>"; }; + 1798F18E1550178E004B0AB8 /* SPConnectionHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPConnectionHandler.m; sourceTree = "<group>"; }; + 1798F1931550181B004B0AB8 /* SPGroupNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPGroupNode.h; sourceTree = "<group>"; }; + 1798F1941550181B004B0AB8 /* SPGroupNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPGroupNode.m; sourceTree = "<group>"; }; + 1798F19615501838004B0AB8 /* SPMutableArrayAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPMutableArrayAdditions.h; sourceTree = "<group>"; }; + 1798F19715501838004B0AB8 /* SPMutableArrayAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPMutableArrayAdditions.m; sourceTree = "<group>"; }; + 1798F1991550185B004B0AB8 /* SPTreeNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTreeNode.h; sourceTree = "<group>"; }; + 1798F19A1550185B004B0AB8 /* SPTreeNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTreeNode.m; sourceTree = "<group>"; }; + 1798F19C15501892004B0AB8 /* SPFlippedView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPFlippedView.h; sourceTree = "<group>"; }; + 1798F19D15501892004B0AB8 /* SPFlippedView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPFlippedView.m; sourceTree = "<group>"; }; + 1798F1C1155018D4004B0AB8 /* SPMutableArrayAdditionsTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPMutableArrayAdditionsTest.h; sourceTree = "<group>"; }; + 1798F1C2155018D4004B0AB8 /* SPMutableArrayAdditionsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPMutableArrayAdditionsTest.m; sourceTree = "<group>"; }; 179ECEC611F265EE009C6A40 /* libbz2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbz2.dylib; path = usr/lib/libbz2.dylib; sourceTree = SDKROOT; }; 179F15040F7C433C00579954 /* SPEditorTokens.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPEditorTokens.h; sourceTree = "<group>"; }; 179F15050F7C433C00579954 /* SPEditorTokens.l */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.lex; path = SPEditorTokens.l; sourceTree = "<group>"; }; @@ -968,6 +966,8 @@ 584D87BE15141A4A00F24774 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; 584D88A71515034200F24774 /* NSNotificationCenterThreadingAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSNotificationCenterThreadingAdditions.h; sourceTree = "<group>"; }; 584D88A81515034200F24774 /* NSNotificationCenterThreadingAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSNotificationCenterThreadingAdditions.m; sourceTree = "<group>"; }; + 584D899B15162CBE00F24774 /* SPDataBase64EncodingAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPDataBase64EncodingAdditions.h; sourceTree = "<group>"; }; + 584D899C15162CBE00F24774 /* SPDataBase64EncodingAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDataBase64EncodingAdditions.m; sourceTree = "<group>"; }; 584F5F8E0F50ACD800036517 /* table-view-small.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-view-small.tiff"; sourceTree = "<group>"; }; 586EBD2311418D7C00B3DE45 /* FeedbackReporter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FeedbackReporter.framework; path = Frameworks/FeedbackReporter.framework; sourceTree = "<group>"; }; 586F432A0FD74CFC00B428D7 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/SSHQuestionDialog.xib; sourceTree = "<group>"; }; @@ -1693,32 +1693,6 @@ name = Plists; sourceTree = "<group>"; }; - 174136701516280900DF1EE6 /* Tree Nodes */ = { - isa = PBXGroup; - children = ( - 174136751516283100DF1EE6 /* SPTreeNode.h */, - 174136761516283100DF1EE6 /* SPTreeNode.m */, - 174136711516283100DF1EE6 /* SPGroupNode.h */, - 174136721516283100DF1EE6 /* SPGroupNode.m */, - 17D3C22012859E070047709F /* SPFavoriteNode.h */, - 17D3C22112859E070047709F /* SPFavoriteNode.m */, - ); - name = "Tree Nodes"; - sourceTree = "<group>"; - }; - 1741368C1516292100DF1EE6 /* Import & Export */ = { - isa = PBXGroup; - children = ( - 1741368D1516294000DF1EE6 /* SPFavoritesExporter.h */, - 1741368E1516294000DF1EE6 /* SPFavoritesExporter.m */, - 174136901516294000DF1EE6 /* SPFavoritesImporter.h */, - 174136911516294000DF1EE6 /* SPFavoritesImporter.m */, - 174136921516294000DF1EE6 /* SPFavoritesImportProtocol.h */, - 1741368F1516294000DF1EE6 /* SPFavoritesExportProtocol.h */, - ); - name = "Import & Export"; - sourceTree = "<group>"; - }; 1761FD9C0EF0486A00331368 /* Scripts */ = { isa = PBXGroup; children = ( @@ -1754,6 +1728,32 @@ name = "Controller Categories"; sourceTree = "<group>"; }; + 1798F1801550172A004B0AB8 /* Import & Export */ = { + isa = PBXGroup; + children = ( + 1798F1841550175B004B0AB8 /* SPFavoritesImporter.h */, + 1798F1851550175B004B0AB8 /* SPFavoritesImporter.m */, + 1798F1811550175B004B0AB8 /* SPFavoritesExporter.h */, + 1798F1821550175B004B0AB8 /* SPFavoritesExporter.m */, + 1798F1861550175B004B0AB8 /* SPFavoritesImportProtocol.h */, + 1798F1831550175B004B0AB8 /* SPFavoritesExportProtocol.h */, + ); + name = "Import & Export"; + sourceTree = "<group>"; + }; + 1798F192155017FB004B0AB8 /* Tree Nodes */ = { + isa = PBXGroup; + children = ( + 1798F1991550185B004B0AB8 /* SPTreeNode.h */, + 1798F19A1550185B004B0AB8 /* SPTreeNode.m */, + 1798F1931550181B004B0AB8 /* SPGroupNode.h */, + 1798F1941550181B004B0AB8 /* SPGroupNode.m */, + 17D3C22012859E070047709F /* SPFavoriteNode.h */, + 17D3C22112859E070047709F /* SPFavoriteNode.m */, + ); + name = "Tree Nodes"; + sourceTree = "<group>"; + }; 17BFC80D10D3FF5200A3B112 /* Icons */ = { isa = PBXGroup; children = ( @@ -1803,18 +1803,18 @@ 17D38FC2127B0C9500672B13 /* Connection View */ = { isa = PBXGroup; children = ( - 174136871516290D00DF1EE6 /* SPConnectionHandler.h */, - 174136881516290D00DF1EE6 /* SPConnectionHandler.m */, + 1798F18D1550178E004B0AB8 /* SPConnectionHandler.h */, + 1798F18E1550178E004B0AB8 /* SPConnectionHandler.m */, 5822C9B31000DB2400DCC3D6 /* SPConnectionController.h */, 5822C9B41000DB2400DCC3D6 /* SPConnectionController.m */, 17D3C6021289BF350047709F /* SPConnectionControllerDelegate.h */, 17D3C6031289BF350047709F /* SPConnectionControllerDelegate.m */, - 174136851516290D00DF1EE6 /* SPConnectionControllerInitializer.h */, - 174136861516290D00DF1EE6 /* SPConnectionControllerInitializer.m */, - 174136831516290D00DF1EE6 /* SPConnectionControllerDataSource.h */, - 174136841516290D00DF1EE6 /* SPConnectionControllerDataSource.m */, + 1798F18B1550178E004B0AB8 /* SPConnectionControllerInitializer.h */, + 1798F18C1550178E004B0AB8 /* SPConnectionControllerInitializer.m */, + 1798F1891550178E004B0AB8 /* SPConnectionControllerDataSource.h */, + 1798F18A1550178E004B0AB8 /* SPConnectionControllerDataSource.m */, 17D38FC3127B0CFC00672B13 /* SPConnectionControllerDelegateProtocol.h */, - 1741368C1516292100DF1EE6 /* Import & Export */, + 1798F1801550172A004B0AB8 /* Import & Export */, ); name = "Connection View"; sourceTree = "<group>"; @@ -1923,8 +1923,8 @@ 380F4EF40FC0B68F00B0BFD7 /* SPStringAdditionsTest.m */, 1760599D1336199D0098E162 /* SPMenuAdditionsTests.h */, 1760599E1336199D0098E162 /* SPMenuAdditionsTests.m */, - 17413680151628EC00DF1EE6 /* SPMutableArrayAdditionsTest.h */, - 17413681151628EC00DF1EE6 /* SPMutableArrayAdditionsTest.m */, + 1798F1C1155018D4004B0AB8 /* SPMutableArrayAdditionsTest.h */, + 1798F1C2155018D4004B0AB8 /* SPMutableArrayAdditionsTest.m */, ); name = "Category Additions"; sourceTree = "<group>"; @@ -2053,7 +2053,7 @@ 17C058870FC9FC390077E9CF /* SPNarrowDownCompletion.m */, BC0ED3D812A9196C00088461 /* SPChooseMenuItemDialog.h */, BC0ED3D912A9196C00088461 /* SPChooseMenuItemDialog.m */, - 174136701516280900DF1EE6 /* Tree Nodes */, + 1798F192155017FB004B0AB8 /* Tree Nodes */, 173E70A1107FF495008733C9 /* Core Data */, ); name = Model; @@ -2068,8 +2068,8 @@ 17E6417F0EF01FA8001BC333 /* SPImageView.m */, 584094CC1107BD0500260CFD /* SPAlertSheets.h */, 584095181107CB6600260CFD /* SPAlertSheets.m */, - 1741367A1516285B00DF1EE6 /* SPFlippedView.h */, - 1741367B1516285B00DF1EE6 /* SPFlippedView.m */, + 1798F19C15501892004B0AB8 /* SPFlippedView.h */, + 1798F19D15501892004B0AB8 /* SPFlippedView.m */, 58C56EF30F438E120035701E /* SPDataCellFormatter.h */, 58C56EF40F438E120035701E /* SPDataCellFormatter.m */, BC2898F1125F4488001B50E1 /* SPGeometryDataView.h */, @@ -2341,7 +2341,7 @@ 2A37F4AAFDCFA73011CA2CEA /* sequel-pro */ = { isa = PBXGroup; children = ( - 1741366F151627F600DF1EE6 /* LICENSE */, + 1798F17E1550171B004B0AB8 /* LICENSE */, 1791346512F75CC1000B27C1 /* README */, 17E641420EF01E8A001BC333 /* Source */, 380F4EF20FC0B67A00B0BFD7 /* Unit Tests */, @@ -2608,10 +2608,10 @@ BC85F5CF12193B7D00E255B5 /* SPColorAdditions.m */, BC32F240121D66260067305E /* SPFileManagerAdditions.h */, BC32F241121D66260067305E /* SPFileManagerAdditions.m */, - 1741367D151628A400DF1EE6 /* SPMutableArrayAdditions.h */, - 1741367E151628A400DF1EE6 /* SPMutableArrayAdditions.m */, - 174137621516793B00DF1EE6 /* SPDataBase64EncodingAdditions.h */, - 174137631516793B00DF1EE6 /* SPDataBase64EncodingAdditions.m */, + 1798F19615501838004B0AB8 /* SPMutableArrayAdditions.h */, + 1798F19715501838004B0AB8 /* SPMutableArrayAdditions.m */, + 584D899B15162CBE00F24774 /* SPDataBase64EncodingAdditions.h */, + 584D899C15162CBE00F24774 /* SPDataBase64EncodingAdditions.m */, ); name = "Category Additions"; sourceTree = "<group>"; @@ -3093,7 +3093,7 @@ 176059B813361D380098E162 /* SPDatabaseInfoTest.m in Sources */, 176059B913361D390098E162 /* SPTableCopyTest.m in Sources */, 176059BA13361D3A0098E162 /* SPDatabaseCopyTest.m in Sources */, - 17413682151628EC00DF1EE6 /* SPMutableArrayAdditionsTest.m in Sources */, + 1798F1C4155018E2004B0AB8 /* SPMutableArrayAdditionsTest.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3302,21 +3302,21 @@ 584D878B15140FEB00F24774 /* SPObjectAdditions.m in Sources */, 584D87921514101E00F24774 /* SPDatabaseStructure.m in Sources */, 584D88A91515034200F24774 /* NSNotificationCenterThreadingAdditions.m in Sources */, - 174136771516283100DF1EE6 /* SPGroupNode.m in Sources */, - 174136791516283100DF1EE6 /* SPTreeNode.m in Sources */, - 1741367C1516285B00DF1EE6 /* SPFlippedView.m in Sources */, - 1741367F151628A400DF1EE6 /* SPMutableArrayAdditions.m in Sources */, - 174136891516290D00DF1EE6 /* SPConnectionControllerDataSource.m in Sources */, - 1741368A1516290D00DF1EE6 /* SPConnectionControllerInitializer.m in Sources */, - 1741368B1516290D00DF1EE6 /* SPConnectionHandler.m in Sources */, - 174136931516294000DF1EE6 /* SPFavoritesExporter.m in Sources */, - 174136941516294000DF1EE6 /* SPFavoritesImporter.m in Sources */, - 174137641516793B00DF1EE6 /* SPDataBase64EncodingAdditions.m in Sources */, + 584D899D15162CBE00F24774 /* SPDataBase64EncodingAdditions.m in Sources */, 17386E0B15192526002DC206 /* SPTableContentDataSource.m in Sources */, 17386E0E1519257E002DC206 /* SPTableContentDelegate.m in Sources */, 17381856151FB34E0078FFE2 /* SPUserManagerDelegate.m in Sources */, 17BA2A3215275D8600389803 /* SPExportInterfaceController.m in Sources */, 17D3583F1533768E00A654D7 /* SPWindowControllerDelegate.m in Sources */, + 1798F1871550175B004B0AB8 /* SPFavoritesExporter.m in Sources */, + 1798F1881550175B004B0AB8 /* SPFavoritesImporter.m in Sources */, + 1798F18F1550178E004B0AB8 /* SPConnectionControllerDataSource.m in Sources */, + 1798F1901550178E004B0AB8 /* SPConnectionControllerInitializer.m in Sources */, + 1798F1911550178E004B0AB8 /* SPConnectionHandler.m in Sources */, + 1798F1951550181B004B0AB8 /* SPGroupNode.m in Sources */, + 1798F19815501838004B0AB8 /* SPMutableArrayAdditions.m in Sources */, + 1798F19B1550185B004B0AB8 /* SPTreeNode.m in Sources */, + 1798F19E15501892004B0AB8 /* SPFlippedView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; |