Revision: 7444
http://skim-app.svn.sourceforge.net/skim-app/?rev=7444&view=rev
Author: hofman
Date: 2011-08-26 09:33:19 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
Remember last chosen search options for new documents
Modified Paths:
--------------
trunk/InitialUserDefaults.plist
trunk/SKMainWindowController.m
trunk/SKMainWindowController_Actions.m
trunk/SKNotesDocument.m
trunk/SKStringConstants.h
trunk/SKStringConstants.m
Modified: trunk/InitialUserDefaults.plist
===================================================================
--- trunk/InitialUserDefaults.plist 2011-08-25 17:44:57 UTC (rev 7443)
+++ trunk/InitialUserDefaults.plist 2011-08-26 09:33:19 UTC (rev 7444)
@@ -206,6 +206,12 @@
<true/>
<key>SKCaseInsensitiveSearch</key>
<true/>
+ <key>SKWholeWordSearch</key>
+ <false/>
+ <key>SKCaseInsensitiveNoteSearch</key>
+ <true/>
+ <key>SKCaseInsensitiveFind</key>
+ <true/>
</dict>
<key>ResettableKeys</key>
<dict>
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2011-08-25 17:44:57 UTC (rev 7443)
+++ trunk/SKMainWindowController.m 2011-08-26 09:33:19 UTC (rev 7444)
@@ -225,9 +225,9 @@
searchResults = [[NSMutableArray alloc] init];
searchResultIndex = 0;
mwcFlags.findPanelFind = 0;
- mwcFlags.caseInsensitiveSearch = 1;
- mwcFlags.wholeWordSearch = 0;
- mwcFlags.caseInsensitiveNoteSearch = 1;
+ mwcFlags.caseInsensitiveSearch = [[NSUserDefaults
standardUserDefaults] boolForKey:SKCaseInsensitiveSearchKey];
+ mwcFlags.wholeWordSearch = [[NSUserDefaults standardUserDefaults]
boolForKey:SKWholeWordSearchKey];
+ mwcFlags.caseInsensitiveNoteSearch = [[NSUserDefaults
standardUserDefaults] boolForKey:SKCaseInsensitiveNoteSearchKey];
groupedSearchResults = [[NSMutableArray alloc] init];
thumbnails = [[NSMutableArray alloc] init];
notes = [[NSMutableArray alloc] init];
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2011-08-25 17:44:57 UTC (rev
7443)
+++ trunk/SKMainWindowController_Actions.m 2011-08-26 09:33:19 UTC (rev
7444)
@@ -844,18 +844,21 @@
mwcFlags.caseInsensitiveSearch = (0 == mwcFlags.caseInsensitiveSearch);
if ([[leftSideController.searchField stringValue] length])
[self search:leftSideController.searchField];
+ [[NSUserDefaults standardUserDefaults]
setBool:mwcFlags.caseInsensitiveSearch forKey:SKCaseInsensitiveSearchKey];
}
- (IBAction)toggleWholeWordSearch:(id)sender {
mwcFlags.wholeWordSearch = (0 == mwcFlags.wholeWordSearch);
if ([[leftSideController.searchField stringValue] length])
[self search:leftSideController.searchField];
+ [[NSUserDefaults standardUserDefaults] setBool:mwcFlags.wholeWordSearch
forKey:SKWholeWordSearchKey];
}
- (IBAction)toggleCaseInsensitiveNoteSearch:(id)sender {
mwcFlags.caseInsensitiveNoteSearch = (0 ==
mwcFlags.caseInsensitiveNoteSearch);
if ([[rightSideController.searchField stringValue] length])
[self searchNotes:rightSideController.searchField];
+ [[NSUserDefaults standardUserDefaults]
setBool:mwcFlags.caseInsensitiveNoteSearch
forKey:SKCaseInsensitiveNoteSearchKey];
}
- (IBAction)toggleLeftSidePane:(id)sender {
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2011-08-25 17:44:57 UTC (rev 7443)
+++ trunk/SKNotesDocument.m 2011-08-26 09:33:19 UTC (rev 7444)
@@ -96,7 +96,7 @@
pdfDocument = nil;
rowHeights = [[SKFloatMapTable alloc] init];
windowRect = NSZeroRect;
- caseInsensitiveSearch = YES;
+ caseInsensitiveSearch = [[NSUserDefaults standardUserDefaults]
boolForKey:SKCaseInsensitiveNoteSearchKey];
}
return self;
}
@@ -513,6 +513,7 @@
caseInsensitiveSearch = NO == caseInsensitiveSearch;
if ([[searchField stringValue] length])
[self searchNotes:searchField];
+ [[NSUserDefaults standardUserDefaults] setBool:caseInsensitiveSearch
forKey:SKCaseInsensitiveNoteSearchKey];
}
- (void)performFindPanelAction:(id)sender {
Modified: trunk/SKStringConstants.h
===================================================================
--- trunk/SKStringConstants.h 2011-08-25 17:44:57 UTC (rev 7443)
+++ trunk/SKStringConstants.h 2011-08-26 09:33:19 UTC (rev 7444)
@@ -124,4 +124,7 @@
extern NSString *SKDisableModificationDateKey;
extern NSString *SKDisableAnimationsKey;
extern NSString *SKDisableUpdateContentsFromEnclosedTextKey;
+extern NSString *SKCaseInsensitiveSearchKey;
+extern NSString *SKWholeWordSearchKey;
+extern NSString *SKCaseInsensitiveNoteSearchKey;
extern NSString *SKCaseInsensitiveFindKey;
Modified: trunk/SKStringConstants.m
===================================================================
--- trunk/SKStringConstants.m 2011-08-25 17:44:57 UTC (rev 7443)
+++ trunk/SKStringConstants.m 2011-08-26 09:33:19 UTC (rev 7444)
@@ -125,4 +125,7 @@
NSString *SKDisableModificationDateKey = @"SKDisableModificationDate";
NSString *SKDisableAnimationsKey = @"SKDisableAnimations";
NSString *SKDisableUpdateContentsFromEnclosedTextKey =
@"SKDisableUpdateContentsFromEnclosedText";
+NSString *SKCaseInsensitiveSearchKey = @"SKCaseInsensitiveSearch";
+NSString *SKWholeWordSearchKey = @"SKWholeWordSearch";
+NSString *SKCaseInsensitiveNoteSearchKey = @"SKCaseInsensitiveNoteSearch";
NSString *SKCaseInsensitiveFindKey = @"SKCaseInsensitiveFind";
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management
Up to 160% more powerful than alternatives and 25% more efficient.
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
