From b978abcc1622d5ec0e0148855b851fcb80161d3b Mon Sep 17 00:00:00 2001 From: "beard%netscape.com" Date: Sat, 15 Jun 2002 01:42:05 +0000 Subject: [PATCH] Bare bones "Search" toolbar button. Need a real icon, using the Finder's for now. --- camino/BrowserWindowController.mm | 19 +++++++++++++++++++ camino/src/browser/BrowserWindowController.mm | 19 +++++++++++++++++++ chimera/BrowserWindowController.mm | 19 +++++++++++++++++++ .../src/browser/BrowserWindowController.mm | 19 +++++++++++++++++++ 4 files changed, 76 insertions(+) diff --git a/camino/BrowserWindowController.mm b/camino/BrowserWindowController.mm index f9af271fd00..89b3434067b 100644 --- a/camino/BrowserWindowController.mm +++ b/camino/BrowserWindowController.mm @@ -73,6 +73,7 @@ static NSString *LocationToolbarItemIdentifier = @"Location Toolbar Item"; static NSString *SidebarToolbarItemIdentifier = @"Sidebar Toolbar Item"; static NSString *PrintToolbarItemIdentifier = @"Print Toolbar Item"; static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; +static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item"; @interface BrowserWindowController(Private) - (void)setupToolbar; @@ -354,6 +355,7 @@ static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; LocationToolbarItemIdentifier, SidebarToolbarItemIdentifier, ThrobberToolbarItemIdentifier, + SearchToolbarItemIdentifier, PrintToolbarItemIdentifier, NSToolbarCustomizeToolbarItemIdentifier, NSToolbarFlexibleSpaceItemIdentifier, @@ -368,6 +370,7 @@ static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; ForwardToolbarItemIdentifier, ReloadToolbarItemIdentifier, StopToolbarItemIdentifier, + SearchToolbarItemIdentifier, LocationToolbarItemIdentifier, SidebarToolbarItemIdentifier, #if CORPORATE_BRANDING @@ -376,6 +379,8 @@ static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; nil]; } +// XXX use a dictionary to speed up the following? + - (NSToolbarItem *) toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdent willBeInsertedIntoToolbar:(BOOL)willBeInserted @@ -423,6 +428,14 @@ static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; [toolbarItem setImage:[NSImage imageNamed:@"sidebarClosed"]]; [toolbarItem setTarget:self]; [toolbarItem setAction:@selector(toggleSidebar:)]; + } else if ( [itemIdent isEqual:SearchToolbarItemIdentifier] ) { + [toolbarItem setLabel:@"Search"]; + [toolbarItem setPaletteLabel:@"Search"]; + [toolbarItem setToolTip:@"Search the Internet"]; + // XXX until we get a better search icon. + [toolbarItem setImage:[[[NSImage alloc] initWithContentsOfFile:@"/System/Library/CoreServices/Finder.app/Contents/Resources/find.icns"] autorelease]]; + [toolbarItem setTarget:self]; + [toolbarItem setAction:@selector(performSearch)]; } else if ( [itemIdent isEqual:ThrobberToolbarItemIdentifier] ) { [toolbarItem setLabel:@""]; [toolbarItem setPaletteLabel:@"Progress"]; @@ -612,6 +625,12 @@ static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; [[mBrowserView getBrowserView] printPreview]; } +- (void)performSearch +{ + // XXX go to the user's preferred search engine. + [[mBrowserView getBrowserView] loadURI:[NSURL URLWithString: @"http://dmoz.org/"] flags:NSLoadFlagsNone]; +} + static Boolean movieControllerFilter(MovieController mc, short action, void *params, long refCon) { if (action == mcActionMovieClick || action == mcActionMouseDown) { diff --git a/camino/src/browser/BrowserWindowController.mm b/camino/src/browser/BrowserWindowController.mm index f9af271fd00..89b3434067b 100644 --- a/camino/src/browser/BrowserWindowController.mm +++ b/camino/src/browser/BrowserWindowController.mm @@ -73,6 +73,7 @@ static NSString *LocationToolbarItemIdentifier = @"Location Toolbar Item"; static NSString *SidebarToolbarItemIdentifier = @"Sidebar Toolbar Item"; static NSString *PrintToolbarItemIdentifier = @"Print Toolbar Item"; static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; +static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item"; @interface BrowserWindowController(Private) - (void)setupToolbar; @@ -354,6 +355,7 @@ static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; LocationToolbarItemIdentifier, SidebarToolbarItemIdentifier, ThrobberToolbarItemIdentifier, + SearchToolbarItemIdentifier, PrintToolbarItemIdentifier, NSToolbarCustomizeToolbarItemIdentifier, NSToolbarFlexibleSpaceItemIdentifier, @@ -368,6 +370,7 @@ static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; ForwardToolbarItemIdentifier, ReloadToolbarItemIdentifier, StopToolbarItemIdentifier, + SearchToolbarItemIdentifier, LocationToolbarItemIdentifier, SidebarToolbarItemIdentifier, #if CORPORATE_BRANDING @@ -376,6 +379,8 @@ static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; nil]; } +// XXX use a dictionary to speed up the following? + - (NSToolbarItem *) toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdent willBeInsertedIntoToolbar:(BOOL)willBeInserted @@ -423,6 +428,14 @@ static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; [toolbarItem setImage:[NSImage imageNamed:@"sidebarClosed"]]; [toolbarItem setTarget:self]; [toolbarItem setAction:@selector(toggleSidebar:)]; + } else if ( [itemIdent isEqual:SearchToolbarItemIdentifier] ) { + [toolbarItem setLabel:@"Search"]; + [toolbarItem setPaletteLabel:@"Search"]; + [toolbarItem setToolTip:@"Search the Internet"]; + // XXX until we get a better search icon. + [toolbarItem setImage:[[[NSImage alloc] initWithContentsOfFile:@"/System/Library/CoreServices/Finder.app/Contents/Resources/find.icns"] autorelease]]; + [toolbarItem setTarget:self]; + [toolbarItem setAction:@selector(performSearch)]; } else if ( [itemIdent isEqual:ThrobberToolbarItemIdentifier] ) { [toolbarItem setLabel:@""]; [toolbarItem setPaletteLabel:@"Progress"]; @@ -612,6 +625,12 @@ static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; [[mBrowserView getBrowserView] printPreview]; } +- (void)performSearch +{ + // XXX go to the user's preferred search engine. + [[mBrowserView getBrowserView] loadURI:[NSURL URLWithString: @"http://dmoz.org/"] flags:NSLoadFlagsNone]; +} + static Boolean movieControllerFilter(MovieController mc, short action, void *params, long refCon) { if (action == mcActionMovieClick || action == mcActionMouseDown) { diff --git a/chimera/BrowserWindowController.mm b/chimera/BrowserWindowController.mm index f9af271fd00..89b3434067b 100644 --- a/chimera/BrowserWindowController.mm +++ b/chimera/BrowserWindowController.mm @@ -73,6 +73,7 @@ static NSString *LocationToolbarItemIdentifier = @"Location Toolbar Item"; static NSString *SidebarToolbarItemIdentifier = @"Sidebar Toolbar Item"; static NSString *PrintToolbarItemIdentifier = @"Print Toolbar Item"; static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; +static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item"; @interface BrowserWindowController(Private) - (void)setupToolbar; @@ -354,6 +355,7 @@ static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; LocationToolbarItemIdentifier, SidebarToolbarItemIdentifier, ThrobberToolbarItemIdentifier, + SearchToolbarItemIdentifier, PrintToolbarItemIdentifier, NSToolbarCustomizeToolbarItemIdentifier, NSToolbarFlexibleSpaceItemIdentifier, @@ -368,6 +370,7 @@ static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; ForwardToolbarItemIdentifier, ReloadToolbarItemIdentifier, StopToolbarItemIdentifier, + SearchToolbarItemIdentifier, LocationToolbarItemIdentifier, SidebarToolbarItemIdentifier, #if CORPORATE_BRANDING @@ -376,6 +379,8 @@ static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; nil]; } +// XXX use a dictionary to speed up the following? + - (NSToolbarItem *) toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdent willBeInsertedIntoToolbar:(BOOL)willBeInserted @@ -423,6 +428,14 @@ static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; [toolbarItem setImage:[NSImage imageNamed:@"sidebarClosed"]]; [toolbarItem setTarget:self]; [toolbarItem setAction:@selector(toggleSidebar:)]; + } else if ( [itemIdent isEqual:SearchToolbarItemIdentifier] ) { + [toolbarItem setLabel:@"Search"]; + [toolbarItem setPaletteLabel:@"Search"]; + [toolbarItem setToolTip:@"Search the Internet"]; + // XXX until we get a better search icon. + [toolbarItem setImage:[[[NSImage alloc] initWithContentsOfFile:@"/System/Library/CoreServices/Finder.app/Contents/Resources/find.icns"] autorelease]]; + [toolbarItem setTarget:self]; + [toolbarItem setAction:@selector(performSearch)]; } else if ( [itemIdent isEqual:ThrobberToolbarItemIdentifier] ) { [toolbarItem setLabel:@""]; [toolbarItem setPaletteLabel:@"Progress"]; @@ -612,6 +625,12 @@ static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; [[mBrowserView getBrowserView] printPreview]; } +- (void)performSearch +{ + // XXX go to the user's preferred search engine. + [[mBrowserView getBrowserView] loadURI:[NSURL URLWithString: @"http://dmoz.org/"] flags:NSLoadFlagsNone]; +} + static Boolean movieControllerFilter(MovieController mc, short action, void *params, long refCon) { if (action == mcActionMovieClick || action == mcActionMouseDown) { diff --git a/chimera/src/browser/BrowserWindowController.mm b/chimera/src/browser/BrowserWindowController.mm index f9af271fd00..89b3434067b 100644 --- a/chimera/src/browser/BrowserWindowController.mm +++ b/chimera/src/browser/BrowserWindowController.mm @@ -73,6 +73,7 @@ static NSString *LocationToolbarItemIdentifier = @"Location Toolbar Item"; static NSString *SidebarToolbarItemIdentifier = @"Sidebar Toolbar Item"; static NSString *PrintToolbarItemIdentifier = @"Print Toolbar Item"; static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; +static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item"; @interface BrowserWindowController(Private) - (void)setupToolbar; @@ -354,6 +355,7 @@ static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; LocationToolbarItemIdentifier, SidebarToolbarItemIdentifier, ThrobberToolbarItemIdentifier, + SearchToolbarItemIdentifier, PrintToolbarItemIdentifier, NSToolbarCustomizeToolbarItemIdentifier, NSToolbarFlexibleSpaceItemIdentifier, @@ -368,6 +370,7 @@ static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; ForwardToolbarItemIdentifier, ReloadToolbarItemIdentifier, StopToolbarItemIdentifier, + SearchToolbarItemIdentifier, LocationToolbarItemIdentifier, SidebarToolbarItemIdentifier, #if CORPORATE_BRANDING @@ -376,6 +379,8 @@ static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; nil]; } +// XXX use a dictionary to speed up the following? + - (NSToolbarItem *) toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdent willBeInsertedIntoToolbar:(BOOL)willBeInserted @@ -423,6 +428,14 @@ static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; [toolbarItem setImage:[NSImage imageNamed:@"sidebarClosed"]]; [toolbarItem setTarget:self]; [toolbarItem setAction:@selector(toggleSidebar:)]; + } else if ( [itemIdent isEqual:SearchToolbarItemIdentifier] ) { + [toolbarItem setLabel:@"Search"]; + [toolbarItem setPaletteLabel:@"Search"]; + [toolbarItem setToolTip:@"Search the Internet"]; + // XXX until we get a better search icon. + [toolbarItem setImage:[[[NSImage alloc] initWithContentsOfFile:@"/System/Library/CoreServices/Finder.app/Contents/Resources/find.icns"] autorelease]]; + [toolbarItem setTarget:self]; + [toolbarItem setAction:@selector(performSearch)]; } else if ( [itemIdent isEqual:ThrobberToolbarItemIdentifier] ) { [toolbarItem setLabel:@""]; [toolbarItem setPaletteLabel:@"Progress"]; @@ -612,6 +625,12 @@ static NSString *ThrobberToolbarItemIdentifier = @"Throbber Toolbar Item"; [[mBrowserView getBrowserView] printPreview]; } +- (void)performSearch +{ + // XXX go to the user's preferred search engine. + [[mBrowserView getBrowserView] loadURI:[NSURL URLWithString: @"http://dmoz.org/"] flags:NSLoadFlagsNone]; +} + static Boolean movieControllerFilter(MovieController mc, short action, void *params, long refCon) { if (action == mcActionMovieClick || action == mcActionMouseDown) {