From d0ac737bcfc19fc4921d5701fd18be315807c6d1 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Tue, 11 Jan 2011 20:45:59 +0000 Subject: Tidy up main menu. --- Interfaces/English.lproj/MainMenu.xib | 420 +++++++++++++++++++++++++++------- 1 file changed, 340 insertions(+), 80 deletions(-) diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib index 548082af..5e5180b9 100644 --- a/Interfaces/English.lproj/MainMenu.xib +++ b/Interfaces/English.lproj/MainMenu.xib @@ -2,17 +2,17 @@ 1050 - 10H574 - 788 + 10J567 + 823 1038.35 - 461.00 + 462.00 com.apple.InterfaceBuilder.CocoaPlugin - 788 + 823 YES - + YES @@ -1120,6 +1120,16 @@ + + + YES + YES + + + 2147483647 + + + Show Navigator @@ -1578,6 +1588,16 @@ + + + YES + YES + + + 2147483647 + + + Open Database in New Tab @@ -3476,6 +3496,7 @@ + @@ -4280,6 +4301,7 @@ + @@ -4543,6 +4565,16 @@ + + 1194 + + + + + 1195 + + + @@ -4620,6 +4652,8 @@ 1186.IBPluginDependency 1186.ImportedFromIB2 1189.IBPluginDependency + 1194.IBPluginDependency + 1195.IBPluginDependency 129.IBPluginDependency 129.ImportedFromIB2 130.IBEditorWindowLastContentRect @@ -4935,7 +4969,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{578, 550}, {271, 173}} + {{847, 311}, {271, 173}} com.apple.InterfaceBuilder.CocoaPlugin {{561, 605}, {181, 43}} @@ -5007,7 +5041,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{435, 717}, {64, 6}} + {{704, 478}, {64, 6}} com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -5021,6 +5055,8 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin {{562, 439}, {64, 6}} com.apple.InterfaceBuilder.CocoaPlugin @@ -5066,7 +5102,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{279, 363}, {280, 303}} + {{473, 181}, {280, 303}} com.apple.InterfaceBuilder.CocoaPlugin {{654, 613}, {157, 223}} @@ -5094,11 +5130,11 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{507, 580}, {269, 143}} + {{776, 341}, {269, 143}} com.apple.InterfaceBuilder.CocoaPlugin {{449, 1007}, {197, 53}} - {{56, 723}, {583, 20}} + {{325, 484}, {583, 20}} com.apple.InterfaceBuilder.CocoaPlugin {{506, 836}, {511, 20}} @@ -5114,7 +5150,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{526, 339}, {251, 323}} + {{517, 151}, {251, 333}} com.apple.InterfaceBuilder.CocoaPlugin {{698, 703}, {184, 133}} @@ -5140,7 +5176,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{298, 420}, {273, 303}} + {{567, 171}, {273, 313}} com.apple.InterfaceBuilder.CocoaPlugin {{312, 683}, {231, 153}} @@ -5207,7 +5243,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{379, 490}, {292, 233}} + {{648, 251}, {292, 233}} com.apple.InterfaceBuilder.CocoaPlugin {{829, 663}, {268, 173}} com.apple.InterfaceBuilder.CocoaPlugin @@ -5233,7 +5269,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{162, 280}, {295, 443}} + {{431, 41}, {295, 443}} com.apple.InterfaceBuilder.CocoaPlugin {{180, 535}, {182, 253}} @@ -5406,7 +5442,7 @@ - 1193 + 1195 @@ -5647,6 +5683,13 @@ Source/NSDictionary_DeepMutableCopy.h + + NSMenu + + IBProjectSource + Source/SPMenuAdditions.h + + NSMenu NSObject @@ -5960,8 +6003,10 @@ YES YES + bundleCommandDispatcher: donate: duplicateTab: + executeBundleItemForApp: newTab: newWindow: openAboutPanel: @@ -5993,14 +6038,18 @@ id id id + id + id YES YES + bundleCommandDispatcher: donate: duplicateTab: + executeBundleItemForApp: newTab: newWindow: openAboutPanel: @@ -6017,6 +6066,10 @@ YES + + bundleCommandDispatcher: + id + donate: id @@ -6025,6 +6078,10 @@ duplicateTab: id + + executeBundleItemForApp: + id + newTab: id @@ -6123,6 +6180,25 @@ Source/SPAppleScriptSupport.h + + SPBundleCommandTextView + NSTextView + + commandScrollView + NSScrollView + + + commandScrollView + + commandScrollView + NSScrollView + + + + IBProjectSource + Source/SPBundleCommandTextView.h + + SPBundleEditorController NSWindowController @@ -6131,16 +6207,23 @@ YES addCommandBundle: + closeUndeleteDefaultBundlesSheet: duplicateCommandBundle: inputFallbackPopupButtonChanged: inputPopupButtonChanged: + metaButtonChanged: outputPopupButtonChanged: + performClose: + reloadBundles: removeCommandBundle: revealCommandBundleInFinder: saveAndCloseWindow: saveBundle: scopeButtonChanged: showHelp: + triggerButtonChanged: + undeleteDefaultBundles: + withBlobButtonChanged: YES @@ -6155,6 +6238,13 @@ id id id + id + id + id + id + id + id + id @@ -6162,16 +6252,23 @@ YES addCommandBundle: + closeUndeleteDefaultBundlesSheet: duplicateCommandBundle: inputFallbackPopupButtonChanged: inputPopupButtonChanged: + metaButtonChanged: outputPopupButtonChanged: + performClose: + reloadBundles: removeCommandBundle: revealCommandBundleInFinder: saveAndCloseWindow: saveBundle: scopeButtonChanged: showHelp: + triggerButtonChanged: + undeleteDefaultBundles: + withBlobButtonChanged: YES @@ -6179,6 +6276,10 @@ addCommandBundle: id + + closeUndeleteDefaultBundlesSheet: + id + duplicateCommandBundle: id @@ -6191,10 +6292,22 @@ inputPopupButtonChanged: id + + metaButtonChanged: + id + outputPopupButtonChanged: id + + performClose: + id + + + reloadBundles: + id + removeCommandBundle: id @@ -6219,121 +6332,227 @@ showHelp: id + + triggerButtonChanged: + id + + + undeleteDefaultBundles: + id + + + withBlobButtonChanged: + id + YES YES + addButton + authorLabelField + authorTextField + bundleDataView + cancelButton categoryTextField - commandBundleArrayController + commandBundleTreeController + commandLabelField + commandScrollView commandTextView - commandsTableView - dataTableScopeButton - disableCheckBox + commandsOutlineView + contactLabelField + contactTextField + descriptionLabelField + descriptionScrollView + descriptionTextView + disabledCheckbox duplicateMenuItem - editorScopeButton fallbackLabelField + helpButton inputFallbackPopupButton - inputFieldScopeButton inputPopupButton keyEquivalentField nameTextField outputPopupButton removeButton revealInFinderMenuItem - tootlipTextField + saveButton + scopePopupButton + showHideMetaButton + tooltipTextField + triggerPopupButton + undeleteSheet + undeleteTableView + withBlobLabelField + withBlobPopupButton YES + NSButton NSTextField - NSArrayController - id - NSTableView + NSTextField + NSView NSButton + NSTextField + NSTreeController + NSTextField + NSScrollView + SPBundleCommandTextView + SPOutlineView + NSTextField + NSTextField + NSTextField + NSScrollView + NSTextView NSButton NSMenuItem - NSButton NSTextField - NSPopUpButton NSButton NSPopUpButton + NSPopUpButton SRRecorderControl NSTextField NSPopUpButton NSButton NSMenuItem + NSButton + NSPopUpButton + NSButton + NSTextField + NSPopUpButton + id + NSTableView NSTextField + NSPopUpButton YES YES + addButton + authorLabelField + authorTextField + bundleDataView + cancelButton categoryTextField - commandBundleArrayController + commandBundleTreeController + commandLabelField + commandScrollView commandTextView - commandsTableView - dataTableScopeButton - disableCheckBox + commandsOutlineView + contactLabelField + contactTextField + descriptionLabelField + descriptionScrollView + descriptionTextView + disabledCheckbox duplicateMenuItem - editorScopeButton fallbackLabelField + helpButton inputFallbackPopupButton - inputFieldScopeButton inputPopupButton keyEquivalentField nameTextField outputPopupButton removeButton revealInFinderMenuItem - tootlipTextField + saveButton + scopePopupButton + showHideMetaButton + tooltipTextField + triggerPopupButton + undeleteSheet + undeleteTableView + withBlobLabelField + withBlobPopupButton YES + + addButton + NSButton + + + authorLabelField + NSTextField + + + authorTextField + NSTextField + + + bundleDataView + NSView + + + cancelButton + NSButton + categoryTextField NSTextField - commandBundleArrayController - NSArrayController + commandBundleTreeController + NSTreeController + + + commandLabelField + NSTextField + + + commandScrollView + NSScrollView commandTextView - id + SPBundleCommandTextView - commandsTableView - NSTableView + commandsOutlineView + SPOutlineView - dataTableScopeButton - NSButton + contactLabelField + NSTextField - disableCheckBox - NSButton + contactTextField + NSTextField - duplicateMenuItem - NSMenuItem + descriptionLabelField + NSTextField - editorScopeButton + descriptionScrollView + NSScrollView + + + descriptionTextView + NSTextView + + + disabledCheckbox NSButton + + duplicateMenuItem + NSMenuItem + fallbackLabelField NSTextField - inputFallbackPopupButton - NSPopUpButton + helpButton + NSButton - inputFieldScopeButton - NSButton + inputFallbackPopupButton + NSPopUpButton inputPopupButton @@ -6360,9 +6579,41 @@ NSMenuItem - tootlipTextField + saveButton + NSButton + + + scopePopupButton + NSPopUpButton + + + showHideMetaButton + NSButton + + + tooltipTextField + NSTextField + + + triggerPopupButton + NSPopUpButton + + + undeleteSheet + id + + + undeleteTableView + NSTableView + + + withBlobLabelField NSTextField + + withBlobPopupButton + NSPopUpButton + @@ -6546,7 +6797,7 @@ NSTextView NSWindow NSMenuItem - NSTableView + SPFavoritesOutlineView NSButton NSProgressIndicator NSTextField @@ -6664,7 +6915,7 @@ favoritesTable - NSTableView + SPFavoritesOutlineView helpButton @@ -7058,6 +7309,7 @@ editorFontMenuItem encodingPopUp errorText + errorTextScrollView helpNavigator helpSearchField helpSearchFieldCell @@ -7113,6 +7365,7 @@ NSMenuItem NSPopUpButton id + NSScrollView NSSegmentedControl NSSearchField NSSearchFieldCell @@ -7171,6 +7424,7 @@ editorFontMenuItem encodingPopUp errorText + errorTextScrollView helpNavigator helpSearchField helpSearchFieldCell @@ -7271,6 +7525,10 @@ errorText id + + errorTextScrollView + NSScrollView + helpNavigator NSSegmentedControl @@ -8525,6 +8783,7 @@ exportCustomFilenameViewButton exportCustomFilenameViewLabelButton exportDeselectAllTablesButton + exportDotForceLowerTableNamesCheck exportExcelSheetOrFilePerTableMatrix exportFilePerTableCheck exportFilenameDividerBox @@ -8582,6 +8841,7 @@ NSButton NSButton NSButton + NSButton NSMatrix NSButton NSBox @@ -8642,6 +8902,7 @@ exportCustomFilenameViewButton exportCustomFilenameViewLabelButton exportDeselectAllTablesButton + exportDotForceLowerTableNamesCheck exportExcelSheetOrFilePerTableMatrix exportFilePerTableCheck exportFilenameDividerBox @@ -8756,6 +9017,10 @@ exportDeselectAllTablesButton NSButton + + exportDotForceLowerTableNamesCheck + NSButton + exportExcelSheetOrFilePerTableMatrix NSMatrix @@ -8959,6 +9224,14 @@ Source/SPXMLExporterDelegate.h + + SPFavoritesOutlineView + NSOutlineView + + IBProjectSource + Source/SPFavoritesOutlineView.h + + SPHistoryController NSObject @@ -9010,6 +9283,14 @@ Source/SPHistoryController.h + + SPOutlineView + NSOutlineView + + IBProjectSource + Source/SPOutlineView.h + + SPProcessListController NSWindowController @@ -10084,35 +10365,14 @@ SPTextView NSTextView - YES - - YES - executeBundleItemForEditor: - showMySQLHelpForCurrentWord: - - - YES - id - id - + showMySQLHelpForCurrentWord: + id - YES - - YES - executeBundleItemForEditor: - showMySQLHelpForCurrentWord: - - - YES - - executeBundleItemForEditor: - id - - - showMySQLHelpForCurrentWord: - id - + showMySQLHelpForCurrentWord: + + showMySQLHelpForCurrentWord: + id -- cgit v1.2.3