Camino only - Bug 410956: Provide obvious access to a search engine plugin list. r/sr=pink
git-svn-id: svn://10.0.0.236/trunk@246095 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -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/";
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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];
|
||||
|
||||
@@ -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];
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user