mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bare bones "Search" toolbar button. Need a real icon, using the Finder's for now.

This commit is contained in:
beard%netscape.com 2002-06-15 01:42:05 +00:00
Родитель 0b22585ae2
Коммит b978abcc16
4 изменённых файлов: 76 добавлений и 0 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

19
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) {

19
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) {

19
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) {

19
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) {