diff options
28 files changed, 4846 insertions, 3731 deletions
diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m index 03cade24..af5e6123 100644 --- a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m +++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m @@ -2395,7 +2395,8 @@ void pingThreadCleanup(MCPConnectionPingDetails *pingDetails) // The cache is available. If the `mysql` or `information_schema` databases are being queried, // never requery as their structure will never change. - if ([currentDatabase isEqualToString:@"mysql"] || [currentDatabase isEqualToString:@"information_schema"]) { + // 5.5.3+ also has performance_schema meta database + if ([currentDatabase isEqualToString:@"mysql"] || [currentDatabase isEqualToString:@"information_schema"] || [currentDatabase isEqualToString:@"performance_schema"]) { shouldQueryStructure = NO; // Otherwise, if the forceUpdate flag wasn't supplied or evaluates to false, also don't update. diff --git a/Interfaces/English.lproj/BundleEditor.xib b/Interfaces/English.lproj/BundleEditor.xib index 25be786e..0997b4f8 100644 --- a/Interfaces/English.lproj/BundleEditor.xib +++ b/Interfaces/English.lproj/BundleEditor.xib @@ -117,7 +117,7 @@ <int key="NSColorSpace">3</int> <bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes> </object> - <object class="NSColor" key="NSTextColor"> + <object class="NSColor" key="NSTextColor" id="1020754459"> <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> <string key="NSColorName">headerTextColor</string> @@ -166,7 +166,7 @@ <bytes key="NSRGB">MC44MzkyMTU2OTU5IDAuODY2NjY2Njc0NiAwLjg5ODAzOTIyMTgAA</bytes> </object> </object> - <object class="NSColor" key="NSGridColor"> + <object class="NSColor" key="NSGridColor" id="893936909"> <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> <string key="NSColorName">gridColor</string> @@ -371,6 +371,16 @@ <string key="NSAction">_popUpItemAction:</string> <reference key="NSTarget" ref="998795499"/> </object> + <object class="NSMenuItem" id="637895342"> + <reference key="NSMenu" ref="973574710"/> + <string key="NSTitle">Undelete Default Bundles…</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="545549031"/> + <reference key="NSMixedImage" ref="20147930"/> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="998795499"/> + </object> <object class="NSMenuItem" id="642604110"> <reference key="NSMenu" ref="973574710"/> <string key="NSTitle">Reload Bundles without Saving</string> @@ -1491,6 +1501,219 @@ </object> </object> </object> + <object class="NSWindowTemplate" id="602640146"> + <int key="NSWindowStyleMask">27</int> + <int key="NSWindowBacking">2</int> + <string key="NSWindowRect">{{140, 260}, {341, 198}}</string> + <int key="NSWTFlags">611844096</int> + <string key="NSWindowTitle">Window</string> + <string key="NSWindowClass">NSPanel</string> + <nil key="NSViewClass"/> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSWindowContentMinSize">{341, 198}</string> + <object class="NSView" key="NSWindowView" id="856429814"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSScrollView" id="364471408"> + <reference key="NSNextResponder" ref="856429814"/> + <int key="NSvFlags">274</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSClipView" id="345853705"> + <reference key="NSNextResponder" ref="364471408"/> + <int key="NSvFlags">2304</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTableView" id="703923380"> + <reference key="NSNextResponder" ref="345853705"/> + <int key="NSvFlags">256</int> + <string key="NSFrameSize">{341, 121}</string> + <reference key="NSSuperview" ref="345853705"/> + <reference key="NSWindow"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTableHeaderView" key="NSHeaderView" id="448210001"> + <reference key="NSNextResponder" ref="1010462793"/> + <int key="NSvFlags">256</int> + <string key="NSFrameSize">{341, 17}</string> + <reference key="NSSuperview" ref="1010462793"/> + <reference key="NSWindow"/> + <reference key="NSTableView" ref="703923380"/> + </object> + <object class="_NSCornerView" key="NSCornerView" id="32874251"> + <reference key="NSNextResponder" ref="364471408"/> + <int key="NSvFlags">-2147483392</int> + <string key="NSFrame">{{224, 0}, {16, 17}}</string> + <reference key="NSSuperview" ref="364471408"/> + <reference key="NSWindow"/> + </object> + <object class="NSMutableArray" key="NSTableColumns"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTableColumn" id="405769812"> + <double key="NSWidth">338</double> + <double key="NSMinWidth">40</double> + <double key="NSMaxWidth">1000</double> + <object class="NSTableHeaderCell" key="NSHeaderCell"> + <int key="NSCellFlags">75628096</int> + <int key="NSCellFlags2">2048</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <object class="NSColor" key="NSBackgroundColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes> + </object> + <reference key="NSTextColor" ref="1020754459"/> + </object> + <object class="NSTextFieldCell" key="NSDataCell" id="37538636"> + <int key="NSCellFlags">337772096</int> + <int key="NSCellFlags2">2048</int> + <string key="NSContents">Text Cell</string> + <reference key="NSSupport" ref="604392898"/> + <reference key="NSControlView" ref="703923380"/> + <reference key="NSBackgroundColor" ref="255000212"/> + <reference key="NSTextColor" ref="576381864"/> + </object> + <int key="NSResizingMask">3</int> + <bool key="NSIsResizeable">YES</bool> + <bool key="NSIsEditable">YES</bool> + <reference key="NSTableView" ref="703923380"/> + </object> + </object> + <double key="NSIntercellSpacingWidth">3</double> + <double key="NSIntercellSpacingHeight">2</double> + <object class="NSColor" key="NSBackgroundColor"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">_sourceListBackgroundColor</string> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MC44MzkyMTU2OTU5IDAuODY2NjY2Njc0NiAwLjg5ODAzOTIyMTgAA</bytes> + </object> + </object> + <reference key="NSGridColor" ref="893936909"/> + <double key="NSRowHeight">17</double> + <int key="NSTvFlags">1111490560</int> + <reference key="NSDelegate"/> + <reference key="NSDataSource"/> + <int key="NSColumnAutoresizingStyle">4</int> + <int key="NSDraggingSourceMaskForLocal">15</int> + <int key="NSDraggingSourceMaskForNonLocal">0</int> + <bool key="NSAllowsTypeSelect">YES</bool> + <int key="NSTableViewSelectionHighlightStyle">1</int> + <int key="NSTableViewDraggingDestinationStyle">1</int> + </object> + </object> + <string key="NSFrame">{{1, 17}, {341, 121}}</string> + <reference key="NSSuperview" ref="364471408"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="703923380"/> + <reference key="NSDocView" ref="703923380"/> + <reference key="NSBGColor" ref="255000212"/> + <int key="NScvFlags">4</int> + </object> + <object class="NSScroller" id="1021684639"> + <reference key="NSNextResponder" ref="364471408"/> + <int key="NSvFlags">-2147483392</int> + <string key="NSFrame">{{224, 17}, {15, 102}}</string> + <reference key="NSSuperview" ref="364471408"/> + <reference key="NSWindow"/> + <reference key="NSTarget" ref="364471408"/> + <string key="NSAction">_doScroller:</string> + <double key="NSPercent">0.99180328845977783</double> + </object> + <object class="NSScroller" id="790140081"> + <reference key="NSNextResponder" ref="364471408"/> + <int key="NSvFlags">-2147483392</int> + <string key="NSFrame">{{1, 119}, {223, 15}}</string> + <reference key="NSSuperview" ref="364471408"/> + <reference key="NSWindow"/> + <int key="NSsFlags">1</int> + <reference key="NSTarget" ref="364471408"/> + <string key="NSAction">_doScroller:</string> + <double key="NSPercent">0.99707603454589844</double> + </object> + <object class="NSClipView" id="1010462793"> + <reference key="NSNextResponder" ref="364471408"/> + <int key="NSvFlags">2304</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="448210001"/> + </object> + <string key="NSFrame">{{1, 0}, {341, 17}}</string> + <reference key="NSSuperview" ref="364471408"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="448210001"/> + <reference key="NSDocView" ref="448210001"/> + <reference key="NSBGColor" ref="255000212"/> + <int key="NScvFlags">4</int> + </object> + <reference ref="32874251"/> + </object> + <string key="NSFrame">{{-1, 60}, {343, 139}}</string> + <reference key="NSSuperview" ref="856429814"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="345853705"/> + <int key="NSsFlags">562</int> + <reference key="NSVScroller" ref="1021684639"/> + <reference key="NSHScroller" ref="790140081"/> + <reference key="NSContentView" ref="345853705"/> + <reference key="NSHeaderClipView" ref="1010462793"/> + <reference key="NSCornerView" ref="32874251"/> + <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes> + </object> + <object class="NSButton" id="4858278"> + <reference key="NSNextResponder" ref="856429814"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{213, 12}, {114, 32}}</string> + <reference key="NSSuperview" ref="856429814"/> + <reference key="NSWindow"/> + <int key="NSTag">1</int> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="521920114"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">Undelete</string> + <reference key="NSSupport" ref="604392898"/> + <reference key="NSControlView" ref="4858278"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">129</int> + <string key="NSAlternateContents"/> + <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="887016115"> + <reference key="NSNextResponder" ref="856429814"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{99, 12}, {114, 32}}</string> + <reference key="NSSuperview" ref="856429814"/> + <reference key="NSWindow"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="517185919"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">Close</string> + <reference key="NSSupport" ref="604392898"/> + <reference key="NSControlView" ref="887016115"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">129</int> + <string key="NSAlternateContents"/> + <string type="base64-UTF8" key="NSKeyEquivalent">Gw</string> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + </object> + <string key="NSFrameSize">{341, 198}</string> + <reference key="NSSuperview"/> + <reference key="NSWindow"/> + </object> + <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string> + <string key="NSMinSize">{341, 214}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> + </object> <object class="NSTreeController" id="645644012"> <object class="NSMutableArray" key="NSDeclaredKeys"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -2281,6 +2504,78 @@ </object> <int key="connectionID">1098</int> </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">undeleteDefaultBundles:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="637895342"/> + </object> + <int key="connectionID">1100</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">undeleteTableView</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="703923380"/> + </object> + <int key="connectionID">1116</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">dataSource</string> + <reference key="source" ref="703923380"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">1119</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="703923380"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">1120</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">undeleteSheet</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="602640146"/> + </object> + <int key="connectionID">1123</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">closeUndeleteDefaultBundlesSheet:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="4858278"/> + </object> + <int key="connectionID">1124</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">closeUndeleteDefaultBundlesSheet:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="887016115"/> + </object> + <int key="connectionID">1125</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="602640146"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">1126</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">initialFirstResponder</string> + <reference key="source" ref="602640146"/> + <reference key="destination" ref="703923380"/> + </object> + <int key="connectionID">1127</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -2417,6 +2712,7 @@ <reference ref="18029675"/> <reference ref="454224452"/> <reference ref="642604110"/> + <reference ref="637895342"/> </object> <reference key="parent" ref="998795499"/> </object> @@ -3134,6 +3430,110 @@ <reference key="object" ref="979150328"/> <reference key="parent" ref="68459104"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">1099</int> + <reference key="object" ref="637895342"/> + <reference key="parent" ref="973574710"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1101</int> + <reference key="object" ref="602640146"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="856429814"/> + </object> + <reference key="parent" ref="0"/> + <string key="objectName">Undelete Default Bundles Sheet</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1102</int> + <reference key="object" ref="856429814"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="364471408"/> + <reference ref="4858278"/> + <reference ref="887016115"/> + </object> + <reference key="parent" ref="602640146"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1103</int> + <reference key="object" ref="364471408"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1021684639"/> + <reference ref="790140081"/> + <reference ref="703923380"/> + <reference ref="448210001"/> + </object> + <reference key="parent" ref="856429814"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1104</int> + <reference key="object" ref="1021684639"/> + <reference key="parent" ref="364471408"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1105</int> + <reference key="object" ref="790140081"/> + <reference key="parent" ref="364471408"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1106</int> + <reference key="object" ref="703923380"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="405769812"/> + </object> + <reference key="parent" ref="364471408"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1108</int> + <reference key="object" ref="405769812"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="37538636"/> + </object> + <reference key="parent" ref="703923380"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1111</int> + <reference key="object" ref="37538636"/> + <reference key="parent" ref="405769812"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1112</int> + <reference key="object" ref="4858278"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="521920114"/> + </object> + <reference key="parent" ref="856429814"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1113</int> + <reference key="object" ref="521920114"/> + <reference key="parent" ref="4858278"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1114</int> + <reference key="object" ref="887016115"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="517185919"/> + </object> + <reference key="parent" ref="856429814"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1115</int> + <reference key="object" ref="517185919"/> + <reference key="parent" ref="887016115"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1118</int> + <reference key="object" ref="448210001"/> + <reference key="parent" ref="364471408"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -3176,6 +3576,25 @@ <string>1092.IBPluginDependency</string> <string>1093.IBEditorWindowLastContentRect</string> <string>1093.IBPluginDependency</string> + <string>1099.IBPluginDependency</string> + <string>1101.IBEditorWindowLastContentRect</string> + <string>1101.IBPluginDependency</string> + <string>1101.IBWindowTemplateEditedContentRect</string> + <string>1101.NSWindowTemplate.visibleAtLaunch</string> + <string>1101.windowTemplate.hasMinSize</string> + <string>1101.windowTemplate.minSize</string> + <string>1102.IBPluginDependency</string> + <string>1103.IBPluginDependency</string> + <string>1104.IBPluginDependency</string> + <string>1105.IBPluginDependency</string> + <string>1106.IBPluginDependency</string> + <string>1108.IBPluginDependency</string> + <string>1111.IBPluginDependency</string> + <string>1112.IBAttributePlaceholdersKey</string> + <string>1112.IBPluginDependency</string> + <string>1113.IBPluginDependency</string> + <string>1114.IBPluginDependency</string> + <string>1115.IBPluginDependency</string> <string>521.IBEditorWindowLastContentRect</string> <string>521.IBPluginDependency</string> <string>521.IBWindowTemplateEditedContentRect</string> @@ -3358,9 +3777,35 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{430, 598}, {167, 4}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{172, 298}, {691, 444}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{172, 298}, {691, 444}}</string> + <string>{{175, 541}, {341, 198}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{175, 541}, {341, 198}}</string> + <boolean value="NO"/> + <boolean value="YES"/> + <string>{341, 198}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSMutableDictionary"> + <string key="NS.key.0">ToolTip</string> + <object class="IBToolTipAttribute" key="NS.object.0"> + <string key="name">ToolTip</string> + <reference key="object" ref="4858278"/> + <string key="toolTip">Undelete selected default Bundles (↩)</string> + </object> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{149, 231}, {691, 444}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{149, 231}, {691, 444}}</string> <boolean value="NO"/> <boolean value="YES"/> <string>{691, 444}</string> @@ -3433,7 +3878,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.brandonwalkin.BWToolkit</string> - <string>{{222, 223}, {243, 98}}</string> + <string>{{199, 139}, {243, 115}}</string> <string>com.brandonwalkin.BWToolkit</string> <string>com.brandonwalkin.BWToolkit</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3602,7 +4047,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">1098</int> + <int key="maxID">1127</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -3747,6 +4192,7 @@ <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>addCommandBundle:</string> + <string>closeUndeleteDefaultBundlesSheet:</string> <string>duplicateCommandBundle:</string> <string>inputFallbackPopupButtonChanged:</string> <string>inputPopupButtonChanged:</string> @@ -3761,6 +4207,7 @@ <string>scopeButtonChanged:</string> <string>showHelp:</string> <string>triggerButtonChanged:</string> + <string>undeleteDefaultBundles:</string> <string>withBlobButtonChanged:</string> </object> <object class="NSMutableArray" key="dict.values"> @@ -3781,6 +4228,8 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="actionInfosByName"> @@ -3788,6 +4237,7 @@ <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>addCommandBundle:</string> + <string>closeUndeleteDefaultBundlesSheet:</string> <string>duplicateCommandBundle:</string> <string>inputFallbackPopupButtonChanged:</string> <string>inputPopupButtonChanged:</string> @@ -3802,6 +4252,7 @@ <string>scopeButtonChanged:</string> <string>showHelp:</string> <string>triggerButtonChanged:</string> + <string>undeleteDefaultBundles:</string> <string>withBlobButtonChanged:</string> </object> <object class="NSMutableArray" key="dict.values"> @@ -3811,6 +4262,10 @@ <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> + <string key="name">closeUndeleteDefaultBundlesSheet:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> <string key="name">duplicateCommandBundle:</string> <string key="candidateClassName">id</string> </object> @@ -3867,6 +4322,10 @@ <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> + <string key="name">undeleteDefaultBundles:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> <string key="name">withBlobButtonChanged:</string> <string key="candidateClassName">id</string> </object> @@ -3908,6 +4367,8 @@ <string>showHideMetaButton</string> <string>tooltipTextField</string> <string>triggerPopupButton</string> + <string>undeleteSheet</string> + <string>undeleteTableView</string> <string>withBlobLabelField</string> <string>withBlobPopupButton</string> </object> @@ -3945,6 +4406,8 @@ <string>NSButton</string> <string>NSTextField</string> <string>NSPopUpButton</string> + <string>id</string> + <string>NSTableView</string> <string>NSTextField</string> <string>NSPopUpButton</string> </object> @@ -3985,6 +4448,8 @@ <string>showHideMetaButton</string> <string>tooltipTextField</string> <string>triggerPopupButton</string> + <string>undeleteSheet</string> + <string>undeleteTableView</string> <string>withBlobLabelField</string> <string>withBlobPopupButton</string> </object> @@ -4119,6 +4584,14 @@ <string key="candidateClassName">NSPopUpButton</string> </object> <object class="IBToOneOutletInfo"> + <string key="name">undeleteSheet</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">undeleteTableView</string> + <string key="candidateClassName">NSTableView</string> + </object> + <object class="IBToOneOutletInfo"> <string key="name">withBlobLabelField</string> <string key="candidateClassName">NSTextField</string> </object> diff --git a/Interfaces/English.lproj/ConnectionView.xib b/Interfaces/English.lproj/ConnectionView.xib index 500c5b45..63800035 100644 --- a/Interfaces/English.lproj/ConnectionView.xib +++ b/Interfaces/English.lproj/ConnectionView.xib @@ -21,8 +21,7 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="5468"/> - <integer value="5345"/> + <integer value="5782"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -44,23 +43,23 @@ <object class="NSCustomObject" id="292263310"> <string key="NSClassName">NSApplication</string> </object> - <object class="NSView" id="847934114"> + <object class="NSCustomView" id="733821228"> <reference key="NSNextResponder"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSSplitView" id="117951421"> - <reference key="NSNextResponder" ref="847934114"/> + <object class="BWSplitView" id="616749187"> + <reference key="NSNextResponder" ref="733821228"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSCustomView" id="720852944"> - <reference key="NSNextResponder" ref="117951421"/> - <int key="NSvFlags">272</int> + <object class="BWCustomView" id="551584428"> + <reference key="NSNextResponder" ref="616749187"/> + <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSScrollView" id="524598165"> - <reference key="NSNextResponder" ref="720852944"/> + <reference key="NSNextResponder" ref="551584428"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -110,7 +109,7 @@ </object> </object> <object class="NSTextFieldCell" key="NSDataCell" id="93569184"> - <int key="NSCellFlags">337772097</int> + <int key="NSCellFlags">69336641</int> <int key="NSCellFlags2">137216</int> <string key="NSContents">Text Cell</string> <reference key="NSSupport" ref="26"/> @@ -156,7 +155,7 @@ </object> </object> <double key="NSRowHeight">17</double> - <int key="NSTvFlags">507510784</int> + <int key="NSTvFlags">373293056</int> <reference key="NSDelegate"/> <reference key="NSDataSource"/> <int key="NSColumnAutoresizingStyle">5</int> @@ -198,7 +197,7 @@ </object> </object> <string key="NSFrame">{{0, 24}, {202, 450}}</string> - <reference key="NSSuperview" ref="720852944"/> + <reference key="NSSuperview" ref="551584428"/> <reference key="NSNextKeyView" ref="233523429"/> <int key="NSsFlags">560</int> <reference key="NSVScroller" ref="533108700"/> @@ -207,7 +206,7 @@ <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes> </object> <object class="BWAnchoredButtonBar" id="805249222"> - <reference key="NSNextResponder" ref="720852944"/> + <reference key="NSNextResponder" ref="551584428"/> <int key="NSvFlags">290</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -240,7 +239,7 @@ <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> <int key="NSState">1</int> - <object class="NSCustomResource" key="NSImage"> + <object class="NSCustomResource" key="NSImage" id="1057150516"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSActionTemplate</string> </object> @@ -261,7 +260,7 @@ <object class="NSMutableArray" key="NSMenuItems"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="751753648"/> - <object class="NSMenuItem" id="47300604"> + <object class="NSMenuItem" id="11275875"> <reference key="NSMenu" ref="949612237"/> <string key="NSTitle">Rename</string> <string key="NSKeyEquiv"/> @@ -271,9 +270,9 @@ <string key="NSAction">_popUpItemAction:</string> <reference key="NSTarget" ref="270183415"/> </object> - <object class="NSMenuItem" id="14440548"> + <object class="NSMenuItem" id="875696059"> <reference key="NSMenu" ref="949612237"/> - <string key="NSTitle">Make Default</string> + <string key="NSTitle">Remove</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="1022504326"/> @@ -281,7 +280,7 @@ <string key="NSAction">_popUpItemAction:</string> <reference key="NSTarget" ref="270183415"/> </object> - <object class="NSMenuItem" id="1021417946"> + <object class="NSMenuItem" id="839925568"> <reference key="NSMenu" ref="949612237"/> <bool key="NSIsDisabled">YES</bool> <bool key="NSIsSeparator">YES</bool> @@ -293,9 +292,9 @@ <string key="NSAction">_popUpItemAction:</string> <reference key="NSTarget" ref="270183415"/> </object> - <object class="NSMenuItem" id="988671905"> + <object class="NSMenuItem" id="864185279"> <reference key="NSMenu" ref="949612237"/> - <string key="NSTitle">Remove</string> + <string key="NSTitle">Duplicate</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="1022504326"/> @@ -303,9 +302,9 @@ <string key="NSAction">_popUpItemAction:</string> <reference key="NSTarget" ref="270183415"/> </object> - <object class="NSMenuItem" id="943591987"> + <object class="NSMenuItem" id="1062672584"> <reference key="NSMenu" ref="949612237"/> - <string key="NSTitle">Duplicate</string> + <string key="NSTitle">Make Default</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="1022504326"/> @@ -313,10 +312,11 @@ <string key="NSAction">_popUpItemAction:</string> <reference key="NSTarget" ref="270183415"/> </object> - <object class="NSMenuItem" id="176010547"> + <object class="NSMenuItem" id="785902570"> <reference key="NSMenu" ref="949612237"/> <bool key="NSIsDisabled">YES</bool> <bool key="NSIsSeparator">YES</bool> + <bool key="NSIsHidden">YES</bool> <string key="NSTitle"/> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> @@ -325,8 +325,9 @@ <string key="NSAction">_popUpItemAction:</string> <reference key="NSTarget" ref="270183415"/> </object> - <object class="NSMenuItem" id="296811585"> + <object class="NSMenuItem" id="885080859"> <reference key="NSMenu" ref="949612237"/> + <bool key="NSIsDisabled">YES</bool> <bool key="NSIsHidden">YES</bool> <string key="NSTitle">Import...</string> <string key="NSKeyEquiv"/> @@ -336,8 +337,9 @@ <string key="NSAction">_popUpItemAction:</string> <reference key="NSTarget" ref="270183415"/> </object> - <object class="NSMenuItem" id="541704663"> + <object class="NSMenuItem" id="509439698"> <reference key="NSMenu" ref="949612237"/> + <bool key="NSIsDisabled">YES</bool> <bool key="NSIsHidden">YES</bool> <string key="NSTitle">Export...</string> <string key="NSKeyEquiv"/> @@ -347,11 +349,10 @@ <string key="NSAction">_popUpItemAction:</string> <reference key="NSTarget" ref="270183415"/> </object> - <object class="NSMenuItem" id="130047523"> + <object class="NSMenuItem" id="444328485"> <reference key="NSMenu" ref="949612237"/> <bool key="NSIsDisabled">YES</bool> <bool key="NSIsSeparator">YES</bool> - <bool key="NSIsHidden">YES</bool> <string key="NSTitle"/> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> @@ -438,68 +439,66 @@ <int key="NSArrowPosition">2</int> </object> </object> - <object class="BWAnchoredPopUpButton" id="817268454"> + <object class="BWAnchoredPopUpButton" id="143274444"> <reference key="NSNextResponder" ref="805249222"/> <int key="NSvFlags">268</int> <string key="NSFrame">{{30, -1}, {32, 24}}</string> <reference key="NSSuperview" ref="805249222"/> <bool key="NSEnabled">YES</bool> - <object class="BWAnchoredPopUpButtonCell" key="NSCell" id="140036820"> + <object class="BWAnchoredPopUpButtonCell" key="NSCell" id="526253214"> <int key="NSCellFlags">-2076049856</int> <int key="NSCellFlags2">134350848</int> <reference key="NSSupport" ref="951888633"/> - <reference key="NSControlView" ref="817268454"/> - <int key="NSButtonFlags">-2036186881</int> + <reference key="NSControlView" ref="143274444"/> + <int key="NSButtonFlags">-2038284033</int> <int key="NSButtonFlags2">163</int> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> <int key="NSPeriodicDelay">400</int> <int key="NSPeriodicInterval">75</int> - <object class="NSMenuItem" key="NSMenuItem" id="948840643"> - <reference key="NSMenu" ref="344531331"/> + <object class="NSMenuItem" key="NSMenuItem" id="773701029"> + <reference key="NSMenu" ref="192444974"/> <bool key="NSIsHidden">YES</bool> <string key="NSTitle"/> <string key="NSKeyEquiv"/> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> <int key="NSState">1</int> - <object class="NSCustomResource" key="NSImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">plus</string> - </object> + <reference key="NSImage" ref="1057150516"/> <reference key="NSOnImage" ref="1022504326"/> <reference key="NSMixedImage" ref="329345764"/> <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="140036820"/> + <reference key="NSTarget" ref="526253214"/> </object> <bool key="NSMenuItemRespectAlignment">YES</bool> - <object class="NSMenu" key="NSMenu" id="344531331"> + <object class="NSMenu" key="NSMenu" id="192444974"> <string key="NSTitle">OtherViews</string> <object class="NSMutableArray" key="NSMenuItems"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="948840643"/> - <object class="NSMenuItem" id="351084462"> - <reference key="NSMenu" ref="344531331"/> + <reference ref="773701029"/> + <object class="NSMenuItem" id="125642911"> + <reference key="NSMenu" ref="192444974"/> <string key="NSTitle">Add Group</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="1022504326"/> <reference key="NSMixedImage" ref="329345764"/> <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="140036820"/> + <reference key="NSTarget" ref="526253214"/> </object> - <object class="NSMenuItem" id="54131866"> - <reference key="NSMenu" ref="344531331"/> + <object class="NSMenuItem" id="853194524"> + <reference key="NSMenu" ref="192444974"/> <string key="NSTitle">Add Favorite</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="1022504326"/> <reference key="NSMixedImage" ref="329345764"/> <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="140036820"/> + <reference key="NSTarget" ref="526253214"/> </object> </object> </object> + <int key="NSSelectedIndex">2</int> <bool key="NSPullDown">YES</bool> <int key="NSPreferredEdge">1</int> <bool key="NSUsesItemFromMenu">YES</bool> @@ -509,7 +508,7 @@ </object> </object> <string key="NSFrame">{{0, 1}, {202, 23}}</string> - <reference key="NSSuperview" ref="720852944"/> + <reference key="NSSuperview" ref="551584428"/> <bool key="BWABBIsResizable">YES</bool> <bool key="BWABBIsAtBottom">YES</bool> <bool key="BWABBHandleIsRightAligned">NO</bool> @@ -517,16 +516,16 @@ </object> </object> <string key="NSFrameSize">{202, 475}</string> - <reference key="NSSuperview" ref="117951421"/> + <reference key="NSSuperview" ref="616749187"/> <string key="NSClassName">NSView</string> </object> - <object class="NSCustomView" id="925021159"> - <reference key="NSNextResponder" ref="117951421"/> + <object class="BWCustomView" id="563806501"> + <reference key="NSNextResponder" ref="616749187"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSScrollView" id="1058735001"> - <reference key="NSNextResponder" ref="925021159"/> + <reference key="NSNextResponder" ref="563806501"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1967,12 +1966,11 @@ <int key="NSsFlags">1</int> <reference key="NSTarget" ref="1058735001"/> <string key="NSAction">_doScroller:</string> - <double key="NSCurValue">0.4285714328289032</double> <double key="NSPercent">0.97838616371154785</double> </object> </object> <string key="NSFrameSize">{679, 443}</string> - <reference key="NSSuperview" ref="925021159"/> + <reference key="NSSuperview" ref="563806501"/> <reference key="NSNextKeyView" ref="954788335"/> <int key="NSsFlags">560</int> <reference key="NSVScroller" ref="508899576"/> @@ -1980,10 +1978,10 @@ <reference key="NSContentView" ref="954788335"/> </object> <object class="NSTextField" id="570492783"> - <reference key="NSNextResponder" ref="925021159"/> + <reference key="NSNextResponder" ref="563806501"/> <int key="NSvFlags">266</int> <string key="NSFrame">{{17, 451}, {645, 17}}</string> - <reference key="NSSuperview" ref="925021159"/> + <reference key="NSSuperview" ref="563806501"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="607446274"> <int key="NSCellFlags">68288064</int> @@ -2001,18 +1999,71 @@ </object> </object> <string key="NSFrame">{{203, 0}, {679, 475}}</string> - <reference key="NSSuperview" ref="117951421"/> + <reference key="NSSuperview" ref="616749187"/> <string key="NSClassName">NSView</string> </object> </object> <string key="NSFrameSize">{882, 475}</string> - <reference key="NSSuperview" ref="847934114"/> + <reference key="NSSuperview" ref="733821228"/> <bool key="NSIsVertical">YES</bool> <int key="NSDividerStyle">2</int> + <reference key="BWSVColor" ref="643097066"/> + <bool key="BWSVColorIsEnabled">NO</bool> + <object class="NSMutableDictionary" key="BWSVMinValues"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="0"/> + <integer value="1"/> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="80"/> + <integer value="445"/> + </object> + </object> + <object class="NSMutableDictionary" key="BWSVMaxValues"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys" id="0"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <object class="NSMutableDictionary" key="BWSVMinUnits"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="0"/> + <integer value="1"/> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="0"/> + <integer value="0"/> + </object> + </object> + <object class="NSMutableDictionary" key="BWSVMaxUnits"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="0"/> + <integer value="1"/> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="0"/> + <integer value="0"/> + </object> + </object> + <int key="BWSVCollapsiblePopupSelection">0</int> + <bool key="BWSVDividerCanCollapse">NO</bool> </object> </object> <string key="NSFrameSize">{882, 475}</string> <reference key="NSSuperview"/> + <string key="NSClassName">SPFlippedView</string> </object> <object class="NSWindowTemplate" id="958272936"> <int key="NSWindowStyleMask">8223</int> @@ -2062,7 +2113,7 @@ </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSColor" id="993041153"> + <object class="NSColor" id="596333324"> <int key="NSColorSpace">1</int> <bytes key="NSRGB">MC45MDE5NjA3OTAyIDAuOTAxOTYwNzkwMiAwLjkwMTk2MDc5MDIAA</bytes> </object> @@ -2185,7 +2236,7 @@ </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="993041153"/> + <reference ref="596333324"/> <object class="NSFont"> <string key="NSName">LucidaGrande-Bold</string> <double key="NSSize">10</double> @@ -2351,6 +2402,78 @@ <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSFrameAutosaveName"/> </object> + <object class="NSUserDefaultsController" id="642702582"> + <bool key="NSSharedInstance">YES</bool> + </object> + <object class="NSMenu" id="9858888"> + <string key="NSTitle"/> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMenuItem" id="471954922"> + <reference key="NSMenu" ref="9858888"/> + <string key="NSTitle">Rename</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="1022504326"/> + <reference key="NSMixedImage" ref="329345764"/> + </object> + <object class="NSMenuItem" id="492456125"> + <reference key="NSMenu" ref="9858888"/> + <string key="NSTitle">Remove</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="1022504326"/> + <reference key="NSMixedImage" ref="329345764"/> + </object> + <object class="NSMenuItem" id="397716655"> + <reference key="NSMenu" ref="9858888"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="1022504326"/> + <reference key="NSMixedImage" ref="329345764"/> + </object> + <object class="NSMenuItem" id="231143565"> + <reference key="NSMenu" ref="9858888"/> + <string key="NSTitle">Duplicate</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="1022504326"/> + <reference key="NSMixedImage" ref="329345764"/> + </object> + <object class="NSMenuItem" id="24826659"> + <reference key="NSMenu" ref="9858888"/> + <string key="NSTitle">Make Default</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="1022504326"/> + <reference key="NSMixedImage" ref="329345764"/> + </object> + <object class="NSMenuItem" id="111315005"> + <reference key="NSMenu" ref="9858888"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <bool key="NSIsHidden">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="1022504326"/> + <reference key="NSMixedImage" ref="329345764"/> + </object> + <object class="NSMenuItem" id="1069447512"> + <reference key="NSMenu" ref="9858888"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsHidden">YES</bool> + <string key="NSTitle">Export...</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="1022504326"/> + <reference key="NSMixedImage" ref="329345764"/> + </object> + </object> + </object> <object class="NSCustomView" id="567906875"> <nil key="NSNextResponder"/> <int key="NSvFlags">274</int> @@ -2451,88 +2574,12 @@ <string key="NSFrameSize">{579, 51}</string> <string key="NSClassName">NSView</string> </object> - <object class="NSMenu" id="9858888"> - <string key="NSTitle"/> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="203173317"> - <reference key="NSMenu" ref="9858888"/> - <string key="NSTitle">Rename</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="1022504326"/> - <reference key="NSMixedImage" ref="329345764"/> - </object> - <object class="NSMenuItem" id="498336476"> - <reference key="NSMenu" ref="9858888"/> - <string key="NSTitle">Make Default</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="1022504326"/> - <reference key="NSMixedImage" ref="329345764"/> - </object> - <object class="NSMenuItem" id="308601296"> - <reference key="NSMenu" ref="9858888"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="1022504326"/> - <reference key="NSMixedImage" ref="329345764"/> - </object> - <object class="NSMenuItem" id="471954922"> - <reference key="NSMenu" ref="9858888"/> - <string key="NSTitle">Remove</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="1022504326"/> - <reference key="NSMixedImage" ref="329345764"/> - </object> - <object class="NSMenuItem" id="654155668"> - <reference key="NSMenu" ref="9858888"/> - <string key="NSTitle">Duplicate</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="1022504326"/> - <reference key="NSMixedImage" ref="329345764"/> - </object> - <object class="NSMenuItem" id="1018515429"> - <reference key="NSMenu" ref="9858888"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <bool key="NSIsHidden">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="1022504326"/> - <reference key="NSMixedImage" ref="329345764"/> - </object> - <object class="NSMenuItem" id="345191685"> - <reference key="NSMenu" ref="9858888"/> - <bool key="NSIsHidden">YES</bool> - <string key="NSTitle">Export...</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="1022504326"/> - <reference key="NSMixedImage" ref="329345764"/> - </object> - </object> - </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> <object class="NSMutableArray" key="connectionRecords"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">connectionView</string> - <reference key="source" ref="545410097"/> - <reference key="destination" ref="847934114"/> - </object> - <int key="connectionID">4908</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">delegate</string> <reference key="source" ref="1012579052"/> <reference key="destination" ref="545410097"/> @@ -2813,22 +2860,6 @@ <int key="connectionID">5341</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">connectionSplitView</string> - <reference key="source" ref="545410097"/> - <reference key="destination" ref="117951421"/> - </object> - <int key="connectionID">5348</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="117951421"/> - <reference key="destination" ref="545410097"/> - </object> - <int key="connectionID">5349</int> - </object> - <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> <string key="label">showHelp:</string> <reference key="source" ref="545410097"/> @@ -3346,6 +3377,14 @@ <int key="connectionID">5439</int> </object> <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">addFavorite:</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="476973680"/> + </object> + <int key="connectionID">5443</int> + </object> + <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">connectButton</string> <reference key="source" ref="545410097"/> @@ -4462,139 +4501,131 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">favoritesOutlineView</string> + <string key="label">connectionView</string> <reference key="source" ref="545410097"/> - <reference key="destination" ref="1012579052"/> + <reference key="destination" ref="733821228"/> </object> - <int key="connectionID">5738</int> + <int key="connectionID">5740</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">menu</string> - <reference key="source" ref="524598165"/> - <reference key="destination" ref="9858888"/> + <string key="label">delegate</string> + <reference key="source" ref="616749187"/> + <reference key="destination" ref="545410097"/> </object> <int key="connectionID">5744</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">duplicateFavorite:</string> - <reference key="source" ref="545410097"/> - <reference key="destination" ref="943591987"/> - </object> - <int key="connectionID">5750</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">makeSelectedFavoriteDefault:</string> + <object class="IBOutletConnection" key="connection"> + <string key="label">connectionSplitView</string> <reference key="source" ref="545410097"/> - <reference key="destination" ref="14440548"/> + <reference key="destination" ref="616749187"/> </object> - <int key="connectionID">5751</int> + <int key="connectionID">5745</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">duplicateFavorite:</string> + <string key="label">renameFavorite:</string> <reference key="source" ref="545410097"/> - <reference key="destination" ref="654155668"/> + <reference key="destination" ref="471954922"/> </object> - <int key="connectionID">5753</int> + <int key="connectionID">5761</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">makeSelectedFavoriteDefault:</string> + <string key="label">removeNode:</string> <reference key="source" ref="545410097"/> - <reference key="destination" ref="498336476"/> + <reference key="destination" ref="492456125"/> </object> - <int key="connectionID">5754</int> + <int key="connectionID">5762</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">renameFavorite:</string> + <string key="label">duplicateFavorite:</string> <reference key="source" ref="545410097"/> - <reference key="destination" ref="47300604"/> + <reference key="destination" ref="231143565"/> </object> - <int key="connectionID">5757</int> + <int key="connectionID">5763</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">renameFavorite:</string> + <string key="label">makeSelectedFavoriteDefault:</string> <reference key="source" ref="545410097"/> - <reference key="destination" ref="203173317"/> + <reference key="destination" ref="24826659"/> </object> - <int key="connectionID">5758</int> + <int key="connectionID">5764</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> <string key="label">exportFavorites:</string> <reference key="source" ref="545410097"/> - <reference key="destination" ref="345191685"/> + <reference key="destination" ref="1069447512"/> </object> - <int key="connectionID">5817</int> + <int key="connectionID">5765</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">importFavorites:</string> + <string key="label">renameFavorite:</string> <reference key="source" ref="545410097"/> - <reference key="destination" ref="296811585"/> + <reference key="destination" ref="11275875"/> </object> - <int key="connectionID">5818</int> + <int key="connectionID">5766</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">exportFavorites:</string> + <string key="label">removeNode:</string> <reference key="source" ref="545410097"/> - <reference key="destination" ref="541704663"/> + <reference key="destination" ref="875696059"/> </object> - <int key="connectionID">5819</int> + <int key="connectionID">5767</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">addGroup:</string> + <string key="label">duplicateFavorite:</string> <reference key="source" ref="545410097"/> - <reference key="destination" ref="351084462"/> + <reference key="destination" ref="864185279"/> </object> - <int key="connectionID">5820</int> + <int key="connectionID">5768</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">addFavorite:</string> + <string key="label">makeSelectedFavoriteDefault:</string> <reference key="source" ref="545410097"/> - <reference key="destination" ref="54131866"/> + <reference key="destination" ref="1062672584"/> </object> - <int key="connectionID">5821</int> + <int key="connectionID">5769</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">removeNode:</string> + <string key="label">importFavorites:</string> <reference key="source" ref="545410097"/> - <reference key="destination" ref="988671905"/> + <reference key="destination" ref="885080859"/> </object> - <int key="connectionID">5822</int> + <int key="connectionID">5770</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">removeNode:</string> + <string key="label">exportFavorites:</string> <reference key="source" ref="545410097"/> - <reference key="destination" ref="471954922"/> + <reference key="destination" ref="509439698"/> </object> - <int key="connectionID">5823</int> + <int key="connectionID">5771</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">addFavoriteUsingCurrentDetails:</string> + <object class="IBOutletConnection" key="connection"> + <string key="label">favoritesOutlineView</string> <reference key="source" ref="545410097"/> - <reference key="destination" ref="476973680"/> + <reference key="destination" ref="1012579052"/> </object> - <int key="connectionID">5824</int> + <int key="connectionID">5772</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">standardNameField</string> + <string key="label">connectionInstructionsTextField</string> <reference key="source" ref="545410097"/> - <reference key="destination" ref="810791200"/> + <reference key="destination" ref="570492783"/> </object> - <int key="connectionID">5825</int> + <int key="connectionID">5773</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> @@ -4602,31 +4633,31 @@ <reference key="source" ref="545410097"/> <reference key="destination" ref="474825058"/> </object> - <int key="connectionID">5826</int> + <int key="connectionID">5774</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">sshNameField</string> + <string key="label">socketUserField</string> <reference key="source" ref="545410097"/> - <reference key="destination" ref="1022082829"/> + <reference key="destination" ref="68541783"/> </object> - <int key="connectionID">5827</int> + <int key="connectionID">5775</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">standardUserField</string> + <string key="label">standardNameField</string> <reference key="source" ref="545410097"/> - <reference key="destination" ref="978463433"/> + <reference key="destination" ref="810791200"/> </object> - <int key="connectionID">5830</int> + <int key="connectionID">5776</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">socketUserField</string> + <string key="label">standardUserField</string> <reference key="source" ref="545410097"/> - <reference key="destination" ref="68541783"/> + <reference key="destination" ref="978463433"/> </object> - <int key="connectionID">5831</int> + <int key="connectionID">5777</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> @@ -4634,15 +4665,31 @@ <reference key="source" ref="545410097"/> <reference key="destination" ref="358903996"/> </object> - <int key="connectionID">5832</int> + <int key="connectionID">5778</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">connectionInstructionsTextField</string> + <string key="label">sshNameField</string> <reference key="source" ref="545410097"/> - <reference key="destination" ref="570492783"/> + <reference key="destination" ref="1022082829"/> </object> - <int key="connectionID">5833</int> + <int key="connectionID">5779</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">addGroup:</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="125642911"/> + </object> + <int key="connectionID">5810</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">addFavorite:</string> + <reference key="source" ref="545410097"/> + <reference key="destination" ref="853194524"/> + </object> + <int key="connectionID">5811</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -4650,9 +4697,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBObjectRecord"> <int key="objectID">0</int> - <object class="NSArray" key="object" id="0"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="object" ref="0"/> <reference key="children" ref="584594810"/> <nil key="parent"/> </object> @@ -4663,16 +4708,6 @@ <string key="objectName">First Responder</string> </object> <object class="IBObjectRecord"> - <int key="objectID">4826</int> - <reference key="object" ref="847934114"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="117951421"/> - </object> - <reference key="parent" ref="0"/> - <string key="objectName">ConnectionView</string> - </object> - <object class="IBObjectRecord"> <int key="objectID">-2</int> <reference key="object" ref="545410097"/> <reference key="parent" ref="0"/> @@ -4685,26 +4720,6 @@ <string key="objectName">Application</string> </object> <object class="IBObjectRecord"> - <int key="objectID">5342</int> - <reference key="object" ref="117951421"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="925021159"/> - <reference ref="720852944"/> - </object> - <reference key="parent" ref="847934114"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5344</int> - <reference key="object" ref="925021159"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1058735001"/> - <reference ref="570492783"/> - </object> - <reference key="parent" ref="117951421"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">5431</int> <reference key="object" ref="958272936"/> <object class="NSMutableArray" key="children"> @@ -4750,6 +4765,32 @@ <reference key="parent" ref="699163511"/> </object> <object class="IBObjectRecord"> + <int key="objectID">5455</int> + <reference key="object" ref="642702582"/> + <reference key="parent" ref="0"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5468</int> + <reference key="object" ref="9858888"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="471954922"/> + <reference ref="492456125"/> + <reference ref="111315005"/> + <reference ref="1069447512"/> + <reference ref="397716655"/> + <reference ref="24826659"/> + <reference ref="231143565"/> + </object> + <reference key="parent" ref="0"/> + <string key="objectName">Context Menu</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5469</int> + <reference key="object" ref="471954922"/> + <reference key="parent" ref="9858888"/> + </object> + <object class="IBObjectRecord"> <int key="objectID">5576</int> <reference key="object" ref="567906875"/> <object class="NSMutableArray" key="children"> @@ -4774,14 +4815,116 @@ <reference key="parent" ref="44241774"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5343</int> - <reference key="object" ref="720852944"/> + <int key="objectID">5668</int> + <reference key="object" ref="12066713"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="538839943"/> + </object> + <reference key="parent" ref="0"/> + <string key="objectName">SSL Key File Selection Help</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5669</int> + <reference key="object" ref="538839943"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="124352014"/> + </object> + <reference key="parent" ref="12066713"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5670</int> + <reference key="object" ref="124352014"/> + <reference key="parent" ref="538839943"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5680</int> + <reference key="object" ref="3577372"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="761812578"/> + </object> + <reference key="parent" ref="0"/> + <string key="objectName">SSL CA Cert File Selection Help</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5681</int> + <reference key="object" ref="761812578"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="444474564"/> + </object> + <reference key="parent" ref="3577372"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5682</int> + <reference key="object" ref="444474564"/> + <reference key="parent" ref="761812578"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5683</int> + <reference key="object" ref="136328549"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="802544195"/> + </object> + <reference key="parent" ref="0"/> + <string key="objectName">SSL Certificate File Selection Help</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5684</int> + <reference key="object" ref="802544195"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="196059550"/> + </object> + <reference key="parent" ref="136328549"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5685</int> + <reference key="object" ref="196059550"/> + <reference key="parent" ref="802544195"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5739</int> + <reference key="object" ref="733821228"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="616749187"/> + </object> + <reference key="parent" ref="0"/> + <string key="objectName">ConnectionView</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5741</int> + <reference key="object" ref="616749187"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="551584428"/> + <reference ref="563806501"/> + </object> + <reference key="parent" ref="733821228"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5742</int> + <reference key="object" ref="551584428"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="805249222"/> <reference ref="524598165"/> </object> - <reference key="parent" ref="117951421"/> + <reference key="parent" ref="616749187"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5743</int> + <reference key="object" ref="563806501"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="570492783"/> + <reference ref="1058735001"/> + </object> + <reference key="parent" ref="616749187"/> </object> <object class="IBObjectRecord"> <int key="objectID">5345</int> @@ -4789,9 +4932,9 @@ <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="221133754"/> - <reference ref="817268454"/> + <reference ref="143274444"/> </object> - <reference key="parent" ref="720852944"/> + <reference key="parent" ref="551584428"/> </object> <object class="IBObjectRecord"> <int key="objectID">5475</int> @@ -4816,21 +4959,26 @@ <reference key="object" ref="949612237"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="623685715"/> <reference ref="751753648"/> - <reference ref="988671905"/> - <reference ref="943591987"/> - <reference ref="130047523"/> - <reference ref="176010547"/> - <reference ref="296811585"/> - <reference ref="541704663"/> - <reference ref="47300604"/> - <reference ref="14440548"/> - <reference ref="1021417946"/> + <reference ref="623685715"/> + <reference ref="11275875"/> + <reference ref="875696059"/> + <reference ref="839925568"/> + <reference ref="785902570"/> + <reference ref="864185279"/> + <reference ref="1062672584"/> + <reference ref="444328485"/> + <reference ref="885080859"/> + <reference ref="509439698"/> </object> <reference key="parent" ref="270183415"/> </object> <object class="IBObjectRecord"> + <int key="objectID">5478</int> + <reference key="object" ref="751753648"/> + <reference key="parent" ref="949612237"/> + </object> + <object class="IBObjectRecord"> <int key="objectID">5479</int> <reference key="object" ref="623685715"/> <object class="NSMutableArray" key="children"> @@ -4844,22 +4992,22 @@ <reference key="object" ref="455108754"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="513442721"/> - <reference ref="43427774"/> - <reference ref="997359603"/> - <reference ref="965148975"/> <reference ref="536740264"/> + <reference ref="965148975"/> + <reference ref="997359603"/> + <reference ref="43427774"/> + <reference ref="513442721"/> </object> <reference key="parent" ref="623685715"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5486</int> - <reference key="object" ref="513442721"/> + <int key="objectID">5482</int> + <reference key="object" ref="536740264"/> <reference key="parent" ref="455108754"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5485</int> - <reference key="object" ref="43427774"/> + <int key="objectID">5483</int> + <reference key="object" ref="965148975"/> <reference key="parent" ref="455108754"/> </object> <object class="IBObjectRecord"> @@ -4868,34 +5016,33 @@ <reference key="parent" ref="455108754"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5483</int> - <reference key="object" ref="965148975"/> + <int key="objectID">5485</int> + <reference key="object" ref="43427774"/> <reference key="parent" ref="455108754"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5482</int> - <reference key="object" ref="536740264"/> + <int key="objectID">5486</int> + <reference key="object" ref="513442721"/> <reference key="parent" ref="455108754"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5478</int> - <reference key="object" ref="751753648"/> - <reference key="parent" ref="949612237"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">4910</int> <reference key="object" ref="524598165"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="533108700"/> - <reference ref="802793151"/> <reference ref="1012579052"/> + <reference ref="802793151"/> + <reference ref="533108700"/> </object> - <reference key="parent" ref="720852944"/> + <reference key="parent" ref="551584428"/> </object> <object class="IBObjectRecord"> - <int key="objectID">4911</int> - <reference key="object" ref="533108700"/> + <int key="objectID">4913</int> + <reference key="object" ref="1012579052"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="131458815"/> + </object> <reference key="parent" ref="524598165"/> </object> <object class="IBObjectRecord"> @@ -4904,12 +5051,8 @@ <reference key="parent" ref="524598165"/> </object> <object class="IBObjectRecord"> - <int key="objectID">4913</int> - <reference key="object" ref="1012579052"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="131458815"/> - </object> + <int key="objectID">4911</int> + <reference key="object" ref="533108700"/> <reference key="parent" ref="524598165"/> </object> <object class="IBObjectRecord"> @@ -4927,23 +5070,33 @@ <reference key="parent" ref="131458815"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5588</int> - <reference key="object" ref="1058735001"/> + <int key="objectID">5154</int> + <reference key="object" ref="570492783"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="315390047"/> - <reference ref="108277656"/> - <reference ref="508899576"/> + <reference ref="607446274"/> </object> - <reference key="parent" ref="925021159"/> + <reference key="parent" ref="563806501"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5447</int> - <reference key="object" ref="315390047"/> + <int key="objectID">5155</int> + <reference key="object" ref="607446274"/> + <reference key="parent" ref="570492783"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5588</int> + <reference key="object" ref="1058735001"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="735564334"/> + <reference ref="508899576"/> + <reference ref="108277656"/> + <reference ref="315390047"/> </object> + <reference key="parent" ref="563806501"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5589</int> + <reference key="object" ref="508899576"/> <reference key="parent" ref="1058735001"/> </object> <object class="IBObjectRecord"> @@ -4952,8 +5105,12 @@ <reference key="parent" ref="1058735001"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5589</int> - <reference key="object" ref="508899576"/> + <int key="objectID">5447</int> + <reference key="object" ref="315390047"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="735564334"/> + </object> <reference key="parent" ref="1058735001"/> </object> <object class="IBObjectRecord"> @@ -4961,39 +5118,36 @@ <reference key="object" ref="735564334"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="990947983"/> - <reference ref="549907703"/> - <reference ref="575228526"/> - <reference ref="476973680"/> - <reference ref="460592307"/> <reference ref="134031646"/> + <reference ref="460592307"/> + <reference ref="476973680"/> + <reference ref="575228526"/> + <reference ref="549907703"/> + <reference ref="990947983"/> </object> <reference key="parent" ref="315390047"/> </object> <object class="IBObjectRecord"> - <int key="objectID">4829</int> - <reference key="object" ref="990947983"/> + <int key="objectID">4980</int> + <reference key="object" ref="134031646"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="757039715"/> + <reference ref="591192172"/> + <reference ref="517771995"/> + <reference ref="253369045"/> </object> <reference key="parent" ref="735564334"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5423</int> - <reference key="object" ref="549907703"/> + <int key="objectID">5157</int> + <reference key="object" ref="460592307"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="321846713"/> + <reference ref="424756162"/> </object> <reference key="parent" ref="735564334"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5422</int> - <reference key="object" ref="575228526"/> - <reference key="parent" ref="735564334"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">5159</int> <reference key="object" ref="476973680"/> <object class="NSMutableArray" key="children"> @@ -5003,31 +5157,54 @@ <reference key="parent" ref="735564334"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5157</int> - <reference key="object" ref="460592307"/> + <int key="objectID">5422</int> + <reference key="object" ref="575228526"/> + <reference key="parent" ref="735564334"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5423</int> + <reference key="object" ref="549907703"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="424756162"/> + <reference ref="321846713"/> </object> <reference key="parent" ref="735564334"/> </object> <object class="IBObjectRecord"> - <int key="objectID">4980</int> - <reference key="object" ref="134031646"/> + <int key="objectID">4829</int> + <reference key="object" ref="990947983"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="253369045"/> - <reference ref="517771995"/> - <reference ref="591192172"/> + <reference ref="757039715"/> </object> <reference key="parent" ref="735564334"/> </object> <object class="IBObjectRecord"> - <int key="objectID">4981</int> - <reference key="object" ref="253369045"/> + <int key="objectID">4839</int> + <reference key="object" ref="757039715"/> + <reference key="parent" ref="990947983"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5424</int> + <reference key="object" ref="321846713"/> + <reference key="parent" ref="549907703"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5160</int> + <reference key="object" ref="220047154"/> + <reference key="parent" ref="476973680"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5158</int> + <reference key="object" ref="424756162"/> + <reference key="parent" ref="460592307"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">4985</int> + <reference key="object" ref="591192172"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="32802602"/> + <reference ref="159800861"/> </object> <reference key="parent" ref="134031646"/> </object> @@ -5041,447 +5218,458 @@ <reference key="parent" ref="134031646"/> </object> <object class="IBObjectRecord"> - <int key="objectID">4985</int> - <reference key="object" ref="591192172"/> + <int key="objectID">4981</int> + <reference key="object" ref="253369045"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="159800861"/> + <reference ref="32802602"/> </object> <reference key="parent" ref="134031646"/> </object> <object class="IBObjectRecord"> - <int key="objectID">4986</int> - <reference key="object" ref="159800861"/> + <int key="objectID">4984</int> + <reference key="object" ref="32802602"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="326102394"/> + <reference ref="31135925"/> + <reference ref="233374444"/> </object> - <reference key="parent" ref="591192172"/> + <reference key="parent" ref="253369045"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5166</int> - <reference key="object" ref="326102394"/> + <int key="objectID">5595</int> + <reference key="object" ref="31135925"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="761323775"/> - <reference ref="1022082829"/> - <reference ref="984151006"/> - <reference ref="692784990"/> - <reference ref="627782947"/> - <reference ref="21480939"/> - <reference ref="558754343"/> - <reference ref="790983747"/> - <reference ref="81612279"/> - <reference ref="844385120"/> - <reference ref="914345743"/> - <reference ref="1049720725"/> - <reference ref="632758915"/> - <reference ref="1000646962"/> - <reference ref="71258292"/> - <reference ref="187191991"/> - <reference ref="189856761"/> - <reference ref="358903996"/> - <reference ref="615962367"/> - <reference ref="1030226140"/> - <reference ref="183948302"/> - <reference ref="180145997"/> - <reference ref="906103858"/> + <reference ref="104955330"/> + <reference ref="638710413"/> + <reference ref="839299955"/> + <reference ref="684819179"/> + <reference ref="950540175"/> + <reference ref="945929172"/> + <reference ref="586011242"/> + <reference ref="1034069158"/> + <reference ref="679511995"/> </object> - <reference key="parent" ref="159800861"/> + <reference key="parent" ref="32802602"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5404</int> - <reference key="object" ref="761323775"/> + <int key="objectID">5156</int> + <reference key="object" ref="233374444"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="906889126"/> + <reference ref="508687946"/> + <reference ref="644973446"/> + <reference ref="786098118"/> + <reference ref="978463433"/> + <reference ref="987440606"/> + <reference ref="211629203"/> + <reference ref="105635377"/> + <reference ref="950381827"/> + <reference ref="788113046"/> + <reference ref="1013612483"/> + <reference ref="910543023"/> + <reference ref="810791200"/> + <reference ref="445567924"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="32802602"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5403</int> - <reference key="object" ref="1022082829"/> + <int key="objectID">5593</int> + <reference key="object" ref="508687946"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="833542503"/> + <reference ref="184523755"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="233374444"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5291</int> - <reference key="object" ref="984151006"/> + <int key="objectID">5171</int> + <reference key="object" ref="644973446"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="563972303"/> + <reference ref="859982751"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="233374444"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5290</int> - <reference key="object" ref="692784990"/> + <int key="objectID">5173</int> + <reference key="object" ref="786098118"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="850057181"/> + <reference ref="393023945"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="233374444"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5289</int> - <reference key="object" ref="627782947"/> + <int key="objectID">5175</int> + <reference key="object" ref="978463433"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="369035253"/> + <reference ref="925313159"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="233374444"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5288</int> - <reference key="object" ref="21480939"/> + <int key="objectID">5176</int> + <reference key="object" ref="987440606"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="944931136"/> + <reference ref="377431100"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="233374444"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5287</int> - <reference key="object" ref="558754343"/> + <int key="objectID">5179</int> + <reference key="object" ref="211629203"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="222275233"/> + <reference ref="646391991"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="233374444"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5286</int> - <reference key="object" ref="790983747"/> + <int key="objectID">5180</int> + <reference key="object" ref="105635377"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="347555313"/> + <reference ref="785119002"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="233374444"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5285</int> - <reference key="object" ref="81612279"/> + <int key="objectID">5183</int> + <reference key="object" ref="950381827"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="386177793"/> + <reference ref="925102591"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="233374444"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5284</int> - <reference key="object" ref="844385120"/> + <int key="objectID">5184</int> + <reference key="object" ref="788113046"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="505035309"/> + <reference ref="441978581"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="233374444"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5273</int> - <reference key="object" ref="914345743"/> + <int key="objectID">5187</int> + <reference key="object" ref="1013612483"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="265944034"/> + <reference ref="1003825843"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="233374444"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5272</int> - <reference key="object" ref="1049720725"/> + <int key="objectID">5188</int> + <reference key="object" ref="910543023"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="615536496"/> + <reference ref="588889019"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="233374444"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5271</int> - <reference key="object" ref="632758915"/> + <int key="objectID">5376</int> + <reference key="object" ref="810791200"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="664433389"/> + <reference ref="1040289660"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="233374444"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5270</int> - <reference key="object" ref="1000646962"/> + <int key="objectID">5377</int> + <reference key="object" ref="445567924"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="289965133"/> + <reference ref="485990188"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="233374444"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5269</int> - <reference key="object" ref="71258292"/> + <int key="objectID">5378</int> + <reference key="object" ref="485990188"/> + <reference key="parent" ref="445567924"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5379</int> + <reference key="object" ref="1040289660"/> + <reference key="parent" ref="810791200"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5189</int> + <reference key="object" ref="588889019"/> + <reference key="parent" ref="910543023"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5190</int> + <reference key="object" ref="1003825843"/> + <reference key="parent" ref="1013612483"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5185</int> + <reference key="object" ref="441978581"/> + <reference key="parent" ref="788113046"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5186</int> + <reference key="object" ref="925102591"/> + <reference key="parent" ref="950381827"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5181</int> + <reference key="object" ref="785119002"/> + <reference key="parent" ref="105635377"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5182</int> + <reference key="object" ref="646391991"/> + <reference key="parent" ref="211629203"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5177</int> + <reference key="object" ref="377431100"/> + <reference key="parent" ref="987440606"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5178</int> + <reference key="object" ref="925313159"/> + <reference key="parent" ref="978463433"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5174</int> + <reference key="object" ref="393023945"/> + <reference key="parent" ref="786098118"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5172</int> + <reference key="object" ref="859982751"/> + <reference key="parent" ref="644973446"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5594</int> + <reference key="object" ref="184523755"/> + <reference key="parent" ref="508687946"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5614</int> + <reference key="object" ref="104955330"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1056521404"/> + <reference ref="69612386"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="31135925"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5268</int> - <reference key="object" ref="187191991"/> + <int key="objectID">5613</int> + <reference key="object" ref="638710413"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="737530250"/> + <reference ref="791857368"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="31135925"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5267</int> - <reference key="object" ref="189856761"/> + <int key="objectID">5612</int> + <reference key="object" ref="839299955"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="218707841"/> + <reference ref="1013426677"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="31135925"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5266</int> - <reference key="object" ref="358903996"/> + <int key="objectID">5606</int> + <reference key="object" ref="684819179"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="869330413"/> + <reference ref="371333119"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="31135925"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5265</int> - <reference key="object" ref="615962367"/> + <int key="objectID">5605</int> + <reference key="object" ref="950540175"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="547674489"/> + <reference ref="196185392"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="31135925"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5264</int> - <reference key="object" ref="1030226140"/> + <int key="objectID">5604</int> + <reference key="object" ref="945929172"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="933547668"/> + <reference ref="1000000271"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="31135925"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5492</int> - <reference key="object" ref="183948302"/> + <int key="objectID">5600</int> + <reference key="object" ref="586011242"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="510891456"/> + <reference ref="85329089"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="31135925"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5523</int> - <reference key="object" ref="180145997"/> + <int key="objectID">5598</int> + <reference key="object" ref="1034069158"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="13940444"/> + <reference ref="943522732"/> </object> - <reference key="parent" ref="326102394"/> + <reference key="parent" ref="31135925"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5525</int> - <reference key="object" ref="906103858"/> + <int key="objectID">5596</int> + <reference key="object" ref="679511995"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="882604644"/> + <reference ref="650760201"/> </object> - <reference key="parent" ref="326102394"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5526</int> - <reference key="object" ref="882604644"/> - <reference key="parent" ref="906103858"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5524</int> - <reference key="object" ref="13940444"/> - <reference key="parent" ref="180145997"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5493</int> - <reference key="object" ref="510891456"/> - <reference key="parent" ref="183948302"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5283</int> - <reference key="object" ref="933547668"/> - <reference key="parent" ref="1030226140"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5282</int> - <reference key="object" ref="547674489"/> - <reference key="parent" ref="615962367"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5281</int> - <reference key="object" ref="869330413"/> - <reference key="parent" ref="358903996"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5280</int> - <reference key="object" ref="218707841"/> - <reference key="parent" ref="189856761"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5279</int> - <reference key="object" ref="737530250"/> - <reference key="parent" ref="187191991"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5278</int> - <reference key="object" ref="1056521404"/> - <reference key="parent" ref="71258292"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5277</int> - <reference key="object" ref="289965133"/> - <reference key="parent" ref="1000646962"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5276</int> - <reference key="object" ref="664433389"/> - <reference key="parent" ref="632758915"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5275</int> - <reference key="object" ref="615536496"/> - <reference key="parent" ref="1049720725"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5274</int> - <reference key="object" ref="265944034"/> - <reference key="parent" ref="914345743"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5299</int> - <reference key="object" ref="505035309"/> - <reference key="parent" ref="844385120"/> + <reference key="parent" ref="31135925"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5298</int> - <reference key="object" ref="386177793"/> - <reference key="parent" ref="81612279"/> + <int key="objectID">5597</int> + <reference key="object" ref="650760201"/> + <reference key="parent" ref="679511995"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5297</int> - <reference key="object" ref="347555313"/> - <reference key="parent" ref="790983747"/> + <int key="objectID">5599</int> + <reference key="object" ref="943522732"/> + <reference key="parent" ref="1034069158"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5296</int> - <reference key="object" ref="222275233"/> - <reference key="parent" ref="558754343"/> + <int key="objectID">5601</int> + <reference key="object" ref="85329089"/> + <reference key="parent" ref="586011242"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5295</int> - <reference key="object" ref="944931136"/> - <reference key="parent" ref="21480939"/> + <int key="objectID">5609</int> + <reference key="object" ref="1000000271"/> + <reference key="parent" ref="945929172"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5294</int> - <reference key="object" ref="369035253"/> - <reference key="parent" ref="627782947"/> + <int key="objectID">5608</int> + <reference key="object" ref="196185392"/> + <reference key="parent" ref="950540175"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5293</int> - <reference key="object" ref="850057181"/> - <reference key="parent" ref="692784990"/> + <int key="objectID">5607</int> + <reference key="object" ref="371333119"/> + <reference key="parent" ref="684819179"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5292</int> - <reference key="object" ref="563972303"/> - <reference key="parent" ref="984151006"/> + <int key="objectID">5617</int> + <reference key="object" ref="1013426677"/> + <reference key="parent" ref="839299955"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5406</int> - <reference key="object" ref="833542503"/> - <reference key="parent" ref="1022082829"/> + <int key="objectID">5616</int> + <reference key="object" ref="791857368"/> + <reference key="parent" ref="638710413"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5405</int> - <reference key="object" ref="906889126"/> - <reference key="parent" ref="761323775"/> + <int key="objectID">5615</int> + <reference key="object" ref="69612386"/> + <reference key="parent" ref="104955330"/> </object> <object class="IBObjectRecord"> <int key="objectID">4983</int> <reference key="object" ref="962671066"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="394302879"/> <reference ref="866600720"/> + <reference ref="394302879"/> </object> <reference key="parent" ref="517771995"/> </object> <object class="IBObjectRecord"> + <int key="objectID">5688</int> + <reference key="object" ref="866600720"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="51601157"/> + <reference ref="57862599"/> + <reference ref="237955939"/> + <reference ref="988136593"/> + <reference ref="216069484"/> + <reference ref="521125104"/> + <reference ref="680939705"/> + <reference ref="484504415"/> + <reference ref="98826968"/> + </object> + <reference key="parent" ref="962671066"/> + </object> + <object class="IBObjectRecord"> <int key="objectID">5162</int> <reference key="object" ref="394302879"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="728228957"/> - <reference ref="459734357"/> - <reference ref="474825058"/> - <reference ref="591324856"/> - <reference ref="745773732"/> - <reference ref="58217156"/> - <reference ref="789391730"/> - <reference ref="512253301"/> - <reference ref="607362814"/> - <reference ref="68541783"/> <reference ref="16421625"/> + <reference ref="68541783"/> + <reference ref="607362814"/> + <reference ref="512253301"/> + <reference ref="789391730"/> + <reference ref="58217156"/> + <reference ref="745773732"/> + <reference ref="591324856"/> + <reference ref="474825058"/> + <reference ref="459734357"/> + <reference ref="728228957"/> </object> <reference key="parent" ref="962671066"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5218</int> - <reference key="object" ref="728228957"/> + <int key="objectID">5720</int> + <reference key="object" ref="16421625"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="299457759"/> + <reference ref="972347112"/> </object> <reference key="parent" ref="394302879"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5386</int> - <reference key="object" ref="459734357"/> + <int key="objectID">5212</int> + <reference key="object" ref="68541783"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="352725628"/> + <reference ref="279442436"/> </object> <reference key="parent" ref="394302879"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5385</int> - <reference key="object" ref="474825058"/> + <int key="objectID">5213</int> + <reference key="object" ref="607362814"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="684614893"/> + <reference ref="798396187"/> </object> <reference key="parent" ref="394302879"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5219</int> - <reference key="object" ref="591324856"/> + <int key="objectID">5214</int> + <reference key="object" ref="512253301"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="317867885"/> + <reference ref="251554254"/> </object> <reference key="parent" ref="394302879"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5217</int> - <reference key="object" ref="745773732"/> + <int key="objectID">5215</int> + <reference key="object" ref="789391730"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="728524936"/> + <reference ref="797213431"/> </object> <reference key="parent" ref="394302879"/> </object> @@ -5495,70 +5683,64 @@ <reference key="parent" ref="394302879"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5215</int> - <reference key="object" ref="789391730"/> + <int key="objectID">5217</int> + <reference key="object" ref="745773732"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="797213431"/> + <reference ref="728524936"/> </object> <reference key="parent" ref="394302879"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5214</int> - <reference key="object" ref="512253301"/> + <int key="objectID">5219</int> + <reference key="object" ref="591324856"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="251554254"/> + <reference ref="317867885"/> </object> <reference key="parent" ref="394302879"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5213</int> - <reference key="object" ref="607362814"/> + <int key="objectID">5385</int> + <reference key="object" ref="474825058"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="798396187"/> + <reference ref="684614893"/> </object> <reference key="parent" ref="394302879"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5212</int> - <reference key="object" ref="68541783"/> + <int key="objectID">5386</int> + <reference key="object" ref="459734357"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="279442436"/> + <reference ref="352725628"/> </object> <reference key="parent" ref="394302879"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5227</int> - <reference key="object" ref="279442436"/> - <reference key="parent" ref="68541783"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5226</int> - <reference key="object" ref="798396187"/> - <reference key="parent" ref="607362814"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5225</int> - <reference key="object" ref="251554254"/> - <reference key="parent" ref="512253301"/> + <int key="objectID">5218</int> + <reference key="object" ref="728228957"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="299457759"/> + </object> + <reference key="parent" ref="394302879"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5224</int> - <reference key="object" ref="797213431"/> - <reference key="parent" ref="789391730"/> + <int key="objectID">5221</int> + <reference key="object" ref="299457759"/> + <reference key="parent" ref="728228957"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5223</int> - <reference key="object" ref="185246669"/> - <reference key="parent" ref="58217156"/> + <int key="objectID">5387</int> + <reference key="object" ref="352725628"/> + <reference key="parent" ref="459734357"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5222</int> - <reference key="object" ref="728524936"/> - <reference key="parent" ref="745773732"/> + <int key="objectID">5388</int> + <reference key="object" ref="684614893"/> + <reference key="parent" ref="474825058"/> </object> <object class="IBObjectRecord"> <int key="objectID">5220</int> @@ -5566,778 +5748,646 @@ <reference key="parent" ref="591324856"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5388</int> - <reference key="object" ref="684614893"/> - <reference key="parent" ref="474825058"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5387</int> - <reference key="object" ref="352725628"/> - <reference key="parent" ref="459734357"/> + <int key="objectID">5222</int> + <reference key="object" ref="728524936"/> + <reference key="parent" ref="745773732"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5221</int> - <reference key="object" ref="299457759"/> - <reference key="parent" ref="728228957"/> + <int key="objectID">5223</int> + <reference key="object" ref="185246669"/> + <reference key="parent" ref="58217156"/> </object> <object class="IBObjectRecord"> - <int key="objectID">4984</int> - <reference key="object" ref="32802602"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="233374444"/> - <reference ref="31135925"/> - </object> - <reference key="parent" ref="253369045"/> + <int key="objectID">5224</int> + <reference key="object" ref="797213431"/> + <reference key="parent" ref="789391730"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5156</int> - <reference key="object" ref="233374444"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="445567924"/> - <reference ref="810791200"/> - <reference ref="910543023"/> - <reference ref="1013612483"/> - <reference ref="788113046"/> - <reference ref="950381827"/> - <reference ref="105635377"/> - <reference ref="211629203"/> - <reference ref="987440606"/> - <reference ref="978463433"/> - <reference ref="786098118"/> - <reference ref="644973446"/> - <reference ref="508687946"/> - </object> - <reference key="parent" ref="32802602"/> + <int key="objectID">5225</int> + <reference key="object" ref="251554254"/> + <reference key="parent" ref="512253301"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5377</int> - <reference key="object" ref="445567924"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="485990188"/> - </object> - <reference key="parent" ref="233374444"/> + <int key="objectID">5226</int> + <reference key="object" ref="798396187"/> + <reference key="parent" ref="607362814"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5376</int> - <reference key="object" ref="810791200"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1040289660"/> - </object> - <reference key="parent" ref="233374444"/> + <int key="objectID">5227</int> + <reference key="object" ref="279442436"/> + <reference key="parent" ref="68541783"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5188</int> - <reference key="object" ref="910543023"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="588889019"/> - </object> - <reference key="parent" ref="233374444"/> + <int key="objectID">5721</int> + <reference key="object" ref="972347112"/> + <reference key="parent" ref="16421625"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5187</int> - <reference key="object" ref="1013612483"/> + <int key="objectID">5697</int> + <reference key="object" ref="51601157"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1003825843"/> + <reference ref="575863174"/> </object> - <reference key="parent" ref="233374444"/> + <reference key="parent" ref="866600720"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5184</int> - <reference key="object" ref="788113046"/> + <int key="objectID">5696</int> + <reference key="object" ref="57862599"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="441978581"/> + <reference ref="357553281"/> </object> - <reference key="parent" ref="233374444"/> + <reference key="parent" ref="866600720"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5183</int> - <reference key="object" ref="950381827"/> + <int key="objectID">5695</int> + <reference key="object" ref="237955939"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="925102591"/> + <reference ref="167444868"/> </object> - <reference key="parent" ref="233374444"/> + <reference key="parent" ref="866600720"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5180</int> - <reference key="object" ref="105635377"/> + <int key="objectID">5694</int> + <reference key="object" ref="988136593"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="785119002"/> + <reference ref="559442548"/> </object> - <reference key="parent" ref="233374444"/> + <reference key="parent" ref="866600720"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5179</int> - <reference key="object" ref="211629203"/> + <int key="objectID">5693</int> + <reference key="object" ref="216069484"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="646391991"/> + <reference ref="276609847"/> </object> - <reference key="parent" ref="233374444"/> + <reference key="parent" ref="866600720"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5176</int> - <reference key="object" ref="987440606"/> + <int key="objectID">5692</int> + <reference key="object" ref="521125104"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="377431100"/> + <reference ref="1025158673"/> </object> - <reference key="parent" ref="233374444"/> + <reference key="parent" ref="866600720"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5175</int> - <reference key="object" ref="978463433"/> + <int key="objectID">5691</int> + <reference key="object" ref="680939705"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="925313159"/> + <reference ref="308087760"/> </object> - <reference key="parent" ref="233374444"/> + <reference key="parent" ref="866600720"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5173</int> - <reference key="object" ref="786098118"/> + <int key="objectID">5690</int> + <reference key="object" ref="484504415"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="393023945"/> + <reference ref="169093017"/> </object> - <reference key="parent" ref="233374444"/> + <reference key="parent" ref="866600720"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5171</int> - <reference key="object" ref="644973446"/> + <int key="objectID">5689</int> + <reference key="object" ref="98826968"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="859982751"/> + <reference ref="730590428"/> </object> - <reference key="parent" ref="233374444"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5172</int> - <reference key="object" ref="859982751"/> - <reference key="parent" ref="644973446"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5174</int> - <reference key="object" ref="393023945"/> - <reference key="parent" ref="786098118"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5178</int> - <reference key="object" ref="925313159"/> - <reference key="parent" ref="978463433"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5177</int> - <reference key="object" ref="377431100"/> - <reference key="parent" ref="987440606"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5182</int> - <reference key="object" ref="646391991"/> - <reference key="parent" ref="211629203"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5181</int> - <reference key="object" ref="785119002"/> - <reference key="parent" ref="105635377"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5186</int> - <reference key="object" ref="925102591"/> - <reference key="parent" ref="950381827"/> + <reference key="parent" ref="866600720"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5185</int> - <reference key="object" ref="441978581"/> - <reference key="parent" ref="788113046"/> + <int key="objectID">5706</int> + <reference key="object" ref="730590428"/> + <reference key="parent" ref="98826968"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5190</int> - <reference key="object" ref="1003825843"/> - <reference key="parent" ref="1013612483"/> + <int key="objectID">5705</int> + <reference key="object" ref="169093017"/> + <reference key="parent" ref="484504415"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5189</int> - <reference key="object" ref="588889019"/> - <reference key="parent" ref="910543023"/> + <int key="objectID">5704</int> + <reference key="object" ref="308087760"/> + <reference key="parent" ref="680939705"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5379</int> - <reference key="object" ref="1040289660"/> - <reference key="parent" ref="810791200"/> + <int key="objectID">5703</int> + <reference key="object" ref="1025158673"/> + <reference key="parent" ref="521125104"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5378</int> - <reference key="object" ref="485990188"/> - <reference key="parent" ref="445567924"/> + <int key="objectID">5702</int> + <reference key="object" ref="276609847"/> + <reference key="parent" ref="216069484"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5158</int> - <reference key="object" ref="424756162"/> - <reference key="parent" ref="460592307"/> + <int key="objectID">5701</int> + <reference key="object" ref="559442548"/> + <reference key="parent" ref="988136593"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5160</int> - <reference key="object" ref="220047154"/> - <reference key="parent" ref="476973680"/> + <int key="objectID">5700</int> + <reference key="object" ref="167444868"/> + <reference key="parent" ref="237955939"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5424</int> - <reference key="object" ref="321846713"/> - <reference key="parent" ref="549907703"/> + <int key="objectID">5699</int> + <reference key="object" ref="357553281"/> + <reference key="parent" ref="57862599"/> </object> <object class="IBObjectRecord"> - <int key="objectID">4839</int> - <reference key="object" ref="757039715"/> - <reference key="parent" ref="990947983"/> + <int key="objectID">5698</int> + <reference key="object" ref="575863174"/> + <reference key="parent" ref="51601157"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5154</int> - <reference key="object" ref="570492783"/> + <int key="objectID">4986</int> + <reference key="object" ref="159800861"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="607446274"/> + <reference ref="326102394"/> </object> - <reference key="parent" ref="925021159"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5155</int> - <reference key="object" ref="607446274"/> - <reference key="parent" ref="570492783"/> + <reference key="parent" ref="591192172"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5593</int> - <reference key="object" ref="508687946"/> + <int key="objectID">5166</int> + <reference key="object" ref="326102394"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="184523755"/> + <reference ref="906103858"/> + <reference ref="180145997"/> + <reference ref="183948302"/> + <reference ref="1030226140"/> + <reference ref="615962367"/> + <reference ref="358903996"/> + <reference ref="189856761"/> + <reference ref="187191991"/> + <reference ref="71258292"/> + <reference ref="1000646962"/> + <reference ref="632758915"/> + <reference ref="1049720725"/> + <reference ref="914345743"/> + <reference ref="844385120"/> + <reference ref="81612279"/> + <reference ref="790983747"/> + <reference ref="558754343"/> + <reference ref="21480939"/> + <reference ref="627782947"/> + <reference ref="692784990"/> + <reference ref="984151006"/> + <reference ref="1022082829"/> + <reference ref="761323775"/> </object> - <reference key="parent" ref="233374444"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5594</int> - <reference key="object" ref="184523755"/> - <reference key="parent" ref="508687946"/> + <reference key="parent" ref="159800861"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5595</int> - <reference key="object" ref="31135925"/> + <int key="objectID">5525</int> + <reference key="object" ref="906103858"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="679511995"/> - <reference ref="1034069158"/> - <reference ref="586011242"/> - <reference ref="945929172"/> - <reference ref="950540175"/> - <reference ref="684819179"/> - <reference ref="839299955"/> - <reference ref="638710413"/> - <reference ref="104955330"/> + <reference ref="882604644"/> </object> - <reference key="parent" ref="32802602"/> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5596</int> - <reference key="object" ref="679511995"/> + <int key="objectID">5523</int> + <reference key="object" ref="180145997"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="650760201"/> + <reference ref="13940444"/> </object> - <reference key="parent" ref="31135925"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5597</int> - <reference key="object" ref="650760201"/> - <reference key="parent" ref="679511995"/> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5598</int> - <reference key="object" ref="1034069158"/> + <int key="objectID">5492</int> + <reference key="object" ref="183948302"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="943522732"/> + <reference ref="510891456"/> </object> - <reference key="parent" ref="31135925"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5599</int> - <reference key="object" ref="943522732"/> - <reference key="parent" ref="1034069158"/> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5600</int> - <reference key="object" ref="586011242"/> + <int key="objectID">5264</int> + <reference key="object" ref="1030226140"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="85329089"/> + <reference ref="933547668"/> </object> - <reference key="parent" ref="31135925"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5601</int> - <reference key="object" ref="85329089"/> - <reference key="parent" ref="586011242"/> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5604</int> - <reference key="object" ref="945929172"/> + <int key="objectID">5265</int> + <reference key="object" ref="615962367"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1000000271"/> + <reference ref="547674489"/> </object> - <reference key="parent" ref="31135925"/> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5605</int> - <reference key="object" ref="950540175"/> + <int key="objectID">5266</int> + <reference key="object" ref="358903996"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="196185392"/> + <reference ref="869330413"/> </object> - <reference key="parent" ref="31135925"/> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5606</int> - <reference key="object" ref="684819179"/> + <int key="objectID">5267</int> + <reference key="object" ref="189856761"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="371333119"/> + <reference ref="218707841"/> </object> - <reference key="parent" ref="31135925"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5607</int> - <reference key="object" ref="371333119"/> - <reference key="parent" ref="684819179"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5608</int> - <reference key="object" ref="196185392"/> - <reference key="parent" ref="950540175"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5609</int> - <reference key="object" ref="1000000271"/> - <reference key="parent" ref="945929172"/> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5612</int> - <reference key="object" ref="839299955"/> + <int key="objectID">5268</int> + <reference key="object" ref="187191991"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1013426677"/> + <reference ref="737530250"/> </object> - <reference key="parent" ref="31135925"/> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5613</int> - <reference key="object" ref="638710413"/> + <int key="objectID">5269</int> + <reference key="object" ref="71258292"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="791857368"/> + <reference ref="1056521404"/> </object> - <reference key="parent" ref="31135925"/> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5614</int> - <reference key="object" ref="104955330"/> + <int key="objectID">5270</int> + <reference key="object" ref="1000646962"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="69612386"/> + <reference ref="289965133"/> </object> - <reference key="parent" ref="31135925"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5615</int> - <reference key="object" ref="69612386"/> - <reference key="parent" ref="104955330"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5616</int> - <reference key="object" ref="791857368"/> - <reference key="parent" ref="638710413"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5617</int> - <reference key="object" ref="1013426677"/> - <reference key="parent" ref="839299955"/> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5668</int> - <reference key="object" ref="12066713"/> + <int key="objectID">5271</int> + <reference key="object" ref="632758915"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="538839943"/> + <reference ref="664433389"/> </object> - <reference key="parent" ref="0"/> - <string key="objectName">SSL Key File Selection Help</string> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5669</int> - <reference key="object" ref="538839943"/> + <int key="objectID">5272</int> + <reference key="object" ref="1049720725"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="124352014"/> + <reference ref="615536496"/> </object> - <reference key="parent" ref="12066713"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5670</int> - <reference key="object" ref="124352014"/> - <reference key="parent" ref="538839943"/> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5680</int> - <reference key="object" ref="3577372"/> + <int key="objectID">5273</int> + <reference key="object" ref="914345743"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="761812578"/> + <reference ref="265944034"/> </object> - <reference key="parent" ref="0"/> - <string key="objectName">SSL CA Cert File Selection Help</string> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5681</int> - <reference key="object" ref="761812578"/> + <int key="objectID">5284</int> + <reference key="object" ref="844385120"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="444474564"/> + <reference ref="505035309"/> </object> - <reference key="parent" ref="3577372"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5682</int> - <reference key="object" ref="444474564"/> - <reference key="parent" ref="761812578"/> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5683</int> - <reference key="object" ref="136328549"/> + <int key="objectID">5285</int> + <reference key="object" ref="81612279"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="802544195"/> + <reference ref="386177793"/> </object> - <reference key="parent" ref="0"/> - <string key="objectName">SSL Certificate File Selection Help</string> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5684</int> - <reference key="object" ref="802544195"/> + <int key="objectID">5286</int> + <reference key="object" ref="790983747"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="196059550"/> + <reference ref="347555313"/> </object> - <reference key="parent" ref="136328549"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5685</int> - <reference key="object" ref="196059550"/> - <reference key="parent" ref="802544195"/> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5688</int> - <reference key="object" ref="866600720"/> + <int key="objectID">5287</int> + <reference key="object" ref="558754343"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="98826968"/> - <reference ref="484504415"/> - <reference ref="680939705"/> - <reference ref="521125104"/> - <reference ref="216069484"/> - <reference ref="988136593"/> - <reference ref="237955939"/> - <reference ref="57862599"/> - <reference ref="51601157"/> + <reference ref="222275233"/> </object> - <reference key="parent" ref="962671066"/> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5689</int> - <reference key="object" ref="98826968"/> + <int key="objectID">5288</int> + <reference key="object" ref="21480939"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="730590428"/> + <reference ref="944931136"/> </object> - <reference key="parent" ref="866600720"/> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5690</int> - <reference key="object" ref="484504415"/> + <int key="objectID">5289</int> + <reference key="object" ref="627782947"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="169093017"/> + <reference ref="369035253"/> </object> - <reference key="parent" ref="866600720"/> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5691</int> - <reference key="object" ref="680939705"/> + <int key="objectID">5290</int> + <reference key="object" ref="692784990"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="308087760"/> + <reference ref="850057181"/> </object> - <reference key="parent" ref="866600720"/> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5692</int> - <reference key="object" ref="521125104"/> + <int key="objectID">5291</int> + <reference key="object" ref="984151006"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1025158673"/> + <reference ref="563972303"/> </object> - <reference key="parent" ref="866600720"/> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5693</int> - <reference key="object" ref="216069484"/> + <int key="objectID">5403</int> + <reference key="object" ref="1022082829"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="276609847"/> + <reference ref="833542503"/> </object> - <reference key="parent" ref="866600720"/> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5694</int> - <reference key="object" ref="988136593"/> + <int key="objectID">5404</int> + <reference key="object" ref="761323775"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="559442548"/> + <reference ref="906889126"/> </object> - <reference key="parent" ref="866600720"/> + <reference key="parent" ref="326102394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5695</int> - <reference key="object" ref="237955939"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="167444868"/> - </object> - <reference key="parent" ref="866600720"/> + <int key="objectID">5405</int> + <reference key="object" ref="906889126"/> + <reference key="parent" ref="761323775"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5696</int> - <reference key="object" ref="57862599"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="357553281"/> - </object> - <reference key="parent" ref="866600720"/> + <int key="objectID">5406</int> + <reference key="object" ref="833542503"/> + <reference key="parent" ref="1022082829"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5697</int> - <reference key="object" ref="51601157"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="575863174"/> - </object> - <reference key="parent" ref="866600720"/> + <int key="objectID">5292</int> + <reference key="object" ref="563972303"/> + <reference key="parent" ref="984151006"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5698</int> - <reference key="object" ref="575863174"/> - <reference key="parent" ref="51601157"/> + <int key="objectID">5293</int> + <reference key="object" ref="850057181"/> + <reference key="parent" ref="692784990"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5699</int> - <reference key="object" ref="357553281"/> - <reference key="parent" ref="57862599"/> + <int key="objectID">5294</int> + <reference key="object" ref="369035253"/> + <reference key="parent" ref="627782947"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5700</int> - <reference key="object" ref="167444868"/> - <reference key="parent" ref="237955939"/> + <int key="objectID">5295</int> + <reference key="object" ref="944931136"/> + <reference key="parent" ref="21480939"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5701</int> - <reference key="object" ref="559442548"/> - <reference key="parent" ref="988136593"/> + <int key="objectID">5296</int> + <reference key="object" ref="222275233"/> + <reference key="parent" ref="558754343"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5702</int> - <reference key="object" ref="276609847"/> - <reference key="parent" ref="216069484"/> + <int key="objectID">5297</int> + <reference key="object" ref="347555313"/> + <reference key="parent" ref="790983747"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5703</int> - <reference key="object" ref="1025158673"/> - <reference key="parent" ref="521125104"/> + <int key="objectID">5298</int> + <reference key="object" ref="386177793"/> + <reference key="parent" ref="81612279"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5704</int> - <reference key="object" ref="308087760"/> - <reference key="parent" ref="680939705"/> + <int key="objectID">5299</int> + <reference key="object" ref="505035309"/> + <reference key="parent" ref="844385120"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5705</int> - <reference key="object" ref="169093017"/> - <reference key="parent" ref="484504415"/> + <int key="objectID">5274</int> + <reference key="object" ref="265944034"/> + <reference key="parent" ref="914345743"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5706</int> - <reference key="object" ref="730590428"/> - <reference key="parent" ref="98826968"/> + <int key="objectID">5275</int> + <reference key="object" ref="615536496"/> + <reference key="parent" ref="1049720725"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5720</int> - <reference key="object" ref="16421625"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="972347112"/> - </object> - <reference key="parent" ref="394302879"/> + <int key="objectID">5276</int> + <reference key="object" ref="664433389"/> + <reference key="parent" ref="632758915"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5721</int> - <reference key="object" ref="972347112"/> - <reference key="parent" ref="16421625"/> + <int key="objectID">5277</int> + <reference key="object" ref="289965133"/> + <reference key="parent" ref="1000646962"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5739</int> - <reference key="object" ref="988671905"/> - <reference key="parent" ref="949612237"/> + <int key="objectID">5278</int> + <reference key="object" ref="1056521404"/> + <reference key="parent" ref="71258292"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5740</int> - <reference key="object" ref="943591987"/> - <reference key="parent" ref="949612237"/> + <int key="objectID">5279</int> + <reference key="object" ref="737530250"/> + <reference key="parent" ref="187191991"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5741</int> - <reference key="object" ref="130047523"/> - <reference key="parent" ref="949612237"/> + <int key="objectID">5280</int> + <reference key="object" ref="218707841"/> + <reference key="parent" ref="189856761"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5468</int> - <reference key="object" ref="9858888"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="471954922"/> - <reference ref="654155668"/> - <reference ref="1018515429"/> - <reference ref="345191685"/> - <reference ref="203173317"/> - <reference ref="498336476"/> - <reference ref="308601296"/> - </object> - <reference key="parent" ref="0"/> - <string key="objectName">Context Menu</string> + <int key="objectID">5281</int> + <reference key="object" ref="869330413"/> + <reference key="parent" ref="358903996"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5469</int> - <reference key="object" ref="471954922"/> - <reference key="parent" ref="9858888"/> + <int key="objectID">5282</int> + <reference key="object" ref="547674489"/> + <reference key="parent" ref="615962367"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5742</int> - <reference key="object" ref="654155668"/> - <reference key="parent" ref="9858888"/> + <int key="objectID">5283</int> + <reference key="object" ref="933547668"/> + <reference key="parent" ref="1030226140"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5745</int> - <reference key="object" ref="14440548"/> - <reference key="parent" ref="949612237"/> + <int key="objectID">5493</int> + <reference key="object" ref="510891456"/> + <reference key="parent" ref="183948302"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5524</int> + <reference key="object" ref="13940444"/> + <reference key="parent" ref="180145997"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5526</int> + <reference key="object" ref="882604644"/> + <reference key="parent" ref="906103858"/> </object> <object class="IBObjectRecord"> <int key="objectID">5746</int> - <reference key="object" ref="1021417946"/> - <reference key="parent" ref="949612237"/> + <reference key="object" ref="492456125"/> + <reference key="parent" ref="9858888"/> </object> <object class="IBObjectRecord"> <int key="objectID">5747</int> - <reference key="object" ref="308601296"/> + <reference key="object" ref="111315005"/> <reference key="parent" ref="9858888"/> </object> <object class="IBObjectRecord"> <int key="objectID">5748</int> - <reference key="object" ref="498336476"/> + <reference key="object" ref="1069447512"/> <reference key="parent" ref="9858888"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5755</int> - <reference key="object" ref="203173317"/> + <int key="objectID">5749</int> + <reference key="object" ref="397716655"/> <reference key="parent" ref="9858888"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5756</int> - <reference key="object" ref="47300604"/> - <reference key="parent" ref="949612237"/> + <int key="objectID">5750</int> + <reference key="object" ref="24826659"/> + <reference key="parent" ref="9858888"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5785</int> - <reference key="object" ref="817268454"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="140036820"/> - </object> - <reference key="parent" ref="805249222"/> + <int key="objectID">5751</int> + <reference key="object" ref="231143565"/> + <reference key="parent" ref="9858888"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5786</int> - <reference key="object" ref="140036820"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="344531331"/> - </object> - <reference key="parent" ref="817268454"/> + <int key="objectID">5752</int> + <reference key="object" ref="11275875"/> + <reference key="parent" ref="949612237"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5787</int> - <reference key="object" ref="344531331"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="54131866"/> - <reference ref="948840643"/> - <reference ref="351084462"/> - </object> - <reference key="parent" ref="140036820"/> + <int key="objectID">5753</int> + <reference key="object" ref="875696059"/> + <reference key="parent" ref="949612237"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5788</int> - <reference key="object" ref="54131866"/> - <reference key="parent" ref="344531331"/> + <int key="objectID">5754</int> + <reference key="object" ref="839925568"/> + <reference key="parent" ref="949612237"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5790</int> - <reference key="object" ref="351084462"/> - <reference key="parent" ref="344531331"/> + <int key="objectID">5755</int> + <reference key="object" ref="785902570"/> + <reference key="parent" ref="949612237"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5794</int> - <reference key="object" ref="948840643"/> - <reference key="parent" ref="344531331"/> + <int key="objectID">5756</int> + <reference key="object" ref="864185279"/> + <reference key="parent" ref="949612237"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5810</int> - <reference key="object" ref="176010547"/> + <int key="objectID">5757</int> + <reference key="object" ref="1062672584"/> <reference key="parent" ref="949612237"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5811</int> - <reference key="object" ref="296811585"/> + <int key="objectID">5758</int> + <reference key="object" ref="444328485"/> <reference key="parent" ref="949612237"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5812</int> - <reference key="object" ref="541704663"/> + <int key="objectID">5759</int> + <reference key="object" ref="885080859"/> <reference key="parent" ref="949612237"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5814</int> - <reference key="object" ref="1018515429"/> - <reference key="parent" ref="9858888"/> + <int key="objectID">5760</int> + <reference key="object" ref="509439698"/> + <reference key="parent" ref="949612237"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5815</int> - <reference key="object" ref="345191685"/> - <reference key="parent" ref="9858888"/> + <int key="objectID">5780</int> + <reference key="object" ref="143274444"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="526253214"/> + </object> + <reference key="parent" ref="805249222"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5781</int> + <reference key="object" ref="526253214"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="192444974"/> + </object> + <reference key="parent" ref="143274444"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5782</int> + <reference key="object" ref="192444974"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="853194524"/> + <reference ref="125642911"/> + <reference ref="773701029"/> + </object> + <reference key="parent" ref="526253214"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5790</int> + <reference key="object" ref="853194524"/> + <reference key="parent" ref="192444974"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5791</int> + <reference key="object" ref="125642911"/> + <reference key="parent" ref="192444974"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5793</int> + <reference key="object" ref="773701029"/> + <reference key="parent" ref="192444974"/> </object> </object> </object> @@ -6347,8 +6397,6 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>-3.IBPluginDependency</string> <string>-3.ImportedFromIB2</string> - <string>4826.IBEditorWindowLastContentRect</string> - <string>4826.IBPluginDependency</string> <string>4829.IBPluginDependency</string> <string>4829.ImportedFromIB2</string> <string>4839.IBPluginDependency</string> @@ -6473,9 +6521,6 @@ <string>5297.IBPluginDependency</string> <string>5298.IBPluginDependency</string> <string>5299.IBPluginDependency</string> - <string>5342.IBPluginDependency</string> - <string>5343.IBPluginDependency</string> - <string>5344.IBPluginDependency</string> <string>5345.IBPluginDependency</string> <string>5376.IBAttributePlaceholdersKey</string> <string>5376.IBPluginDependency</string> @@ -6511,6 +6556,7 @@ <string>5435.IBPluginDependency</string> <string>5436.IBPluginDependency</string> <string>5447.IBPluginDependency</string> + <string>5455.IBPluginDependency</string> <string>5468.IBEditorWindowLastContentRect</string> <string>5468.IBPluginDependency</string> <string>5469.IBPluginDependency</string> @@ -6602,36 +6648,38 @@ <string>5706.IBPluginDependency</string> <string>5720.IBPluginDependency</string> <string>5721.IBPluginDependency</string> + <string>5739.IBEditorWindowLastContentRect</string> <string>5739.IBPluginDependency</string> - <string>5740.IBPluginDependency</string> <string>5741.IBPluginDependency</string> <string>5742.IBPluginDependency</string> - <string>5745.IBPluginDependency</string> + <string>5743.IBPluginDependency</string> <string>5746.IBPluginDependency</string> <string>5747.IBPluginDependency</string> <string>5748.IBPluginDependency</string> + <string>5749.IBPluginDependency</string> + <string>5750.IBPluginDependency</string> + <string>5751.IBPluginDependency</string> + <string>5752.IBPluginDependency</string> + <string>5753.IBPluginDependency</string> + <string>5754.IBPluginDependency</string> <string>5755.IBPluginDependency</string> <string>5756.IBPluginDependency</string> - <string>5785.IBPluginDependency</string> - <string>5785.IBViewBoundsToFrameTransform</string> - <string>5786.IBPluginDependency</string> - <string>5787.IBEditorWindowLastContentRect</string> - <string>5787.IBPluginDependency</string> - <string>5788.IBPluginDependency</string> + <string>5757.IBPluginDependency</string> + <string>5758.IBPluginDependency</string> + <string>5759.IBPluginDependency</string> + <string>5760.IBPluginDependency</string> + <string>5780.IBPluginDependency</string> + <string>5781.IBPluginDependency</string> + <string>5782.IBEditorWindowLastContentRect</string> + <string>5782.IBPluginDependency</string> <string>5790.IBPluginDependency</string> - <string>5794.IBPluginDependency</string> - <string>5810.IBPluginDependency</string> - <string>5811.IBPluginDependency</string> - <string>5812.IBPluginDependency</string> - <string>5814.IBPluginDependency</string> - <string>5815.IBPluginDependency</string> + <string>5791.IBPluginDependency</string> + <string>5793.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{47, 270}, {882, 475}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -6896,9 +6944,6 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.brandonwalkin.BWToolkit</string> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> @@ -6961,7 +7006,8 @@ <string>com.brandonwalkin.BWToolkit</string> <string>com.brandonwalkin.BWToolkit</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{472, 412}, {142, 123}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{725, 739}, {142, 123}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.brandonwalkin.BWToolkit</string> @@ -6969,11 +7015,11 @@ <bytes key="NSTransformStruct">P4AAAL+AAAC/gAAAwagAAA</bytes> </object> <string>com.brandonwalkin.BWToolkit</string> - <string>{{35, 125}, {131, 169}}</string> + <string>{{129, -14}, {131, 169}}</string> <string>com.brandonwalkin.BWToolkit</string> <string>com.brandonwalkin.BWToolkit</string> <string>com.brandonwalkin.BWToolkit</string> - <string>{{425, 97}, {180, 93}}</string> + <string>{{649, 98}, {180, 93}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -7103,6 +7149,11 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{141, 131}, {882, 475}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.brandonwalkin.BWToolkit</string> + <string>com.brandonwalkin.BWToolkit</string> + <string>com.brandonwalkin.BWToolkit</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -7113,21 +7164,18 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.brandonwalkin.BWToolkit</string> - <object class="NSAffineTransform"> - <bytes key="NSTransformStruct">P4AAAL+AAAC/gAAAwagAAA</bytes> - </object> - <string>com.brandonwalkin.BWToolkit</string> - <string>{{113, 232}, {128, 62}}</string> - <string>com.brandonwalkin.BWToolkit</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.brandonwalkin.BWToolkit</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.brandonwalkin.BWToolkit</string> + <string>com.brandonwalkin.BWToolkit</string> + <string>{{160, 101}, {131, 54}}</string> + <string>com.brandonwalkin.BWToolkit</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.brandonwalkin.BWToolkit</string> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> @@ -7146,7 +7194,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">5833</int> + <int key="maxID">5811</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -7939,6 +7987,25 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">BWSplitView</string> + <string key="superclassName">NSSplitView</string> + <object class="NSMutableDictionary" key="actions"> + <string key="NS.key.0">toggleCollapse:</string> + <string key="NS.object.0">id</string> + </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">toggleCollapse:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">toggleCollapse:</string> + <string key="candidateClassName">id</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">BWToolkitFramework.framework/Headers/BWSplitView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">BWTransparentScrollView</string> <string key="superclassName">NSScrollView</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -8045,6 +8112,14 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">NSController</string> + <string key="superclassName">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">NSFormatter</string> <string key="superclassName">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -8606,6 +8681,14 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">NSUserDefaultsController</string> + <string key="superclassName">NSController</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSUserDefaultsController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">NSView</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> @@ -8692,7 +8775,6 @@ <string>NSMenuCheckmark</string> <string>NSMenuMixedState</string> <string>NSSwitch</string> - <string>plus</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -8701,7 +8783,6 @@ <string>{9, 8}</string> <string>{7, 2}</string> <string>{15, 15}</string> - <string>{32, 23}</string> </object> </object> </data> diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 760c4033..1b6dd208 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -23,13 +23,13 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="7210"/> + <integer value="27"/> </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"> <string key="NS.key.0">PluginDependencyRecalculationVersion</string> @@ -51,18 +51,312 @@ <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSSplitView" id="937377983"> + <object class="BWSplitView" id="162770193"> <reference key="NSNextResponder" ref="632807581"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSCustomView" id="372294785"> - <reference key="NSNextResponder" ref="937377983"/> - <int key="NSvFlags">256</int> + <object class="BWCustomView" id="1053680279"> + <reference key="NSNextResponder" ref="162770193"/> + <int key="NSvFlags">272</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> + <object class="BWAnchoredButtonBar" id="28219887"> + <reference key="NSNextResponder" ref="1053680279"/> + <int key="NSvFlags">290</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="BWAnchoredButton" id="500608059"> + <reference key="NSNextResponder" ref="28219887"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{-1, -1}, {32, 24}}</string> + <reference key="NSSuperview" ref="28219887"/> + <bool key="NSEnabled">YES</bool> + <object class="BWAnchoredButtonCell" key="NSCell" id="283448047"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134348800</int> + <string key="NSContents"/> + <object class="NSFont" key="NSSupport" id="26"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">11</double> + <int key="NSfFlags">3100</int> + </object> + <reference key="NSControlView" ref="500608059"/> + <int key="NSButtonFlags">113524991</int> + <int key="NSButtonFlags2">163</int> + <object class="NSCustomResource" key="NSNormalImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSAddTemplate</string> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="BWAnchoredPopUpButton" id="960207750"> + <reference key="NSNextResponder" ref="28219887"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{30, -1}, {32, 24}}</string> + <reference key="NSSuperview" ref="28219887"/> + <bool key="NSEnabled">YES</bool> + <object class="BWAnchoredPopUpButtonCell" key="NSCell" id="321871356"> + <int key="NSCellFlags">71433792</int> + <int key="NSCellFlags2">134219776</int> + <object class="NSFont" key="NSSupport" id="244931163"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">13</double> + <int key="NSfFlags">1044</int> + </object> + <reference key="NSControlView" ref="960207750"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">163</int> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + <object class="NSMenuItem" key="NSMenuItem" id="545621807"> + <reference key="NSMenu" ref="890046805"/> + <bool key="NSIsHidden">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <object class="NSCustomResource" key="NSImage" id="551275390"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSActionTemplate</string> + </object> + <object class="NSCustomResource" key="NSOnImage" id="450876295"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSMenuCheckmark</string> + </object> + <object class="NSCustomResource" key="NSMixedImage" id="414351669"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSMenuMixedState</string> + </object> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="321871356"/> + </object> + <bool key="NSMenuItemRespectAlignment">YES</bool> + <object class="NSMenu" key="NSMenu" id="890046805"> + <string key="NSTitle">OtherViews</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="545621807"/> + <object class="NSMenuItem" id="112091395"> + <reference key="NSMenu" ref="890046805"/> + <string key="NSTitle">Rename Table...</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="321871356"/> + </object> + <object class="NSMenuItem" id="897887117"> + <reference key="NSMenu" ref="890046805"/> + <string key="NSTitle">Duplicate Table...</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="321871356"/> + </object> + <object class="NSMenuItem" id="226083732"> + <reference key="NSMenu" ref="890046805"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <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="321871356"/> + </object> + <object class="NSMenuItem" id="962084508"> + <reference key="NSMenu" ref="890046805"/> + <string key="NSTitle">Truncate Table</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="321871356"/> + </object> + <object class="NSMenuItem" id="351524538"> + <reference key="NSMenu" ref="890046805"/> + <string key="NSTitle">Remove Table</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="321871356"/> + </object> + <object class="NSMenuItem" id="215466732"> + <reference key="NSMenu" ref="890046805"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <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="321871356"/> + </object> + <object class="NSMenuItem" id="1049807214"> + <reference key="NSMenu" ref="890046805"/> + <string key="NSTitle">Open Table in New Tab</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="321871356"/> + </object> + <object class="NSMenuItem" id="584909701"> + <reference key="NSMenu" ref="890046805"/> + <string key="NSTitle">Export</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="450876295"/> + <reference key="NSMixedImage" ref="414351669"/> + <string key="NSAction">submenuAction:</string> + <object class="NSMenu" key="NSSubmenu" id="593991505"> + <string key="NSTitle">Export</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMenuItem" id="639503037"> + <reference key="NSMenu" ref="593991505"/> + <string key="NSTitle">As SQL dump...</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="450876295"/> + <reference key="NSMixedImage" ref="414351669"/> + <string key="NSAction">_popUpItemAction:</string> + <int key="NSTag">1</int> + <reference key="NSTarget" ref="321871356"/> + </object> + <object class="NSMenuItem" id="779058431"> + <reference key="NSMenu" ref="593991505"/> + <string key="NSTitle">As CSV file...</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="450876295"/> + <reference key="NSMixedImage" ref="414351669"/> + <string key="NSAction">_popUpItemAction:</string> + <int key="NSTag">2</int> + <reference key="NSTarget" ref="321871356"/> + </object> + <object class="NSMenuItem" id="752934580"> + <reference key="NSMenu" ref="593991505"/> + <string key="NSTitle">As XML file...</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="450876295"/> + <reference key="NSMixedImage" ref="414351669"/> + <string key="NSAction">_popUpItemAction:</string> + <int key="NSTag">3</int> + <reference key="NSTarget" ref="321871356"/> + </object> + </object> + </object> + </object> + <object class="NSMenuItem" id="160189226"> + <reference key="NSMenu" ref="890046805"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <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="321871356"/> + </object> + <object class="NSMenuItem" id="570147191"> + <reference key="NSMenu" ref="890046805"/> + <string key="NSTitle">Show Create Table Syntax...</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="321871356"/> + </object> + </object> + </object> + <bool key="NSPullDown">YES</bool> + <int key="NSPreferredEdge">1</int> + <bool key="NSUsesItemFromMenu">YES</bool> + <bool key="NSAltersState">YES</bool> + </object> + </object> + <object class="BWAnchoredButton" id="595750628"> + <reference key="NSNextResponder" ref="28219887"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{61, -1}, {32, 24}}</string> + <reference key="NSSuperview" ref="28219887"/> + <bool key="NSEnabled">YES</bool> + <object class="BWAnchoredButtonCell" key="NSCell" id="227511715"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134348800</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="595750628"/> + <int key="NSButtonFlags">113524991</int> + <int key="NSButtonFlags2">163</int> + <object class="NSCustomResource" key="NSNormalImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSRefreshTemplate</string> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="BWAnchoredButton" id="57416393"> + <reference key="NSNextResponder" ref="28219887"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{92, -1}, {32, 24}}</string> + <reference key="NSSuperview" ref="28219887"/> + <bool key="NSEnabled">YES</bool> + <object class="BWAnchoredButtonCell" key="NSCell" id="708016222"> + <int key="NSCellFlags">-2080244224</int> + <int key="NSCellFlags2">134348800</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="57416393"/> + <int key="NSButtonFlags">-926662401</int> + <int key="NSButtonFlags2">163</int> + <object class="NSCustomResource" key="NSNormalImage" id="230512564"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">button_pane_show_icon</string> + </object> + <object class="NSCustomResource" key="NSAlternateImage" id="6531"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">button_pane_hide_icon</string> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + </object> + <string key="NSFrame">{{0, 1}, {214, 23}}</string> + <reference key="NSSuperview" ref="1053680279"/> + <bool key="BWABBIsResizable">YES</bool> + <bool key="BWABBIsAtBottom">YES</bool> + <bool key="BWABBHandleIsRightAligned">NO</bool> + <int key="BWABBSelectedIndex">0</int> + </object> <object class="BWSplitView" id="298095498"> - <reference key="NSNextResponder" ref="372294785"/> + <reference key="NSNextResponder" ref="1053680279"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -91,11 +385,7 @@ <int key="NSCellFlags">343014976</int> <int key="NSCellFlags2">268567552</int> <string key="NSContents"/> - <object class="NSFont" key="NSSupport" id="26"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">11</double> - <int key="NSfFlags">3100</int> - </object> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="727834078"/> <bool key="NSDrawsBackground">YES</bool> <int key="NSTextBezelStyle">1</int> @@ -210,11 +500,7 @@ <int key="NSCellFlags">69336641</int> <int key="NSCellFlags2">2048</int> <string key="NSContents">Text Cell</string> - <object class="NSFont" key="NSSupport" id="244931163"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">13</double> - <int key="NSfFlags">1044</int> - </object> + <reference key="NSSupport" ref="244931163"/> <reference key="NSControlView" ref="970881282"/> <object class="NSColor" key="NSBackgroundColor" id="62854682"> <int key="NSColorSpace">6</int> @@ -222,7 +508,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"/> @@ -329,7 +615,7 @@ <object class="NSTableView" id="251040077"> <reference key="NSNextResponder" ref="73685676"/> <int key="NSvFlags">4352</int> - <string key="NSFrameSize">{214, 354}</string> + <string key="NSFrameSize">{214, 352}</string> <reference key="NSSuperview" ref="73685676"/> <bool key="NSEnabled">YES</bool> <object class="_NSCornerView" key="NSCornerView"> @@ -395,7 +681,7 @@ <int key="NSTableViewDraggingDestinationStyle">1</int> </object> </object> - <string key="NSFrameSize">{214, 354}</string> + <string key="NSFrameSize">{214, 352}</string> <reference key="NSSuperview" ref="233472824"/> <reference key="NSNextKeyView" ref="251040077"/> <reference key="NSDocView" ref="251040077"/> @@ -423,7 +709,7 @@ <double key="NSPercent">0.99047619104385376</double> </object> </object> - <string key="NSFrameSize">{214, 354}</string> + <string key="NSFrameSize">{214, 352}</string> <reference key="NSSuperview" ref="1017775084"/> <reference key="NSNextKeyView" ref="73685676"/> <int key="NSsFlags">528</int> @@ -433,12 +719,12 @@ <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes> </object> </object> - <string key="NSFrame">{{0, 27}, {214, 354}}</string> + <string key="NSFrame">{{0, 27}, {214, 352}}</string> <reference key="NSSuperview" ref="213762440"/> <string key="NSClassName">NSView</string> </object> </object> - <string key="NSFrameSize">{214, 381}</string> + <string key="NSFrameSize">{214, 379}</string> <reference key="NSSuperview" ref="131633443"/> <int key="NSDividerStyle">2</int> <object class="NSColor" key="BWSVColor"> @@ -471,7 +757,7 @@ <bool key="BWSVDividerCanCollapse">NO</bool> </object> </object> - <string key="NSFrameSize">{214, 381}</string> + <string key="NSFrameSize">{214, 379}</string> <reference key="NSSuperview" ref="298095498"/> <string key="NSClassName">NSView</string> </object> @@ -505,7 +791,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTableColumn" id="195537032"> <string key="NSIdentifier">name</string> - <double key="NSWidth">211</double> + <double key="NSWidth">213</double> <double key="NSMinWidth">43</double> <double key="NSMaxWidth">1000</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> @@ -548,7 +834,7 @@ </object> <reference key="NSGridColor" ref="864903678"/> <double key="NSRowHeight">45</double> - <int key="NSTvFlags">1377828864</int> + <int key="NSTvFlags">1379926016</int> <reference key="NSDelegate"/> <reference key="NSDataSource"/> <int key="NSColumnAutoresizingStyle">2</int> @@ -712,13 +998,13 @@ <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes> </object> </object> - <string key="NSFrame">{{0, 382}, {214, 145}}</string> + <string key="NSFrame">{{0, 380}, {214, 145}}</string> <reference key="NSSuperview" ref="298095498"/> <string key="NSClassName">NSView</string> </object> </object> - <string key="NSFrame">{{0, 23}, {214, 527}}</string> - <reference key="NSSuperview" ref="372294785"/> + <string key="NSFrame">{{0, 24}, {214, 525}}</string> + <reference key="NSSuperview" ref="1053680279"/> <int key="NSDividerStyle">2</int> <reference key="BWSVColor" ref="304829493"/> <bool key="BWSVColorIsEnabled">NO</bool> @@ -759,307 +1045,21 @@ <int key="BWSVCollapsiblePopupSelection">2</int> <bool key="BWSVDividerCanCollapse">NO</bool> </object> - <object class="BWAnchoredButtonBar" id="28219887"> - <reference key="NSNextResponder" ref="372294785"/> - <int key="NSvFlags">290</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="BWAnchoredButton" id="500608059"> - <reference key="NSNextResponder" ref="28219887"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{-1, -1}, {32, 24}}</string> - <reference key="NSSuperview" ref="28219887"/> - <bool key="NSEnabled">YES</bool> - <object class="BWAnchoredButtonCell" key="NSCell" id="283448047"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134348800</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="500608059"/> - <int key="NSButtonFlags">113524991</int> - <int key="NSButtonFlags2">163</int> - <object class="NSCustomResource" key="NSNormalImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSAddTemplate</string> - </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="BWAnchoredPopUpButton" id="960207750"> - <reference key="NSNextResponder" ref="28219887"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{30, -1}, {32, 24}}</string> - <reference key="NSSuperview" ref="28219887"/> - <bool key="NSEnabled">YES</bool> - <object class="BWAnchoredPopUpButtonCell" key="NSCell" id="321871356"> - <int key="NSCellFlags">71433792</int> - <int key="NSCellFlags2">134219776</int> - <reference key="NSSupport" ref="244931163"/> - <reference key="NSControlView" ref="960207750"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">163</int> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> - <object class="NSMenuItem" key="NSMenuItem" id="545621807"> - <reference key="NSMenu" ref="890046805"/> - <bool key="NSIsHidden">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <object class="NSCustomResource" key="NSImage" id="551275390"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSActionTemplate</string> - </object> - <object class="NSCustomResource" key="NSOnImage" id="450876295"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSMenuCheckmark</string> - </object> - <object class="NSCustomResource" key="NSMixedImage" id="414351669"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSMenuMixedState</string> - </object> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="321871356"/> - </object> - <bool key="NSMenuItemRespectAlignment">YES</bool> - <object class="NSMenu" key="NSMenu" id="890046805"> - <string key="NSTitle">OtherViews</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="545621807"/> - <object class="NSMenuItem" id="112091395"> - <reference key="NSMenu" ref="890046805"/> - <string key="NSTitle">Rename Table...</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="321871356"/> - </object> - <object class="NSMenuItem" id="897887117"> - <reference key="NSMenu" ref="890046805"/> - <string key="NSTitle">Duplicate Table...</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="321871356"/> - </object> - <object class="NSMenuItem" id="226083732"> - <reference key="NSMenu" ref="890046805"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <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="321871356"/> - </object> - <object class="NSMenuItem" id="962084508"> - <reference key="NSMenu" ref="890046805"/> - <string key="NSTitle">Truncate Table</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="321871356"/> - </object> - <object class="NSMenuItem" id="351524538"> - <reference key="NSMenu" ref="890046805"/> - <string key="NSTitle">Remove Table</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="321871356"/> - </object> - <object class="NSMenuItem" id="215466732"> - <reference key="NSMenu" ref="890046805"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <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="321871356"/> - </object> - <object class="NSMenuItem" id="1049807214"> - <reference key="NSMenu" ref="890046805"/> - <string key="NSTitle">Open Table in New Tab</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="321871356"/> - </object> - <object class="NSMenuItem" id="584909701"> - <reference key="NSMenu" ref="890046805"/> - <string key="NSTitle">Export</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="450876295"/> - <reference key="NSMixedImage" ref="414351669"/> - <string key="NSAction">submenuAction:</string> - <object class="NSMenu" key="NSSubmenu" id="593991505"> - <string key="NSTitle">Export</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="639503037"> - <reference key="NSMenu" ref="593991505"/> - <string key="NSTitle">As SQL dump...</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="450876295"/> - <reference key="NSMixedImage" ref="414351669"/> - <string key="NSAction">_popUpItemAction:</string> - <int key="NSTag">1</int> - <reference key="NSTarget" ref="321871356"/> - </object> - <object class="NSMenuItem" id="779058431"> - <reference key="NSMenu" ref="593991505"/> - <string key="NSTitle">As CSV file...</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="450876295"/> - <reference key="NSMixedImage" ref="414351669"/> - <string key="NSAction">_popUpItemAction:</string> - <int key="NSTag">2</int> - <reference key="NSTarget" ref="321871356"/> - </object> - <object class="NSMenuItem" id="752934580"> - <reference key="NSMenu" ref="593991505"/> - <string key="NSTitle">As XML file...</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="450876295"/> - <reference key="NSMixedImage" ref="414351669"/> - <string key="NSAction">_popUpItemAction:</string> - <int key="NSTag">3</int> - <reference key="NSTarget" ref="321871356"/> - </object> - </object> - </object> - </object> - <object class="NSMenuItem" id="160189226"> - <reference key="NSMenu" ref="890046805"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <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="321871356"/> - </object> - <object class="NSMenuItem" id="570147191"> - <reference key="NSMenu" ref="890046805"/> - <string key="NSTitle">Show Create Table Syntax...</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="321871356"/> - </object> - </object> - </object> - <bool key="NSPullDown">YES</bool> - <int key="NSPreferredEdge">1</int> - <bool key="NSUsesItemFromMenu">YES</bool> - <bool key="NSAltersState">YES</bool> - </object> - </object> - <object class="BWAnchoredButton" id="595750628"> - <reference key="NSNextResponder" ref="28219887"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{61, -1}, {32, 24}}</string> - <reference key="NSSuperview" ref="28219887"/> - <bool key="NSEnabled">YES</bool> - <object class="BWAnchoredButtonCell" key="NSCell" id="227511715"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134348800</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="595750628"/> - <int key="NSButtonFlags">113524991</int> - <int key="NSButtonFlags2">163</int> - <object class="NSCustomResource" key="NSNormalImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSRefreshTemplate</string> - </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="BWAnchoredButton" id="57416393"> - <reference key="NSNextResponder" ref="28219887"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{92, -1}, {32, 24}}</string> - <reference key="NSSuperview" ref="28219887"/> - <bool key="NSEnabled">YES</bool> - <object class="BWAnchoredButtonCell" key="NSCell" id="708016222"> - <int key="NSCellFlags">-2080244224</int> - <int key="NSCellFlags2">134348800</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="57416393"/> - <int key="NSButtonFlags">-926662401</int> - <int key="NSButtonFlags2">163</int> - <object class="NSCustomResource" key="NSNormalImage" id="230512564"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">button_pane_show_icon</string> - </object> - <object class="NSCustomResource" key="NSAlternateImage" id="6531"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">button_pane_hide_icon</string> - </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - </object> - <string key="NSFrame">{{0, 1}, {214, 23}}</string> - <reference key="NSSuperview" ref="372294785"/> - <bool key="BWABBIsResizable">YES</bool> - <bool key="BWABBIsAtBottom">YES</bool> - <bool key="BWABBHandleIsRightAligned">NO</bool> - <int key="BWABBSelectedIndex">0</int> - </object> </object> - <string key="NSFrameSize">{214, 550}</string> - <reference key="NSSuperview" ref="937377983"/> + <string key="NSFrameSize">{214, 549}</string> + <reference key="NSSuperview" ref="162770193"/> <string key="NSClassName">NSView</string> </object> - <object class="NSCustomView" id="604818293"> - <reference key="NSNextResponder" ref="937377983"/> - <int key="NSvFlags">256</int> + <object class="BWCustomView" id="882258892"> + <reference key="NSNextResponder" ref="162770193"/> + <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTabView" id="714795046"> - <reference key="NSNextResponder" ref="604818293"/> + <reference key="NSNextResponder" ref="882258892"/> <int key="NSvFlags">274</int> <string key="NSFrame">{{-7, -10}, {741, 564}}</string> - <reference key="NSSuperview" ref="604818293"/> + <reference key="NSSuperview" ref="882258892"/> <object class="NSMutableArray" key="NSTabViewItems"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTabViewItem" id="831053945"> @@ -2544,7 +2544,7 @@ <object class="NSTabViewItem" id="624106058"> <string key="NSIdentifier">content</string> <object class="NSView" key="NSView" id="1013108064"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder" ref="714795046"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -2865,55 +2865,134 @@ <reference key="NSTextColor" ref="454249633"/> </object> </object> - <object class="NSSplitView" id="231622333"> + <object class="NSButton" id="924091760"> + <reference key="NSNextResponder" ref="1013108064"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{654, 10}, {32, 25}}</string> + <reference key="NSSuperview" ref="1013108064"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="281993992"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="244931163"/> + <reference key="NSControlView" ref="924091760"/> + <int key="NSButtonFlags">-2042347265</int> + <int key="NSButtonFlags2">35</int> + <object class="NSCustomResource" key="NSNormalImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">button_right</string> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + </object> + </object> + <object class="NSButton" id="434675603"> + <reference key="NSNextResponder" ref="1013108064"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{592, 10}, {32, 25}}</string> + <reference key="NSSuperview" ref="1013108064"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="105847394"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="244931163"/> + <reference key="NSControlView" ref="434675603"/> + <int key="NSButtonFlags">-2042347265</int> + <int key="NSButtonFlags2">35</int> + <object class="NSCustomResource" key="NSNormalImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">button_left</string> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + </object> + </object> + <object class="NSButton" id="429029434"> + <reference key="NSNextResponder" ref="1013108064"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{623, 10}, {32, 25}}</string> + <reference key="NSSuperview" ref="1013108064"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="843215079"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="790379580"/> + <reference key="NSControlView" ref="429029434"/> + <int key="NSButtonFlags">-934526721</int> + <int key="NSButtonFlags2">268435491</int> + <object class="NSCustomResource" key="NSNormalImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">button_pagination</string> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent">j</string> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + </object> + </object> + <object class="NSButton" id="873734510"> + <reference key="NSNextResponder" ref="1013108064"/> + <int key="NSvFlags">265</int> + <string key="NSFrame">{{734, 507}, {160, 16}}</string> + <reference key="NSSuperview" ref="1013108064"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="212274460"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134479872</int> + <string key="NSContents">ShowFilterTable_Dummy_Button</string> + <object class="NSFont" key="NSSupport"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">9</double> + <int key="NSfFlags">3614</int> + </object> + <reference key="NSControlView" ref="873734510"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">268435585</int> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent">f</string> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSSplitView" id="262085420"> <reference key="NSNextResponder" ref="1013108064"/> <int key="NSvFlags">266</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSCustomView" id="894187833"> - <reference key="NSNextResponder" ref="231622333"/> - <int key="NSvFlags">290</int> + <object class="NSCustomView" id="795017229"> + <reference key="NSNextResponder" ref="262085420"/> + <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextField" id="905386082"> - <reference key="NSNextResponder" ref="894187833"/> - <int key="NSvFlags">264</int> - <string key="NSFrame">{{7, 6}, {43, 14}}</string> - <reference key="NSSuperview" ref="894187833"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="314592665"> - <int key="NSCellFlags">67239488</int> - <int key="NSCellFlags2">272761856</int> - <string key="NSContents">Search:</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="905386082"/> - <reference key="NSBackgroundColor" ref="62854682"/> - <reference key="NSTextColor" ref="454249633"/> - </object> - </object> - <object class="NSPopUpButton" id="830088955"> - <reference key="NSNextResponder" ref="894187833"/> - <int key="NSvFlags">266</int> - <string key="NSFrame">{{51, 3}, {160, 20}}</string> - <reference key="NSSuperview" ref="894187833"/> + <object class="NSPopUpButton" id="744029762"> + <reference key="NSNextResponder" ref="795017229"/> + <int key="NSvFlags">265</int> + <string key="NSFrame">{{216, 0}, {95, 25}}</string> + <reference key="NSSuperview" ref="795017229"/> <bool key="NSEnabled">YES</bool> - <object class="NSPopUpButtonCell" key="NSCell" id="376863254"> + <object class="NSPopUpButtonCell" key="NSCell" id="105542136"> <int key="NSCellFlags">-1539178944</int> <int key="NSCellFlags2">133120</int> - <reference key="NSSupport" ref="790379580"/> - <reference key="NSControlView" ref="830088955"/> - <int key="NSButtonFlags">-2038284033</int> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="744029762"/> + <int key="NSButtonFlags">-2038415105</int> <int key="NSButtonFlags2">36</int> - <reference key="NSAlternateImage" ref="790379580"/> <string key="NSAlternateContents"/> <object class="NSMutableString" key="NSKeyEquivalent"> <characters key="NS.bytes"/> </object> <int key="NSPeriodicDelay">400</int> <int key="NSPeriodicInterval">75</int> - <object class="NSMenuItem" key="NSMenuItem" id="1028844875"> - <reference key="NSMenu" ref="747439187"/> - <string key="NSTitle">field</string> + <object class="NSMenuItem" key="NSMenuItem" id="129836593"> + <reference key="NSMenu" ref="1000166734"/> + <string key="NSTitle">is</string> <string key="NSKeyEquiv"/> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> @@ -2921,16 +3000,16 @@ <reference key="NSOnImage" ref="450876295"/> <reference key="NSMixedImage" ref="414351669"/> <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="376863254"/> + <reference key="NSTarget" ref="105542136"/> </object> <bool key="NSMenuItemRespectAlignment">YES</bool> - <object class="NSMenu" key="NSMenu" id="747439187"> + <object class="NSMenu" key="NSMenu" id="1000166734"> <object class="NSMutableString" key="NSTitle"> <characters key="NS.bytes">OtherViews</characters> </object> <object class="NSMutableArray" key="NSMenuItems"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1028844875"/> + <reference ref="129836593"/> </object> </object> <int key="NSPreferredEdge">3</int> @@ -2939,28 +3018,29 @@ <int key="NSArrowPosition">1</int> </object> </object> - <object class="NSPopUpButton" id="744029762"> - <reference key="NSNextResponder" ref="894187833"/> - <int key="NSvFlags">265</int> - <string key="NSFrame">{{216, 0}, {95, 25}}</string> - <reference key="NSSuperview" ref="894187833"/> + <object class="NSPopUpButton" id="830088955"> + <reference key="NSNextResponder" ref="795017229"/> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{50, 3}, {160, 20}}</string> + <reference key="NSSuperview" ref="795017229"/> <bool key="NSEnabled">YES</bool> - <object class="NSPopUpButtonCell" key="NSCell" id="105542136"> + <object class="NSPopUpButtonCell" key="NSCell" id="376863254"> <int key="NSCellFlags">-1539178944</int> <int key="NSCellFlags2">133120</int> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="744029762"/> - <int key="NSButtonFlags">-2038415105</int> + <reference key="NSSupport" ref="790379580"/> + <reference key="NSControlView" ref="830088955"/> + <int key="NSButtonFlags">-2038284033</int> <int key="NSButtonFlags2">36</int> + <reference key="NSAlternateImage" ref="790379580"/> <string key="NSAlternateContents"/> <object class="NSMutableString" key="NSKeyEquivalent"> <characters key="NS.bytes"/> </object> <int key="NSPeriodicDelay">400</int> <int key="NSPeriodicInterval">75</int> - <object class="NSMenuItem" key="NSMenuItem" id="129836593"> - <reference key="NSMenu" ref="1000166734"/> - <string key="NSTitle">is</string> + <object class="NSMenuItem" key="NSMenuItem" id="1028844875"> + <reference key="NSMenu" ref="747439187"/> + <string key="NSTitle">field</string> <string key="NSKeyEquiv"/> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> @@ -2968,16 +3048,16 @@ <reference key="NSOnImage" ref="450876295"/> <reference key="NSMixedImage" ref="414351669"/> <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="105542136"/> + <reference key="NSTarget" ref="376863254"/> </object> <bool key="NSMenuItemRespectAlignment">YES</bool> - <object class="NSMenu" key="NSMenu" id="1000166734"> + <object class="NSMenu" key="NSMenu" id="747439187"> <object class="NSMutableString" key="NSTitle"> <characters key="NS.bytes">OtherViews</characters> </object> <object class="NSMutableArray" key="NSMenuItems"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="129836593"/> + <reference ref="1028844875"/> </object> </object> <int key="NSPreferredEdge">3</int> @@ -2986,21 +3066,37 @@ <int key="NSArrowPosition">1</int> </object> </object> + <object class="NSTextField" id="905386082"> + <reference key="NSNextResponder" ref="795017229"/> + <int key="NSvFlags">264</int> + <string key="NSFrame">{{7, 6}, {43, 14}}</string> + <reference key="NSSuperview" ref="795017229"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="314592665"> + <int key="NSCellFlags">67239488</int> + <int key="NSCellFlags2">272761856</int> + <string key="NSContents">Search:</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="905386082"/> + <reference key="NSBackgroundColor" ref="62854682"/> + <reference key="NSTextColor" ref="454249633"/> + </object> + </object> </object> <string key="NSFrameSize">{313, 27}</string> - <reference key="NSSuperview" ref="231622333"/> + <reference key="NSSuperview" ref="262085420"/> <string key="NSClassName">NSView</string> </object> - <object class="NSCustomView" id="641645529"> - <reference key="NSNextResponder" ref="231622333"/> - <int key="NSvFlags">290</int> + <object class="NSCustomView" id="964230781"> + <reference key="NSNextResponder" ref="262085420"/> + <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSSearchField" id="377771536"> - <reference key="NSNextResponder" ref="641645529"/> + <reference key="NSNextResponder" ref="964230781"/> <int key="NSvFlags">266</int> <string key="NSFrame">{{5, 4}, {278, 19}}</string> - <reference key="NSSuperview" ref="641645529"/> + <reference key="NSSuperview" ref="964230781"/> <bool key="NSEnabled">YES</bool> <object class="NSSearchFieldCell" key="NSCell" id="667596795"> <int key="NSCellFlags">879885888</int> @@ -3060,10 +3156,10 @@ </object> </object> <object class="NSTextField" id="85531569"> - <reference key="NSNextResponder" ref="641645529"/> + <reference key="NSNextResponder" ref="964230781"/> <int key="NSvFlags">-2147483379</int> <string key="NSFrame">{{129, 6}, {28, 14}}</string> - <reference key="NSSuperview" ref="641645529"/> + <reference key="NSSuperview" ref="964230781"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="194715102"> <int key="NSCellFlags">68288064</int> @@ -3076,10 +3172,10 @@ </object> </object> <object class="NSSearchField" id="722854793"> - <reference key="NSNextResponder" ref="641645529"/> + <reference key="NSNextResponder" ref="964230781"/> <int key="NSvFlags">-2147483378</int> <string key="NSFrame">{{5, 4}, {112, 19}}</string> - <reference key="NSSuperview" ref="641645529"/> + <reference key="NSSuperview" ref="964230781"/> <bool key="NSEnabled">YES</bool> <object class="NSSearchFieldCell" key="NSCell" id="556901008"> <int key="NSCellFlags">343014976</int> @@ -3137,10 +3233,10 @@ </object> </object> <object class="NSSearchField" id="538700903"> - <reference key="NSNextResponder" ref="641645529"/> + <reference key="NSNextResponder" ref="964230781"/> <int key="NSvFlags">-2147483381</int> <string key="NSFrame">{{170, 4}, {111, 19}}</string> - <reference key="NSSuperview" ref="641645529"/> + <reference key="NSSuperview" ref="964230781"/> <bool key="NSEnabled">YES</bool> <object class="NSSearchFieldCell" key="NSCell" id="564763515"> <int key="NSCellFlags">343014976</int> @@ -3201,113 +3297,17 @@ </object> </object> <string key="NSFrame">{{322, 0}, {284, 27}}</string> - <reference key="NSSuperview" ref="231622333"/> + <reference key="NSSuperview" ref="262085420"/> <string key="NSClassName">NSView</string> </object> </object> <string key="NSFrame">{{6, 509}, {606, 27}}</string> <reference key="NSSuperview" ref="1013108064"/> <bool key="NSIsVertical">YES</bool> - <string key="NSAutosaveName">TableFilterSplitter</string> - </object> - <object class="NSButton" id="924091760"> - <reference key="NSNextResponder" ref="1013108064"/> - <int key="NSvFlags">289</int> - <string key="NSFrame">{{654, 10}, {32, 25}}</string> - <reference key="NSSuperview" ref="1013108064"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="281993992"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="244931163"/> - <reference key="NSControlView" ref="924091760"/> - <int key="NSButtonFlags">-2042347265</int> - <int key="NSButtonFlags2">35</int> - <object class="NSCustomResource" key="NSNormalImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">button_right</string> - </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> - </object> - </object> - <object class="NSButton" id="434675603"> - <reference key="NSNextResponder" ref="1013108064"/> - <int key="NSvFlags">289</int> - <string key="NSFrame">{{592, 10}, {32, 25}}</string> - <reference key="NSSuperview" ref="1013108064"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="105847394"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="244931163"/> - <reference key="NSControlView" ref="434675603"/> - <int key="NSButtonFlags">-2042347265</int> - <int key="NSButtonFlags2">35</int> - <object class="NSCustomResource" key="NSNormalImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">button_left</string> - </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> - </object> - </object> - <object class="NSButton" id="429029434"> - <reference key="NSNextResponder" ref="1013108064"/> - <int key="NSvFlags">289</int> - <string key="NSFrame">{{623, 10}, {32, 25}}</string> - <reference key="NSSuperview" ref="1013108064"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="843215079"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="790379580"/> - <reference key="NSControlView" ref="429029434"/> - <int key="NSButtonFlags">-934526721</int> - <int key="NSButtonFlags2">268435491</int> - <object class="NSCustomResource" key="NSNormalImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">button_pagination</string> - </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent">j</string> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> - </object> - </object> - <object class="NSButton" id="873734510"> - <reference key="NSNextResponder" ref="1013108064"/> - <int key="NSvFlags">265</int> - <string key="NSFrame">{{734, 507}, {160, 16}}</string> - <reference key="NSSuperview" ref="1013108064"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="212274460"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134479872</int> - <string key="NSContents">ShowFilterTable_Dummy_Button</string> - <object class="NSFont" key="NSSupport"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">9</double> - <int key="NSfFlags">3614</int> - </object> - <reference key="NSControlView" ref="873734510"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">268435585</int> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent">f</string> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> </object> </object> <string key="NSFrame">{{10, 7}, {706, 544}}</string> + <reference key="NSSuperview" ref="714795046"/> </object> <string key="NSLabel">Content</string> <reference key="NSColor" ref="62854682"/> @@ -3316,7 +3316,7 @@ <object class="NSTabViewItem" id="105987292"> <string key="NSIdentifier">customQuery</string> <object class="NSView" key="NSView" id="746504912"> - <reference key="NSNextResponder" ref="714795046"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -3507,29 +3507,6 @@ <object class="NSTextView" id="793890647"> <reference key="NSNextResponder" ref="888807510"/> <int key="NSvFlags">6418</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">{694, 14}</string> <reference key="NSSuperview" ref="888807510"/> <object class="NSTextContainer" key="NSTextContainer" id="845974686"> @@ -3652,7 +3629,7 @@ <object class="NSTableView" id="7005793"> <reference key="NSNextResponder" ref="719411200"/> <int key="NSvFlags">4352</int> - <string key="NSFrameSize">{694, 206}</string> + <string key="NSFrameSize">{694, 205}</string> <reference key="NSSuperview" ref="719411200"/> <bool key="NSEnabled">YES</bool> <object class="NSTableHeaderView" key="NSHeaderView" id="569161033"> @@ -3714,7 +3691,7 @@ <int key="NSTableViewDraggingDestinationStyle">0</int> </object> </object> - <string key="NSFrame">{{1, 17}, {694, 206}}</string> + <string key="NSFrame">{{1, 17}, {694, 205}}</string> <reference key="NSSuperview" ref="808759882"/> <reference key="NSNextKeyView" ref="7005793"/> <reference key="NSDocView" ref="7005793"/> @@ -3757,7 +3734,7 @@ </object> <reference ref="348657092"/> </object> - <string key="NSFrame">{{0, -1}, {696, 224}}</string> + <string key="NSFrame">{{0, -1}, {696, 223}}</string> <reference key="NSSuperview" ref="539474293"/> <reference key="NSNextKeyView" ref="719411200"/> <int key="NSsFlags">562</int> @@ -3771,7 +3748,7 @@ <object class="NSPopUpButton" id="956647572"> <reference key="NSNextResponder" ref="539474293"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{156, 222}, {98, 22}}</string> + <string key="NSFrame">{{156, 221}, {98, 22}}</string> <reference key="NSSuperview" ref="539474293"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="619849563"> @@ -3884,7 +3861,7 @@ <object class="NSPopUpButton" id="346800534"> <reference key="NSNextResponder" ref="539474293"/> <int key="NSvFlags">264</int> - <string key="NSFrame">{{38, 222}, {108, 22}}</string> + <string key="NSFrame">{{38, 221}, {108, 22}}</string> <reference key="NSSuperview" ref="539474293"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="620314745"> @@ -3998,7 +3975,7 @@ <object class="NSPopUpButton" id="544395596"> <reference key="NSNextResponder" ref="539474293"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{-10, 221}, {48, 25}}</string> + <string key="NSFrame">{{-10, 220}, {48, 25}}</string> <reference key="NSSuperview" ref="539474293"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="127119628"> @@ -4338,7 +4315,7 @@ <object class="NSButton" id="1067429818"> <reference key="NSNextResponder" ref="539474293"/> <int key="NSvFlags">265</int> - <string key="NSFrame">{{563, 224}, {124, 17}}</string> + <string key="NSFrame">{{563, 223}, {124, 17}}</string> <reference key="NSSuperview" ref="539474293"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="230812569"> @@ -4359,7 +4336,7 @@ <object class="NSButton" id="768193117"> <reference key="NSNextResponder" ref="539474293"/> <int key="NSvFlags">265</int> - <string key="NSFrame">{{404, 224}, {151, 17}}</string> + <string key="NSFrame">{{404, 223}, {151, 17}}</string> <reference key="NSSuperview" ref="539474293"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="538725211"> @@ -4391,7 +4368,7 @@ <string>NeXT TIFF v4.0 pasteboard type</string> </object> </object> - <string key="NSFrame">{{32, 222}, {664, 23}}</string> + <string key="NSFrame">{{32, 221}, {664, 23}}</string> <reference key="NSSuperview" ref="539474293"/> <bool key="NSEnabled">YES</bool> <object class="NSImageCell" key="NSCell" id="982720237"> @@ -4406,16 +4383,16 @@ <bool key="NSEditable">YES</bool> </object> </object> - <string key="NSFrame">{{0, 151}, {696, 245}}</string> + <string key="NSFrame">{{0, 151}, {696, 244}}</string> <reference key="NSSuperview" ref="727658473"/> <string key="NSClassName">NSView</string> </object> </object> - <string key="NSFrameSize">{696, 396}</string> + <string key="NSFrameSize">{696, 395}</string> <reference key="NSSuperview" ref="940311190"/> </object> </object> - <string key="NSFrameSize">{696, 396}</string> + <string key="NSFrameSize">{696, 395}</string> <reference key="NSSuperview" ref="515194087"/> <string key="NSClassName">NSView</string> </object> @@ -4437,7 +4414,7 @@ <object class="NSTextView" id="714539623"> <reference key="NSNextResponder" ref="572051963"/> <int key="NSvFlags">2322</int> - <string key="NSFrameSize">{672, 13}</string> + <string key="NSFrameSize">{887, 13}</string> <reference key="NSSuperview" ref="572051963"/> <object class="NSTextContainer" key="NSTextContainer" id="322143189"> <object class="NSLayoutManager" key="NSLayoutManager"> @@ -4509,7 +4486,7 @@ <nil key="NSDelegate"/> </object> <reference key="NSTextView" ref="714539623"/> - <double key="NSWidth">672</double> + <double key="NSWidth">887</double> <int key="NSTCFlags">1</int> </object> <object class="NSTextViewSharedData" key="NSSharedData"> @@ -4555,7 +4532,7 @@ <nil key="NSDefaultParagraphStyle"/> </object> <int key="NSTVFlags">6</int> - <string key="NSMaxSize">{672, 1e+07}</string> + <string key="NSMaxSize">{887, 1e+07}</string> <string key="NSMinize">{223, 3}</string> <nil key="NSDelegate"/> </object> @@ -4582,6 +4559,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-100, -100}, {87, 18}}</string> <reference key="NSSuperview" ref="618407678"/> + <bool key="NSEnabled">YES</bool> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="618407678"/> <string key="NSAction">_doScroller:</string> @@ -4592,7 +4570,7 @@ <string key="NSFrame">{{12, 12}, {672, 66}}</string> <reference key="NSSuperview" ref="1028777476"/> <reference key="NSNextKeyView" ref="572051963"/> - <int key="NSsFlags">528</int> + <int key="NSsFlags">656</int> <reference key="NSVScroller" ref="628306046"/> <reference key="NSHScroller" ref="195758564"/> <reference key="NSContentView" ref="572051963"/> @@ -4614,12 +4592,12 @@ </object> </object> </object> - <string key="NSFrame">{{0, 397}, {696, 111}}</string> + <string key="NSFrame">{{0, 396}, {696, 111}}</string> <reference key="NSSuperview" ref="515194087"/> <string key="NSClassName">NSView</string> </object> </object> - <string key="NSFrame">{{6, 33}, {696, 508}}</string> + <string key="NSFrame">{{6, 34}, {696, 507}}</string> <reference key="NSSuperview" ref="746504912"/> <int key="NSDividerStyle">2</int> <reference key="BWSVColor" ref="304829493"/> @@ -4671,7 +4649,6 @@ </object> </object> <string key="NSFrame">{{10, 7}, {706, 544}}</string> - <reference key="NSSuperview" ref="714795046"/> </object> <string key="NSLabel">Custom Query</string> <reference key="NSColor" ref="62854682"/> @@ -6458,27 +6435,68 @@ <reference key="NSTabView" ref="714795046"/> </object> </object> - <reference key="NSSelectedTabViewItem" ref="105987292"/> + <reference key="NSSelectedTabViewItem" ref="624106058"/> <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="746504912"/> + <reference ref="1013108064"/> </object> </object> </object> - <string key="NSFrame">{{215, 0}, {729, 550}}</string> - <reference key="NSSuperview" ref="937377983"/> + <string key="NSFrame">{{215, 0}, {728, 549}}</string> + <reference key="NSSuperview" ref="162770193"/> <string key="NSClassName">NSView</string> </object> </object> - <string key="NSFrame">{{0, -1}, {944, 550}}</string> + <string key="NSFrameSize">{943, 549}</string> <reference key="NSSuperview" ref="632807581"/> <bool key="NSIsVertical">YES</bool> <int key="NSDividerStyle">2</int> <string key="NSAutosaveName">DBViewSplitter</string> + <reference key="BWSVColor" ref="304829493"/> + <bool key="BWSVColorIsEnabled">NO</bool> + <object class="NSMutableDictionary" key="BWSVMinValues"> + <integer value="1" key="NS.key.0"/> + <integer value="495" key="NS.object.0"/> + </object> + <object class="NSMutableDictionary" key="BWSVMaxValues"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference key="dict.sortedKeys" ref="0"/> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <object class="NSMutableDictionary" key="BWSVMinUnits"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="0"/> + <integer value="1"/> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="0"/> + <integer value="0"/> + </object> + </object> + <object class="NSMutableDictionary" key="BWSVMaxUnits"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="0"/> + <integer value="1"/> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="0"/> + <integer value="0"/> + </object> + </object> + <int key="BWSVCollapsiblePopupSelection">0</int> + <bool key="BWSVDividerCanCollapse">NO</bool> </object> </object> <string key="NSFrameSize">{943, 549}</string> @@ -7205,7 +7223,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"/> @@ -7359,7 +7377,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> @@ -7369,7 +7387,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"/> @@ -7532,7 +7550,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> @@ -7542,7 +7560,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> @@ -8143,7 +8161,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> @@ -8153,7 +8171,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">{360, 348}</string> <object class="NSView" key="NSWindowView" id="729080358"> <nil key="NSNextResponder"/> @@ -8560,7 +8578,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> <string key="NSMinSize">{360, 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> @@ -8572,7 +8590,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"/> @@ -8692,7 +8710,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> @@ -8704,7 +8722,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"/> @@ -8839,7 +8857,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> @@ -8851,7 +8869,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"/> @@ -9074,7 +9092,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> <string key="NSFrameAutosaveName">SPCreateSyntaxSheet</string> </object> <object class="NSWindowTemplate" id="466147946"> @@ -9087,7 +9105,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"/> @@ -9257,7 +9275,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> @@ -9267,7 +9285,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"/> @@ -9665,7 +9683,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="633448481"> @@ -9676,7 +9694,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> <string key="NSWindowTitle">Filter</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">{380, 170}</string> <object class="NSView" key="NSWindowView" id="257361103"> <nil key="NSNextResponder"/> @@ -10318,7 +10336,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string> </object> <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string> <string key="NSMinSize">{380, 192}</string> - <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> <string key="NSFrameAutosaveName">SPTableFilterPanel</string> </object> <object class="NSWindowTemplate" id="923391973"> @@ -10818,7 +10836,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <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> @@ -10922,7 +10940,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <string key="NSFrameSize">{338, 150}</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="884983195"> <nil key="NSNextResponder"/> @@ -11105,7 +11123,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <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> @@ -12111,14 +12129,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">delegate</string> - <reference key="source" ref="937377983"/> - <reference key="destination" ref="427689665"/> - </object> - <int key="connectionID">678</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> <reference key="source" ref="628830973"/> <reference key="destination" ref="103234030"/> </object> @@ -13262,14 +13272,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">contentViewSplitter</string> - <reference key="source" ref="427689665"/> - <reference key="destination" ref="937377983"/> - </object> - <int key="connectionID">5938</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">tableInfoTable</string> <reference key="source" ref="427689665"/> <reference key="destination" ref="347093764"/> @@ -13750,14 +13752,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="231622333"/> - <reference key="destination" ref="392169872"/> - </object> - <int key="connectionID">6306</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">spHistoryControllerInstance</string> <reference key="source" ref="392169872"/> <reference key="destination" ref="796834585"/> @@ -16557,6 +16551,30 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> </object> <int key="connectionID">7726</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="162770193"/> + <reference key="destination" ref="427689665"/> + </object> + <int key="connectionID">7732</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">contentViewSplitter</string> + <reference key="source" ref="427689665"/> + <reference key="destination" ref="162770193"/> + </object> + <int key="connectionID">7733</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="262085420"/> + <reference key="destination" ref="392169872"/> + </object> + <int key="connectionID">7780</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -19238,180 +19256,550 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <reference key="object" ref="632807581"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="937377983"/> + <reference ref="162770193"/> </object> <reference key="parent" ref="0"/> <string key="objectName">Master DB View</string> </object> <object class="IBObjectRecord"> - <int key="objectID">677</int> - <reference key="object" ref="937377983"/> + <int key="objectID">7051</int> + <reference key="object" ref="985474865"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="604818293"/> - <reference ref="372294785"/> + <reference ref="563848996"/> </object> - <reference key="parent" ref="632807581"/> + <reference key="parent" ref="556141845"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7056</int> + <reference key="object" ref="262885074"/> + <reference key="parent" ref="556141845"/> </object> <object class="IBObjectRecord"> - <int key="objectID">676</int> - <reference key="object" ref="604818293"/> + <int key="objectID">7073</int> + <reference key="object" ref="960497878"/> + <reference key="parent" ref="0"/> + <string key="objectName">SPIndexesController</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7467</int> + <reference key="object" ref="527545451"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="714795046"/> + <reference ref="301167516"/> + <reference ref="771032846"/> + <reference ref="231084647"/> + <reference ref="275038138"/> + <reference ref="726011785"/> </object> - <reference key="parent" ref="937377983"/> + <reference key="parent" ref="0"/> + <string key="objectName">Table Custom Query Menu</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7468</int> + <reference key="object" ref="301167516"/> + <reference key="parent" ref="527545451"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7469</int> + <reference key="object" ref="771032846"/> + <reference key="parent" ref="527545451"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7470</int> + <reference key="object" ref="231084647"/> + <reference key="parent" ref="527545451"/> </object> <object class="IBObjectRecord"> - <int key="objectID">675</int> - <reference key="object" ref="372294785"/> + <int key="objectID">7473</int> + <reference key="object" ref="275038138"/> + <reference key="parent" ref="527545451"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7472</int> + <reference key="object" ref="726011785"/> + <reference key="parent" ref="527545451"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7499</int> + <reference key="object" ref="819141542"/> + <reference key="parent" ref="752657505"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7500</int> + <reference key="object" ref="182964528"/> + <reference key="parent" ref="752657505"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7502</int> + <reference key="object" ref="633448481"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="298095498"/> - <reference ref="28219887"/> + <reference ref="257361103"/> </object> - <reference key="parent" ref="937377983"/> + <reference key="parent" ref="0"/> + <string key="objectName">Filter Table Window</string> </object> <object class="IBObjectRecord"> - <int key="objectID">6032</int> - <reference key="object" ref="298095498"/> + <int key="objectID">7503</int> + <reference key="object" ref="257361103"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="131633443"/> - <reference ref="192579410"/> + <reference ref="389089658"/> + <reference ref="631288327"/> + <reference ref="80390753"/> + <reference ref="571404189"/> + <reference ref="614305746"/> + <reference ref="672293521"/> + <reference ref="743894180"/> </object> - <reference key="parent" ref="372294785"/> + <reference key="parent" ref="633448481"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6142</int> - <reference key="object" ref="28219887"/> + <int key="objectID">7504</int> + <reference key="object" ref="80390753"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="57416393"/> - <reference ref="595750628"/> - <reference ref="960207750"/> - <reference ref="500608059"/> + <reference ref="317678649"/> + <reference ref="40644394"/> </object> - <reference key="parent" ref="372294785"/> + <reference key="parent" ref="257361103"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6153</int> - <reference key="object" ref="57416393"/> + <int key="objectID">7505</int> + <reference key="object" ref="672293521"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="708016222"/> + <reference ref="1073467237"/> </object> - <reference key="parent" ref="28219887"/> + <reference key="parent" ref="257361103"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6151</int> - <reference key="object" ref="595750628"/> + <int key="objectID">7506</int> + <reference key="object" ref="389089658"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="227511715"/> + <reference ref="800774053"/> </object> - <reference key="parent" ref="28219887"/> + <reference key="parent" ref="257361103"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6145</int> - <reference key="object" ref="960207750"/> + <int key="objectID">7511</int> + <reference key="object" ref="800774053"/> + <reference key="parent" ref="389089658"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7512</int> + <reference key="object" ref="1073467237"/> + <reference key="parent" ref="672293521"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7513</int> + <reference key="object" ref="317678649"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="321871356"/> + <reference ref="81944450"/> </object> - <reference key="parent" ref="28219887"/> + <reference key="parent" ref="80390753"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6143</int> - <reference key="object" ref="500608059"/> + <int key="objectID">7514</int> + <reference key="object" ref="40644394"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="283448047"/> + <reference ref="332689220"/> </object> - <reference key="parent" ref="28219887"/> + <reference key="parent" ref="80390753"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6144</int> - <reference key="object" ref="283448047"/> - <reference key="parent" ref="500608059"/> + <int key="objectID">7515</int> + <reference key="object" ref="332689220"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="281953763"/> + <reference ref="784489290"/> + <reference ref="233010382"/> + <reference ref="493190585"/> + </object> + <reference key="parent" ref="40644394"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6146</int> - <reference key="object" ref="321871356"/> + <int key="objectID">7516</int> + <reference key="object" ref="281953763"/> + <reference key="parent" ref="332689220"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7517</int> + <reference key="object" ref="784489290"/> + <reference key="parent" ref="332689220"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7518</int> + <reference key="object" ref="233010382"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="890046805"/> + <reference ref="435560165"/> </object> - <reference key="parent" ref="960207750"/> + <reference key="parent" ref="332689220"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6147</int> - <reference key="object" ref="890046805"/> + <int key="objectID">7519</int> + <reference key="object" ref="493190585"/> + <reference key="parent" ref="332689220"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7520</int> + <reference key="object" ref="435560165"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="570147191"/> - <reference ref="215466732"/> - <reference ref="545621807"/> - <reference ref="351524538"/> - <reference ref="962084508"/> - <reference ref="226083732"/> - <reference ref="897887117"/> - <reference ref="112091395"/> - <reference ref="584909701"/> - <reference ref="160189226"/> - <reference ref="1049807214"/> + <reference ref="1007581754"/> </object> - <reference key="parent" ref="321871356"/> + <reference key="parent" ref="233010382"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6927</int> - <reference key="object" ref="570147191"/> - <reference key="parent" ref="890046805"/> + <int key="objectID">7521</int> + <reference key="object" ref="1007581754"/> + <reference key="parent" ref="435560165"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6926</int> - <reference key="object" ref="215466732"/> - <reference key="parent" ref="890046805"/> + <int key="objectID">7522</int> + <reference key="object" ref="81944450"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="378021102"/> + <reference ref="28009727"/> + <reference ref="617167031"/> + </object> + <reference key="parent" ref="317678649"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6148</int> - <reference key="object" ref="545621807"/> - <reference key="parent" ref="890046805"/> + <int key="objectID">7523</int> + <reference key="object" ref="378021102"/> + <reference key="parent" ref="81944450"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6160</int> - <reference key="object" ref="351524538"/> - <reference key="parent" ref="890046805"/> + <int key="objectID">7524</int> + <reference key="object" ref="28009727"/> + <reference key="parent" ref="81944450"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6159</int> - <reference key="object" ref="962084508"/> - <reference key="parent" ref="890046805"/> + <int key="objectID">7525</int> + <reference key="object" ref="617167031"/> + <reference key="parent" ref="81944450"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6158</int> - <reference key="object" ref="226083732"/> - <reference key="parent" ref="890046805"/> + <int key="objectID">7537</int> + <reference key="object" ref="631288327"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1038452661"/> + </object> + <reference key="parent" ref="257361103"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6157</int> - <reference key="object" ref="897887117"/> - <reference key="parent" ref="890046805"/> + <int key="objectID">7538</int> + <reference key="object" ref="1038452661"/> + <reference key="parent" ref="631288327"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6156</int> - <reference key="object" ref="112091395"/> - <reference key="parent" ref="890046805"/> + <int key="objectID">7563</int> + <reference key="object" ref="743894180"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="131977594"/> + </object> + <reference key="parent" ref="257361103"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6152</int> - <reference key="object" ref="227511715"/> - <reference key="parent" ref="595750628"/> + <int key="objectID">7564</int> + <reference key="object" ref="131977594"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="435787029"/> + </object> + <reference key="parent" ref="743894180"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6154</int> - <reference key="object" ref="708016222"/> - <reference key="parent" ref="57416393"/> + <int key="objectID">7565</int> + <reference key="object" ref="435787029"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="182251176"/> + <reference ref="799609780"/> + <reference ref="250649762"/> + <reference ref="906365069"/> + <reference ref="926461989"/> + <reference ref="960836473"/> + </object> + <reference key="parent" ref="131977594"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7570</int> + <reference key="object" ref="182251176"/> + <reference key="parent" ref="435787029"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7569</int> + <reference key="object" ref="799609780"/> + <reference key="parent" ref="435787029"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7568</int> + <reference key="object" ref="250649762"/> + <reference key="parent" ref="435787029"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7567</int> + <reference key="object" ref="906365069"/> + <reference key="parent" ref="435787029"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7566</int> + <reference key="object" ref="926461989"/> + <reference key="parent" ref="435787029"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7583</int> + <reference key="object" ref="614305746"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="334758487"/> + </object> + <reference key="parent" ref="257361103"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7584</int> + <reference key="object" ref="334758487"/> + <reference key="parent" ref="614305746"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7602</int> + <reference key="object" ref="571404189"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="175346013"/> + <reference ref="750508133"/> + <reference ref="1256480"/> + </object> + <reference key="parent" ref="257361103"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7603</int> + <reference key="object" ref="175346013"/> + <reference key="parent" ref="571404189"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7604</int> + <reference key="object" ref="750508133"/> + <reference key="parent" ref="571404189"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7605</int> + <reference key="object" ref="1256480"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="731332077"/> + </object> + <reference key="parent" ref="571404189"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7606</int> + <reference key="object" ref="731332077"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="997033309"/> + </object> + <reference key="parent" ref="1256480"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7607</int> + <reference key="object" ref="997033309"/> + <reference key="parent" ref="731332077"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7609</int> + <reference key="object" ref="923391973"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="680570399"/> + </object> + <reference key="parent" ref="0"/> + <string key="objectName">Filter Table Set Default Operator Sheet</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7610</int> + <reference key="object" ref="680570399"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="854762999"/> + <reference ref="176747162"/> + <reference ref="1048134410"/> + <reference ref="443771452"/> + <reference ref="306412979"/> + </object> + <reference key="parent" ref="923391973"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7615</int> + <reference key="object" ref="1048134410"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="307696791"/> + </object> + <reference key="parent" ref="680570399"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7616</int> + <reference key="object" ref="307696791"/> + <reference key="parent" ref="1048134410"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7617</int> + <reference key="object" ref="443771452"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="409181653"/> + </object> + <reference key="parent" ref="680570399"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7618</int> + <reference key="object" ref="409181653"/> + <reference key="parent" ref="443771452"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7619</int> + <reference key="object" ref="854762999"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="516417057"/> + </object> + <reference key="parent" ref="680570399"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7620</int> + <reference key="object" ref="516417057"/> + <reference key="parent" ref="854762999"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7623</int> + <reference key="object" ref="176747162"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="200145570"/> + <reference ref="570980822"/> + <reference ref="561854733"/> + </object> + <reference key="parent" ref="680570399"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7624</int> + <reference key="object" ref="200145570"/> + <reference key="parent" ref="176747162"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7625</int> + <reference key="object" ref="570980822"/> + <reference key="parent" ref="176747162"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7626</int> + <reference key="object" ref="561854733"/> + <reference key="parent" ref="176747162"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7629</int> + <reference key="object" ref="306412979"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="928180881"/> + </object> + <reference key="parent" ref="680570399"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7630</int> + <reference key="object" ref="928180881"/> + <reference key="parent" ref="306412979"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7633</int> + <reference key="object" ref="960836473"/> + <reference key="parent" ref="435787029"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7668</int> + <reference key="object" ref="456870714"/> + <reference key="parent" ref="107658659"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7052</int> + <reference key="object" ref="563848996"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="980906208"/> + <reference ref="675650257"/> + <reference ref="407752940"/> + </object> + <reference key="parent" ref="985474865"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7055</int> + <reference key="object" ref="980906208"/> + <reference key="parent" ref="563848996"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7054</int> + <reference key="object" ref="675650257"/> + <reference key="parent" ref="563848996"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7053</int> + <reference key="object" ref="407752940"/> + <reference key="parent" ref="563848996"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7683</int> + <reference key="object" ref="530477407"/> + <reference key="parent" ref="556141845"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7727</int> + <reference key="object" ref="162770193"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1053680279"/> + <reference ref="882258892"/> + </object> + <reference key="parent" ref="632807581"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7728</int> + <reference key="object" ref="1053680279"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="298095498"/> + <reference ref="28219887"/> + </object> + <reference key="parent" ref="162770193"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7729</int> + <reference key="object" ref="882258892"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="714795046"/> + </object> + <reference key="parent" ref="162770193"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">6032</int> + <reference key="object" ref="298095498"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="131633443"/> + <reference ref="192579410"/> + </object> + <reference key="parent" ref="1053680279"/> </object> <object class="IBObjectRecord"> <int key="objectID">6033</int> @@ -19446,6 +19834,52 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <string key="objectName">Scroll View (Table Info Table View)</string> </object> <object class="IBObjectRecord"> + <int key="objectID">7691</int> + <reference key="object" ref="561874764"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="794785393"/> + <reference ref="313695606"/> + <reference ref="464071814"/> + </object> + <reference key="parent" ref="192579410"/> + <string key="objectName">Scroll View (Activities Table View)</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7692</int> + <reference key="object" ref="794785393"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="195537032"/> + </object> + <reference key="parent" ref="561874764"/> + <string key="objectName">Table View (Activities)</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7693</int> + <reference key="object" ref="313695606"/> + <reference key="parent" ref="561874764"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7694</int> + <reference key="object" ref="464071814"/> + <reference key="parent" ref="561874764"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7695</int> + <reference key="object" ref="195537032"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="530698659"/> + </object> + <reference key="parent" ref="794785393"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7696</int> + <reference key="object" ref="530698659"/> + <reference key="parent" ref="195537032"/> + </object> + <object class="IBObjectRecord"> <int key="objectID">4482</int> <reference key="object" ref="353686052"/> <reference key="parent" ref="298226231"/> @@ -19621,7 +20055,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <reference ref="831053945"/> <reference ref="624106058"/> </object> - <reference key="parent" ref="604818293"/> + <reference key="parent" ref="882258892"/> </object> <object class="IBObjectRecord"> <int key="objectID">6692</int> @@ -19687,7 +20121,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <reference ref="429029434"/> <reference ref="924091760"/> <reference ref="33038697"/> - <reference ref="231622333"/> <reference ref="440898411"/> <reference ref="738389447"/> <reference ref="331025266"/> @@ -19697,6 +20130,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <reference ref="393139604"/> <reference ref="196265983"/> <reference ref="873734510"/> + <reference ref="262085420"/> </object> <reference key="parent" ref="624106058"/> </object> @@ -19749,16 +20183,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <reference key="parent" ref="1013108064"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6303</int> - <reference key="object" ref="231622333"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="641645529"/> - <reference ref="894187833"/> - </object> - <reference key="parent" ref="1013108064"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">858</int> <reference key="object" ref="440898411"/> <reference key="parent" ref="1013108064"/> @@ -19773,15 +20197,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <reference key="parent" ref="1013108064"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5178</int> - <reference key="object" ref="196265983"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="291648608"/> - </object> - <reference key="parent" ref="1013108064"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">5177</int> <reference key="object" ref="331025266"/> <object class="NSMutableArray" key="children"> @@ -19827,6 +20242,34 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <reference key="parent" ref="1013108064"/> </object> <object class="IBObjectRecord"> + <int key="objectID">5178</int> + <reference key="object" ref="196265983"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="291648608"/> + </object> + <reference key="parent" ref="1013108064"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7533</int> + <reference key="object" ref="873734510"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="212274460"/> + </object> + <reference key="parent" ref="1013108064"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7534</int> + <reference key="object" ref="212274460"/> + <reference key="parent" ref="873734510"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5181</int> + <reference key="object" ref="291648608"/> + <reference key="parent" ref="196265983"/> + </object> + <object class="IBObjectRecord"> <int key="objectID">5202</int> <reference key="object" ref="595196722"/> <reference key="parent" ref="393139604"/> @@ -19852,173 +20295,11 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <reference key="parent" ref="331025266"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5181</int> - <reference key="object" ref="291648608"/> - <reference key="parent" ref="196265983"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">5180</int> <reference key="object" ref="238883532"/> <reference key="parent" ref="738389447"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6305</int> - <reference key="object" ref="641645529"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="538700903"/> - <reference ref="722854793"/> - <reference ref="85531569"/> - <reference ref="377771536"/> - </object> - <reference key="parent" ref="231622333"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6304</int> - <reference key="object" ref="894187833"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="744029762"/> - <reference ref="830088955"/> - <reference ref="905386082"/> - </object> - <reference key="parent" ref="231622333"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">156</int> - <reference key="object" ref="744029762"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="105542136"/> - </object> - <reference key="parent" ref="894187833"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">146</int> - <reference key="object" ref="830088955"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="376863254"/> - </object> - <reference key="parent" ref="894187833"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">3971</int> - <reference key="object" ref="905386082"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="314592665"/> - </object> - <reference key="parent" ref="894187833"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">3972</int> - <reference key="object" ref="314592665"/> - <reference key="parent" ref="905386082"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">3754</int> - <reference key="object" ref="376863254"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="747439187"/> - </object> - <reference key="parent" ref="830088955"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">147</int> - <reference key="object" ref="747439187"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1028844875"/> - </object> - <reference key="parent" ref="376863254"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">144</int> - <reference key="object" ref="1028844875"/> - <reference key="parent" ref="747439187"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">3755</int> - <reference key="object" ref="105542136"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1000166734"/> - </object> - <reference key="parent" ref="744029762"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">157</int> - <reference key="object" ref="1000166734"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="129836593"/> - </object> - <reference key="parent" ref="105542136"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">154</int> - <reference key="object" ref="129836593"/> - <reference key="parent" ref="1000166734"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6371</int> - <reference key="object" ref="538700903"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="564763515"/> - </object> - <reference key="parent" ref="641645529"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6369</int> - <reference key="object" ref="722854793"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="556901008"/> - </object> - <reference key="parent" ref="641645529"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6364</int> - <reference key="object" ref="85531569"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="194715102"/> - </object> - <reference key="parent" ref="641645529"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">3963</int> - <reference key="object" ref="377771536"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="667596795"/> - </object> - <reference key="parent" ref="641645529"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">3964</int> - <reference key="object" ref="667596795"/> - <reference key="parent" ref="377771536"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6365</int> - <reference key="object" ref="194715102"/> - <reference key="parent" ref="85531569"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6370</int> - <reference key="object" ref="556901008"/> - <reference key="parent" ref="722854793"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6372</int> - <reference key="object" ref="564763515"/> - <reference key="parent" ref="538700903"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">3920</int> <reference key="object" ref="457166030"/> <reference key="parent" ref="33038697"/> @@ -20457,6 +20738,94 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <reference key="parent" ref="220777809"/> </object> <object class="IBObjectRecord"> + <int key="objectID">7457</int> + <reference key="object" ref="168895907"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="598509241"/> + </object> + <reference key="parent" ref="220777809"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7649</int> + <reference key="object" ref="844922654"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="688701059"/> + </object> + <reference key="parent" ref="220777809"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7650</int> + <reference key="object" ref="688701059"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1032311748"/> + </object> + <reference key="parent" ref="844922654"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7651</int> + <reference key="object" ref="1032311748"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="388408398"/> + <reference ref="995423539"/> + </object> + <reference key="parent" ref="688701059"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7652</int> + <reference key="object" ref="388408398"/> + <reference key="parent" ref="1032311748"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7653</int> + <reference key="object" ref="995423539"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="361834046"/> + </object> + <reference key="parent" ref="1032311748"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7654</int> + <reference key="object" ref="361834046"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="975189907"/> + <reference ref="175745626"/> + <reference ref="776631612"/> + <reference ref="746368739"/> + </object> + <reference key="parent" ref="995423539"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7655</int> + <reference key="object" ref="975189907"/> + <reference key="parent" ref="361834046"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7656</int> + <reference key="object" ref="175745626"/> + <reference key="parent" ref="361834046"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7660</int> + <reference key="object" ref="776631612"/> + <reference key="parent" ref="361834046"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7661</int> + <reference key="object" ref="746368739"/> + <reference key="parent" ref="361834046"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7458</int> + <reference key="object" ref="598509241"/> + <reference key="parent" ref="168895907"/> + </object> + <object class="IBObjectRecord"> <int key="objectID">5137</int> <reference key="object" ref="578226656"/> <reference key="parent" ref="996552255"/> @@ -20588,6 +20957,66 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <reference key="parent" ref="715508012"/> </object> <object class="IBObjectRecord"> + <int key="objectID">7484</int> + <reference key="object" ref="325583102"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="309064650"/> + </object> + <reference key="parent" ref="715508012"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7486</int> + <reference key="object" ref="90106305"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="127254249"/> + </object> + <reference key="parent" ref="715508012"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7488</int> + <reference key="object" ref="977579039"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="922217819"/> + </object> + <reference key="parent" ref="715508012"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7489</int> + <reference key="object" ref="922217819"/> + <reference key="parent" ref="977579039"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7493</int> + <reference key="object" ref="127254249"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="39043069"/> + </object> + <reference key="parent" ref="90106305"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7494</int> + <reference key="object" ref="39043069"/> + <reference key="parent" ref="127254249"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7490</int> + <reference key="object" ref="309064650"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="326438402"/> + </object> + <reference key="parent" ref="325583102"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7491</int> + <reference key="object" ref="326438402"/> + <reference key="parent" ref="309064650"/> + </object> + <object class="IBObjectRecord"> <int key="objectID">1311</int> <reference key="object" ref="262388894"/> <reference key="parent" ref="214236344"/> @@ -20673,6 +21102,673 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <reference key="parent" ref="105987292"/> </object> <object class="IBObjectRecord"> + <int key="objectID">7168</int> + <reference key="object" ref="556476514"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1006311058"/> + <reference ref="896749354"/> + <reference ref="911536978"/> + <reference ref="67603994"/> + </object> + <reference key="parent" ref="746504912"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7206</int> + <reference key="object" ref="515194087"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1028777476"/> + <reference ref="940311190"/> + </object> + <reference key="parent" ref="746504912"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7208</int> + <reference key="object" ref="1028777476"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="951184307"/> + <reference ref="618407678"/> + </object> + <reference key="parent" ref="515194087"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7207</int> + <reference key="object" ref="940311190"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="727658473"/> + </object> + <reference key="parent" ref="515194087"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7209</int> + <reference key="object" ref="727658473"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="815597998"/> + <reference ref="539474293"/> + </object> + <reference key="parent" ref="940311190"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7210</int> + <reference key="object" ref="815597998"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="274248101"/> + </object> + <reference key="parent" ref="727658473"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7211</int> + <reference key="object" ref="539474293"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="956647572"/> + <reference ref="346800534"/> + <reference ref="1067429818"/> + <reference ref="544395596"/> + <reference ref="131271512"/> + <reference ref="808759882"/> + <reference ref="768193117"/> + </object> + <reference key="parent" ref="727658473"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7217</int> + <reference key="object" ref="956647572"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="619849563"/> + </object> + <reference key="parent" ref="539474293"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7218</int> + <reference key="object" ref="346800534"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="620314745"/> + </object> + <reference key="parent" ref="539474293"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7220</int> + <reference key="object" ref="1067429818"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="230812569"/> + </object> + <reference key="parent" ref="539474293"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7221</int> + <reference key="object" ref="544395596"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="127119628"/> + </object> + <reference key="parent" ref="539474293"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7222</int> + <reference key="object" ref="131271512"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="982720237"/> + </object> + <reference key="parent" ref="539474293"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7223</int> + <reference key="object" ref="808759882"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="7005793"/> + <reference ref="472788253"/> + <reference ref="445978979"/> + <reference ref="569161033"/> + </object> + <reference key="parent" ref="539474293"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7219</int> + <reference key="object" ref="768193117"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="538725211"/> + </object> + <reference key="parent" ref="539474293"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7261</int> + <reference key="object" ref="538725211"/> + <reference key="parent" ref="768193117"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7224</int> + <reference key="object" ref="7005793"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="878178504"/> + </object> + <reference key="parent" ref="808759882"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7225</int> + <reference key="object" ref="472788253"/> + <reference key="parent" ref="808759882"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7226</int> + <reference key="object" ref="445978979"/> + <reference key="parent" ref="808759882"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7227</int> + <reference key="object" ref="569161033"/> + <reference key="parent" ref="808759882"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7228</int> + <reference key="object" ref="878178504"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="418066499"/> + </object> + <reference key="parent" ref="7005793"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7229</int> + <reference key="object" ref="418066499"/> + <reference key="parent" ref="878178504"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7230</int> + <reference key="object" ref="982720237"/> + <reference key="parent" ref="131271512"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7231</int> + <reference key="object" ref="127119628"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="771730213"/> + </object> + <reference key="parent" ref="544395596"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7232</int> + <reference key="object" ref="771730213"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="13017251"/> + <reference ref="1064627204"/> + <reference ref="333140288"/> + <reference ref="464962028"/> + <reference ref="973603618"/> + <reference ref="548252955"/> + <reference ref="242837345"/> + <reference ref="111215177"/> + <reference ref="137574969"/> + <reference ref="390532841"/> + <reference ref="11400907"/> + <reference ref="299769724"/> + <reference ref="339454293"/> + <reference ref="851449724"/> + <reference ref="40537642"/> + <reference ref="1019660857"/> + <reference ref="218034896"/> + <reference ref="481768593"/> + <reference ref="601071387"/> + <reference ref="919522650"/> + <reference ref="187254930"/> + <reference ref="955447048"/> + <reference ref="738645357"/> + </object> + <reference key="parent" ref="127119628"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7233</int> + <reference key="object" ref="13017251"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7234</int> + <reference key="object" ref="1064627204"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7235</int> + <reference key="object" ref="333140288"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7236</int> + <reference key="object" ref="464962028"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7237</int> + <reference key="object" ref="973603618"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7238</int> + <reference key="object" ref="548252955"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7239</int> + <reference key="object" ref="242837345"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7240</int> + <reference key="object" ref="111215177"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7241</int> + <reference key="object" ref="137574969"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7242</int> + <reference key="object" ref="390532841"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7243</int> + <reference key="object" ref="11400907"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7244</int> + <reference key="object" ref="299769724"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7245</int> + <reference key="object" ref="339454293"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7246</int> + <reference key="object" ref="851449724"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7247</int> + <reference key="object" ref="40537642"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7248</int> + <reference key="object" ref="1019660857"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7249</int> + <reference key="object" ref="218034896"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7250</int> + <reference key="object" ref="481768593"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7251</int> + <reference key="object" ref="601071387"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7252</int> + <reference key="object" ref="919522650"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7253</int> + <reference key="object" ref="187254930"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7254</int> + <reference key="object" ref="955447048"/> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7255</int> + <reference key="object" ref="738645357"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="213180477"/> + </object> + <reference key="parent" ref="771730213"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7256</int> + <reference key="object" ref="213180477"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="473531880"/> + <reference ref="42963699"/> + <reference ref="274956371"/> + </object> + <reference key="parent" ref="738645357"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7257</int> + <reference key="object" ref="473531880"/> + <reference key="parent" ref="213180477"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7258</int> + <reference key="object" ref="42963699"/> + <reference key="parent" ref="213180477"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7259</int> + <reference key="object" ref="274956371"/> + <reference key="parent" ref="213180477"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7260</int> + <reference key="object" ref="230812569"/> + <reference key="parent" ref="1067429818"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7262</int> + <reference key="object" ref="620314745"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="667831799"/> + </object> + <reference key="parent" ref="346800534"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7263</int> + <reference key="object" ref="667831799"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1070901121"/> + <reference ref="326390546"/> + <reference ref="764730752"/> + <reference ref="592706198"/> + <reference ref="589151309"/> + <reference ref="51552001"/> + <reference ref="254052843"/> + </object> + <reference key="parent" ref="620314745"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7264</int> + <reference key="object" ref="1070901121"/> + <reference key="parent" ref="667831799"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7265</int> + <reference key="object" ref="326390546"/> + <reference key="parent" ref="667831799"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7266</int> + <reference key="object" ref="764730752"/> + <reference key="parent" ref="667831799"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7267</int> + <reference key="object" ref="592706198"/> + <reference key="parent" ref="667831799"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7268</int> + <reference key="object" ref="589151309"/> + <reference key="parent" ref="667831799"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7269</int> + <reference key="object" ref="51552001"/> + <reference key="parent" ref="667831799"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7270</int> + <reference key="object" ref="254052843"/> + <reference key="parent" ref="667831799"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7271</int> + <reference key="object" ref="619849563"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="974240681"/> + </object> + <reference key="parent" ref="956647572"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7272</int> + <reference key="object" ref="974240681"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1027761430"/> + <reference ref="746927371"/> + <reference ref="982764648"/> + <reference ref="592146235"/> + <reference ref="779864648"/> + <reference ref="67215330"/> + <reference ref="1068988738"/> + </object> + <reference key="parent" ref="619849563"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7273</int> + <reference key="object" ref="1027761430"/> + <reference key="parent" ref="974240681"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7274</int> + <reference key="object" ref="746927371"/> + <reference key="parent" ref="974240681"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7275</int> + <reference key="object" ref="982764648"/> + <reference key="parent" ref="974240681"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7276</int> + <reference key="object" ref="592146235"/> + <reference key="parent" ref="974240681"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7277</int> + <reference key="object" ref="779864648"/> + <reference key="parent" ref="974240681"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7278</int> + <reference key="object" ref="67215330"/> + <reference key="parent" ref="974240681"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7279</int> + <reference key="object" ref="1068988738"/> + <reference key="parent" ref="974240681"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7280</int> + <reference key="object" ref="274248101"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="74062067"/> + <reference ref="243558888"/> + <reference ref="793890647"/> + </object> + <reference key="parent" ref="815597998"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7283</int> + <reference key="object" ref="74062067"/> + <reference key="parent" ref="274248101"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7282</int> + <reference key="object" ref="243558888"/> + <reference key="parent" ref="274248101"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7281</int> + <reference key="object" ref="793890647"/> + <reference key="parent" ref="274248101"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7429</int> + <reference key="object" ref="951184307"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="679246699"/> + </object> + <reference key="parent" ref="1028777476"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7721</int> + <reference key="object" ref="618407678"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="628306046"/> + <reference ref="195758564"/> + <reference ref="714539623"/> + </object> + <reference key="parent" ref="1028777476"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7722</int> + <reference key="object" ref="628306046"/> + <reference key="parent" ref="618407678"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7723</int> + <reference key="object" ref="195758564"/> + <reference key="parent" ref="618407678"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7724</int> + <reference key="object" ref="714539623"/> + <reference key="parent" ref="618407678"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7430</int> + <reference key="object" ref="679246699"/> + <reference key="parent" ref="951184307"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7172</int> + <reference key="object" ref="1006311058"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="663662810"/> + </object> + <reference key="parent" ref="556476514"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7203</int> + <reference key="object" ref="896749354"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="820624125"/> + </object> + <reference key="parent" ref="556476514"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7396</int> + <reference key="object" ref="911536978"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="387497503"/> + </object> + <reference key="parent" ref="556476514"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7463</int> + <reference key="object" ref="67603994"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="527038904"/> + </object> + <reference key="parent" ref="556476514"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7464</int> + <reference key="object" ref="527038904"/> + <reference key="parent" ref="67603994"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7397</int> + <reference key="object" ref="387497503"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="351194612"/> + </object> + <reference key="parent" ref="911536978"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7398</int> + <reference key="object" ref="351194612"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="256037954"/> + <reference ref="947192156"/> + </object> + <reference key="parent" ref="387497503"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7400</int> + <reference key="object" ref="256037954"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="694090924"/> + </object> + <reference key="parent" ref="351194612"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7406</int> + <reference key="object" ref="947192156"/> + <reference key="parent" ref="351194612"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7409</int> + <reference key="object" ref="694090924"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="385028074"/> + <reference ref="683443109"/> + </object> + <reference key="parent" ref="256037954"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7410</int> + <reference key="object" ref="385028074"/> + <reference key="parent" ref="694090924"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7412</int> + <reference key="object" ref="683443109"/> + <reference key="parent" ref="694090924"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7204</int> + <reference key="object" ref="820624125"/> + <reference key="parent" ref="896749354"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7173</int> + <reference key="object" ref="663662810"/> + <reference key="parent" ref="1006311058"/> + </object> + <object class="IBObjectRecord"> <int key="objectID">1246</int> <reference key="object" ref="730602982"/> <object class="NSMutableArray" key="children"> @@ -20893,6 +21989,132 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <reference key="parent" ref="730602982"/> </object> <object class="IBObjectRecord"> + <int key="objectID">7438</int> + <reference key="object" ref="986860589"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="472283040"/> + </object> + <reference key="parent" ref="730602982"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7440</int> + <reference key="object" ref="656261728"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1466046"/> + </object> + <reference key="parent" ref="730602982"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7442</int> + <reference key="object" ref="196361793"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="995017127"/> + </object> + <reference key="parent" ref="730602982"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7444</int> + <reference key="object" ref="307672983"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="428052689"/> + </object> + <reference key="parent" ref="730602982"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7446</int> + <reference key="object" ref="988950867"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="103576616"/> + </object> + <reference key="parent" ref="730602982"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7448</int> + <reference key="object" ref="333563212"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="958047642"/> + </object> + <reference key="parent" ref="730602982"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7450</int> + <reference key="object" ref="993399156"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="662360258"/> + </object> + <reference key="parent" ref="730602982"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7452</int> + <reference key="object" ref="1047204509"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="328213476"/> + </object> + <reference key="parent" ref="730602982"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7454</int> + <reference key="object" ref="69053511"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="700311928"/> + </object> + <reference key="parent" ref="730602982"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7455</int> + <reference key="object" ref="700311928"/> + <reference key="parent" ref="69053511"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7453</int> + <reference key="object" ref="328213476"/> + <reference key="parent" ref="1047204509"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7451</int> + <reference key="object" ref="662360258"/> + <reference key="parent" ref="993399156"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7449</int> + <reference key="object" ref="958047642"/> + <reference key="parent" ref="333563212"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7447</int> + <reference key="object" ref="103576616"/> + <reference key="parent" ref="988950867"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7445</int> + <reference key="object" ref="428052689"/> + <reference key="parent" ref="307672983"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7443</int> + <reference key="object" ref="995017127"/> + <reference key="parent" ref="196361793"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7441</int> + <reference key="object" ref="1466046"/> + <reference key="parent" ref="656261728"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7439</int> + <reference key="object" ref="472283040"/> + <reference key="parent" ref="986860589"/> + </object> + <object class="IBObjectRecord"> <int key="objectID">5751</int> <reference key="object" ref="643775960"/> <reference key="parent" ref="459419226"/> @@ -21597,1557 +22819,347 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <reference key="parent" ref="585162074"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7051</int> - <reference key="object" ref="985474865"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="563848996"/> - </object> - <reference key="parent" ref="556141845"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7056</int> - <reference key="object" ref="262885074"/> - <reference key="parent" ref="556141845"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7061</int> - <reference key="object" ref="584909701"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="593991505"/> - </object> - <reference key="parent" ref="890046805"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7062</int> - <reference key="object" ref="593991505"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="752934580"/> - <reference ref="639503037"/> - <reference ref="779058431"/> - </object> - <reference key="parent" ref="584909701"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7063</int> - <reference key="object" ref="752934580"/> - <reference key="parent" ref="593991505"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7064</int> - <reference key="object" ref="639503037"/> - <reference key="parent" ref="593991505"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7065</int> - <reference key="object" ref="779058431"/> - <reference key="parent" ref="593991505"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7069</int> - <reference key="object" ref="160189226"/> - <reference key="parent" ref="890046805"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7073</int> - <reference key="object" ref="960497878"/> - <reference key="parent" ref="0"/> - <string key="objectName">SPIndexesController</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7168</int> - <reference key="object" ref="556476514"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1006311058"/> - <reference ref="896749354"/> - <reference ref="911536978"/> - <reference ref="67603994"/> - </object> - <reference key="parent" ref="746504912"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7172</int> - <reference key="object" ref="1006311058"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="663662810"/> - </object> - <reference key="parent" ref="556476514"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7173</int> - <reference key="object" ref="663662810"/> - <reference key="parent" ref="1006311058"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7203</int> - <reference key="object" ref="896749354"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="820624125"/> - </object> - <reference key="parent" ref="556476514"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7204</int> - <reference key="object" ref="820624125"/> - <reference key="parent" ref="896749354"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7206</int> - <reference key="object" ref="515194087"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1028777476"/> - <reference ref="940311190"/> - </object> - <reference key="parent" ref="746504912"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7208</int> - <reference key="object" ref="1028777476"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="951184307"/> - <reference ref="618407678"/> - </object> - <reference key="parent" ref="515194087"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7207</int> - <reference key="object" ref="940311190"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="727658473"/> - </object> - <reference key="parent" ref="515194087"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7209</int> - <reference key="object" ref="727658473"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="815597998"/> - <reference ref="539474293"/> - </object> - <reference key="parent" ref="940311190"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7210</int> - <reference key="object" ref="815597998"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="274248101"/> - </object> - <reference key="parent" ref="727658473"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7211</int> - <reference key="object" ref="539474293"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="956647572"/> - <reference ref="346800534"/> - <reference ref="1067429818"/> - <reference ref="544395596"/> - <reference ref="131271512"/> - <reference ref="808759882"/> - <reference ref="768193117"/> - </object> - <reference key="parent" ref="727658473"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7217</int> - <reference key="object" ref="956647572"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="619849563"/> - </object> - <reference key="parent" ref="539474293"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7218</int> - <reference key="object" ref="346800534"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="620314745"/> - </object> - <reference key="parent" ref="539474293"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7219</int> - <reference key="object" ref="768193117"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="538725211"/> - </object> - <reference key="parent" ref="539474293"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7220</int> - <reference key="object" ref="1067429818"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="230812569"/> - </object> - <reference key="parent" ref="539474293"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7221</int> - <reference key="object" ref="544395596"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="127119628"/> - </object> - <reference key="parent" ref="539474293"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7222</int> - <reference key="object" ref="131271512"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="982720237"/> - </object> - <reference key="parent" ref="539474293"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7223</int> - <reference key="object" ref="808759882"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="7005793"/> - <reference ref="472788253"/> - <reference ref="445978979"/> - <reference ref="569161033"/> - </object> - <reference key="parent" ref="539474293"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7224</int> - <reference key="object" ref="7005793"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="878178504"/> - </object> - <reference key="parent" ref="808759882"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7225</int> - <reference key="object" ref="472788253"/> - <reference key="parent" ref="808759882"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7226</int> - <reference key="object" ref="445978979"/> - <reference key="parent" ref="808759882"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7227</int> - <reference key="object" ref="569161033"/> - <reference key="parent" ref="808759882"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7228</int> - <reference key="object" ref="878178504"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="418066499"/> - </object> - <reference key="parent" ref="7005793"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7229</int> - <reference key="object" ref="418066499"/> - <reference key="parent" ref="878178504"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7230</int> - <reference key="object" ref="982720237"/> - <reference key="parent" ref="131271512"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7231</int> - <reference key="object" ref="127119628"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="771730213"/> - </object> - <reference key="parent" ref="544395596"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7232</int> - <reference key="object" ref="771730213"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="13017251"/> - <reference ref="1064627204"/> - <reference ref="333140288"/> - <reference ref="464962028"/> - <reference ref="973603618"/> - <reference ref="548252955"/> - <reference ref="242837345"/> - <reference ref="111215177"/> - <reference ref="137574969"/> - <reference ref="390532841"/> - <reference ref="11400907"/> - <reference ref="299769724"/> - <reference ref="339454293"/> - <reference ref="851449724"/> - <reference ref="40537642"/> - <reference ref="1019660857"/> - <reference ref="218034896"/> - <reference ref="481768593"/> - <reference ref="601071387"/> - <reference ref="919522650"/> - <reference ref="187254930"/> - <reference ref="955447048"/> - <reference ref="738645357"/> - </object> - <reference key="parent" ref="127119628"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7233</int> - <reference key="object" ref="13017251"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7234</int> - <reference key="object" ref="1064627204"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7235</int> - <reference key="object" ref="333140288"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7236</int> - <reference key="object" ref="464962028"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7237</int> - <reference key="object" ref="973603618"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7238</int> - <reference key="object" ref="548252955"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7239</int> - <reference key="object" ref="242837345"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7240</int> - <reference key="object" ref="111215177"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7241</int> - <reference key="object" ref="137574969"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7242</int> - <reference key="object" ref="390532841"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7243</int> - <reference key="object" ref="11400907"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7244</int> - <reference key="object" ref="299769724"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7245</int> - <reference key="object" ref="339454293"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7246</int> - <reference key="object" ref="851449724"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7247</int> - <reference key="object" ref="40537642"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7248</int> - <reference key="object" ref="1019660857"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7249</int> - <reference key="object" ref="218034896"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7250</int> - <reference key="object" ref="481768593"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7251</int> - <reference key="object" ref="601071387"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7252</int> - <reference key="object" ref="919522650"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7253</int> - <reference key="object" ref="187254930"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7254</int> - <reference key="object" ref="955447048"/> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7255</int> - <reference key="object" ref="738645357"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="213180477"/> - </object> - <reference key="parent" ref="771730213"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7256</int> - <reference key="object" ref="213180477"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="473531880"/> - <reference ref="42963699"/> - <reference ref="274956371"/> - </object> - <reference key="parent" ref="738645357"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7257</int> - <reference key="object" ref="473531880"/> - <reference key="parent" ref="213180477"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7258</int> - <reference key="object" ref="42963699"/> - <reference key="parent" ref="213180477"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7259</int> - <reference key="object" ref="274956371"/> - <reference key="parent" ref="213180477"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7260</int> - <reference key="object" ref="230812569"/> - <reference key="parent" ref="1067429818"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7261</int> - <reference key="object" ref="538725211"/> - <reference key="parent" ref="768193117"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7262</int> - <reference key="object" ref="620314745"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="667831799"/> - </object> - <reference key="parent" ref="346800534"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7263</int> - <reference key="object" ref="667831799"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1070901121"/> - <reference ref="326390546"/> - <reference ref="764730752"/> - <reference ref="592706198"/> - <reference ref="589151309"/> - <reference ref="51552001"/> - <reference ref="254052843"/> - </object> - <reference key="parent" ref="620314745"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7264</int> - <reference key="object" ref="1070901121"/> - <reference key="parent" ref="667831799"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7265</int> - <reference key="object" ref="326390546"/> - <reference key="parent" ref="667831799"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7266</int> - <reference key="object" ref="764730752"/> - <reference key="parent" ref="667831799"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7267</int> - <reference key="object" ref="592706198"/> - <reference key="parent" ref="667831799"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7268</int> - <reference key="object" ref="589151309"/> - <reference key="parent" ref="667831799"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7269</int> - <reference key="object" ref="51552001"/> - <reference key="parent" ref="667831799"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7270</int> - <reference key="object" ref="254052843"/> - <reference key="parent" ref="667831799"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7271</int> - <reference key="object" ref="619849563"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="974240681"/> - </object> - <reference key="parent" ref="956647572"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7272</int> - <reference key="object" ref="974240681"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1027761430"/> - <reference ref="746927371"/> - <reference ref="982764648"/> - <reference ref="592146235"/> - <reference ref="779864648"/> - <reference ref="67215330"/> - <reference ref="1068988738"/> - </object> - <reference key="parent" ref="619849563"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7273</int> - <reference key="object" ref="1027761430"/> - <reference key="parent" ref="974240681"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7274</int> - <reference key="object" ref="746927371"/> - <reference key="parent" ref="974240681"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7275</int> - <reference key="object" ref="982764648"/> - <reference key="parent" ref="974240681"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7276</int> - <reference key="object" ref="592146235"/> - <reference key="parent" ref="974240681"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7277</int> - <reference key="object" ref="779864648"/> - <reference key="parent" ref="974240681"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7278</int> - <reference key="object" ref="67215330"/> - <reference key="parent" ref="974240681"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7279</int> - <reference key="object" ref="1068988738"/> - <reference key="parent" ref="974240681"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7280</int> - <reference key="object" ref="274248101"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="74062067"/> - <reference ref="243558888"/> - <reference ref="793890647"/> - </object> - <reference key="parent" ref="815597998"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7283</int> - <reference key="object" ref="74062067"/> - <reference key="parent" ref="274248101"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7282</int> - <reference key="object" ref="243558888"/> - <reference key="parent" ref="274248101"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7281</int> - <reference key="object" ref="793890647"/> - <reference key="parent" ref="274248101"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7396</int> - <reference key="object" ref="911536978"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="387497503"/> - </object> - <reference key="parent" ref="556476514"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7397</int> - <reference key="object" ref="387497503"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="351194612"/> - </object> - <reference key="parent" ref="911536978"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7398</int> - <reference key="object" ref="351194612"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="256037954"/> - <reference ref="947192156"/> - </object> - <reference key="parent" ref="387497503"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7400</int> - <reference key="object" ref="256037954"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="694090924"/> - </object> - <reference key="parent" ref="351194612"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7406</int> - <reference key="object" ref="947192156"/> - <reference key="parent" ref="351194612"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7409</int> - <reference key="object" ref="694090924"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="385028074"/> - <reference ref="683443109"/> - </object> - <reference key="parent" ref="256037954"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7410</int> - <reference key="object" ref="385028074"/> - <reference key="parent" ref="694090924"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7412</int> - <reference key="object" ref="683443109"/> - <reference key="parent" ref="694090924"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7429</int> - <reference key="object" ref="951184307"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="679246699"/> - </object> - <reference key="parent" ref="1028777476"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7430</int> - <reference key="object" ref="679246699"/> - <reference key="parent" ref="951184307"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7438</int> - <reference key="object" ref="986860589"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="472283040"/> - </object> - <reference key="parent" ref="730602982"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7439</int> - <reference key="object" ref="472283040"/> - <reference key="parent" ref="986860589"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7440</int> - <reference key="object" ref="656261728"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1466046"/> - </object> - <reference key="parent" ref="730602982"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7441</int> - <reference key="object" ref="1466046"/> - <reference key="parent" ref="656261728"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7442</int> - <reference key="object" ref="196361793"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="995017127"/> - </object> - <reference key="parent" ref="730602982"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7443</int> - <reference key="object" ref="995017127"/> - <reference key="parent" ref="196361793"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7444</int> - <reference key="object" ref="307672983"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="428052689"/> - </object> - <reference key="parent" ref="730602982"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7445</int> - <reference key="object" ref="428052689"/> - <reference key="parent" ref="307672983"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7446</int> - <reference key="object" ref="988950867"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="103576616"/> - </object> - <reference key="parent" ref="730602982"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7447</int> - <reference key="object" ref="103576616"/> - <reference key="parent" ref="988950867"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7448</int> - <reference key="object" ref="333563212"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="958047642"/> - </object> - <reference key="parent" ref="730602982"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7449</int> - <reference key="object" ref="958047642"/> - <reference key="parent" ref="333563212"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7450</int> - <reference key="object" ref="993399156"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="662360258"/> - </object> - <reference key="parent" ref="730602982"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7451</int> - <reference key="object" ref="662360258"/> - <reference key="parent" ref="993399156"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7452</int> - <reference key="object" ref="1047204509"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="328213476"/> - </object> - <reference key="parent" ref="730602982"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7453</int> - <reference key="object" ref="328213476"/> - <reference key="parent" ref="1047204509"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7454</int> - <reference key="object" ref="69053511"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="700311928"/> - </object> - <reference key="parent" ref="730602982"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7455</int> - <reference key="object" ref="700311928"/> - <reference key="parent" ref="69053511"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7457</int> - <reference key="object" ref="168895907"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="598509241"/> - </object> - <reference key="parent" ref="220777809"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7458</int> - <reference key="object" ref="598509241"/> - <reference key="parent" ref="168895907"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7463</int> - <reference key="object" ref="67603994"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="527038904"/> - </object> - <reference key="parent" ref="556476514"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7464</int> - <reference key="object" ref="527038904"/> - <reference key="parent" ref="67603994"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7467</int> - <reference key="object" ref="527545451"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="301167516"/> - <reference ref="771032846"/> - <reference ref="231084647"/> - <reference ref="275038138"/> - <reference ref="726011785"/> - </object> - <reference key="parent" ref="0"/> - <string key="objectName">Table Custom Query Menu</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7468</int> - <reference key="object" ref="301167516"/> - <reference key="parent" ref="527545451"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7469</int> - <reference key="object" ref="771032846"/> - <reference key="parent" ref="527545451"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7470</int> - <reference key="object" ref="231084647"/> - <reference key="parent" ref="527545451"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7473</int> - <reference key="object" ref="275038138"/> - <reference key="parent" ref="527545451"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7472</int> - <reference key="object" ref="726011785"/> - <reference key="parent" ref="527545451"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7484</int> - <reference key="object" ref="325583102"/> + <int key="objectID">6142</int> + <reference key="object" ref="28219887"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="309064650"/> + <reference ref="57416393"/> + <reference ref="595750628"/> + <reference ref="960207750"/> + <reference ref="500608059"/> </object> - <reference key="parent" ref="715508012"/> + <reference key="parent" ref="1053680279"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7486</int> - <reference key="object" ref="90106305"/> + <int key="objectID">6153</int> + <reference key="object" ref="57416393"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="127254249"/> + <reference ref="708016222"/> </object> - <reference key="parent" ref="715508012"/> + <reference key="parent" ref="28219887"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7488</int> - <reference key="object" ref="977579039"/> + <int key="objectID">6151</int> + <reference key="object" ref="595750628"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="922217819"/> + <reference ref="227511715"/> </object> - <reference key="parent" ref="715508012"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7489</int> - <reference key="object" ref="922217819"/> - <reference key="parent" ref="977579039"/> + <reference key="parent" ref="28219887"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7490</int> - <reference key="object" ref="309064650"/> + <int key="objectID">6145</int> + <reference key="object" ref="960207750"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="326438402"/> + <reference ref="321871356"/> </object> - <reference key="parent" ref="325583102"/> + <reference key="parent" ref="28219887"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7491</int> - <reference key="object" ref="326438402"/> + <int key="objectID">6143</int> + <reference key="object" ref="500608059"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="283448047"/> </object> - <reference key="parent" ref="309064650"/> + <reference key="parent" ref="28219887"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7493</int> - <reference key="object" ref="127254249"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="39043069"/> - </object> - <reference key="parent" ref="90106305"/> + <int key="objectID">6144</int> + <reference key="object" ref="283448047"/> + <reference key="parent" ref="500608059"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7494</int> - <reference key="object" ref="39043069"/> + <int key="objectID">6146</int> + <reference key="object" ref="321871356"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="890046805"/> </object> - <reference key="parent" ref="127254249"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7499</int> - <reference key="object" ref="819141542"/> - <reference key="parent" ref="752657505"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7500</int> - <reference key="object" ref="182964528"/> - <reference key="parent" ref="752657505"/> + <reference key="parent" ref="960207750"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7502</int> - <reference key="object" ref="633448481"/> + <int key="objectID">6147</int> + <reference key="object" ref="890046805"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="257361103"/> + <reference ref="570147191"/> + <reference ref="215466732"/> + <reference ref="545621807"/> + <reference ref="351524538"/> + <reference ref="962084508"/> + <reference ref="226083732"/> + <reference ref="897887117"/> + <reference ref="112091395"/> + <reference ref="584909701"/> + <reference ref="160189226"/> + <reference ref="1049807214"/> </object> - <reference key="parent" ref="0"/> - <string key="objectName">Filter Table Window</string> + <reference key="parent" ref="321871356"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7503</int> - <reference key="object" ref="257361103"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="389089658"/> - <reference ref="631288327"/> - <reference ref="80390753"/> - <reference ref="571404189"/> - <reference ref="614305746"/> - <reference ref="672293521"/> - <reference ref="743894180"/> - </object> - <reference key="parent" ref="633448481"/> + <int key="objectID">6927</int> + <reference key="object" ref="570147191"/> + <reference key="parent" ref="890046805"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7504</int> - <reference key="object" ref="80390753"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="317678649"/> - <reference ref="40644394"/> - </object> - <reference key="parent" ref="257361103"/> + <int key="objectID">6926</int> + <reference key="object" ref="215466732"/> + <reference key="parent" ref="890046805"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7505</int> - <reference key="object" ref="672293521"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1073467237"/> - </object> - <reference key="parent" ref="257361103"/> + <int key="objectID">6148</int> + <reference key="object" ref="545621807"/> + <reference key="parent" ref="890046805"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7506</int> - <reference key="object" ref="389089658"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="800774053"/> - </object> - <reference key="parent" ref="257361103"/> + <int key="objectID">6160</int> + <reference key="object" ref="351524538"/> + <reference key="parent" ref="890046805"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7511</int> - <reference key="object" ref="800774053"/> - <reference key="parent" ref="389089658"/> + <int key="objectID">6159</int> + <reference key="object" ref="962084508"/> + <reference key="parent" ref="890046805"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7512</int> - <reference key="object" ref="1073467237"/> - <reference key="parent" ref="672293521"/> + <int key="objectID">6158</int> + <reference key="object" ref="226083732"/> + <reference key="parent" ref="890046805"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7513</int> - <reference key="object" ref="317678649"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="81944450"/> - </object> - <reference key="parent" ref="80390753"/> + <int key="objectID">6157</int> + <reference key="object" ref="897887117"/> + <reference key="parent" ref="890046805"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7514</int> - <reference key="object" ref="40644394"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="332689220"/> - </object> - <reference key="parent" ref="80390753"/> + <int key="objectID">6156</int> + <reference key="object" ref="112091395"/> + <reference key="parent" ref="890046805"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7515</int> - <reference key="object" ref="332689220"/> + <int key="objectID">7061</int> + <reference key="object" ref="584909701"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="281953763"/> - <reference ref="784489290"/> - <reference ref="233010382"/> - <reference ref="493190585"/> + <reference ref="593991505"/> </object> - <reference key="parent" ref="40644394"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7516</int> - <reference key="object" ref="281953763"/> - <reference key="parent" ref="332689220"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7517</int> - <reference key="object" ref="784489290"/> - <reference key="parent" ref="332689220"/> + <reference key="parent" ref="890046805"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7518</int> - <reference key="object" ref="233010382"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="435560165"/> - </object> - <reference key="parent" ref="332689220"/> + <int key="objectID">7069</int> + <reference key="object" ref="160189226"/> + <reference key="parent" ref="890046805"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7519</int> - <reference key="object" ref="493190585"/> - <reference key="parent" ref="332689220"/> + <int key="objectID">7686</int> + <reference key="object" ref="1049807214"/> + <reference key="parent" ref="890046805"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7520</int> - <reference key="object" ref="435560165"/> + <int key="objectID">7062</int> + <reference key="object" ref="593991505"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1007581754"/> + <reference ref="752934580"/> + <reference ref="639503037"/> + <reference ref="779058431"/> </object> - <reference key="parent" ref="233010382"/> + <reference key="parent" ref="584909701"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7521</int> - <reference key="object" ref="1007581754"/> - <reference key="parent" ref="435560165"/> + <int key="objectID">7063</int> + <reference key="object" ref="752934580"/> + <reference key="parent" ref="593991505"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7522</int> - <reference key="object" ref="81944450"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="378021102"/> - <reference ref="28009727"/> - <reference ref="617167031"/> - </object> - <reference key="parent" ref="317678649"/> + <int key="objectID">7064</int> + <reference key="object" ref="639503037"/> + <reference key="parent" ref="593991505"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7523</int> - <reference key="object" ref="378021102"/> - <reference key="parent" ref="81944450"/> + <int key="objectID">7065</int> + <reference key="object" ref="779058431"/> + <reference key="parent" ref="593991505"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7524</int> - <reference key="object" ref="28009727"/> - <reference key="parent" ref="81944450"/> + <int key="objectID">6152</int> + <reference key="object" ref="227511715"/> + <reference key="parent" ref="595750628"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7525</int> - <reference key="object" ref="617167031"/> - <reference key="parent" ref="81944450"/> + <int key="objectID">6154</int> + <reference key="object" ref="708016222"/> + <reference key="parent" ref="57416393"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7533</int> - <reference key="object" ref="873734510"/> + <int key="objectID">7777</int> + <reference key="object" ref="262085420"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="212274460"/> + <reference ref="795017229"/> + <reference ref="964230781"/> </object> <reference key="parent" ref="1013108064"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7534</int> - <reference key="object" ref="212274460"/> - <reference key="parent" ref="873734510"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7537</int> - <reference key="object" ref="631288327"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1038452661"/> - </object> - <reference key="parent" ref="257361103"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7538</int> - <reference key="object" ref="1038452661"/> - <reference key="parent" ref="631288327"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7563</int> - <reference key="object" ref="743894180"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="131977594"/> - </object> - <reference key="parent" ref="257361103"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7564</int> - <reference key="object" ref="131977594"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="435787029"/> - </object> - <reference key="parent" ref="743894180"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7565</int> - <reference key="object" ref="435787029"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="182251176"/> - <reference ref="799609780"/> - <reference ref="250649762"/> - <reference ref="906365069"/> - <reference ref="926461989"/> - <reference ref="960836473"/> - </object> - <reference key="parent" ref="131977594"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7570</int> - <reference key="object" ref="182251176"/> - <reference key="parent" ref="435787029"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7569</int> - <reference key="object" ref="799609780"/> - <reference key="parent" ref="435787029"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7568</int> - <reference key="object" ref="250649762"/> - <reference key="parent" ref="435787029"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7567</int> - <reference key="object" ref="906365069"/> - <reference key="parent" ref="435787029"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7566</int> - <reference key="object" ref="926461989"/> - <reference key="parent" ref="435787029"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7583</int> - <reference key="object" ref="614305746"/> + <int key="objectID">7778</int> + <reference key="object" ref="795017229"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="334758487"/> - </object> - <reference key="parent" ref="257361103"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7584</int> - <reference key="object" ref="334758487"/> - <reference key="parent" ref="614305746"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7602</int> - <reference key="object" ref="571404189"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="175346013"/> - <reference ref="750508133"/> - <reference ref="1256480"/> - </object> - <reference key="parent" ref="257361103"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7603</int> - <reference key="object" ref="175346013"/> - <reference key="parent" ref="571404189"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7604</int> - <reference key="object" ref="750508133"/> - <reference key="parent" ref="571404189"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7605</int> - <reference key="object" ref="1256480"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="731332077"/> - </object> - <reference key="parent" ref="571404189"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7606</int> - <reference key="object" ref="731332077"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="997033309"/> - </object> - <reference key="parent" ref="1256480"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7607</int> - <reference key="object" ref="997033309"/> - <reference key="parent" ref="731332077"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7609</int> - <reference key="object" ref="923391973"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="680570399"/> - </object> - <reference key="parent" ref="0"/> - <string key="objectName">Filter Table Set Default Operator Sheet</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7610</int> - <reference key="object" ref="680570399"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="854762999"/> - <reference ref="176747162"/> - <reference ref="1048134410"/> - <reference ref="443771452"/> - <reference ref="306412979"/> - </object> - <reference key="parent" ref="923391973"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7615</int> - <reference key="object" ref="1048134410"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="307696791"/> + <reference ref="905386082"/> + <reference ref="830088955"/> + <reference ref="744029762"/> </object> - <reference key="parent" ref="680570399"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7616</int> - <reference key="object" ref="307696791"/> - <reference key="parent" ref="1048134410"/> + <reference key="parent" ref="262085420"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7617</int> - <reference key="object" ref="443771452"/> + <int key="objectID">7779</int> + <reference key="object" ref="964230781"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="409181653"/> + <reference ref="377771536"/> + <reference ref="85531569"/> + <reference ref="722854793"/> + <reference ref="538700903"/> </object> - <reference key="parent" ref="680570399"/> + <reference key="parent" ref="262085420"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7618</int> - <reference key="object" ref="409181653"/> - <reference key="parent" ref="443771452"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7619</int> - <reference key="object" ref="854762999"/> + <int key="objectID">3971</int> + <reference key="object" ref="905386082"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="516417057"/> + <reference ref="314592665"/> </object> - <reference key="parent" ref="680570399"/> + <reference key="parent" ref="795017229"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7620</int> - <reference key="object" ref="516417057"/> - <reference key="parent" ref="854762999"/> + <int key="objectID">3972</int> + <reference key="object" ref="314592665"/> + <reference key="parent" ref="905386082"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7623</int> - <reference key="object" ref="176747162"/> + <int key="objectID">146</int> + <reference key="object" ref="830088955"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="200145570"/> - <reference ref="570980822"/> - <reference ref="561854733"/> + <reference ref="376863254"/> </object> - <reference key="parent" ref="680570399"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7624</int> - <reference key="object" ref="200145570"/> - <reference key="parent" ref="176747162"/> + <reference key="parent" ref="795017229"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7625</int> - <reference key="object" ref="570980822"/> - <reference key="parent" ref="176747162"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7626</int> - <reference key="object" ref="561854733"/> - <reference key="parent" ref="176747162"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7629</int> - <reference key="object" ref="306412979"/> + <int key="objectID">3754</int> + <reference key="object" ref="376863254"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="928180881"/> + <reference ref="747439187"/> </object> - <reference key="parent" ref="680570399"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7630</int> - <reference key="object" ref="928180881"/> - <reference key="parent" ref="306412979"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7633</int> - <reference key="object" ref="960836473"/> - <reference key="parent" ref="435787029"/> + <reference key="parent" ref="830088955"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7649</int> - <reference key="object" ref="844922654"/> + <int key="objectID">147</int> + <reference key="object" ref="747439187"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="688701059"/> + <reference ref="1028844875"/> </object> - <reference key="parent" ref="220777809"/> + <reference key="parent" ref="376863254"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7650</int> - <reference key="object" ref="688701059"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1032311748"/> - </object> - <reference key="parent" ref="844922654"/> + <int key="objectID">144</int> + <reference key="object" ref="1028844875"/> + <reference key="parent" ref="747439187"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7651</int> - <reference key="object" ref="1032311748"/> + <int key="objectID">156</int> + <reference key="object" ref="744029762"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="388408398"/> - <reference ref="995423539"/> + <reference ref="105542136"/> </object> - <reference key="parent" ref="688701059"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7652</int> - <reference key="object" ref="388408398"/> - <reference key="parent" ref="1032311748"/> + <reference key="parent" ref="795017229"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7653</int> - <reference key="object" ref="995423539"/> + <int key="objectID">3755</int> + <reference key="object" ref="105542136"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="361834046"/> + <reference ref="1000166734"/> </object> - <reference key="parent" ref="1032311748"/> + <reference key="parent" ref="744029762"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7654</int> - <reference key="object" ref="361834046"/> + <int key="objectID">157</int> + <reference key="object" ref="1000166734"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="975189907"/> - <reference ref="175745626"/> - <reference ref="776631612"/> - <reference ref="746368739"/> + <reference ref="129836593"/> </object> - <reference key="parent" ref="995423539"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7655</int> - <reference key="object" ref="975189907"/> - <reference key="parent" ref="361834046"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7656</int> - <reference key="object" ref="175745626"/> - <reference key="parent" ref="361834046"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7660</int> - <reference key="object" ref="776631612"/> - <reference key="parent" ref="361834046"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7661</int> - <reference key="object" ref="746368739"/> - <reference key="parent" ref="361834046"/> + <reference key="parent" ref="105542136"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7668</int> - <reference key="object" ref="456870714"/> - <reference key="parent" ref="107658659"/> + <int key="objectID">154</int> + <reference key="object" ref="129836593"/> + <reference key="parent" ref="1000166734"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7052</int> - <reference key="object" ref="563848996"/> + <int key="objectID">6371</int> + <reference key="object" ref="538700903"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="980906208"/> - <reference ref="675650257"/> - <reference ref="407752940"/> + <reference ref="564763515"/> </object> - <reference key="parent" ref="985474865"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7055</int> - <reference key="object" ref="980906208"/> - <reference key="parent" ref="563848996"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7054</int> - <reference key="object" ref="675650257"/> - <reference key="parent" ref="563848996"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7053</int> - <reference key="object" ref="407752940"/> - <reference key="parent" ref="563848996"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7683</int> - <reference key="object" ref="530477407"/> - <reference key="parent" ref="556141845"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7686</int> - <reference key="object" ref="1049807214"/> - <reference key="parent" ref="890046805"/> + <reference key="parent" ref="964230781"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7691</int> - <reference key="object" ref="561874764"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="794785393"/> - <reference ref="313695606"/> - <reference ref="464071814"/> - </object> - <reference key="parent" ref="192579410"/> - <string key="objectName">Scroll View (Activities Table View)</string> + <int key="objectID">6372</int> + <reference key="object" ref="564763515"/> + <reference key="parent" ref="538700903"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7692</int> - <reference key="object" ref="794785393"/> + <int key="objectID">6369</int> + <reference key="object" ref="722854793"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="195537032"/> + <reference ref="556901008"/> </object> - <reference key="parent" ref="561874764"/> - <string key="objectName">Table View (Activities)</string> + <reference key="parent" ref="964230781"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7693</int> - <reference key="object" ref="313695606"/> - <reference key="parent" ref="561874764"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7694</int> - <reference key="object" ref="464071814"/> - <reference key="parent" ref="561874764"/> + <int key="objectID">6370</int> + <reference key="object" ref="556901008"/> + <reference key="parent" ref="722854793"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7695</int> - <reference key="object" ref="195537032"/> + <int key="objectID">6364</int> + <reference key="object" ref="85531569"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="530698659"/> + <reference ref="194715102"/> </object> - <reference key="parent" ref="794785393"/> + <reference key="parent" ref="964230781"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7696</int> - <reference key="object" ref="530698659"/> - <reference key="parent" ref="195537032"/> + <int key="objectID">6365</int> + <reference key="object" ref="194715102"/> + <reference key="parent" ref="85531569"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7721</int> - <reference key="object" ref="618407678"/> + <int key="objectID">3963</int> + <reference key="object" ref="377771536"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="628306046"/> - <reference ref="195758564"/> - <reference ref="714539623"/> + <reference ref="667596795"/> </object> - <reference key="parent" ref="1028777476"/> + <reference key="parent" ref="964230781"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7722</int> - <reference key="object" ref="628306046"/> - <reference key="parent" ref="618407678"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7723</int> - <reference key="object" ref="195758564"/> - <reference key="parent" ref="618407678"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7724</int> - <reference key="object" ref="714539623"/> - <reference key="parent" ref="618407678"/> + <int key="objectID">3964</int> + <reference key="object" ref="667596795"/> + <reference key="parent" ref="377771536"/> </object> </object> </object> @@ -23824,9 +23836,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <string>6293.IBSegmentedControlTracker.RoundRobinState</string> <string>6293.IBSegmentedControlTracker.WasGrowing</string> <string>6294.IBPluginDependency</string> - <string>6303.IBPluginDependency</string> - <string>6304.IBPluginDependency</string> - <string>6305.IBPluginDependency</string> <string>6340.IBPluginDependency</string> <string>6341.IBPluginDependency</string> <string>6343.IBPluginDependency</string> @@ -23988,10 +23997,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <string>6736.IBPluginDependency</string> <string>674.IBPluginDependency</string> <string>674.ImportedFromIB2</string> - <string>675.IBPluginDependency</string> - <string>675.ImportedFromIB2</string> - <string>676.IBPluginDependency</string> - <string>676.ImportedFromIB2</string> <string>6765.IBEditorWindowLastContentRect</string> <string>6765.IBPluginDependency</string> <string>6765.IBWindowTemplateEditedContentRect</string> @@ -24003,9 +24008,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <string>6767.IBPluginDependency</string> <string>6768.IBPluginDependency</string> <string>6769.IBPluginDependency</string> - <string>677.CustomClassName</string> - <string>677.IBPluginDependency</string> - <string>677.ImportedFromIB2</string> <string>6770.IBPluginDependency</string> <string>6771.IBPluginDependency</string> <string>6772.IBPluginDependency</string> @@ -24468,6 +24470,12 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <string>7722.IBPluginDependency</string> <string>7723.IBPluginDependency</string> <string>7724.IBPluginDependency</string> + <string>7727.IBPluginDependency</string> + <string>7728.IBPluginDependency</string> + <string>7729.IBPluginDependency</string> + <string>7777.IBPluginDependency</string> + <string>7778.IBPluginDependency</string> + <string>7779.IBPluginDependency</string> <string>858.IBPluginDependency</string> <string>858.ImportedFromIB2</string> <string>959.IBEditorWindowLastContentRect</string> @@ -25396,9 +25404,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -25618,10 +25623,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</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>{{308, 178}, {360, 348}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{308, 178}, {360, 348}}</string> @@ -25645,9 +25646,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>BWSplitView</string> - <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> @@ -25800,7 +25798,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{58, 273}, {943, 549}}</string> + <string>{{81, 307}, {943, 549}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -26270,6 +26268,12 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.brandonwalkin.BWToolkit</string> + <string>com.brandonwalkin.BWToolkit</string> + <string>com.brandonwalkin.BWToolkit</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{265, 489}, {405, 267}}</string> @@ -26308,7 +26312,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> </object> </object> <nil key="sourceID"/> - <int key="maxID">7726</int> + <int key="maxID">7780</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -28664,6 +28668,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <string>exportCustomFilenameViewButton</string> <string>exportCustomFilenameViewLabelButton</string> <string>exportDeselectAllTablesButton</string> + <string>exportDotForceLowerTableNamesCheck</string> <string>exportExcelSheetOrFilePerTableMatrix</string> <string>exportFilePerTableCheck</string> <string>exportFilenameDividerBox</string> @@ -28721,6 +28726,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <string>NSButton</string> <string>NSButton</string> <string>NSButton</string> + <string>NSButton</string> <string>NSMatrix</string> <string>NSButton</string> <string>NSBox</string> @@ -28781,6 +28787,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <string>exportCustomFilenameViewButton</string> <string>exportCustomFilenameViewLabelButton</string> <string>exportDeselectAllTablesButton</string> + <string>exportDotForceLowerTableNamesCheck</string> <string>exportExcelSheetOrFilePerTableMatrix</string> <string>exportFilePerTableCheck</string> <string>exportFilenameDividerBox</string> @@ -28896,6 +28903,10 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes> <string key="candidateClassName">NSButton</string> </object> <object class="IBToOneOutletInfo"> + <string key="name">exportDotForceLowerTableNamesCheck</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo"> <string key="name">exportExcelSheetOrFilePerTableMatrix</string> <string key="candidateClassName">NSMatrix</string> </object> diff --git a/Resources/English.lproj/BundleEditor.strings b/Resources/English.lproj/BundleEditor.strings Binary files differindex 70fce557..17be5976 100644 --- a/Resources/English.lproj/BundleEditor.strings +++ b/Resources/English.lproj/BundleEditor.strings diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings Binary files differindex 15ffd56a..18431777 100644 --- a/Resources/English.lproj/Localizable.strings +++ b/Resources/English.lproj/Localizable.strings diff --git a/Resources/Plists/PreferenceDefaults.plist b/Resources/Plists/PreferenceDefaults.plist index 093174a2..591bb967 100644 --- a/Resources/Plists/PreferenceDefaults.plist +++ b/Resources/Plists/PreferenceDefaults.plist @@ -175,5 +175,9 @@ <string>LIKE '%@%'</string> <key>WebKitDeveloperExtras</key> <true/> + <key>deletedDefaultBundles</key> + <array/> + <key>updatedDefaultBundles</key> + <array/> </dict> </plist> diff --git a/Scripts/build.sh b/Scripts/build.sh index 82c788de..a9291abb 100755 --- a/Scripts/build.sh +++ b/Scripts/build.sh @@ -42,6 +42,13 @@ then "${SRCROOT}/Scripts/trim-application.sh" -p "$BUILD_PRODUCT" -a fi +# Copy all Default Bundles to build product +rm -rf "${BUILD_PRODUCT}/Contents/SharedSupport/Default Bundles" + +mkdir -p "${BUILD_PRODUCT}/Contents/SharedSupport/Default Bundles" + +cp -R "${SRCROOT}/SharedSupport/Default Bundles" "${BUILD_PRODUCT}/Contents/SharedSupport" + # Perform distribution specific tasks if this is a 'Distribution' build if [ "$CONFIGURATION" == 'Distribution' ] then diff --git a/SharedSupport/Default Bundles/Open Selected Table.spBundle/command.plist b/SharedSupport/Default Bundles/Open Selected Table.spBundle/command.plist new file mode 100644 index 00000000..6bf2c03f --- /dev/null +++ b/SharedSupport/Default Bundles/Open Selected Table.spBundle/command.plist @@ -0,0 +1,119 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>author</key> + <string>Hans-Jörg Bibiko</string> + <key>category</key> + <string>Open</string> + <key>command</key> + <string> +# Remove hand-shake files +rm -f "$SP_QUERY_RESULT_FILE" +rm -f "$SP_QUERY_FILE" +rm -f "$SP_QUERY_RESULT_STATUS_FILE" + + +# Check if one table is selected +if [ -z "$SP_SELECTED_TABLE" ]; then + echo "<font color=red>Please select a table.</font>" + exit $SP_BUNDLE_EXIT_SHOW_AS_HTML_TOOLTIP +fi + + +# Ask for desired application - modify the list if needed +open "sequelpro://$SP_PROCESS_ID@chooseItemFromList/Numbers/Microsoft Excel" + +# wait for Sequel Pro; status file will be written to disk if query was finished +while [ 1 ] +do + [[ -e "$SP_QUERY_RESULT_STATUS_FILE" ]] && break + sleep 0.01 +done + +# Read the chosen list item +APP=$(cat "$SP_QUERY_RESULT_FILE") + +# Check if user dismissed, if so bail (if $APP is empty := user pressed ESC) +if [ -z "$APP" ]; then + rm -f "$SP_QUERY_RESULT_FILE" + rm -f "$SP_QUERY_FILE" + rm -f "$SP_QUERY_RESULT_STATUS_FILE" + exit 0 +fi + +# Remove hand-shake files +rm -f "$SP_QUERY_RESULT_FILE" +rm -f "$SP_QUERY_FILE" +rm -f "$SP_QUERY_RESULT_STATUS_FILE" + + +# Query for desired data +echo "SELECT * FROM \`${SP_SELECTED_TABLE//\`/\`\`}\`" > "$SP_QUERY_FILE" +open "sequelpro://$SP_PROCESS_ID@passToDoc/ExecuteQuery/csv" + +# wait for Sequel Pro; status file will be written to disk if query +# was finished +while [ 1 ] +do + [[ -e "$SP_QUERY_RESULT_STATUS_FILE" ]] && break + sleep 0.1 +done + +# Check returned status 0 := no error; 1 := error +RES=$(cat "$SP_QUERY_RESULT_STATUS_FILE") +[[ ! -e "$SP_QUERY_RESULT_FILE" ]] && RES=1 + + +# No sql error +if [ "$RES" == "0" ]; then + DATAFILENAME=$(date "+sp_data%H%M%S.csv") + mv "$SP_QUERY_RESULT_FILE" ~/Desktop/$DATAFILENAME + open -a "$APP" ~/Desktop/$DATAFILENAME + echo "$APP is opening data file ~/Desktop/$DATAFILENAME." +else + # if error message will be saved in result file + echo "<font color=red>" + cat "$SP_QUERY_RESULT_FILE" + echo "</font>" + rm -f "$SP_QUERY_RESULT_FILE" + rm -f "$SP_QUERY_FILE" + rm -f "$SP_QUERY_RESULT_STATUS_FILE" + exit $SP_BUNDLE_EXIT_SHOW_AS_HTML_TOOLTIP +fi + +rm -f "$SP_QUERY_RESULT_FILE" +rm -f "$SP_QUERY_FILE" +rm -f "$SP_QUERY_RESULT_STATUS_FILE" +</string> + <key>contact</key> + <string>znvy@ovovxb.qr</string> + <key>description</key> + <string>If one table is selected in the Table List it will write the table data CSV formatted at "~/Desktop/sp_dataxxxxx.csv" to disk (xxxxx := timestamp) and asks for the application with which the data should be opened. + +Version 1.0</string> + <key>internalKeyEquivalent</key> + <dict> + <key>characters</key> + <string>O</string> + <key>keyCode</key> + <integer>31</integer> + <key>modifierFlags</key> + <integer>1835008</integer> + </dict> + <key>keyEquivalent</key> + <string>^~@o</string> + <key>name</key> + <string>Open selected table with…</string> + <key>output</key> + <string>showastexttooltip</string> + <key>scope</key> + <string>general</string> + <key>tooltip</key> + <string>Open selected table </string> + <key>uuid</key> + <string>8F406B0A-23A4-4436-A348-E248A61BA59C</string> + <key>isDefaultBundle</key> + <true/> +</dict> +</plist> diff --git a/Source/SPAppController.m b/Source/SPAppController.m index 879ea116..d89f0cce 100644 --- a/Source/SPAppController.m +++ b/Source/SPAppController.m @@ -528,11 +528,11 @@ } else { // Check for installed UUIDs if(![cmdData objectForKey:SPBundleFileUUIDKey]) { - NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Error while installing bundle file", @"error while installing bundle file")] - defaultButton:NSLocalizedString(@"OK", @"OK button") + NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Error while installing Bundle", @"Open Files : Bundle : UUID : Error dialog title")] + defaultButton:NSLocalizedString(@"OK", @"Open Files : Bundle : UUID : OK button") alternateButton:nil otherButton:nil - informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"The bundle ‘%@’ has no UUID which is necessary to identify installed bundles.", @"the bundle ‘%@’ has no UUID which is necessary to identify installed bundles."), [filename lastPathComponent]]]; + informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"The Bundle ‘%@’ has no UUID which is necessary to identify installed Bundles.", @"Open Files : Bundle: UUID : UUID-Attribute is missing in bundle's command.plist file"), [filename lastPathComponent]]]; [alert setAlertStyle:NSCriticalAlertStyle]; [alert runModal]; @@ -540,21 +540,21 @@ return; } if([[installedBundleUUIDs allKeys] containsObject:[cmdData objectForKey:SPBundleFileUUIDKey]]) { - NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Installing bundle file", @"installing bundle file")] - defaultButton:NSLocalizedString(@"Update", @"Update button") - alternateButton:NSLocalizedString(@"Cancel", @"Cancel button") + NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Installing Bundle", @"Open Files : Bundle : Already-Installed : 'Update Bundle' question dialog title")] + defaultButton:NSLocalizedString(@"Update", @"Open Files : Bundle : Already-Installed : Update button") + alternateButton:NSLocalizedString(@"Cancel", @"Open Files : Bundle : Already-Installed : Cancel button") otherButton:nil - informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"A bundle ‘%@’ is already installed. Do you want to update it?", @"a bundle ‘%@’ is already installed. do you want to update it?"), [[installedBundleUUIDs objectForKey:[cmdData objectForKey:SPBundleFileUUIDKey]] objectForKey:@"name"]]]; + informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"A Bundle ‘%@’ is already installed. Do you want to update it?", @"Open Files : Bundle : Already-Installed : 'Update Bundle' question dialog message"), [[installedBundleUUIDs objectForKey:[cmdData objectForKey:SPBundleFileUUIDKey]] objectForKey:@"name"]]]; [alert setAlertStyle:NSCriticalAlertStyle]; NSInteger answer = [alert runModal]; if(answer == NSAlertDefaultReturn) { NSError *error = nil; - NSString *moveToTrashCommand = [NSString stringWithFormat:@"osascript -e 'tell application \"Finder\" to move (POSIX file \"%@\") to the trash'", infoPath]; + NSString *moveToTrashCommand = [NSString stringWithFormat:@"osascript -e 'tell application \"Finder\" to move (POSIX file \"%@\") to the trash'", newPath]; [moveToTrashCommand runBashCommandWithEnvironment:nil atCurrentDirectoryPath:nil error:&error]; if(error != nil) { - NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Error while moving “%@” to Trash.", @"error while moving “%@” to trash"), [[installedBundleUUIDs objectForKey:[cmdData objectForKey:SPBundleFileUUIDKey]] objectForKey:@"path"]] - defaultButton:NSLocalizedString(@"OK", @"OK button") + NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Error while moving “%@” to Trash.", @"Open Files : Bundle : Already-Installed : Delete-Old-Error : Could not delete old bundle before installing new version."), [[installedBundleUUIDs objectForKey:[cmdData objectForKey:SPBundleFileUUIDKey]] objectForKey:@"path"]] + defaultButton:NSLocalizedString(@"OK", @"Open Files : Bundle : Already-Installed : Delete-Old-Error : OK button") alternateButton:nil otherButton:nil informativeTextWithFormat:[error localizedDescription]]; @@ -590,11 +590,11 @@ [self reloadBundles:self]; } else { - NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Error while installing bundle file", @"error while installing bundle file")] - defaultButton:NSLocalizedString(@"OK", @"OK button") + NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Error while installing Bundle", @"Open Files : Bundle : Install-Error : error dialog title")] + defaultButton:NSLocalizedString(@"OK", @"Open Files : Bundle : Install-Error : OK button") alternateButton:nil otherButton:nil - informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"The bundle ‘%@’ already exists.", @"the bundle ‘%@’ already exists."), [filename lastPathComponent]]]; + informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"The Bundle ‘%@’ already exists.", @"Open Files : Bundle : Install-Error : Destination path already exists error dialog message"), [filename lastPathComponent]]]; [alert setAlertStyle:NSCriticalAlertStyle]; [alert runModal]; @@ -635,6 +635,31 @@ else parameter = [NSArray array]; + + // Handle commands which don't need a connection window + if([command isEqualToString:@"chooseItemFromList"]) { + NSString *statusFileName = [NSString stringWithFormat:@"%@%@", SPURLSchemeQueryResultStatusPathHeader, (passedProcessID && [passedProcessID length]) ? passedProcessID : @""]; + NSString *resultFileName = [NSString stringWithFormat:@"%@%@", SPURLSchemeQueryResultPathHeader, (passedProcessID && [passedProcessID length]) ? passedProcessID : @""]; + [[NSFileManager defaultManager] removeItemAtPath:statusFileName error:nil]; + [[NSFileManager defaultManager] removeItemAtPath:resultFileName error:nil]; + NSString *result = @""; + NSString *status = @"0"; + if([parameter count]) { + NSInteger idx = [SPChooseMenuItemDialog withItems:parameter atPosition:[NSEvent mouseLocation]]; + if(idx > -1) { + result = [parameter objectAtIndex:idx]; + } + } + if(![status writeToFile:statusFileName atomically:YES encoding:NSUTF8StringEncoding error:nil]) { + NSBeep(); + SPBeginAlertSheet(NSLocalizedString(@"BASH Error", @"bash error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [self parentWindow], self, nil, nil, + NSLocalizedString(@"Status file for sequelpro url scheme command couldn't be written!", @"status file for sequelpro url scheme command couldn't be written error message")); + } + [result writeToFile:resultFileName atomically:YES encoding:NSUTF8StringEncoding error:nil]; + return; + } + + NSString *activeProcessID = [[[[self frontDocumentWindow] delegate] selectedTableDocument] processID]; SPDatabaseDocument *processDocument = nil; @@ -769,6 +794,8 @@ [env setObject:[infoPath stringByDeletingLastPathComponent] forKey:SPBundleShellVariableBundlePath]; [env setObject:bundleInputFilePath forKey:SPBundleShellVariableInputFilePath]; [env setObject:SPBundleScopeGeneral forKey:SPBundleShellVariableBundleScope]; + [env setObject:SPURLSchemeQueryResultPathHeader forKey:SPBundleShellVariableQueryResultFile]; + [env setObject:SPURLSchemeQueryResultStatusPathHeader forKey:SPBundleShellVariableQueryResultStatusFile]; NSString *input = @""; NSError *inputFileError = nil; @@ -798,7 +825,9 @@ [[NSFileManager defaultManager] removeItemAtPath:bundleInputFilePath error:nil]; - NSString *action = [[cmdData objectForKey:SPBundleFileOutputActionKey] lowercaseString]; + NSString *action = SPBundleOutputActionNone; + if([cmdData objectForKey:SPBundleFileOutputActionKey] && [[cmdData objectForKey:SPBundleFileOutputActionKey] length]) + action = [[cmdData objectForKey:SPBundleFileOutputActionKey] lowercaseString]; // Redirect due exit code if(err != nil) { @@ -837,8 +866,7 @@ } if(err == nil && output) { - if([cmdData objectForKey:SPBundleFileOutputActionKey] && [[cmdData objectForKey:SPBundleFileOutputActionKey] length] - && ![[cmdData objectForKey:SPBundleFileOutputActionKey] isEqualToString:SPBundleOutputActionNone]) { + if(![action isEqualToString:SPBundleOutputActionNone]) { NSPoint pos = [NSEvent mouseLocation]; pos.y -= 16; @@ -1318,118 +1346,302 @@ // Clean menu [menu compatibleRemoveAllItems]; - NSString *bundlePath = [[NSFileManager defaultManager] applicationSupportDirectoryForSubDirectory:SPBundleSupportFolder createIfNotExists:NO error:nil]; + NSArray *bundlePaths = [NSArray arrayWithObjects: + ([[NSFileManager defaultManager] applicationSupportDirectoryForSubDirectory:SPBundleSupportFolder createIfNotExists:NO error:nil])?:@"", + [NSString stringWithFormat:@"%@/Contents/SharedSupport/Default Bundles", [[NSBundle mainBundle] bundlePath]], + nil]; - if(bundlePath) { - NSError *error = nil; - NSArray *foundBundles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:bundlePath error:&error]; - if (foundBundles && [foundBundles count] && error == nil) { - for(NSString* bundle in foundBundles) { - if(![[[bundle pathExtension] lowercaseString] isEqualToString:[SPUserBundleFileExtension lowercaseString]]) continue; + BOOL processDefaultBundles = NO; + NSFileManager *fm = [NSFileManager defaultManager]; + + NSArray *deletedDefaultBundles; + NSMutableArray *updatedDefaultBundles = [NSMutableArray array]; + if([[NSUserDefaults standardUserDefaults] objectForKey:SPBundleDeletedDefaultBundlesKey]) { + deletedDefaultBundles = [[[NSUserDefaults standardUserDefaults] objectForKey:SPBundleDeletedDefaultBundlesKey] retain]; + } else { + deletedDefaultBundles = [[NSArray array] retain]; + } + if([[NSUserDefaults standardUserDefaults] objectForKey:SPBundleUpdatedDefaultBundlesKey]) { + [updatedDefaultBundles setArray:[[NSUserDefaults standardUserDefaults] objectForKey:SPBundleUpdatedDefaultBundlesKey]]; + } - foundInstalledBundles = YES; + NSMutableString *infoAboutUpdatedDefaultBundles = [NSMutableString string]; - NSError *readError = nil; - NSString *convError = nil; - NSPropertyListFormat format; - NSDictionary *cmdData = nil; - NSString *infoPath = [NSString stringWithFormat:@"%@/%@/%@", bundlePath, bundle, SPBundleFileName]; - NSData *pData = [NSData dataWithContentsOfFile:infoPath options:NSUncachedRead error:&readError]; + for(NSString* bundlePath in bundlePaths) { + if([bundlePath length]) { - cmdData = [[NSPropertyListSerialization propertyListFromData:pData - mutabilityOption:NSPropertyListImmutable format:&format errorDescription:&convError] retain]; + NSError *error = nil; + NSArray *foundBundles = [fm contentsOfDirectoryAtPath:bundlePath error:&error]; + if (foundBundles && [foundBundles count] && error == nil) { - if(!cmdData || readError != nil || [convError length] || !(format == NSPropertyListXMLFormat_v1_0 || format == NSPropertyListBinaryFormat_v1_0)) { - NSLog(@"“%@/%@” file couldn't be read.", bundle, SPBundleFileName); - NSBeep(); - if (cmdData) [cmdData release]; - } else { - if((![cmdData objectForKey:SPBundleFileDisabledKey] || ![[cmdData objectForKey:SPBundleFileDisabledKey] intValue]) && [cmdData objectForKey:SPBundleFileNameKey] && [[cmdData objectForKey:SPBundleFileNameKey] length] && [cmdData objectForKey:SPBundleFileScopeKey]) - { + for(NSString* bundle in foundBundles) { + if(![[[bundle pathExtension] lowercaseString] isEqualToString:[SPUserBundleFileExtension lowercaseString]]) continue; + + foundInstalledBundles = YES; + + NSError *readError = nil; + NSString *convError = nil; + NSPropertyListFormat format; + NSDictionary *cmdData = nil; + NSString *infoPath = [NSString stringWithFormat:@"%@/%@/%@", bundlePath, bundle, SPBundleFileName]; + NSData *pData = [NSData dataWithContentsOfFile:infoPath options:NSUncachedRead error:&readError]; + + cmdData = [[NSPropertyListSerialization propertyListFromData:pData + mutabilityOption:NSPropertyListImmutable format:&format errorDescription:&convError] retain]; + + if(!cmdData || readError != nil || [convError length] || !(format == NSPropertyListXMLFormat_v1_0 || format == NSPropertyListBinaryFormat_v1_0)) { + + NSLog(@"“%@” file couldn't be read.", infoPath); + NSBeep(); + + } else { + if((![cmdData objectForKey:SPBundleFileDisabledKey] || ![[cmdData objectForKey:SPBundleFileDisabledKey] intValue]) + && [cmdData objectForKey:SPBundleFileNameKey] + && [[cmdData objectForKey:SPBundleFileNameKey] length] + && [cmdData objectForKey:SPBundleFileScopeKey]) + { + + if([cmdData objectForKey:SPBundleFileUUIDKey] && [[cmdData objectForKey:SPBundleFileUUIDKey] length]) { + + if(processDefaultBundles) { + + // Skip deleted default Bundles + BOOL bundleWasDeleted = NO; + if([deletedDefaultBundles count]) { + for(NSArray* item in deletedDefaultBundles) { + if([[item objectAtIndex:0] isEqualToString:[cmdData objectForKey:SPBundleFileUUIDKey]]) { + bundleWasDeleted = YES; + break; + } + } + } + if(bundleWasDeleted) continue; + + // If default Bundle is already install check for possible update, + // if so duplicate the modified one by appending (user) and updated it + if([installedBundleUUIDs objectForKey:[cmdData objectForKey:SPBundleFileUUIDKey]]) { + if([updatedDefaultBundles containsObject:[cmdData objectForKey:SPBundleFileUUIDKey]]) { + + NSString *oldPath = [NSString stringWithFormat:@"%@/%@/%@", [bundlePaths objectAtIndex:0], bundle, SPBundleFileName]; + NSError *readError = nil; + NSString *convError = nil; + NSPropertyListFormat format; + NSDictionary *cmdData = nil; + + NSData *pData = [NSData dataWithContentsOfFile:oldPath options:NSUncachedRead error:&readError]; + cmdData = [[NSPropertyListSerialization propertyListFromData:pData + mutabilityOption:NSPropertyListImmutable format:&format errorDescription:&convError] retain]; + if(!cmdData || readError != nil || [convError length] || !(format == NSPropertyListXMLFormat_v1_0 || format == NSPropertyListBinaryFormat_v1_0)) { + NSLog(@"“%@” file couldn't be read.", oldPath); + NSBeep(); + if (cmdData) [cmdData release]; + continue; + } else { + NSString *oldBundle = [NSString stringWithFormat:@"%@/%@", [bundlePaths objectAtIndex:0], bundle]; + // Check for modifications + if([cmdData objectForKey:SPBundleFileDefaultBundleWasModifiedKey]) { + + // Duplicate Bundle, change the UUID and rename the menu label + NSString *duplicatedBundle = [NSString stringWithFormat:@"%@/%@_%ld.%@", [bundlePaths objectAtIndex:0], [bundle substringToIndex:([bundle length] - [SPUserBundleFileExtension length] - 1)], (NSUInteger)(random() % 35000), SPUserBundleFileExtension]; + if(![[NSFileManager defaultManager] copyItemAtPath:oldBundle toPath:duplicatedBundle error:nil]) { + NSLog(@"Couldn't copy “%@” to update it", bundle); + NSBeep(); + if (cmdData) [cmdData release]; + continue; + } + NSError *readError1 = nil; + NSString *convError1 = nil; + NSMutableDictionary *dupData = [NSMutableDictionary dictionary]; + NSString *duplicatedBundleCommand = [NSString stringWithFormat:@"%@/%@", duplicatedBundle, SPBundleFileName]; + NSData *dData = [NSData dataWithContentsOfFile:duplicatedBundleCommand options:NSUncachedRead error:&readError1]; + [dupData setDictionary:[NSPropertyListSerialization propertyListFromData:dData + mutabilityOption:NSPropertyListImmutable format:&format errorDescription:&convError1]]; + if(!dupData && ![dupData count] || readError1 != nil || [convError1 length] || !(format == NSPropertyListXMLFormat_v1_0 || format == NSPropertyListBinaryFormat_v1_0)) { + NSLog(@"“%@” file couldn't be read.", duplicatedBundleCommand); + NSBeep(); + continue; + } + [dupData setObject:[NSString stringWithNewUUID] forKey:SPBundleFileUUIDKey]; + NSString *orgName = [dupData objectForKey:SPBundleFileNameKey]; + [dupData setObject:[NSString stringWithFormat:@"%@ (user)", orgName] forKey:SPBundleFileNameKey]; + [dupData removeObjectForKey:SPBundleFileIsDefaultBundleKey]; + [dupData writeToFile:duplicatedBundleCommand atomically:YES]; + + NSError *error = nil; + NSString *moveToTrashCommand = [NSString stringWithFormat:@"osascript -e 'tell application \"Finder\" to move (POSIX file \"%@\") to the trash'", oldBundle]; + [moveToTrashCommand runBashCommandWithEnvironment:nil atCurrentDirectoryPath:nil error:&error]; + + if(error != nil) { + NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Error while moving “%@” to Trash.", @"error while moving “%@” to trash"), [[installedBundleUUIDs objectForKey:[cmdData objectForKey:SPBundleFileUUIDKey]] objectForKey:@"path"]] + defaultButton:NSLocalizedString(@"OK", @"OK button") + alternateButton:nil + otherButton:nil + informativeTextWithFormat:[error localizedDescription]]; + + [alert setAlertStyle:NSCriticalAlertStyle]; + [alert runModal]; + if (cmdData) [cmdData release]; + continue; + } + [infoAboutUpdatedDefaultBundles appendFormat:@"• %@\n", orgName]; + } else { + + // If no modifications are done simply remove the old one + if(![fm removeItemAtPath:oldBundle error:nil]) { + NSLog(@"Couldn't remove “%@” to update it", bundle); + NSBeep(); + if (cmdData) [cmdData release]; + continue; + } + + } + + // Remove item from update list which will be updated in the Prefs + [updatedDefaultBundles removeObject:[cmdData objectForKey:SPBundleFileUUIDKey]]; + + } + + if (cmdData) [cmdData release]; + + } else { + continue; + } + } + + BOOL isDir; + NSString *newInfoPath = [NSString stringWithFormat:@"%@/%@/%@", [bundlePaths objectAtIndex:0], bundle, SPBundleFileName]; + NSString *orgPath = [NSString stringWithFormat:@"%@/%@", [bundlePaths objectAtIndex:1], bundle]; + NSString *newPath = [NSString stringWithFormat:@"%@/%@", [bundlePaths objectAtIndex:0], bundle]; + if([fm fileExistsAtPath:newPath isDirectory:&isDir] && isDir) + newPath = [NSString stringWithFormat:@"%@_%ld", newPath, (NSUInteger)(random() % 35000)]; + NSError *error = nil; + [fm copyItemAtPath:orgPath toPath:newPath error:&error]; + if(error != nil) { + NSBeep(); + NSLog(@"Default Bundle “%@” couldn't be copied to '%@'", bundle, newInfoPath); + continue; + } + infoPath = [NSString stringWithString:newInfoPath]; - NSArray *scopes = [[cmdData objectForKey:SPBundleFileScopeKey] componentsSeparatedByString:@" "]; - for(NSString *scope in scopes) { - if(![bundleUsedScopes containsObject:scope]) { - [bundleUsedScopes addObject:scope]; - [bundleItems setObject:[NSMutableArray array] forKey:scope]; - [bundleCategories setObject:[NSMutableArray array] forKey:scope]; - [bundleKeyEquivalents setObject:[NSMutableDictionary dictionary] forKey:scope]; + } + + [installedBundleUUIDs setObject:[NSDictionary dictionaryWithObjectsAndKeys: + [NSString stringWithFormat:@"%@ (%@)", bundle, [cmdData objectForKey:SPBundleFileNameKey]], @"name", + infoPath, @"path", nil] forKey:[cmdData objectForKey:SPBundleFileUUIDKey]]; + + } else { + NSLog(@"No UUID for %@", bundle); + NSBeep(); + continue; } - if([cmdData objectForKey:SPBundleFileCategoryKey] && [[cmdData objectForKey:SPBundleFileCategoryKey] length] && ![[bundleCategories objectForKey:scope] containsObject:[cmdData objectForKey:SPBundleFileCategoryKey]]) - [[bundleCategories objectForKey:scope] addObject:[cmdData objectForKey:SPBundleFileCategoryKey]]; - } + NSArray *scopes = [[cmdData objectForKey:SPBundleFileScopeKey] componentsSeparatedByString:@" "]; + for(NSString *scope in scopes) { - NSMutableDictionary *aDict = [NSMutableDictionary dictionary]; - [aDict setObject:[cmdData objectForKey:SPBundleFileNameKey] forKey:SPBundleInternLabelKey]; - [aDict setObject:infoPath forKey:SPBundleInternPathToFileKey]; + if(![bundleUsedScopes containsObject:scope]) { + [bundleUsedScopes addObject:scope]; + [bundleItems setObject:[NSMutableArray array] forKey:scope]; + [bundleCategories setObject:[NSMutableArray array] forKey:scope]; + [bundleKeyEquivalents setObject:[NSMutableDictionary dictionary] forKey:scope]; + } - // Register trigger - if([cmdData objectForKey:SPBundleFileTriggerKey]) { - if(![bundleTriggers objectForKey:[cmdData objectForKey:SPBundleFileTriggerKey]]) - [bundleTriggers setObject:[NSMutableArray array] forKey:[cmdData objectForKey:SPBundleFileTriggerKey]]; - [[bundleTriggers objectForKey:[cmdData objectForKey:SPBundleFileTriggerKey]] addObject:[NSString stringWithFormat:@"%@|%@|%@", infoPath, [cmdData objectForKey:SPBundleFileScopeKey], ([[cmdData objectForKey:SPBundleFileOutputActionKey] isEqualToString:SPBundleOutputActionShowAsHTML])?[cmdData objectForKey:SPBundleFileUUIDKey]:@""]]; - } + if([cmdData objectForKey:SPBundleFileCategoryKey] && [[cmdData objectForKey:SPBundleFileCategoryKey] length] && ![[bundleCategories objectForKey:scope] containsObject:[cmdData objectForKey:SPBundleFileCategoryKey]]) + [[bundleCategories objectForKey:scope] addObject:[cmdData objectForKey:SPBundleFileCategoryKey]]; + } + + NSMutableDictionary *aDict = [NSMutableDictionary dictionary]; + [aDict setObject:[cmdData objectForKey:SPBundleFileNameKey] forKey:SPBundleInternLabelKey]; + [aDict setObject:infoPath forKey:SPBundleInternPathToFileKey]; + + // Register trigger + if([cmdData objectForKey:SPBundleFileTriggerKey]) { + if(![bundleTriggers objectForKey:[cmdData objectForKey:SPBundleFileTriggerKey]]) + [bundleTriggers setObject:[NSMutableArray array] forKey:[cmdData objectForKey:SPBundleFileTriggerKey]]; + [[bundleTriggers objectForKey:[cmdData objectForKey:SPBundleFileTriggerKey]] addObject: + [NSString stringWithFormat:@"%@|%@|%@", + infoPath, + [cmdData objectForKey:SPBundleFileScopeKey], + ([[cmdData objectForKey:SPBundleFileOutputActionKey] isEqualToString:SPBundleOutputActionShowAsHTML])?[cmdData objectForKey:SPBundleFileUUIDKey]:@""]]; + } - if([cmdData objectForKey:SPBundleFileKeyEquivalentKey] && [[cmdData objectForKey:SPBundleFileKeyEquivalentKey] length]) { - NSString *theKey = [cmdData objectForKey:SPBundleFileKeyEquivalentKey]; - NSString *theChar = [theKey substringFromIndex:[theKey length]-1]; - NSString *theMods = [theKey substringToIndex:[theKey length]-1]; - NSUInteger mask = 0; - if([theMods rangeOfString:@"^"].length) - mask = mask | NSControlKeyMask; - if([theMods rangeOfString:@"@"].length) - mask = mask | NSCommandKeyMask; - if([theMods rangeOfString:@"~"].length) - mask = mask | NSAlternateKeyMask; - if([theMods rangeOfString:@"$"].length) - mask = mask | NSShiftKeyMask; - for(NSString* scope in scopes) { - if(![[bundleKeyEquivalents objectForKey:scope] objectForKey:[cmdData objectForKey:SPBundleFileKeyEquivalentKey]]) - [[bundleKeyEquivalents objectForKey:scope] setObject:[NSMutableArray array] forKey:[cmdData objectForKey:SPBundleFileKeyEquivalentKey]]; - - [[[bundleKeyEquivalents objectForKey:scope] objectForKey:[cmdData objectForKey:SPBundleFileKeyEquivalentKey]] addObject: - [NSDictionary dictionaryWithObjectsAndKeys: - infoPath, @"path", - [cmdData objectForKey:SPBundleFileNameKey], @"title", - ([cmdData objectForKey:SPBundleFileTooltipKey]) ?: @"", @"tooltip", - nil]]; + if([cmdData objectForKey:SPBundleFileKeyEquivalentKey] && [[cmdData objectForKey:SPBundleFileKeyEquivalentKey] length]) { + + NSString *theKey = [cmdData objectForKey:SPBundleFileKeyEquivalentKey]; + NSString *theChar = [theKey substringFromIndex:[theKey length]-1]; + NSString *theMods = [theKey substringToIndex:[theKey length]-1]; + NSUInteger mask = 0; + if([theMods rangeOfString:@"^"].length) + mask = mask | NSControlKeyMask; + if([theMods rangeOfString:@"@"].length) + mask = mask | NSCommandKeyMask; + if([theMods rangeOfString:@"~"].length) + mask = mask | NSAlternateKeyMask; + if([theMods rangeOfString:@"$"].length) + mask = mask | NSShiftKeyMask; + for(NSString* scope in scopes) { + if(![[bundleKeyEquivalents objectForKey:scope] objectForKey:[cmdData objectForKey:SPBundleFileKeyEquivalentKey]]) + [[bundleKeyEquivalents objectForKey:scope] setObject:[NSMutableArray array] forKey:[cmdData objectForKey:SPBundleFileKeyEquivalentKey]]; + + [[[bundleKeyEquivalents objectForKey:scope] objectForKey:[cmdData objectForKey:SPBundleFileKeyEquivalentKey]] addObject: + [NSDictionary dictionaryWithObjectsAndKeys: + infoPath, @"path", + [cmdData objectForKey:SPBundleFileNameKey], @"title", + ([cmdData objectForKey:SPBundleFileTooltipKey]) ?: @"", @"tooltip", + nil]]; + } + + [aDict setObject:[NSArray arrayWithObjects:theChar, [NSNumber numberWithInteger:mask], nil] forKey:SPBundleInternKeyEquivalentKey]; } - [aDict setObject:[NSArray arrayWithObjects:theChar, [NSNumber numberWithInteger:mask], nil] forKey:SPBundleInternKeyEquivalentKey]; - } + if([cmdData objectForKey:SPBundleFileTooltipKey] && [[cmdData objectForKey:SPBundleFileTooltipKey] length]) + [aDict setObject:[cmdData objectForKey:SPBundleFileTooltipKey] forKey:SPBundleFileTooltipKey]; - if([cmdData objectForKey:SPBundleFileUUIDKey] && [[cmdData objectForKey:SPBundleFileUUIDKey] length]) - [installedBundleUUIDs setObject:[NSDictionary dictionaryWithObjectsAndKeys: - [NSString stringWithFormat:@"%@ (%@)", bundle, [cmdData objectForKey:SPBundleFileNameKey]], @"name", - infoPath, @"path", nil] forKey:[cmdData objectForKey:SPBundleFileUUIDKey]]; + if([cmdData objectForKey:SPBundleFileCategoryKey] && [[cmdData objectForKey:SPBundleFileCategoryKey] length]) + [aDict setObject:[cmdData objectForKey:SPBundleFileCategoryKey] forKey:SPBundleFileCategoryKey]; - if([cmdData objectForKey:SPBundleFileTooltipKey] && [[cmdData objectForKey:SPBundleFileTooltipKey] length]) - [aDict setObject:[cmdData objectForKey:SPBundleFileTooltipKey] forKey:SPBundleFileTooltipKey]; + if([cmdData objectForKey:SPBundleFileKeyEquivalentKey] && [[cmdData objectForKey:SPBundleFileKeyEquivalentKey] length]) + [aDict setObject:[cmdData objectForKey:SPBundleFileKeyEquivalentKey] forKey:@"key"]; - if([cmdData objectForKey:SPBundleFileCategoryKey] && [[cmdData objectForKey:SPBundleFileCategoryKey] length]) - [aDict setObject:[cmdData objectForKey:SPBundleFileCategoryKey] forKey:SPBundleFileCategoryKey]; + for(NSString* scope in scopes) + [[bundleItems objectForKey:scope] addObject:aDict]; - if([cmdData objectForKey:SPBundleFileKeyEquivalentKey] && [[cmdData objectForKey:SPBundleFileKeyEquivalentKey] length]) - [aDict setObject:[cmdData objectForKey:SPBundleFileKeyEquivalentKey] forKey:@"key"]; + } + + if (cmdData) [cmdData release]; - for(NSString* scope in scopes) - [[bundleItems objectForKey:scope] addObject:aDict]; } - if (cmdData) [cmdData release]; } - } - NSSortDescriptor *sortDescriptor = [[[NSSortDescriptor alloc] initWithKey:SPBundleInternLabelKey ascending:YES] autorelease]; - for(NSString* scope in [bundleItems allKeys]) { - [[bundleItems objectForKey:scope] sortUsingDescriptors:[NSArray arrayWithObject:sortDescriptor]]; - [[bundleCategories objectForKey:scope] sortUsingSelector:@selector(compare:)]; + NSSortDescriptor *sortDescriptor = [[[NSSortDescriptor alloc] initWithKey:SPBundleInternLabelKey ascending:YES] autorelease]; + for(NSString* scope in [bundleItems allKeys]) { + [[bundleItems objectForKey:scope] sortUsingDescriptors:[NSArray arrayWithObject:sortDescriptor]]; + [[bundleCategories objectForKey:scope] sortUsingSelector:@selector(compare:)]; + } } } + processDefaultBundles = YES; + } + + [deletedDefaultBundles release]; + + // Synchronize updated Bundles + [[NSUserDefaults standardUserDefaults] setObject:updatedDefaultBundles forKey:SPBundleUpdatedDefaultBundlesKey]; + + // Inform user about default Bundle updates which were modified by the user and re-run Reload Bundles + if([infoAboutUpdatedDefaultBundles length]) { + NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Default Bundles Update", @"default bundles update") + defaultButton:NSLocalizedString(@"OK", @"OK button") + alternateButton:nil + otherButton:nil + informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"The following default Bundles were updated:\n%@\nYour modifications were stored as “(user)”.", @"the following default bundles were updated:\n%@\nyour modifications were stored as “(user)”."), infoAboutUpdatedDefaultBundles]]; + + [alert runModal]; + [self reloadBundles:nil]; + return; } - // Rebuild Bundles main menu item + // === Rebuild Bundles main menu item === // Add default menu items NSMenuItem *anItem; diff --git a/Source/SPBundleEditorController.h b/Source/SPBundleEditorController.h index d586e5bc..ac4c9e6b 100644 --- a/Source/SPBundleEditorController.h +++ b/Source/SPBundleEditorController.h @@ -65,6 +65,9 @@ IBOutlet NSScrollView *commandScrollView; IBOutlet NSScrollView *descriptionScrollView; + IBOutlet id undeleteSheet; + IBOutlet NSTableView *undeleteTableView; + IBOutlet NSTreeController *commandBundleTreeController; NSMutableArray *touchedBundleArray; NSMutableDictionary *commandBundleTree; @@ -108,6 +111,8 @@ NSArray *shellVariableSuggestions; + NSMutableArray *deletedDefaultBundles; + } - (IBAction)inputPopupButtonChanged:(id)sender; @@ -126,6 +131,8 @@ - (IBAction)reloadBundles:(id)sender; - (IBAction)metaButtonChanged:(id)sender; - (IBAction)performClose:(id)sender; +- (IBAction)undeleteDefaultBundles:(id)sender; +- (IBAction)closeUndeleteDefaultBundlesSheet:(id)sender; - (BOOL)saveBundle:(NSDictionary*)bundle atPath:(NSString*)aPath; - (BOOL)cancelRowEditing; diff --git a/Source/SPBundleEditorController.m b/Source/SPBundleEditorController.m index 32f5b581..de779e67 100644 --- a/Source/SPBundleEditorController.m +++ b/Source/SPBundleEditorController.m @@ -33,6 +33,11 @@ #define kGeneralScopeArrayIndex 2 #define kDisabledScopeTag 10 +#define SP_BUNDLEEDITOR_SCOPE_INPUTFIELD_STRING NSLocalizedString(@"Input Field", @"Bundle Editor : Scope dropdown : 'input field' item") +#define SP_BUNDLEEDITOR_SCOPE_DATATABLE_STRING NSLocalizedString(@"Data Table", @"Bundle Editor : Scope dropdown : 'data table' item") +#define SP_BUNDLEEDITOR_SCOPE_GENERAL_STRING NSLocalizedString(@"General", @"Bundle Editor : Scope dropdown : 'general' item") +#define SP_BUNDLEEDITOR_OUTLINE_BUNDLE_TOOLTIP_STRING NSLocalizedString(@"“%@” Bundle",@"Bundle Editor : Outline View : Bundle item : tooltip") + @interface SPBundleEditorController (PrivateAPI) - (void)_updateBundleDataView; @@ -62,6 +67,7 @@ draggedFilePath = nil; oldBundleName = nil; isTableCellEditing = NO; + deletedDefaultBundles = [[NSMutableArray alloc] initWithCapacity:1]; } return self; @@ -96,6 +102,7 @@ [withBlobDataTableArray release]; [shellVariableSuggestions release]; + [deletedDefaultBundles release]; if(touchedBundleArray) [touchedBundleArray release], touchedBundleArray = nil; if(commandBundleTree) [commandBundleTree release], commandBundleTree = nil; @@ -120,10 +127,10 @@ sortDescriptor = [[NSSortDescriptor alloc] initWithKey:kBundleNameKey ascending:YES selector:@selector(localizedCompare:)]; [commandBundleTree setObject:[NSMutableArray array] forKey:kChildrenKey]; - [commandBundleTree setObject:@"BUNDLES" forKey:kBundleNameKey]; - [[commandBundleTree objectForKey:kChildrenKey] addObject:[NSMutableDictionary dictionaryWithObjectsAndKeys:[NSMutableArray array], kChildrenKey, NSLocalizedString(@"Input Field", @"input field scope menu label"), kBundleNameKey, nil]]; - [[commandBundleTree objectForKey:kChildrenKey] addObject:[NSMutableDictionary dictionaryWithObjectsAndKeys:[NSMutableArray array], kChildrenKey, NSLocalizedString(@"Data Table", @"data table scope menu label"), kBundleNameKey, nil]]; - [[commandBundleTree objectForKey:kChildrenKey] addObject:[NSMutableDictionary dictionaryWithObjectsAndKeys:[NSMutableArray array], kChildrenKey, NSLocalizedString(@"General", @"general scope menu label"), kBundleNameKey, nil]]; + [commandBundleTree setObject:NSLocalizedString(@"BUNDLES",@"Bundle Editor : Outline View : 'BUNDLES' item") forKey:kBundleNameKey]; + [[commandBundleTree objectForKey:kChildrenKey] addObject:[NSMutableDictionary dictionaryWithObjectsAndKeys:[NSMutableArray array], kChildrenKey, SP_BUNDLEEDITOR_SCOPE_INPUTFIELD_STRING, kBundleNameKey, nil]]; + [[commandBundleTree objectForKey:kChildrenKey] addObject:[NSMutableDictionary dictionaryWithObjectsAndKeys:[NSMutableArray array], kChildrenKey, SP_BUNDLEEDITOR_SCOPE_DATATABLE_STRING, kBundleNameKey, nil]]; + [[commandBundleTree objectForKey:kChildrenKey] addObject:[NSMutableDictionary dictionaryWithObjectsAndKeys:[NSMutableArray array], kChildrenKey, SP_BUNDLEEDITOR_SCOPE_GENERAL_STRING, kBundleNameKey, nil]]; // Init all needed menus inputGeneralScopePopUpMenu = [[NSMenu alloc] initWithTitle:@""]; @@ -166,60 +173,60 @@ NSDictionary *menuItemTitles = [NSDictionary dictionaryWithObjects: [NSArray arrayWithObjects: - NSLocalizedString(@"None", @"none menu item label"), - - NSLocalizedString(@"None", @"none menu item label"), - NSLocalizedString(@"Selected Text", @"selected text menu item label"), - NSLocalizedString(@"Entire Content", @"entire content menu item label"), - - NSLocalizedString(@"None", @"none menu item label"), - NSLocalizedString(@"Selected Rows (TSV)", @"selected rows (TSV) menu item label"), - NSLocalizedString(@"Selected Rows (CSV)", @"selected rows (CSV) menu item label"), - NSLocalizedString(@"Selected Rows (SQL)", @"selected rows (SQL) menu item label"), - NSLocalizedString(@"Table Content (TSV)", @"table content (TSV) menu item label"), - NSLocalizedString(@"Table Content (CSV)", @"table content (CSV) menu item label"), - NSLocalizedString(@"Table Content (SQL)", @"table content (SQL) menu item label"), - - NSLocalizedString(@"None", @"none menu item label"), - NSLocalizedString(@"Insert as Text", @"insert as text item label"), - NSLocalizedString(@"Insert as Snippet", @"insert as snippet item label"), - NSLocalizedString(@"Replace Selection", @"replace selection item label"), - NSLocalizedString(@"Replace Entire Content", @"replace entire content item label"), - NSLocalizedString(@"Show as Text Tooltip", @"show as text tooltip item label"), - NSLocalizedString(@"Show as HTML Tooltip", @"show as html tooltip item label"), - NSLocalizedString(@"Show as HTML", @"show as html item label"), - - NSLocalizedString(@"None", @"none menu item label"), - NSLocalizedString(@"Show as Text Tooltip", @"show as text tooltip item label"), - NSLocalizedString(@"Show as HTML Tooltip", @"show as html tooltip item label"), - NSLocalizedString(@"Show as HTML", @"show as html item label"), - - NSLocalizedString(@"None", @"none menu item label"), - NSLocalizedString(@"Show as Text Tooltip", @"show as text tooltip item label"), - NSLocalizedString(@"Show as HTML Tooltip", @"show as html tooltip item label"), - NSLocalizedString(@"Show as HTML", @"show as html item label"), - - NSLocalizedString(@"None", @"none menu item label"), - NSLocalizedString(@"Current Word", @"current word item label"), - NSLocalizedString(@"Current Line", @"current line item label"), - NSLocalizedString(@"Current Query", @"current query item label"), - NSLocalizedString(@"Entire Content", @"entire content item label"), - - NSLocalizedString(@"None", @"none menu item label"), - - NSLocalizedString(@"None", @"none menu item label"), - NSLocalizedString(@"Database changed", @"database changed item label"), - NSLocalizedString(@"Table changed", @"table changed item label"), - NSLocalizedString(@"Table Row changed", @"table row changed item label"), - - NSLocalizedString(@"None", @"none menu item label"), - NSLocalizedString(@"Database changed", @"database changed item label"), - NSLocalizedString(@"Table changed", @"table changed item label"), - - NSLocalizedString(@"exclude BLOB", @"exclude BLOB item label"), - NSLocalizedString(@"include BLOB", @"include BLOB item label"), - NSLocalizedString(@"save BLOB as image file", @"save BLOB as image file item label"), - NSLocalizedString(@"save BLOB as dat file", @"save BLOB as dat file item label"), + NSLocalizedString(@"None", @"Bundle Editor : Scope=General : Input source dropdown: 'None' item"), + + NSLocalizedString(@"None", @"Bundle Editor : Scope=Field : Input source dropdown: 'None' item"), + NSLocalizedString(@"Selected Text", @"Bundle Editor : Scope=Field : Input source dropdown: 'selected text' item"), + NSLocalizedString(@"Entire Content", @"Bundle Editor : Scope=Field : Input source dropdown: 'entire content' item"), + + NSLocalizedString(@"None", @"Bundle Editor : Scope=Data-Table : Input source dropdown: 'none' item"), + NSLocalizedString(@"Selected Rows (TSV)", @"Bundle Editor : Scope=Data-Table : Input source dropdown: 'selected rows as tab-separated' item"), + NSLocalizedString(@"Selected Rows (CSV)", @"Bundle Editor : Scope=Data-Table : Input source dropdown: 'selected rows as comma-separated' item"), + NSLocalizedString(@"Selected Rows (SQL)", @"Bundle Editor : Scope=Data-Table : Input source dropdown: 'selected rows as SQL' item"), + NSLocalizedString(@"Table Content (TSV)", @"Bundle Editor : Scope=Data-Table : Input source dropdown: 'table content as tab-separated' item"), + NSLocalizedString(@"Table Content (CSV)", @"Bundle Editor : Scope=Data-Table : Input source dropdown: 'table content as comma-separated' item"), + NSLocalizedString(@"Table Content (SQL)", @"Bundle Editor : Scope=Data-Table : Input source dropdown: 'table content as SQL' item"), + + NSLocalizedString(@"None", @"Bundle Editor : Scope=Field : Output dropdown : 'none' item"), + NSLocalizedString(@"Insert as Text", @"Bundle Editor : Scope=Field : Output dropdown : 'insert as text' item"), + NSLocalizedString(@"Insert as Snippet", @"Bundle Editor : Scope=Field : Output dropdown : 'insert as snippet' item"), + NSLocalizedString(@"Replace Selection", @"Bundle Editor : Scope=Field : Output dropdown : 'replace selection' item"), + NSLocalizedString(@"Replace Entire Content", @"Bundle Editor : Scope=Field : Output dropdown : 'replace entire content' item"), + NSLocalizedString(@"Show as Text Tooltip", @"Bundle Editor : Scope=Field : Output dropdown : 'show as text tooltip' item"), + NSLocalizedString(@"Show as HTML Tooltip", @"Bundle Editor : Scope=Field : Output dropdown : 'show as html tooltip' item"), + NSLocalizedString(@"Show as HTML", @"Bundle Editor : Scope=Field : Output dropdown : 'show as html' item"), + + NSLocalizedString(@"None", @"Bundle Editor : Scope=General : Output dropdown : 'none' item"), + NSLocalizedString(@"Show as Text Tooltip", @"Bundle Editor : Scope=General : Output dropdown : 'show as text tooltip' item"), + NSLocalizedString(@"Show as HTML Tooltip", @"Bundle Editor : Scope=General : Output dropdown : 'show as html tooltip' item"), + NSLocalizedString(@"Show as HTML", @"Bundle Editor : Scope=General : Output dropdown : 'show as html' item"), + + NSLocalizedString(@"None", @"Bundle Editor : Scope=Data-Table : Output dropdown : 'none' item"), + NSLocalizedString(@"Show as Text Tooltip", @"Bundle Editor : Scope=Data-Table : Output dropdown : 'show as text tooltip' item"), + NSLocalizedString(@"Show as HTML Tooltip", @"Bundle Editor : Scope=Data-Table : Output dropdown : 'show as html tooltip' item"), + NSLocalizedString(@"Show as HTML", @"Bundle Editor : Scope=Data-Table : Output dropdown : 'show as html' item"), + + NSLocalizedString(@"None", @"Bundle Editor : Fallback Input source dropdown : 'none' item"), + NSLocalizedString(@"Current Word", @"Bundle Editor : Fallback Input source dropdown : 'current word' item"), + NSLocalizedString(@"Current Line", @"Bundle Editor : Fallback Input source dropdown : 'current line' item"), + NSLocalizedString(@"Current Query", @"Bundle Editor : Fallback Input source dropdown : 'current query' item"), + NSLocalizedString(@"Entire Content", @"Bundle Editor : Fallback Input source dropdown : 'entire content' item"), + + NSLocalizedString(@"None", @"Bundle Editor : Scope=Field : Trigger dropdown : 'none' item"), + + NSLocalizedString(@"None", @"Bundle Editor : Scope=Data-Table : Trigger dropdown : 'none' item"), + NSLocalizedString(@"Database changed", @"Bundle Editor : Scope=Data-Table : Trigger dropdown : 'database changed' item"), + NSLocalizedString(@"Table changed", @"Bundle Editor : Scope=Data-Table : Trigger dropdown : 'table changed' item"), + NSLocalizedString(@"Table Row changed", @"Bundle Editor : Scope=Data-Table : Trigger dropdown : 'table row changed' item"), + + NSLocalizedString(@"None", @"Bundle Editor : Scope=General : Trigger dropdown : 'none' item"), + NSLocalizedString(@"Database changed", @"Bundle Editor : Scope=General : Trigger dropdown : 'database changed' item"), + NSLocalizedString(@"Table changed", @"Bundle Editor : Scope=General : Trigger dropdown : 'table changed' item"), + + NSLocalizedString(@"exclude BLOB", @"Bundle Editor : BLOB dropdown : 'exclude BLOB' item"), + NSLocalizedString(@"include BLOB", @"Bundle Editor : BLOB dropdown : 'include BLOB' item"), + NSLocalizedString(@"save BLOB as image file", @"Bundle Editor : BLOB dropdown : 'save BLOB as image file' item"), + NSLocalizedString(@"save BLOB as dat file", @"Bundle Editor : BLOB dropdown : 'save BLOB as dat file' item"), nil] forKeys:allPopupScopeItems]; @@ -285,15 +292,15 @@ [anItem release]; [inputGeneralScopePopUpMenu compatibleRemoveAllItems]; - anItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"General", @"general scope menu label") action:@selector(scopeButtonChanged:) keyEquivalent:@""]; + anItem = [[NSMenuItem alloc] initWithTitle:SP_BUNDLEEDITOR_SCOPE_GENERAL_STRING action:@selector(scopeButtonChanged:) keyEquivalent:@""]; [anItem setTag:kGeneralScopeArrayIndex]; [inputGeneralScopePopUpMenu addItem:anItem]; [anItem release]; - anItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Input Field", @"input field scope menu label") action:@selector(scopeButtonChanged:) keyEquivalent:@""]; + anItem = [[NSMenuItem alloc] initWithTitle:SP_BUNDLEEDITOR_SCOPE_INPUTFIELD_STRING action:@selector(scopeButtonChanged:) keyEquivalent:@""]; [anItem setTag:kInputFieldScopeArrayIndex]; [inputGeneralScopePopUpMenu addItem:anItem]; [anItem release]; - anItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Data Table", @"data table scope menu label") action:@selector(scopeButtonChanged:) keyEquivalent:@""]; + anItem = [[NSMenuItem alloc] initWithTitle:SP_BUNDLEEDITOR_SCOPE_DATATABLE_STRING action:@selector(scopeButtonChanged:) keyEquivalent:@""]; [anItem setTag:kDataTableScopeArrayIndex]; [inputGeneralScopePopUpMenu addItem:anItem]; [anItem release]; @@ -316,9 +323,9 @@ SPBundleShellVariableExitNone, SPBundleShellVariableExitReplaceContent, SPBundleShellVariableExitReplaceSelection, - SPBundleShellVariableExitInsertAsHTML, - SPBundleShellVariableExitInsertAsHTMLTooltip, - SPBundleShellVariableExitInsertAsTextTooltip, + SPBundleShellVariableExitShowAsHTML, + SPBundleShellVariableExitShowAsHTMLTooltip, + SPBundleShellVariableExitShowAsTextTooltip, SPBundleShellVariableInputFilePath, SPBundleShellVariableInputTableMetaData, SPBundleShellVariableBundlePath, @@ -350,6 +357,10 @@ nil ] retain]; + if([[NSUserDefaults standardUserDefaults] objectForKey:SPBundleDeletedDefaultBundlesKey]) { + [deletedDefaultBundles setArray:[[NSUserDefaults standardUserDefaults] objectForKey:SPBundleDeletedDefaultBundlesKey]]; + } + [self _initTree]; } @@ -601,11 +612,11 @@ [commandsOutlineView reloadData]; - NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Error", @"error") - defaultButton:NSLocalizedString(@"OK", @"OK button") + NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Error", @"Bundle Editor : Copy-Command-Error : error dialog title") + defaultButton:NSLocalizedString(@"OK", @"Bundle Editor : Copy-Command-Error : OK button") alternateButton:nil otherButton:nil - informativeTextWithFormat:NSLocalizedString(@"Error while duplicating Bundle content.", @"error while duplicating Bundle content")]; + informativeTextWithFormat:NSLocalizedString(@"Error while duplicating Bundle content.", @"Bundle Editor : Copy-Command-Error : Copying failed error message")]; [alert setAlertStyle:NSCriticalAlertStyle]; [alert runModal]; @@ -615,6 +626,8 @@ } [bundle setObject:newFileName forKey:kBundleNameKey]; + [self saveBundle:bundle atPath:nil]; + // Insert duplicate below selected one NSUInteger *currentPath[[currentIndexPath length]]; [currentIndexPath getIndexes:¤tPath]; @@ -709,11 +722,11 @@ [commandsOutlineView abortEditing]; - NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Remove selected Bundle?", @"remove selected bundle message") - defaultButton:NSLocalizedString(@"Remove", @"remove button") - alternateButton:NSLocalizedString(@"Cancel", @"cancel button") + NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Remove selected Bundle?", @"Bundle Editor : Remove-Bundle: remove dialog title") + defaultButton:NSLocalizedString(@"Remove", @"Bundle Editor : Remove-Bundle: remove button") + alternateButton:NSLocalizedString(@"Cancel", @"Bundle Editor : Remove-Bundle: cancel button") otherButton:nil - informativeTextWithFormat:NSLocalizedString(@"Are you sure you want to move the selected Bundle to the Trash and remove them respectively?", @"move to trash and remove resp the selected bundle informative message")]; + informativeTextWithFormat:NSLocalizedString(@"Are you sure you want to move the selected Bundle to the Trash and remove them respectively?", @"Bundle Editor : Remove-Bundle: remove dialog message")]; [alert setAlertStyle:NSCriticalAlertStyle]; @@ -763,7 +776,7 @@ */ - (IBAction)showHelp:(id)sender { - [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:NSLocalizedString(@"http://www.sequelpro.com/docs/Bundle_Editor", @"Localized help page for bundle editor - do not localize if no translated webpage is available")]]; + [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:SPLOCALIZEDURL_BUNDLEEDITORHELP]]; } /** @@ -798,6 +811,27 @@ [self close]; } +- (IBAction)undeleteDefaultBundles:(id)sender +{ + [NSApp beginSheet:undeleteSheet + modalForWindow:[self window] + modalDelegate:self + didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:) + contextInfo:@"undeleteSelectedDefaultBundles"]; +} + +- (IBAction)closeUndeleteDefaultBundlesSheet:(id)sender +{ + + [NSApp endSheet:[sender window] returnCode:[sender tag]]; + + if ([sender respondsToSelector:@selector(orderOut:)]) + [sender orderOut:nil]; + else if ([sender respondsToSelector:@selector(window)]) + [[sender window] orderOut:nil]; + +} + /** * Save all touched bundles to disk and close the Bundle Editor window */ @@ -843,8 +877,8 @@ for(id item in allBundles) { if(![self saveBundle:item atPath:nil]) { closeMe = NO; - NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Error while saving “%@”.", @"error while saving “%@”"), [item objectForKey:kBundleNameKey]] - defaultButton:NSLocalizedString(@"OK", @"OK button") + NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Error while saving “%@”.", @"Bundle Editor : Save-and-Close-Error : error dialog title"), [item objectForKey:kBundleNameKey]] + defaultButton:NSLocalizedString(@"OK", @"Bundle Editor : Save-and-Close-Error : OK button") alternateButton:nil otherButton:nil informativeTextWithFormat:@""]; @@ -871,6 +905,7 @@ NSFileManager *fm = [NSFileManager defaultManager]; BOOL isDir = NO; + BOOL isNewBundle = NO; // If passed aPath is nil construct the path from bundle's bundleName. // aPath is mainly used for dragging a bundle from table view. @@ -888,6 +923,7 @@ if(![fm createDirectoryAtPath:aPath withIntermediateDirectories:YES attributes:nil error:nil]) return NO; isDir = YES; + isNewBundle = YES; } // If aPath exists but it's not a folder bail out @@ -908,6 +944,30 @@ kBundleNameKey, nil]]; + + if(!isNewBundle) { + NSError *readError = nil; + NSString *convError = nil; + NSPropertyListFormat format; + NSDictionary *cmdData = nil; + NSData *pData = [NSData dataWithContentsOfFile:cmdFilePath options:NSUncachedRead error:&readError]; + cmdData = [[NSPropertyListSerialization propertyListFromData:pData + mutabilityOption:NSPropertyListImmutable format:&format errorDescription:&convError] retain]; + if(!cmdData || readError != nil || [convError length] || !(format == NSPropertyListXMLFormat_v1_0 || format == NSPropertyListBinaryFormat_v1_0)) { + NSLog(@"“%@” file couldn't be read.", cmdFilePath); + NSBeep(); + if (cmdData) [cmdData release]; + return NO; + } else { + // Check for changes and return if no changes are found + if([[saveDict description] isEqualToString:[cmdData description]]) + return YES; + if([cmdData objectForKey:SPBundleFileIsDefaultBundleKey]) + [saveDict setObject:[NSNumber numberWithBool:YES] forKey:SPBundleFileDefaultBundleWasModifiedKey]; + } + if (cmdData) [cmdData release]; + } + // Remove a given old command.plist file [fm removeItemAtPath:cmdFilePath error:nil]; [saveDict writeToFile:cmdFilePath atomically:YES]; @@ -949,8 +1009,8 @@ NSString *moveToTrashCommand = [NSString stringWithFormat:@"osascript -e 'tell application \"Finder\" to move (POSIX file \"%@\") to the trash'", thePath]; [moveToTrashCommand runBashCommandWithEnvironment:nil atCurrentDirectoryPath:nil error:&error]; if(error != nil) { - NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Error while moving “%@” to Trash.", @"error while moving “%@” to trash"), thePath] - defaultButton:NSLocalizedString(@"OK", @"OK button") + NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Error while moving “%@” to Trash.", @"Bundle Editor : Trash-Bundle(s)-Error : error dialog title"), thePath] + defaultButton:NSLocalizedString(@"OK", @"Bundle Editor : Trash-Bundle(s)-Error : OK button") alternateButton:nil otherButton:nil informativeTextWithFormat:[error localizedDescription]]; @@ -960,6 +1020,10 @@ deletionSuccessfully = NO; break; } + if([obj objectForKey:SPBundleFileIsDefaultBundleKey]) { + [deletedDefaultBundles addObject:[NSArray arrayWithObjects:[obj objectForKey:SPBundleFileUUIDKey], [obj objectForKey:SPBundleFileNameKey], nil]]; + [[NSUserDefaults standardUserDefaults] setObject:deletedDefaultBundles forKey:SPBundleDeletedDefaultBundlesKey]; + } [commandsOutlineView reloadData]; } } @@ -978,7 +1042,8 @@ [addButton setEnabled:([[commandBundleTreeController selectionIndexPath] length] > 1)]; } - } else if([contextInfo isEqualToString:@"saveBundle"]) { + } + else if([contextInfo isEqualToString:@"saveBundle"]) { if (returnCode == NSOKButton) { id aBundle = [self _currentSelectedObject]; @@ -998,8 +1063,8 @@ } if(!copyingWasSuccessful || ![self saveBundle:aBundle atPath:savePath]) { - NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Error while saving the Bundle.", @"error while saving a Bundle") - defaultButton:NSLocalizedString(@"OK", @"OK button") + NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Error while saving the Bundle.", @"Bundle Editor : Save-Bundle-Error : error dialog title") + defaultButton:NSLocalizedString(@"OK", @"Bundle Editor : Save-Bundle-Error : OK button") alternateButton:nil otherButton:nil informativeTextWithFormat:@""]; @@ -1009,6 +1074,28 @@ } } } + else if([contextInfo isEqualToString:@"undeleteSelectedDefaultBundles"]) { + if(returnCode == 1) { + + NSIndexSet *selectedRows = [undeleteTableView selectedRowIndexes]; + + if(![selectedRows count]) return; + + NSInteger rowIndex; + NSMutableArray *stillUndeletedBundles = [NSMutableArray array]; + for(rowIndex = 0; rowIndex < [deletedDefaultBundles count]; rowIndex++) { + if(![selectedRows containsIndex:rowIndex]) + [stillUndeletedBundles addObject:[deletedDefaultBundles objectAtIndex:rowIndex]]; + } + [deletedDefaultBundles setArray:stillUndeletedBundles]; + [undeleteTableView reloadData]; + [[NSUserDefaults standardUserDefaults] setObject:stillUndeletedBundles forKey:SPBundleDeletedDefaultBundlesKey]; + [[NSUserDefaults standardUserDefaults] synchronize]; + [[NSApp delegate] reloadBundles:nil]; + [self reloadBundles:self]; + + } + } } @@ -1096,6 +1183,24 @@ } #pragma mark - +#pragma mark TableView delegates + +- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView +{ + return [deletedDefaultBundles count]; +} + +- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex +{ + return [[deletedDefaultBundles objectAtIndex:rowIndex] objectAtIndex:1]; +} + +- (BOOL)tableView:(NSTableView *)aTableView shouldEditTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex +{ + return NO; +} + +#pragma mark - #pragma mark outline delegates - (BOOL)outlineView:(id)outlineView isItemExpandable:(id)item @@ -1201,7 +1306,7 @@ } - (NSString *)outlineView:(NSOutlineView *)outlineView toolTipForCell:(NSCell *)cell rect:(NSRectPointer)rect tableColumn:(NSTableColumn *)tc item:(id)item mouseLocation:(NSPoint)mouseLocation{ - if([outlineView levelForItem:item] == 0) return NSLocalizedString(@"Installed Bundles", @"Installed Bundles"); + if([outlineView levelForItem:item] == 0) return NSLocalizedString(@"Installed Bundles", @"Bundle Editor : Outline View : 'BUNDLES' item : tooltip"); if([outlineView levelForItem:item] == 1) { NSString *bName = [[item representedObject] objectForKey:kBundleNameKey]; NSUInteger k = 0; @@ -1218,13 +1323,13 @@ } switch([self _scopeIndexForArrangedScopeIndex:k]) { case kInputFieldScopeArrayIndex: - return NSLocalizedString(@"Input Field Scope\ncommands will run on each text input field", @"Input Field Scope\ncommands will run on each text input field tooltip"); + return NSLocalizedString(@"Input Field Scope\ncommands will run on each text input field", @"Bundle Editor : Outline View : 'Input Field' item : tooltip"); break; case kDataTableScopeArrayIndex: - return NSLocalizedString(@"Data Table Scope\ncommands will run on the Content and Query data tables", @"Data Table Scope\ncommands will run on the Content and Query data tables tooltip"); + return NSLocalizedString(@"Data Table Scope\ncommands will run on the Content and Query data tables", @"Bundle Editor : Outline View : 'Data Table' item : tooltip"); break; case kGeneralScopeArrayIndex: - return NSLocalizedString(@"General Scope\ncommands will run application-wide", @"General Scope\ncommands will run application-wide tooltip"); + return NSLocalizedString(@"General Scope\ncommands will run application-wide", @"Bundle Editor : Outline View : 'General' item : tooltip"); break; default: return @""; @@ -1232,25 +1337,25 @@ } if([outlineView levelForItem:item] == 2) { if([[item representedObject] objectForKey:kChildrenKey]) { - return [NSString stringWithFormat:@"“%@” %@", [[item representedObject] objectForKey:kBundleNameKey], NSLocalizedString(@"submenu label", @"submenu label")]; + return [NSString stringWithFormat:NSLocalizedString(@"Bundles in category “%@”",@"Bundle Editor : Outline View : Menu Category item : tooltip"), [[item representedObject] objectForKey:kBundleNameKey]]; } else { if([[item representedObject] objectForKey:SPBundleFileTooltipKey] && [[[item representedObject] objectForKey:SPBundleFileTooltipKey] length]) return [[item representedObject] objectForKey:SPBundleFileTooltipKey]; else - return [NSString stringWithFormat:@"“%@” Bundle", [[item representedObject] objectForKey:kBundleNameKey]]; + return [NSString stringWithFormat:SP_BUNDLEEDITOR_OUTLINE_BUNDLE_TOOLTIP_STRING, [[item representedObject] objectForKey:kBundleNameKey]]; } } if([outlineView levelForItem:item] == 3) { if([[item representedObject] objectForKey:SPBundleFileTooltipKey] && [[[item representedObject] objectForKey:SPBundleFileTooltipKey] length]) return [[item representedObject] objectForKey:SPBundleFileTooltipKey]; else - return [NSString stringWithFormat:@"“%@” Bundle", [[item representedObject] objectForKey:kBundleNameKey]]; + return [NSString stringWithFormat:SP_BUNDLEEDITOR_OUTLINE_BUNDLE_TOOLTIP_STRING, [[item representedObject] objectForKey:kBundleNameKey]]; } return @""; } #pragma mark - -#pragma mark TableView delegate +#pragma mark TableView (outline) delegate /** * Traps enter and esc and edit/cancel without entering next row @@ -1386,6 +1491,10 @@ return ([[commandBundleTreeController selectedObjects] count] == 1 && ![[[commandBundleTreeController selectedObjects] objectAtIndex:0] objectForKey:kChildrenKey]); } + if ( action == @selector(undeleteDefaultBundles:) ) { + return ([deletedDefaultBundles count]) ? YES : NO; + } + return YES; } diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h index 2cd4d170..73a7ef77 100644 --- a/Source/SPConnectionController.h +++ b/Source/SPConnectionController.h @@ -38,7 +38,7 @@ @interface NSObject (BWAnchoredButtonBar) -- (void)setSplitViewDelegate:(id)splitViewDelegate; +- (NSRect)splitView:(NSSplitView *)splitView additionalEffectiveRectOfDividerAtIndex:(NSInteger)dividerIndex; @end diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m index 4bafafbf..2bad361f 100644 --- a/Source/SPConnectionController.m +++ b/Source/SPConnectionController.m @@ -133,8 +133,8 @@ static const NSString *SPExportFavoritesFilename = @"SequelProFavorites.plist"; [databaseConnectionView setHidden:YES]; [connectionView setFrame:[databaseConnectionView frame]]; [databaseConnectionSuperview addSubview:connectionView]; - [connectionSplitView setPosition:[[dbDocument valueForKey:@"dbTablesTableView"] frame].size.width-6 ofDividerAtIndex:0]; - [connectionSplitViewButtonBar setSplitViewDelegate:self]; + [connectionSplitView setPosition:[[dbDocument valueForKey:@"dbTablesTableView"] frame].size.width ofDividerAtIndex:0]; + [connectionSplitView setDelegate:self]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(scrollViewFrameChanged:) name:NSViewFrameDidChangeNotification object:nil]; @@ -278,6 +278,9 @@ static const NSString *SPExportFavoritesFilename = @"SequelProFavorites.plist"; isConnecting = YES; cancellingConnection = NO; + // Disable the favorites outline view to prevent further connections attempts + [favoritesOutlineView setEnabled:NO]; + [addToFavoritesButton setHidden:YES]; [addToFavoritesButton display]; [helpButton setHidden:YES]; diff --git a/Source/SPConnectionControllerDelegate.m b/Source/SPConnectionControllerDelegate.m index c0b86c0f..449a2cb2 100644 --- a/Source/SPConnectionControllerDelegate.m +++ b/Source/SPConnectionControllerDelegate.m @@ -35,33 +35,18 @@ #pragma mark - #pragma mark SplitView delegate methods -/** - * When the split view is resized, trigger a resize in the hidden table - * width as well, to keep the connection view and connected view in synch. - * Use this rather than splitViewDidResizeSubviews: as the latter is not - * forwarded by the BWAnchoredButtonBar. - */ -- (CGFloat)splitView:(NSSplitView *)splitView constrainSplitPosition:(CGFloat)proposedPosition ofSubviewAt:(NSInteger)dividerIndex -{ - [databaseConnectionView setPosition:[[[connectionSplitView subviews] objectAtIndex:0] frame].size.width ofDividerAtIndex:0]; - - return proposedPosition; -} - -/** - * Return the maximum possible size of the splitview. - */ -- (CGFloat)splitView:(NSSplitView *)sender constrainMaxCoordinate:(CGFloat)proposedMax ofSubviewAt:(NSInteger)offset +- (NSRect)splitView:(NSSplitView *)splitView additionalEffectiveRectOfDividerAtIndex:(NSInteger)dividerIndex { - return (proposedMax - 445); + return [connectionSplitViewButtonBar splitView:splitView additionalEffectiveRectOfDividerAtIndex:dividerIndex]; } /** - * Return the minimum possible size of the splitview. + * When the split view is resized, trigger a resize in the hidden table + * width as well, to keep the connection view and connected view in sync. */ -- (CGFloat)splitView:(NSSplitView *)sender constrainMinCoordinate:(CGFloat)proposedMin ofSubviewAt:(NSInteger)offset +- (void)splitViewDidResizeSubviews:(NSNotification *)notification { - return (proposedMin + 80); + [databaseConnectionView setPosition:[[[connectionSplitView subviews] objectAtIndex:0] frame].size.width ofDividerAtIndex:0]; } #pragma mark - diff --git a/Source/SPConnectionHandler.m b/Source/SPConnectionHandler.m index 6a6bc3d6..6d777ff5 100644 --- a/Source/SPConnectionHandler.m +++ b/Source/SPConnectionHandler.m @@ -32,17 +32,8 @@ * Set up the MySQL connection, either through a successful tunnel or directly in the background. */ - (void)initiateMySQLConnection -{ - // Disable the favorites table view to prevent further connections attempts - [favoritesOutlineView setEnabled:NO]; - - if (sshTunnel) { - [progressIndicatorText setStringValue:NSLocalizedString(@"MySQL connecting...", @"MySQL connecting very short status message")]; - } - else { - [progressIndicatorText setStringValue:NSLocalizedString(@"Connecting...", @"Generic connecting very short status message")]; - } - +{ + [progressIndicatorText setStringValue:(sshTunnel) ? NSLocalizedString(@"MySQL connecting...", @"MySQL connecting very short status message") : NSLocalizedString(@"Connecting...", @"Generic connecting very short status message")]; [progressIndicatorText display]; [connectButton setTitle:NSLocalizedString(@"Cancel", @"cancel button")]; @@ -295,7 +286,9 @@ certificateAuthorityCertificatePath:[self sslCACertFileLocationEnabled] ? [self [dbDocument setTitlebarStatus:NSLocalizedString(@"SSH Disconnected", @"SSH disconnected titlebar marker")]; [self failConnectionWithTitle:NSLocalizedString(@"SSH connection failed!", @"SSH connection failed title") errorMessage:[theTunnel lastError] detail:[sshTunnel debugMessages]]; - } + + [self _restoreConnectionInterface]; + } else if (newState == PROXY_STATE_CONNECTED) { [dbDocument setTitlebarStatus:NSLocalizedString(@"SSH Connected", @"SSH connected titlebar marker")]; diff --git a/Source/SPConstants.h b/Source/SPConstants.h index 2a35ab60..c5a932ea 100644 --- a/Source/SPConstants.h +++ b/Source/SPConstants.h @@ -211,6 +211,7 @@ typedef enum #define SPLOCALIZEDURL_KEYBOARDSHORTCUTS NSLocalizedString(@"http://www.sequelpro.com/docs/Keyboard_Shortcuts", @"Localized keyboard shortcuts page - do not localize if no translated webpage is available") #define SPLOCALIZEDURL_CONNECTIONHELP NSLocalizedString(@"http://www.sequelpro.com/docs/Getting_Connected", @"Localized connection help page - do not localize if no translated webpage is available") #define SPLOCALIZEDURL_TRANSLATIONFEEDBACK NSLocalizedString(@"http://dev.sequelpro.com/translate/feedback", @"Localized translation feedback page - do not localize if no translated webpage is available") +#define SPLOCALIZEDURL_BUNDLEEDITORHELP NSLocalizedString(@"http://www.sequelpro.com/docs/Bundle_Editor", @"Localized help page for bundle editor - do not localize if no translated webpage is available") // Long running notification time for Growl messages extern const CGFloat SPLongRunningNotificationTime; @@ -367,6 +368,8 @@ extern NSString *SPUniqueSchemaDelimiter; extern NSString *SPLastImportIntoNewTableEncoding; extern NSString *SPLastImportIntoNewTableType; extern NSString *SPGlobalValueHistory; +extern NSString *SPBundleDeletedDefaultBundlesKey; +extern NSString *SPBundleUpdatedDefaultBundlesKey; // URLs extern NSString *SPDonationsURL; @@ -475,6 +478,8 @@ extern NSString *SPBundleFileUUIDKey; extern NSString *SPBundleFileDescriptionKey; extern NSString *SPBundleFileTriggerKey; extern NSString *SPBundleFileWithBlobKey; +extern NSString *SPBundleFileIsDefaultBundleKey; +extern NSString *SPBundleFileDefaultBundleWasModifiedKey; extern NSString *SPBundleInternLabelKey; extern NSString *SPBundleInternPathToFileKey; extern NSString *SPBundleInternKeyEquivalentKey; @@ -518,9 +523,9 @@ extern NSString *SPBundleShellVariableExitReplaceSelection; extern NSString *SPBundleShellVariableExitReplaceContent; extern NSString *SPBundleShellVariableExitInsertAsText; extern NSString *SPBundleShellVariableExitInsertAsSnippet; -extern NSString *SPBundleShellVariableExitInsertAsHTML; -extern NSString *SPBundleShellVariableExitInsertAsTextTooltip; -extern NSString *SPBundleShellVariableExitInsertAsHTMLTooltip; +extern NSString *SPBundleShellVariableExitShowAsHTML; +extern NSString *SPBundleShellVariableExitShowAsTextTooltip; +extern NSString *SPBundleShellVariableExitShowAsHTMLTooltip; extern NSString *SPBundleShellVariableCurrentHost; extern NSString *SPBundleShellVariableCurrentUser; extern NSString *SPBundleShellVariableCurrentPort; diff --git a/Source/SPConstants.m b/Source/SPConstants.m index f919e880..c7ac921d 100644 --- a/Source/SPConstants.m +++ b/Source/SPConstants.m @@ -179,6 +179,8 @@ NSString *SPUniqueSchemaDelimiter = @""; // U+FFF8 NSString *SPLastImportIntoNewTableEncoding = @"LastImportIntoNewTableEncoding"; NSString *SPLastImportIntoNewTableType = @"LastImportIntoNewTableType"; NSString *SPGlobalValueHistory = @"GlobalValueHistory"; +NSString *SPBundleDeletedDefaultBundlesKey = @"deletedDefaultBundles"; +NSString *SPBundleUpdatedDefaultBundlesKey = @"updatedDefaultBundles"; // URLs NSString *SPDonationsURL = @"http://www.sequelpro.com/donate.html"; @@ -287,6 +289,8 @@ NSString *SPBundleFileUUIDKey = @"uuid"; NSString *SPBundleFileDescriptionKey = @"description"; NSString *SPBundleFileTriggerKey = @"trigger"; NSString *SPBundleFileWithBlobKey = @"withblob"; +NSString *SPBundleFileIsDefaultBundleKey = @"isDefaultBundle"; +NSString *SPBundleFileDefaultBundleWasModifiedKey = @"defaultBundleWasModified"; NSString *SPBundleInternLabelKey = @"label"; NSString *SPBundleInternPathToFileKey = @"path"; NSString *SPBundleInternKeyEquivalentKey = @"keyEquivalent"; @@ -317,11 +321,11 @@ NSString *SPBundleShellVariableCurrentUser = @"SP_CURRENT_USER" NSString *SPBundleShellVariableCurrentWord = @"SP_CURRENT_WORD"; NSString *SPBundleShellVariableDatabaseEncoding = @"SP_DATABASE_ENCODING"; NSString *SPBundleShellVariableDataTableSource = @"SP_DATA_TABLE_SOURCE"; -NSString *SPBundleShellVariableExitInsertAsHTML = @"SP_BUNDLE_EXIT_SHOW_AS_HTML"; -NSString *SPBundleShellVariableExitInsertAsHTMLTooltip = @"SP_BUNDLE_EXIT_SHOW_AS_HTML_TOOLTIP"; +NSString *SPBundleShellVariableExitShowAsHTML = @"SP_BUNDLE_EXIT_SHOW_AS_HTML"; +NSString *SPBundleShellVariableExitShowAsHTMLTooltip = @"SP_BUNDLE_EXIT_SHOW_AS_HTML_TOOLTIP"; NSString *SPBundleShellVariableExitInsertAsSnippet = @"SP_BUNDLE_EXIT_INSERT_AS_SNIPPET"; NSString *SPBundleShellVariableExitInsertAsText = @"SP_BUNDLE_EXIT_INSERT_AS_TEXT"; -NSString *SPBundleShellVariableExitInsertAsTextTooltip = @"SP_BUNDLE_EXIT_SHOW_AS_TEXT_TOOLTIP"; +NSString *SPBundleShellVariableExitShowAsTextTooltip = @"SP_BUNDLE_EXIT_SHOW_AS_TEXT_TOOLTIP"; NSString *SPBundleShellVariableExitNone = @"SP_BUNDLE_EXIT_NONE"; NSString *SPBundleShellVariableExitReplaceContent = @"SP_BUNDLE_EXIT_REPLACE_CONTENT"; NSString *SPBundleShellVariableExitReplaceSelection = @"SP_BUNDLE_EXIT_REPLACE_SELECTION"; diff --git a/Source/SPCopyTable.m b/Source/SPCopyTable.m index fad9332e..827672b5 100644 --- a/Source/SPCopyTable.m +++ b/Source/SPCopyTable.m @@ -1276,7 +1276,9 @@ NSInteger kBlobAsImageFile = 4; [[NSFileManager defaultManager] removeItemAtPath:bundleInputFilePath error:nil]; - NSString *action = [[cmdData objectForKey:SPBundleFileOutputActionKey] lowercaseString]; + NSString *action = SPBundleOutputActionNone; + if([cmdData objectForKey:SPBundleFileOutputActionKey] && [[cmdData objectForKey:SPBundleFileOutputActionKey] length]) + action = [[cmdData objectForKey:SPBundleFileOutputActionKey] lowercaseString]; // Redirect due exit code if(err != nil) { @@ -1315,8 +1317,7 @@ NSInteger kBlobAsImageFile = 4; } if(err == nil && output) { - if([cmdData objectForKey:SPBundleFileOutputActionKey] && [[cmdData objectForKey:SPBundleFileOutputActionKey] length] - && ![[cmdData objectForKey:SPBundleFileOutputActionKey] isEqualToString:SPBundleOutputActionNone]) { + if(![action isEqualToString:SPBundleOutputActionNone]) { NSPoint pos = [NSEvent mouseLocation]; pos.y -= 16; diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m index 096974ba..787817bc 100644 --- a/Source/SPDatabaseDocument.m +++ b/Source/SPDatabaseDocument.m @@ -493,7 +493,8 @@ YY_BUFFER_STATE yy_scan_string (const char *); NSString *database = NSArrayObjectAtIndex([queryResult fetchRowAsArray], 0); // If the database is either information_schema or mysql then it is classed as a system table - if ([database isEqualToString:@"information_schema"] || [database isEqualToString:@"mysql"]) { + // 5.5.3+ performance_schema + if ([database isEqualToString:@"information_schema"] || [database isEqualToString:@"mysql"] || [database isEqualToString:@"performance_schema"]) { [allSystemDatabases addObject:database]; } else { @@ -5266,16 +5267,6 @@ YY_BUFFER_STATE yy_scan_string (const char *); #pragma mark - #pragma mark SplitView delegate methods -- (CGFloat)splitView:(NSSplitView *)splitView constrainMaxCoordinate:(CGFloat)proposedMax ofSubviewAt:(NSInteger)dividerIndex -{ - - // Limit the right view of DBViewSplitter in order to avoid GUI element overlapping - if(splitView == contentViewSplitter) return proposedMax - 495; - - return proposedMax; - -} - /** * tells the splitView that it can collapse views */ @@ -5295,9 +5286,8 @@ YY_BUFFER_STATE yy_scan_string (const char *); - (NSRect)splitView:(NSSplitView *)splitView additionalEffectiveRectOfDividerAtIndex:(NSInteger)dividerIndex { - if (sidebarGrabber != nil) { - NSRect grabberBounds = [sidebarGrabber bounds]; - return [sidebarGrabber convertRect:NSMakeRect(grabberBounds.origin.x + (grabberBounds.size.width - 16), grabberBounds.origin.y, 16, grabberBounds.size.height) toView:splitView]; + if (splitView == contentViewSplitter && sidebarGrabber != nil) { + return [sidebarGrabber splitView:splitView additionalEffectiveRectOfDividerAtIndex:dividerIndex]; } else { return NSZeroRect; } diff --git a/Source/SPExtendedTableInfo.m b/Source/SPExtendedTableInfo.m index 1f67b95d..a765f6df 100644 --- a/Source/SPExtendedTableInfo.m +++ b/Source/SPExtendedTableInfo.m @@ -513,23 +513,24 @@ // If we are viewing tables in the information_schema database, then disable all controls that cause table // changes as these tables are not modifiable by anyone. - BOOL isInformationSchemaDb = [[tableDocumentInstance database] isEqualToString:@"information_schema"]; + //also affects mysql and performance_schema + BOOL isSystemSchemaDb = ([[tableDocumentInstance database] isEqualToString:@"information_schema"] || [[tableDocumentInstance database] isEqualToString:@"performance_schema"] || [[tableDocumentInstance database] isEqualToString:@"mysql"]); if ([[databaseDataInstance getDatabaseStorageEngines] count] && [statusFields objectForKey:@"Engine"]) { - [tableTypePopUpButton setEnabled:(!isInformationSchemaDb)]; + [tableTypePopUpButton setEnabled:(!isSystemSchemaDb)]; } if ([[databaseDataInstance getDatabaseCharacterSetEncodings] count] && [tableDataInstance tableEncoding]) { - [tableEncodingPopUpButton setEnabled:(!isInformationSchemaDb)]; + [tableEncodingPopUpButton setEnabled:(!isSystemSchemaDb)]; } if ([[databaseDataInstance getDatabaseCollationsForEncoding:[tableDataInstance tableEncoding]] count] && [statusFields objectForKey:@"Collation"]) { - [tableCollationPopUpButton setEnabled:(!isInformationSchemaDb)]; + [tableCollationPopUpButton setEnabled:(!isSystemSchemaDb)]; } - [tableCommentsTextView setEditable:(!isInformationSchemaDb)]; + [tableCommentsTextView setEditable:(!isSystemSchemaDb)]; } #pragma mark - diff --git a/Source/SPIndexesController.m b/Source/SPIndexesController.m index a19480e6..27b4471d 100644 --- a/Source/SPIndexesController.m +++ b/Source/SPIndexesController.m @@ -129,17 +129,32 @@ static const NSString *SPNewIndexKeyBlockSize = @"IndexKeyBlockSize"; [indexNameTextField setEnabled:NO]; [indexNameTextField setStringValue:@"PRIMARY"]; - // If the table is of type MyISAM and Spation extension support is available, add the SPATIAL type + // If the table is of type MyISAM and Spatial extension support is available, add the SPATIAL type NSString *engine = [[tableData statusValues] objectForKey:@"Engine"]; if ([engine isEqualToString:@"MyISAM"] && [[dbDocument serverSupport] supportsSpatialExtensions]) { [indexTypePopUpButton addItemWithTitle:@"SPATIAL"]; } - + // Check to see whether a primary key already exists for the table, and if so select INDEX instead for (NSDictionary *field in fields) { - if ([field objectForKey:@"isprimarykey"]) { + BOOL hasCompositePrimaryKey = NO; + BOOL isPrimaryKey = [field objectForKey:@"isprimarykey"]; + + // The 'isprimarykey' key of a field is only present for single column primary keys, not composite keys, + // so we need to check the indexes manually. + if (!isPrimaryKey) { + for (NSDictionary *index in indexes) + { + if ([[index objectForKey:@"Key_name"] isEqualToString:@"PRIMARY"]) { + hasCompositePrimaryKey = YES; + break; + } + } + } + + if (isPrimaryKey || hasCompositePrimaryKey) { // Remove primary key option [indexTypePopUpButton removeItemAtIndex:0]; @@ -154,10 +169,31 @@ static const NSString *SPNewIndexKeyBlockSize = @"IndexKeyBlockSize"; break; } } + + NSMutableArray *indexedFieldNames = [[NSMutableArray alloc] init]; + + // Build an array of all indexed column names + for (NSDictionary *index in indexes) + { + [indexedFieldNames addObject:[index objectForKey:@"Column_name"]]; + } + + NSDictionary *initialField = nil; + + // Select the first column as the initial field that doesn't already have an index + for (NSDictionary *field in fields) + { + if (![indexedFieldNames containsObject:[field objectForKey:@"name"]]) { + initialField = [[field mutableCopy] autorelease]; + break; + } + } + + if (initialField) [indexedFieldNames release], initialField = nil; // Reset the indexed columns [indexedFields removeAllObjects]; - [indexedFields addObject:[[[fields objectAtIndex:0] mutableCopy] autorelease]]; + [indexedFields addObject:initialField]; [indexedColumnsTableView reloadData]; @@ -393,15 +429,19 @@ static const NSString *SPNewIndexKeyBlockSize = @"IndexKeyBlockSize"; */ - (NSInteger)numberOfItemsInComboBoxCell:(NSComboBoxCell *)comboBoxCell { - return [fields count]; + return ([fields count] - [indexedFields count]); } /** * Returns the item to be displayed in the combo box cell as the supplied index. */ - (id)comboBoxCell:(NSComboBoxCell *)comboBoxCell objectValueForItemAtIndex:(NSInteger)index -{ - return [[fields objectAtIndex:index] objectForKey:@"name"]; +{ + NSMutableArray *availableFields = [fields mutableCopy]; + + [availableFields removeObjectsInArray:indexedFields]; + + return [[availableFields objectAtIndex:index] objectForKey:@"name"]; } #pragma mark - diff --git a/Source/SPLogger.m b/Source/SPLogger.m index 743b0fce..5736fde6 100644 --- a/Source/SPLogger.m +++ b/Source/SPLogger.m @@ -107,7 +107,10 @@ static SPLogger *logger = nil; NSString *logString = [[NSString alloc] initWithFormat:theString arguments:arguments]; va_end(arguments); - // Write the log line, forcing an immediate write to disk to ensure logging + // Write the log line, forcing an immediate write to disk to ensure logging, and + // synchronised to allow use across multiple executables or their frameworks. + [logFileHandle synchronizeFile]; + [logFileHandle seekToEndOfFile]; [logFileHandle writeData:[[NSString stringWithFormat:@"%@ %@\n", [[NSDate date] descriptionWithCalendarFormat:@"%H:%M:%S" timeZone:nil locale:[[NSUserDefaults standardUserDefaults] dictionaryRepresentation]], logString] dataUsingEncoding:NSUTF8StringEncoding]]; [logFileHandle synchronizeFile]; diff --git a/Source/SPStringAdditions.m b/Source/SPStringAdditions.m index b523907c..a8346399 100644 --- a/Source/SPStringAdditions.m +++ b/Source/SPStringAdditions.m @@ -526,9 +526,9 @@ [theEnv setObject:[NSNumber numberWithInteger:SPBundleRedirectActionReplaceContent] forKey:SPBundleShellVariableExitReplaceContent]; [theEnv setObject:[NSNumber numberWithInteger:SPBundleRedirectActionInsertAsText] forKey:SPBundleShellVariableExitInsertAsText]; [theEnv setObject:[NSNumber numberWithInteger:SPBundleRedirectActionInsertAsSnippet] forKey:SPBundleShellVariableExitInsertAsSnippet]; - [theEnv setObject:[NSNumber numberWithInteger:SPBundleRedirectActionShowAsHTML] forKey:SPBundleShellVariableExitInsertAsHTML]; - [theEnv setObject:[NSNumber numberWithInteger:SPBundleRedirectActionShowAsTextTooltip] forKey:SPBundleShellVariableExitInsertAsTextTooltip]; - [theEnv setObject:[NSNumber numberWithInteger:SPBundleRedirectActionShowAsHTMLTooltip] forKey:SPBundleShellVariableExitInsertAsHTMLTooltip]; + [theEnv setObject:[NSNumber numberWithInteger:SPBundleRedirectActionShowAsHTML] forKey:SPBundleShellVariableExitShowAsHTML]; + [theEnv setObject:[NSNumber numberWithInteger:SPBundleRedirectActionShowAsTextTooltip] forKey:SPBundleShellVariableExitShowAsTextTooltip]; + [theEnv setObject:[NSNumber numberWithInteger:SPBundleRedirectActionShowAsHTMLTooltip] forKey:SPBundleShellVariableExitShowAsHTMLTooltip]; // Create and set an unique process ID for each SPDatabaseDocument which has to passed // for each sequelpro:// scheme command as user to be able to identify the url scheme command. diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m index 82282b5d..8e2bde89 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -4164,16 +4164,45 @@ return NO; } +// Set a minimum size for the filter text area - (CGFloat)splitView:(NSSplitView *)sender constrainMaxCoordinate:(CGFloat)proposedMax ofSubviewAt:(NSInteger)offset { return (proposedMax - 180); } +// Set a minimum size for the field list and action area - (CGFloat)splitView:(NSSplitView *)sender constrainMinCoordinate:(CGFloat)proposedMin ofSubviewAt:(NSInteger)offset { return (proposedMin + 200); } +// Improve default resizing and resize only the filter text area by default +- (void)splitView:(NSSplitView *)sender resizeSubviewsWithOldSize:(NSSize)oldSize +{ + NSSize newSize = [sender frame].size; + NSView *leftView = [[sender subviews] objectAtIndex:0]; + NSView *rightView = [[sender subviews] objectAtIndex:1]; + float dividerThickness = [sender dividerThickness]; + NSRect leftFrame = [leftView frame]; + NSRect rightFrame = [rightView frame]; + + // Resize height of both views + leftFrame.size.height = newSize.height; + rightFrame.size.height = newSize.height; + + // Only resize the right view's width - unless the constraint has been reached + if (rightFrame.size.width > 180 || newSize.width > oldSize.width) { + rightFrame.size.width = newSize.width - leftFrame.size.width - dividerThickness; + } else { + leftFrame.size.width = newSize.width - rightFrame.size.width - dividerThickness; + } + rightFrame.origin.x = leftFrame.size.width + dividerThickness; + + [leftView setFrame:leftFrame]; + [rightView setFrame:rightFrame]; +} + + #pragma mark - #pragma mark Task interaction diff --git a/Source/SPTextView.m b/Source/SPTextView.m index ab37f464..af4356a2 100644 --- a/Source/SPTextView.m +++ b/Source/SPTextView.m @@ -351,8 +351,10 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse) // Put information_schema and/or mysql db at the end if not selected + // 5.5.3+ also has performance_schema NSString* mysql_id = [NSString stringWithFormat:@"%@%@%@", connectionID, SPUniqueSchemaDelimiter, @"mysql"]; - NSString* inf_id = [NSString stringWithFormat:@"%@%@%@", connectionID, SPUniqueSchemaDelimiter, @"information_schema"]; + NSString* inf_id = [NSString stringWithFormat:@"%@%@%@", connectionID, SPUniqueSchemaDelimiter, @"information_schema"]; + NSString* perf_id = [NSString stringWithFormat:@"%@%@%@", connectionID, SPUniqueSchemaDelimiter, @"performance_schema"]; if(currentDb && ![currentDb isEqualToString:mysql_id] && [sortedDbs containsObject:mysql_id]) { [sortedDbs removeObject:mysql_id]; [sortedDbs addObject:mysql_id]; @@ -361,6 +363,10 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse) [sortedDbs removeObject:inf_id]; [sortedDbs addObject:inf_id]; } + if(currentDb && ![currentDb isEqualToString:perf_id] && [sortedDbs containsObject:perf_id]) { + [sortedDbs removeObject:perf_id]; + [sortedDbs addObject:perf_id]; + } BOOL aTableNameExists = NO; if(!aDbName) { diff --git a/Source/SPTextViewAdditions.m b/Source/SPTextViewAdditions.m index f04c6684..2e1f8f9b 100644 --- a/Source/SPTextViewAdditions.m +++ b/Source/SPTextViewAdditions.m @@ -649,7 +649,9 @@ [[NSFileManager defaultManager] removeItemAtPath:bundleInputFilePath error:nil]; - NSString *action = [[cmdData objectForKey:SPBundleFileOutputActionKey] lowercaseString]; + NSString *action = SPBundleOutputActionNone; + if([cmdData objectForKey:SPBundleFileOutputActionKey] && [[cmdData objectForKey:SPBundleFileOutputActionKey] length]) + action = [[cmdData objectForKey:SPBundleFileOutputActionKey] lowercaseString]; // Redirect due exit code if(err != nil) { @@ -688,8 +690,7 @@ } if(err == nil && output) { - if([cmdData objectForKey:SPBundleFileOutputActionKey] && [[cmdData objectForKey:SPBundleFileOutputActionKey] length] - && ![[cmdData objectForKey:SPBundleFileOutputActionKey] isEqualToString:SPBundleOutputActionNone]) { + if(![action isEqualToString:SPBundleOutputActionNone]) { if([action isEqualToString:SPBundleOutputActionShowAsTextTooltip]) { [SPTooltip showWithObject:output]; diff --git a/Source/SPUserManager.m b/Source/SPUserManager.m index c545c6a8..b8d0e826 100644 --- a/Source/SPUserManager.m +++ b/Source/SPUserManager.m @@ -39,6 +39,8 @@ static const NSString *SPTableViewNameColumnID = @"NameColumn"; - (void)_selectParentFromSelection; - (NSArray *)_fetchUserWithUserName:(NSString *)username; - (NSManagedObject *)_createNewSPUser; +- (void)_grantPrivileges:(NSArray *)thePrivileges onDatabase:(NSString *)aDatabase forUser:(NSString *)aUser host:(NSString *)aHost; +- (void)_revokePrivileges:(NSArray *)thePrivileges onDatabase:(NSString *)aDatabase forUser:(NSString *)aUser host:(NSString *)aHost; - (BOOL)_checkAndDisplayMySqlError; - (void)_clearData; - (void)_initializeChild:(NSManagedObject *)child withItem:(NSDictionary *)item; @@ -169,6 +171,9 @@ static const NSString *SPTableViewNameColumnID = @"NameColumn"; while (privRow = [result fetchRowAsArray]) { privKey = [NSMutableString stringWithString:[[privRow objectAtIndex:0] lowercaseString]]; + + // Skip the special "Usage" key + if ([privKey isEqualToString:@"usage"]) continue; [privKey replaceOccurrencesOfString:@" " withString:@"_" options:NSLiteralSearch range:NSMakeRange(0, [privKey length])]; [privKey appendString:@"_priv"]; @@ -1167,30 +1172,10 @@ static const NSString *SPTableViewNameColumnID = @"NameColumn"; } // Grant privileges - if ([grantPrivileges count] > 0) - { - NSString *grantStatement = [NSString stringWithFormat:@"GRANT %@ ON %@.* TO %@@%@", - [[grantPrivileges componentsJoinedByCommas] uppercaseString], - [dbName backtickQuotedString], - [[schemaPriv valueForKeyPath:@"user.parent.user"] tickQuotedString], - [[schemaPriv valueForKeyPath:@"user.host"] tickQuotedString]]; - - [self.mySqlConnection queryString:grantStatement]; - [self _checkAndDisplayMySqlError]; - } + [self _grantPrivileges:grantPrivileges onDatabase:dbName forUser:[schemaPriv valueForKeyPath:@"user.parent.user"] host:[schemaPriv valueForKeyPath:@"user.host"]]; // Revoke privileges - if ([revokePrivileges count] > 0) - { - NSString *revokeStatement = [NSString stringWithFormat:@"REVOKE %@ ON %@.* FROM %@@%@", - [[revokePrivileges componentsJoinedByCommas] uppercaseString], - [dbName backtickQuotedString], - [[schemaPriv valueForKeyPath:@"user.parent.user"] tickQuotedString], - [[schemaPriv valueForKeyPath:@"user.host"] tickQuotedString]]; - - [self.mySqlConnection queryString:revokeStatement]; - [self _checkAndDisplayMySqlError]; - } + [self _revokePrivileges:revokePrivileges onDatabase:dbName forUser:[schemaPriv valueForKeyPath:@"user.parent.user"] host:[schemaPriv valueForKeyPath:@"user.host"]]; return YES; } @@ -1245,28 +1230,10 @@ static const NSString *SPTableViewNameColumnID = @"NameColumn"; } // Grant privileges - if ([grantPrivileges count] > 0) { - - NSString *grantStatement = [NSString stringWithFormat:@"GRANT %@ ON *.* TO %@@%@", - [[grantPrivileges componentsJoinedByCommas] uppercaseString], - [[[user parent] valueForKey:@"user"] tickQuotedString], - [[user valueForKey:@"host"] tickQuotedString]]; + [self _grantPrivileges:grantPrivileges onDatabase:nil forUser:[[user parent] valueForKey:@"user"] host:[user valueForKey:@"host"]]; - [self.mySqlConnection queryString:grantStatement]; - [self _checkAndDisplayMySqlError]; - } - // Revoke privileges - if ([revokePrivileges count] > 0) - { - NSString *revokeStatement = [NSString stringWithFormat:@"REVOKE %@ ON *.* FROM %@@%@", - [[revokePrivileges componentsJoinedByCommas] uppercaseString], - [[[user parent] valueForKey:@"user"] tickQuotedString], - [[user valueForKey:@"host"] tickQuotedString]]; - - [self.mySqlConnection queryString:revokeStatement]; - [self _checkAndDisplayMySqlError]; - } + [self _revokePrivileges:revokePrivileges onDatabase:nil forUser:[[user parent] valueForKey:@"user"] host:[user valueForKey:@"host"]]; } for (NSManagedObject *priv in [user valueForKey:@"schema_privileges"]) { @@ -1331,6 +1298,69 @@ static const NSString *SPTableViewNameColumnID = @"NameColumn"; } /** + * Grant the supplied privileges to the specified user and host + */ +- (void)_grantPrivileges:(NSArray *)thePrivileges onDatabase:(NSString *)aDatabase forUser:(NSString *)aUser host:(NSString *)aHost +{ + if (![thePrivileges count]) return; + + NSString *grantStatement; + + // Special case when all items are checked, to allow GRANT OPTION to work + if ([self.privsSupportedByServer count] == [thePrivileges count]) { + grantStatement = [NSString stringWithFormat:@"GRANT ALL ON %@.* TO %@@%@ WITH GRANT OPTION", + aDatabase?[aDatabase backtickQuotedString]:@"*", + [aUser tickQuotedString], + [aHost tickQuotedString]]; + } else { + grantStatement = [NSString stringWithFormat:@"GRANT %@ ON %@.* TO %@@%@", + [[thePrivileges componentsJoinedByCommas] uppercaseString], + aDatabase?[aDatabase backtickQuotedString]:@"*", + [aUser tickQuotedString], + [aHost tickQuotedString]]; + } + + [self.mySqlConnection queryString:grantStatement]; + [self _checkAndDisplayMySqlError]; +} + + +/** + * Revoke the supplied privileges from the specified user and host + */ +- (void)_revokePrivileges:(NSArray *)thePrivileges onDatabase:(NSString *)aDatabase forUser:(NSString *)aUser host:(NSString *)aHost +{ + if (![thePrivileges count]) return; + + NSString *revokeStatement; + + // Special case when all items are checked, to allow GRANT OPTION to work + if ([self.privsSupportedByServer count] == [thePrivileges count]) { + revokeStatement = [NSString stringWithFormat:@"REVOKE ALL PRIVILEGES ON %@.* FROM %@@%@", + aDatabase?[aDatabase backtickQuotedString]:@"*", + [aUser tickQuotedString], + [aHost tickQuotedString]]; + + [self.mySqlConnection queryString:revokeStatement]; + [self _checkAndDisplayMySqlError]; + + revokeStatement = [NSString stringWithFormat:@"REVOKE GRANT OPTION ON %@.* FROM %@@%@", + aDatabase?[aDatabase backtickQuotedString]:@"*", + [aUser tickQuotedString], + [aHost tickQuotedString]]; + } else { + revokeStatement = [NSString stringWithFormat:@"REVOKE %@ ON %@.* FROM %@@%@", + [[thePrivileges componentsJoinedByCommas] uppercaseString], + aDatabase?[aDatabase backtickQuotedString]:@"*", + [aUser tickQuotedString], + [aHost tickQuotedString]]; + } + + [self.mySqlConnection queryString:revokeStatement]; + [self _checkAndDisplayMySqlError]; +} + +/** * Displays an alert panel if there was an error condition on the MySQL connection. */ - (BOOL)_checkAndDisplayMySqlError |