From 452e5fb8e8fd1f22be98b26ece0010af09fb3d7d Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Sat, 24 Apr 2010 17:10:55 +0000 Subject: Bunch of improvements to the serve processes panel, including: - MCPKit's listProcesses (mysql_list_processes) method is now used, instead of running the query ourselves. - The ability to set whether or not the list is auto refreshed. - The ability to set the autorefresh interval, either via the presets or by entering a custom value (the interface for this might need updating). - Get the process list is now performed on a background thread. This completes the implementation of issue #607. --- Interfaces/English.lproj/DatabaseProcessList.xib | 840 +++++++++++++++++++++-- 1 file changed, 793 insertions(+), 47 deletions(-) (limited to 'Interfaces') diff --git a/Interfaces/English.lproj/DatabaseProcessList.xib b/Interfaces/English.lproj/DatabaseProcessList.xib index 74bb98b4..d4129c44 100644 --- a/Interfaces/English.lproj/DatabaseProcessList.xib +++ b/Interfaces/English.lproj/DatabaseProcessList.xib @@ -2,17 +2,18 @@ 1050 - 10C540 - 740 - 1038.25 - 458.00 + 10D573 + 762 + 1038.29 + 460.00 com.apple.InterfaceBuilder.CocoaPlugin - 740 + 762 YES - + + YES @@ -356,6 +357,7 @@ {{1, 17}, {575, 130}} + 4 @@ -389,6 +391,7 @@ {{1, 0}, {575, 17}} + 4 @@ -397,6 +400,7 @@ {{-1, 22}, {577, 148}} + 530 @@ -420,7 +424,7 @@ YES 1 - + 6 System textBackgroundColor @@ -475,9 +479,9 @@ - -2147482356 + -2147482359 - {{559, 178}, {16, 16}} + {{548, 178}, {16, 16}} 20746 100 @@ -616,20 +620,113 @@ _popUpItemAction: - + - Show FULL Process List + YES + YES + 2147483647 - 1 _popUpItemAction: + + + Auto Refresh Interval + + 2147483647 + + + submenuAction: + + Auto Refresh Interval + + YES + + + 2 Seconds + + 2147483647 + + + _popUpItemAction: + 2 + + + + + 5 Seconds + + 2147483647 + + + _popUpItemAction: + 5 + + + + + 10 Seconds + + 2147483647 + + + _popUpItemAction: + 10 + + + + + 30 Seconds + + 2147483647 + + + _popUpItemAction: + 30 + + + + + 60 Seconds + + 2147483647 + + + _popUpItemAction: + 60 + + + + + YES + YES + + + 2147483647 + + + _popUpItemAction: + + + + + Custom... + + 2147483647 + + + _popUpItemAction: + + + + + - 2 + 3 YES 1 YES @@ -639,16 +736,16 @@ -2147483358 - {{67, 4}, {374, 14}} + {{159, 4}, {282, 14}} YES 68288064 - 272761856 + 71435264 0 of 0 - + 6 System controlColor @@ -657,6 +754,33 @@ + + + 288 + {{67, 2}, {89, 18}} + + YES + + 67239424 + 131072 + Auto refresh + + + 1211912703 + 2 + + NSImage + NSSwitch + + + NSSwitch + + + + 200 + 25 + + {575, 203} @@ -706,13 +830,203 @@ - - YES - ProcessListShowProcessID - ProcessListShowFullProcessList - YES + + 1 + 2 + {{343, 502}, {189, 93}} + 1886912512 + Custom Interval + NSWindow + + View + + {292, 112} + {189, 93} + + + 256 + + YES + + + 256 + {{17, 56}, {48, 14}} + + YES + + 68288064 + 71304192 + Interval: + + + + + + + + + 256 + {{124, 56}, {48, 14}} + + YES + + 68288064 + 4195328 + seconds + + + + + + + + + 259 + {{94, 13}, {70, 28}} + + 1 + YES + + 67239424 + 138018816 + OK + + + 1 + -2038284033 + 1 + + Helvetica + 11 + 16 + + + DQ + 200 + 25 + + + + + 259 + {{26, 13}, {70, 28}} + + YES + + 67239424 + 138018816 + Cancel + + + -2038284033 + 1 + + + Gw + 200 + 25 + + + + + 268 + {{70, 52}, {49, 22}} + + YES + + -1804468671 + 272630784 + + + + YES + + YES + allowsFloats + formatterBehavior + lenient + locale + minimum + negativeInfinitySymbol + nilSymbol + numberStyle + positiveInfinitySymbol + + + YES + + + + + + + + -∞ + + + +∞ + + + #,##0.### + #,##0.### + + + + + + + + NaN + + YES + + + YES + + + + + + 0 + 0 + YES + NO + 1 + AAAAAAAAAAAAAAAAAAAAAA + + + 3 + YES + YES + YES + + . + , + YES + NO + YES + + + YES + + + 6 + System + textColor + + + + + + {189, 93} + + + {{0, 0}, {1680, 1028}} + {189, 115} + {292, 134} + @@ -883,31 +1197,147 @@ - toggeleShowFullProcessList: + toggleProcessListAutoRefresh: + + + + 107 + + + + autoRefreshButton - + - 101 + 108 - value: values.ProcessListShowFullProcessList - + value: values.ProcessListEnableAutoRefresh + - + - value: values.ProcessListShowFullProcessList + value: values.ProcessListEnableAutoRefresh value - values.ProcessListShowFullProcessList - - NSConditionallySetsEnabled - - + values.ProcessListEnableAutoRefresh 2 - 104 + 110 + + + + delegate + + + + 111 + + + + setAutoRefreshInterval: + + + + 123 + + + + setAutoRefreshInterval: + + + + 124 + + + + setCustomAutoRefreshInterval: + + + + 128 + + + + setAutoRefreshInterval: + + + + 129 + + + + setAutoRefreshInterval: + + + + 130 + + + + setAutoRefreshInterval: + + + + 131 + + + + autoRefreshIntervalMenuItem + + + + 132 + + + + customIntervalWindow + + + + 179 + + + + customIntervalButton + + + + 180 + + + + delegate + + + + 182 + + + + customIntervalTextField + + + + 183 + + + + closeSheet: + + + + 184 + + + + closeSheet: + + + + 185 @@ -960,6 +1390,7 @@ + @@ -1211,17 +1642,13 @@ YES - + + - - 79 - - - 82 @@ -1275,6 +1702,186 @@ + + 105 + + + YES + + + + + + 106 + + + + + 112 + + + + + 113 + + + YES + + + + + + 114 + + + YES + + + + + + + + + + + + 115 + + + + + 116 + + + + + 117 + + + + + 118 + + + + + 119 + + + + + 120 + + + + + 121 + + + + + 133 + + + YES + + + + Custom Interval + + + 134 + + + YES + + + + + + + + + + 135 + + + YES + + + + + + 138 + + + YES + + + + + + 140 + + + YES + + + + + + 141 + + + + + 143 + + + + + 172 + + + + + 173 + + + YES + + + + + + 174 + + + + + 176 + + + YES + + + + + + 177 + + + YES + + + + + + 178 + + + @@ -1282,14 +1889,55 @@ YES -3.IBPluginDependency + 105.IBPluginDependency + 106.IBPluginDependency + 112.IBPluginDependency + 113.IBPluginDependency + 114.IBEditorWindowLastContentRect + 114.IBPluginDependency + 115.IBPluginDependency + 116.IBPluginDependency + 117.IBPluginDependency + 118.IBPluginDependency + 119.IBPluginDependency + 120.IBPluginDependency + 121.IBPluginDependency + 133.IBEditorWindowLastContentRect + 133.IBPluginDependency + 133.IBWindowTemplateEditedContentRect + 133.ImportedFromIB2 + 133.windowTemplate.hasMaxSize + 133.windowTemplate.hasMinSize + 133.windowTemplate.maxSize + 133.windowTemplate.minSize + 134.IBPluginDependency + 134.ImportedFromIB2 + 135.IBPluginDependency + 135.ImportedFromIB2 + 138.IBPluginDependency + 138.ImportedFromIB2 14.IBPluginDependency 14.IBShouldRemoveOnLegacySave + 140.IBPluginDependency + 140.ImportedFromIB2 + 141.IBPluginDependency + 143.IBPluginDependency 15.IBPluginDependency 15.IBShouldRemoveOnLegacySave 16.IBPluginDependency 16.IBShouldRemoveOnLegacySave 17.IBPluginDependency 17.ImportedFromIB2 + 172.IBPluginDependency + 173.IBPluginDependency + 173.ImportedFromIB2 + 174.IBPluginDependency + 176.IBAttributePlaceholdersKey + 176.IBPluginDependency + 177.IBPluginDependency + 178.IBNumberFormatterBehaviorMetadataKey + 178.IBNumberFormatterLocalizesFormatMetadataKey + 178.IBPluginDependency 18.IBPluginDependency 18.ImportedFromIB2 19.IBPluginDependency @@ -1332,27 +1980,48 @@ 69.IBPluginDependency 7.IBPluginDependency 7.ImportedFromIB2 + 74.IBPluginDependency 75.IBAttributePlaceholdersKey 75.IBPluginDependency 76.IBPluginDependency 77.IBPluginDependency 78.IBEditorWindowLastContentRect 78.IBPluginDependency - 79.IBPluginDependency 82.IBPluginDependency 84.IBAttributePlaceholdersKey 84.IBPluginDependency 85.IBPluginDependency + 86.IBPluginDependency 87.IBPluginDependency 88.IBPluginDependency 93.IBPluginDependency 94.IBPluginDependency + 96.IBPluginDependency YES com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{603, 414}, {130, 133}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{580, 299}, {189, 93}} + com.apple.InterfaceBuilder.CocoaPlugin + {{580, 299}, {189, 93}} + + + {292, 112} + {189, 93} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1364,15 +2033,44 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{541, 371}, {575, 203}} + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Custom refresh interval. Must be greater than 0. + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{541, 371}, {575, 203}} + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{406, 682}, {575, 203}} + com.apple.InterfaceBuilder.CocoaPlugin + {{406, 682}, {575, 203}} {{321, 508}, {411, 341}} @@ -1401,6 +2099,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -1412,8 +2111,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{458, 293}, {223, 68}} - com.apple.InterfaceBuilder.CocoaPlugin + {{385, 524}, {218, 183}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1430,6 +2128,8 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -1448,7 +2148,7 @@ - 104 + 185 @@ -1534,12 +2234,15 @@ YES YES + closeSheet: copy: killProcessConnection: killProcessQuery: refreshProcessList: saveServerProcesses: - toggeleShowFullProcessList: + setAutoRefreshInterval: + setCustomAutoRefreshInterval: + toggleProcessListAutoRefresh: toggleShowProcessID: @@ -1551,12 +2254,20 @@ id id id + id + id + id YES YES + autoRefreshButton + autoRefreshIntervalMenuItem + customIntervalButton + customIntervalTextField + customIntervalWindow filterProcessesSearchField processListTableView processesCountTextField @@ -1566,6 +2277,11 @@ YES + NSButton + NSMenuItem + NSButton + NSTextField + NSWindow NSSearchField NSTableView NSTextField @@ -1728,6 +2444,14 @@ AppKit.framework/Headers/NSMenuItemCell.h + + NSNumberFormatter + NSFormatter + + IBFrameworkSource + Foundation.framework/Headers/NSNumberFormatter.h + + NSObject @@ -2253,6 +2977,7 @@ 0 + IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx @@ -2264,5 +2989,26 @@ YES ../../sequel-pro.xcodeproj 3 + + YES + + YES + NSMenuCheckmark + NSMenuMixedState + NSSwitch + button_action + button_bar_spacer + button_refresh + + + YES + {9, 8} + {7, 2} + {15, 15} + {32, 23} + {10, 23} + {32, 23} + + -- cgit v1.2.3