Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pull the search button out of the default toolbar, move it to the left of

Browse Source 
the url bar if it's there at all, and change the icon.


git-svn-id: svn://10.0.0.236/trunk@123800 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pinkerton%netscape.com 2002-06-21 19:33:59 +00:00
parent 31312aaabc
commit 2d383e548c
4 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/camino/BrowserWindowController.mm
View File

@ -370,8 +370,10 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
ForwardToolbarItemIdentifier,
ReloadToolbarItemIdentifier,
StopToolbarItemIdentifier,
SearchToolbarItemIdentifier,
LocationToolbarItemIdentifier,
#if CORPORATE_BRANDING
SearchToolbarItemIdentifier,
#endif
SidebarToolbarItemIdentifier,
#if CORPORATE_BRANDING
ThrobberToolbarItemIdentifier,
@ -432,8 +434,7 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
[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 setImage:[NSImage imageNamed:@"saveShowFile.tif"]];
[toolbarItem setTarget:self];
[toolbarItem setAction:@selector(performSearch)];
} else if ( [itemIdent isEqual:ThrobberToolbarItemIdentifier] ) {
@ -631,8 +632,8 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
- (void)performSearch
{
// XXX go to the user's preferred search engine.
[[mBrowserView getBrowserView] loadURI:[NSURL URLWithString: @"http://dmoz.org/"] flags:NSLoadFlagsNone];
// 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)

11
mozilla/camino/src/browser/BrowserWindowController.mm
View File

@ -370,8 +370,10 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
ForwardToolbarItemIdentifier,
ReloadToolbarItemIdentifier,
StopToolbarItemIdentifier,
SearchToolbarItemIdentifier,
LocationToolbarItemIdentifier,
#if CORPORATE_BRANDING
SearchToolbarItemIdentifier,
#endif
SidebarToolbarItemIdentifier,
#if CORPORATE_BRANDING
ThrobberToolbarItemIdentifier,
@ -432,8 +434,7 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
[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 setImage:[NSImage imageNamed:@"saveShowFile.tif"]];
[toolbarItem setTarget:self];
[toolbarItem setAction:@selector(performSearch)];
} else if ( [itemIdent isEqual:ThrobberToolbarItemIdentifier] ) {
@ -631,8 +632,8 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
- (void)performSearch
{
// XXX go to the user's preferred search engine.
[[mBrowserView getBrowserView] loadURI:[NSURL URLWithString: @"http://dmoz.org/"] flags:NSLoadFlagsNone];
// 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)

11
mozilla/chimera/BrowserWindowController.mm
View File

@ -370,8 +370,10 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
ForwardToolbarItemIdentifier,
ReloadToolbarItemIdentifier,
StopToolbarItemIdentifier,
SearchToolbarItemIdentifier,
LocationToolbarItemIdentifier,
#if CORPORATE_BRANDING
SearchToolbarItemIdentifier,
#endif
SidebarToolbarItemIdentifier,
#if CORPORATE_BRANDING
ThrobberToolbarItemIdentifier,
@ -432,8 +434,7 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
[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 setImage:[NSImage imageNamed:@"saveShowFile.tif"]];
[toolbarItem setTarget:self];
[toolbarItem setAction:@selector(performSearch)];
} else if ( [itemIdent isEqual:ThrobberToolbarItemIdentifier] ) {
@ -631,8 +632,8 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
- (void)performSearch
{
// XXX go to the user's preferred search engine.
[[mBrowserView getBrowserView] loadURI:[NSURL URLWithString: @"http://dmoz.org/"] flags:NSLoadFlagsNone];
// 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)

11
mozilla/chimera/src/browser/BrowserWindowController.mm
View File

@ -370,8 +370,10 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
ForwardToolbarItemIdentifier,
ReloadToolbarItemIdentifier,
StopToolbarItemIdentifier,
SearchToolbarItemIdentifier,
LocationToolbarItemIdentifier,
#if CORPORATE_BRANDING
SearchToolbarItemIdentifier,
#endif
SidebarToolbarItemIdentifier,
#if CORPORATE_BRANDING
ThrobberToolbarItemIdentifier,
@ -432,8 +434,7 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
[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 setImage:[NSImage imageNamed:@"saveShowFile.tif"]];
[toolbarItem setTarget:self];
[toolbarItem setAction:@selector(performSearch)];
} else if ( [itemIdent isEqual:ThrobberToolbarItemIdentifier] ) {
@ -631,8 +632,8 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
- (void)performSearch
{
// XXX go to the user's preferred search engine.
[[mBrowserView getBrowserView] loadURI:[NSURL URLWithString: @"http://dmoz.org/"] flags:NSLoadFlagsNone];
// 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)