From a5af1bc73e296ff0b545310782a446259d896389 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Thu, 12 Nov 2009 23:44:09 +0000 Subject: - New server processes panel, accessible via the 'Database' menu and alt+cmd+P. Includes the ability to kill queries and connections as well as live filtering support and the ability to save all processes or the current filtered set to a file. Implements issue #458. - Reorganise 'Database' menu. - Give 'Flush Privileges' key equivalent of shift+cmd+F. --- Interfaces/English.lproj/MainMenu.xib | 317 ++++++++++++++++++++++++++++------ 1 file changed, 262 insertions(+), 55 deletions(-) (limited to 'Interfaces/English.lproj/MainMenu.xib') diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib index 07fde2c0..177b13d6 100644 --- a/Interfaces/English.lproj/MainMenu.xib +++ b/Interfaces/English.lproj/MainMenu.xib @@ -2,17 +2,17 @@ 1050 - 10B504 + 10C540 740 - 1038.2 - 437.00 + 1038.25 + 458.00 com.apple.InterfaceBuilder.CocoaPlugin 740 YES - + YES @@ -71,6 +71,14 @@ + + + Check for Updates... + + 2147483647 + + + YES @@ -102,10 +110,11 @@ - + - Check for Updates... + Visit Website... + 1048576 2147483647 @@ -119,15 +128,6 @@ - - - Visit Website... - - 1048576 - 2147483647 - - - YES @@ -1227,8 +1227,8 @@ Add Database... - - 1048576 + A + 524288 2147483647 @@ -1253,6 +1253,15 @@ + + + Flush Privileges + F + 1048576 + 2147483647 + + + Refresh Databases @@ -1275,7 +1284,7 @@ - User Accounts + User Accounts... u 1048576 2147483647 @@ -1552,7 +1561,7 @@ - + YES YES @@ -1562,19 +1571,20 @@ - + - Flush Privileges - + Show Server Variables... + V + 1048576 2147483647 - + - Show Server Variables... - V - 1048576 + Show Server Processes... + p + 1572864 2147483647 @@ -2827,6 +2837,14 @@ 1030 + + + showDatabaseProcessList: + + + + 1032 + @@ -3309,10 +3327,11 @@ - - + + + @@ -4128,11 +4147,6 @@ - - 995 - - - 996 @@ -4186,6 +4200,16 @@ + + 1031 + + + + + 1033 + + + @@ -4204,6 +4228,8 @@ 1029.IBPluginDependency 103.IBPluginDependency 103.ImportedFromIB2 + 1031.IBPluginDependency + 1033.IBPluginDependency 106.IBEditorWindowLastContentRect 106.IBPluginDependency 106.ImportedFromIB2 @@ -4545,7 +4571,6 @@ 990.IBPluginDependency 991.IBPluginDependency 992.IBPluginDependency - 995.IBPluginDependency 996.IBPluginDependency 998.IBPluginDependency @@ -4563,7 +4588,9 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{796, 736}, {190, 123}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{733, 644}, {190, 123}} com.apple.InterfaceBuilder.CocoaPlugin {{561, 605}, {181, 43}} @@ -4614,7 +4641,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{503, 227}, {280, 283}} + {{256, 236}, {280, 283}} com.apple.InterfaceBuilder.CocoaPlugin {{654, 613}, {157, 223}} @@ -4642,11 +4669,11 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{1019, 437}, {194, 73}} + {{662, 694}, {194, 73}} com.apple.InterfaceBuilder.CocoaPlugin {{449, 1007}, {197, 53}} - {{346, 859}, {511, 20}} + {{108, 519}, {511, 20}} com.apple.InterfaceBuilder.CocoaPlugin {{506, 836}, {511, 20}} @@ -4699,7 +4726,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{547, 257}, {237, 253}} + {{300, 266}, {237, 253}} com.apple.InterfaceBuilder.CocoaPlugin {{698, 703}, {184, 133}} @@ -4717,7 +4744,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{367, 257}, {215, 253}} + {{120, 266}, {215, 253}} com.apple.InterfaceBuilder.CocoaPlugin {{518, 583}, {218, 253}} @@ -4725,7 +4752,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{597, 327}, {251, 183}} + {{525, 564}, {255, 203}} com.apple.InterfaceBuilder.CocoaPlugin {{312, 683}, {231, 153}} @@ -4794,7 +4821,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{678, 327}, {265, 183}} + {{606, 584}, {265, 183}} com.apple.InterfaceBuilder.CocoaPlugin {{829, 663}, {268, 173}} com.apple.InterfaceBuilder.CocoaPlugin @@ -4822,7 +4849,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{461, 177}, {235, 333}} + {{214, 186}, {235, 333}} com.apple.InterfaceBuilder.CocoaPlugin {{180, 535}, {182, 253}} @@ -4955,7 +4982,6 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin @@ -4974,7 +5000,7 @@ - 1030 + 1034 @@ -5077,6 +5103,13 @@ + + NSDictionary + + IBProjectSource + Source/NSDictionary_DeepMutableCopy.h + + NSMenu NSObject @@ -5261,6 +5294,7 @@ connectionSplitView connectionSplitViewButtonBar connectionView + delegate errorDetailText errorDetailWindow favoritesTable @@ -5285,6 +5319,7 @@ NSSplitView BWAnchoredButtonBar NSView + id NSTextView NSWindow NSTableView @@ -5304,6 +5339,56 @@ + + SPProcessListController + NSWindowController + + YES + + YES + closeSheet: + copy: + killProcessConnection: + killProcessQuery: + refreshProcessList: + + + YES + id + id + id + id + id + + + + YES + + YES + closeProcessListButton + filterProcessesSearchField + processListTableView + processesCountTextField + refreshProcessesButton + refreshProgressIndicator + saveProcessesButton + + + YES + NSButton + NSSearchField + NSTableView + NSTextField + NSButton + NSProgressIndicator + NSButton + + + + IBProjectSource + Source/SPProcessListController.h + + SPQueryController NSWindowController @@ -5372,6 +5457,56 @@ Source/SPTableView.h + + SPUserManager + NSWindowController + + YES + + YES + addHost: + addUser: + checkAllPrivileges: + doApply: + doCancel: + removeHost: + removeUser: + uncheckAllPrivileges: + + + YES + id + id + id + id + id + id + id + id + + + + YES + + YES + outlineView + privsSupportedByServer + tabView + treeController + + + YES + NSOutlineView + NSMutableDictionary + NSTabView + NSTreeController + + + + IBProjectSource + Source/SPUserManager.h + + TableDocument NSDocument @@ -5387,7 +5522,6 @@ checksumTable: chooseDatabase: chooseEncoding: - closeDatabaseSheet: closeErrorConnectionSheet: closePanelSheet: closePasswordSheet: @@ -5412,6 +5546,7 @@ saveServerVariables: setDatabases: showCreateTableSyntax: + showDatabaseProcessList: showMySQLHelp: showUserManager: showVariables: @@ -5519,9 +5654,14 @@ tableTabView tableWindow tablesListInstance + taskCancelButton + taskDescriptionText + taskProgressIndicator + taskProgressLayer titleAccessoryView titleImageView titleStringView + userManagerInstance variablesCountTextField variablesSearchField variablesSheet @@ -5576,9 +5716,14 @@ NSTabView id id + NSButton + id + id + NSBox id id id + SPUserManager NSTextField NSSearchField id @@ -5659,6 +5804,14 @@ AppKit.framework/Headers/NSUserInterfaceItemSearching.h + + NSBox + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSBox.h + + NSBrowser NSControl @@ -5683,6 +5836,36 @@ AppKit.framework/Headers/NSControl.h + + NSController + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSController.h + + + + NSDictionary + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSDictionary.h + + + + NSDictionary + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSDictionary + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + NSDocument NSObject @@ -5784,6 +5967,15 @@ AppKit.framework/Headers/NSMovieView.h + + NSMutableDictionary + NSDictionary + + + + NSMutableDictionary + + NSObject @@ -5855,7 +6047,7 @@ NSObject - + IBFrameworkSource AppKit.framework/Headers/NSOutlineView.h @@ -5918,17 +6110,11 @@ NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - + NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - + NSObject @@ -6119,6 +6305,19 @@ WebKit.framework/Headers/WebUIDelegate.h + + NSObjectController + NSController + + IBFrameworkSource + AppKit.framework/Headers/NSObjectController.h + + + + NSOutlineView + NSTableView + + NSPopUpButton NSButton @@ -6211,6 +6410,14 @@ AppKit.framework/Headers/NSTextView.h + + NSTreeController + NSObjectController + + IBFrameworkSource + AppKit.framework/Headers/NSTreeController.h + + NSView -- cgit v1.2.3