diff --git a/mozilla/camino/resources/application/WebsiteDefaults.strings b/mozilla/camino/resources/application/WebsiteDefaults.strings index f7ecdc4b33b..286cc6cdacd 100644 --- a/mozilla/camino/resources/application/WebsiteDefaults.strings +++ b/mozilla/camino/resources/application/WebsiteDefaults.strings @@ -6,3 +6,4 @@ SupportPage = "http://caminobrowser.org/help/"; KeyboardShortcutsPage = "http://caminobrowser.org/documentation/shortcuts/"; FeedbackPage = "http://caminobrowser.org/contact/"; RendezvousPage ="http://www.zeroconf.org/webbrowsers.html"; +FindEnginesPage = "http://caminobrowser.org/documentation/searchplugins/"; diff --git a/mozilla/camino/resources/localized/English.lproj/Localizable.strings.in b/mozilla/camino/resources/localized/English.lproj/Localizable.strings.in index d4e145c40c9..ca74d54bc5b 100644 --- a/mozilla/camino/resources/localized/English.lproj/Localizable.strings.in +++ b/mozilla/camino/resources/localized/English.lproj/Localizable.strings.in @@ -437,6 +437,7 @@ /* Web Search Engines */ "ManageSearchEnginesMenuItem" = "Manage Search Engines…"; +"FindSearchEnginesMenuItem" = "Find Search Engines…"; "EngineNameAlreadyExistsTitle" = "Search engine name already exists"; "EngineNameAlreadyExistsMessage" = "A search engine named “%@” already exists. Please specify a different name."; "RemovingAllEnginesTitle" = "Cannot remove all search engines"; diff --git a/mozilla/camino/src/browser/BrowserWindowController.h b/mozilla/camino/src/browser/BrowserWindowController.h index 70c500c0048..2daa20562fe 100644 --- a/mozilla/camino/src/browser/BrowserWindowController.h +++ b/mozilla/camino/src/browser/BrowserWindowController.h @@ -214,6 +214,7 @@ typedef enum { - (IBAction)endSearchSheet:(id)sender; - (IBAction)cancelSearchSheet:(id)sender; - (IBAction)manageSearchEngines:(id)sender; +- (IBAction)findSearchEngines:(id)sender; - (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)proposedFrameSize; diff --git a/mozilla/camino/src/browser/BrowserWindowController.mm b/mozilla/camino/src/browser/BrowserWindowController.mm index 3edebab8066..29899552613 100644 --- a/mozilla/camino/src/browser/BrowserWindowController.mm +++ b/mozilla/camino/src/browser/BrowserWindowController.mm @@ -1696,7 +1696,8 @@ public: // Always allow the search engine menu to work if (action == @selector(searchEngineChanged:) || - action == @selector(manageSearchEngines:)) + action == @selector(manageSearchEngines:) || + action == @selector(findSearchEngines:)) { return YES; } @@ -4760,6 +4761,13 @@ public: [[SearchEngineEditor sharedSearchEngineEditor] showSearchEngineEditor:self]; } +- (IBAction)findSearchEngines:(id)sender +{ + NSString* findEnginesPage = NSLocalizedStringFromTable(@"FindEnginesPage", @"WebsiteDefaults", nil); + if (![findEnginesPage isEqualToString:@"FindEnginesPage"]) + [[NSApp delegate] showURL:findEnginesPage]; +} + - (void) focusChangedFrom:(NSResponder*) oldResponder to:(NSResponder*) newResponder { BOOL oldResponderIsGecko = [self isResponderGeckoView:oldResponder]; diff --git a/mozilla/camino/src/browser/WebSearchField.mm b/mozilla/camino/src/browser/WebSearchField.mm index 5d1c408299b..aae77d06a78 100644 --- a/mozilla/camino/src/browser/WebSearchField.mm +++ b/mozilla/camino/src/browser/WebSearchField.mm @@ -80,10 +80,15 @@ static const int kSearchPluginRelatedItemsTag = 102; [separatorBeforeManageEngines setTag:kSeparatorBeforeManageSearchEnginesMenuItemTag]; [searchMenu addItem:separatorBeforeManageEngines]; NSMenuItem* manageEnginesMenuItem = [[[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"ManageSearchEnginesMenuItem", nil) - action:@selector(manageSearchEngines:) - keyEquivalent:@""] autorelease]; + action:@selector(manageSearchEngines:) + keyEquivalent:@""] autorelease]; [manageEnginesMenuItem setTarget:[self target]]; [searchMenu addItem:manageEnginesMenuItem]; + NSMenuItem* findEnginesMenuItem = [[[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"FindSearchEnginesMenuItem", nil) + action:@selector(findSearchEngines:) + keyEquivalent:@""] autorelease]; + [findEnginesMenuItem setTarget:[self target]]; + [searchMenu addItem:findEnginesMenuItem]; [[self cell] setSearchMenuTemplate:searchMenu]; }