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

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

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@124022 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sfraser%netscape.com
2002-06-25 21:53:27 +00:00
parent b1b9817c5d
commit fac1614754
24 changed files with 114 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/camino/CHFind.h
View File

@@ -32,6 +32,7 @@
@protocol CHFind
- (BOOL)findInPage:(NSString*)text;
- (BOOL)findInPageWithPattern:(NSString*)text caseSensitive:(BOOL)inCaseSensitive
wrap:(BOOL)inWrap backwards:(BOOL)inBackwards;
@end

10
mozilla/camino/English.lproj/FindDialog.nib/classes.nib generated
View File

@@ -5,11 +5,11 @@
CLASS = FindDlgController;
LANGUAGE = ObjC;
OUTLETS = {
mFindButton = id;
mIgnoreCaseBox = id;
mSearchBackwardsBox = id;
mSearchField = id;
mWrapAroundBox = id;
mFindButton = NSButton;
mIgnoreCaseBox = NSButton;
mSearchBackwardsBox = NSButton;
mSearchField = NSTextField;
mWrapAroundBox = NSButton;
};
SUPERCLASS = NSWindowController;
},

BIN
mozilla/camino/English.lproj/FindDialog.nib/objects.nib generated
View File

Binary file not shown.

10
mozilla/camino/FindDialog.nib/classes.nib generated
View File

@@ -5,11 +5,11 @@
CLASS = FindDlgController;
LANGUAGE = ObjC;
OUTLETS = {
mFindButton = id;
mIgnoreCaseBox = id;
mSearchBackwardsBox = id;
mSearchField = id;
mWrapAroundBox = id;
mFindButton = NSButton;
mIgnoreCaseBox = NSButton;
mSearchBackwardsBox = NSButton;
mSearchField = NSTextField;
mWrapAroundBox = NSButton;
};
SUPERCLASS = NSWindowController;
},

BIN
mozilla/camino/FindDialog.nib/objects.nib generated
View File

Binary file not shown.

10
mozilla/camino/FindDlgController.h
View File

@@ -39,11 +39,11 @@
#include "nsIWebBrowserFind.h"
@interface FindDlgController : NSWindowController {
IBOutlet id mSearchField;
IBOutlet id mIgnoreCaseBox;
IBOutlet id mWrapAroundBox;
IBOutlet id mSearchBackwardsBox;
IBOutlet id mFindButton;
IBOutlet NSTextField* mSearchField;
IBOutlet NSButton* mIgnoreCaseBox;
IBOutlet NSButton* mWrapAroundBox;
IBOutlet NSButton* mSearchBackwardsBox;
IBOutlet NSButton* mFindButton;
NSString* mSearchText;
}

18
mozilla/camino/FindDlgController.mm
View File

@@ -70,8 +70,15 @@
NSWindowController* controller = [[NSApp mainWindow] windowController];
if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
id<CHFind> browserController = controller;
BOOL ignoreCase = [mIgnoreCaseBox state];
BOOL wrapSearch = [mWrapAroundBox state];
BOOL searchBack = [mSearchBackwardsBox state];
[self storeSearchText:[mSearchField stringValue]];
BOOL found = [browserController findInPage:mSearchText];
BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
wrap:wrapSearch backwards:searchBack];
if ( found )
[self close];
else
@@ -93,7 +100,12 @@
NSWindowController* controller = [[NSApp mainWindow] windowController];
if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
id<CHFind> browserController = controller;
BOOL found = [browserController findInPage:mSearchText];
BOOL ignoreCase = [mIgnoreCaseBox state];
BOOL wrapSearch = [mWrapAroundBox state];
BOOL searchBack = [mSearchBackwardsBox state];
BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
wrap:wrapSearch backwards:searchBack];
if ( !found )
NSBeep();
}
@@ -101,7 +113,6 @@
NSBeep();
}
//
// controlTextDidChange
//
@@ -115,7 +126,6 @@
[mFindButton setEnabled:PR_FALSE];
}
- (void)storeSearchText:(NSString*)inText
{
[mSearchText autorelease];

10
mozilla/camino/resources/localized/English.lproj/FindDialog.nib/classes.nib generated
View File

@@ -5,11 +5,11 @@
CLASS = FindDlgController;
LANGUAGE = ObjC;
OUTLETS = {
mFindButton = id;
mIgnoreCaseBox = id;
mSearchBackwardsBox = id;
mSearchField = id;
mWrapAroundBox = id;
mFindButton = NSButton;
mIgnoreCaseBox = NSButton;
mSearchBackwardsBox = NSButton;
mSearchField = NSTextField;
mWrapAroundBox = NSButton;
};
SUPERCLASS = NSWindowController;
},

BIN
mozilla/camino/resources/localized/English.lproj/FindDialog.nib/objects.nib generated
View File

Binary file not shown.

3
mozilla/camino/src/find/Find.h
View File

@@ -32,6 +32,7 @@
@protocol CHFind
- (BOOL)findInPage:(NSString*)text;
- (BOOL)findInPageWithPattern:(NSString*)text caseSensitive:(BOOL)inCaseSensitive
wrap:(BOOL)inWrap backwards:(BOOL)inBackwards;
@end

10
mozilla/camino/src/find/FindDlgController.h
View File

@@ -39,11 +39,11 @@
#include "nsIWebBrowserFind.h"
@interface FindDlgController : NSWindowController {
IBOutlet id mSearchField;
IBOutlet id mIgnoreCaseBox;
IBOutlet id mWrapAroundBox;
IBOutlet id mSearchBackwardsBox;
IBOutlet id mFindButton;
IBOutlet NSTextField* mSearchField;
IBOutlet NSButton* mIgnoreCaseBox;
IBOutlet NSButton* mWrapAroundBox;
IBOutlet NSButton* mSearchBackwardsBox;
IBOutlet NSButton* mFindButton;
NSString* mSearchText;
}

18
mozilla/camino/src/find/FindDlgController.mm
View File

@@ -70,8 +70,15 @@
NSWindowController* controller = [[NSApp mainWindow] windowController];
if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
id<CHFind> browserController = controller;
BOOL ignoreCase = [mIgnoreCaseBox state];
BOOL wrapSearch = [mWrapAroundBox state];
BOOL searchBack = [mSearchBackwardsBox state];
[self storeSearchText:[mSearchField stringValue]];
BOOL found = [browserController findInPage:mSearchText];
BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
wrap:wrapSearch backwards:searchBack];
if ( found )
[self close];
else
@@ -93,7 +100,12 @@
NSWindowController* controller = [[NSApp mainWindow] windowController];
if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
id<CHFind> browserController = controller;
BOOL found = [browserController findInPage:mSearchText];
BOOL ignoreCase = [mIgnoreCaseBox state];
BOOL wrapSearch = [mWrapAroundBox state];
BOOL searchBack = [mSearchBackwardsBox state];
BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
wrap:wrapSearch backwards:searchBack];
if ( !found )
NSBeep();
}
@@ -101,7 +113,6 @@
NSBeep();
}
//
// controlTextDidChange
//
@@ -115,7 +126,6 @@
[mFindButton setEnabled:PR_FALSE];
}
- (void)storeSearchText:(NSString*)inText
{
[mSearchText autorelease];

3
mozilla/chimera/CHFind.h
View File

@@ -32,6 +32,7 @@
@protocol CHFind
- (BOOL)findInPage:(NSString*)text;
- (BOOL)findInPageWithPattern:(NSString*)text caseSensitive:(BOOL)inCaseSensitive
wrap:(BOOL)inWrap backwards:(BOOL)inBackwards;
@end

10
mozilla/chimera/English.lproj/FindDialog.nib/classes.nib generated
View File

@@ -5,11 +5,11 @@
CLASS = FindDlgController;
LANGUAGE = ObjC;
OUTLETS = {
mFindButton = id;
mIgnoreCaseBox = id;
mSearchBackwardsBox = id;
mSearchField = id;
mWrapAroundBox = id;
mFindButton = NSButton;
mIgnoreCaseBox = NSButton;
mSearchBackwardsBox = NSButton;
mSearchField = NSTextField;
mWrapAroundBox = NSButton;
};
SUPERCLASS = NSWindowController;
},

BIN
mozilla/chimera/English.lproj/FindDialog.nib/objects.nib generated
View File

Binary file not shown.

10
mozilla/chimera/FindDialog.nib/classes.nib generated
View File

@@ -5,11 +5,11 @@
CLASS = FindDlgController;
LANGUAGE = ObjC;
OUTLETS = {
mFindButton = id;
mIgnoreCaseBox = id;
mSearchBackwardsBox = id;
mSearchField = id;
mWrapAroundBox = id;
mFindButton = NSButton;
mIgnoreCaseBox = NSButton;
mSearchBackwardsBox = NSButton;
mSearchField = NSTextField;
mWrapAroundBox = NSButton;
};
SUPERCLASS = NSWindowController;
},

BIN
mozilla/chimera/FindDialog.nib/objects.nib generated
View File

Binary file not shown.

10
mozilla/chimera/FindDlgController.h
View File

@@ -39,11 +39,11 @@
#include "nsIWebBrowserFind.h"
@interface FindDlgController : NSWindowController {
IBOutlet id mSearchField;
IBOutlet id mIgnoreCaseBox;
IBOutlet id mWrapAroundBox;
IBOutlet id mSearchBackwardsBox;
IBOutlet id mFindButton;
IBOutlet NSTextField* mSearchField;
IBOutlet NSButton* mIgnoreCaseBox;
IBOutlet NSButton* mWrapAroundBox;
IBOutlet NSButton* mSearchBackwardsBox;
IBOutlet NSButton* mFindButton;
NSString* mSearchText;
}

18
mozilla/chimera/FindDlgController.mm
View File

@@ -70,8 +70,15 @@
NSWindowController* controller = [[NSApp mainWindow] windowController];
if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
id<CHFind> browserController = controller;
BOOL ignoreCase = [mIgnoreCaseBox state];
BOOL wrapSearch = [mWrapAroundBox state];
BOOL searchBack = [mSearchBackwardsBox state];
[self storeSearchText:[mSearchField stringValue]];
BOOL found = [browserController findInPage:mSearchText];
BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
wrap:wrapSearch backwards:searchBack];
if ( found )
[self close];
else
@@ -93,7 +100,12 @@
NSWindowController* controller = [[NSApp mainWindow] windowController];
if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
id<CHFind> browserController = controller;
BOOL found = [browserController findInPage:mSearchText];
BOOL ignoreCase = [mIgnoreCaseBox state];
BOOL wrapSearch = [mWrapAroundBox state];
BOOL searchBack = [mSearchBackwardsBox state];
BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
wrap:wrapSearch backwards:searchBack];
if ( !found )
NSBeep();
}
@@ -101,7 +113,6 @@
NSBeep();
}
//
// controlTextDidChange
//
@@ -115,7 +126,6 @@
[mFindButton setEnabled:PR_FALSE];
}
- (void)storeSearchText:(NSString*)inText
{
[mSearchText autorelease];

10
mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/classes.nib generated
View File

@@ -5,11 +5,11 @@
CLASS = FindDlgController;
LANGUAGE = ObjC;
OUTLETS = {
mFindButton = id;
mIgnoreCaseBox = id;
mSearchBackwardsBox = id;
mSearchField = id;
mWrapAroundBox = id;
mFindButton = NSButton;
mIgnoreCaseBox = NSButton;
mSearchBackwardsBox = NSButton;
mSearchField = NSTextField;
mWrapAroundBox = NSButton;
};
SUPERCLASS = NSWindowController;
},

BIN
mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/objects.nib generated
View File

Binary file not shown.

3
mozilla/chimera/src/find/Find.h
View File

@@ -32,6 +32,7 @@
@protocol CHFind
- (BOOL)findInPage:(NSString*)text;
- (BOOL)findInPageWithPattern:(NSString*)text caseSensitive:(BOOL)inCaseSensitive
wrap:(BOOL)inWrap backwards:(BOOL)inBackwards;
@end

10
mozilla/chimera/src/find/FindDlgController.h
View File

@@ -39,11 +39,11 @@
#include "nsIWebBrowserFind.h"
@interface FindDlgController : NSWindowController {
IBOutlet id mSearchField;
IBOutlet id mIgnoreCaseBox;
IBOutlet id mWrapAroundBox;
IBOutlet id mSearchBackwardsBox;
IBOutlet id mFindButton;
IBOutlet NSTextField* mSearchField;
IBOutlet NSButton* mIgnoreCaseBox;
IBOutlet NSButton* mWrapAroundBox;
IBOutlet NSButton* mSearchBackwardsBox;
IBOutlet NSButton* mFindButton;
NSString* mSearchText;
}

18
mozilla/chimera/src/find/FindDlgController.mm
View File

@@ -70,8 +70,15 @@
NSWindowController* controller = [[NSApp mainWindow] windowController];
if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
id<CHFind> browserController = controller;
BOOL ignoreCase = [mIgnoreCaseBox state];
BOOL wrapSearch = [mWrapAroundBox state];
BOOL searchBack = [mSearchBackwardsBox state];
[self storeSearchText:[mSearchField stringValue]];
BOOL found = [browserController findInPage:mSearchText];
BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
wrap:wrapSearch backwards:searchBack];
if ( found )
[self close];
else
@@ -93,7 +100,12 @@
NSWindowController* controller = [[NSApp mainWindow] windowController];
if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
id<CHFind> browserController = controller;
BOOL found = [browserController findInPage:mSearchText];
BOOL ignoreCase = [mIgnoreCaseBox state];
BOOL wrapSearch = [mWrapAroundBox state];
BOOL searchBack = [mSearchBackwardsBox state];
BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
wrap:wrapSearch backwards:searchBack];
if ( !found )
NSBeep();
}
@@ -101,7 +113,6 @@
NSBeep();
}
//
// controlTextDidChange
//
@@ -115,7 +126,6 @@
[mFindButton setEnabled:PR_FALSE];
}
- (void)storeSearchText:(NSString*)inText
{
[mSearchText autorelease];