Revision: 7538
http://skim-app.svn.sourceforge.net/skim-app/?rev=7538&view=rev
Author: hofman
Date: 2011-11-15 12:48:26 +0000 (Tue, 15 Nov 2011)
Log Message:
-----------
rename flag
Modified Paths:
--------------
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2011-11-14 18:21:42 UTC (rev 7537)
+++ trunk/SKMainWindowController.h 2011-11-15 12:48:26 UTC (rev 7538)
@@ -164,7 +164,7 @@
unsigned int updatingOutlineSelection:1;
unsigned int updatingThumbnailSelection:1;
unsigned int isAnimating:1;
- unsigned int findPanelFind:1;
+ unsigned int isSynchronousFind:1;
unsigned int caseInsensitiveSearch:1;
unsigned int wholeWordSearch:1;
unsigned int updatingNoteSelection:1;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2011-11-14 18:21:42 UTC (rev 7537)
+++ trunk/SKMainWindowController.m 2011-11-15 12:48:26 UTC (rev 7538)
@@ -224,7 +224,7 @@
interactionMode = SKNormalMode;
searchResults = [[NSMutableArray alloc] init];
searchResultIndex = 0;
- mwcFlags.findPanelFind = 0;
+ mwcFlags.isSynchronousFind = 0;
mwcFlags.caseInsensitiveSearch = [[NSUserDefaults
standardUserDefaults] boolForKey:SKCaseInsensitiveSearchKey];
mwcFlags.wholeWordSearch = [[NSUserDefaults standardUserDefaults]
boolForKey:SKWholeWordSearchKey];
mwcFlags.caseInsensitiveNoteSearch = [[NSUserDefaults
standardUserDefaults] boolForKey:SKCaseInsensitiveNoteSearchKey];
@@ -1687,9 +1687,9 @@
}
- (PDFSelection *)findString:(NSString *)string fromSelection:(PDFSelection
*)selection withOptions:(NSInteger)options {
- mwcFlags.findPanelFind = 1;
+ mwcFlags.isSynchronousFind = 1;
selection = [[pdfView document] findString:string fromSelection:selection
withOptions:options];
- mwcFlags.findPanelFind = 0;
+ mwcFlags.isSynchronousFind = 0;
return selection;
}
@@ -1806,7 +1806,7 @@
#pragma mark PDFDocument delegate
- (void)didMatchString:(PDFSelection *)instance {
- if (mwcFlags.findPanelFind == 0) {
+ if (mwcFlags.isSynchronousFind == 0) {
if (mwcFlags.wholeWordSearch) {
PDFSelection *copy = [[instance copy] autorelease];
NSString *string = [instance string];
@@ -1841,7 +1841,7 @@
}
- (void)documentDidBeginDocumentFind:(NSNotification *)note {
- if (mwcFlags.findPanelFind == 0) {
+ if (mwcFlags.isSynchronousFind == 0) {
NSString *message = [NSLocalizedString(@"Searching", @"Message in
search table header") stringByAppendingEllipsis];
[self setSearchResults:nil];
[[[leftSideController.findTableView
tableColumnWithIdentifier:RESULTS_COLUMNID] headerCell] setStringValue:message];
@@ -1859,7 +1859,7 @@
}
- (void)documentDidEndDocumentFind:(NSNotification *)note {
- if (mwcFlags.findPanelFind == 0) {
+ if (mwcFlags.isSynchronousFind == 0) {
NSString *message = [NSString stringWithFormat:NSLocalizedString(@"%ld
Results", @"Message in search table header"), (long)[searchResults count]];
[self didChangeValueForKey:GROUPEDSEARCHRESULTS_KEY];
[self didChangeValueForKey:SEARCHRESULTS_KEY];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
