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

Fixing bug 154069; hooking up additional find options. Also did some file detabbing. r=ccarlen/pinkerton.

This commit is contained in:
sfraser%netscape.com 2002-06-25 22:08:33 +00:00
Родитель 17b8a206c1
Коммит 88316a9e93
22 изменённых файлов: 180 добавлений и 156 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
camino/BrowserWindowController.h
Просмотреть файл

@ -177,8 +177,6 @@ class nsIDOMNode;
- (void)startThrobber;
- (void)stopThrobber;
//- (BOOL)findInPage:(NSString*)text;
-(void) biggerTextSize;
-(void) smallerTextSize;

26
camino/BrowserWindowController.mm
Просмотреть файл

@ -224,8 +224,8 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
[self setupToolbar];
// 03/03/2002 mlj Changing strategy a bit here. The addTab: method was
// duplicating a lot of the code found here. I have moved it to that method.
// We now remove the IB tab, then add one of our own.
// duplicating a lot of the code found here. I have moved it to that method.
// We now remove the IB tab, then add one of our own.
[mTabBrowser removeTabViewItem:[mTabBrowser tabViewItemAtIndex:0]];
[self newTab];
@ -348,7 +348,7 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar
{
return [NSArray arrayWithObjects: BackToolbarItemIdentifier,
return [NSArray arrayWithObjects: BackToolbarItemIdentifier,
ForwardToolbarItemIdentifier,
ReloadToolbarItemIdentifier,
StopToolbarItemIdentifier,
@ -367,7 +367,7 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar *)toolbar
{
return [NSArray arrayWithObjects: BackToolbarItemIdentifier,
return [NSArray arrayWithObjects: BackToolbarItemIdentifier,
ForwardToolbarItemIdentifier,
ReloadToolbarItemIdentifier,
StopToolbarItemIdentifier,
@ -522,11 +522,11 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
- (void)beginLocationSheet
{
[NSApp beginSheet: mLocationSheetWindow
modalForWindow: [self window]
modalDelegate: nil
didEndSelector: nil
contextInfo: nil];
[NSApp beginSheet: mLocationSheetWindow
modalForWindow: [self window]
modalDelegate: nil
didEndSelector: nil
contextInfo: nil];
}
- (IBAction)endLocationSheet:(id)sender
@ -701,9 +701,11 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
}
- (BOOL)findInPage:(NSString*)text
- (BOOL)findInPageWithPattern:(NSString*)text caseSensitive:(BOOL)inCaseSensitive
wrap:(BOOL)inWrap backwards:(BOOL)inBackwards
{
return [[mBrowserView getBrowserView] findInPage:text];
return [[mBrowserView getBrowserView] findInPageWithPattern:text caseSensitive:inCaseSensitive
wrap:inWrap backwards:inBackwards];
}
- (void)addBookmarkExtended: (BOOL)aIsFromMenu isFolder:(BOOL)aIsFolder
@ -764,7 +766,7 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
NSResponder* resp = [[self window] firstResponder];
[[self window] makeFirstResponder: nil];
if ( ([mSidebarDrawer state] == NSDrawerClosedState) || ([mSidebarDrawer state] == NSDrawerClosingState) ) {
if ( ([mSidebarDrawer state] == NSDrawerClosedState) || ([mSidebarDrawer state] == NSDrawerClosingState) ) {
// XXXHack to bypass sidebar crashes.
[mSidebarDrawer openOnEdge: NSMaxXEdge];
} else {

3
camino/CHBrowserView.h
Просмотреть файл

@ -142,7 +142,8 @@ enum {
- (void)printDocument;
- (BOOL)findInPage:(NSString*)inText;
- (BOOL)findInPageWithPattern:(NSString*)inText caseSensitive:(BOOL)inCaseSensitive
wrap:(BOOL)inWrap backwards:(BOOL)inBackwards;
-(IBAction)cut:(id)aSender;
-(IBAction)copy:(id)aSender;

53
camino/CHBrowserView.mm
Просмотреть файл

@ -98,7 +98,7 @@ const char* dirServiceContractID = "@mozilla.org/file/directory_service;1";
class nsCocoaBrowserListener : public nsSupportsWeakReference,
public nsIInterfaceRequestor,
public nsIWebBrowserChrome,
public nsIWebBrowserChrome,
public nsIWindowCreator,
public nsIEmbeddingSiteWindow2,
public nsIWebProgressListener,
@ -148,12 +148,12 @@ nsCocoaBrowserListener::~nsCocoaBrowserListener()
}
NS_IMPL_ISUPPORTS9(nsCocoaBrowserListener,
nsIInterfaceRequestor,
nsIWebBrowserChrome,
nsIInterfaceRequestor,
nsIWebBrowserChrome,
nsIWindowCreator,
nsIEmbeddingSiteWindow,
nsIEmbeddingSiteWindow,
nsIEmbeddingSiteWindow2,
nsIWebProgressListener,
nsIWebProgressListener,
nsISupportsWeakReference,
nsIContextMenuListener,
nsITooltipListener)
@ -218,14 +218,14 @@ nsCocoaBrowserListener::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords, const
NSPoint where;
where.x = aXCoords; where.y = aYCoords;
[mContainer onShowTooltip:where withText:[NSString stringWithCharacters:aTipText length:nsCRT::strlen(aTipText)]];
return NS_OK;
return NS_OK;
}
NS_IMETHODIMP
nsCocoaBrowserListener::OnHideTooltip()
{
[mContainer onHideTooltip];
return NS_OK;
return NS_OK;
}
// Implementation of nsIWebBrowserChrome
@ -363,7 +363,7 @@ nsCocoaBrowserListener::ExitModalEventLoop(nsresult aStatus)
NS_IMETHODIMP
nsCocoaBrowserListener::Blur()
{
return NS_OK;
return NS_OK;
}
// Implementation of nsIEmbeddingSiteWindow
@ -890,11 +890,11 @@ void nsHeaderSniffer::PerformSave()
/* void onProgressChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aCurSelfProgress, in long aMaxSelfProgress, in long aCurTotalProgress, in long aMaxTotalProgress); */
NS_IMETHODIMP
nsHeaderSniffer::OnProgressChange(nsIWebProgress *aWebProgress,
nsIRequest *aRequest,
PRInt32 aCurSelfProgress,
PRInt32 aMaxSelfProgress,
PRInt32 aCurTotalProgress,
PRInt32 aMaxTotalProgress)
nsIRequest *aRequest,
PRInt32 aCurSelfProgress,
PRInt32 aMaxSelfProgress,
PRInt32 aCurTotalProgress,
PRInt32 aMaxTotalProgress)
{
return NS_OK;
}
@ -902,8 +902,8 @@ nsHeaderSniffer::OnProgressChange(nsIWebProgress *aWebProgress,
/* void onLocationChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsIURI location); */
NS_IMETHODIMP
nsHeaderSniffer::OnLocationChange(nsIWebProgress *aWebProgress,
nsIRequest *aRequest,
nsIURI *location)
nsIRequest *aRequest,
nsIURI *location)
{
return NS_OK;
}
@ -911,9 +911,9 @@ nsHeaderSniffer::OnLocationChange(nsIWebProgress *aWebProgress,
/* void onStatusChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsresult aStatus, in wstring aMessage); */
NS_IMETHODIMP
nsHeaderSniffer::OnStatusChange(nsIWebProgress *aWebProgress,
nsIRequest *aRequest,
nsresult aStatus,
const PRUnichar *aMessage)
nsIRequest *aRequest,
nsresult aStatus,
const PRUnichar *aMessage)
{
return NS_OK;
}
@ -1000,8 +1000,8 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aReq
if (_webBrowser) {
nsCOMPtr<nsIBaseWindow> window = do_QueryInterface(_webBrowser);
window->SetSize((PRInt32)frameRect.size.width,
(PRInt32)frameRect.size.height,
PR_TRUE);
(PRInt32)frameRect.size.height,
PR_TRUE);
}
}
@ -1173,14 +1173,14 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aReq
if (_webBrowser) {
// Set the container nsIWebBrowserChrome
_webBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome *,
_listener));
_listener));
NSRect frame = [self frame];
// Hook up the widget hierarchy with us as the parent
nsCOMPtr<nsIBaseWindow> baseWin = do_QueryInterface(_webBrowser);
baseWin->InitWindow((NSView*)self, nsnull, 0, 0,
frame.size.width, frame.size.height);
frame.size.width, frame.size.height);
baseWin->Create();
}
@ -1248,7 +1248,8 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aReq
print->Print(nsnull, nsnull);
}
-(BOOL)findInPage:(NSString*)inText
- (BOOL)findInPageWithPattern:(NSString*)inText caseSensitive:(BOOL)inCaseSensitive
wrap:(BOOL)inWrap backwards:(BOOL)inBackwards
{
PRBool found = PR_FALSE;
@ -1265,6 +1266,10 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aReq
framesFind->SetRootSearchFrame(rootWindow);
framesFind->SetCurrentSearchFrame(focusedWindow);
webFind->SetMatchCase(inCaseSensitive ? PR_TRUE : PR_FALSE);
webFind->SetWrapFind(inWrap ? PR_TRUE : PR_FALSE);
webFind->SetFindBackwards(inBackwards ? PR_TRUE : PR_FALSE);
PRUnichar* text = (PRUnichar*)nsMemory::Alloc(([inText length]+1)*sizeof(PRUnichar));
if ( text ) {
[inText getCharacters:text];
@ -1537,7 +1542,7 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aReq
}
return dragAccepted;
}
}
@end

Двоичные данные
camino/English.lproj/FindDialog.nib/objects.nib сгенерированный
Просмотреть файл

Двоичный файл не отображается.

Двоичные данные
camino/FindDialog.nib/objects.nib сгенерированный
Просмотреть файл

Двоичный файл не отображается.

Двоичные данные
camino/resources/localized/English.lproj/FindDialog.nib/objects.nib сгенерированный
Просмотреть файл

Двоичный файл не отображается.

2
camino/src/browser/BrowserWindowController.h
Просмотреть файл

@ -177,8 +177,6 @@ class nsIDOMNode;
- (void)startThrobber;
- (void)stopThrobber;
//- (BOOL)findInPage:(NSString*)text;
-(void) biggerTextSize;
-(void) smallerTextSize;

26
camino/src/browser/BrowserWindowController.mm
Просмотреть файл

@ -224,8 +224,8 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
[self setupToolbar];
// 03/03/2002 mlj Changing strategy a bit here. The addTab: method was
// duplicating a lot of the code found here. I have moved it to that method.
// We now remove the IB tab, then add one of our own.
// duplicating a lot of the code found here. I have moved it to that method.
// We now remove the IB tab, then add one of our own.
[mTabBrowser removeTabViewItem:[mTabBrowser tabViewItemAtIndex:0]];
[self newTab];
@ -348,7 +348,7 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar
{
return [NSArray arrayWithObjects: BackToolbarItemIdentifier,
return [NSArray arrayWithObjects: BackToolbarItemIdentifier,
ForwardToolbarItemIdentifier,
ReloadToolbarItemIdentifier,
StopToolbarItemIdentifier,
@ -367,7 +367,7 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar *)toolbar
{
return [NSArray arrayWithObjects: BackToolbarItemIdentifier,
return [NSArray arrayWithObjects: BackToolbarItemIdentifier,
ForwardToolbarItemIdentifier,
ReloadToolbarItemIdentifier,
StopToolbarItemIdentifier,
@ -522,11 +522,11 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
- (void)beginLocationSheet
{
[NSApp beginSheet: mLocationSheetWindow
modalForWindow: [self window]
modalDelegate: nil
didEndSelector: nil
contextInfo: nil];
[NSApp beginSheet: mLocationSheetWindow
modalForWindow: [self window]
modalDelegate: nil
didEndSelector: nil
contextInfo: nil];
}
- (IBAction)endLocationSheet:(id)sender
@ -701,9 +701,11 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
}
- (BOOL)findInPage:(NSString*)text
- (BOOL)findInPageWithPattern:(NSString*)text caseSensitive:(BOOL)inCaseSensitive
wrap:(BOOL)inWrap backwards:(BOOL)inBackwards
{
return [[mBrowserView getBrowserView] findInPage:text];
return [[mBrowserView getBrowserView] findInPageWithPattern:text caseSensitive:inCaseSensitive
wrap:inWrap backwards:inBackwards];
}
- (void)addBookmarkExtended: (BOOL)aIsFromMenu isFolder:(BOOL)aIsFolder
@ -764,7 +766,7 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
NSResponder* resp = [[self window] firstResponder];
[[self window] makeFirstResponder: nil];
if ( ([mSidebarDrawer state] == NSDrawerClosedState) || ([mSidebarDrawer state] == NSDrawerClosingState) ) {
if ( ([mSidebarDrawer state] == NSDrawerClosedState) || ([mSidebarDrawer state] == NSDrawerClosingState) ) {
// XXXHack to bypass sidebar crashes.
[mSidebarDrawer openOnEdge: NSMaxXEdge];
} else {

3
camino/src/embedding/CHBrowserView.h
Просмотреть файл

@ -142,7 +142,8 @@ enum {
- (void)printDocument;
- (BOOL)findInPage:(NSString*)inText;
- (BOOL)findInPageWithPattern:(NSString*)inText caseSensitive:(BOOL)inCaseSensitive
wrap:(BOOL)inWrap backwards:(BOOL)inBackwards;
-(IBAction)cut:(id)aSender;
-(IBAction)copy:(id)aSender;

53
camino/src/embedding/CHBrowserView.mm
Просмотреть файл

@ -98,7 +98,7 @@ const char* dirServiceContractID = "@mozilla.org/file/directory_service;1";
class nsCocoaBrowserListener : public nsSupportsWeakReference,
public nsIInterfaceRequestor,
public nsIWebBrowserChrome,
public nsIWebBrowserChrome,
public nsIWindowCreator,
public nsIEmbeddingSiteWindow2,
public nsIWebProgressListener,
@ -148,12 +148,12 @@ nsCocoaBrowserListener::~nsCocoaBrowserListener()
}
NS_IMPL_ISUPPORTS9(nsCocoaBrowserListener,
nsIInterfaceRequestor,
nsIWebBrowserChrome,
nsIInterfaceRequestor,
nsIWebBrowserChrome,
nsIWindowCreator,
nsIEmbeddingSiteWindow,
nsIEmbeddingSiteWindow,
nsIEmbeddingSiteWindow2,
nsIWebProgressListener,
nsIWebProgressListener,
nsISupportsWeakReference,
nsIContextMenuListener,
nsITooltipListener)
@ -218,14 +218,14 @@ nsCocoaBrowserListener::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords, const
NSPoint where;
where.x = aXCoords; where.y = aYCoords;
[mContainer onShowTooltip:where withText:[NSString stringWithCharacters:aTipText length:nsCRT::strlen(aTipText)]];
return NS_OK;
return NS_OK;
}
NS_IMETHODIMP
nsCocoaBrowserListener::OnHideTooltip()
{
[mContainer onHideTooltip];
return NS_OK;
return NS_OK;
}
// Implementation of nsIWebBrowserChrome
@ -363,7 +363,7 @@ nsCocoaBrowserListener::ExitModalEventLoop(nsresult aStatus)
NS_IMETHODIMP
nsCocoaBrowserListener::Blur()
{
return NS_OK;
return NS_OK;
}
// Implementation of nsIEmbeddingSiteWindow
@ -890,11 +890,11 @@ void nsHeaderSniffer::PerformSave()
/* void onProgressChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aCurSelfProgress, in long aMaxSelfProgress, in long aCurTotalProgress, in long aMaxTotalProgress); */
NS_IMETHODIMP
nsHeaderSniffer::OnProgressChange(nsIWebProgress *aWebProgress,
nsIRequest *aRequest,
PRInt32 aCurSelfProgress,
PRInt32 aMaxSelfProgress,
PRInt32 aCurTotalProgress,
PRInt32 aMaxTotalProgress)
nsIRequest *aRequest,
PRInt32 aCurSelfProgress,
PRInt32 aMaxSelfProgress,
PRInt32 aCurTotalProgress,
PRInt32 aMaxTotalProgress)
{
return NS_OK;
}
@ -902,8 +902,8 @@ nsHeaderSniffer::OnProgressChange(nsIWebProgress *aWebProgress,
/* void onLocationChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsIURI location); */
NS_IMETHODIMP
nsHeaderSniffer::OnLocationChange(nsIWebProgress *aWebProgress,
nsIRequest *aRequest,
nsIURI *location)
nsIRequest *aRequest,
nsIURI *location)
{
return NS_OK;
}
@ -911,9 +911,9 @@ nsHeaderSniffer::OnLocationChange(nsIWebProgress *aWebProgress,
/* void onStatusChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsresult aStatus, in wstring aMessage); */
NS_IMETHODIMP
nsHeaderSniffer::OnStatusChange(nsIWebProgress *aWebProgress,
nsIRequest *aRequest,
nsresult aStatus,
const PRUnichar *aMessage)
nsIRequest *aRequest,
nsresult aStatus,
const PRUnichar *aMessage)
{
return NS_OK;
}
@ -1000,8 +1000,8 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aReq
if (_webBrowser) {
nsCOMPtr<nsIBaseWindow> window = do_QueryInterface(_webBrowser);
window->SetSize((PRInt32)frameRect.size.width,
(PRInt32)frameRect.size.height,
PR_TRUE);
(PRInt32)frameRect.size.height,
PR_TRUE);
}
}
@ -1173,14 +1173,14 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aReq
if (_webBrowser) {
// Set the container nsIWebBrowserChrome
_webBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome *,
_listener));
_listener));
NSRect frame = [self frame];
// Hook up the widget hierarchy with us as the parent
nsCOMPtr<nsIBaseWindow> baseWin = do_QueryInterface(_webBrowser);
baseWin->InitWindow((NSView*)self, nsnull, 0, 0,
frame.size.width, frame.size.height);
frame.size.width, frame.size.height);
baseWin->Create();
}
@ -1248,7 +1248,8 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aReq
print->Print(nsnull, nsnull);
}
-(BOOL)findInPage:(NSString*)inText
- (BOOL)findInPageWithPattern:(NSString*)inText caseSensitive:(BOOL)inCaseSensitive
wrap:(BOOL)inWrap backwards:(BOOL)inBackwards
{
PRBool found = PR_FALSE;
@ -1265,6 +1266,10 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aReq
framesFind->SetRootSearchFrame(rootWindow);
framesFind->SetCurrentSearchFrame(focusedWindow);
webFind->SetMatchCase(inCaseSensitive ? PR_TRUE : PR_FALSE);
webFind->SetWrapFind(inWrap ? PR_TRUE : PR_FALSE);
webFind->SetFindBackwards(inBackwards ? PR_TRUE : PR_FALSE);
PRUnichar* text = (PRUnichar*)nsMemory::Alloc(([inText length]+1)*sizeof(PRUnichar));
if ( text ) {
[inText getCharacters:text];
@ -1537,7 +1542,7 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aReq
}
return dragAccepted;
}
}
@end

2
chimera/BrowserWindowController.h
Просмотреть файл

@ -177,8 +177,6 @@ class nsIDOMNode;
- (void)startThrobber;
- (void)stopThrobber;
//- (BOOL)findInPage:(NSString*)text;
-(void) biggerTextSize;
-(void) smallerTextSize;

26
chimera/BrowserWindowController.mm
Просмотреть файл

@ -224,8 +224,8 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
[self setupToolbar];
// 03/03/2002 mlj Changing strategy a bit here. The addTab: method was
// duplicating a lot of the code found here. I have moved it to that method.
// We now remove the IB tab, then add one of our own.
// duplicating a lot of the code found here. I have moved it to that method.
// We now remove the IB tab, then add one of our own.
[mTabBrowser removeTabViewItem:[mTabBrowser tabViewItemAtIndex:0]];
[self newTab];
@ -348,7 +348,7 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar
{
return [NSArray arrayWithObjects: BackToolbarItemIdentifier,
return [NSArray arrayWithObjects: BackToolbarItemIdentifier,
ForwardToolbarItemIdentifier,
ReloadToolbarItemIdentifier,
StopToolbarItemIdentifier,
@ -367,7 +367,7 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar *)toolbar
{
return [NSArray arrayWithObjects: BackToolbarItemIdentifier,
return [NSArray arrayWithObjects: BackToolbarItemIdentifier,
ForwardToolbarItemIdentifier,
ReloadToolbarItemIdentifier,
StopToolbarItemIdentifier,
@ -522,11 +522,11 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
- (void)beginLocationSheet
{
[NSApp beginSheet: mLocationSheetWindow
modalForWindow: [self window]
modalDelegate: nil
didEndSelector: nil
contextInfo: nil];
[NSApp beginSheet: mLocationSheetWindow
modalForWindow: [self window]
modalDelegate: nil
didEndSelector: nil
contextInfo: nil];
}
- (IBAction)endLocationSheet:(id)sender
@ -701,9 +701,11 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
}
- (BOOL)findInPage:(NSString*)text
- (BOOL)findInPageWithPattern:(NSString*)text caseSensitive:(BOOL)inCaseSensitive
wrap:(BOOL)inWrap backwards:(BOOL)inBackwards
{
return [[mBrowserView getBrowserView] findInPage:text];
return [[mBrowserView getBrowserView] findInPageWithPattern:text caseSensitive:inCaseSensitive
wrap:inWrap backwards:inBackwards];
}
- (void)addBookmarkExtended: (BOOL)aIsFromMenu isFolder:(BOOL)aIsFolder
@ -764,7 +766,7 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
NSResponder* resp = [[self window] firstResponder];
[[self window] makeFirstResponder: nil];
if ( ([mSidebarDrawer state] == NSDrawerClosedState) || ([mSidebarDrawer state] == NSDrawerClosingState) ) {
if ( ([mSidebarDrawer state] == NSDrawerClosedState) || ([mSidebarDrawer state] == NSDrawerClosingState) ) {
// XXXHack to bypass sidebar crashes.
[mSidebarDrawer openOnEdge: NSMaxXEdge];
} else {

3
chimera/CHBrowserView.h
Просмотреть файл

@ -142,7 +142,8 @@ enum {
- (void)printDocument;
- (BOOL)findInPage:(NSString*)inText;
- (BOOL)findInPageWithPattern:(NSString*)inText caseSensitive:(BOOL)inCaseSensitive
wrap:(BOOL)inWrap backwards:(BOOL)inBackwards;
-(IBAction)cut:(id)aSender;
-(IBAction)copy:(id)aSender;

53
chimera/CHBrowserView.mm
Просмотреть файл

@ -98,7 +98,7 @@ const char* dirServiceContractID = "@mozilla.org/file/directory_service;1";
class nsCocoaBrowserListener : public nsSupportsWeakReference,
public nsIInterfaceRequestor,
public nsIWebBrowserChrome,
public nsIWebBrowserChrome,
public nsIWindowCreator,
public nsIEmbeddingSiteWindow2,
public nsIWebProgressListener,
@ -148,12 +148,12 @@ nsCocoaBrowserListener::~nsCocoaBrowserListener()
}
NS_IMPL_ISUPPORTS9(nsCocoaBrowserListener,
nsIInterfaceRequestor,
nsIWebBrowserChrome,
nsIInterfaceRequestor,
nsIWebBrowserChrome,
nsIWindowCreator,
nsIEmbeddingSiteWindow,
nsIEmbeddingSiteWindow,
nsIEmbeddingSiteWindow2,
nsIWebProgressListener,
nsIWebProgressListener,
nsISupportsWeakReference,
nsIContextMenuListener,
nsITooltipListener)
@ -218,14 +218,14 @@ nsCocoaBrowserListener::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords, const
NSPoint where;
where.x = aXCoords; where.y = aYCoords;
[mContainer onShowTooltip:where withText:[NSString stringWithCharacters:aTipText length:nsCRT::strlen(aTipText)]];
return NS_OK;
return NS_OK;
}
NS_IMETHODIMP
nsCocoaBrowserListener::OnHideTooltip()
{
[mContainer onHideTooltip];
return NS_OK;
return NS_OK;
}
// Implementation of nsIWebBrowserChrome
@ -363,7 +363,7 @@ nsCocoaBrowserListener::ExitModalEventLoop(nsresult aStatus)
NS_IMETHODIMP
nsCocoaBrowserListener::Blur()
{
return NS_OK;
return NS_OK;
}
// Implementation of nsIEmbeddingSiteWindow
@ -890,11 +890,11 @@ void nsHeaderSniffer::PerformSave()
/* void onProgressChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aCurSelfProgress, in long aMaxSelfProgress, in long aCurTotalProgress, in long aMaxTotalProgress); */
NS_IMETHODIMP
nsHeaderSniffer::OnProgressChange(nsIWebProgress *aWebProgress,
nsIRequest *aRequest,
PRInt32 aCurSelfProgress,
PRInt32 aMaxSelfProgress,
PRInt32 aCurTotalProgress,
PRInt32 aMaxTotalProgress)
nsIRequest *aRequest,
PRInt32 aCurSelfProgress,
PRInt32 aMaxSelfProgress,
PRInt32 aCurTotalProgress,
PRInt32 aMaxTotalProgress)
{
return NS_OK;
}
@ -902,8 +902,8 @@ nsHeaderSniffer::OnProgressChange(nsIWebProgress *aWebProgress,
/* void onLocationChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsIURI location); */
NS_IMETHODIMP
nsHeaderSniffer::OnLocationChange(nsIWebProgress *aWebProgress,
nsIRequest *aRequest,
nsIURI *location)
nsIRequest *aRequest,
nsIURI *location)
{
return NS_OK;
}
@ -911,9 +911,9 @@ nsHeaderSniffer::OnLocationChange(nsIWebProgress *aWebProgress,
/* void onStatusChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsresult aStatus, in wstring aMessage); */
NS_IMETHODIMP
nsHeaderSniffer::OnStatusChange(nsIWebProgress *aWebProgress,
nsIRequest *aRequest,
nsresult aStatus,
const PRUnichar *aMessage)
nsIRequest *aRequest,
nsresult aStatus,
const PRUnichar *aMessage)
{
return NS_OK;
}
@ -1000,8 +1000,8 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aReq
if (_webBrowser) {
nsCOMPtr<nsIBaseWindow> window = do_QueryInterface(_webBrowser);
window->SetSize((PRInt32)frameRect.size.width,
(PRInt32)frameRect.size.height,
PR_TRUE);
(PRInt32)frameRect.size.height,
PR_TRUE);
}
}
@ -1173,14 +1173,14 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aReq
if (_webBrowser) {
// Set the container nsIWebBrowserChrome
_webBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome *,
_listener));
_listener));
NSRect frame = [self frame];
// Hook up the widget hierarchy with us as the parent
nsCOMPtr<nsIBaseWindow> baseWin = do_QueryInterface(_webBrowser);
baseWin->InitWindow((NSView*)self, nsnull, 0, 0,
frame.size.width, frame.size.height);
frame.size.width, frame.size.height);
baseWin->Create();
}
@ -1248,7 +1248,8 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aReq
print->Print(nsnull, nsnull);
}
-(BOOL)findInPage:(NSString*)inText
- (BOOL)findInPageWithPattern:(NSString*)inText caseSensitive:(BOOL)inCaseSensitive
wrap:(BOOL)inWrap backwards:(BOOL)inBackwards
{
PRBool found = PR_FALSE;
@ -1265,6 +1266,10 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aReq
framesFind->SetRootSearchFrame(rootWindow);
framesFind->SetCurrentSearchFrame(focusedWindow);
webFind->SetMatchCase(inCaseSensitive ? PR_TRUE : PR_FALSE);
webFind->SetWrapFind(inWrap ? PR_TRUE : PR_FALSE);
webFind->SetFindBackwards(inBackwards ? PR_TRUE : PR_FALSE);
PRUnichar* text = (PRUnichar*)nsMemory::Alloc(([inText length]+1)*sizeof(PRUnichar));
if ( text ) {
[inText getCharacters:text];
@ -1537,7 +1542,7 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aReq
}
return dragAccepted;
}
}
@end

Двоичные данные
chimera/English.lproj/FindDialog.nib/objects.nib сгенерированный
Просмотреть файл

Двоичный файл не отображается.

Двоичные данные
chimera/FindDialog.nib/objects.nib сгенерированный
Просмотреть файл

Двоичный файл не отображается.

Двоичные данные
chimera/resources/localized/English.lproj/FindDialog.nib/objects.nib сгенерированный
Просмотреть файл

Двоичный файл не отображается.

2
chimera/src/browser/BrowserWindowController.h
Просмотреть файл

@ -177,8 +177,6 @@ class nsIDOMNode;
- (void)startThrobber;
- (void)stopThrobber;
//- (BOOL)findInPage:(NSString*)text;
-(void) biggerTextSize;
-(void) smallerTextSize;

26
chimera/src/browser/BrowserWindowController.mm
Просмотреть файл

@ -224,8 +224,8 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
[self setupToolbar];
// 03/03/2002 mlj Changing strategy a bit here. The addTab: method was
// duplicating a lot of the code found here. I have moved it to that method.
// We now remove the IB tab, then add one of our own.
// duplicating a lot of the code found here. I have moved it to that method.
// We now remove the IB tab, then add one of our own.
[mTabBrowser removeTabViewItem:[mTabBrowser tabViewItemAtIndex:0]];
[self newTab];
@ -348,7 +348,7 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar
{
return [NSArray arrayWithObjects: BackToolbarItemIdentifier,
return [NSArray arrayWithObjects: BackToolbarItemIdentifier,
ForwardToolbarItemIdentifier,
ReloadToolbarItemIdentifier,
StopToolbarItemIdentifier,
@ -367,7 +367,7 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar *)toolbar
{
return [NSArray arrayWithObjects: BackToolbarItemIdentifier,
return [NSArray arrayWithObjects: BackToolbarItemIdentifier,
ForwardToolbarItemIdentifier,
ReloadToolbarItemIdentifier,
StopToolbarItemIdentifier,
@ -522,11 +522,11 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
- (void)beginLocationSheet
{
[NSApp beginSheet: mLocationSheetWindow
modalForWindow: [self window]
modalDelegate: nil
didEndSelector: nil
contextInfo: nil];
[NSApp beginSheet: mLocationSheetWindow
modalForWindow: [self window]
modalDelegate: nil
didEndSelector: nil
contextInfo: nil];
}
- (IBAction)endLocationSheet:(id)sender
@ -701,9 +701,11 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
}
- (BOOL)findInPage:(NSString*)text
- (BOOL)findInPageWithPattern:(NSString*)text caseSensitive:(BOOL)inCaseSensitive
wrap:(BOOL)inWrap backwards:(BOOL)inBackwards
{
return [[mBrowserView getBrowserView] findInPage:text];
return [[mBrowserView getBrowserView] findInPageWithPattern:text caseSensitive:inCaseSensitive
wrap:inWrap backwards:inBackwards];
}
- (void)addBookmarkExtended: (BOOL)aIsFromMenu isFolder:(BOOL)aIsFolder
@ -764,7 +766,7 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
NSResponder* resp = [[self window] firstResponder];
[[self window] makeFirstResponder: nil];
if ( ([mSidebarDrawer state] == NSDrawerClosedState) || ([mSidebarDrawer state] == NSDrawerClosingState) ) {
if ( ([mSidebarDrawer state] == NSDrawerClosedState) || ([mSidebarDrawer state] == NSDrawerClosingState) ) {
// XXXHack to bypass sidebar crashes.
[mSidebarDrawer openOnEdge: NSMaxXEdge];
} else {

3
chimera/src/embedding/CHBrowserView.h
Просмотреть файл

@ -142,7 +142,8 @@ enum {
- (void)printDocument;
- (BOOL)findInPage:(NSString*)inText;
- (BOOL)findInPageWithPattern:(NSString*)inText caseSensitive:(BOOL)inCaseSensitive
wrap:(BOOL)inWrap backwards:(BOOL)inBackwards;
-(IBAction)cut:(id)aSender;
-(IBAction)copy:(id)aSender;

53
chimera/src/embedding/CHBrowserView.mm
Просмотреть файл

@ -98,7 +98,7 @@ const char* dirServiceContractID = "@mozilla.org/file/directory_service;1";
class nsCocoaBrowserListener : public nsSupportsWeakReference,
public nsIInterfaceRequestor,
public nsIWebBrowserChrome,
public nsIWebBrowserChrome,
public nsIWindowCreator,
public nsIEmbeddingSiteWindow2,
public nsIWebProgressListener,
@ -148,12 +148,12 @@ nsCocoaBrowserListener::~nsCocoaBrowserListener()
}
NS_IMPL_ISUPPORTS9(nsCocoaBrowserListener,
nsIInterfaceRequestor,
nsIWebBrowserChrome,
nsIInterfaceRequestor,
nsIWebBrowserChrome,
nsIWindowCreator,
nsIEmbeddingSiteWindow,
nsIEmbeddingSiteWindow,
nsIEmbeddingSiteWindow2,
nsIWebProgressListener,
nsIWebProgressListener,
nsISupportsWeakReference,
nsIContextMenuListener,
nsITooltipListener)
@ -218,14 +218,14 @@ nsCocoaBrowserListener::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords, const
NSPoint where;
where.x = aXCoords; where.y = aYCoords;
[mContainer onShowTooltip:where withText:[NSString stringWithCharacters:aTipText length:nsCRT::strlen(aTipText)]];
return NS_OK;
return NS_OK;
}
NS_IMETHODIMP
nsCocoaBrowserListener::OnHideTooltip()
{
[mContainer onHideTooltip];
return NS_OK;
return NS_OK;
}
// Implementation of nsIWebBrowserChrome
@ -363,7 +363,7 @@ nsCocoaBrowserListener::ExitModalEventLoop(nsresult aStatus)
NS_IMETHODIMP
nsCocoaBrowserListener::Blur()
{
return NS_OK;
return NS_OK;
}
// Implementation of nsIEmbeddingSiteWindow
@ -890,11 +890,11 @@ void nsHeaderSniffer::PerformSave()
/* void onProgressChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aCurSelfProgress, in long aMaxSelfProgress, in long aCurTotalProgress, in long aMaxTotalProgress); */
NS_IMETHODIMP
nsHeaderSniffer::OnProgressChange(nsIWebProgress *aWebProgress,
nsIRequest *aRequest,
PRInt32 aCurSelfProgress,
PRInt32 aMaxSelfProgress,
PRInt32 aCurTotalProgress,
PRInt32 aMaxTotalProgress)
nsIRequest *aRequest,
PRInt32 aCurSelfProgress,
PRInt32 aMaxSelfProgress,
PRInt32 aCurTotalProgress,
PRInt32 aMaxTotalProgress)
{
return NS_OK;
}
@ -902,8 +902,8 @@ nsHeaderSniffer::OnProgressChange(nsIWebProgress *aWebProgress,
/* void onLocationChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsIURI location); */
NS_IMETHODIMP
nsHeaderSniffer::OnLocationChange(nsIWebProgress *aWebProgress,
nsIRequest *aRequest,
nsIURI *location)
nsIRequest *aRequest,
nsIURI *location)
{
return NS_OK;
}
@ -911,9 +911,9 @@ nsHeaderSniffer::OnLocationChange(nsIWebProgress *aWebProgress,
/* void onStatusChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsresult aStatus, in wstring aMessage); */
NS_IMETHODIMP
nsHeaderSniffer::OnStatusChange(nsIWebProgress *aWebProgress,
nsIRequest *aRequest,
nsresult aStatus,
const PRUnichar *aMessage)
nsIRequest *aRequest,
nsresult aStatus,
const PRUnichar *aMessage)
{
return NS_OK;
}
@ -1000,8 +1000,8 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aReq
if (_webBrowser) {
nsCOMPtr<nsIBaseWindow> window = do_QueryInterface(_webBrowser);
window->SetSize((PRInt32)frameRect.size.width,
(PRInt32)frameRect.size.height,
PR_TRUE);
(PRInt32)frameRect.size.height,
PR_TRUE);
}
}
@ -1173,14 +1173,14 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aReq
if (_webBrowser) {
// Set the container nsIWebBrowserChrome
_webBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome *,
_listener));
_listener));
NSRect frame = [self frame];
// Hook up the widget hierarchy with us as the parent
nsCOMPtr<nsIBaseWindow> baseWin = do_QueryInterface(_webBrowser);
baseWin->InitWindow((NSView*)self, nsnull, 0, 0,
frame.size.width, frame.size.height);
frame.size.width, frame.size.height);
baseWin->Create();
}
@ -1248,7 +1248,8 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aReq
print->Print(nsnull, nsnull);
}
-(BOOL)findInPage:(NSString*)inText
- (BOOL)findInPageWithPattern:(NSString*)inText caseSensitive:(BOOL)inCaseSensitive
wrap:(BOOL)inWrap backwards:(BOOL)inBackwards
{
PRBool found = PR_FALSE;
@ -1265,6 +1266,10 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aReq
framesFind->SetRootSearchFrame(rootWindow);
framesFind->SetCurrentSearchFrame(focusedWindow);
webFind->SetMatchCase(inCaseSensitive ? PR_TRUE : PR_FALSE);
webFind->SetWrapFind(inWrap ? PR_TRUE : PR_FALSE);
webFind->SetFindBackwards(inBackwards ? PR_TRUE : PR_FALSE);
PRUnichar* text = (PRUnichar*)nsMemory::Alloc(([inText length]+1)*sizeof(PRUnichar));
if ( text ) {
[inText getCharacters:text];
@ -1537,7 +1542,7 @@ nsHeaderSniffer::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aReq
}
return dragAccepted;
}
}
@end