aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Interfaces/English.lproj/DBView.xib1221
-rw-r--r--Interfaces/English.lproj/MainMenu.xib33
-rw-r--r--Interfaces/English.lproj/Preferences.xib655
-rw-r--r--Resources/PreferenceDefaults.plist4
-rw-r--r--Source/SPConstants.h24
-rw-r--r--Source/SPConstants.m2
-rw-r--r--Source/SPDatabaseData.m26
-rw-r--r--Source/SPDatabaseDocument.h6
-rw-r--r--Source/SPDatabaseDocument.m144
-rw-r--r--Source/SPPreferenceController.m41
-rw-r--r--Source/SPTablesList.m33
11 files changed, 745 insertions, 1444 deletions
diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index faa9a5fc..bf65d27b 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -2,7 +2,7 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10D573</string>
+ <string key="IBDocument.SystemVersion">10D2094</string>
<string key="IBDocument.InterfaceBuilderVersion">762</string>
<string key="IBDocument.AppKitVersion">1038.29</string>
<string key="IBDocument.HIToolboxVersion">460.00</string>
@@ -23,14 +23,14 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="287"/>
+ <integer value="1246"/>
<integer value="6219"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.brandonwalkin.BWToolkit</string>
- <string>com.apple.WebKitIBPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.WebKitIBPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -228,7 +228,7 @@
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor" id="1001122760">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
+ <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
<reference key="NSTextColor" ref="454249633"/>
@@ -273,7 +273,6 @@
</object>
<string key="NSFrame">{{1, 1}, {218, 38}}</string>
<reference key="NSSuperview" ref="607475905"/>
- <reference key="NSNextKeyView" ref="970881282"/>
<reference key="NSDocView" ref="970881282"/>
<object class="NSColor" key="NSBGColor" id="1024678221">
<int key="NSColorSpace">6</int>
@@ -305,7 +304,6 @@
</object>
<string key="NSFrame">{{-1, -13}, {220, 40}}</string>
<reference key="NSSuperview" ref="801427893"/>
- <reference key="NSNextKeyView" ref="494991824"/>
<int key="NSsFlags">2</int>
<reference key="NSVScroller" ref="196112633"/>
<reference key="NSHScroller" ref="142487484"/>
@@ -403,7 +401,6 @@
</object>
<string key="NSFrameSize">{214, 354}</string>
<reference key="NSSuperview" ref="233472824"/>
- <reference key="NSNextKeyView" ref="251040077"/>
<reference key="NSDocView" ref="251040077"/>
<reference key="NSBGColor" ref="1024678221"/>
<int key="NScvFlags">4</int>
@@ -431,7 +428,6 @@
</object>
<string key="NSFrameSize">{214, 354}</string>
<reference key="NSSuperview" ref="1017775084"/>
- <reference key="NSNextKeyView" ref="73685676"/>
<int key="NSsFlags">528</int>
<reference key="NSVScroller" ref="693168867"/>
<reference key="NSHScroller" ref="656188692"/>
@@ -567,7 +563,6 @@
</object>
<string key="NSFrameSize">{214, 145}</string>
<reference key="NSSuperview" ref="298226231"/>
- <reference key="NSNextKeyView" ref="347093764"/>
<reference key="NSDocView" ref="347093764"/>
<reference key="NSBGColor" ref="1024678221"/>
<int key="NScvFlags">6</int>
@@ -595,7 +590,6 @@
</object>
<string key="NSFrameSize">{214, 145}</string>
<reference key="NSSuperview" ref="192579410"/>
- <reference key="NSNextKeyView" ref="685057119"/>
<int key="NSsFlags">512</int>
<reference key="NSVScroller" ref="245346414"/>
<reference key="NSHScroller" ref="353686052"/>
@@ -946,7 +940,7 @@
<object class="NSTabViewItem" id="831053945">
<string key="NSIdentifier">source</string>
<object class="NSView" key="NSView" id="461236772">
- <reference key="NSNextResponder" ref="714795046"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1464,7 +1458,6 @@
</object>
<string key="NSFrame">{{1, 17}, {694, 289}}</string>
<reference key="NSSuperview" ref="22340145"/>
- <reference key="NSNextKeyView" ref="715508012"/>
<reference key="NSDocView" ref="715508012"/>
<reference key="NSBGColor" ref="1024678221"/>
<int key="NScvFlags">4</int>
@@ -1497,7 +1490,6 @@
</object>
<string key="NSFrame">{{1, 0}, {694, 17}}</string>
<reference key="NSSuperview" ref="22340145"/>
- <reference key="NSNextKeyView" ref="926883367"/>
<reference key="NSDocView" ref="926883367"/>
<reference key="NSBGColor" ref="1024678221"/>
<int key="NScvFlags">4</int>
@@ -1506,7 +1498,6 @@
</object>
<string key="NSFrame">{{-1, 22}, {696, 307}}</string>
<reference key="NSSuperview" ref="220777809"/>
- <reference key="NSNextKeyView" ref="16936123"/>
<int key="NSsFlags">562</int>
<reference key="NSVScroller" ref="943144555"/>
<reference key="NSHScroller" ref="456666876"/>
@@ -2053,7 +2044,6 @@
</object>
<string key="NSFrame">{{1, 17}, {694, 142}}</string>
<reference key="NSSuperview" ref="376224367"/>
- <reference key="NSNextKeyView" ref="584834515"/>
<reference key="NSDocView" ref="584834515"/>
<reference key="NSBGColor" ref="1024678221"/>
<int key="NScvFlags">4</int>
@@ -2086,7 +2076,6 @@
</object>
<string key="NSFrame">{{1, 0}, {694, 17}}</string>
<reference key="NSSuperview" ref="376224367"/>
- <reference key="NSNextKeyView" ref="459548655"/>
<reference key="NSDocView" ref="459548655"/>
<reference key="NSBGColor" ref="1024678221"/>
<int key="NScvFlags">4</int>
@@ -2095,7 +2084,6 @@
</object>
<string key="NSFrame">{{-1, 22}, {696, 160}}</string>
<reference key="NSSuperview" ref="1063281455"/>
- <reference key="NSNextKeyView" ref="794929378"/>
<int key="NSsFlags">562</int>
<reference key="NSVScroller" ref="1019209947"/>
<reference key="NSHScroller" ref="328951385"/>
@@ -2208,7 +2196,6 @@
</object>
</object>
<string key="NSFrame">{{10, 7}, {706, 544}}</string>
- <reference key="NSSuperview" ref="714795046"/>
</object>
<string key="NSLabel">Structure</string>
<reference key="NSColor" ref="62854682"/>
@@ -3941,7 +3928,7 @@
<object class="NSTabViewItem" id="94659530">
<string key="NSIdentifier">status</string>
<object class="NSView" key="NSView" id="730602982">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder" ref="714795046"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3968,6 +3955,29 @@
<object class="NSTextView" id="69074373">
<reference key="NSNextResponder" ref="78677381"/>
<int key="NSvFlags">2322</int>
+ <object class="NSMutableSet" key="NSDragTypes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="set.sortedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>Apple HTML pasteboard type</string>
+ <string>Apple PDF pasteboard type</string>
+ <string>Apple PICT pasteboard type</string>
+ <string>Apple PNG pasteboard type</string>
+ <string>Apple URL pasteboard type</string>
+ <string>CorePasteboardFlavorType 0x6D6F6F76</string>
+ <string>NSColor pasteboard type</string>
+ <string>NSFilenamesPboardType</string>
+ <string>NSStringPboardType</string>
+ <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+ <string>NeXT RTFD pasteboard type</string>
+ <string>NeXT Rich Text Format v1.0 pasteboard type</string>
+ <string>NeXT TIFF v4.0 pasteboard type</string>
+ <string>NeXT font pasteboard type</string>
+ <string>NeXT ruler pasteboard type</string>
+ <string>WebURLsWithTitlesPboardType</string>
+ <string>public.url</string>
+ </object>
+ </object>
<string key="NSFrameSize">{542, 14}</string>
<reference key="NSSuperview" ref="78677381"/>
<object class="NSTextContainer" key="NSTextContainer" id="708157837">
@@ -4744,6 +4754,7 @@
</object>
</object>
<string key="NSFrame">{{10, 7}, {706, 544}}</string>
+ <reference key="NSSuperview" ref="714795046"/>
</object>
<string key="NSLabel">Status</string>
<reference key="NSColor" ref="62854682"/>
@@ -5578,14 +5589,14 @@
<reference key="NSTabView" ref="714795046"/>
</object>
</object>
- <reference key="NSSelectedTabViewItem" ref="831053945"/>
+ <reference key="NSSelectedTabViewItem" ref="94659530"/>
<reference key="NSFont" ref="26"/>
<int key="NSTvFlags">134217731</int>
<bool key="NSAllowTruncatedLabels">YES</bool>
<bool key="NSDrawsBackground">YES</bool>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="461236772"/>
+ <reference ref="730602982"/>
</object>
</object>
</object>
@@ -5618,7 +5629,7 @@
<string key="NSWindowContentMaxSize">{292, 112}</string>
<string key="NSWindowContentMinSize">{292, 112}</string>
<object class="NSView" key="NSWindowView" id="70075497">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -5627,6 +5638,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{36, 75}, {91, 14}}</string>
<reference key="NSSuperview" ref="70075497"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="45988560">
<int key="NSCellFlags">68288064</int>
@@ -5643,6 +5655,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17, 50}, {110, 14}}</string>
<reference key="NSSuperview" ref="70075497"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="410467805">
<int key="NSCellFlags">68288064</int>
@@ -5659,6 +5672,7 @@
<int key="NSvFlags">258</int>
<string key="NSFrame">{{135, 74}, {137, 18}}</string>
<reference key="NSSuperview" ref="70075497"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="212969926">
<int key="NSCellFlags">-1804468671</int>
@@ -5681,6 +5695,7 @@
<int key="NSvFlags">259</int>
<string key="NSFrame">{{207, 13}, {70, 28}}</string>
<reference key="NSSuperview" ref="70075497"/>
+ <reference key="NSWindow"/>
<int key="NSTag">1</int>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="169260261">
@@ -5708,6 +5723,7 @@
<int key="NSvFlags">259</int>
<string key="NSFrame">{{139, 13}, {70, 28}}</string>
<reference key="NSSuperview" ref="70075497"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="994559297">
<int key="NSCellFlags">67239424</int>
@@ -5729,6 +5745,7 @@
<int key="NSvFlags">258</int>
<string key="NSFrame">{{132, 45}, {143, 22}}</string>
<reference key="NSSuperview" ref="70075497"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="1000126742">
<int key="NSCellFlags">-2076049856</int>
@@ -5744,303 +5761,15 @@
</object>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="410007925">
- <reference key="NSMenu" ref="38191244"/>
- <string key="NSTitle">Default</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
+ <nil key="NSMenuItem"/>
<bool key="NSMenuItemRespectAlignment">YES</bool>
<object class="NSMenu" key="NSMenu" id="38191244">
<string key="NSTitle">OtherViews</string>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="410007925"/>
- <object class="NSMenuItem" id="936262700">
- <reference key="NSMenu" ref="38191244"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="75240407">
- <reference key="NSMenu" ref="38191244"/>
- <string key="NSTitle">UCS-2 Unicode (ucs2)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="410304104">
- <reference key="NSMenu" ref="38191244"/>
- <string key="NSTitle">UTF-8 Unicode (utf8)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="1022552442">
- <reference key="NSMenu" ref="38191244"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="4256">
- <reference key="NSMenu" ref="38191244"/>
- <string key="NSTitle">US ASCII (ascii)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="941593702">
- <reference key="NSMenu" ref="38191244"/>
- <string key="NSTitle">ISO Latin 1 (latin1)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="266800360">
- <reference key="NSMenu" ref="38191244"/>
- <string key="NSTitle">Mac Roman (macroman)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="510465377">
- <reference key="NSMenu" ref="38191244"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="706333609">
- <reference key="NSMenu" ref="38191244"/>
- <string key="NSTitle">Windows Latin 2 (cp1250)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="430273312">
- <reference key="NSMenu" ref="38191244"/>
- <string key="NSTitle">ISO Latin 2 (latin2)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="416176514">
- <reference key="NSMenu" ref="38191244"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="164789390">
- <reference key="NSMenu" ref="38191244"/>
- <string key="NSTitle">Windows Arabic (cp1256)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="564953861">
- <reference key="NSMenu" ref="38191244"/>
- <string key="NSTitle">ISO Greek (greek)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="21931488">
- <reference key="NSMenu" ref="38191244"/>
- <string key="NSTitle">ISO Hebrew (hebrew)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="215456235">
- <reference key="NSMenu" ref="38191244"/>
- <string key="NSTitle">ISO Turkish (latin5)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="100280668">
- <reference key="NSMenu" ref="38191244"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="877852446">
- <reference key="NSMenu" ref="38191244"/>
- <string key="NSTitle">Windows Baltic (cp1257)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="284223347">
- <reference key="NSMenu" ref="38191244"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="199319595">
- <reference key="NSMenu" ref="38191244"/>
- <string key="NSTitle">Windows Cyrillic (cp1251)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="129898533">
- <reference key="NSMenu" ref="38191244"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="965264484">
- <reference key="NSMenu" ref="38191244"/>
- <string key="NSTitle">Big5 Traditional Chinese (big5)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="706919296">
- <reference key="NSMenu" ref="38191244"/>
- <string key="NSTitle">Shift-JIS Japanese (sjis)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="646927594">
- <reference key="NSMenu" ref="38191244"/>
- <string key="NSTitle">EUC-JP Japanese (ujis)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
- <object class="NSMenuItem" id="96525804">
- <reference key="NSMenu" ref="38191244"/>
- <string key="NSTitle">EUC-KR Korean (euckr)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1000126742"/>
- </object>
</object>
</object>
+ <int key="NSSelectedIndex">-1</int>
<int key="NSPreferredEdge">3</int>
<bool key="NSUsesItemFromMenu">YES</bool>
<bool key="NSAltersState">YES</bool>
@@ -6049,6 +5778,8 @@
</object>
</object>
<string key="NSFrameSize">{292, 112}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{292, 134}</string>
@@ -6291,7 +6022,7 @@
<string key="NSWindowContentMaxSize">{600, 142}</string>
<string key="NSWindowContentMinSize">{269, 142}</string>
<object class="NSView" key="NSWindowView" id="846512394">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -6300,6 +6031,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{36, 105}, {71, 14}}</string>
<reference key="NSSuperview" ref="846512394"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="967312779">
<int key="NSCellFlags">68288064</int>
@@ -6316,6 +6048,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17, 80}, {90, 14}}</string>
<reference key="NSSuperview" ref="846512394"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="308586219">
<int key="NSCellFlags">68288064</int>
@@ -6332,6 +6065,7 @@
<int key="NSvFlags">258</int>
<string key="NSFrame">{{112, 104}, {137, 18}}</string>
<reference key="NSSuperview" ref="846512394"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="39963071">
<int key="NSCellFlags">-1804468671</int>
@@ -6349,6 +6083,7 @@
<int key="NSvFlags">257</int>
<string key="NSFrame">{{184, 13}, {70, 28}}</string>
<reference key="NSSuperview" ref="846512394"/>
+ <reference key="NSWindow"/>
<int key="NSTag">1</int>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="805893132">
@@ -6372,6 +6107,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{109, 75}, {143, 22}}</string>
<reference key="NSSuperview" ref="846512394"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="285868883">
<int key="NSCellFlags">-2076049856</int>
@@ -6387,303 +6123,15 @@
</object>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="675982474">
- <reference key="NSMenu" ref="27429055"/>
- <string key="NSTitle">Default</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
+ <nil key="NSMenuItem"/>
<bool key="NSMenuItemRespectAlignment">YES</bool>
<object class="NSMenu" key="NSMenu" id="27429055">
<string key="NSTitle">OtherViews</string>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="675982474"/>
- <object class="NSMenuItem" id="173190155">
- <reference key="NSMenu" ref="27429055"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="859905377">
- <reference key="NSMenu" ref="27429055"/>
- <string key="NSTitle">UCS-2 Unicode (ucs2)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="543217219">
- <reference key="NSMenu" ref="27429055"/>
- <string key="NSTitle">UTF-8 Unicode (utf8)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="529293183">
- <reference key="NSMenu" ref="27429055"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="920579102">
- <reference key="NSMenu" ref="27429055"/>
- <string key="NSTitle">US ASCII (ascii)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="908384763">
- <reference key="NSMenu" ref="27429055"/>
- <string key="NSTitle">ISO Latin 1 (latin1)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="1047958260">
- <reference key="NSMenu" ref="27429055"/>
- <string key="NSTitle">Mac Roman (macroman)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="650678591">
- <reference key="NSMenu" ref="27429055"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="465185890">
- <reference key="NSMenu" ref="27429055"/>
- <string key="NSTitle">Windows Latin 2 (cp1250)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="123372458">
- <reference key="NSMenu" ref="27429055"/>
- <string key="NSTitle">ISO Latin 2 (latin2)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="11979888">
- <reference key="NSMenu" ref="27429055"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="798880689">
- <reference key="NSMenu" ref="27429055"/>
- <string key="NSTitle">Windows Arabic (cp1256)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="806179041">
- <reference key="NSMenu" ref="27429055"/>
- <string key="NSTitle">ISO Greek (greek)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="832559959">
- <reference key="NSMenu" ref="27429055"/>
- <string key="NSTitle">ISO Hebrew (hebrew)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="943576969">
- <reference key="NSMenu" ref="27429055"/>
- <string key="NSTitle">ISO Turkish (latin5)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="799943484">
- <reference key="NSMenu" ref="27429055"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="769641882">
- <reference key="NSMenu" ref="27429055"/>
- <string key="NSTitle">Windows Baltic (cp1257)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="771569539">
- <reference key="NSMenu" ref="27429055"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="90462047">
- <reference key="NSMenu" ref="27429055"/>
- <string key="NSTitle">Windows Cyrillic (cp1251)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="71707537">
- <reference key="NSMenu" ref="27429055"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="396130049">
- <reference key="NSMenu" ref="27429055"/>
- <string key="NSTitle">Big5 Traditional Chinese (big5)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="106858384">
- <reference key="NSMenu" ref="27429055"/>
- <string key="NSTitle">Shift-JIS Japanese (sjis)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="507842350">
- <reference key="NSMenu" ref="27429055"/>
- <string key="NSTitle">EUC-JP Japanese (ujis)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
- <object class="NSMenuItem" id="520376365">
- <reference key="NSMenu" ref="27429055"/>
- <string key="NSTitle">EUC-KR Korean (euckr)</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="285868883"/>
- </object>
</object>
</object>
+ <int key="NSSelectedIndex">-1</int>
<int key="NSPreferredEdge">3</int>
<bool key="NSUsesItemFromMenu">YES</bool>
<bool key="NSAltersState">YES</bool>
@@ -6695,6 +6143,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{41, 54}, {66, 14}}</string>
<reference key="NSSuperview" ref="846512394"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="193977111">
<int key="NSCellFlags">68288064</int>
@@ -6711,6 +6160,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{109, 50}, {143, 22}}</string>
<reference key="NSSuperview" ref="846512394"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="285541065">
<int key="NSCellFlags">-2076049856</int>
@@ -6746,6 +6196,7 @@
<int key="NSvFlags">257</int>
<string key="NSFrame">{{116, 13}, {70, 28}}</string>
<reference key="NSSuperview" ref="846512394"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="783843620">
<int key="NSCellFlags">67239424</int>
@@ -6764,6 +6215,8 @@
</object>
</object>
<string key="NSFrameSize">{269, 142}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSMinSize">{269, 164}</string>
@@ -6901,7 +6354,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>
<string key="NSWindowContentMinSize">{213, 107}</string>
<object class="NSView" key="NSWindowView" id="234287744">
<nil key="NSNextResponder"/>
@@ -7057,7 +6510,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{213, 129}</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="423199625">
<int key="NSWindowStyleMask">7</int>
@@ -7067,7 +6520,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSWindowTitle">Reset Auto Increment</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>
<string key="NSWindowContentMinSize">{255, 95}</string>
<object class="NSView" key="NSWindowView" id="748618982">
<nil key="NSNextResponder"/>
@@ -7230,7 +6683,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 1002}}</string>
<string key="NSMinSize">{255, 117}</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="787219800">
<int key="NSWindowStyleMask">1</int>
@@ -7240,7 +6693,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSWindowTitle">New Relation</string>
<string key="NSWindowClass">NSPanel</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="842408319">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
@@ -7841,7 +7294,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSFrameSize">{302, 307}</string>
</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 class="NSWindowTemplate" id="437271354">
<int key="NSWindowStyleMask">9</int>
@@ -7851,7 +7304,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSWindowTitle">New Trigger</string>
<string key="NSWindowClass">NSPanel</string>
<nil key="NSViewClass"/>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{329, 348}</string>
<object class="NSView" key="NSWindowView" id="729080358">
<nil key="NSNextResponder"/>
@@ -8258,7 +7711,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSMinSize">{329, 370}</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="1066802919">
<int key="NSWindowStyleMask">3</int>
@@ -8270,7 +7723,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{213, 50}</string>
<object class="NSView" key="NSWindowView" id="525490268">
<nil key="NSNextResponder"/>
@@ -8390,7 +7843,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
<string key="NSMinSize">{213, 72}</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="553728448">
<int key="NSWindowStyleMask">9</int>
@@ -8402,7 +7855,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{213, 107}</string>
<object class="NSView" key="NSWindowView" id="1052076676">
<nil key="NSNextResponder"/>
@@ -8537,7 +7990,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{213, 129}</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="828950706">
<int key="NSWindowStyleMask">15</int>
@@ -8549,7 +8002,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{350, 200}</string>
<object class="NSView" key="NSWindowView" id="749598685">
<nil key="NSNextResponder"/>
@@ -8772,7 +8225,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSMinSize">{350, 222}</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="466147946">
<int key="NSWindowStyleMask">9</int>
@@ -8784,7 +8237,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{213, 107}</string>
<object class="NSView" key="NSWindowView" id="860968037">
<nil key="NSNextResponder"/>
@@ -8954,7 +8407,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{213, 129}</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="78186995">
<int key="NSWindowStyleMask">31</int>
@@ -8964,7 +8417,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSWindowTitle">MySQL Help</string>
<string key="NSWindowClass">NSPanel</string>
<nil key="NSViewClass"/>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{351, 120}</string>
<object class="NSView" key="NSWindowView" id="539508428">
<nil key="NSNextResponder"/>
@@ -9362,7 +8815,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 1002}}</string>
<string key="NSMinSize">{351, 136}</string>
- <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSFrameAutosaveName">MYSQL_HELP_WINDOW</string>
</object>
<object class="NSWindowTemplate" id="434046103">
@@ -9496,7 +8949,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSWindowTitle">Secure Text Input Sheet</string>
<string key="NSWindowClass">NSPanel</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="978976687">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
@@ -9600,7 +9053,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSFrameSize">{338, 138}</string>
</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>
</object>
<object class="NSCustomView" id="139279766">
<nil key="NSNextResponder"/>
@@ -11493,7 +10946,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSColorName">disabledControlTextColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC4zMzMzMzMzNDMzAA</bytes>
+ <bytes key="NSWhite">MC4zMzMzMzMzMzMzAA</bytes>
</object>
</object>
</object>
@@ -17950,160 +17403,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<reference key="object" ref="38191244"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="129898533"/>
- <reference ref="21931488"/>
- <reference ref="284223347"/>
- <reference ref="965264484"/>
- <reference ref="164789390"/>
- <reference ref="564953861"/>
- <reference ref="75240407"/>
- <reference ref="410304104"/>
- <reference ref="510465377"/>
- <reference ref="706333609"/>
- <reference ref="430273312"/>
- <reference ref="1022552442"/>
- <reference ref="877852446"/>
- <reference ref="4256"/>
- <reference ref="215456235"/>
- <reference ref="941593702"/>
- <reference ref="199319595"/>
- <reference ref="416176514"/>
- <reference ref="266800360"/>
- <reference ref="706919296"/>
- <reference ref="646927594"/>
- <reference ref="100280668"/>
- <reference ref="936262700"/>
- <reference ref="410007925"/>
- <reference ref="96525804"/>
</object>
<reference key="parent" ref="1000126742"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">4754</int>
- <reference key="object" ref="129898533"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4755</int>
- <reference key="object" ref="21931488"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4756</int>
- <reference key="object" ref="284223347"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4757</int>
- <reference key="object" ref="965264484"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4758</int>
- <reference key="object" ref="164789390"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4759</int>
- <reference key="object" ref="564953861"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4760</int>
- <reference key="object" ref="75240407"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4761</int>
- <reference key="object" ref="410304104"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4762</int>
- <reference key="object" ref="510465377"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4763</int>
- <reference key="object" ref="706333609"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4764</int>
- <reference key="object" ref="430273312"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4765</int>
- <reference key="object" ref="1022552442"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4766</int>
- <reference key="object" ref="877852446"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4767</int>
- <reference key="object" ref="4256"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4768</int>
- <reference key="object" ref="215456235"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4769</int>
- <reference key="object" ref="941593702"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4770</int>
- <reference key="object" ref="199319595"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4771</int>
- <reference key="object" ref="416176514"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4772</int>
- <reference key="object" ref="266800360"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4773</int>
- <reference key="object" ref="706919296"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4774</int>
- <reference key="object" ref="646927594"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4775</int>
- <reference key="object" ref="100280668"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4776</int>
- <reference key="object" ref="936262700"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4777</int>
- <reference key="object" ref="410007925"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4795</int>
- <reference key="object" ref="96525804"/>
- <reference key="parent" ref="38191244"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">5322</int>
<reference key="object" ref="291331305"/>
<object class="NSMutableArray" key="children">
@@ -18203,160 +17506,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<reference key="object" ref="27429055"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="71707537"/>
- <reference ref="832559959"/>
- <reference ref="771569539"/>
- <reference ref="396130049"/>
- <reference ref="798880689"/>
- <reference ref="806179041"/>
- <reference ref="859905377"/>
- <reference ref="543217219"/>
- <reference ref="650678591"/>
- <reference ref="465185890"/>
- <reference ref="123372458"/>
- <reference ref="529293183"/>
- <reference ref="769641882"/>
- <reference ref="920579102"/>
- <reference ref="943576969"/>
- <reference ref="908384763"/>
- <reference ref="90462047"/>
- <reference ref="11979888"/>
- <reference ref="1047958260"/>
- <reference ref="106858384"/>
- <reference ref="507842350"/>
- <reference ref="799943484"/>
- <reference ref="173190155"/>
- <reference ref="675982474"/>
- <reference ref="520376365"/>
</object>
<reference key="parent" ref="285868883"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">5336</int>
- <reference key="object" ref="71707537"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5337</int>
- <reference key="object" ref="832559959"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5338</int>
- <reference key="object" ref="771569539"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5339</int>
- <reference key="object" ref="396130049"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5340</int>
- <reference key="object" ref="798880689"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5341</int>
- <reference key="object" ref="806179041"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5342</int>
- <reference key="object" ref="859905377"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5343</int>
- <reference key="object" ref="543217219"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5344</int>
- <reference key="object" ref="650678591"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5345</int>
- <reference key="object" ref="465185890"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5346</int>
- <reference key="object" ref="123372458"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5347</int>
- <reference key="object" ref="529293183"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5348</int>
- <reference key="object" ref="769641882"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5349</int>
- <reference key="object" ref="920579102"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5350</int>
- <reference key="object" ref="943576969"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5351</int>
- <reference key="object" ref="908384763"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5352</int>
- <reference key="object" ref="90462047"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5353</int>
- <reference key="object" ref="11979888"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5354</int>
- <reference key="object" ref="1047958260"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5355</int>
- <reference key="object" ref="106858384"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5356</int>
- <reference key="object" ref="507842350"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5357</int>
- <reference key="object" ref="799943484"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5358</int>
- <reference key="object" ref="173190155"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5359</int>
- <reference key="object" ref="675982474"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5360</int>
- <reference key="object" ref="520376365"/>
- <reference key="parent" ref="27429055"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">5361</int>
<reference key="object" ref="39963071"/>
<reference key="parent" ref="49938431"/>
@@ -23857,55 +23010,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>4753.IBPluginDependency</string>
<string>4753.ImportedFromIB2</string>
<string>4753.editorWindowContentRectSynchronizationRect</string>
- <string>4754.IBPluginDependency</string>
- <string>4754.ImportedFromIB2</string>
- <string>4755.IBPluginDependency</string>
- <string>4755.ImportedFromIB2</string>
- <string>4756.IBPluginDependency</string>
- <string>4756.ImportedFromIB2</string>
- <string>4757.IBPluginDependency</string>
- <string>4757.ImportedFromIB2</string>
- <string>4758.IBPluginDependency</string>
- <string>4758.ImportedFromIB2</string>
- <string>4759.IBPluginDependency</string>
- <string>4759.ImportedFromIB2</string>
- <string>4760.IBPluginDependency</string>
- <string>4760.ImportedFromIB2</string>
- <string>4761.IBPluginDependency</string>
- <string>4761.ImportedFromIB2</string>
- <string>4762.IBPluginDependency</string>
- <string>4762.ImportedFromIB2</string>
- <string>4763.IBPluginDependency</string>
- <string>4763.ImportedFromIB2</string>
- <string>4764.IBPluginDependency</string>
- <string>4764.ImportedFromIB2</string>
- <string>4765.IBPluginDependency</string>
- <string>4765.ImportedFromIB2</string>
- <string>4766.IBPluginDependency</string>
- <string>4766.ImportedFromIB2</string>
- <string>4767.IBPluginDependency</string>
- <string>4767.ImportedFromIB2</string>
- <string>4768.IBPluginDependency</string>
- <string>4768.ImportedFromIB2</string>
- <string>4769.IBPluginDependency</string>
- <string>4769.ImportedFromIB2</string>
- <string>4770.IBPluginDependency</string>
- <string>4770.ImportedFromIB2</string>
- <string>4771.IBPluginDependency</string>
- <string>4771.ImportedFromIB2</string>
- <string>4772.IBPluginDependency</string>
- <string>4772.ImportedFromIB2</string>
- <string>4773.IBPluginDependency</string>
- <string>4773.ImportedFromIB2</string>
- <string>4774.IBPluginDependency</string>
- <string>4774.ImportedFromIB2</string>
- <string>4775.IBPluginDependency</string>
- <string>4775.ImportedFromIB2</string>
- <string>4776.IBPluginDependency</string>
- <string>4776.ImportedFromIB2</string>
- <string>4777.IBPluginDependency</string>
- <string>4777.ImportedFromIB2</string>
- <string>4795.IBPluginDependency</string>
<string>500.IBPluginDependency</string>
<string>500.ImportedFromIB2</string>
<string>501.IBEditorWindowLastContentRect</string>
@@ -24021,55 +23125,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>5335.IBPluginDependency</string>
<string>5335.ImportedFromIB2</string>
<string>5335.editorWindowContentRectSynchronizationRect</string>
- <string>5336.IBPluginDependency</string>
- <string>5336.ImportedFromIB2</string>
- <string>5337.IBPluginDependency</string>
- <string>5337.ImportedFromIB2</string>
- <string>5338.IBPluginDependency</string>
- <string>5338.ImportedFromIB2</string>
- <string>5339.IBPluginDependency</string>
- <string>5339.ImportedFromIB2</string>
- <string>5340.IBPluginDependency</string>
- <string>5340.ImportedFromIB2</string>
- <string>5341.IBPluginDependency</string>
- <string>5341.ImportedFromIB2</string>
- <string>5342.IBPluginDependency</string>
- <string>5342.ImportedFromIB2</string>
- <string>5343.IBPluginDependency</string>
- <string>5343.ImportedFromIB2</string>
- <string>5344.IBPluginDependency</string>
- <string>5344.ImportedFromIB2</string>
- <string>5345.IBPluginDependency</string>
- <string>5345.ImportedFromIB2</string>
- <string>5346.IBPluginDependency</string>
- <string>5346.ImportedFromIB2</string>
- <string>5347.IBPluginDependency</string>
- <string>5347.ImportedFromIB2</string>
- <string>5348.IBPluginDependency</string>
- <string>5348.ImportedFromIB2</string>
- <string>5349.IBPluginDependency</string>
- <string>5349.ImportedFromIB2</string>
- <string>5350.IBPluginDependency</string>
- <string>5350.ImportedFromIB2</string>
- <string>5351.IBPluginDependency</string>
- <string>5351.ImportedFromIB2</string>
- <string>5352.IBPluginDependency</string>
- <string>5352.ImportedFromIB2</string>
- <string>5353.IBPluginDependency</string>
- <string>5353.ImportedFromIB2</string>
- <string>5354.IBPluginDependency</string>
- <string>5354.ImportedFromIB2</string>
- <string>5355.IBPluginDependency</string>
- <string>5355.ImportedFromIB2</string>
- <string>5356.IBPluginDependency</string>
- <string>5356.ImportedFromIB2</string>
- <string>5357.IBPluginDependency</string>
- <string>5357.ImportedFromIB2</string>
- <string>5358.IBPluginDependency</string>
- <string>5358.ImportedFromIB2</string>
- <string>5359.IBPluginDependency</string>
- <string>5359.ImportedFromIB2</string>
- <string>5360.IBPluginDependency</string>
<string>5361.IBPluginDependency</string>
<string>5369.IBPluginDependency</string>
<string>5428.IBEditorWindowLastContentRect</string>
@@ -25479,61 +24534,12 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{577, 117}, {228, 379}}</string>
+ <string>{{831, 435}, {225, 4}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{67, 289}, {228, 362}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
<string>{{940, 346}, {260, 127}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{940, 346}, {260, 127}}</string>
@@ -25724,9 +24730,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{919, 382}, {269, 142}}</string>
+ <string>{{733, 382}, {269, 142}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{919, 382}, {269, 142}}</string>
+ <string>{{733, 382}, {269, 142}}</string>
<integer value="1"/>
<boolean value="YES"/>
<boolean value="YES"/>
@@ -25748,60 +24754,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{907, -2}, {228, 379}}</string>
+ <string>{{831, 473}, {143, 6}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{67, 289}, {228, 362}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{317, 217}, {505, 308}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -25966,9 +24923,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{859, 372}, {292, 112}}</string>
+ <string>{{710, 372}, {292, 112}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{859, 372}, {292, 112}}</string>
+ <string>{{710, 372}, {292, 112}}</string>
<integer value="1"/>
<integer value="1"/>
<integer value="1"/>
@@ -25991,7 +24948,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{728, 469}, {143, 6}}</string>
+ <string>{{831, 448}, {143, 6}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{67, 289}, {228, 362}}</string>
@@ -26006,7 +24963,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{569, 898}, {117, 4}}</string>
+ <string>{{381, 607}, {161, 6}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -26772,7 +25729,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{127, 120}, {943, 549}}</string>
+ <string>{{59, 120}, {943, 549}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{1013, 364}, {157, 63}}</string>
@@ -27944,7 +26901,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>indexTypePopUpButton</string>
<string>indexedColumnsComboBox</string>
<string>indexesTableView</string>
- <string>removeIndexButton</string>
<string>tableData</string>
<string>tableStructure</string>
<string>tablesList</string>
@@ -27957,7 +26913,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>NSPopUpButton</string>
<string>NSComboBox</string>
<string>NSTableView</string>
- <string>NSButton</string>
<string>SPTableData</string>
<string>SPTableStructure</string>
<string>SPTablesList</string>
@@ -28204,11 +27159,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addField:</string>
- <string>chooseIndexType:</string>
<string>closeKeySheet:</string>
<string>closeSheet:</string>
<string>copyField:</string>
- <string>openIndexSheet:</string>
<string>reloadTable:</string>
<string>removeField:</string>
<string>resetAutoIncrement:</string>
@@ -28222,8 +27175,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>id</string>
<string>id</string>
<string>id</string>
- <string>id</string>
- <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib
index 41902baa..5ae45696 100644
--- a/Interfaces/English.lproj/MainMenu.xib
+++ b/Interfaces/English.lproj/MainMenu.xib
@@ -2,7 +2,7 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10D573</string>
+ <string key="IBDocument.SystemVersion">10D2094</string>
<string key="IBDocument.InterfaceBuilderVersion">762</string>
<string key="IBDocument.AppKitVersion">1038.29</string>
<string key="IBDocument.HIToolboxVersion">460.00</string>
@@ -13,6 +13,7 @@
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="956"/>
+ <integer value="29"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1250,6 +1251,7 @@
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">10</int>
</object>
<object class="NSMenuItem" id="428425210">
<reference key="NSMenu" ref="487618540"/>
@@ -1260,6 +1262,7 @@
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">20</int>
</object>
<object class="NSMenuItem" id="345290219">
<reference key="NSMenu" ref="487618540"/>
@@ -1268,6 +1271,7 @@
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
+ <int key="NSTag">30</int>
</object>
<object class="NSMenuItem" id="649847059">
<reference key="NSMenu" ref="487618540"/>
@@ -1279,6 +1283,7 @@
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
+ <int key="NSTag">-1</int>
</object>
<object class="NSMenuItem" id="587809847">
<reference key="NSMenu" ref="487618540"/>
@@ -1289,6 +1294,7 @@
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">40</int>
</object>
<object class="NSMenuItem" id="247892805">
<reference key="NSMenu" ref="487618540"/>
@@ -1299,6 +1305,7 @@
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">50</int>
</object>
<object class="NSMenuItem" id="1045933524">
<reference key="NSMenu" ref="487618540"/>
@@ -1309,6 +1316,7 @@
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">60</int>
</object>
<object class="NSMenuItem" id="929144169">
<reference key="NSMenu" ref="487618540"/>
@@ -1320,6 +1328,7 @@
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
+ <int key="NSTag">-1</int>
</object>
<object class="NSMenuItem" id="1019891968">
<reference key="NSMenu" ref="487618540"/>
@@ -1330,6 +1339,7 @@
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">70</int>
</object>
<object class="NSMenuItem" id="272867556">
<reference key="NSMenu" ref="487618540"/>
@@ -1340,6 +1350,7 @@
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">80</int>
</object>
<object class="NSMenuItem" id="831843460">
<reference key="NSMenu" ref="487618540"/>
@@ -1351,6 +1362,7 @@
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
+ <int key="NSTag">-1</int>
</object>
<object class="NSMenuItem" id="114701997">
<reference key="NSMenu" ref="487618540"/>
@@ -1361,6 +1373,7 @@
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">90</int>
</object>
<object class="NSMenuItem" id="86485907">
<reference key="NSMenu" ref="487618540"/>
@@ -1371,6 +1384,7 @@
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">100</int>
</object>
<object class="NSMenuItem" id="243329592">
<reference key="NSMenu" ref="487618540"/>
@@ -1381,6 +1395,7 @@
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">110</int>
</object>
<object class="NSMenuItem" id="620428396">
<reference key="NSMenu" ref="487618540"/>
@@ -1391,6 +1406,7 @@
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">120</int>
</object>
<object class="NSMenuItem" id="145813245">
<reference key="NSMenu" ref="487618540"/>
@@ -1402,6 +1418,7 @@
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
+ <int key="NSTag">-1</int>
</object>
<object class="NSMenuItem" id="290468717">
<reference key="NSMenu" ref="487618540"/>
@@ -1412,6 +1429,7 @@
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">130</int>
</object>
<object class="NSMenuItem" id="384948978">
<reference key="NSMenu" ref="487618540"/>
@@ -1423,6 +1441,7 @@
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
+ <int key="NSTag">-1</int>
</object>
<object class="NSMenuItem" id="537895346">
<reference key="NSMenu" ref="487618540"/>
@@ -1433,6 +1452,7 @@
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">140</int>
</object>
<object class="NSMenuItem" id="239164973">
<reference key="NSMenu" ref="487618540"/>
@@ -1444,6 +1464,7 @@
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
+ <int key="NSTag">-1</int>
</object>
<object class="NSMenuItem" id="803749958">
<reference key="NSMenu" ref="487618540"/>
@@ -1454,6 +1475,7 @@
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">150</int>
</object>
<object class="NSMenuItem" id="691508085">
<reference key="NSMenu" ref="487618540"/>
@@ -1464,6 +1486,7 @@
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">160</int>
</object>
<object class="NSMenuItem" id="705318648">
<reference key="NSMenu" ref="487618540"/>
@@ -1474,6 +1497,7 @@
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">170</int>
</object>
<object class="NSMenuItem" id="302542110">
<reference key="NSMenu" ref="487618540"/>
@@ -1482,6 +1506,7 @@
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
+ <int key="NSTag">180</int>
</object>
</object>
</object>
@@ -4767,7 +4792,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{449, 1007}, {197, 53}}</string>
- <string>{{108, 563}, {511, 20}}</string>
+ <string>{{106, 685}, {511, 20}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{506, 836}, {511, 20}}</string>
@@ -4809,7 +4834,7 @@
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
- <string>{{596, 277}, {255, 253}}</string>
+ <string>{{348, 432}, {255, 253}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{312, 683}, {231, 153}}</string>
@@ -4821,7 +4846,7 @@
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
- <string>{{815, 44}, {276, 423}}</string>
+ <string>{{603, 82}, {276, 423}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{556, 185}, {279, 383}}</string>
diff --git a/Interfaces/English.lproj/Preferences.xib b/Interfaces/English.lproj/Preferences.xib
index 9edaca7a..9bb44b4d 100644
--- a/Interfaces/English.lproj/Preferences.xib
+++ b/Interfaces/English.lproj/Preferences.xib
@@ -2,8 +2,8 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10D573</string>
- <string key="IBDocument.InterfaceBuilderVersion">740</string>
+ <string key="IBDocument.SystemVersion">10D2094</string>
+ <string key="IBDocument.InterfaceBuilderVersion">762</string>
<string key="IBDocument.AppKitVersion">1038.29</string>
<string key="IBDocument.HIToolboxVersion">460.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
@@ -15,19 +15,17 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>740</string>
+ <string>762</string>
<string>1.2.5</string>
</object>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="1520"/>
- <integer value="60"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.brandonwalkin.BWToolkit</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.brandonwalkin.BWToolkit</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -52,32 +50,35 @@
<object class="NSWindowTemplate" id="1005">
<int key="NSWindowStyleMask">4107</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{634, 582}, {500, 172}}</string>
- <int key="NSWTFlags">536873984</int>
+ <string key="NSWindowRect">{{430, 486}, {550, 172}}</string>
+ <int key="NSWTFlags">544738304</int>
<string key="NSWindowTitle">Preferences</string>
<string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
- <string key="NSWindowContentMinSize">{500, 0}</string>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <string key="NSWindowContentMinSize">{550, 50}</string>
<object class="NSView" key="NSWindowView" id="1006">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
- <string key="NSFrameSize">{500, 172}</string>
+ <string key="NSFrameSize">{550, 172}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
</object>
- <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
- <string key="NSMinSize">{500, 22}</string>
- <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+ <string key="NSMinSize">{550, 72}</string>
+ <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
</object>
<object class="NSCustomView" id="594324362">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSPopUpButton" id="258765966">
<reference key="NSNextResponder" ref="594324362"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{151, 121}, {254, 26}}</string>
+ <string key="NSFrame">{{201, 141}, {254, 26}}</string>
<reference key="NSSuperview" ref="594324362"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="562129977">
<int key="NSCellFlags">-2076049856</int>
@@ -136,6 +137,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">-1</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="459226932">
@@ -147,6 +149,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">10</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="658105746">
@@ -158,6 +161,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">20</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="803859810">
@@ -171,6 +175,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">-1</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="597534842">
@@ -182,6 +187,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">40</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="1039961945">
@@ -193,6 +199,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">50</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="286480960">
@@ -204,6 +211,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">60</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="920159195">
@@ -217,6 +225,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">-1</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="215733800">
@@ -228,6 +237,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">70</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="754067936">
@@ -239,6 +249,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">80</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="167641433">
@@ -252,6 +263,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">-1</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="100024375">
@@ -263,6 +275,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">90</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="30486352">
@@ -274,6 +287,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">100</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="852885382">
@@ -285,6 +299,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">110</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="168185241">
@@ -296,6 +311,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">120</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="248587109">
@@ -309,6 +325,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">-1</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="580779424">
@@ -320,6 +337,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">130</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="301221561">
@@ -333,6 +351,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">-1</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="118115381">
@@ -344,6 +363,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">140</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="535802383">
@@ -357,6 +377,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">-1</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="32816449">
@@ -368,6 +389,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">150</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="476769155">
@@ -379,6 +401,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">160</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="426404401">
@@ -390,6 +413,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">170</int>
<reference key="NSTarget" ref="562129977"/>
</object>
<object class="NSMenuItem" id="286777225">
@@ -400,6 +424,7 @@
<reference key="NSOnImage" ref="1039721224"/>
<reference key="NSMixedImage" ref="720177216"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">180</int>
<reference key="NSTarget" ref="562129977"/>
</object>
</object>
@@ -413,8 +438,9 @@
<object class="NSButton" id="521332722">
<reference key="NSNextResponder" ref="594324362"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{152, 214}, {209, 18}}</string>
+ <string key="NSFrame">{{202, 234}, {330, 18}}</string>
<reference key="NSSuperview" ref="594324362"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="964808674">
<int key="NSCellFlags">67239424</int>
@@ -440,8 +466,9 @@
<object class="NSTextField" id="140067361">
<reference key="NSNextResponder" ref="594324362"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{40, 242}, {108, 17}}</string>
+ <string key="NSFrame">{{11, 262}, {187, 17}}</string>
<reference key="NSSuperview" ref="594324362"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="996600667">
<int key="NSCellFlags">68288064</int>
@@ -455,7 +482,7 @@
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor" id="432854223">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
+ <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="1035618107">
@@ -472,8 +499,9 @@
<object class="NSPopUpButton" id="331339372">
<reference key="NSNextResponder" ref="594324362"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{151, 236}, {254, 26}}</string>
+ <string key="NSFrame">{{201, 256}, {254, 26}}</string>
<reference key="NSSuperview" ref="594324362"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="406329678">
<int key="NSCellFlags">-2076049856</int>
@@ -504,8 +532,9 @@
<object class="NSTextField" id="227167312">
<reference key="NSNextResponder" ref="594324362"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{33, 85}, {116, 17}}</string>
+ <string key="NSFrame">{{17, 105}, {182, 17}}</string>
<reference key="NSSuperview" ref="594324362"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="513222356">
<int key="NSCellFlags">68288064</int>
@@ -520,8 +549,9 @@
<object class="NSTextField" id="63384418">
<reference key="NSNextResponder" ref="594324362"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{33, 127}, {116, 17}}</string>
+ <string key="NSFrame">{{17, 147}, {182, 17}}</string>
<reference key="NSSuperview" ref="594324362"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="163779676">
<int key="NSCellFlags">68288064</int>
@@ -536,8 +566,9 @@
<object class="NSButton" id="929785803">
<reference key="NSNextResponder" ref="594324362"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{152, 84}, {166, 18}}</string>
+ <string key="NSFrame">{{202, 104}, {330, 18}}</string>
<reference key="NSSuperview" ref="594324362"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="530413242">
<int key="NSCellFlags">67239424</int>
@@ -558,8 +589,9 @@
<object class="NSButton" id="302000957">
<reference key="NSNextResponder" ref="594324362"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{152, 62}, {181, 18}}</string>
+ <string key="NSFrame">{{202, 82}, {330, 18}}</string>
<reference key="NSSuperview" ref="594324362"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="218042555">
<int key="NSCellFlags">67239424</int>
@@ -580,8 +612,9 @@
<object class="NSBox" id="101736468">
<reference key="NSNextResponder" ref="594324362"/>
<int key="NSvFlags">12</int>
- <string key="NSFrame">{{154, 156}, {326, 5}}</string>
+ <string key="NSFrame">{{204, 176}, {326, 5}}</string>
<reference key="NSSuperview" ref="594324362"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -610,8 +643,9 @@
<object class="NSBox" id="666474856">
<reference key="NSNextResponder" ref="594324362"/>
<int key="NSvFlags">12</int>
- <string key="NSFrame">{{154, 108}, {326, 5}}</string>
+ <string key="NSFrame">{{204, 128}, {326, 5}}</string>
<reference key="NSSuperview" ref="594324362"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -632,8 +666,9 @@
<object class="NSBox" id="997817518">
<reference key="NSNextResponder" ref="594324362"/>
<int key="NSvFlags">12</int>
- <string key="NSFrame">{{154, 53}, {326, 5}}</string>
+ <string key="NSFrame">{{204, 73}, {326, 5}}</string>
<reference key="NSSuperview" ref="594324362"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -654,8 +689,9 @@
<object class="NSTextField" id="326562367">
<reference key="NSNextResponder" ref="594324362"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{42, 23}, {106, 17}}</string>
+ <string key="NSFrame">{{17, 43}, {181, 17}}</string>
<reference key="NSSuperview" ref="594324362"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="899935643">
<int key="NSCellFlags">68288064</int>
@@ -670,8 +706,9 @@
<object class="NSTextField" id="155059">
<reference key="NSNextResponder" ref="594324362"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{153, 20}, {38, 22}}</string>
+ <string key="NSFrame">{{203, 40}, {38, 22}}</string>
<reference key="NSSuperview" ref="594324362"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="875775803">
<int key="NSCellFlags">-1804468671</int>
@@ -746,8 +783,9 @@
<object class="NSTextField" id="95243153">
<reference key="NSNextResponder" ref="594324362"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{197, 23}, {162, 17}}</string>
+ <string key="NSFrame">{{247, 43}, {286, 17}}</string>
<reference key="NSSuperview" ref="594324362"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="710086132">
<int key="NSCellFlags">68288064</int>
@@ -762,8 +800,9 @@
<object class="NSPopUpButton" id="649933712">
<reference key="NSNextResponder" ref="594324362"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{151, 169}, {254, 26}}</string>
+ <string key="NSFrame">{{201, 189}, {254, 26}}</string>
<reference key="NSSuperview" ref="594324362"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="404009397">
<int key="NSCellFlags">-2076049856</int>
@@ -885,8 +924,9 @@
<object class="NSTextField" id="343898725">
<reference key="NSNextResponder" ref="594324362"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{61, 175}, {88, 17}}</string>
+ <string key="NSFrame">{{17, 195}, {182, 17}}</string>
<reference key="NSSuperview" ref="594324362"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="840580273">
<int key="NSCellFlags">68288064</int>
@@ -901,8 +941,9 @@
<object class="NSBox" id="502540430">
<reference key="NSNextResponder" ref="594324362"/>
<int key="NSvFlags">12</int>
- <string key="NSFrame">{{154, 204}, {326, 5}}</string>
+ <string key="NSFrame">{{204, 224}, {326, 5}}</string>
<reference key="NSSuperview" ref="594324362"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -921,19 +962,22 @@
<bool key="NSTransparent">NO</bool>
</object>
</object>
- <string key="NSFrameSize">{500, 280}</string>
+ <string key="NSFrameSize">{550, 300}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="395894064">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSButton" id="401684657">
<reference key="NSNextResponder" ref="395894064"/>
- <int key="NSvFlags">289</int>
- <string key="NSFrame">{{395, 12}, {90, 32}}</string>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{425, 32}, {102, 32}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="828765183">
<int key="NSCellFlags">67239424</int>
@@ -951,9 +995,10 @@
</object>
<object class="NSTextField" id="416182097">
<reference key="NSNextResponder" ref="395894064"/>
- <int key="NSvFlags">289</int>
- <string key="NSFrame">{{163, 20}, {221, 19}}</string>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{205, 40}, {218, 19}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="82174450">
<int key="NSCellFlags">-2076049856</int>
@@ -973,8 +1018,9 @@
<object class="NSPopUpButton" id="67060802">
<reference key="NSNextResponder" ref="395894064"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{162, 56}, {320, 26}}</string>
+ <string key="NSFrame">{{204, 76}, {320, 26}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="323591102">
<int key="NSCellFlags">-2076049856</int>
@@ -1041,9 +1087,10 @@
</object>
<object class="NSTextField" id="418062206">
<reference key="NSNextResponder" ref="395894064"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{8, 22}, {148, 17}}</string>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{17, 42}, {181, 17}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="578929076">
<int key="NSCellFlags">68288064</int>
@@ -1058,8 +1105,9 @@
<object class="NSTextField" id="743152467">
<reference key="NSNextResponder" ref="395894064"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 62}, {140, 17}}</string>
+ <string key="NSFrame">{{17, 82}, {182, 17}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="449580049">
<int key="NSCellFlags">68288064</int>
@@ -1074,8 +1122,9 @@
<object class="NSBox" id="169616697">
<reference key="NSNextResponder" ref="395894064"/>
<int key="NSvFlags">12</int>
- <string key="NSFrame">{{163, 86}, {316, 5}}</string>
+ <string key="NSFrame">{{205, 106}, {316, 5}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -1096,8 +1145,9 @@
<object class="NSButton" id="282702408">
<reference key="NSNextResponder" ref="395894064"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{161, 238}, {123, 18}}</string>
+ <string key="NSFrame">{{203, 258}, {320, 18}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="7693853">
<int key="NSCellFlags">67239424</int>
@@ -1118,8 +1168,9 @@
<object class="NSTextField" id="302141262">
<reference key="NSNextResponder" ref="395894064"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{32, 277}, {125, 17}}</string>
+ <string key="NSFrame">{{17, 297}, {183, 17}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="524603578">
<int key="NSCellFlags">67239488</int>
@@ -1134,8 +1185,9 @@
<object class="NSTextField" id="265036898">
<reference key="NSNextResponder" ref="395894064"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{383, 144}, {38, 17}}</string>
+ <string key="NSFrame">{{449, 164}, {84, 17}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="596167553">
<int key="NSCellFlags">67239488</int>
@@ -1150,8 +1202,9 @@
<object class="NSButton" id="625748362">
<reference key="NSNextResponder" ref="395894064"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{161, 278}, {106, 18}}</string>
+ <string key="NSFrame">{{203, 298}, {320, 18}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="29938940">
<int key="NSCellFlags">-2080244224</int>
@@ -1172,8 +1225,9 @@
<object class="NSButton" id="728219401">
<reference key="NSNextResponder" ref="395894064"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{161, 143}, {115, 18}}</string>
+ <string key="NSFrame">{{203, 163}, {139, 18}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="920748663">
<int key="NSCellFlags">67239424</int>
@@ -1194,8 +1248,9 @@
<object class="NSButton" id="563352266">
<reference key="NSNextResponder" ref="395894064"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{161, 258}, {105, 18}}</string>
+ <string key="NSFrame">{{203, 278}, {320, 18}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="516443326">
<int key="NSCellFlags">-2080244224</int>
@@ -1216,8 +1271,9 @@
<object class="NSStepper" id="813674245">
<reference key="NSNextResponder" ref="395894064"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{362, 138}, {19, 27}}</string>
+ <string key="NSFrame">{{428, 158}, {19, 27}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSStepperCell" key="NSCell" id="1061407286">
<int key="NSCellFlags">917024</int>
@@ -1234,8 +1290,9 @@
<object class="NSTextField" id="479121914">
<reference key="NSNextResponder" ref="395894064"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{282, 141}, {75, 22}}</string>
+ <string key="NSFrame">{{348, 161}, {75, 22}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="585678618">
<int key="NSCellFlags">-1804468672</int>
@@ -1304,8 +1361,9 @@
<object class="NSTextField" id="618764971">
<reference key="NSNextResponder" ref="395894064"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{14, 99}, {143, 17}}</string>
+ <string key="NSFrame">{{17, 119}, {182, 17}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="609090823">
<int key="NSCellFlags">68288064</int>
@@ -1320,8 +1378,9 @@
<object class="NSTextField" id="423928419">
<reference key="NSNextResponder" ref="395894064"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{163, 97}, {75, 22}}</string>
+ <string key="NSFrame">{{205, 117}, {75, 22}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="82744709">
<int key="NSCellFlags">-1804468671</int>
@@ -1338,8 +1397,9 @@
<object class="NSButton" id="41303511">
<reference key="NSNextResponder" ref="395894064"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{161, 198}, {297, 18}}</string>
+ <string key="NSFrame">{{203, 218}, {329, 18}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="441275">
<int key="NSCellFlags">67239424</int>
@@ -1360,8 +1420,9 @@
<object class="NSBox" id="238389133">
<reference key="NSNextResponder" ref="395894064"/>
<int key="NSvFlags">12</int>
- <string key="NSFrame">{{163, 45}, {316, 5}}</string>
+ <string key="NSFrame">{{205, 65}, {316, 5}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -1382,8 +1443,9 @@
<object class="NSBox" id="692531763">
<reference key="NSNextResponder" ref="395894064"/>
<int key="NSvFlags">12</int>
- <string key="NSFrame">{{163, 224}, {316, 5}}</string>
+ <string key="NSFrame">{{205, 244}, {316, 5}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -1404,8 +1466,9 @@
<object class="NSBox" id="205950287">
<reference key="NSNextResponder" ref="395894064"/>
<int key="NSvFlags">12</int>
- <string key="NSFrame">{{163, 169}, {316, 5}}</string>
+ <string key="NSFrame">{{205, 189}, {316, 5}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -1426,8 +1489,9 @@
<object class="NSBox" id="17983744">
<reference key="NSNextResponder" ref="395894064"/>
<int key="NSvFlags">12</int>
- <string key="NSFrame">{{163, 130}, {316, 5}}</string>
+ <string key="NSFrame">{{205, 150}, {316, 5}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -1448,8 +1512,9 @@
<object class="NSButton" id="761347322">
<reference key="NSNextResponder" ref="395894064"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{161, 178}, {206, 18}}</string>
+ <string key="NSFrame">{{203, 198}, {329, 18}}</string>
<reference key="NSSuperview" ref="395894064"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="542131730">
<int key="NSCellFlags">-2080244224</int>
@@ -1468,7 +1533,9 @@
</object>
</object>
</object>
- <string key="NSFrameSize">{499, 316}</string>
+ <string key="NSFrameSize">{550, 336}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="593732956">
@@ -1663,7 +1730,7 @@
</object>
</object>
</object>
- <string key="NSFrameSize">{197, 23}</string>
+ <string key="NSFrameSize">{217, 23}</string>
<reference key="NSSuperview" ref="984943037"/>
<bool key="BWABBIsResizable">YES</bool>
<bool key="BWABBIsAtBottom">YES</bool>
@@ -1683,7 +1750,7 @@
<object class="NSTableView" id="279932544">
<reference key="NSNextResponder" ref="253139122"/>
<int key="NSvFlags">4370</int>
- <string key="NSFrameSize">{198, 358}</string>
+ <string key="NSFrameSize">{218, 358}</string>
<reference key="NSSuperview" ref="253139122"/>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
@@ -1695,7 +1762,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn" id="22246087">
<string key="NSIdentifier">name</string>
- <double key="NSWidth">195</double>
+ <double key="NSWidth">215</double>
<double key="NSMinWidth">40</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1765,9 +1832,8 @@
<int key="NSTableViewDraggingDestinationStyle">1</int>
</object>
</object>
- <string key="NSFrame">{{1, 1}, {198, 358}}</string>
+ <string key="NSFrame">{{1, 1}, {218, 358}}</string>
<reference key="NSSuperview" ref="533802223"/>
- <reference key="NSNextKeyView" ref="279932544"/>
<reference key="NSDocView" ref="279932544"/>
<reference key="NSBGColor" ref="887465699"/>
<int key="NScvFlags">4</int>
@@ -1793,9 +1859,8 @@
<double key="NSPercent">0.99532711505889893</double>
</object>
</object>
- <string key="NSFrame">{{-2, 22}, {200, 360}}</string>
+ <string key="NSFrame">{{-2, 22}, {220, 360}}</string>
<reference key="NSSuperview" ref="984943037"/>
- <reference key="NSNextKeyView" ref="253139122"/>
<int key="NSsFlags">530</int>
<reference key="NSVScroller" ref="940130901"/>
<reference key="NSHScroller" ref="2545381"/>
@@ -1803,7 +1868,7 @@
<bytes key="NSScrollAmts">QSAAAEEgAABCPAAAQjwAAA</bytes>
</object>
</object>
- <string key="NSFrameSize">{197, 381}</string>
+ <string key="NSFrameSize">{217, 381}</string>
<reference key="NSSuperview" ref="141072039"/>
<string key="NSClassName">NSView</string>
</object>
@@ -1815,7 +1880,7 @@
<object class="NSTabView" id="961025550">
<reference key="NSNextResponder" ref="343315962"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{-7, 34}, {322, 282}}</string>
+ <string key="NSFrame">{{-7, 34}, {352, 282}}</string>
<reference key="NSSuperview" ref="343315962"/>
<object class="NSMutableArray" key="NSTabViewItems">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1829,7 +1894,7 @@
<object class="NSTextField" id="796172881">
<reference key="NSNextResponder" ref="922389102"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{119, 153}, {135, 19}}</string>
+ <string key="NSFrame">{{119, 153}, {165, 19}}</string>
<reference key="NSSuperview" ref="922389102"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="994019596">
@@ -1847,7 +1912,7 @@
<object class="NSSecureTextField" id="755342553">
<reference key="NSNextResponder" ref="922389102"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{119, 180}, {135, 19}}</string>
+ <string key="NSFrame">{{119, 180}, {165, 19}}</string>
<reference key="NSSuperview" ref="922389102"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSecureTextFieldCell" key="NSCell" id="1031469346">
@@ -1868,7 +1933,7 @@
<object class="NSTextField" id="133134378">
<reference key="NSNextResponder" ref="922389102"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{119, 207}, {135, 19}}</string>
+ <string key="NSFrame">{{119, 207}, {165, 19}}</string>
<reference key="NSSuperview" ref="922389102"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="738673778">
@@ -1885,7 +1950,7 @@
<object class="NSTextField" id="707085995">
<reference key="NSNextResponder" ref="922389102"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{119, 126}, {135, 19}}</string>
+ <string key="NSFrame">{{119, 126}, {165, 19}}</string>
<reference key="NSSuperview" ref="922389102"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="961856924">
@@ -1903,7 +1968,7 @@
<object class="NSTextField" id="77492794">
<reference key="NSNextResponder" ref="922389102"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{119, 234}, {135, 19}}</string>
+ <string key="NSFrame">{{119, 234}, {165, 19}}</string>
<reference key="NSSuperview" ref="922389102"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="621427359">
@@ -1920,7 +1985,7 @@
<object class="NSTextField" id="405218604">
<reference key="NSNextResponder" ref="922389102"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{81, 236}, {33, 14}}</string>
+ <string key="NSFrame">{{4, 236}, {110, 14}}</string>
<reference key="NSSuperview" ref="922389102"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="240920834">
@@ -1936,7 +2001,7 @@
<object class="NSTextField" id="311258049">
<reference key="NSNextResponder" ref="922389102"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{53, 209}, {61, 14}}</string>
+ <string key="NSFrame">{{4, 209}, {110, 14}}</string>
<reference key="NSSuperview" ref="922389102"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="260120936">
@@ -1952,7 +2017,7 @@
<object class="NSTextField" id="326534719">
<reference key="NSNextResponder" ref="922389102"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{57, 155}, {57, 14}}</string>
+ <string key="NSFrame">{{4, 155}, {110, 14}}</string>
<reference key="NSSuperview" ref="922389102"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="33430397">
@@ -1968,7 +2033,7 @@
<object class="NSTextField" id="829144025">
<reference key="NSNextResponder" ref="922389102"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{56, 182}, {58, 14}}</string>
+ <string key="NSFrame">{{4, 182}, {110, 14}}</string>
<reference key="NSSuperview" ref="922389102"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="700495139">
@@ -1984,7 +2049,7 @@
<object class="NSTextField" id="352560561">
<reference key="NSNextResponder" ref="922389102"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{85, 128}, {29, 14}}</string>
+ <string key="NSFrame">{{4, 128}, {110, 14}}</string>
<reference key="NSSuperview" ref="922389102"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="723136745">
@@ -1998,7 +2063,7 @@
</object>
</object>
</object>
- <string key="NSFrame">{{10, 7}, {287, 262}}</string>
+ <string key="NSFrame">{{10, 7}, {317, 262}}</string>
</object>
<string key="NSLabel">Standard</string>
<reference key="NSColor" ref="700609571"/>
@@ -2014,7 +2079,7 @@
<object class="NSTextField" id="634238753">
<reference key="NSNextResponder" ref="839532754"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{119, 180}, {135, 19}}</string>
+ <string key="NSFrame">{{119, 180}, {165, 19}}</string>
<reference key="NSSuperview" ref="839532754"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="77164118">
@@ -2032,7 +2097,7 @@
<object class="NSSecureTextField" id="340136489">
<reference key="NSNextResponder" ref="839532754"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{119, 207}, {135, 19}}</string>
+ <string key="NSFrame">{{119, 207}, {165, 19}}</string>
<reference key="NSSuperview" ref="839532754"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSecureTextFieldCell" key="NSCell" id="66198316">
@@ -2053,7 +2118,7 @@
<object class="NSTextField" id="596010118">
<reference key="NSNextResponder" ref="839532754"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{119, 153}, {135, 19}}</string>
+ <string key="NSFrame">{{119, 153}, {165, 19}}</string>
<reference key="NSSuperview" ref="839532754"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="283360027">
@@ -2071,7 +2136,7 @@
<object class="NSTextField" id="119091130">
<reference key="NSNextResponder" ref="839532754"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{119, 234}, {135, 19}}</string>
+ <string key="NSFrame">{{119, 234}, {165, 19}}</string>
<reference key="NSSuperview" ref="839532754"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="380690864">
@@ -2088,7 +2153,7 @@
<object class="NSTextField" id="109184829">
<reference key="NSNextResponder" ref="839532754"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{53, 236}, {61, 14}}</string>
+ <string key="NSFrame">{{4, 236}, {110, 14}}</string>
<reference key="NSSuperview" ref="839532754"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="210960415">
@@ -2104,7 +2169,7 @@
<object class="NSTextField" id="483422259">
<reference key="NSNextResponder" ref="839532754"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{57, 182}, {57, 14}}</string>
+ <string key="NSFrame">{{4, 182}, {110, 14}}</string>
<reference key="NSSuperview" ref="839532754"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="196254248">
@@ -2120,7 +2185,7 @@
<object class="NSTextField" id="14709164">
<reference key="NSNextResponder" ref="839532754"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{56, 209}, {58, 14}}</string>
+ <string key="NSFrame">{{4, 209}, {110, 14}}</string>
<reference key="NSSuperview" ref="839532754"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="175382146">
@@ -2136,7 +2201,7 @@
<object class="NSTextField" id="205311716">
<reference key="NSNextResponder" ref="839532754"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 155}, {43, 14}}</string>
+ <string key="NSFrame">{{4, 155}, {110, 14}}</string>
<reference key="NSSuperview" ref="839532754"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="766781287">
@@ -2150,7 +2215,7 @@
</object>
</object>
</object>
- <string key="NSFrame">{{10, 7}, {287, 262}}</string>
+ <string key="NSFrame">{{10, 7}, {317, 262}}</string>
</object>
<string key="NSLabel">Socket</string>
<reference key="NSColor" ref="700609571"/>
@@ -2166,7 +2231,7 @@
<object class="NSTextField" id="1041581151">
<reference key="NSNextResponder" ref="404987940"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{119, 59}, {135, 19}}</string>
+ <string key="NSFrame">{{119, 59}, {165, 19}}</string>
<reference key="NSSuperview" ref="404987940"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="882064965">
@@ -2183,7 +2248,7 @@
<object class="NSTextField" id="663701836">
<reference key="NSNextResponder" ref="404987940"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{119, 33}, {135, 19}}</string>
+ <string key="NSFrame">{{119, 33}, {165, 19}}</string>
<reference key="NSSuperview" ref="404987940"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="996160392">
@@ -2200,7 +2265,7 @@
<object class="NSTextField" id="905879958">
<reference key="NSNextResponder" ref="404987940"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{119, 85}, {135, 19}}</string>
+ <string key="NSFrame">{{119, 85}, {165, 19}}</string>
<reference key="NSSuperview" ref="404987940"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="782045166">
@@ -2217,7 +2282,7 @@
<object class="NSTextField" id="781513571">
<reference key="NSNextResponder" ref="404987940"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{119, 7}, {135, 19}}</string>
+ <string key="NSFrame">{{119, 7}, {165, 19}}</string>
<reference key="NSSuperview" ref="404987940"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="160881703">
@@ -2235,7 +2300,7 @@
<object class="NSTextField" id="946292517">
<reference key="NSNextResponder" ref="404987940"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{59, 61}, {55, 14}}</string>
+ <string key="NSFrame">{{5, 61}, {109, 14}}</string>
<reference key="NSSuperview" ref="404987940"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="544940669">
@@ -2251,7 +2316,7 @@
<object class="NSTextField" id="459575305">
<reference key="NSNextResponder" ref="404987940"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{33, 35}, {81, 14}}</string>
+ <string key="NSFrame">{{5, 35}, {109, 14}}</string>
<reference key="NSSuperview" ref="404987940"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="26059905">
@@ -2267,7 +2332,7 @@
<object class="NSTextField" id="463016809">
<reference key="NSNextResponder" ref="404987940"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{58, 87}, {56, 14}}</string>
+ <string key="NSFrame">{{5, 87}, {109, 14}}</string>
<reference key="NSSuperview" ref="404987940"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="642636551">
@@ -2283,7 +2348,7 @@
<object class="NSTextField" id="266286554">
<reference key="NSNextResponder" ref="404987940"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{54, 9}, {60, 14}}</string>
+ <string key="NSFrame">{{5, 9}, {109, 14}}</string>
<reference key="NSSuperview" ref="404987940"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="646676137">
@@ -2299,7 +2364,7 @@
<object class="NSTextField" id="471638951">
<reference key="NSNextResponder" ref="404987940"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{119, 153}, {135, 19}}</string>
+ <string key="NSFrame">{{119, 153}, {165, 19}}</string>
<reference key="NSSuperview" ref="404987940"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="98025404">
@@ -2317,7 +2382,7 @@
<object class="NSSecureTextField" id="602383030">
<reference key="NSNextResponder" ref="404987940"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{119, 180}, {135, 19}}</string>
+ <string key="NSFrame">{{119, 180}, {165, 19}}</string>
<reference key="NSSuperview" ref="404987940"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSecureTextFieldCell" key="NSCell" id="682598366">
@@ -2338,7 +2403,7 @@
<object class="NSTextField" id="917213113">
<reference key="NSNextResponder" ref="404987940"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{119, 207}, {135, 19}}</string>
+ <string key="NSFrame">{{119, 207}, {165, 19}}</string>
<reference key="NSSuperview" ref="404987940"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="983072894">
@@ -2355,7 +2420,7 @@
<object class="NSTextField" id="545088922">
<reference key="NSNextResponder" ref="404987940"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{119, 126}, {135, 19}}</string>
+ <string key="NSFrame">{{119, 126}, {165, 19}}</string>
<reference key="NSSuperview" ref="404987940"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1015235520">
@@ -2373,7 +2438,7 @@
<object class="NSTextField" id="619305072">
<reference key="NSNextResponder" ref="404987940"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{119, 234}, {135, 19}}</string>
+ <string key="NSFrame">{{119, 234}, {165, 19}}</string>
<reference key="NSSuperview" ref="404987940"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="153943465">
@@ -2390,7 +2455,7 @@
<object class="NSTextField" id="32316521">
<reference key="NSNextResponder" ref="404987940"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{42, 236}, {72, 14}}</string>
+ <string key="NSFrame">{{5, 236}, {109, 14}}</string>
<reference key="NSSuperview" ref="404987940"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="528636141">
@@ -2406,7 +2471,7 @@
<object class="NSTextField" id="706577331">
<reference key="NSNextResponder" ref="404987940"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{53, 209}, {61, 14}}</string>
+ <string key="NSFrame">{{5, 209}, {109, 14}}</string>
<reference key="NSSuperview" ref="404987940"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1047551041">
@@ -2422,7 +2487,7 @@
<object class="NSTextField" id="578376935">
<reference key="NSNextResponder" ref="404987940"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{57, 155}, {57, 14}}</string>
+ <string key="NSFrame">{{5, 155}, {109, 14}}</string>
<reference key="NSSuperview" ref="404987940"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="860519796">
@@ -2438,7 +2503,7 @@
<object class="NSTextField" id="623079900">
<reference key="NSNextResponder" ref="404987940"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{56, 182}, {58, 14}}</string>
+ <string key="NSFrame">{{5, 182}, {109, 14}}</string>
<reference key="NSSuperview" ref="404987940"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="33269254">
@@ -2454,7 +2519,7 @@
<object class="NSTextField" id="981807110">
<reference key="NSNextResponder" ref="404987940"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{85, 128}, {29, 14}}</string>
+ <string key="NSFrame">{{5, 128}, {109, 14}}</string>
<reference key="NSSuperview" ref="404987940"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="596887118">
@@ -2468,7 +2533,7 @@
</object>
</object>
</object>
- <string key="NSFrame">{{10, 7}, {287, 262}}</string>
+ <string key="NSFrame">{{10, 7}, {317, 262}}</string>
<reference key="NSSuperview" ref="961025550"/>
</object>
<string key="NSLabel">SSH</string>
@@ -2488,7 +2553,7 @@
<object class="NSTextField" id="415835787">
<reference key="NSNextResponder" ref="343315962"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{112, 342}, {170, 19}}</string>
+ <string key="NSFrame">{{112, 342}, {200, 19}}</string>
<reference key="NSSuperview" ref="343315962"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="570809913">
@@ -2505,7 +2570,7 @@
<object class="NSTextField" id="318504265">
<reference key="NSNextResponder" ref="343315962"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{68, 344}, {39, 14}}</string>
+ <string key="NSFrame">{{9, 344}, {98, 14}}</string>
<reference key="NSSuperview" ref="343315962"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="299715951">
@@ -2521,7 +2586,7 @@
<object class="NSPopUpButton" id="1065964214">
<reference key="NSNextResponder" ref="343315962"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{109, 313}, {176, 22}}</string>
+ <string key="NSFrame">{{109, 313}, {206, 22}}</string>
<reference key="NSSuperview" ref="343315962"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="658054386">
@@ -2587,7 +2652,7 @@
<object class="NSTextField" id="490379939">
<reference key="NSNextResponder" ref="343315962"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{68, 318}, {39, 14}}</string>
+ <string key="NSFrame">{{9, 318}, {98, 14}}</string>
<reference key="NSSuperview" ref="343315962"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="761091734">
@@ -2601,18 +2666,18 @@
</object>
</object>
</object>
- <string key="NSFrame">{{198, 0}, {302, 381}}</string>
+ <string key="NSFrame">{{218, 0}, {332, 381}}</string>
<reference key="NSSuperview" ref="141072039"/>
<string key="NSClassName">NSView</string>
</object>
</object>
- <string key="NSFrameSize">{500, 381}</string>
+ <string key="NSFrameSize">{550, 381}</string>
<reference key="NSSuperview" ref="593732956"/>
<bool key="NSIsVertical">YES</bool>
<int key="NSDividerStyle">2</int>
</object>
</object>
- <string key="NSFrameSize">{500, 381}</string>
+ <string key="NSFrameSize">{550, 381}</string>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="1041614321">
@@ -2623,7 +2688,7 @@
<object class="NSButton" id="624078196">
<reference key="NSNextResponder" ref="1041614321"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{152, 173}, {187, 18}}</string>
+ <string key="NSFrame">{{202, 193}, {338, 18}}</string>
<reference key="NSSuperview" ref="1041614321"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1060471631">
@@ -2645,7 +2710,7 @@
<object class="NSBox" id="122803528">
<reference key="NSNextResponder" ref="1041614321"/>
<int key="NSvFlags">12</int>
- <string key="NSFrame">{{154, 136}, {334, 5}}</string>
+ <string key="NSFrame">{{204, 156}, {334, 5}}</string>
<reference key="NSSuperview" ref="1041614321"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -2667,7 +2732,7 @@
<object class="NSButton" id="385216684">
<reference key="NSNextResponder" ref="1041614321"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{152, 150}, {261, 18}}</string>
+ <string key="NSFrame">{{202, 170}, {338, 18}}</string>
<reference key="NSSuperview" ref="1041614321"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="695439962">
@@ -2689,7 +2754,7 @@
<object class="NSButton" id="894039889">
<reference key="NSNextResponder" ref="1041614321"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{152, 110}, {189, 18}}</string>
+ <string key="NSFrame">{{202, 130}, {338, 18}}</string>
<reference key="NSSuperview" ref="1041614321"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="641765383">
@@ -2711,7 +2776,7 @@
<object class="NSButton" id="638138321">
<reference key="NSNextResponder" ref="1041614321"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{180, 87}, {77, 18}}</string>
+ <string key="NSFrame">{{230, 107}, {310, 18}}</string>
<reference key="NSSuperview" ref="1041614321"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="135236421">
@@ -2733,7 +2798,7 @@
<object class="NSButton" id="967639780">
<reference key="NSNextResponder" ref="1041614321"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{180, 41}, {123, 18}}</string>
+ <string key="NSFrame">{{230, 61}, {310, 18}}</string>
<reference key="NSSuperview" ref="1041614321"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="510254021">
@@ -2755,7 +2820,7 @@
<object class="NSButton" id="705623520">
<reference key="NSNextResponder" ref="1041614321"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{180, 64}, {154, 18}}</string>
+ <string key="NSFrame">{{230, 84}, {310, 18}}</string>
<reference key="NSSuperview" ref="1041614321"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="29352039">
@@ -2777,7 +2842,7 @@
<object class="NSButton" id="184242117">
<reference key="NSNextResponder" ref="1041614321"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{180, 18}, {63, 18}}</string>
+ <string key="NSFrame">{{230, 38}, {310, 18}}</string>
<reference key="NSSuperview" ref="1041614321"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="545580787">
@@ -2797,7 +2862,7 @@
</object>
</object>
</object>
- <string key="NSFrameSize">{500, 209}</string>
+ <string key="NSFrameSize">{550, 229}</string>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="369742224">
@@ -2808,8 +2873,9 @@
<object class="NSBox" id="185366293">
<reference key="NSNextResponder" ref="369742224"/>
<int key="NSvFlags">12</int>
- <string key="NSFrame">{{154, 135}, {326, 5}}</string>
+ <string key="NSFrame">{{204, 155}, {326, 5}}</string>
<reference key="NSSuperview" ref="369742224"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -2829,9 +2895,10 @@
</object>
<object class="NSButton" id="467474047">
<reference key="NSNextResponder" ref="369742224"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{153, 81}, {256, 18}}</string>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{203, 101}, {329, 18}}</string>
<reference key="NSSuperview" ref="369742224"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="699261423">
<int key="NSCellFlags">67239424</int>
@@ -2850,9 +2917,10 @@
</object>
<object class="NSButton" id="390491056">
<reference key="NSNextResponder" ref="369742224"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{152, 144}, {225, 18}}</string>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{202, 164}, {330, 18}}</string>
<reference key="NSSuperview" ref="369742224"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="638010774">
<int key="NSCellFlags">67239424</int>
@@ -2872,8 +2940,9 @@
<object class="NSButton" id="951909881">
<reference key="NSNextResponder" ref="369742224"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{148, 12}, {111, 32}}</string>
+ <string key="NSFrame">{{198, 32}, {178, 32}}</string>
<reference key="NSSuperview" ref="369742224"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="905416501">
<int key="NSCellFlags">67239424</int>
@@ -2891,13 +2960,14 @@
</object>
<object class="NSTextField" id="330050984">
<reference key="NSNextResponder" ref="369742224"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{73, 49}, {75, 17}}</string>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{17, 69}, {181, 17}}</string>
<reference key="NSSuperview" ref="369742224"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="32693158">
<int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">272629760</int>
+ <int key="NSCellFlags2">71303168</int>
<string key="NSContents">Last check:</string>
<reference key="NSSupport" ref="320262838"/>
<reference key="NSControlView" ref="330050984"/>
@@ -2907,9 +2977,10 @@
</object>
<object class="NSTextField" id="29700160">
<reference key="NSNextResponder" ref="369742224"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{151, 49}, {254, 17}}</string>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{201, 69}, {332, 17}}</string>
<reference key="NSSuperview" ref="369742224"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1046240552">
<int key="NSCellFlags">67239424</int>
@@ -2965,8 +3036,9 @@ AQAAAAA</bytes>
<object class="NSBox" id="389135821">
<reference key="NSNextResponder" ref="369742224"/>
<int key="NSvFlags">12</int>
- <string key="NSFrame">{{154, 72}, {326, 5}}</string>
+ <string key="NSFrame">{{204, 92}, {326, 5}}</string>
<reference key="NSSuperview" ref="369742224"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -2986,13 +3058,14 @@ AQAAAAA</bytes>
</object>
<object class="NSTextField" id="1030541779">
<reference key="NSNextResponder" ref="369742224"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{75, 111}, {73, 17}}</string>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{17, 131}, {181, 17}}</string>
<reference key="NSSuperview" ref="369742224"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="250240617">
<int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">272629760</int>
+ <int key="NSCellFlags2">71303168</int>
<string key="NSContents">Frequency:</string>
<reference key="NSSupport" ref="320262838"/>
<reference key="NSControlView" ref="1030541779"/>
@@ -3003,8 +3076,9 @@ AQAAAAA</bytes>
<object class="NSPopUpButton" id="1064689843">
<reference key="NSNextResponder" ref="369742224"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{151, 105}, {150, 26}}</string>
+ <string key="NSFrame">{{201, 125}, {172, 26}}</string>
<reference key="NSSuperview" ref="369742224"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="526160091">
<int key="NSCellFlags">-2076049856</int>
@@ -3070,24 +3144,26 @@ AQAAAAA</bytes>
</object>
</object>
</object>
- <string key="NSFrameSize">{498, 180}</string>
+ <string key="NSFrameSize">{550, 200}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="769132533">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTextField" id="746894224">
<reference key="NSNextResponder" ref="769132533"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{12, 56}, {137, 17}}</string>
+ <string key="NSFrame">{{11, 76}, {188, 17}}</string>
<reference key="NSSuperview" ref="769132533"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1057393276">
<int key="NSCellFlags">67239488</int>
- <int key="NSCellFlags2">272630784</int>
+ <int key="NSCellFlags2">71304192</int>
<string key="NSContents">Connection Timeout:</string>
<reference key="NSSupport" ref="320262838"/>
<reference key="NSControlView" ref="746894224"/>
@@ -3098,8 +3174,9 @@ AQAAAAA</bytes>
<object class="NSButton" id="64545568">
<reference key="NSNextResponder" ref="769132533"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{152, 18}, {166, 18}}</string>
+ <string key="NSFrame">{{202, 38}, {330, 18}}</string>
<reference key="NSSuperview" ref="769132533"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="151662644">
<int key="NSCellFlags">-2080244224</int>
@@ -3120,8 +3197,9 @@ AQAAAAA</bytes>
<object class="NSTextField" id="591009529">
<reference key="NSNextResponder" ref="769132533"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{154, 53}, {50, 22}}</string>
+ <string key="NSFrame">{{204, 73}, {50, 22}}</string>
<reference key="NSSuperview" ref="769132533"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="170658213">
<int key="NSCellFlags">-1804468671</int>
@@ -3182,8 +3260,9 @@ AQAAAAA</bytes>
<object class="NSTextField" id="794722267">
<reference key="NSNextResponder" ref="769132533"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{209, 56}, {56, 17}}</string>
+ <string key="NSFrame">{{259, 76}, {274, 17}}</string>
<reference key="NSSuperview" ref="769132533"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="619604330">
<int key="NSCellFlags">67239488</int>
@@ -3198,8 +3277,9 @@ AQAAAAA</bytes>
<object class="NSBox" id="688014148">
<reference key="NSNextResponder" ref="769132533"/>
<int key="NSvFlags">12</int>
- <string key="NSFrame">{{154, 42}, {326, 5}}</string>
+ <string key="NSFrame">{{204, 62}, {326, 5}}</string>
<reference key="NSSuperview" ref="769132533"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -3218,7 +3298,9 @@ AQAAAAA</bytes>
<bool key="NSTransparent">NO</bool>
</object>
</object>
- <string key="NSFrameSize">{500, 93}</string>
+ <string key="NSFrameSize">{550, 113}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="1033452264">
@@ -3229,8 +3311,9 @@ AQAAAAA</bytes>
<object class="NSTextField" id="1018119488">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{363, 55}, {23, 19}}</string>
+ <string key="NSFrame">{{444, 75}, {23, 19}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="248584789">
<int key="NSCellFlags">-1804468671</int>
@@ -3301,12 +3384,13 @@ AQAAAAA</bytes>
<object class="NSTextField" id="304684720">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{256, 57}, {104, 17}}</string>
+ <string key="NSFrame">{{306, 77}, {133, 17}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="273262177">
<int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">272630784</int>
+ <int key="NSCellFlags2">205521920</int>
<string key="NSContents">Tab Stop Width:</string>
<reference key="NSSupport" ref="320262838"/>
<reference key="NSControlView" ref="304684720"/>
@@ -3317,8 +3401,9 @@ AQAAAAA</bytes>
<object class="NSStepper" id="161634003">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{393, 53}, {15, 22}}</string>
+ <string key="NSFrame">{{474, 73}, {15, 22}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSStepperCell" key="NSCell" id="93125704">
<int key="NSCellFlags">68025888</int>
@@ -3342,8 +3427,9 @@ AQAAAAA</bytes>
<string>NSColor pasteboard type</string>
</object>
</object>
- <string key="NSFrame">{{154, 199}, {44, 23}}</string>
+ <string key="NSFrame">{{204, 219}, {44, 23}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSIsBordered">YES</bool>
<object class="NSColor" key="NSColor">
@@ -3361,8 +3447,9 @@ AQAAAAA</bytes>
<string>NSColor pasteboard type</string>
</object>
</object>
- <string key="NSFrame">{{154, 228}, {44, 23}}</string>
+ <string key="NSFrame">{{204, 248}, {44, 23}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSIsBordered">YES</bool>
<object class="NSColor" key="NSColor">
@@ -3380,8 +3467,9 @@ AQAAAAA</bytes>
<string>NSColor pasteboard type</string>
</object>
</object>
- <string key="NSFrame">{{154, 141}, {44, 23}}</string>
+ <string key="NSFrame">{{204, 161}, {44, 23}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSIsBordered">YES</bool>
<object class="NSColor" key="NSColor">
@@ -3399,8 +3487,9 @@ AQAAAAA</bytes>
<string>NSColor pasteboard type</string>
</object>
</object>
- <string key="NSFrame">{{154, 112}, {44, 23}}</string>
+ <string key="NSFrame">{{204, 132}, {44, 23}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSIsBordered">YES</bool>
<object class="NSColor" key="NSColor">
@@ -3418,8 +3507,9 @@ AQAAAAA</bytes>
<string>NSColor pasteboard type</string>
</object>
</object>
- <string key="NSFrame">{{154, 286}, {44, 23}}</string>
+ <string key="NSFrame">{{204, 306}, {44, 23}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSIsBordered">YES</bool>
<object class="NSColor" key="NSColor">
@@ -3437,8 +3527,9 @@ AQAAAAA</bytes>
<string>NSColor pasteboard type</string>
</object>
</object>
- <string key="NSFrame">{{154, 170}, {44, 23}}</string>
+ <string key="NSFrame">{{204, 190}, {44, 23}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSIsBordered">YES</bool>
<object class="NSColor" key="NSColor">
@@ -3456,8 +3547,9 @@ AQAAAAA</bytes>
<string>NSColor pasteboard type</string>
</object>
</object>
- <string key="NSFrame">{{154, 83}, {44, 23}}</string>
+ <string key="NSFrame">{{204, 103}, {44, 23}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSIsBordered">YES</bool>
<object class="NSColor" key="NSColor">
@@ -3475,8 +3567,9 @@ AQAAAAA</bytes>
<string>NSColor pasteboard type</string>
</object>
</object>
- <string key="NSFrame">{{154, 54}, {44, 23}}</string>
+ <string key="NSFrame">{{204, 74}, {44, 23}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSIsBordered">YES</bool>
<object class="NSColor" key="NSColor">
@@ -3494,8 +3587,9 @@ AQAAAAA</bytes>
<string>NSColor pasteboard type</string>
</object>
</object>
- <string key="NSFrame">{{154, 315}, {44, 23}}</string>
+ <string key="NSFrame">{{204, 335}, {44, 23}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSIsBordered">YES</bool>
<object class="NSColor" key="NSColor">
@@ -3513,8 +3607,9 @@ AQAAAAA</bytes>
<string>NSColor pasteboard type</string>
</object>
</object>
- <string key="NSFrame">{{154, 257}, {44, 23}}</string>
+ <string key="NSFrame">{{204, 277}, {44, 23}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSIsBordered">YES</bool>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">1</int>
@@ -3524,8 +3619,9 @@ AQAAAAA</bytes>
<object class="NSTextField" id="99482303">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{86, 202}, {63, 17}}</string>
+ <string key="NSFrame">{{17, 222}, {182, 17}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="465390474">
<int key="NSCellFlags">68288064</int>
@@ -3540,8 +3636,9 @@ AQAAAAA</bytes>
<object class="NSTextField" id="568872772">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{88, 173}, {61, 17}}</string>
+ <string key="NSFrame">{{17, 193}, {182, 17}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="629129203">
<int key="NSCellFlags">68288064</int>
@@ -3556,8 +3653,9 @@ AQAAAAA</bytes>
<object class="NSTextField" id="246467941">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{79, 231}, {70, 17}}</string>
+ <string key="NSFrame">{{17, 251}, {182, 17}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="841770398">
<int key="NSCellFlags">68288064</int>
@@ -3572,8 +3670,9 @@ AQAAAAA</bytes>
<object class="NSTextField" id="481169742">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{89, 86}, {60, 17}}</string>
+ <string key="NSFrame">{{17, 106}, {182, 17}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="837982163">
<int key="NSCellFlags">68288064</int>
@@ -3588,8 +3687,9 @@ AQAAAAA</bytes>
<object class="NSTextField" id="923591695">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{23, 58}, {125, 17}}</string>
+ <string key="NSFrame">{{17, 78}, {181, 17}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="554509386">
<int key="NSCellFlags">68288064</int>
@@ -3604,8 +3704,9 @@ AQAAAAA</bytes>
<object class="NSTextField" id="8892598">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{102, 144}, {47, 17}}</string>
+ <string key="NSFrame">{{17, 164}, {182, 17}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="728610506">
<int key="NSCellFlags">68288064</int>
@@ -3620,8 +3721,9 @@ AQAAAAA</bytes>
<object class="NSTextField" id="55746852">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{112, 318}, {37, 17}}</string>
+ <string key="NSFrame">{{17, 338}, {182, 17}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="693342907">
<int key="NSCellFlags">68288064</int>
@@ -3636,8 +3738,9 @@ AQAAAAA</bytes>
<object class="NSTextField" id="496117397">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{46, 115}, {103, 17}}</string>
+ <string key="NSFrame">{{17, 135}, {182, 17}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="336899348">
<int key="NSCellFlags">68288064</int>
@@ -3652,8 +3755,9 @@ AQAAAAA</bytes>
<object class="NSTextField" id="477643899">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{66, 289}, {83, 17}}</string>
+ <string key="NSFrame">{{17, 309}, {182, 17}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="896659768">
<int key="NSCellFlags">68288064</int>
@@ -3668,8 +3772,9 @@ AQAAAAA</bytes>
<object class="NSTextField" id="676806550">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{113, 357}, {36, 17}}</string>
+ <string key="NSFrame">{{17, 377}, {182, 17}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="10706281">
<int key="NSCellFlags">68288064</int>
@@ -3684,8 +3789,9 @@ AQAAAAA</bytes>
<object class="NSButton" id="462361579">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{73, 12}, {131, 32}}</string>
+ <string key="NSFrame">{{69, 32}, {185, 32}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="603963569">
<int key="NSCellFlags">-2080244224</int>
@@ -3704,8 +3810,9 @@ AQAAAAA</bytes>
<object class="NSButton" id="742042283">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{396, 347}, {90, 32}}</string>
+ <string key="NSFrame">{{446, 367}, {90, 32}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="345790946">
<int key="NSCellFlags">67239424</int>
@@ -3724,8 +3831,9 @@ AQAAAAA</bytes>
<object class="NSTextField" id="751188139">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{154, 355}, {240, 19}}</string>
+ <string key="NSFrame">{{204, 375}, {240, 19}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="66452133">
<int key="NSCellFlags">-2076049856</int>
@@ -3741,8 +3849,9 @@ AQAAAAA</bytes>
<object class="NSTextField" id="34959322">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{107, 260}, {42, 17}}</string>
+ <string key="NSFrame">{{17, 280}, {182, 17}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="632150824">
<int key="NSCellFlags">605158976</int>
@@ -3757,8 +3866,9 @@ AQAAAAA</bytes>
<object class="NSButton" id="7445657">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{257, 317}, {126, 18}}</string>
+ <string key="NSFrame">{{307, 337}, {225, 18}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="823431848">
<int key="NSCellFlags">-2080244224</int>
@@ -3779,8 +3889,9 @@ AQAAAAA</bytes>
<object class="NSButton" id="571822117">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{257, 288}, {150, 18}}</string>
+ <string key="NSFrame">{{307, 308}, {225, 18}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="743257684">
<int key="NSCellFlags">-2080244224</int>
@@ -3801,8 +3912,9 @@ AQAAAAA</bytes>
<object class="NSButton" id="1030846368">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{257, 230}, {179, 18}}</string>
+ <string key="NSFrame">{{307, 250}, {225, 18}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="231642073">
<int key="NSCellFlags">67239424</int>
@@ -3823,8 +3935,9 @@ AQAAAAA</bytes>
<object class="NSButton" id="397485802">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{257, 259}, {185, 18}}</string>
+ <string key="NSFrame">{{307, 279}, {225, 18}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="491730308">
<int key="NSCellFlags">-2080244224</int>
@@ -3845,8 +3958,9 @@ AQAAAAA</bytes>
<object class="NSButton" id="787536920">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{257, 173}, {185, 18}}</string>
+ <string key="NSFrame">{{307, 193}, {225, 18}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="496801621">
<int key="NSCellFlags">-2080244224</int>
@@ -3867,8 +3981,9 @@ AQAAAAA</bytes>
<object class="NSButton" id="782193237">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{257, 86}, {186, 18}}</string>
+ <string key="NSFrame">{{307, 106}, {225, 18}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="131748905">
<int key="NSCellFlags">67239424</int>
@@ -3889,8 +4004,9 @@ AQAAAAA</bytes>
<object class="NSButton" id="827082642">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{257, 144}, {179, 18}}</string>
+ <string key="NSFrame">{{307, 164}, {225, 18}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="92164221">
<int key="NSCellFlags">67239424</int>
@@ -3911,8 +4027,9 @@ AQAAAAA</bytes>
<object class="NSTextField" id="184945490">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{357, 119}, {29, 19}}</string>
+ <string key="NSFrame">{{407, 139}, {29, 19}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="409964321">
<int key="NSCellFlags">-1538130368</int>
@@ -3984,8 +4101,9 @@ AQAAAAA</bytes>
<object class="NSTextField" id="892250776">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{298, 121}, {54, 14}}</string>
+ <string key="NSFrame">{{306, 141}, {96, 14}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1060023867">
<int key="NSCellFlags">605158976</int>
@@ -4000,8 +4118,9 @@ AQAAAAA</bytes>
<object class="NSStepper" id="107658761">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{392, 117}, {15, 22}}</string>
+ <string key="NSFrame">{{442, 137}, {15, 22}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSStepperCell" key="NSCell" id="171005061">
<int key="NSCellFlags">604896800</int>
@@ -4018,8 +4137,9 @@ AQAAAAA</bytes>
<object class="NSTextField" id="1009372112">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{410, 121}, {27, 14}}</string>
+ <string key="NSFrame">{{460, 141}, {73, 14}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="201150384">
<int key="NSCellFlags">605158976</int>
@@ -4034,8 +4154,9 @@ AQAAAAA</bytes>
<object class="NSButton" id="774563613">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">-2147483380</int>
- <string key="NSFrame">{{257, 24}, {197, 18}}</string>
+ <string key="NSFrame">{{307, 44}, {225, 18}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="420702000">
<int key="NSCellFlags">-1543373312</int>
@@ -4056,8 +4177,9 @@ AQAAAAA</bytes>
<object class="NSTextField" id="16021182">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{357, 205}, {29, 19}}</string>
+ <string key="NSFrame">{{407, 225}, {29, 19}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="992523117">
<int key="NSCellFlags">-1538130368</int>
@@ -4129,8 +4251,9 @@ AQAAAAA</bytes>
<object class="NSTextField" id="140155660">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{298, 207}, {54, 14}}</string>
+ <string key="NSFrame">{{306, 227}, {96, 14}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="499174965">
<int key="NSCellFlags">605158976</int>
@@ -4145,8 +4268,9 @@ AQAAAAA</bytes>
<object class="NSStepper" id="682694750">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{392, 203}, {15, 22}}</string>
+ <string key="NSFrame">{{442, 223}, {15, 22}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSStepperCell" key="NSCell" id="266600395">
<int key="NSCellFlags">604896800</int>
@@ -4163,8 +4287,9 @@ AQAAAAA</bytes>
<object class="NSTextField" id="659498064">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{410, 207}, {27, 14}}</string>
+ <string key="NSFrame">{{460, 227}, {73, 14}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="516695546">
<int key="NSCellFlags">605158976</int>
@@ -4179,8 +4304,9 @@ AQAAAAA</bytes>
<object class="NSBox" id="863604695">
<reference key="NSNextResponder" ref="1033452264"/>
<int key="NSvFlags">12</int>
- <string key="NSFrame">{{154, 344}, {326, 5}}</string>
+ <string key="NSFrame">{{204, 364}, {326, 5}}</string>
<reference key="NSSuperview" ref="1033452264"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -4199,8 +4325,9 @@ AQAAAAA</bytes>
<bool key="NSTransparent">NO</bool>
</object>
</object>
- <string key="NSFrameSize">{500, 395}</string>
+ <string key="NSFrameSize">{550, 415}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSUserDefaultsController" id="151174232">
@@ -4579,22 +4706,6 @@ AQAAAAA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
- <string key="label">selectedValue: values.DefaultEncoding</string>
- <reference key="source" ref="258765966"/>
- <reference key="destination" ref="151174232"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="258765966"/>
- <reference key="NSDestination" ref="151174232"/>
- <string key="NSLabel">selectedValue: values.DefaultEncoding</string>
- <string key="NSBinding">selectedValue</string>
- <string key="NSKeyPath">values.DefaultEncoding</string>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">630</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
<string key="label">value: values.UseMonospacedFonts</string>
<reference key="source" ref="929785803"/>
<reference key="destination" ref="151174232"/>
@@ -6578,6 +6689,26 @@ AQAAAAA</bytes>
</object>
<int key="connectionID">1625</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">selectedTag: values.DefaultEncodingTag</string>
+ <reference key="source" ref="258765966"/>
+ <reference key="destination" ref="151174232"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="258765966"/>
+ <reference key="NSDestination" ref="151174232"/>
+ <string key="NSLabel">selectedTag: values.DefaultEncodingTag</string>
+ <string key="NSBinding">selectedTag</string>
+ <string key="NSKeyPath">values.DefaultEncodingTag</string>
+ <object class="NSDictionary" key="NSOptions">
+ <string key="NS.key.0">NSAllowsEditingMultipleValuesSelection</string>
+ <boolean value="NO" key="NS.object.0"/>
+ </object>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">1635</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -7073,10 +7204,10 @@ AQAAAAA</bytes>
<reference ref="169616697"/>
<reference ref="743152467"/>
<reference ref="418062206"/>
- <reference ref="416182097"/>
- <reference ref="401684657"/>
<reference ref="67060802"/>
<reference ref="238389133"/>
+ <reference ref="416182097"/>
+ <reference ref="401684657"/>
</object>
<reference key="parent" ref="0"/>
<string key="objectName">Tables</string>
@@ -9846,14 +9977,14 @@ AQAAAAA</bytes>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{467, 550}, {500, 172}}</string>
+ <string>{{430, 463}, {550, 172}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{467, 550}, {500, 172}}</string>
+ <string>{{430, 463}, {550, 172}}</string>
<boolean value="NO"/>
<string>{196, 240}</string>
<string>{{202, 428}, {480, 270}}</string>
<boolean value="YES"/>
- <string>{500, 0}</string>
+ <string>{550, 50}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -10104,7 +10235,7 @@ AQAAAAA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.brandonwalkin.BWToolkit</string>
- <string>{{656, 406}, {124, 81}}</string>
+ <string>{{427, 109}, {124, 81}}</string>
<string>com.brandonwalkin.BWToolkit</string>
<string>com.brandonwalkin.BWToolkit</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -10123,13 +10254,13 @@ AQAAAAA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{571, 222}, {500, 280}}</string>
+ <string>{{221, 105}, {550, 300}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUserGuide">
<reference key="view" ref="594324362"/>
- <double key="location">145</double>
+ <double key="location">195</double>
<int key="affinity">0</int>
</object>
</object>
@@ -10138,7 +10269,7 @@ AQAAAAA</bytes>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{488, 191}, {279, 433}}</string>
+ <string>{{646, 14}, {276, 433}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{67, 289}, {228, 362}}</string>
@@ -10172,7 +10303,7 @@ AQAAAAA</bytes>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
- <string>{{648, 147}, {500, 381}}</string>
+ <string>{{408, 167}, {550, 381}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -10271,13 +10402,13 @@ AQAAAAA</bytes>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
- <string>{{471, 328}, {499, 316}}</string>
+ <string>{{466, 176}, {550, 336}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUserGuide">
<reference key="view" ref="395894064"/>
- <double key="location">153</double>
+ <double key="location">195</double>
<int key="affinity">0</int>
</object>
</object>
@@ -10308,13 +10439,13 @@ AQAAAAA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{254, 472}, {500, 209}}</string>
+ <string>{{254, 452}, {550, 229}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUserGuide">
<reference key="view" ref="1041614321"/>
- <double key="location">145</double>
+ <double key="location">195</double>
<int key="affinity">0</int>
</object>
</object>
@@ -10322,7 +10453,7 @@ AQAAAAA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{-1048, 591}, {254, 6}}</string>
+ <string>{{646, 556}, {254, 6}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{381, 612}, {175, 53}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -10342,23 +10473,23 @@ AQAAAAA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{489, 450}, {498, 180}}</string>
+ <string>{{419, 410}, {550, 200}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUserGuide">
<reference key="view" ref="369742224"/>
- <double key="location">145</double>
+ <double key="location">195</double>
<int key="affinity">0</int>
</object>
</object>
- <string>{{117, 527}, {500, 93}}</string>
+ <string>{{117, 507}, {550, 113}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUserGuide">
<reference key="view" ref="769132533"/>
- <double key="location">145</double>
+ <double key="location">195</double>
<int key="affinity">0</int>
</object>
</object>
@@ -10413,18 +10544,18 @@ AQAAAAA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{380, 197}, {500, 395}}</string>
+ <string>{{380, 177}, {550, 415}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUserGuide">
<reference key="view" ref="1033452264"/>
- <double key="location">145</double>
+ <double key="location">195</double>
<int key="affinity">0</int>
</object>
<object class="IBUserGuide">
<reference key="view" ref="1033452264"/>
- <double key="location">250</double>
+ <double key="location">300</double>
<int key="affinity">0</int>
</object>
</object>
@@ -10474,7 +10605,7 @@ AQAAAAA</bytes>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">1625</int>
+ <int key="maxID">1635</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -10488,6 +10619,13 @@ AQAAAAA</bytes>
</object>
</object>
<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">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
@@ -10505,7 +10643,14 @@ AQAAAAA</bytes>
<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">
@@ -10526,6 +10671,13 @@ AQAAAAA</bytes>
<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>
@@ -10551,7 +10703,7 @@ AQAAAAA</bytes>
</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">
@@ -11158,6 +11310,13 @@ AQAAAAA</bytes>
<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">Sparkle.framework/Headers/SUAppcast.h</string>
</object>
</object>
@@ -11470,6 +11629,7 @@ AQAAAAA</bytes>
</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"/>
@@ -11485,5 +11645,24 @@ AQAAAAA</bytes>
<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>NSActionTemplate</string>
+ <string>NSMenuCheckmark</string>
+ <string>NSMenuMixedState</string>
+ <string>NSSwitch</string>
+ <string>button_add</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{10, 10}</string>
+ <string>{9, 8}</string>
+ <string>{7, 2}</string>
+ <string>{15, 15}</string>
+ <string>{32, 23}</string>
+ </object>
+ </object>
</data>
</archive>
diff --git a/Resources/PreferenceDefaults.plist b/Resources/PreferenceDefaults.plist
index 56b43134..e501fae8 100644
--- a/Resources/PreferenceDefaults.plist
+++ b/Resources/PreferenceDefaults.plist
@@ -2,8 +2,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>DefaultEncoding</key>
- <string>Autodetect</string>
+ <key>DefaultEncodingTag</key>
+ <real>0</real>
<key>DefaultViewMode</key>
<integer>0</integer>
<key>LastViewMode</key>
diff --git a/Source/SPConstants.h b/Source/SPConstants.h
index 99d16583..0eafec7a 100644
--- a/Source/SPConstants.h
+++ b/Source/SPConstants.h
@@ -151,6 +151,30 @@ typedef enum
SPMainMenuHelp = 7
} SPMainMenuTags;
+// Encoding constants
+typedef enum
+{
+ SPEncodingAutodetect = 0,
+ SPEncodingUCS2 = 10,
+ SPEncodingUTF8 = 20,
+ SPEncodingUTF8viaLatin1 = 30,
+ SPEncodingASCII = 40,
+ SPEncodingLatin1 = 50,
+ SPEncodingMacRoman = 60,
+ SPEncodingCP1250Latin2 = 70,
+ SPEncodingISOLatin2 = 80,
+ SPEncodingCP1256Arabic = 90,
+ SPEncodingGreek = 100,
+ SPEncodingHebrew = 110,
+ SPEncodingLatin5Turkish = 120,
+ SPEncodingCP1257WinBaltic = 130,
+ SPEncodingCP1251WinCyrillic = 140,
+ SPEncodingBig5Chinese = 150,
+ SPEncodingShiftJISJapanese = 160,
+ SPEncodingEUCJPJapanese = 170,
+ SPEncodingEUCKRKorean = 180
+} SPEncodingTypes;
+
// Long running notification time for Growl messages
extern const CGFloat SPLongRunningNotificationTime;
diff --git a/Source/SPConstants.m b/Source/SPConstants.m
index 4ce1a4c5..93553d78 100644
--- a/Source/SPConstants.m
+++ b/Source/SPConstants.m
@@ -59,7 +59,7 @@ NSString *SPLastFavoriteIndex = @"LastFavoriteIndex";
NSString *SPAutoConnectToDefault = @"AutoConnectToDefault";
NSString *SPDefaultViewMode = @"DefaultViewMode";
NSString *SPLastViewMode = @"LastViewMode";
-NSString *SPDefaultEncoding = @"DefaultEncoding";
+NSString *SPDefaultEncoding = @"DefaultEncodingTag";
NSString *SPUseMonospacedFonts = @"UseMonospacedFonts";
NSString *SPDisplayTableViewVerticalGridlines = @"DisplayTableViewVerticalGridlines";
NSString *SPCustomQueryMaxHistoryItems = @"CustomQueryMaxHistoryItems";
diff --git a/Source/SPDatabaseData.m b/Source/SPDatabaseData.m
index becd1d6e..27b542c4 100644
--- a/Source/SPDatabaseData.m
+++ b/Source/SPDatabaseData.m
@@ -29,6 +29,7 @@
@interface SPDatabaseData (PrivateAPI)
- (NSMutableArray *)_getDatabaseDataForQuery:(NSString *)query;
+NSInteger _sortMySQL4CharsetEntry(NSDictionary *itemOne, NSDictionary *itemTwo, void *context);
@end
@@ -392,8 +393,21 @@ const SPDatabaseCharSets charsets[] =
// Try to retrieve the available character set encodings from the database
// Check the information_schema.character_sets table is accessible
- if (serverMajorVersion >= 5)
- [characterSetEncodings addObjectsFromArray:[self _getDatabaseDataForQuery:@"SELECT * FROM `information_schema`.`character_sets` ORDER BY `character_set_name` ASC"]];
+ if (serverMajorVersion >= 5) {
+ [characterSetEncodings addObjectsFromArray:[self _getDatabaseDataForQuery:@"SELECT * FROM `information_schema`.`character_sets` ORDER BY `character_set_name` ASC"]];
+ } else if (serverMajorVersion == 4 && serverMinorVersion >= 1) {
+ NSArray *supportedEncodings = [self _getDatabaseDataForQuery:@"SHOW CHARACTER SET"];
+ supportedEncodings = [supportedEncodings sortedArrayUsingFunction:_sortMySQL4CharsetEntry context:nil];
+ for (NSDictionary *anEncoding in supportedEncodings) {
+ NSDictionary *convertedEncoding = [NSDictionary dictionaryWithObjectsAndKeys:
+ [anEncoding objectForKey:@"Charset"], @"CHARACTER_SET_NAME",
+ [anEncoding objectForKey:@"Description"], @"DESCRIPTION",
+ [anEncoding objectForKey:@"Default collation"], @"DEFAULT_COLLATE_NAME",
+ [anEncoding objectForKey:@"Maxlen"], @"MAXLEN",
+ nil];
+ [characterSetEncodings addObject:convertedEncoding];
+ }
+ }
// If that failed, get the list of character set encodings from the hard-coded list
if (![characterSetEncodings count]) {
@@ -453,4 +467,12 @@ const SPDatabaseCharSets charsets[] =
return array;
}
+/**
+ * Sorts a 4.1-style SHOW CHARACTER SET result by the Charset key.
+ */
+NSInteger _sortMySQL4CharsetEntry(NSDictionary *itemOne, NSDictionary *itemTwo, void *context)
+{
+ return [[itemOne objectForKey:@"Charset"] compare:[itemTwo objectForKey:@"Charset"]];
+}
+
@end
diff --git a/Source/SPDatabaseDocument.h b/Source/SPDatabaseDocument.h
index 315b231c..3ca3ad6f 100644
--- a/Source/SPDatabaseDocument.h
+++ b/Source/SPDatabaseDocument.h
@@ -239,9 +239,9 @@
- (BOOL)connectionEncodingViaLatin1:(id)connection;
- (IBAction)chooseEncoding:(id)sender;
- (BOOL)supportsEncoding;
-- (void)updateEncodingMenuWithSelectedEncoding:(NSString *)encoding;
-- (NSString *)encodingNameFromMySQLEncoding:(NSString *)mysqlEncoding;
-- (NSString *)mysqlEncodingFromDisplayEncoding:(NSString *)encodingName;
+- (void)updateEncodingMenuWithSelectedEncoding:(NSNumber *)encodingTag;
+- (NSNumber *)encodingTagFromMySQLEncoding:(NSString *)mysqlEncoding;
+- (NSString *)mysqlEncodingFromEncodingTag:(NSNumber *)encodingTag;
// Table methods
- (IBAction)showCreateTableSyntax:(id)sender;
diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m
index e06065af..c5381114 100644
--- a/Source/SPDatabaseDocument.m
+++ b/Source/SPDatabaseDocument.m
@@ -636,11 +636,11 @@
if ([self isUntitled]) [[parentWindow standardWindowButton:NSWindowDocumentIconButton] setImage:nil];
// Set the connection encoding
- NSString *encodingName = [prefs objectForKey:SPDefaultEncoding];
- if ( [encodingName isEqualToString:@"Autodetect"] ) {
+ NSNumber *encodingType = [prefs objectForKey:SPDefaultEncoding];
+ if ( [encodingType intValue] == SPEncodingAutodetect ) {
[self setConnectionEncoding:[self databaseEncoding] reloadingViews:NO];
} else {
- [self setConnectionEncoding:[self mysqlEncodingFromDisplayEncoding:encodingName] reloadingViews:NO];
+ [self setConnectionEncoding:[self mysqlEncodingFromEncodingTag:encodingType] reloadingViews:NO];
}
// Get the mysql version
@@ -888,6 +888,36 @@
if (![tablesListInstance selectionShouldChangeInTableView:nil]) return;
[databaseNameField setStringValue:@""];
+
+ // Populate the database encoding popup button with a default menu item
+ [databaseEncodingButton removeAllItems];
+ [databaseEncodingButton addItemWithTitle:@"Default"];
+
+ // Retrieve the server-supported encodings and add them to the menu
+ NSArray *encodings = [databaseDataInstance getDatabaseCharacterSetEncodings];
+ NSString *utf8MenuItemTitle = nil;
+ if ([encodings count] > 0
+ && ([mySQLConnection serverMajorVersion] > 4
+ || ([mySQLConnection serverMajorVersion] == 4 && [mySQLConnection serverMinorVersion] >= 1)))
+ {
+ [[databaseEncodingButton menu] addItem:[NSMenuItem separatorItem]];
+ for (NSDictionary *encoding in encodings) {
+ NSString *menuItemTitle = (![encoding objectForKey:@"DESCRIPTION"]) ? [encoding objectForKey:@"CHARACTER_SET_NAME"] : [NSString stringWithFormat:@"%@ (%@)", [encoding objectForKey:@"DESCRIPTION"], [encoding objectForKey:@"CHARACTER_SET_NAME"]];
+ [databaseEncodingButton addItemWithTitle:menuItemTitle];
+
+ // If the UTF8 entry has been encountered, store the title
+ if ([[encoding objectForKey:@"CHARACTER_SET_NAME"] isEqualToString:@"utf8"]) {
+ utf8MenuItemTitle = [NSString stringWithString:menuItemTitle];
+ }
+ }
+
+ // If a UTF8 entry was found, promote it to the top of the list
+ if (utf8MenuItemTitle) {
+ [[databaseEncodingButton menu] insertItem:[NSMenuItem separatorItem] atIndex:2];
+ [databaseEncodingButton insertItemWithTitle:utf8MenuItemTitle atIndex:2];
+ }
+ }
+
[NSApp beginSheet:databaseSheet
modalForWindow:parentWindow
@@ -1495,9 +1525,9 @@
// update the selected menu item
if (_encodingViaLatin1) {
- [self updateEncodingMenuWithSelectedEncoding:[self encodingNameFromMySQLEncoding:[NSString stringWithFormat:@"%@-", mysqlEncoding]]];
+ [self updateEncodingMenuWithSelectedEncoding:[self encodingTagFromMySQLEncoding:[NSString stringWithFormat:@"%@-", mysqlEncoding]]];
} else {
- [self updateEncodingMenuWithSelectedEncoding:[self encodingNameFromMySQLEncoding:mysqlEncoding]];
+ [self updateEncodingMenuWithSelectedEncoding:[self encodingTagFromMySQLEncoding:mysqlEncoding]];
}
// Reload stuff as appropriate
@@ -1531,80 +1561,80 @@
*
* @param NSString *encoding - the title of the menu item which will be selected
*/
-- (void)updateEncodingMenuWithSelectedEncoding:(NSString *)encoding
+- (void)updateEncodingMenuWithSelectedEncoding:(NSNumber *)encodingTag
{
- NSEnumerator *dbEncodingMenuEn = [[selectEncodingMenu itemArray] objectEnumerator];
- id menuItem;
+ NSInteger itemToSelect = [encodingTag integerValue];
NSInteger correctStateForMenuItem;
- while (menuItem = [dbEncodingMenuEn nextObject]) {
- correctStateForMenuItem = [[menuItem title] isEqualToString:encoding] ? NSOnState : NSOffState;
- if ([menuItem state] == correctStateForMenuItem) // don't re-apply state incase it causes performance issues
+ for (NSMenuItem *aMenuItem in [selectEncodingMenu itemArray]) {
+ correctStateForMenuItem = ([aMenuItem tag] == itemToSelect) ? NSOnState : NSOffState;
+
+ if ([aMenuItem state] == correctStateForMenuItem) // don't re-apply state incase it causes performance issues
continue;
- [menuItem setState:correctStateForMenuItem];
+ [aMenuItem setState:correctStateForMenuItem];
}
}
/**
* Returns the display name for a mysql encoding
*/
-- (NSString *)encodingNameFromMySQLEncoding:(NSString *)mysqlEncoding
+- (NSNumber *)encodingTagFromMySQLEncoding:(NSString *)mysqlEncoding
{
NSDictionary *translationMap = [NSDictionary dictionaryWithObjectsAndKeys:
- @"UCS-2 Unicode (ucs2)", @"ucs2",
- @"UTF-8 Unicode (utf8)", @"utf8",
- @"UTF-8 Unicode via Latin 1", @"utf8-",
- @"US ASCII (ascii)", @"ascii",
- @"ISO Latin 1 (latin1)", @"latin1",
- @"Mac Roman (macroman)", @"macroman",
- @"Windows Latin 2 (cp1250)", @"cp1250",
- @"ISO Latin 2 (latin2)", @"latin2",
- @"Windows Arabic (cp1256)", @"cp1256",
- @"ISO Greek (greek)", @"greek",
- @"ISO Hebrew (hebrew)", @"hebrew",
- @"ISO Turkish (latin5)", @"latin5",
- @"Windows Baltic (cp1257)", @"cp1257",
- @"Windows Cyrillic (cp1251)", @"cp1251",
- @"Big5 Traditional Chinese (big5)", @"big5",
- @"Shift-JIS Japanese (sjis)", @"sjis",
- @"EUC-JP Japanese (ujis)", @"ujis",
- @"EUC-KR Korean (euckr)", @"euckr",
+ [NSNumber numberWithInt:SPEncodingUCS2], @"ucs2",
+ [NSNumber numberWithInt:SPEncodingUTF8], @"utf8",
+ [NSNumber numberWithInt:SPEncodingUTF8viaLatin1], @"utf8-",
+ [NSNumber numberWithInt:SPEncodingASCII], @"ascii",
+ [NSNumber numberWithInt:SPEncodingLatin1], @"latin1",
+ [NSNumber numberWithInt:SPEncodingMacRoman], @"macroman",
+ [NSNumber numberWithInt:SPEncodingCP1250Latin2], @"cp1250",
+ [NSNumber numberWithInt:SPEncodingISOLatin2], @"latin2",
+ [NSNumber numberWithInt:SPEncodingCP1256Arabic], @"cp1256",
+ [NSNumber numberWithInt:SPEncodingGreek], @"greek",
+ [NSNumber numberWithInt:SPEncodingHebrew], @"hebrew",
+ [NSNumber numberWithInt:SPEncodingLatin5Turkish], @"latin5",
+ [NSNumber numberWithInt:SPEncodingCP1257WinBaltic], @"cp1257",
+ [NSNumber numberWithInt:SPEncodingCP1251WinCyrillic], @"cp1251",
+ [NSNumber numberWithInt:SPEncodingBig5Chinese], @"big5",
+ [NSNumber numberWithInt:SPEncodingShiftJISJapanese], @"sjis",
+ [NSNumber numberWithInt:SPEncodingEUCJPJapanese], @"ujis",
+ [NSNumber numberWithInt:SPEncodingEUCKRKorean], @"euckr",
nil];
- NSString *encodingName = [translationMap valueForKey:mysqlEncoding];
+ NSNumber *encodingTag = [translationMap valueForKey:mysqlEncoding];
- if (!encodingName)
- return [NSString stringWithFormat:@"Unknown Encoding (%@)", mysqlEncoding, nil];
+ if (!encodingTag)
+ return [NSNumber numberWithInt:SPEncodingAutodetect];
- return encodingName;
+ return encodingTag;
}
/**
* Returns the mysql encoding for an encoding string that is displayed to the user
*/
-- (NSString *)mysqlEncodingFromDisplayEncoding:(NSString *)encodingName
+- (NSString *)mysqlEncodingFromEncodingTag:(NSNumber *)encodingTag
{
NSDictionary *translationMap = [NSDictionary dictionaryWithObjectsAndKeys:
- @"ucs2", @"UCS-2 Unicode (ucs2)",
- @"utf8", @"UTF-8 Unicode (utf8)",
- @"utf8-", @"UTF-8 Unicode via Latin 1",
- @"ascii", @"US ASCII (ascii)",
- @"latin1", @"ISO Latin 1 (latin1)",
- @"macroman", @"Mac Roman (macroman)",
- @"cp1250", @"Windows Latin 2 (cp1250)",
- @"latin2", @"ISO Latin 2 (latin2)",
- @"cp1256", @"Windows Arabic (cp1256)",
- @"greek", @"ISO Greek (greek)",
- @"hebrew", @"ISO Hebrew (hebrew)",
- @"latin5", @"ISO Turkish (latin5)",
- @"cp1257", @"Windows Baltic (cp1257)",
- @"cp1251", @"Windows Cyrillic (cp1251)",
- @"big5", @"Big5 Traditional Chinese (big5)",
- @"sjis", @"Shift-JIS Japanese (sjis)",
- @"ujis", @"EUC-JP Japanese (ujis)",
- @"euckr", @"EUC-KR Korean (euckr)",
+ @"ucs2", [NSString stringWithFormat:@"%i", SPEncodingUCS2],
+ @"utf8", [NSString stringWithFormat:@"%i", SPEncodingUTF8],
+ @"utf8-", [NSString stringWithFormat:@"%i", SPEncodingUTF8viaLatin1],
+ @"ascii", [NSString stringWithFormat:@"%i", SPEncodingASCII],
+ @"latin1", [NSString stringWithFormat:@"%i", SPEncodingLatin1],
+ @"macroman", [NSString stringWithFormat:@"%i", SPEncodingMacRoman],
+ @"cp1250", [NSString stringWithFormat:@"%i", SPEncodingCP1250Latin2],
+ @"latin2", [NSString stringWithFormat:@"%i", SPEncodingISOLatin2],
+ @"cp1256", [NSString stringWithFormat:@"%i", SPEncodingCP1256Arabic],
+ @"greek", [NSString stringWithFormat:@"%i", SPEncodingGreek],
+ @"hebrew", [NSString stringWithFormat:@"%i", SPEncodingHebrew],
+ @"latin5", [NSString stringWithFormat:@"%i", SPEncodingLatin5Turkish],
+ @"cp1257", [NSString stringWithFormat:@"%i", SPEncodingCP1257WinBaltic],
+ @"cp1251", [NSString stringWithFormat:@"%i", SPEncodingCP1251WinCyrillic],
+ @"big5", [NSString stringWithFormat:@"%i", SPEncodingBig5Chinese],
+ @"sjis", [NSString stringWithFormat:@"%i", SPEncodingShiftJISJapanese],
+ @"ujis", [NSString stringWithFormat:@"%i", SPEncodingEUCJPJapanese],
+ @"euckr", [NSString stringWithFormat:@"%i", SPEncodingEUCKRKorean],
nil];
- NSString *mysqlEncoding = [translationMap valueForKey:encodingName];
+ NSString *mysqlEncoding = [translationMap valueForKey:[NSString stringWithFormat:@"%i", [encodingTag intValue]]];
if (!mysqlEncoding)
return @"utf8";
@@ -1646,7 +1676,7 @@
*/
- (IBAction)chooseEncoding:(id)sender
{
- [self setConnectionEncoding:[self mysqlEncodingFromDisplayEncoding:[(NSMenuItem *)sender title]] reloadingViews:YES];
+ [self setConnectionEncoding:[self mysqlEncodingFromEncodingTag:[NSNumber numberWithInt:[(NSMenuItem *)sender tag]]] reloadingViews:YES];
}
/**
@@ -4366,7 +4396,7 @@
// If there is an encoding selected other than the default we must specify it in CREATE DATABASE statement
if ([databaseEncodingButton indexOfSelectedItem] > 0) {
- createStatement = [NSString stringWithFormat:@"%@ DEFAULT CHARACTER SET %@", createStatement, [[self mysqlEncodingFromDisplayEncoding:[databaseEncodingButton title]] backtickQuotedString]];
+ createStatement = [NSString stringWithFormat:@"%@ DEFAULT CHARACTER SET %@", createStatement, [[self mysqlEncodingFromEncodingTag:[databaseEncodingButton tag]] backtickQuotedString]];
}
// Create the database
diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m
index 2a621325..bbf5c434 100644
--- a/Source/SPPreferenceController.m
+++ b/Source/SPPreferenceController.m
@@ -309,6 +309,34 @@
[prefs removeObjectForKey:@"SUSendProfileInfo"];
}
+ // For versions prior to 2325 (<0.9.9), convert the old encoding pref string into the new localizable constant
+ if (recordedVersionNumber < 2325 && [prefs objectForKey:@"DefaultEncoding"] && [[prefs objectForKey:@"DefaultEncoding"] isKindOfClass:[NSString class]]) {
+ NSDictionary *encodingMap = [NSDictionary dictionaryWithObjectsAndKeys:
+ [NSNumber numberWithInt:SPEncodingAutodetect], @"Autodetect",
+ [NSNumber numberWithInt:SPEncodingUCS2], @"UCS-2 Unicode (ucs2)",
+ [NSNumber numberWithInt:SPEncodingUTF8], @"UTF-8 Unicode (utf8)",
+ [NSNumber numberWithInt:SPEncodingUTF8viaLatin1], @"UTF-8 Unicode via Latin 1",
+ [NSNumber numberWithInt:SPEncodingASCII], @"US ASCII (ascii)",
+ [NSNumber numberWithInt:SPEncodingLatin1], @"ISO Latin 1 (latin1)",
+ [NSNumber numberWithInt:SPEncodingMacRoman], @"Mac Roman (macroman)",
+ [NSNumber numberWithInt:SPEncodingCP1250Latin2], @"Windows Latin 2 (cp1250)",
+ [NSNumber numberWithInt:SPEncodingISOLatin2], @"ISO Latin 2 (latin2)",
+ [NSNumber numberWithInt:SPEncodingCP1256Arabic], @"Windows Arabic (cp1256)",
+ [NSNumber numberWithInt:SPEncodingGreek], @"ISO Greek (greek)",
+ [NSNumber numberWithInt:SPEncodingHebrew], @"ISO Hebrew (hebrew)",
+ [NSNumber numberWithInt:SPEncodingLatin5Turkish], @"ISO Turkish (latin5)",
+ [NSNumber numberWithInt:SPEncodingCP1257WinBaltic], @"Windows Baltic (cp1257)",
+ [NSNumber numberWithInt:SPEncodingCP1251WinCyrillic], @"Windows Cyrillic (cp1251)",
+ [NSNumber numberWithInt:SPEncodingBig5Chinese], @"Big5 Traditional Chinese (big5)",
+ [NSNumber numberWithInt:SPEncodingShiftJISJapanese], @"Shift-JIS Japanese (sjis)",
+ [NSNumber numberWithInt:SPEncodingEUCJPJapanese], @"EUC-JP Japanese (ujis)",
+ [NSNumber numberWithInt:SPEncodingEUCKRKorean], @"EUC-KR Korean (euckr)",
+ nil];
+ NSNumber *newMappedValue = [encodingMap valueForKey:[prefs objectForKey:@"DefaultEncoding"]];
+ if (newMappedValue == nil) newMappedValue = [NSNumber numberWithInt:0];
+ [prefs setObject:newMappedValue forKey:@"DefaultEncodingTag"];
+ }
+
// Update the prefs revision
[prefs setObject:[NSNumber numberWithInteger:currentVersionNumber] forKey:SPLastUsedVersion];
}
@@ -989,6 +1017,19 @@
[preferencesWindow endEditingFor:[preferencesWindow firstResponder]];
}
+// -------------------------------------------------------------------------------
+// windowWillResize:toSize:
+// Trap window resize notifications and use them to disable resizing on most tabs
+// - except for the favourites tab.
+// -------------------------------------------------------------------------------
+- (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)frameSize
+{
+ if ([sender showsResizeIndicator])
+ return frameSize;
+ else
+ return [sender frame].size;
+}
+
#pragma mark -
#pragma mark Other
diff --git a/Source/SPTablesList.m b/Source/SPTablesList.m
index 498a5166..509e3b83 100644
--- a/Source/SPTablesList.m
+++ b/Source/SPTablesList.m
@@ -287,6 +287,35 @@
[tableTypeButton addItemWithTitle:[engine objectForKey:@"Engine"]];
}
+ // Populate the table encoding popup button with a default menu item
+ [tableEncodingButton removeAllItems];
+ [tableEncodingButton addItemWithTitle:@"Default"];
+
+ // Retrieve the server-supported encodings and add them to the menu
+ NSArray *encodings = [databaseDataInstance getDatabaseCharacterSetEncodings];
+ NSString *utf8MenuItemTitle = nil;
+ if ([encodings count] > 0
+ && ([mySQLConnection serverMajorVersion] > 4
+ || ([mySQLConnection serverMajorVersion] == 4 && [mySQLConnection serverMinorVersion] >= 1)))
+ {
+ [[tableEncodingButton menu] addItem:[NSMenuItem separatorItem]];
+ for (NSDictionary *encoding in encodings) {
+ NSString *menuItemTitle = (![encoding objectForKey:@"DESCRIPTION"]) ? [encoding objectForKey:@"CHARACTER_SET_NAME"] : [NSString stringWithFormat:@"%@ (%@)", [encoding objectForKey:@"DESCRIPTION"], [encoding objectForKey:@"CHARACTER_SET_NAME"]];
+ [tableEncodingButton addItemWithTitle:menuItemTitle];
+
+ // If the UTF8 entry has been encountered, store the menu title
+ if ([[encoding objectForKey:@"CHARACTER_SET_NAME"] isEqualToString:@"utf8"]) {
+ utf8MenuItemTitle = [NSString stringWithString:menuItemTitle];
+ }
+ }
+
+ // If a UTF8 entry was found, promote it to the top of the list
+ if (utf8MenuItemTitle) {
+ [[tableEncodingButton menu] insertItem:[NSMenuItem separatorItem] atIndex:2];
+ [tableEncodingButton insertItemWithTitle:utf8MenuItemTitle atIndex:2];
+ }
+ }
+
[NSApp beginSheet:tableSheet
modalForWindow:[tableDocumentInstance parentWindow]
modalDelegate:self
@@ -675,7 +704,7 @@
// If encoding is set to Autodetect, update the connection character set encoding
// based on the newly selected table's encoding - but only if it differs from the current encoding.
- if ([[[NSUserDefaults standardUserDefaults] objectForKey:SPDefaultEncoding] isEqualToString:@"Autodetect"]) {
+ if ([[[NSUserDefaults standardUserDefaults] objectForKey:SPDefaultEncoding] intValue] == SPEncodingAutodetect) {
if (tableEncoding != nil && ![tableEncoding isEqualToString:[tableDocumentInstance connectionEncoding]]) {
[tableDocumentInstance setConnectionEncoding:tableEncoding reloadingViews:NO];
[tableDataInstance resetAllData];
@@ -2033,7 +2062,7 @@
// If there is an encoding selected other than the default we must specify it in CREATE TABLE statement
if ([tableEncodingButton indexOfSelectedItem] > 0) {
- charSetStatement = [NSString stringWithFormat:@"DEFAULT CHARACTER SET %@", [[tableDocumentInstance mysqlEncodingFromDisplayEncoding:[tableEncodingButton title]] backtickQuotedString]];
+ charSetStatement = [NSString stringWithFormat:@"DEFAULT CHARACTER SET %@", [[tableDocumentInstance mysqlEncodingFromEncodingTag:[tableEncodingButton tag]] backtickQuotedString]];
}
// If there is a type selected other than the default we must specify it in CREATE TABLE statement