Skim PDF Reader and Note-taker for OS X

Revision: 4952
          http://skim-app.svn.sourceforge.net/skim-app/?rev=4952&view=rev
Author:   hofman
Date:     2008-11-13 11:22:52 +0000 (Thu, 13 Nov 2008)

Log Message:
-----------
rename method

Modified Paths:
--------------
    trunk/SKFindController.m

Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m	2008-11-13 10:33:01 UTC (rev 4951)
+++ trunk/SKFindController.m	2008-11-13 11:22:52 UTC (rev 4952)
@@ -77,7 +77,7 @@
 
 - (unsigned)retainCount { return UINT_MAX; }
 
-- (void)awakeFromNib {
+- (void)windowDidLoad {
     [self setWindowFrameAutosaveName:SKFindPanelFrameAutosaveName];
     if ([[self window] respondsToSelector:@selector(setCollectionBehavior:)])
         [[self window] setCollectionBehavior:NSWindowCollectionBehaviorMoveToActiveSpace];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7277
          http://skim-app.svn.sourceforge.net/skim-app/?rev=7277&view=rev
Author:   hofman
Date:     2011-06-17 21:01:57 +0000 (Fri, 17 Jun 2011)

Log Message:
-----------
fix offset of find bar when hiding

Modified Paths:
--------------
    trunk/SKFindController.m

Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m	2011-06-17 11:34:44 UTC (rev 7276)
+++ trunk/SKFindController.m	2011-06-17 21:01:57 UTC (rev 7277)
@@ -143,8 +143,13 @@
         
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidBecomeKey:) name:NSWindowDidBecomeKeyNotification object:[[self view] window]];
         [self windowDidBecomeKey:nil];
-    } else if ([[self view] window]) {
-        [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidBecomeKeyNotification object:[[self view] window]];
+    } else {
+		if ([contentView isFlipped])
+            barRect.origin.y -= barHeight;
+		else
+			barRect.origin.y = NSMaxY([contentView bounds]) - barHeight;
+        if ([[self view] window])
+            [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidBecomeKeyNotification object:[[self view] window]];
     }
     viewFrame.size.height += barHeight;
     if ([contentView isFlipped]) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7281
          http://skim-app.svn.sourceforge.net/skim-app/?rev=7281&view=rev
Author:   hofman
Date:     2011-06-17 23:20:12 +0000 (Fri, 17 Jun 2011)

Log Message:
-----------
take localization into account for min size of find bar

Modified Paths:
--------------
    trunk/SKFindController.m

Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m	2011-06-17 23:19:28 UTC (rev 7280)
+++ trunk/SKFindController.m	2011-06-17 23:20:12 UTC (rev 7281)
@@ -78,6 +78,7 @@
     [gradientView setEdges:SKMinYEdgeMask];
     [gradientView setClipEdges:SKMinXEdgeMask | SKMaxYEdgeMask];
     NSSize size = [gradientView contentRect].size;
+    size.width -= dx;
     [gradientView setMinSize:size];
     size.width = 500.0;
     [gradientView setMaxSize:size];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7292
          http://skim-app.svn.sourceforge.net/skim-app/?rev=7292&view=rev
Author:   hofman
Date:     2011-06-19 12:00:14 +0000 (Sun, 19 Jun 2011)

Log Message:
-----------
set find pboard to find string when removing scope bar explicitly, so the current string is used for finding when it's hidden

Modified Paths:
--------------
    trunk/SKFindController.m

Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m	2011-06-19 09:56:46 UTC (rev 7291)
+++ trunk/SKFindController.m	2011-06-19 12:00:14 UTC (rev 7292)
@@ -212,6 +212,9 @@
 }
 
 - (IBAction)remove:(id)sender {
+    [ownerController commitEditing];
+    if ([findString length])
+        [self updateFindPboard];
     [self toggleAboveView:nil animate:YES];
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7299
          http://skim-app.svn.sourceforge.net/skim-app/?rev=7299&view=rev
Author:   hofman
Date:     2011-06-21 12:31:41 +0000 (Tue, 21 Jun 2011)

Log Message:
-----------
check for segmented control class instead of selectedTag method, because the latter is always defined

Modified Paths:
--------------
    trunk/SKFindController.m

Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m	2011-06-21 11:13:31 UTC (rev 7298)
+++ trunk/SKFindController.m	2011-06-21 12:31:41 UTC (rev 7299)
@@ -218,7 +218,7 @@
 
 - (IBAction)find:(id)sender {
     NSStringCompareOptions options = 0;
-    if ([sender respondsToSelector:@selector(selectedTag)] && [sender selectedTag] == 0)
+    if ([sender isKindOfClass:[NSSegmentedControl class]] && [sender selectedTag] == 0)
         options |= NSBackwardsSearch;
     [self findWithOptions:options];
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7300
          http://skim-app.svn.sourceforge.net/skim-app/?rev=7300&view=rev
Author:   hofman
Date:     2011-06-21 12:56:34 +0000 (Tue, 21 Jun 2011)

Log Message:
-----------
don't show "Not found" message when find string is empty

Modified Paths:
--------------
    trunk/SKFindController.m

Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m	2011-06-21 12:31:41 UTC (rev 7299)
+++ trunk/SKFindController.m	2011-06-21 12:56:34 UTC (rev 7300)
@@ -207,7 +207,7 @@
 
 - (void)findWithOptions:(NSStringCompareOptions)backForwardOption {
     [ownerController commitEditing];
-    BOOL found = NO;
+    BOOL found = YES;
     if ([findString length]) {
         NSInteger findOptions = [[NSUserDefaults standardUserDefaults] boolForKey:SKCaseInsensitiveFindKey] ? NSCaseInsensitiveSearch : 0;
         found = [delegate findString:findString options:findOptions | backForwardOption];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7301
          http://skim-app.svn.sourceforge.net/skim-app/?rev=7301&view=rev
Author:   hofman
Date:     2011-06-21 16:48:08 +0000 (Tue, 21 Jun 2011)

Log Message:
-----------
There can be more than 2 subviews when we're hiding the find bar (status bar). Find the one next to the find bar.

Modified Paths:
--------------
    trunk/SKFindController.m

Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m	2011-06-21 12:56:34 UTC (rev 7300)
+++ trunk/SKFindController.m	2011-06-21 16:48:08 UTC (rev 7301)
@@ -130,10 +130,10 @@
     
     if (view == nil) {
         NSArray *subviews = [[[self view] superview] subviews];
-        if ([subviews count] == 2)
-            view = [subviews objectAtIndex:([subviews objectAtIndex:0] == [self view] ? 1 : 0)];
-        else
-            return;
+        for (view in subviews) {
+            if (view != [self view] && NSMaxY([view frame]) >= NSMinY([[self view] frame]))
+                break;
+        }
     }
     
 	NSRect viewFrame = [view frame];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7302
          http://skim-app.svn.sourceforge.net/skim-app/?rev=7302&view=rev
Author:   hofman
Date:     2011-06-21 16:52:00 +0000 (Tue, 21 Jun 2011)

Log Message:
-----------
local variable for the find bar view

Modified Paths:
--------------
    trunk/SKFindController.m

Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m	2011-06-21 16:48:08 UTC (rev 7301)
+++ trunk/SKFindController.m	2011-06-21 16:52:00 UTC (rev 7302)
@@ -83,7 +83,6 @@
     SKShiftAndResizeViews([NSArray arrayWithObjects:navigationButton, findField, nil], -dx2, 0.0);
     SKShiftAndResizeViews([NSArray arrayWithObjects:findField, nil], 0.0, dx1 + dx2);
     
-    gradientView = (SKGradientView *)[self view];
     [gradientView setEdges:SKMinYEdgeMask];
     [gradientView setClipEdges:SKMinXEdgeMask | SKMaxYEdgeMask];
     size = [gradientView contentRect].size;
@@ -128,10 +127,12 @@
     if ([[NSUserDefaults standardUserDefaults] boolForKey:SKDisableAnimationsKey])
         animate = NO;
     
+    NSView *findBar = [self view];
+    
     if (view == nil) {
-        NSArray *subviews = [[[self view] superview] subviews];
+        NSArray *subviews = [[findBar superview] subviews];
         for (view in subviews) {
-            if (view != [self view] && NSMaxY([view frame]) >= NSMinY([[self view] frame]))
+            if (view != findBar && NSMaxY([view frame]) >= NSMinY([findBar frame]))
                 break;
         }
     }
@@ -139,8 +140,8 @@
 	NSRect viewFrame = [view frame];
 	NSView *contentView = [view superview];
 	NSRect barRect = [view frame];
-	CGFloat barHeight = NSHeight([[self view] frame]);
-    BOOL visible = (nil == [[self view] superview]);
+	CGFloat barHeight = NSHeight([findBar frame]);
+    BOOL visible = (nil == [findBar superview]);
     NSTimeInterval duration;
     
 	barRect.size.height = barHeight;
@@ -151,18 +152,17 @@
 		else
 			barRect.origin.y = NSMaxY([contentView bounds]);
         [[self view] setFrame:barRect];
-		[contentView addSubview:[self view] positioned:NSWindowBelow relativeTo:nil];
+		[contentView addSubview:findBar positioned:NSWindowBelow relativeTo:nil];
         barHeight = -barHeight;
         
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidBecomeKey:) name:NSWindowDidBecomeKeyNotification object:[[self view] window]];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidBecomeKey:) name:NSWindowDidBecomeKeyNotification object:[findBar window]];
         [self windowDidBecomeKey:nil];
     } else {
 		if ([contentView isFlipped])
             barRect.origin.y -= barHeight;
 		else
 			barRect.origin.y = NSMaxY([contentView bounds]) - barHeight;
-        if ([[self view] window])
-            [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidBecomeKeyNotification object:[[self view] window]];
+        [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidBecomeKeyNotification object:[findBar window]];
     }
     viewFrame.size.height += barHeight;
     if ([contentView isFlipped]) {
@@ -178,15 +178,15 @@
         duration = 0.5 * [[NSAnimationContext currentContext] duration];
         [[NSAnimationContext currentContext] setDuration:duration];
         [[view animator] setFrame:viewFrame];
-        [[[self view] animator] setFrame:barRect];
+        [[findBar animator] setFrame:barRect];
         [NSAnimationContext endGrouping];
         [self performSelector:@selector(endAnimation:) withObject:[NSNumber numberWithBool:visible] afterDelay:duration];
     } else {
         [view setFrame:viewFrame];
         if (visible)
-            [[self view] setFrame:barRect];
+            [findBar setFrame:barRect];
         else
-            [[self view] removeFromSuperview];
+            [findBar removeFromSuperview];
         [[contentView window] recalculateKeyViewLoop];
     }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7303
          http://skim-app.svn.sourceforge.net/skim-app/?rev=7303&view=rev
Author:   hofman
Date:     2011-06-21 17:05:37 +0000 (Tue, 21 Jun 2011)

Log Message:
-----------
fix check for flipped superview

Modified Paths:
--------------
    trunk/SKFindController.m

Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m	2011-06-21 16:52:00 UTC (rev 7302)
+++ trunk/SKFindController.m	2011-06-21 17:05:37 UTC (rev 7303)
@@ -132,8 +132,13 @@
     if (view == nil) {
         NSArray *subviews = [[findBar superview] subviews];
         for (view in subviews) {
-            if (view != findBar && NSMaxY([view frame]) >= NSMinY([findBar frame]))
-                break;
+            if (view != findBar) {
+                if ([[findBar superview] isFlipped]) {
+                    if (NSMaxY([view frame]) >= NSMinY([findBar frame])) break;
+                } else {
+                    if (NSMinY([view frame]) <= NSMaxY([findBar frame])) break;
+                }
+            }
         }
     }
     


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7304
          http://skim-app.svn.sourceforge.net/skim-app/?rev=7304&view=rev
Author:   hofman
Date:     2011-06-21 17:10:10 +0000 (Tue, 21 Jun 2011)

Log Message:
-----------
interchange checks for flipped views

Modified Paths:
--------------
    trunk/SKFindController.m

Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m	2011-06-21 17:05:37 UTC (rev 7303)
+++ trunk/SKFindController.m	2011-06-21 17:10:10 UTC (rev 7304)
@@ -134,9 +134,9 @@
         for (view in subviews) {
             if (view != findBar) {
                 if ([[findBar superview] isFlipped]) {
+                    if (NSMinY([view frame]) <= NSMaxY([findBar frame])) break;
+                } else {
                     if (NSMaxY([view frame]) >= NSMinY([findBar frame])) break;
-                } else {
-                    if (NSMinY([view frame]) <= NSMaxY([findBar frame])) break;
                 }
             }
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7305
          http://skim-app.svn.sourceforge.net/skim-app/?rev=7305&view=rev
Author:   hofman
Date:     2011-06-21 17:32:55 +0000 (Tue, 21 Jun 2011)

Log Message:
-----------
just check for adjacent views

Modified Paths:
--------------
    trunk/SKFindController.m

Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m	2011-06-21 17:10:10 UTC (rev 7304)
+++ trunk/SKFindController.m	2011-06-21 17:32:55 UTC (rev 7305)
@@ -132,13 +132,10 @@
     if (view == nil) {
         NSArray *subviews = [[findBar superview] subviews];
         for (view in subviews) {
-            if (view != findBar) {
-                if ([[findBar superview] isFlipped]) {
-                    if (NSMinY([view frame]) <= NSMaxY([findBar frame])) break;
-                } else {
-                    if (NSMaxY([view frame]) >= NSMinY([findBar frame])) break;
-                }
-            }
+            if (view != findBar &&
+                (fabs(NSMinY([view frame]) - NSMaxY([findBar frame])) <= 0.0 ||
+                 fabs(NSMaxY([view frame]) - NSMinY([findBar frame])) <= 0.0))
+                break;
         }
     }
     


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7591
          http://skim-app.svn.sourceforge.net/skim-app/?rev=7591&view=rev
Author:   hofman
Date:     2011-12-21 18:15:32 +0000 (Wed, 21 Dec 2011)
Log Message:
-----------
update find pboard when window with find field loses key or find field is removed, works like Xcode does

Modified Paths:
--------------
    trunk/SKFindController.m

Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m	2011-12-21 14:00:08 UTC (rev 7590)
+++ trunk/SKFindController.m	2011-12-21 18:15:32 UTC (rev 7591)
@@ -106,6 +106,11 @@
     }
 }
 
+- (void)windowDidResignKey:(NSNotification *)notification {
+    if ([findString length])
+        [self updateFindPboard];
+}
+
 - (void)updateFindPboard {
     NSPasteboard *findPboard = [NSPasteboard pasteboardWithName:NSFindPboard];
     [findPboard declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil];
@@ -159,6 +164,7 @@
         barHeight = -barHeight;
         
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidBecomeKey:) name:NSWindowDidBecomeKeyNotification object:[findBar window]];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidResignKey:) name:NSWindowDidResignKeyNotification object:[findBar window]];
         [self windowDidBecomeKey:nil];
     } else {
 		if ([contentView isFlipped])
@@ -166,6 +172,8 @@
 		else
 			barRect.origin.y = NSMaxY([contentView bounds]) - barHeight;
         [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidBecomeKeyNotification object:[findBar window]];
+        [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidResignKeyNotification object:[findBar window]];
+        [self windowDidResignKey:nil];
     }
     viewFrame.size.height += barHeight;
     if ([contentView isFlipped]) {
@@ -226,9 +234,6 @@
 }
 
 - (IBAction)remove:(id)sender {
-    [ownerController commitEditing];
-    if ([findString length])
-        [self updateFindPboard];
     [self toggleAboveView:nil animate:YES];
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7596
          http://skim-app.svn.sourceforge.net/skim-app/?rev=7596&view=rev
Author:   hofman
Date:     2011-12-24 00:08:59 +0000 (Sat, 24 Dec 2011)
Log Message:
-----------
update find pboard also for empty string, as NSFindPanel and Xcode do

Modified Paths:
--------------
    trunk/SKFindController.m

Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m	2011-12-22 13:59:18 UTC (rev 7595)
+++ trunk/SKFindController.m	2011-12-24 00:08:59 UTC (rev 7596)
@@ -107,8 +107,7 @@
 }
 
 - (void)windowDidResignKey:(NSNotification *)notification {
-    if ([findString length])
-        [self updateFindPboard];
+    [self updateFindPboard];
 }
 
 - (void)updateFindPboard {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7597
          http://skim-app.svn.sourceforge.net/skim-app/?rev=7597&view=rev
Author:   hofman
Date:     2011-12-24 00:10:09 +0000 (Sat, 24 Dec 2011)
Log Message:
-----------
make sure we don't set a nil string

Modified Paths:
--------------
    trunk/SKFindController.m

Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m	2011-12-24 00:08:59 UTC (rev 7596)
+++ trunk/SKFindController.m	2011-12-24 00:10:09 UTC (rev 7597)
@@ -113,7 +113,7 @@
 - (void)updateFindPboard {
     NSPasteboard *findPboard = [NSPasteboard pasteboardWithName:NSFindPboard];
     [findPboard declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil];
-    [findPboard setString:findString forType:NSStringPboardType];
+    [findPboard setString:findString ?: @"" forType:NSStringPboardType];
     lastChangeCount = [findPboard changeCount];
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7609
          http://skim-app.svn.sourceforge.net/skim-app/?rev=7609&view=rev
Author:   hofman
Date:     2011-12-28 12:36:45 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
create field editor for find field early and synthesize accessor

Modified Paths:
--------------
    trunk/SKFindController.m

Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m	2011-12-28 12:18:25 UTC (rev 7608)
+++ trunk/SKFindController.m	2011-12-28 12:36:45 UTC (rev 7609)
@@ -48,8 +48,7 @@
 
 @implementation SKFindController
 
-@... delegate, findField, messageField, doneButton, navigationButton, ownerController, findString;
-@... fieldEditor;
+@synthesize delegate, findField, messageField, doneButton, navigationButton, ownerController, findString, fieldEditor;
 
 - (void)dealloc {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
@@ -96,6 +95,9 @@
     NSMenu *menu = [NSMenu menu];
     [menu addItemWithTitle:NSLocalizedString(@"Ignore Case", @"Menu item title") action:@selector(toggleCaseInsensitiveFind:) target:self];
     [[findField cell] setSearchMenuTemplate:menu];
+    
+    fieldEditor = [[SKFindFieldEditor alloc] init];
+    [fieldEditor setFieldEditor:YES];
 }
 
 - (void)windowDidBecomeKey:(NSNotification *)notification {
@@ -219,14 +221,6 @@
     }
 }
 
-- (NSTextView *)fieldEditor {
-    if (fieldEditor == nil) {
-        fieldEditor = [[SKFindFieldEditor alloc] init];
-        [fieldEditor setFieldEditor:YES];
-    }
-    return fieldEditor;
-}
-
 - (void)findForward:(BOOL)forward {
     BOOL found = YES;
     if ([findString length]) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.