diff options
author | stuconnolly <stuart02@gmail.com> | 2010-03-25 22:16:56 +0000 |
---|---|---|
committer | stuconnolly <stuart02@gmail.com> | 2010-03-25 22:16:56 +0000 |
commit | 90002d731b137988e4462374e35220db86731086 (patch) | |
tree | d92bb03c60379672eccf7a89f7d5b2e405dd2896 | |
parent | fa5f69379821283787e66405c7a6bd43dc16a71e (diff) | |
download | sequelpro-90002d731b137988e4462374e35220db86731086.tar.gz sequelpro-90002d731b137988e4462374e35220db86731086.tar.bz2 sequelpro-90002d731b137988e4462374e35220db86731086.zip |
Bunch of improvements to the server process list viewer, including:
- It is now a separate window like the console to enable monitoring.
- It now uses the same window style as the console.
- The ability to show or hide the process ID, column. This could possibly be enabled for some of the other columns as well, suggestions?
- The ability to enable or disable the use of SHOW FULL PROCESSLIST or just SHOW PROCESSLIST.
This implements most of the enhancements requested in issue #607, with the exception of the option to enable auto-refresh, which is still being worked on.
-rw-r--r-- | Interfaces/English.lproj/DatabaseProcessList.xib | 787 | ||||
-rw-r--r-- | Source/SPConstants.h | 2 | ||||
-rw-r--r-- | Source/SPConstants.m | 2 | ||||
-rw-r--r-- | Source/SPProcessListController.h | 9 | ||||
-rw-r--r-- | Source/SPProcessListController.m | 68 | ||||
-rw-r--r-- | Source/TableDocument.m | 2 |
6 files changed, 575 insertions, 295 deletions
diff --git a/Interfaces/English.lproj/DatabaseProcessList.xib b/Interfaces/English.lproj/DatabaseProcessList.xib index 370da418..74bb98b4 100644 --- a/Interfaces/English.lproj/DatabaseProcessList.xib +++ b/Interfaces/English.lproj/DatabaseProcessList.xib @@ -7,25 +7,15 @@ <string key="IBDocument.AppKitVersion">1038.25</string> <string key="IBDocument.HIToolboxVersion">458.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.brandonwalkin.BWToolkit</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>740</string> - <string>1.2.1</string> - </object> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="NS.object.0">740</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="17"/> + <integer value="7"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>com.brandonwalkin.BWToolkit</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> <object class="NSMutableDictionary" key="IBDocument.Metadata"> @@ -51,7 +41,7 @@ <object class="NSWindowTemplate" id="1071072595"> <int key="NSWindowStyleMask">15</int> <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{386, 500}, {586, 349}}</string> + <string key="NSWindowRect">{{386, 573}, {575, 203}}</string> <int key="NSWTFlags">1886912512</int> <string key="NSWindowTitle">Processes</string> <string key="NSWindowClass">NSWindow</string> @@ -78,7 +68,7 @@ <object class="NSTableView" id="457137758"> <reference key="NSNextResponder" ref="605698422"/> <int key="NSvFlags">256</int> - <string key="NSFrameSize">{575, 251}</string> + <string key="NSFrameSize">{575, 130}</string> <reference key="NSSuperview" ref="605698422"/> <bool key="NSEnabled">YES</bool> <object class="NSTableHeaderView" key="NSHeaderView" id="442504499"> @@ -90,7 +80,7 @@ </object> <object class="_NSCornerView" key="NSCornerView" id="779891178"> <reference key="NSNextResponder" ref="859424053"/> - <int key="NSvFlags">256</int> + <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{576, 0}, {12, 17}}</string> <reference key="NSSuperview" ref="859424053"/> </object> @@ -354,26 +344,25 @@ </object> </object> <double key="NSRowHeight">16</double> - <int key="NSTvFlags">1514176512</int> + <int key="NSTvFlags">1514143744</int> <reference key="NSDelegate"/> <reference key="NSDataSource"/> - <int key="NSColumnAutoresizingStyle">1</int> + <int key="NSColumnAutoresizingStyle">4</int> <int key="NSDraggingSourceMaskForLocal">15</int> <int key="NSDraggingSourceMaskForNonLocal">0</int> <bool key="NSAllowsTypeSelect">YES</bool> <int key="NSTableViewDraggingDestinationStyle">0</int> </object> </object> - <string key="NSFrame">{{1, 17}, {575, 251}}</string> + <string key="NSFrame">{{1, 17}, {575, 130}}</string> <reference key="NSSuperview" ref="859424053"/> - <reference key="NSNextKeyView" ref="457137758"/> <reference key="NSDocView" ref="457137758"/> <reference key="NSBGColor" ref="657889635"/> <int key="NScvFlags">4</int> </object> <object class="NSScroller" id="971927666"> <reference key="NSNextResponder" ref="859424053"/> - <int key="NSvFlags">256</int> + <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{576, 17}, {11, 251}}</string> <reference key="NSSuperview" ref="859424053"/> <int key="NSsFlags">256</int> @@ -400,17 +389,15 @@ </object> <string key="NSFrame">{{1, 0}, {575, 17}}</string> <reference key="NSSuperview" ref="859424053"/> - <reference key="NSNextKeyView" ref="442504499"/> <reference key="NSDocView" ref="442504499"/> <reference key="NSBGColor" ref="657889635"/> <int key="NScvFlags">4</int> </object> <reference ref="779891178"/> </object> - <string key="NSFrame">{{-1, 47}, {588, 269}}</string> + <string key="NSFrame">{{-1, 22}, {577, 148}}</string> <reference key="NSSuperview" ref="1010674838"/> - <reference key="NSNextKeyView" ref="605698422"/> - <int key="NSsFlags">18</int> + <int key="NSsFlags">530</int> <reference key="NSVScroller" ref="971927666"/> <reference key="NSHScroller" ref="287987975"/> <reference key="NSContentView" ref="605698422"/> @@ -418,80 +405,10 @@ <reference key="NSCornerView" ref="779891178"/> <bytes key="NSScrollAmts">QSAAAEEgAABBkAAAQZAAAA</bytes> </object> - <object class="NSButton" id="11057255"> - <reference key="NSNextResponder" ref="1010674838"/> - <int key="NSvFlags">289</int> - <string key="NSFrame">{{477, 13}, {94, 28}}</string> - <reference key="NSSuperview" ref="1010674838"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="569404619"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">138018816</int> - <string key="NSContents">Close</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="11057255"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">1</int> - <object class="NSFont" key="NSAlternateImage"> - <string key="NSName">Helvetica</string> - <double key="NSSize">11</double> - <int key="NSfFlags">16</int> - </object> - <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="97939917"> - <reference key="NSNextResponder" ref="1010674838"/> - <int key="NSvFlags">260</int> - <string key="NSFrame">{{15, 13}, {111, 28}}</string> - <reference key="NSSuperview" ref="1010674838"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="856752825"> - <int key="NSCellFlags">-2080244224</int> - <int key="NSCellFlags2">134348800</int> - <string key="NSContents">Save As...</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="97939917"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">129</int> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="BWInsetTextField" id="530590788"> - <reference key="NSNextResponder" ref="1010674838"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{9, 324}, {117, 14}}</string> - <reference key="NSSuperview" ref="1010674838"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="110248309"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272761856</int> - <string key="NSContents">Database Processes</string> - <object class="NSFont" key="NSSupport"> - <string key="NSName">LucidaGrande-Bold</string> - <double key="NSSize">11</double> - <int key="NSfFlags">16</int> - </object> - <reference key="NSControlView" ref="530590788"/> - <object class="NSColor" key="NSBackgroundColor" id="596664222"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">controlColor</string> - <reference key="NSColor" ref="466472473"/> - </object> - <reference key="NSTextColor" ref="37591332"/> - </object> - </object> <object class="NSSearchField" id="872678477"> <reference key="NSNextResponder" ref="1010674838"/> - <int key="NSvFlags">265</int> - <string key="NSFrame">{{367, 322}, {208, 19}}</string> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{10, 176}, {530, 19}}</string> <reference key="NSSuperview" ref="1010674838"/> <bool key="NSEnabled">YES</bool> <object class="NSSearchFieldCell" key="NSCell" id="92933437"> @@ -556,53 +473,192 @@ <bytes key="NSSearchFieldFlags">CAAAAA</bytes> </object> </object> - <object class="NSTextField" id="923493504"> + <object class="NSProgressIndicator" id="456564741"> + <reference key="NSNextResponder" ref="1010674838"/> + <int key="NSvFlags">-2147482356</int> + <object class="NSPSMatrix" key="NSDrawMatrix"/> + <string key="NSFrame">{{559, 178}, {16, 16}}</string> + <reference key="NSSuperview" ref="1010674838"/> + <int key="NSpiFlags">20746</int> + <double key="NSMaxValue">100</double> + </object> + <object class="NSImageView" id="602221387"> <reference key="NSNextResponder" ref="1010674838"/> - <int key="NSvFlags">-2147483382</int> - <string key="NSFrame">{{128, 324}, {234, 14}}</string> + <int key="NSvFlags">290</int> + <object class="NSMutableSet" key="NSDragTypes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="set.sortedObjects"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>Apple PDF pasteboard type</string> + <string>Apple PICT pasteboard type</string> + <string>Apple PNG pasteboard type</string> + <string>NSFilenamesPboardType</string> + <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string> + <string>NeXT TIFF v4.0 pasteboard type</string> + </object> + </object> + <string key="NSFrame">{{62, 0}, {513, 23}}</string> <reference key="NSSuperview" ref="1010674838"/> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="1037448022"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">71439360</int> - <string key="NSContents">0 of 0</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="923493504"/> - <reference key="NSBackgroundColor" ref="596664222"/> - <reference key="NSTextColor" ref="37591332"/> + <object class="NSImageCell" key="NSCell" id="34344227"> + <int key="NSCellFlags">130560</int> + <int key="NSCellFlags2">33554432</int> + <object class="NSCustomResource" key="NSContents"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">button_bar_spacer</string> + </object> + <int key="NSAlign">0</int> + <int key="NSScale">1</int> + <int key="NSStyle">0</int> + <bool key="NSAnimates">YES</bool> </object> + <bool key="NSEditable">YES</bool> </object> - <object class="NSButton" id="212964148"> + <object class="NSButton" id="215740769"> <reference key="NSNextResponder" ref="1010674838"/> <int key="NSvFlags">289</int> - <string key="NSFrame">{{385, 13}, {94, 28}}</string> + <string key="NSFrame">{{446, 2}, {118, 17}}</string> <reference key="NSSuperview" ref="1010674838"/> <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="512998809"> + <object class="NSButtonCell" key="NSCell" id="120875413"> <int key="NSCellFlags">-2080244224</int> <int key="NSCellFlags2">134348800</int> - <string key="NSContents">Refresh</string> + <string key="NSContents">Save As...</string> <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="212964148"/> + <reference key="NSControlView" ref="215740769"/> <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">268435585</int> + <int key="NSButtonFlags2">164</int> <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent">r</string> + <string key="NSKeyEquivalent"/> <int key="NSPeriodicDelay">200</int> <int key="NSPeriodicInterval">25</int> </object> </object> - <object class="NSProgressIndicator" id="456564741"> + <object class="NSButton" id="457818722"> <reference key="NSNextResponder" ref="1010674838"/> - <int key="NSvFlags">-2147482356</int> - <object class="NSPSMatrix" key="NSDrawMatrix"/> - <string key="NSFrame">{{366, 20}, {16, 16}}</string> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{30, -1}, {32, 25}}</string> <reference key="NSSuperview" ref="1010674838"/> - <int key="NSpiFlags">20746</int> - <double key="NSMaxValue">100</double> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="113118727"> + <int key="NSCellFlags">-2080244224</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">Clear</string> + <object class="NSFont" key="NSSupport" id="421083426"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">13</double> + <int key="NSfFlags">1044</int> + </object> + <reference key="NSControlView" ref="457818722"/> + <int key="NSButtonFlags">-2042347265</int> + <int key="NSButtonFlags2">163</int> + <object class="NSCustomResource" key="NSNormalImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">button_refresh</string> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + </object> + </object> + <object class="NSPopUpButton" id="52926490"> + <reference key="NSNextResponder" ref="1010674838"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{-10, 0}, {46, 25}}</string> + <reference key="NSSuperview" ref="1010674838"/> + <bool key="NSEnabled">YES</bool> + <object class="NSPopUpButtonCell" key="NSCell" id="627053027"> + <int key="NSCellFlags">-2076049856</int> + <int key="NSCellFlags2">134219776</int> + <reference key="NSSupport" ref="421083426"/> + <reference key="NSControlView" ref="52926490"/> + <int key="NSButtonFlags">-2042609409</int> + <int key="NSButtonFlags2">35</int> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + <object class="NSMenuItem" key="NSMenuItem" id="915308397"> + <reference key="NSMenu" ref="985642956"/> + <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"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">button_action</string> + </object> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="627053027"/> + </object> + <bool key="NSMenuItemRespectAlignment">YES</bool> + <object class="NSMenu" key="NSMenu" id="985642956"> + <string key="NSTitle">OtherViews</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="915308397"/> + <object class="NSMenuItem" id="197497844"> + <reference key="NSMenu" ref="985642956"/> + <string key="NSTitle">Show Process ID</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <int key="NSState">1</int> + <object class="NSCustomResource" key="NSOnImage" id="895795572"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSMenuCheckmark</string> + </object> + <object class="NSCustomResource" key="NSMixedImage" id="112300578"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSMenuMixedState</string> + </object> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="627053027"/> + </object> + <object class="NSMenuItem" id="842507213"> + <reference key="NSMenu" ref="985642956"/> + <string key="NSTitle">Show FULL Process List</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <int key="NSState">1</int> + <reference key="NSOnImage" ref="895795572"/> + <reference key="NSMixedImage" ref="112300578"/> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="627053027"/> + </object> + </object> + </object> + <int key="NSSelectedIndex">2</int> + <bool key="NSPullDown">YES</bool> + <int key="NSPreferredEdge">1</int> + <bool key="NSUsesItemFromMenu">YES</bool> + <bool key="NSAltersState">YES</bool> + </object> + </object> + <object class="NSTextField" id="695408953"> + <reference key="NSNextResponder" ref="1010674838"/> + <int key="NSvFlags">-2147483358</int> + <string key="NSFrame">{{67, 4}, {374, 14}}</string> + <reference key="NSSuperview" ref="1010674838"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="717069845"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272761856</int> + <string key="NSContents">0 of 0</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="695408953"/> + <object class="NSColor" key="NSBackgroundColor"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">controlColor</string> + <reference key="NSColor" ref="466472473"/> + </object> + <reference key="NSTextColor" ref="37591332"/> + </object> </object> </object> - <string key="NSFrameSize">{586, 349}</string> + <string key="NSFrameSize">{575, 203}</string> <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> @@ -618,14 +674,8 @@ <string key="NSTitle">Copy</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <object class="NSCustomResource" key="NSOnImage" id="169169667"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSMenuCheckmark</string> - </object> - <object class="NSCustomResource" key="NSMixedImage" id="30477996"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSMenuMixedState</string> - </object> + <reference key="NSOnImage" ref="895795572"/> + <reference key="NSMixedImage" ref="112300578"/> </object> <object class="NSMenuItem" id="503642664"> <reference key="NSMenu" ref="328428957"/> @@ -634,27 +684,35 @@ <string key="NSTitle"/> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="169169667"/> - <reference key="NSMixedImage" ref="30477996"/> + <reference key="NSOnImage" ref="895795572"/> + <reference key="NSMixedImage" ref="112300578"/> </object> <object class="NSMenuItem" id="116759459"> <reference key="NSMenu" ref="328428957"/> <string key="NSTitle">Kill Query</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="169169667"/> - <reference key="NSMixedImage" ref="30477996"/> + <reference key="NSOnImage" ref="895795572"/> + <reference key="NSMixedImage" ref="112300578"/> </object> <object class="NSMenuItem" id="322366870"> <reference key="NSMenu" ref="328428957"/> <string key="NSTitle">Kill Connection</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="169169667"/> - <reference key="NSMixedImage" ref="30477996"/> + <reference key="NSOnImage" ref="895795572"/> + <reference key="NSMixedImage" ref="112300578"/> </object> </object> </object> + <object class="NSUserDefaultsController" id="280475776"> + <object class="NSMutableArray" key="NSDeclaredKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>ProcessListShowProcessID</string> + <string>ProcessListShowFullProcessList</string> + </object> + <bool key="NSSharedInstance">YES</bool> + </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> <object class="NSMutableArray" key="connectionRecords"> @@ -668,14 +726,6 @@ <int key="connectionID">40</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">closeSheet:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="11057255"/> - </object> - <int key="connectionID">41</int> - </object> - <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">delegate</string> <reference key="source" ref="872678477"/> @@ -709,14 +759,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">refreshProcessList:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="212964148"/> - </object> - <int key="connectionID">48</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> <string key="label">killProcessQuery:</string> <reference key="source" ref="1001"/> <reference key="destination" ref="116759459"/> @@ -757,59 +799,115 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">saveProcessesButton</string> + <string key="label">filterProcessesSearchField</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="97939917"/> + <reference key="destination" ref="872678477"/> </object> - <int key="connectionID">65</int> + <int key="connectionID">68</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">refreshProcessesButton</string> + <string key="label">refreshProgressIndicator</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="212964148"/> + <reference key="destination" ref="456564741"/> </object> - <int key="connectionID">66</int> + <int key="connectionID">70</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">closeProcessListButton</string> + <object class="IBActionConnection" key="connection"> + <string key="label">saveServerProcesses:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="215740769"/> + </object> + <int key="connectionID">89</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">refreshProcessList:</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="11057255"/> + <reference key="destination" ref="457818722"/> </object> - <int key="connectionID">67</int> + <int key="connectionID">90</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">filterProcessesSearchField</string> + <string key="label">refreshProcessesButton</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="872678477"/> + <reference key="destination" ref="457818722"/> </object> - <int key="connectionID">68</int> + <int key="connectionID">91</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">refreshProgressIndicator</string> + <string key="label">saveProcessesButton</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="456564741"/> + <reference key="destination" ref="215740769"/> </object> - <int key="connectionID">70</int> + <int key="connectionID">92</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">processesCountTextField</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="923493504"/> + <reference key="destination" ref="695408953"/> </object> - <int key="connectionID">71</int> + <int key="connectionID">95</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: values.ProcessListShowProcessID</string> + <reference key="source" ref="197497844"/> + <reference key="destination" ref="280475776"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="197497844"/> + <reference key="NSDestination" ref="280475776"/> + <string key="NSLabel">value: values.ProcessListShowProcessID</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">values.ProcessListShowProcessID</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSConditionallySetsEnabled</string> + <boolean value="NO" key="NS.object.0"/> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">99</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">saveServerProcesses:</string> + <string key="label">toggleShowProcessID:</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="97939917"/> + <reference key="destination" ref="197497844"/> </object> - <int key="connectionID">73</int> + <int key="connectionID">100</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">toggeleShowFullProcessList:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="842507213"/> + </object> + <int key="connectionID">101</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: values.ProcessListShowFullProcessList</string> + <reference key="source" ref="842507213"/> + <reference key="destination" ref="280475776"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="842507213"/> + <reference key="NSDestination" ref="280475776"/> + <string key="NSLabel">value: values.ProcessListShowFullProcessList</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">values.ProcessListShowFullProcessList</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSConditionallySetsEnabled</string> + <boolean value="NO" key="NS.object.0"/> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">104</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -854,27 +952,18 @@ <reference key="object" ref="1010674838"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="923493504"/> <reference ref="872678477"/> - <reference ref="530590788"/> - <reference ref="97939917"/> - <reference ref="11057255"/> <reference ref="859424053"/> <reference ref="456564741"/> - <reference ref="212964148"/> + <reference ref="457818722"/> + <reference ref="52926490"/> + <reference ref="602221387"/> + <reference ref="215740769"/> + <reference ref="695408953"/> </object> <reference key="parent" ref="1071072595"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5</int> - <reference key="object" ref="923493504"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1037448022"/> - </object> - <reference key="parent" ref="1010674838"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">6</int> <reference key="object" ref="872678477"/> <object class="NSMutableArray" key="children"> @@ -896,48 +985,6 @@ <reference key="parent" ref="1010674838"/> </object> <object class="IBObjectRecord"> - <int key="objectID">8</int> - <reference key="object" ref="530590788"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="110248309"/> - </object> - <reference key="parent" ref="1010674838"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">9</int> - <reference key="object" ref="97939917"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="856752825"/> - </object> - <reference key="parent" ref="1010674838"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">10</int> - <reference key="object" ref="11057255"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="569404619"/> - </object> - <reference key="parent" ref="1010674838"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">11</int> - <reference key="object" ref="569404619"/> - <reference key="parent" ref="11057255"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">12</int> - <reference key="object" ref="856752825"/> - <reference key="parent" ref="97939917"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">13</int> - <reference key="object" ref="110248309"/> - <reference key="parent" ref="530590788"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">14</int> <reference key="object" ref="442504499"/> <reference key="parent" ref="859424053"/> @@ -1002,11 +1049,6 @@ <reference key="parent" ref="872678477"/> </object> <object class="IBObjectRecord"> - <int key="objectID">23</int> - <reference key="object" ref="1037448022"/> - <reference key="parent" ref="923493504"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">28</int> <reference key="object" ref="916357082"/> <object class="NSMutableArray" key="children"> @@ -1091,20 +1133,6 @@ <reference key="parent" ref="1006157959"/> </object> <object class="IBObjectRecord"> - <int key="objectID">46</int> - <reference key="object" ref="212964148"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="512998809"/> - </object> - <reference key="parent" ref="1010674838"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">47</int> - <reference key="object" ref="512998809"/> - <reference key="parent" ref="212964148"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">51</int> <reference key="object" ref="328428957"/> <object class="NSMutableArray" key="children"> @@ -1142,6 +1170,111 @@ <reference key="object" ref="456564741"/> <reference key="parent" ref="1010674838"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">74</int> + <reference key="object" ref="602221387"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="34344227"/> + </object> + <reference key="parent" ref="1010674838"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">75</int> + <reference key="object" ref="457818722"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="113118727"/> + </object> + <reference key="parent" ref="1010674838"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">76</int> + <reference key="object" ref="52926490"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="627053027"/> + </object> + <reference key="parent" ref="1010674838"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">77</int> + <reference key="object" ref="627053027"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="985642956"/> + </object> + <reference key="parent" ref="52926490"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">78</int> + <reference key="object" ref="985642956"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="842507213"/> + <reference ref="915308397"/> + <reference ref="197497844"/> + </object> + <reference key="parent" ref="627053027"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">79</int> + <reference key="object" ref="842507213"/> + <reference key="parent" ref="985642956"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">82</int> + <reference key="object" ref="915308397"/> + <reference key="parent" ref="985642956"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">84</int> + <reference key="object" ref="197497844"/> + <reference key="parent" ref="985642956"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">85</int> + <reference key="object" ref="113118727"/> + <reference key="parent" ref="457818722"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">86</int> + <reference key="object" ref="34344227"/> + <reference key="parent" ref="602221387"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">87</int> + <reference key="object" ref="215740769"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="120875413"/> + </object> + <reference key="parent" ref="1010674838"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">88</int> + <reference key="object" ref="120875413"/> + <reference key="parent" ref="215740769"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">93</int> + <reference key="object" ref="695408953"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="717069845"/> + </object> + <reference key="parent" ref="1010674838"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">94</int> + <reference key="object" ref="717069845"/> + <reference key="parent" ref="695408953"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">96</int> + <reference key="object" ref="280475776"/> + <reference key="parent" ref="0"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -1149,11 +1282,6 @@ <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>-3.IBPluginDependency</string> - <string>10.IBPluginDependency</string> - <string>10.ImportedFromIB2</string> - <string>11.IBPluginDependency</string> - <string>12.IBPluginDependency</string> - <string>13.IBPluginDependency</string> <string>14.IBPluginDependency</string> <string>14.IBShouldRemoveOnLegacySave</string> <string>15.IBPluginDependency</string> @@ -1171,7 +1299,6 @@ <string>21.IBPluginDependency</string> <string>21.IBShouldRemoveOnLegacySave</string> <string>22.IBPluginDependency</string> - <string>23.IBPluginDependency</string> <string>28.IBPluginDependency</string> <string>29.IBPluginDependency</string> <string>3.IBEditorWindowLastContentRect</string> @@ -1195,9 +1322,6 @@ <string>39.IBPluginDependency</string> <string>4.IBPluginDependency</string> <string>4.ImportedFromIB2</string> - <string>46.IBPluginDependency</string> - <string>47.IBPluginDependency</string> - <string>5.IBPluginDependency</string> <string>51.IBEditorWindowLastContentRect</string> <string>51.IBPluginDependency</string> <string>55.IBPluginDependency</string> @@ -1208,8 +1332,21 @@ <string>69.IBPluginDependency</string> <string>7.IBPluginDependency</string> <string>7.ImportedFromIB2</string> - <string>8.IBPluginDependency</string> - <string>9.IBPluginDependency</string> + <string>75.IBAttributePlaceholdersKey</string> + <string>75.IBPluginDependency</string> + <string>76.IBPluginDependency</string> + <string>77.IBPluginDependency</string> + <string>78.IBEditorWindowLastContentRect</string> + <string>78.IBPluginDependency</string> + <string>79.IBPluginDependency</string> + <string>82.IBPluginDependency</string> + <string>84.IBAttributePlaceholdersKey</string> + <string>84.IBPluginDependency</string> + <string>85.IBPluginDependency</string> + <string>87.IBPluginDependency</string> + <string>88.IBPluginDependency</string> + <string>93.IBPluginDependency</string> + <string>94.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1217,11 +1354,6 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.brandonwalkin.BWToolkit</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -1238,10 +1370,9 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{541, 371}, {575, 203}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{402, 386}, {586, 349}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{402, 386}, {586, 349}}</string> + <string>{{541, 371}, {575, 203}}</string> <integer value="1"/> <string>{{321, 508}, {411, 341}}</string> <integer value="0"/> @@ -1260,20 +1391,44 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> + <string>{{523, 251}, {155, 73}}</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>{{523, 251}, {155, 73}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <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="457818722"/> + <string key="toolTip">Clear Console</string> + </object> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{458, 293}, {223, 68}}</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="197497844"/> + <string key="toolTip">Duplicate the selected table</string> + </object> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.brandonwalkin.BWToolkit</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> </object> @@ -1293,7 +1448,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">73</int> + <int key="maxID">104</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -1337,6 +1492,13 @@ <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> + <string key="minorKey">Source/SPMainThreadTrampoline.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> <string key="minorKey">Source/SPNotLoaded.h</string> </object> </object> @@ -1372,12 +1534,13 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>closeSheet:</string> <string>copy:</string> <string>killProcessConnection:</string> <string>killProcessQuery:</string> <string>refreshProcessList:</string> <string>saveServerProcesses:</string> + <string>toggeleShowFullProcessList:</string> + <string>toggleShowProcessID:</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1387,13 +1550,13 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>closeProcessListButton</string> <string>filterProcessesSearchField</string> <string>processListTableView</string> <string>processesCountTextField</string> @@ -1403,7 +1566,6 @@ </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSButton</string> <string>NSSearchField</string> <string>NSTableView</string> <string>NSTextField</string> @@ -1472,6 +1634,13 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">NSApplication</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">BWToolkitFramework.framework/Headers/NSApplication+BWAdditions.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">NSButton</string> <string key="superclassName">NSControl</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -1504,6 +1673,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"> @@ -1512,6 +1689,22 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">NSImageCell</string> + <string key="superclassName">NSCell</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSImageCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSImageView</string> + <string key="superclassName">NSControl</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSImageView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">NSMenu</string> <string key="superclassName">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier" id="853112308"> @@ -1528,6 +1721,14 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">NSMenuItemCell</string> + <string key="superclassName">NSButtonCell</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSMenuItemCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> @@ -1863,6 +2064,22 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">NSPopUpButton</string> + <string key="superclassName">NSButton</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSPopUpButton.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSPopUpButtonCell</string> + <string key="superclassName">NSMenuItemCell</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">AppKit.framework/Headers/NSPopUpButtonCell.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">NSProgressIndicator</string> <string key="superclassName">NSView</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -1955,6 +2172,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> @@ -1978,6 +2203,13 @@ <reference key="sourceIdentifier" ref="686268200"/> </object> <object class="IBPartialClassDescription"> + <string key="className">NSView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">BWToolkitFramework.framework/Headers/NSView+BWAdditions.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">NSWindow</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> @@ -2000,6 +2232,13 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">NSWindow</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBFrameworkSource</string> + <string key="minorKey">BWToolkitFramework.framework/Headers/NSWindow+BWAdditions.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">NSWindowController</string> <string key="superclassName">NSResponder</string> <object class="NSMutableDictionary" key="actions"> diff --git a/Source/SPConstants.h b/Source/SPConstants.h index aabef38e..54bce4d1 100644 --- a/Source/SPConstants.h +++ b/Source/SPConstants.h @@ -198,6 +198,8 @@ extern NSString *SPConsoleShowHelps; extern NSString *SPEditInSheetEnabled; extern NSString *SPTableInformationPanelCollapsed; extern NSString *SPTableColumnWidths; +extern NSString *SPProcessListShowProcessID; +extern NSString *SPProcessListShowFullProcessList; // Hidden Prefs extern NSString *SPPrintWarningRowLimit; diff --git a/Source/SPConstants.m b/Source/SPConstants.m index 35b0a173..f0df9dac 100644 --- a/Source/SPConstants.m +++ b/Source/SPConstants.m @@ -128,6 +128,8 @@ NSString *SPConsoleShowConnections = @"ConsoleShowConnections"; NSString *SPEditInSheetEnabled = @"EditInSheetEnabled"; NSString *SPTableInformationPanelCollapsed = @"TableInformationPanelCollapsed"; NSString *SPTableColumnWidths = @"tableColumnWidths"; +NSString *SPProcessListShowProcessID = @"ProcessListShowProcessID"; +NSString *SPProcessListShowFullProcessList = @"ProcessListShowFullProcessList"; // Hidden Prefs NSString *SPPrintWarningRowLimit = @"PrintWarningRowLimit"; diff --git a/Source/SPProcessListController.h b/Source/SPProcessListController.h index 3e93f117..7832ec65 100644 --- a/Source/SPProcessListController.h +++ b/Source/SPProcessListController.h @@ -31,13 +31,15 @@ { MCPConnection *connection; + BOOL showFullProcessList; + + NSUserDefaults *prefs; NSMutableArray *processes, *processesFiltered; IBOutlet NSTableView *processListTableView; IBOutlet NSTextField *processesCountTextField; IBOutlet NSSearchField *filterProcessesSearchField; IBOutlet NSProgressIndicator *refreshProgressIndicator; - IBOutlet NSButton *closeProcessListButton; IBOutlet NSButton *saveProcessesButton; IBOutlet NSButton *refreshProcessesButton; } @@ -45,12 +47,13 @@ @property (readwrite, assign) MCPConnection *connection; - (IBAction)copy:(id)sender; -- (IBAction)closeSheet:(id)sender; - (IBAction)refreshProcessList:(id)sender; - (IBAction)saveServerProcesses:(id)sender; - (IBAction)killProcessQuery:(id)sender; - (IBAction)killProcessConnection:(id)sender; +- (IBAction)toggleShowProcessID:(id)sender; +- (IBAction)toggeleShowFullProcessList:(id)sender; -- (void)displayProcessListSheetAttachedToWindow:(NSWindow *)window; +- (void)displayProcessListWindow; @end diff --git a/Source/SPProcessListController.m b/Source/SPProcessListController.m index d655e776..81d66f0e 100644 --- a/Source/SPProcessListController.m +++ b/Source/SPProcessListController.m @@ -31,6 +31,8 @@ #import "SPConstants.h" #import "SPAlertSheets.h" +#define TABLEVIEW_ID_COLUMN_IDENTIFIER @"Id" + @interface SPProcessListController (PrivateAPI) - (void)_getDatabaseProcessList; @@ -51,6 +53,11 @@ { if ((self = [super initWithWindowNibName:@"DatabaseProcessList"])) { processes = [[NSMutableArray alloc] init]; + + prefs = [NSUserDefaults standardUserDefaults]; + + // Default the process list comment to SHOW FULL PROCESSLIST + showFullProcessList = [prefs boolForKey:SPProcessListShowFullProcessList]; } return self; @@ -60,8 +67,13 @@ * Interface initialisation */ - (void)awakeFromNib -{ - NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults]; +{ + [[self window] setTitle:[NSString stringWithFormat:@"%@ %@", [[[NSDocumentController sharedDocumentController] currentDocument] name], NSLocalizedString(@"Server Processes", @"server processes window title")]]; + + [self setWindowFrameAutosaveName:@"ProcessList"]; + + // Show/hide table columns + [[processListTableView tableColumnWithIdentifier:TABLEVIEW_ID_COLUMN_IDENTIFIER] setHidden:![prefs boolForKey:SPProcessListShowProcessID]]; // Set the process table view's vertical gridlines if required [processListTableView setGridStyleMask:([prefs boolForKey:SPDisplayTableViewVerticalGridlines]) ? NSTableViewSolidVerticalGridLineMask : NSTableViewGridNone]; @@ -128,15 +140,14 @@ /** * Close the process list sheet. */ -- (IBAction)closeSheet:(id)sender +- (void)close { - [NSApp endSheet:[self window] returnCode:[sender tag]]; - [[self window] orderOut:self]; - // If the filtered array is allocated and it's not a reference to the processes array get rid of it if ((processesFiltered) && (processesFiltered != processes)) { [processesFiltered release], processesFiltered = nil; - } + } + + [super close]; } /** @@ -150,7 +161,6 @@ // Disable controls [refreshProcessesButton setEnabled:NO]; - [closeProcessListButton setEnabled:NO]; [saveProcessesButton setEnabled:NO]; [filterProcessesSearchField setEnabled:NO]; @@ -166,7 +176,6 @@ // Enable controls [filterProcessesSearchField setEnabled:YES]; [saveProcessesButton setEnabled:YES]; - [closeProcessListButton setEnabled:YES]; [refreshProcessesButton setEnabled:YES]; // Stop progress Indicator @@ -244,13 +253,31 @@ [alert beginSheetModalForWindow:[self window] modalDelegate:self didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:) contextInfo:SPKillProcessConnectionMode]; } +/** + * + */ +- (IBAction)toggleShowProcessID:(id)sender +{ + [[processListTableView tableColumnWithIdentifier:TABLEVIEW_ID_COLUMN_IDENTIFIER] setHidden:([sender state])]; +} + +/** + * + */ +- (IBAction)toggeleShowFullProcessList:(id)sender +{ + showFullProcessList = (!showFullProcessList); + + [self refreshProcessList:self]; +} + #pragma mark - #pragma mark Other methods /** * Displays the process list sheet attached to the supplied window. */ -- (void)displayProcessListSheetAttachedToWindow:(NSWindow *)window +- (void)displayProcessListWindow { // Weak reference processesFiltered = processes; @@ -266,8 +293,7 @@ [self _updateServerProcessesFilterForFilterString:[filterProcessesSearchField stringValue]]; } - // Open the sheet - [NSApp beginSheet:[self window] modalForWindow:window modalDelegate:self didEndSelector:nil contextInfo:nil]; + [self showWindow:self]; } /** @@ -275,7 +301,6 @@ */ - (void)sheetDidEnd:(id)sheet returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo { - // Order out current sheet to suppress overlapping of sheets if ([sheet respondsToSelector:@selector(orderOut:)]) [sheet orderOut:nil]; @@ -343,6 +368,14 @@ } /** + * NSWindow autosave name + */ +- (NSString *)windowFrameAutosaveName +{ + return @"ProcessList"; +} + +/** * This method is called as part of Key Value Observing which is used to watch for prefernce changes which effect the interface. */ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context @@ -383,7 +416,7 @@ { id object = [[processesFiltered objectAtIndex:row] valueForKey:[tableColumn identifier]]; - return (![object isNSNull]) ? object : @"NULL"; + return (![object isNSNull]) ? object : [prefs stringForKey:SPNullValue]; } #pragma mark - @@ -408,7 +441,7 @@ */ - (void)dealloc { - [[NSUserDefaults standardUserDefaults] removeObserver:self forKeyPath:SPUseMonospacedFonts]; + [prefs removeObserver:self forKeyPath:SPUseMonospacedFonts]; [processes release], processes = nil; @@ -427,7 +460,8 @@ NSUInteger i = 0; // Get processes - MCPResult *processList = [connection queryString:@"SHOW PROCESSLIST"]; + MCPResult *processList = [connection queryString:(showFullProcessList) ? @"SHOW FULL PROCESSLIST" : @"SHOW PROCESSLIST"]; + [processList setReturnDataAsStrings:YES]; if ([processList numOfRows]) [processList dataSeek:0]; @@ -524,7 +558,7 @@ [processListTableView reloadData]; - [processesCountTextField setStringValue:[NSString stringWithFormat:NSLocalizedString(@"%lu of %lu", "filtered item count"), (unsigned long)[processesFiltered count], (unsigned long)[processes count]]]; + [processesCountTextField setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Showing %lu of %lu processes", "filtered item count"), (unsigned long)[processesFiltered count], (unsigned long)[processes count]]]; [processesCountTextField setHidden:NO]; if ([processesFiltered count] == 0) return; diff --git a/Source/TableDocument.m b/Source/TableDocument.m index e764a44f..163f6d8b 100644 --- a/Source/TableDocument.m +++ b/Source/TableDocument.m @@ -976,7 +976,7 @@ [prefs addObserver:processListController forKeyPath:SPDisplayTableViewVerticalGridlines options:NSKeyValueObservingOptionNew context:NULL]; } - [processListController displayProcessListSheetAttachedToWindow:tableWindow]; + [processListController displayProcessListWindow]; } /** |