aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Interfaces/English.lproj/DatabaseProcessList.xib90
-rw-r--r--Resources/Plists/PreferenceDefaults.plist4
-rw-r--r--Source/SPConstants.h1
-rw-r--r--Source/SPConstants.m1
-rw-r--r--Source/SPProcessListController.h1
-rw-r--r--Source/SPProcessListController.m16
6 files changed, 95 insertions, 18 deletions
diff --git a/Interfaces/English.lproj/DatabaseProcessList.xib b/Interfaces/English.lproj/DatabaseProcessList.xib
index 95a80875..fd761e49 100644
--- a/Interfaces/English.lproj/DatabaseProcessList.xib
+++ b/Interfaces/English.lproj/DatabaseProcessList.xib
@@ -2,17 +2,17 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10J567</string>
- <string key="IBDocument.InterfaceBuilderVersion">804</string>
+ <string key="IBDocument.SystemVersion">10J869</string>
+ <string key="IBDocument.InterfaceBuilderVersion">851</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">462.00</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">804</string>
+ <string key="NS.object.0">851</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="17"/>
+ <integer value="78"/>
<integer value="134"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
@@ -44,7 +44,7 @@
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
- <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMinSize">{640, 200}</string>
<object class="NSView" key="NSWindowView" id="1010674838">
<reference key="NSNextResponder"/>
@@ -197,7 +197,7 @@
<string key="NSColorName">controlBackgroundColor</string>
<object class="NSColor" key="NSColor" id="466472473">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+ <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
</object>
</object>
<reference key="NSTextColor" ref="37591332"/>
@@ -655,6 +655,16 @@
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="627053027"/>
</object>
+ <object class="NSMenuItem" id="998945078">
+ <reference key="NSMenu" ref="985642956"/>
+ <string key="NSTitle">Show FULL Process List</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="895795572"/>
+ <reference key="NSMixedImage" ref="112300578"/>
+ <string key="NSAction">_popUpItemAction:</string>
+ <reference key="NSTarget" ref="627053027"/>
+ </object>
<object class="NSMenuItem" id="987382219">
<reference key="NSMenu" ref="985642956"/>
<bool key="NSIsDisabled">YES</bool>
@@ -761,7 +771,7 @@
</object>
</object>
</object>
- <int key="NSSelectedIndex">1</int>
+ <int key="NSSelectedIndex">2</int>
<bool key="NSPullDown">YES</bool>
<int key="NSPreferredEdge">1</int>
<bool key="NSUsesItemFromMenu">YES</bool>
@@ -822,7 +832,7 @@
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSMinSize">{640, 222}</string>
- <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
</object>
<object class="NSMenu" id="328428957">
<string key="NSTitle"/>
@@ -865,6 +875,10 @@
</object>
</object>
<object class="NSUserDefaultsController" id="280475776">
+ <object class="NSMutableArray" key="NSDeclaredKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>ProcessListShowFullProcessList</string>
+ </object>
<bool key="NSSharedInstance">YES</bool>
</object>
<object class="NSWindowTemplate" id="237958724">
@@ -1376,6 +1390,30 @@
</object>
<int key="connectionID">185</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">toggeleShowFullProcessList:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="998945078"/>
+ </object>
+ <int key="connectionID">187</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: values.ProcessListShowFullProcessList</string>
+ <reference key="source" ref="998945078"/>
+ <reference key="destination" ref="280475776"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="998945078"/>
+ <reference key="NSDestination" ref="280475776"/>
+ <string key="NSLabel">value: values.ProcessListShowFullProcessList</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">values.ProcessListShowFullProcessList</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">188</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -1683,6 +1721,7 @@
<reference ref="197497844"/>
<reference ref="987382219"/>
<reference ref="437163950"/>
+ <reference ref="998945078"/>
</object>
<reference key="parent" ref="627053027"/>
</object>
@@ -1919,6 +1958,11 @@
<reference key="object" ref="59013685"/>
<reference key="parent" ref="437242737"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">186</int>
+ <reference key="object" ref="998945078"/>
+ <reference key="parent" ref="985642956"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1982,6 +2026,7 @@
<string>178.IBPluginDependency</string>
<string>18.IBPluginDependency</string>
<string>18.ImportedFromIB2</string>
+ <string>186.IBPluginDependency</string>
<string>19.IBPluginDependency</string>
<string>19.ImportedFromIB2</string>
<string>20.IBPluginDependency</string>
@@ -2064,9 +2109,9 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{852, 726}, {229, 93}}</string>
+ <string>{{470, 726}, {229, 93}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{852, 726}, {229, 93}}</string>
+ <string>{{470, 726}, {229, 93}}</string>
<integer value="1"/>
<integer value="1"/>
<boolean value="YES"/>
@@ -2122,6 +2167,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
@@ -2130,9 +2176,9 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{394, 380}, {640, 203}}</string>
+ <string>{{626, 333}, {640, 203}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{394, 380}, {640, 203}}</string>
+ <string>{{626, 333}, {640, 203}}</string>
<integer value="1"/>
<string>{{321, 508}, {411, 341}}</string>
<integer value="0"/>
@@ -2173,7 +2219,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{365, 386}, {209, 78}}</string>
+ <string>{{605, 260}, {223, 98}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary">
@@ -2210,7 +2256,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">185</int>
+ <int key="maxID">188</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2254,6 +2300,13 @@
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/PSMTabBar/PSMTabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
<string key="minorKey">Source/SPConnectionController.h</string>
</object>
</object>
@@ -2332,6 +2385,7 @@
<string>saveServerProcesses:</string>
<string>setAutoRefreshInterval:</string>
<string>setCustomAutoRefreshInterval:</string>
+ <string>toggeleShowFullProcessList:</string>
<string>toggleProcessListAutoRefresh:</string>
<string>toggleShowProcessID:</string>
</object>
@@ -2347,6 +2401,7 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
@@ -2361,6 +2416,7 @@
<string>saveServerProcesses:</string>
<string>setAutoRefreshInterval:</string>
<string>setCustomAutoRefreshInterval:</string>
+ <string>toggeleShowFullProcessList:</string>
<string>toggleProcessListAutoRefresh:</string>
<string>toggleShowProcessID:</string>
</object>
@@ -2399,6 +2455,10 @@
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
+ <string key="name">toggeleShowFullProcessList:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
<string key="name">toggleProcessListAutoRefresh:</string>
<string key="candidateClassName">id</string>
</object>
diff --git a/Resources/Plists/PreferenceDefaults.plist b/Resources/Plists/PreferenceDefaults.plist
index 0c34ab58..07eb71ae 100644
--- a/Resources/Plists/PreferenceDefaults.plist
+++ b/Resources/Plists/PreferenceDefaults.plist
@@ -161,6 +161,8 @@
<integer>1000</integer>
<key>ProcessListShowProcessID</key>
<true/>
+ <key>ProcessListShowFullProcessList</key>
+ <false/>
<key>ProcessListEnableAutoRefresh</key>
<false/>
<key>ProcessListAutoRrefreshInterval</key>
@@ -172,7 +174,7 @@
<key>ResetAutoIncrementAfterDeletionOfAllRows</key>
<true/>
<key>FilterTableDefaultOperator</key>
- <string>LIKE '%@%'</string>
+ <string>LIKE &apos;%@%&apos;</string>
<key>WebKitDeveloperExtras</key>
<true/>
<key>deletedDefaultBundles</key>
diff --git a/Source/SPConstants.h b/Source/SPConstants.h
index df66951a..ef1fc0c4 100644
--- a/Source/SPConstants.h
+++ b/Source/SPConstants.h
@@ -349,6 +349,7 @@ extern NSString *SPTableInformationPanelCollapsed;
extern NSString *SPTableColumnWidths;
extern NSString *SPProcessListTableColumnWidths;
extern NSString *SPProcessListShowProcessID;
+extern NSString *SPProcessListShowFullProcessList;
extern NSString *SPProcessListEnableAutoRefresh;
extern NSString *SPProcessListAutoRrefreshInterval;
extern NSString *SPFavoritesSortedBy;
diff --git a/Source/SPConstants.m b/Source/SPConstants.m
index abb27c1c..ef263d98 100644
--- a/Source/SPConstants.m
+++ b/Source/SPConstants.m
@@ -155,6 +155,7 @@ NSString *SPTableInformationPanelCollapsed = @"TableInformationPanelCollap
NSString *SPTableColumnWidths = @"tableColumnWidths";
NSString *SPProcessListTableColumnWidths = @"ProcessListTableColumnWidths";
NSString *SPProcessListShowProcessID = @"ProcessListShowProcessID";
+NSString *SPProcessListShowFullProcessList = @"ProcessListShowFullProcessList";
NSString *SPProcessListEnableAutoRefresh = @"ProcessListEnableAutoRefresh";
NSString *SPProcessListAutoRrefreshInterval = @"ProcessListAutoRrefreshInterval";
NSString *SPFavoritesSortedBy = @"FavoritesSortedBy";
diff --git a/Source/SPProcessListController.h b/Source/SPProcessListController.h
index 3fc66c78..df5f48a6 100644
--- a/Source/SPProcessListController.h
+++ b/Source/SPProcessListController.h
@@ -58,6 +58,7 @@
- (IBAction)killProcessQuery:(id)sender;
- (IBAction)killProcessConnection:(id)sender;
- (IBAction)toggleShowProcessID:(id)sender;
+- (IBAction)toggeleShowFullProcessList:(id)sender;
- (IBAction)toggleProcessListAutoRefresh:(id)sender;
- (IBAction)setAutoRefreshInterval:(id)sender;
- (IBAction)setCustomAutoRefreshInterval:(id)sender;
diff --git a/Source/SPProcessListController.m b/Source/SPProcessListController.m
index 8062fd93..4caa6a59 100644
--- a/Source/SPProcessListController.m
+++ b/Source/SPProcessListController.m
@@ -62,6 +62,8 @@ static const NSString *SPTableViewIDColumnIdentifier = @"Id";
autoRefreshTimer = nil;
processListThreadRunning = NO;
+ showFullProcessList = [prefs boolForKey:SPProcessListShowFullProcessList];
+
processes = [[NSMutableArray alloc] init];
prefs = [NSUserDefaults standardUserDefaults];
@@ -288,6 +290,16 @@ static const NSString *SPTableViewIDColumnIdentifier = @"Id";
}
/**
+ * Toggles the display of the FULL process list.
+ */
+- (IBAction)toggeleShowFullProcessList:(id)sender
+{
+ showFullProcessList = (!showFullProcessList);
+
+ [self refreshProcessList:self];
+}
+
+/**
* Toggles whether or not auto refresh is enabled.
*/
- (IBAction)toggleProcessListAutoRefresh:(id)sender
@@ -309,7 +321,7 @@ static const NSString *SPTableViewIDColumnIdentifier = @"Id";
}
/**
- *
+ * Displays the set custom auto-refresh interval sheet.
*/
- (IBAction)setCustomAutoRefreshInterval:(id)sender
{
@@ -675,7 +687,7 @@ static const NSString *SPTableViewIDColumnIdentifier = @"Id";
// Get processes
if ([connection isConnected]) {
- MCPResult *processList = [connection listProcesses];
+ MCPResult *processList = (showFullProcessList) ? [connection queryString:@"SHOW FULL PROCESSLIST"] : [connection listProcesses];
[processList setReturnDataAsStrings:YES];
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 06:38:45 +0000