From aec2fcca44cd97cbf595c3e377d5f88250fe41a1 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Sat, 27 Mar 2010 02:54:55 +0000 Subject: Fix an exception caused when selecting the default favorite popup button. Caused by the addition of validateMenuItem: in r2015. --- Interfaces/English.lproj/MainMenu.xib | 463 ++++++++++++++++------------------ Source/SPPreferenceController.m | 2 +- 2 files changed, 218 insertions(+), 247 deletions(-) diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib index 8798d869..61390f70 100644 --- a/Interfaces/English.lproj/MainMenu.xib +++ b/Interfaces/English.lproj/MainMenu.xib @@ -12,7 +12,7 @@ YES - + YES @@ -1209,6 +1209,56 @@ + + + Favorites + + 2147483647 + + + submenuAction: + + Favorites + + YES + + + YES + Sort By + + 2147483647 + + + + + + Name + + 2147483647 + + + + + + Host + + 2147483647 + + + + + + + + + YES + YES + + + 2147483647 + + + Hide Toolbar @@ -3392,6 +3442,8 @@ + + @@ -4357,6 +4409,46 @@ + + 1052 + + + YES + + + + + + 1053 + + + YES + + + + + + + + 1054 + + + + + 1055 + + + + + 1056 + + + + + 1057 + + + @@ -4385,6 +4477,13 @@ 1047.IBPluginDependency 1048.IBPluginDependency 1050.IBPluginDependency + 1052.IBPluginDependency + 1053.IBEditorWindowLastContentRect + 1053.IBPluginDependency + 1054.IBPluginDependency + 1055.IBPluginDependency + 1056.IBPluginDependency + 1057.IBPluginDependency 106.IBEditorWindowLastContentRect 106.IBPluginDependency 106.ImportedFromIB2 @@ -4753,6 +4852,13 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{765, 511}, {99, 63}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin {{824, 199}, {204, 153}} com.apple.InterfaceBuilder.CocoaPlugin @@ -4836,7 +4942,7 @@ com.apple.InterfaceBuilder.CocoaPlugin {{449, 1007}, {197, 53}} - {{194, 636}, {511, 20}} + {{322, 824}, {511, 20}} com.apple.InterfaceBuilder.CocoaPlugin {{506, 836}, {511, 20}} @@ -4889,7 +4995,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{431, 365}, {251, 293}} + {{514, 501}, {251, 323}} com.apple.InterfaceBuilder.CocoaPlugin {{698, 703}, {184, 133}} @@ -5163,7 +5269,7 @@ - 1051 + 1057 @@ -5193,6 +5299,22 @@ Source/CMCopyTable.h + + CMTextView + NSTextView + + showMySQLHelpForCurrentWord: + id + + + scrollView + NSScrollView + + + IBProjectSource + Source/CMTextView.h + + FirstResponder NSObject @@ -5318,12 +5440,19 @@ NSObject IBProjectSource - Source/SPNotLoaded.h + Source/SPMainThreadTrampoline.h NSObject + IBProjectSource + Source/SPNotLoaded.h + + + + NSObject + IBProjectSource Source/SPQueryFavoriteManager.h @@ -5511,12 +5640,13 @@ YES YES - closeSheet: copy: killProcessConnection: killProcessQuery: refreshProcessList: saveServerProcesses: + toggeleShowFullProcessList: + toggleShowProcessID: YES @@ -5526,13 +5656,13 @@ id id id + id YES YES - closeProcessListButton filterProcessesSearchField processListTableView processesCountTextField @@ -5542,7 +5672,6 @@ YES - NSButton NSSearchField NSTableView NSTextField @@ -5614,6 +5743,67 @@ Source/SPQueryController.h + + SPQueryFavoriteManager + NSWindowController + + YES + + YES + addQueryFavorite: + closeQueryManagerSheet: + duplicateQueryFavorite: + exportFavorites: + importFavoritesByAdding: + importFavoritesByReplacing: + insertPlaceholder: + removeAllQueryFavorites: + removeQueryFavorite: + saveFavoriteToFile: + showHelp: + + + YES + id + id + id + id + id + id + id + id + id + id + id + + + + YES + + YES + encodingPopUp + favoriteNameTextField + favoriteQueryTextView + favoriteTabTriggerTextField + favoritesArrayController + favoritesTableView + removeButton + splitViewButtonBar + + + YES + NSPopUpButton + NSTextField + CMTextView + NSTextField + NSArrayController + NSTableView + NSButton + BWAnchoredButtonBar + + + + SPServerVariablesController NSWindowController @@ -5749,6 +5939,13 @@ Source/SPConnectionDelegate.h + + TableDocument + + IBProjectSource + Source/SPPrintController.h + + TableDocument NSDocument @@ -5790,9 +5987,11 @@ showConsole: showCreateTableSyntax: showMySQLHelp: + showNavigator: showServerProcesses: showServerVariables: showUserManager: + toggleNavigator: validateSaveConnectionAccessory: viewContent: viewQuery: @@ -5847,6 +6046,8 @@ id id id + id + id @@ -6006,244 +6207,6 @@ - - TableDocument - NSDocument - - YES - - YES - addConnectionToFavorites: - addDatabase: - analyzeTable: - backForwardInHistory: - cancelTask: - checkTable: - checksumTable: - chooseDatabase: - chooseEncoding: - closeErrorConnectionSheet: - closePanelSheet: - closePasswordSheet: - closeSheet: - copyChecksumFromSheet: - copyCreateTableSyntax: - copyCreateTableSyntaxFromSheet: - export: - exportMultipleTables: - exportTable: - flushPrivileges: - flushTable: - focusOnTableContentFilter: - focusOnTableListFilter: - import: - openCurrentConnectionInNewWindow: - optimizeTable: - removeDatabase: - repairTable: - saveConnectionSheet: - saveCreateSyntax: - setDatabases: - showConsole: - showCreateTableSyntax: - showMySQLHelp: - showNavigator: - showServerProcesses: - showServerVariables: - showUserManager: - toggleNavigator: - validateSaveConnectionAccessory: - viewContent: - viewQuery: - viewRelations: - viewStatus: - viewStructure: - viewTriggers: - - - YES - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - - - - YES - - YES - addDatabaseButton - chooseDatabaseButton - connectionErrorDialog - contentViewSplitter - createTableSyntaxTextField - createTableSyntaxTextView - createTableSyntaxWindow - customQueryInstance - customQueryTextView - databaseDataInstance - databaseEncodingButton - databaseNameField - databaseSheet - dbTablesTableView - encodingPopUp - exportControllerInstance - extendedTableInfoInstance - favoritesButton - historyControl - inputTextWindow - inputTextWindowHeader - inputTextWindowMessage - inputTextWindowSecureTextField - listFilterField - queryProgressBar - saveConnectionAccessory - saveConnectionAutoConnect - saveConnectionEncrypt - saveConnectionEncryptString - saveConnectionIncludeData - saveConnectionIncludeQuery - saveConnectionSavePassword - saveConnectionSavePasswordAlert - sidebarGrabber - spHistoryControllerInstance - statusTableAccessoryView - statusTableCopyChecksum - statusTableView - statusValues - tableContentInstance - tableDataInstance - tableDumpInstance - tableInfoCollapseButton - tableInfoTable - tableListSplitter - tableRelationsInstance - tableSourceInstance - tableTabView - tableTriggersInstance - tableWindow - tablesListInstance - taskCancelButton - taskCancellationCallbackObject - taskDescriptionText - taskProgressIndicator - taskProgressLayer - titleAccessoryView - titleImageView - titleStringView - userManagerInstance - - - YES - id - id - NSWindow - NSSplitView - NSTextField - NSTextView - NSWindow - id - NSTextView - id - id - id - id - NSTableView - NSPopUpButton - id - id - id - id - id - id - id - id - NSSearchField - id - id - id - id - NSSecureTextField - id - id - id - id - id - id - id - id - id - id - id - id - id - NSButton - NSTableView - NSSplitView - id - id - NSTabView - id - id - id - NSButton - id - id - id - NSBox - id - id - id - SPUserManager - - - - IBDocumentRelativeSource - ../../Source/TableDocument.h - - YES @@ -6858,6 +6821,14 @@ AppKit.framework/Headers/NSResponder.h + + NSScrollView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSScrollView.h + + NSSearchField NSTextField diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m index af80ba7f..33cc9e81 100644 --- a/Source/SPPreferenceController.m +++ b/Source/SPPreferenceController.m @@ -1113,7 +1113,7 @@ return ([favoritesTableView numberOfSelectedRows] > 0); } - return [super validateMenuItem:menuItem]; + return YES; } -- cgit v1.2.3