Revision: 3949
http://skim-app.svn.sourceforge.net/skim-app/?rev=3949&view=rev
Author: hofman
Date: 2008-06-01 07:18:07 -0700 (Sun, 01 Jun 2008)
Log Message:
-----------
Partially revert an earlier commit. Reinstate temporary annotations for search
highlight. This is still relevant for grouped find results. So on Leopard now
both highlights are supported.
Modified Paths:
--------------
trunk/English.lproj/PreferenceWindow.nib/info.nib
trunk/English.lproj/PreferenceWindow.nib/keyedobjects.nib
trunk/SKMainWindowController.m
trunk/SKPreferenceController.h
trunk/SKPreferenceController.m
Modified: trunk/English.lproj/PreferenceWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/PreferenceWindow.nib/info.nib 2008-06-01 12:55:53 UTC
(rev 3948)
+++ trunk/English.lproj/PreferenceWindow.nib/info.nib 2008-06-01 14:18:07 UTC
(rev 3949)
@@ -13,6 +13,6 @@
<integer>5</integer>
</array>
<key>IBSystem Version</key>
- <string>9D34</string>
+ <string>9C7010</string>
</dict>
</plist>
Modified: trunk/English.lproj/PreferenceWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2008-06-01 12:55:53 UTC (rev 3948)
+++ trunk/SKMainWindowController.m 2008-06-01 14:18:07 UTC (rev 3949)
@@ -2877,21 +2877,20 @@
[pdfView scrollSelectionToVisible:self];
[findTableView deselectAll:self];
[groupedFindTableView deselectAll:self];
- if ([pdfView
respondsToSelector:@selector(setCurrentSelection:animate:)]) {
- [pdfView setCurrentSelection:selection animate:YES];
- } else if ([[NSUserDefaults standardUserDefaults]
boolForKey:SKShouldHighlightSearchResultsKey]) {
+ if ([[NSUserDefaults standardUserDefaults]
boolForKey:SKShouldHighlightSearchResultsKey]) {
[self removeTemporaryAnnotations];
[self addAnnotationsForSelection:selection];
temporaryAnnotationTimer = [[NSTimer
scheduledTimerWithTimeInterval:10 target:self
selector:@selector(temporaryAnnotationTimerFired:) userInfo:NULL repeats:NO]
retain];
}
+ if ([pdfView
respondsToSelector:@selector(setCurrentSelection:animate:)])
+ [pdfView setCurrentSelection:selection animate:YES];
} else {
NSBeep();
}
}
- (void)goToFindResults:(NSArray *)findResults scrollToVisible:(BOOL)scroll {
- BOOL canAnimate = [pdfView
respondsToSelector:@selector(setCurrentSelection:animate:)];
- BOOL highlight = canAnimate == NO && [[NSUserDefaults
standardUserDefaults] boolForKey:SKShouldHighlightSearchResultsKey];
+ BOOL highlight = [[NSUserDefaults standardUserDefaults]
boolForKey:SKShouldHighlightSearchResultsKey];
// union all selected objects
NSEnumerator *selE = [findResults objectEnumerator];
PDFSelection *sel;
@@ -2907,11 +2906,12 @@
[self removeTemporaryAnnotations];
// add an annotation so it's easier to see the search result
- if (canAnimate)
- [pdfView setCurrentSelection:currentSel animate:YES];
- else if (highlight)
+ if (highlight)
[self addAnnotationsForSelection:currentSel];
+ if ([pdfView respondsToSelector:@selector(setCurrentSelection:animate:)])
+ [pdfView setCurrentSelection:currentSel animate:YES];
+
while (sel = [selE nextObject]) {
[currentSel addSelection:sel];
if (highlight)
Modified: trunk/SKPreferenceController.h
===================================================================
--- trunk/SKPreferenceController.h 2008-06-01 12:55:53 UTC (rev 3948)
+++ trunk/SKPreferenceController.h 2008-06-01 14:18:07 UTC (rev 3949)
@@ -67,8 +67,6 @@
- (BOOL)isCustomTeXEditor;
- (void)setCustomTeXEditor:(BOOL)flag;
-- (BOOL)isLeopard;
-
- (IBAction)changeDiscreteThumbnailSizes:(id)sender;
- (IBAction)changeUpdateInterval:(id)sender;
- (IBAction)changeTeXEditorPreset:(id)sender;
Modified: trunk/SKPreferenceController.m
===================================================================
--- trunk/SKPreferenceController.m 2008-06-01 12:55:53 UTC (rev 3948)
+++ trunk/SKPreferenceController.m 2008-06-01 14:18:07 UTC (rev 3949)
@@ -172,10 +172,6 @@
isCustomTeXEditor = flag;
}
-- (BOOL)isLeopard {
- return floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4;
-}
-
- (IBAction)changeDiscreteThumbnailSizes:(id)sender {
if ([sender state] == NSOnState) {
[thumbnailSizeSlider setNumberOfTickMarks:8];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
