Skim PDF Reader and Note-taker for OS X

Revision: 1672
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1672&view=rev
Author:   hofman
Date:     2007-03-30 02:32:11 -0700 (Fri, 30 Mar 2007)

Log Message:
-----------
edit annotation when double-clicking attributed string of anchored note in outline view

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-03-29 23:02:40 UTC (rev 1671)
+++ trunk/SKMainWindowController.m	2007-03-30 09:32:11 UTC (rev 1672)
@@ -1995,14 +1995,26 @@
 
 - (void)outlineView:(NSOutlineView *)ov setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn byItem:(id)item{
     if ([ov isEqual:noteOutlineView]) {
-        if ([[tableColumn identifier] isEqualToString:@"note"]) 
-            [item setContents:object];
+        if ([[tableColumn identifier] isEqualToString:@"note"]) {
+            if ([object isEqualToString:[item contents]] == NO)
+                [item setContents:object];
+        }
     }
 }
 
 - (BOOL)outlineView:(NSOutlineView *)ov shouldEditTableColumn:(NSTableColumn *)tableColumn item:(id)item{
     if ([ov isEqual:noteOutlineView]) {
-        return [[tableColumn identifier] isEqualToString:@"note"] && [item type] && [item isMovable];
+        if ([[tableColumn identifier] isEqualToString:@"note"]) {
+            if ([item type] == nil) {
+                PDFAnnotation *annotation = [(SKNoteText *)item annotation];
+                [pdfView scrollAnnotationToVisible:annotation];
+                [pdfView setActiveAnnotation:annotation];
+                [self showNote:annotation];
+                return NO;
+            } else if ([item isMovable]) {
+                return YES;
+            }
+        }
     }
     return NO;
 }


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

Revision: 1680
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1680&view=rev
Author:   hofman
Date:     2007-03-30 07:36:13 -0700 (Fri, 30 Mar 2007)

Log Message:
-----------
dirty region for display before removing temporary annotation. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-03-30 12:44:24 UTC (rev 1679)
+++ trunk/SKMainWindowController.m	2007-03-30 14:36:13 UTC (rev 1680)
@@ -1497,8 +1497,8 @@
 {
     SKMainWindowController *wc = (SKMainWindowController *)context;
     PDFAnnotation *annote = (PDFAnnotation *)annotation;
+    [[wc pdfView] setNeedsDisplayForAnnotation:annote];
     [[annote page] removeAnnotation:annote];
-    [[wc pdfView] setNeedsDisplayForAnnotation:annote];
     // no need to update thumbnail, since temp annotations are only displayed when the search table is displayed
 }
 


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

Revision: 1681
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1681&view=rev
Author:   hofman
Date:     2007-03-30 09:08:16 -0700 (Fri, 30 Mar 2007)

Log Message:
-----------
Remove commented out code for capturing screen. Also in presentation mode hide menubar and dock only when on the primary screen. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-03-30 14:36:13 UTC (rev 1680)
+++ trunk/SKMainWindowController.m	2007-03-30 16:08:16 UTC (rev 1681)
@@ -959,10 +959,10 @@
 }
 
 - (void)goFullScreen {
-    NSScreen *screen = [[self window] screen]; // @@ or should we use the main screen?
+    NSScreen *screen = [[self window] screen]; // @@ screen: or should we use the main screen?
     NSColor *backgroundColor = [self isPresentation] ? [NSColor blackColor] : [NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:SKFullScreenBackgroundColorKey]];
     
-    if (screen == nil)
+    if (screen == nil) // @@ screen: can this ever happen?
         screen = [NSScreen mainScreen];
     
     // Create the full-screen window if it does not already  exist.
@@ -1127,41 +1127,30 @@
     [pdfView setFrame:[[pdfView superview] bounds]];
 }
 
-- (BOOL)enterPresentationMode {
-    // Get the screen information.
-    //NSScreen *screen = [[self window] screen]; // @@ or should we use the mainScreen?
-    //NSNumber *screenID = [[screen deviceDescription] objectForKey:@"NSScreenNumber"];
+- (void)enterPresentationMode {
+    NSScrollView *scrollView = [[pdfView documentView] enclosingScrollView];
+    // Set up presentation mode
+    savedState.displayMode = [pdfView displayMode];
+    [pdfView setDisplayMode:kPDFDisplaySinglePage];
+    savedState.autoScales = [pdfView autoScales];
+    savedState.scaleFactor = [pdfView scaleFactor];
+    [pdfView setAutoScales:YES];
+    savedState.hasHorizontalScroller = [scrollView hasHorizontalScroller];
+    [scrollView setNeverHasHorizontalScroller:YES];
+    savedState.hasVerticalScroller = [scrollView hasVerticalScroller];
+    [scrollView setNeverHasVerticalScroller:YES];
+    savedState.autoHidesScrollers = [scrollView autohidesScrollers];
+    [scrollView setAutohidesScrollers:YES];
     
-    // Capture the screen.
-    //CGDisplayErr err = CGDisplayCapture((CGDirectDisplayID)[screenID longValue]);
+    if ([pdfView hasReadingBar])
+        [pdfView toggleReadingBar];
     
-    //if (err == kCGErrorSuccess) {
-        NSScrollView *scrollView = [[pdfView documentView] enclosingScrollView];
-        // Set up presentation mode
-        savedState.displayMode = [pdfView displayMode];
-        [pdfView setDisplayMode:kPDFDisplaySinglePage];
-        savedState.autoScales = [pdfView autoScales];
-        savedState.scaleFactor = [pdfView scaleFactor];
-        [pdfView setAutoScales:YES];
-        savedState.hasHorizontalScroller = [scrollView hasHorizontalScroller];
-        [scrollView setNeverHasHorizontalScroller:YES];
-        savedState.hasVerticalScroller = [scrollView hasVerticalScroller];
-        [scrollView setNeverHasVerticalScroller:YES];
-        savedState.autoHidesScrollers = [scrollView autohidesScrollers];
-        [scrollView setAutohidesScrollers:YES];
-        
-        if ([pdfView hasReadingBar])
-            [pdfView toggleReadingBar];
-        
-        NSColor *backgroundColor = [NSColor blackColor];
-        [pdfView setBackgroundColor:backgroundColor];
-        [fullScreenWindow setBackgroundColor:backgroundColor];
-        [fullScreenWindow setLevel:NSPopUpMenuWindowLevel];
-        
-        isPresentation = YES;
-    //}
+    NSColor *backgroundColor = [NSColor blackColor];
+    [pdfView setBackgroundColor:backgroundColor];
+    [fullScreenWindow setBackgroundColor:backgroundColor];
+    [fullScreenWindow setLevel:NSPopUpMenuWindowLevel];
     
-    return YES; //err == kCGErrorSuccess;
+    isPresentation = YES;
 }
 
 - (void)exitPresentationMode {
@@ -1179,11 +1168,6 @@
     [scrollView setHasVerticalScroller:savedState.hasVerticalScroller];
     [scrollView setAutohidesScrollers:savedState.autoHidesScrollers];		
     
-    // Get the screen information.
-    //NSScreen *screen = [fullScreenWindow screen];
-    //NSNumber *screenID = [[screen deviceDescription] objectForKey:@"NSScreenNumber"];
-    //CGDisplayRelease((CGDirectDisplayID)[screenID longValue]);
-    
     NSColor *backgroundColor = [NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:SKFullScreenBackgroundColorKey]];
     [pdfView setBackgroundColor:backgroundColor];
     [fullScreenWindow setBackgroundColor:backgroundColor];
@@ -1196,14 +1180,11 @@
     if ([self isFullScreen])
         return;
     
-    NSScreen *screen = [[self window] screen]; // @@ or should we use the main screen?
-    if (screen == nil)
+    NSScreen *screen = [[self window] screen]; // @@ screen: or should we use the main screen?
+    if (screen == nil) // @@ screen: can this ever happen?
         screen = [NSScreen mainScreen];
-    
     if ([screen isEqual:[[NSScreen screens] objectAtIndex:0]])
         SetSystemUIMode(kUIModeAllHidden, kUIOptionAutoShowMenuBar);
-    else
-        SetSystemUIMode(kUIModeNormal, 0);
     
     if ([self isPresentation])
         [self exitPresentationMode];
@@ -1220,18 +1201,20 @@
     
     BOOL wasFullScreen = [self isFullScreen];
     
-    if ([self enterPresentationMode]) {
-        
-        if (wasFullScreen) {
-            [self hideSideWindows];
-        } else
-            [self goFullScreen];
-        
+    [self enterPresentationMode];
+    
+    NSScreen *screen = [[self window] screen]; // @@ screen: or should we use the main screen?
+    if (screen == nil) // @@ screen: can this ever happen?
+        screen = [NSScreen mainScreen];
+    if ([screen isEqual:[[NSScreen screens] objectAtIndex:0]])
         SetSystemUIMode(kUIModeAllHidden, 0);
-        
-        [pdfView setHasNavigation:YES autohidesCursor:YES];
-        
-    } else NSBeep(); // or an alert?
+    
+    if (wasFullScreen)
+        [self hideSideWindows];
+    else
+        [self goFullScreen];
+    
+    [pdfView setHasNavigation:YES autohidesCursor:YES];
 }
 
 - (IBAction)exitFullScreen:(id)sender {


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

Revision: 1691
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1691&view=rev
Author:   hofman
Date:     2007-04-01 05:27:07 -0700 (Sun, 01 Apr 2007)

Log Message:
-----------
Disable outline button when there is no outline.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-01 09:33:53 UTC (rev 1690)
+++ trunk/SKMainWindowController.m	2007-04-01 12:27:07 UTC (rev 1691)
@@ -250,6 +250,7 @@
             NSWidth([leftSideContentBox frame]) > 0.0)
             [self toggleLeftSidePane:self];
         [self setLeftSidePaneState:SKThumbnailSidePaneState];
+        [leftSideButton setEnabled:NO forSegment:SKOutlineSidePaneState];
     } else if ([[NSUserDefaults standardUserDefaults] boolForKey:SKOpenContentsPaneOnlyForTOCKey] &&
                NSWidth([leftSideContentBox frame]) <= 0.0) {
         [self toggleLeftSidePane:self];


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

Revision: 1698
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1698&view=rev
Author:   hofman
Date:     2007-04-02 09:20:23 -0700 (Mon, 02 Apr 2007)

Log Message:
-----------
Update selection of font manager when active annotation changes and when the main window becomes main. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-02 13:57:20 UTC (rev 1697)
+++ trunk/SKMainWindowController.m	2007-04-02 16:20:23 UTC (rev 1698)
@@ -392,8 +392,12 @@
 
 - (void)windowDidBecomeKey:(NSNotification *)aNotification {
     PDFAnnotation *annotation = [pdfView activeAnnotation];
-    if ([annotation isNoteAnnotation])
+    
+    if ([annotation isNoteAnnotation]) {
+        if ([annotation respondsToSelector:@selector(font)])
+            [[NSFontManager sharedFontManager] setSelectedFont:[(PDFAnnotationFreeText *)annotation font] isMultiple:NO];
         [[NSColorPanel sharedColorPanel] setColor:[annotation color]];
+    }
 }
 
 #pragma mark Accessors
@@ -1703,8 +1707,11 @@
         if ([self selectedNote] != annotation) {
             [noteOutlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:[noteOutlineView rowForItem:annotation]] byExtendingSelection:NO];
         }
-        if ([[self window] isKeyWindow])
+        if ([[self window] isKeyWindow]) {
+            if ([annotation respondsToSelector:@selector(font)])
+                [[NSFontManager sharedFontManager] setSelectedFont:[(PDFAnnotationFreeText *)annotation font] isMultiple:NO];
             [[NSColorPanel sharedColorPanel] setColor:[annotation color]];
+        }
     } else {
         [noteOutlineView deselectAll:self];
     }


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

Revision: 1700
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1700&view=rev
Author:   hofman
Date:     2007-04-02 10:54:20 -0700 (Mon, 02 Apr 2007)

Log Message:
-----------
use convertFont method instead of panelConvertFont, as the latter does not immediately apply the conversion, apparently. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-02 16:43:20 UTC (rev 1699)
+++ trunk/SKMainWindowController.m	2007-04-02 17:54:20 UTC (rev 1700)
@@ -660,7 +660,7 @@
 - (IBAction)changeFont:(id)sender{
     PDFAnnotation *annotation = [pdfView activeAnnotation];
     if ([annotation isNoteAnnotation] && [annotation respondsToSelector:@selector(setFont:)] && [annotation respondsToSelector:@selector(font)]) {
-        NSFont *font = [[NSFontPanel sharedFontPanel] panelConvertFont:[(PDFAnnotationFreeText *)annotation font]];
+        NSFont *font = [sender convertFont:[(PDFAnnotationFreeText *)annotation font]];
         if ([annotation respondsToSelector:@selector(setDefaultFont:)] && [annotation respondsToSelector:@selector(font)])
             [(SKPDFAnnotationFreeText *)annotation setDefaultFont:font];
         else


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

Revision: 1705
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1705&view=rev
Author:   hofman
Date:     2007-04-02 13:33:00 -0700 (Mon, 02 Apr 2007)

Log Message:
-----------
Disable TOC menu item when there is no outline.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-02 19:21:49 UTC (rev 1704)
+++ trunk/SKMainWindowController.m	2007-04-02 20:33:00 UTC (rev 1705)
@@ -3024,7 +3024,7 @@
         return [self isPresentation] == NO;
     } else if (action == @selector(changeLeftSidePaneState:)) {
         [menuItem setState:(int)leftSidePaneState == [menuItem tag] ? ([findTableView window] ? NSMixedState : NSOnState) : NSOffState];
-        return YES;
+        return [menuItem tag] == SKThumbnailSidePaneState || pdfOutline;
     } else if (action == @selector(changeRightSidePaneState:)) {
         [menuItem setState:(int)rightSidePaneState == [menuItem tag] ? NSOnState : NSOffState];
         return YES;


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

Revision: 1707
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1707&view=rev
Author:   hofman
Date:     2007-04-02 15:12:09 -0700 (Mon, 02 Apr 2007)

Log Message:
-----------
Go back to destination when reloading document.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-02 21:44:13 UTC (rev 1706)
+++ trunk/SKMainWindowController.m	2007-04-02 22:12:09 UTC (rev 1707)
@@ -416,10 +416,26 @@
         
         [self unregisterForDocumentNotifications];
         
+        PDFDestination *dest;
+        unsigned pageIndex = NSNotFound;
+        NSPoint point = NSZeroPoint;
+        
+        if ([pdfView document]) {
+            dest = [pdfView currentDestination];
+            pageIndex = [[pdfView document] indexForPage:[dest page]];
+            point = [dest point];
+        }
+        
         [[pdfView document] setDelegate:nil];
         [pdfView setDocument:document];
         [[pdfView document] setDelegate:self];
         
+        if (pageIndex != NSNotFound && [document pageCount]) {
+            PDFPage *page = [document pageAtIndex:MIN(pageIndex, [document pageCount])];
+            dest = [[[PDFDestination alloc] initWithPage:page point:point] autorelease];
+            [pdfView goToDestination:dest];
+        }
+        
         [self registerForDocumentNotifications];
         
         [pdfOutline release];


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

Revision: 1710
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1710&view=rev
Author:   hofman
Date:     2007-04-03 06:07:01 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
Delay reselecting page after reloading the document, so the pdfview has time to set up. 

Highlight search result from find panel. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-02 23:20:49 UTC (rev 1709)
+++ trunk/SKMainWindowController.m	2007-04-03 13:07:01 UTC (rev 1710)
@@ -409,13 +409,6 @@
 - (void)setPdfDocument:(PDFDocument *)document{
     if ([pdfView document] != document) {
         
-        // these will be invalid. If needed, the document will restore them
-        [[self mutableArrayValueForKey:@"notes"] removeAllObjects];
-        
-        [lastViewedPages removeAllObjects];
-        
-        [self unregisterForDocumentNotifications];
-        
         PDFDestination *dest;
         unsigned pageIndex = NSNotFound;
         NSPoint point = NSZeroPoint;
@@ -426,16 +419,17 @@
             point = [dest point];
         }
         
+        // these will be invalid. If needed, the document will restore them
+        [[self mutableArrayValueForKey:@"notes"] removeAllObjects];
+        
+        [lastViewedPages removeAllObjects];
+        
+        [self unregisterForDocumentNotifications];
+        
         [[pdfView document] setDelegate:nil];
         [pdfView setDocument:document];
         [[pdfView document] setDelegate:self];
         
-        if (pageIndex != NSNotFound && [document pageCount]) {
-            PDFPage *page = [document pageAtIndex:MIN(pageIndex, [document pageCount])];
-            dest = [[[PDFDestination alloc] initWithPage:page atPoint:point] autorelease];
-            [pdfView goToDestination:dest];
-        }
-        
         [self registerForDocumentNotifications];
         
         [pdfOutline release];
@@ -455,6 +449,12 @@
         
         [self resetThumbnails];
         [self updateThumbnailSelection];
+        
+        if (pageIndex != NSNotFound && [document pageCount]) {
+            PDFPage *page = [document pageAtIndex:MIN(pageIndex, [document pageCount])];
+            dest = [[[PDFDestination alloc] initWithPage:page atPoint:point] autorelease];
+            [pdfView performSelector:@selector(goToDestination:) withObject:dest afterDelay:0.0];
+        }
     }
 }
 
@@ -1553,6 +1553,8 @@
     if (selection) {
         [findTableView deselectAll:self];
 		[pdfView setCurrentSelection:selection];
+        [self removeTemporaryAnnotations];
+        [self addAnnotationsForSelection:selection];
 		[pdfView scrollSelectionToVisible:self];
 	} else {
 		NSBeep();


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

Revision: 1712
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1712&view=rev
Author:   hofman
Date:     2007-04-03 07:47:14 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
Search pdf document asynchronously.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-03 13:25:23 UTC (rev 1711)
+++ trunk/SKMainWindowController.m	2007-04-03 14:47:14 UTC (rev 1712)
@@ -1543,7 +1543,7 @@
     } else {
         [self fadeInSearchView];
     }
-    [[pdfView document] findString:[sender stringValue] withOptions:NSCaseInsensitiveSearch];
+    [[pdfView document] beginFindString:[sender stringValue] withOptions:NSCaseInsensitiveSearch];
 }
 
 - (void)findString:(NSString *)string options:(int)options{
@@ -2174,6 +2174,18 @@
 
 - (id)tableView:(NSTableView *)tv objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row { return nil; }
 
+- (BOOL)tableView:(NSTableView *)tv commandSelectRow:(int)row {
+    if ([tv isEqual:thumbnailTableView]) {
+        NSRect rect = [[[pdfView document] pageAtIndex:row] boundsForBox:[pdfView displayBox]];
+        
+        rect.origin.y = NSMidY(rect) - 100.0;
+        rect.size.height = 200.0;
+        [self showSnapshotAtPageNumber:row forRect:rect factor:1];
+        return YES;
+    }
+    return NO;
+}
+
 - (float)tableView:(NSTableView *)tv heightOfRow:(int)row {
     if ([tv isEqual:thumbnailTableView]) {
         NSSize thumbSize = [[[[self thumbnails] objectAtIndex:row] image] size];


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

Revision: 1715
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1715&view=rev
Author:   amaxwell
Date:     2007-04-03 09:32:07 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
Use threaded animation in find progress spinner.

Cancel search when beginning a new one or clearing the searchfield.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-03 15:08:34 UTC (rev 1714)
+++ trunk/SKMainWindowController.m	2007-04-03 16:32:07 UTC (rev 1715)
@@ -200,6 +200,8 @@
     [self displayOutlineView];
     [self displayNoteView];
     
+    [spinner setUsesThreadedAnimation:YES];
+    
     // we retain as we might replace it with the full screen window
     mainWindow = [[self window] retain];
     
@@ -1533,7 +1535,13 @@
 }
 
 - (IBAction)search:(id)sender {
+
+    // cancel any previous find to remove those results, or else they stay around
+    if ([[pdfView document] isFinding])
+        [[pdfView document] cancelFindString];
+
     if ([[sender stringValue] isEqualToString:@""]) {
+        
         // get rid of temporary annotations
         [self removeTemporaryAnnotations];
         if (leftSidePaneState == SKThumbnailSidePaneState)
@@ -1542,8 +1550,8 @@
             [self fadeInOutlineView];
     } else {
         [self fadeInSearchView];
+        [[pdfView document] beginFindString:[sender stringValue] withOptions:NSCaseInsensitiveSearch];
     }
-    [[pdfView document] beginFindString:[sender stringValue] withOptions:NSCaseInsensitiveSearch];
 }
 
 - (void)findString:(NSString *)string options:(int)options{


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

Revision: 1716
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1716&view=rev
Author:   hofman
Date:     2007-04-03 10:31:06 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
Always use crop box for snapshots. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-03 16:32:07 UTC (rev 1715)
+++ trunk/SKMainWindowController.m	2007-04-03 17:31:06 UTC (rev 1716)
@@ -3229,3 +3229,38 @@
 }
 
 @end
+
+
+@interface SKProgressIndicator : NSProgressIndicator
+@end
+
+@implementation SKProgressIndicator
+
+- (void)setDoubleValue:(double)newValue {
+    [super setDoubleValue:newValue];
+    [self setNeedsDisplay:YES];
+}
+
+- (void)drawRect:(NSRect)aRect {
+    NSRect bounds = [self bounds];
+    NSPoint center = NSMakePoint(NSMidX(bounds), NSMidY(bounds));
+    NSBezierPath *path = [NSBezierPath bezierPath];
+    double angle = ([self doubleValue] - [self minValue]) / ([self maxValue] - [self minValue]) * 360.0;
+    
+    [NSGraphicsContext saveGraphicsState];
+    
+    [[NSColor selectedControlColor] set];
+    [[NSBezierPath bezierPathWithOvalInRect:bounds] fill];
+    [[NSColor controlBackgroundColor] set];
+    [[NSBezierPath bezierPathWithOvalInRect:NSInsetRect(bounds, 2.0, 2.0)] fill];
+    [[NSColor selectedControlColor] set];
+    
+    [path moveToPoint:center];
+    [path appendBezierPathWithArcWithCenter:center radius:0.5 * NSWidth(bounds) - 1.0 startAngle:270.0 + angle endAngle:270.0 clockwise:YES];
+    [path closePath];
+    [path fill];
+    
+    [NSGraphicsContext restoreGraphicsState];
+}
+
+@end


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

Revision: 1717
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1717&view=rev
Author:   hofman
Date:     2007-04-03 10:32:37 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
Revert last changes, experimental code.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-03 17:31:06 UTC (rev 1716)
+++ trunk/SKMainWindowController.m	2007-04-03 17:32:37 UTC (rev 1717)
@@ -3229,38 +3229,3 @@
 }
 
 @end
-
-
-@... SKProgressIndicator : NSProgressIndicator
-@...
-
-@... SKProgressIndicator
-
-- (void)setDoubleValue:(double)newValue {
-    [super setDoubleValue:newValue];
-    [self setNeedsDisplay:YES];
-}
-
-- (void)drawRect:(NSRect)aRect {
-    NSRect bounds = [self bounds];
-    NSPoint center = NSMakePoint(NSMidX(bounds), NSMidY(bounds));
-    NSBezierPath *path = [NSBezierPath bezierPath];
-    double angle = ([self doubleValue] - [self minValue]) / ([self maxValue] - [self minValue]) * 360.0;
-    
-    [NSGraphicsContext saveGraphicsState];
-    
-    [[NSColor selectedControlColor] set];
-    [[NSBezierPath bezierPathWithOvalInRect:bounds] fill];
-    [[NSColor controlBackgroundColor] set];
-    [[NSBezierPath bezierPathWithOvalInRect:NSInsetRect(bounds, 2.0, 2.0)] fill];
-    [[NSColor selectedControlColor] set];
-    
-    [path moveToPoint:center];
-    [path appendBezierPathWithArcWithCenter:center radius:0.5 * NSWidth(bounds) - 1.0 startAngle:270.0 + angle endAngle:270.0 clockwise:YES];
-    [path closePath];
-    [path fill];
-    
-    [NSGraphicsContext restoreGraphicsState];
-}
-
-@...


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

Revision: 1718
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1718&view=rev
Author:   hofman
Date:     2007-04-03 10:54:14 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
Revert an earlier commit. Don't highlight search results from find panel. I remember why I did not do that initially: there is no way to remove it. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-03 17:32:37 UTC (rev 1717)
+++ trunk/SKMainWindowController.m	2007-04-03 17:54:14 UTC (rev 1718)
@@ -1561,8 +1561,6 @@
     if (selection) {
         [findTableView deselectAll:self];
 		[pdfView setCurrentSelection:selection];
-        [self removeTemporaryAnnotations];
-        [self addAnnotationsForSelection:selection];
 		[pdfView scrollSelectionToVisible:self];
 	} else {
 		NSBeep();


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

Revision: 1719
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1719&view=rev
Author:   amaxwell
Date:     2007-04-03 15:30:01 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
CFSetApplier function was supposed to be static.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-03 17:54:14 UTC (rev 1718)
+++ trunk/SKMainWindowController.m	2007-04-03 22:30:01 UTC (rev 1719)
@@ -1514,7 +1514,7 @@
     }
 }
 
-void removeTemporaryAnnotations(const void *annotation, void *context)
+static void removeTemporaryAnnotations(const void *annotation, void *context)
 {
     SKMainWindowController *wc = (SKMainWindowController *)context;
     PDFAnnotation *annote = (PDFAnnotation *)annotation;


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

Revision: 1743
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1743&view=rev
Author:   hofman
Date:     2007-04-05 01:41:40 -0700 (Thu, 05 Apr 2007)

Log Message:
-----------
Don't go out of fullscreen when going to another app. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-05 04:08:28 UTC (rev 1742)
+++ trunk/SKMainWindowController.m	2007-04-05 08:41:40 UTC (rev 1743)
@@ -1709,11 +1709,6 @@
         [self exitFullScreen:self];
 }
 
-- (void)handleApplicationWillResignActiveNotification:(NSNotification *)notification {
-    if ([self isFullScreen] || [self isPresentation])
-        [self exitFullScreen:self];
-}
-
 - (void)handleDidChangeActiveAnnotationNotification:(NSNotification *)notification {
     PDFAnnotation *annotation = [pdfView activeAnnotation];
     


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

Revision: 1745
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1745&view=rev
Author:   hofman
Date:     2007-04-05 01:58:40 -0700 (Thu, 05 Apr 2007)

Log Message:
-----------
Don't observe resignActive.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-05 08:46:14 UTC (rev 1744)
+++ trunk/SKMainWindowController.m	2007-04-05 08:58:40 UTC (rev 1745)
@@ -276,8 +276,6 @@
     // Application
     [nc addObserver:self selector:@selector(handleApplicationWillTerminateNotification:) 
                              name:SKApplicationWillTerminateNotification object:NSApp];
-    [nc addObserver:self selector:@selector(handleApplicationWillResignActiveNotification:) 
-                             name:NSApplicationWillResignActiveNotification object:NSApp];
     // PDFView
     [nc addObserver:self selector:@selector(handlePageChangedNotification:) 
                              name:PDFViewPageChangedNotification object:pdfView];


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

Revision: 1798
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1798&view=rev
Author:   hofman
Date:     2007-04-10 13:33:19 -0700 (Tue, 10 Apr 2007)

Log Message:
-----------
Make sure we show the left side pane when setting an (initial) search result (from spotlight or bibdesk). 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-10 20:10:27 UTC (rev 1797)
+++ trunk/SKMainWindowController.m	2007-04-10 20:33:19 UTC (rev 1798)
@@ -1573,6 +1573,8 @@
 }
 
 - (void)displaySearchResultsForString:(NSString *)string {
+    if (NSWidth([leftSideContentBox frame]) <= 0.0)
+        [self toggleLeftSidePane:self];
     [searchField setStringValue:string];
     [self search:searchField];
 }


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

Revision: 1799
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1799&view=rev
Author:   hofman
Date:     2007-04-12 01:38:32 -0700 (Thu, 12 Apr 2007)

Log Message:
-----------
Show number of pages in window title. Request from users list. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-10 20:33:19 UTC (rev 1798)
+++ trunk/SKMainWindowController.m	2007-04-12 08:38:32 UTC (rev 1799)
@@ -425,6 +425,13 @@
     return setup;
 }
 
+- (NSString *)windowTitleForDocumentDisplayName:(NSString *)displayName {
+    if ([pdfView document])
+        return [NSString stringWithFormat:NSLocalizedString(@"%@ (%i pages)", @"Window title format"), displayName, [[pdfView document] pageCount]];
+    else
+        return displayName;
+}
+
 - (void)windowDidBecomeKey:(NSNotification *)notification {
     PDFAnnotation *annotation = [pdfView activeAnnotation];
     


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

Revision: 1801
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1801&view=rev
Author:   hofman
Date:     2007-04-12 02:49:36 -0700 (Thu, 12 Apr 2007)

Log Message:
-----------
Setup toolbar before setting the window frame. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-12 09:04:42 UTC (rev 1800)
+++ trunk/SKMainWindowController.m	2007-04-12 09:49:36 UTC (rev 1801)
@@ -220,6 +220,8 @@
     
     [spinner setUsesThreadedAnimation:YES];
     
+    [self setupToolbar];
+    
     // we retain as we might replace it with the full screen window
     mainWindow = [[self window] retain];
     
@@ -232,8 +234,6 @@
     [noteArrayController setSortDescriptors:[NSArray arrayWithObjects:indexSortDescriptor, contentsSortDescriptor, nil]];
     [snapshotArrayController setSortDescriptors:[NSArray arrayWithObjects:indexSortDescriptor, nil]];
     
-    [self setupToolbar];
-    
     if ([[NSUserDefaults standardUserDefaults] boolForKey:SKOpenFilesMaximizedKey])
         [[self window] setFrame:[[NSScreen mainScreen] visibleFrame] display:NO];
     


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

Revision: 1817
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1817&view=rev
Author:   hofman
Date:     2007-04-15 01:43:42 -0700 (Sun, 15 Apr 2007)

Log Message:
-----------
Rearrange notes after adding a new one. This ought to be done by NSArrayController.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-13 17:00:04 UTC (rev 1816)
+++ trunk/SKMainWindowController.m	2007-04-15 08:43:42 UTC (rev 1817)
@@ -1811,6 +1811,7 @@
     if (annotation) {
         updatingNoteSelection = YES;
         [noteArrayController addObject:annotation];
+        [noteArrayController rearrangeObjects]; // doesn't see to be done automatically
         updatingNoteSelection = NO;
     }
     if (page) {


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

Revision: 1820
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1820&view=rev
Author:   hofman
Date:     2007-04-15 02:40:13 -0700 (Sun, 15 Apr 2007)

Log Message:
-----------
Subsort notes by the top of their bounds. (second attempt)

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-15 09:29:49 UTC (rev 1819)
+++ trunk/SKMainWindowController.m	2007-04-15 09:40:13 UTC (rev 1820)
@@ -229,10 +229,10 @@
     
     [[self window] setBackgroundColor:[NSColor colorWithDeviceWhite:0.9 alpha:1.0]];
     
-    NSSortDescriptor *indexSortDescriptor = [[[NSSortDescriptor alloc] initWithKey:@"pageIndex" ascending:YES] autorelease];
-    NSSortDescriptor *contentsSortDescriptor = [[[NSSortDescriptor alloc] initWithKey:@"contents" ascending:YES] autorelease];
-    [noteArrayController setSortDescriptors:[NSArray arrayWithObjects:indexSortDescriptor, contentsSortDescriptor, nil]];
-    [snapshotArrayController setSortDescriptors:[NSArray arrayWithObjects:indexSortDescriptor, nil]];
+    NSSortDescriptor *pageIndexSortDescriptor = [[[NSSortDescriptor alloc] initWithKey:@"pageIndex" ascending:YES] autorelease];
+    NSSortDescriptor *boundsTopSortDescriptor = [[[NSSortDescriptor alloc] initWithKey:@"boundsTop" ascending:NO] autorelease];
+    [noteArrayController setSortDescriptors:[NSArray arrayWithObjects:pageIndexSortDescriptor, boundsTopSortDescriptor, nil]];
+    [snapshotArrayController setSortDescriptors:[NSArray arrayWithObjects:pageIndexSortDescriptor, nil]];
     
     if ([[NSUserDefaults standardUserDefaults] boolForKey:SKOpenFilesMaximizedKey])
         [[self window] setFrame:[[NSScreen mainScreen] visibleFrame] display:NO];


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

Revision: 1827
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1827&view=rev
Author:   hofman
Date:     2007-04-15 15:38:09 -0700 (Sun, 15 Apr 2007)

Log Message:
-----------
Don't close notes pane; we should use the width from the prefs. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-15 18:39:11 UTC (rev 1826)
+++ trunk/SKMainWindowController.m	2007-04-15 22:38:09 UTC (rev 1827)
@@ -272,8 +272,6 @@
                NSWidth([leftSideContentBox frame]) <= 0.0) {
         [self toggleLeftSidePane:self];
     }
-    if (NSWidth([rightSideContentBox frame]) > 0.0)
-        [self toggleRightSidePane:self];
     
     [pdfView setBackgroundColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:SKBackgroundColorKey]]];
     


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

Revision: 1834
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1834&view=rev
Author:   amaxwell
Date:     2007-04-16 15:22:58 -0700 (Mon, 16 Apr 2007)

Log Message:
-----------
- Fix leak of toolbarItems dictionary.
- Invalidate timers when the window closes, since they'll prevent -dealloc
  from being called and cause a crash if thumbnails are rendering when the
  doc is closed.
- Add a warning of another leak from MallocDebug, and a comment.  If anyone
  can clarify the memory management here, please do so.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-16 21:20:32 UTC (rev 1833)
+++ trunk/SKMainWindowController.m	2007-04-16 22:22:58 UTC (rev 1834)
@@ -149,22 +149,6 @@
     
 	[[NSNotificationCenter defaultCenter] removeObserver: self];
     [self unregisterAsObserver];
-    
-    if (thumbnailTimer) {
-        [thumbnailTimer invalidate];
-        [thumbnailTimer release];
-        thumbnailTimer = nil;
-    }
-    if (snapshotTimer) {
-        [snapshotTimer invalidate];
-        [snapshotTimer release];
-        snapshotTimer = nil;
-    }
-    if (findTimer) {
-        [findTimer invalidate];
-        [findTimer release];
-        findTimer = nil;
-    }
     [(id)temporaryAnnotations release];
     [dirtyThumbnails release];
     [dirtySnapshots release];
@@ -178,6 +162,7 @@
 	[rightSideWindow release];
 	[fullScreenWindow release];
     [mainWindow release];
+    [toolbarItems release];
     
     [super dealloc];
 }
@@ -446,6 +431,23 @@
         NSString *path = [[[self document] fileURL] path];
         if (pageIndex != NSNotFound && path)
             [[SKBookmarkController sharedBookmarkController] addRecentDocumentForPath:path pageIndex:pageIndex];
+        
+        // timers retain their target, so invalidate them now or they may keep firing after the PDF is gone
+        if (thumbnailTimer) {
+            [thumbnailTimer invalidate];
+            [thumbnailTimer release];
+            thumbnailTimer = nil;
+        }
+        if (snapshotTimer) {
+            [snapshotTimer invalidate];
+            [snapshotTimer release];
+            snapshotTimer = nil;
+        }
+        if (findTimer) {
+            [findTimer invalidate];
+            [findTimer release];
+            findTimer = nil;
+        }
     }
 }
 
@@ -2010,7 +2012,8 @@
     if ([ov isEqual:outlineView]) {
         if (item == nil){
             if ((pdfOutline) && ([[pdfView document] isLocked] == NO)){
-                
+#warning leaks 
+                // arm: This return and the one just below that retain the item are necessary to prevent a crash (and appear in Apple's sample code), but MallocDebug says we're leaking them when the doc is closed.  Can someone explain this?
                 return [[pdfOutline childAtIndex: index] retain];
                 
             }else{


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

Revision: 1835
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1835&view=rev
Author:   amaxwell
Date:     2007-04-16 15:26:18 -0700 (Mon, 16 Apr 2007)

Log Message:
-----------
fix comment

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-16 22:22:58 UTC (rev 1834)
+++ trunk/SKMainWindowController.m	2007-04-16 22:26:18 UTC (rev 1835)
@@ -2013,7 +2013,7 @@
         if (item == nil){
             if ((pdfOutline) && ([[pdfView document] isLocked] == NO)){
 #warning leaks 
-                // arm: This return and the one just below that retain the item are necessary to prevent a crash (and appear in Apple's sample code), but MallocDebug says we're leaking them when the doc is closed.  Can someone explain this?
+                // arm: This retain and the one just below are necessary to prevent a crash (and appear in Apple's sample code), but MallocDebug says we're leaking them when the doc is closed.  Can someone explain this?
                 return [[pdfOutline childAtIndex: index] retain];
                 
             }else{


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

Revision: 1836
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1836&view=rev
Author:   hofman
Date:     2007-04-17 01:46:31 -0700 (Tue, 17 Apr 2007)

Log Message:
-----------
Remove testing code.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-16 22:26:18 UTC (rev 1835)
+++ trunk/SKMainWindowController.m	2007-04-17 08:46:31 UTC (rev 1836)
@@ -112,21 +112,6 @@
 
 - (id)initWithWindowNibName:(NSString *)windowNibName owner:(id)owner{
     self = [super initWithWindowNibName:windowNibName owner:owner];
-    NSColor *color;
-    color = [[[[SKPDFAnnotationFreeText alloc] initWithBounds:NSZeroRect] autorelease] color];
-    [[NSUserDefaults standardUserDefaults] setObject:[NSArchiver archivedDataWithRootObject:color] forKey:@"SKFreeTextNoteColorKey"];
-    color = [[[[SKPDFAnnotationNote alloc] initWithBounds:NSZeroRect] autorelease] color];
-    [[NSUserDefaults standardUserDefaults] setObject:[NSArchiver archivedDataWithRootObject:color] forKey:@"SKAnchoredNoteColorKey"];
-    color = [[[[SKPDFAnnotationCircle alloc] initWithBounds:NSZeroRect] autorelease] color];
-    [[NSUserDefaults standardUserDefaults] setObject:[NSArchiver archivedDataWithRootObject:color] forKey:@"SKCircleNoteColorKey"];
-    color = [[[[SKPDFAnnotationSquare alloc] initWithBounds:NSZeroRect] autorelease] color];
-    [[NSUserDefaults standardUserDefaults] setObject:[NSArchiver archivedDataWithRootObject:color] forKey:@"SKSquareNoteColorKey"];
-    color = [[[[SKPDFAnnotationMarkup alloc] initWithBounds:NSZeroRect markupType:kPDFMarkupTypeHighlight quadrilateralPointsAsStrings:nil] autorelease] color];
-    [[NSUserDefaults standardUserDefaults] setObject:[NSArchiver archivedDataWithRootObject:color] forKey:@"SKHighlightNoteColorKey"];
-    color = [[[[SKPDFAnnotationMarkup alloc] initWithBounds:NSZeroRect markupType:kPDFMarkupTypeUnderline quadrilateralPointsAsStrings:nil] autorelease] color];
-    [[NSUserDefaults standardUserDefaults] setObject:[NSArchiver archivedDataWithRootObject:color] forKey:@"SKUnderlineNoteColorKey"];
-    color = [[[[SKPDFAnnotationMarkup alloc] initWithBounds:NSZeroRect markupType:kPDFMarkupTypeStrikeOut quadrilateralPointsAsStrings:nil] autorelease] color];
-    [[NSUserDefaults standardUserDefaults] setObject:[NSArchiver archivedDataWithRootObject:color] forKey:@"SKStrikeOutNoteColorKey"];
     if(self){
         [self setShouldCloseDocument:YES];
         isPresentation = NO;


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

Revision: 1841
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1841&view=rev
Author:   hofman
Date:     2007-04-17 09:45:01 -0700 (Tue, 17 Apr 2007)

Log Message:
-----------
Remove outline items when reloading pdf document.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-17 16:19:59 UTC (rev 1840)
+++ trunk/SKMainWindowController.m	2007-04-17 16:45:01 UTC (rev 1841)
@@ -472,6 +472,7 @@
         
         [pdfOutline release];
         pdfOutline = [[[pdfView document] outlineRoot] retain];
+        [pdfOutlineItems removeAllObjects];
         if (pdfOutline && [[pdfView document] isLocked] == NO) {
             [outlineView reloadData];
             [outlineView setAutoresizesOutlineColumn: NO];


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

Revision: 1938
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1938&view=rev
Author:   hofman
Date:     2007-04-30 04:04:51 -0700 (Mon, 30 Apr 2007)

Log Message:
-----------
Add arrow as default toolbar item

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-30 10:59:35 UTC (rev 1937)
+++ trunk/SKMainWindowController.m	2007-04-30 11:04:51 UTC (rev 1938)
@@ -2997,7 +2997,8 @@
 		NSToolbarSeparatorItemIdentifier, 
         SKDocumentToolbarNewNoteItemIdentifier, 
         SKDocumentToolbarNewCircleNoteItemIdentifier, 
-        SKDocumentToolbarNewMarkupItemIdentifier, nil];
+        SKDocumentToolbarNewMarkupItemIdentifier,
+        SKDocumentToolbarNewArrowItemIdentifier, nil];
 }
 
 - (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar {


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

Revision: 1952
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1952&view=rev
Author:   hofman
Date:     2007-05-02 16:15:20 -0700 (Wed, 02 May 2007)

Log Message:
-----------
Allow editing text of markup in outlineview, so it can be used to tag the text. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-01 23:24:00 UTC (rev 1951)
+++ trunk/SKMainWindowController.m	2007-05-02 23:15:20 UTC (rev 1952)
@@ -2167,7 +2167,7 @@
                 [pdfView setActiveAnnotation:annotation];
                 [self showNote:annotation];
                 return NO;
-            } else if ([item isMovable]) {
+            } else {
                 return YES;
             }
         }


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

Revision: 1956
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1956&view=rev
Author:   hofman
Date:     2007-05-03 13:35:50 -0700 (Thu, 03 May 2007)

Log Message:
-----------
Scroll before changing temporary selections for find, otherwise the wrong rect may get scheduled for display. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-03 18:56:35 UTC (rev 1955)
+++ trunk/SKMainWindowController.m	2007-05-03 20:35:50 UTC (rev 1956)
@@ -1662,11 +1662,11 @@
     PDFSelection *selection = [[pdfView document] findString:string fromSelection:[pdfView currentSelection] withOptions:options];
 	findPanelFind = NO;
     if (selection) {
-        [self removeTemporaryAnnotations];
-        [findTableView deselectAll:self];
 		[pdfView setCurrentSelection:selection];
-        [self addAnnotationsForSelection:selection];
 		[pdfView scrollSelectionToVisible:self];
+        [findTableView deselectAll:self];
+        [self removeTemporaryAnnotations];
+        [self addAnnotationsForSelection:selection];
         findTimer = [[NSTimer scheduledTimerWithTimeInterval:10 target:self selector:@selector(findTimerFired:) userInfo:NULL repeats:NO] retain];
 	} else {
 		NSBeep();
@@ -2262,10 +2262,6 @@
         
         BOOL highlight = [[NSUserDefaults standardUserDefaults] boolForKey:SKShouldHighlightSearchResultsKey];
         
-        // clear the selection
-        [pdfView setCurrentSelection:nil];
-        [self removeTemporaryAnnotations];
-        
         // union all selected objects
         NSEnumerator *selE = [[findArrayController selectedObjects] objectEnumerator];
         PDFSelection *sel;
@@ -2273,6 +2269,11 @@
         // arm:  PDFSelection is mutable, and using -addSelection on an object from selectedObjects will actually mutate the object in searchResults, which does bad things.  MagicHat indicates that PDFSelection implements copyWithZone: even though it doesn't conform to <NSCopying>, so we'll use that since -init doesn't work (-initWithDocument: does, but it's not listed in the header either).  I filed rdar://problem/4888251 and also noticed that PDFKitViewer sample code uses -[PDFSelection copy].
         PDFSelection *currentSel = [[[selE nextObject] copy] autorelease];
         
+        [pdfView setCurrentSelection:currentSel];
+        [pdfView scrollSelectionToVisible:self];
+        
+        [self removeTemporaryAnnotations];
+        
         // add an annotation so it's easier to see the search result
         if (highlight)
             [self addAnnotationsForSelection:currentSel];
@@ -2283,8 +2284,6 @@
                 [self addAnnotationsForSelection:sel];
         }
         
-        [pdfView setCurrentSelection:currentSel];
-        [pdfView scrollSelectionToVisible:self];
     } else if ([[aNotification object] isEqual:thumbnailTableView]) {
         if (updatingThumbnailSelection == NO) {
             int row = [thumbnailTableView selectedRow];


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

Revision: 1959
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1959&view=rev
Author:   hofman
Date:     2007-05-03 15:00:35 -0700 (Thu, 03 May 2007)

Log Message:
-----------
Remove unused empty method.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-03 21:26:29 UTC (rev 1958)
+++ trunk/SKMainWindowController.m	2007-05-03 22:00:35 UTC (rev 1959)
@@ -2430,7 +2430,6 @@
         
         PDFPage *emptyPage = [[[PDFPage alloc] init] autorelease];
         [emptyPage setBounds:[[[pdfView document] pageAtIndex:0] boundsForBox:kPDFDisplayBoxCropBox] forBox:kPDFDisplayBoxCropBox];
-        [emptyPage setBounds:[[[pdfView document] pageAtIndex:0] boundsForBox:kPDFDisplayBoxCropBox] forBox:kPDFDisplayBoxMediaBox];
         NSImage *image = [emptyPage thumbnailWithSize:thumbnailCacheSize shadowBlurRadius:shadowBlurRadius shadowOffset:NSMakeSize(0.0, shadowOffset)];
         for (i = 0; i < count; i++) {
             SKThumbnail *thumbnail = [[SKThumbnail alloc] initWithImage:image label:[[pdfDoc pageAtIndex:i] label]];
@@ -2464,10 +2463,6 @@
         [tn setDirty:YES];
 }
 
-- (void)updateThumbnailsIfNeeded {
-
-}
-
 #pragma mark Notes
 
 - (void)updateNoteSelection {


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

Revision: 1962
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1962&view=rev
Author:   hofman
Date:     2007-05-03 16:39:20 -0700 (Thu, 03 May 2007)

Log Message:
-----------
Avoid defomring the app icon used as badge on empty thumbnails

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-03 23:22:59 UTC (rev 1961)
+++ trunk/SKMainWindowController.m	2007-05-03 23:39:20 UTC (rev 1962)
@@ -2429,8 +2429,9 @@
         [image lockFocus];
         NSRect imgRect = NSZeroRect;
         imgRect.size = [image size];
-        imgRect = NSInsetRect(imgRect, 0.2 * NSWidth(imgRect), 0.2 * NSHeight(imgRect));
-        [[NSImage imageNamed:@"NSApplicationIcon"] drawInRect:imgRect fromRect:NSZeroRect operation:NSCompositeCopy fraction:0.5];
+        float width = 0.8 * fmin(NSWidth(imgRect), NSHeight(imgRect));
+        imgRect = NSInsetRect(imgRect, 0.5 * (NSWidth(imgRect) - width), 0.5 * (NSHeight(imgRect) - width));
+        [[NSImage imageNamed:@"NSApplicationIcon"] drawInRect:imgRect fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:0.5];
         [image unlockFocus];
         
         for (i = 0; i < count; i++) {


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

Revision: 1963
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1963&view=rev
Author:   amaxwell
Date:     2007-05-03 18:48:20 -0700 (Thu, 03 May 2007)

Log Message:
-----------
Fix annotation sorting problem that's been driving me crazy.  Sort descriptors need to be set before loading the document.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-03 23:39:20 UTC (rev 1962)
+++ trunk/SKMainWindowController.m	2007-05-04 01:48:20 UTC (rev 1963)
@@ -159,11 +159,20 @@
 }
 
 - (void)windowDidLoad{
+    
     // this needs to be done before loading the PDFDocument
-    [self resetThumbnailSizeIfNeeded];
-    [self resetSnapshotSizeIfNeeded];
+    {
+        [self resetThumbnailSizeIfNeeded];
+        [self resetSnapshotSizeIfNeeded];
+        
+        NSSortDescriptor *pageIndexSortDescriptor = [[[NSSortDescriptor alloc] initWithKey:@"pageIndex" ascending:YES] autorelease];
+        NSSortDescriptor *boundsSortDescriptor = [[[NSSortDescriptor alloc] initWithKey:@"bounds" ascending:YES selector:@selector(boundsCompare:)] autorelease];
+        [noteArrayController setSortDescriptors:[NSArray arrayWithObjects:pageIndexSortDescriptor, boundsSortDescriptor, nil]];
+        [snapshotArrayController setSortDescriptors:[NSArray arrayWithObjects:pageIndexSortDescriptor, nil]];
+    }
     
-    // this is not called automatically, because the document overrides makeWindowControllers
+    // NB: the next line will load the PDF document and annotations, so necessary setup must be finished first!
+    // windowControllerDidLoadNib: is not called automatically because the document overrides makeWindowControllers
     [[self document] windowControllerDidLoadNib:self];
     
     [leftSideCollapsibleView setCollapseEdges:BDSKMaxXEdgeMask | BDSKMinYEdgeMask];
@@ -204,12 +213,7 @@
     [self setWindowFrameAutosaveNameOrCascade:SKMainWindowFrameAutosaveName];
     
     [[self window] setBackgroundColor:[NSColor colorWithDeviceWhite:0.9 alpha:1.0]];
-    
-    NSSortDescriptor *pageIndexSortDescriptor = [[[NSSortDescriptor alloc] initWithKey:@"pageIndex" ascending:YES] autorelease];
-    NSSortDescriptor *boundsSortDescriptor = [[[NSSortDescriptor alloc] initWithKey:@"bounds" ascending:YES selector:@selector(boundsCompare:)] autorelease];
-    [noteArrayController setSortDescriptors:[NSArray arrayWithObjects:pageIndexSortDescriptor, boundsSortDescriptor, nil]];
-    [snapshotArrayController setSortDescriptors:[NSArray arrayWithObjects:pageIndexSortDescriptor, nil]];
-    
+
     if ([[NSUserDefaults standardUserDefaults] boolForKey:SKOpenFilesMaximizedKey])
         [[self window] setFrame:[[NSScreen mainScreen] visibleFrame] display:NO];
     
@@ -445,6 +449,7 @@
 }
 
 - (void)setPdfDocument:(PDFDocument *)document{
+
     if ([pdfView document] != document) {
         
         PDFDestination *dest;
@@ -527,7 +532,7 @@
     NSEnumerator *e = [notes objectEnumerator];
     PDFAnnotation *annotation;
     
-    // remove the current anotations
+    // remove the current annotations
     [pdfView endAnnotationEdit:self];
     [pdfView setActiveAnnotation:nil];
     while (annotation = [e nextObject]) {


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

Revision: 1974
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1974&view=rev
Author:   hofman
Date:     2007-05-04 12:19:36 -0700 (Fri, 04 May 2007)

Log Message:
-----------
Fix another leak due to an appkit bug.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-04 19:00:55 UTC (rev 1973)
+++ trunk/SKMainWindowController.m	2007-05-04 19:19:36 UTC (rev 1974)
@@ -646,6 +646,11 @@
     [notes removeObjectAtIndex:theIndex];
 }
 
+// this one shouldn't be needed, but leaving it out leads to a leak from the binding of the NSArrayController
+- (NSArray *)thumbnails {
+    return thumbnails;
+}
+
 - (unsigned)countOfThumbnails {
     return [thumbnails count];
 }


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

Revision: 1980
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1980&view=rev
Author:   hofman
Date:     2007-05-05 11:27:25 -0700 (Sat, 05 May 2007)

Log Message:
-----------
Delay rowheight change note when image is redrawn, otherwise it will be ignored.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-05 17:24:48 UTC (rev 1979)
+++ trunk/SKMainWindowController.m	2007-05-05 18:27:25 UTC (rev 1980)
@@ -672,7 +672,7 @@
         
         newSize = [image size];
         if (fabs(newSize.width - oldSize.width) > 1.0 || fabs(newSize.height - oldSize.height) > 1.0) {
-            [thumbnailTableView noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndex:theIndex]];
+            [thumbnailTableView performSelector:@selector(noteHeightOfRowsWithIndexesChanged:) withObject:[NSIndexSet indexSetWithIndex:theIndex] afterDelay:0.0];
         }
     }
     return thumbnail;


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

Revision: 1985
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1985&view=rev
Author:   hofman
Date:     2007-05-06 11:00:52 -0700 (Sun, 06 May 2007)

Log Message:
-----------
Update find table in batches of 50, as redrawing is considerably slower than finding.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-06 17:10:10 UTC (rev 1984)
+++ trunk/SKMainWindowController.m	2007-05-06 18:00:52 UTC (rev 1985)
@@ -1560,8 +1560,11 @@
 }
 
 - (void)documentDidEndDocumentFind:(NSNotification *)note {
-    if (findPanelFind == NO)
+    if (findPanelFind == NO) {
         [spinner stopAnimation:nil];
+        [self willChangeValueForKey:@"searchResults"];
+        [self didChangeValueForKey:@"searchResults"];
+    }
 }
 
 - (void)documentDidEndPageFind:(NSNotification *)note {
@@ -1572,8 +1575,13 @@
 }
 
 - (void)didMatchString:(PDFSelection *)instance {
-    if (findPanelFind == NO)
-        [findArrayController addObject:instance];
+    if (findPanelFind == NO) {
+        [searchResults addObject:instance];
+        if ([searchResults count] % 50 == 0) {
+            [self willChangeValueForKey:@"searchResults"];
+            [self didChangeValueForKey:@"searchResults"];
+        }
+    }
 }
 
 - (void)addAnnotationsForSelection:(PDFSelection *)sel {


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

Revision: 1994
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1994&view=rev
Author:   hofman
Date:     2007-05-07 12:51:46 -0700 (Mon, 07 May 2007)

Log Message:
-----------
Remove all thumbnails when reloading the document, to avoid an exception. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-07 19:50:59 UTC (rev 1993)
+++ trunk/SKMainWindowController.m	2007-05-07 19:51:46 UTC (rev 1994)
@@ -473,6 +473,7 @@
         
         // these will be invalid. If needed, the document will restore them
         [[self mutableArrayValueForKey:@"notes"] removeAllObjects];
+        [[self mutableArrayValueForKey:@"thumbnails"] removeAllObjects];
         
         [lastViewedPages removeAllObjects];
         


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

Revision: 2008
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2008&view=rev
Author:   hofman
Date:     2007-05-09 10:53:04 -0700 (Wed, 09 May 2007)

Log Message:
-----------
Fix bug # 1715974. Layout document view after loading the PDF, mainly to fix the scaling when the PDF auto-scales. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-09 17:35:53 UTC (rev 2007)
+++ trunk/SKMainWindowController.m	2007-05-09 17:53:04 UTC (rev 2008)
@@ -243,6 +243,9 @@
     // windowControllerDidLoadNib: is not called automatically because the document overrides makeWindowControllers
     [[self document] windowControllerDidLoadNib:self];
     
+    // this is mainly needed when the pdf auto-scales
+    [pdfView layoutDocumentView];
+    
     if (pdfOutline == nil) {
         if ([[NSUserDefaults standardUserDefaults] boolForKey:SKOpenContentsPaneOnlyForTOCKey] &&
             NSWidth([leftSideContentBox frame]) > 0.0)


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

Revision: 2009
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2009&view=rev
Author:   hofman
Date:     2007-05-09 11:03:05 -0700 (Wed, 09 May 2007)

Log Message:
-----------
Enable note toolbar items in note tool mode. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-09 17:53:04 UTC (rev 2008)
+++ trunk/SKMainWindowController.m	2007-05-09 18:03:05 UTC (rev 2009)
@@ -3127,8 +3127,8 @@
         return YES;
     } else if ([identifier isEqualToString:SKDocumentToolbarPresentationItemIdentifier]) {
         return YES;
-    } else if ([identifier isEqualToString:SKDocumentToolbarNewNoteItemIdentifier] || [identifier isEqualToString:SKDocumentToolbarNewCircleNoteItemIdentifier]) {
-        return [pdfView toolMode] == SKTextToolMode;
+    } else if ([identifier isEqualToString:SKDocumentToolbarNewNoteItemIdentifier] || [identifier isEqualToString:SKDocumentToolbarNewCircleNoteItemIdentifier] || [identifier isEqualToString:SKDocumentToolbarNewArrowItemIdentifier]) {
+        return [pdfView toolMode] == SKTextToolMode || [pdfView toolMode] == SKNoteToolMode;
     } else if ([identifier isEqualToString:SKDocumentToolbarNewMarkupItemIdentifier]) {
         return [pdfView toolMode] == SKTextToolMode && [[[pdfView currentSelection] pages] count];
     } else if ([identifier isEqualToString:SKDocumentToolbarInfoItemIdentifier]) {


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

Revision: 2010
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2010&view=rev
Author:   hofman
Date:     2007-05-09 11:04:54 -0700 (Wed, 09 May 2007)

Log Message:
-----------
Enable note menu items in note tool mode. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-09 18:03:05 UTC (rev 2009)
+++ trunk/SKMainWindowController.m	2007-05-09 18:04:54 UTC (rev 2010)
@@ -3130,7 +3130,7 @@
     } else if ([identifier isEqualToString:SKDocumentToolbarNewNoteItemIdentifier] || [identifier isEqualToString:SKDocumentToolbarNewCircleNoteItemIdentifier] || [identifier isEqualToString:SKDocumentToolbarNewArrowItemIdentifier]) {
         return [pdfView toolMode] == SKTextToolMode || [pdfView toolMode] == SKNoteToolMode;
     } else if ([identifier isEqualToString:SKDocumentToolbarNewMarkupItemIdentifier]) {
-        return [pdfView toolMode] == SKTextToolMode && [[[pdfView currentSelection] pages] count];
+        return ([pdfView toolMode] == SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [[[pdfView currentSelection] pages] count];
     } else if ([identifier isEqualToString:SKDocumentToolbarInfoItemIdentifier]) {
         return YES;
     } else {
@@ -3142,7 +3142,7 @@
     SEL action = [menuItem action];
     if (action == @selector(createNewNote:)) {
         BOOL isMarkup = [menuItem tag] == SKHighlightNote || [menuItem tag] == SKUnderlineNote || [menuItem tag] == SKStrikeOutNote;
-        return [pdfView toolMode] == SKTextToolMode && (isMarkup == NO || [[[pdfView currentSelection] pages] count]);
+        return ([pdfView toolMode] == SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && (isMarkup == NO || [[[pdfView currentSelection] pages] count]);
     } else if (action == @selector(editNote:)) {
         PDFAnnotation *annotation = [pdfView activeAnnotation];
         return [annotation isNoteAnnotation] && ([[annotation type] isEqualToString:@"FreeText"] || [[annotation type] isEqualToString:@"Note"]);


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

Revision: 2035
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2035&view=rev
Author:   hofman
Date:     2007-05-14 06:43:32 -0700 (Mon, 14 May 2007)

Log Message:
-----------
Find panel find starts at current page when there is no selection. Wrap search. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-13 14:41:15 UTC (rev 2034)
+++ trunk/SKMainWindowController.m	2007-05-14 13:43:32 UTC (rev 2035)
@@ -1679,8 +1679,16 @@
 }
 
 - (void)findString:(NSString *)string options:(int)options{
+    PDFSelection *sel = [pdfView currentSelection];
+    unsigned pageIndex = [[pdfView document] indexForPage:[pdfView currentPage]];
+    while ([sel string] == nil && pageIndex-- > 0) {
+        PDFPage *page = [[pdfView document] pageAtIndex:pageIndex];
+        sel = [page selectionForRect:[page boundsForBox:kPDFDisplayBoxCropBox]];
+    }
 	findPanelFind = YES;
-    PDFSelection *selection = [[pdfView document] findString:string fromSelection:[pdfView currentSelection] withOptions:options];
+    PDFSelection *selection = [[pdfView document] findString:string fromSelection:sel withOptions:options];
+    if (selection == nil && [sel string])
+        selection = [[pdfView document] findString:string fromSelection:nil withOptions:options];
 	findPanelFind = NO;
     if (selection) {
 		[pdfView setCurrentSelection:selection];


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

Revision: 2060
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2060&view=rev
Author:   hofman
Date:     2007-05-17 07:53:07 -0700 (Thu, 17 May 2007)

Log Message:
-----------
Scroll to previous location when reloading pdf.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-17 11:49:41 UTC (rev 2059)
+++ trunk/SKMainWindowController.m	2007-05-17 14:53:07 UTC (rev 2060)
@@ -470,12 +470,12 @@
 
     if ([pdfView document] != document) {
         
-        PDFDestination *dest;
         unsigned pageIndex = NSNotFound;
+        NSRect visibleRect = NSZeroRect;
         
         if ([pdfView document]) {
-            dest = [pdfView currentDestination];
             pageIndex = [[pdfView document] indexForPage:[pdfView currentPage]];
+            visibleRect = [pdfView convertRect:[pdfView convertRect:[[pdfView documentView] visibleRect] fromView:[pdfView documentView]] toPage:[pdfView currentPage]];
         }
         
         // these will be invalid. If needed, the document will restore them
@@ -512,8 +512,12 @@
         [self updateThumbnailSelection];
         
         if (pageIndex != NSNotFound && [document pageCount]) {
-            PDFPage *page = [document pageAtIndex:MIN(pageIndex, [document pageCount])];
-            [pdfView performSelector:@selector(goToPage:) withObject:page afterDelay:0.0];
+            PDFPage *page = [document pageAtIndex:MIN(pageIndex, [document pageCount] - 1)];
+            [pdfView goToPage:page];
+            [[pdfView window] disableFlushWindow];
+            [pdfView display];
+            [[pdfView documentView] scrollRectToVisible:[pdfView convertRect:[pdfView convertRect:visibleRect fromPage:page] toView:[pdfView documentView]]];
+            [[pdfView window] enableFlushWindow];
         }
     }
 }


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

Revision: 2084
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2084&view=rev
Author:   hofman
Date:     2007-05-19 03:13:38 -0700 (Sat, 19 May 2007)

Log Message:
-----------
Use current display box to copy TIFF data for page.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-19 09:42:47 UTC (rev 2083)
+++ trunk/SKMainWindowController.m	2007-05-19 10:13:38 UTC (rev 2084)
@@ -2419,7 +2419,7 @@
         if (index != NSNotFound) {
             PDFPage *page = [[pdfView document] pageAtIndex:index];
             NSData *pdfData = [page dataRepresentation];
-            NSData *tiffData = [[page image] TIFFRepresentation];
+            NSData *tiffData = [[page imageForBox:[pdfView displayBox]] TIFFRepresentation];
             NSPasteboard *pboard = [NSPasteboard generalPasteboard];
             [pboard declareTypes:[NSArray arrayWithObjects:NSPDFPboardType, NSTIFFPboardType, nil] owner:nil];
             [pboard setData:pdfData forType:NSPDFPboardType];


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

Revision: 2102
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2102&view=rev
Author:   hofman
Date:     2007-05-22 03:08:36 -0700 (Tue, 22 May 2007)

Log Message:
-----------
Make page rotation and crop undoable. Don't change the document change count, as this is not persistent. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-22 09:22:06 UTC (rev 2101)
+++ trunk/SKMainWindowController.m	2007-05-22 10:08:36 UTC (rev 2102)
@@ -903,37 +903,39 @@
         [self doAutoScale:sender];
 }
 
-- (IBAction)rotateRight:(id)sender {
-    [[pdfView currentPage] setRotation:[[pdfView currentPage] rotation] + 90];
+- (void)rotatePageAtIndex:(unsigned int)index by:(int)rotation {
+    NSUndoManager *undoManager = [[self document] undoManager];
+    [[undoManager prepareWithInvocationTarget:self] rotatePageAtIndex:index by:-rotation];
+    [[self document] updateChangeCount:[undoManager isUndoing] ? NSChangeDone : NSChangeUndone];
+    
+    PDFPage *page = [[pdfView document] pageAtIndex:index];
+    [page setRotation:[page rotation] + rotation];
     [pdfView layoutDocumentView];
     
     NSEnumerator *snapshotEnum = [snapshots objectEnumerator];
     SKSnapshotWindowController *wc;
     while (wc = [snapshotEnum nextObject]) {
-        if ([wc isPageVisible:[pdfView currentPage]]) {
+        if ([wc isPageVisible:page]) {
             [self snapshotNeedsUpdate:wc];
             [wc redisplay];
         }
     }    
-    [self updateThumbnailAtPageIndex:[[pdfView document] indexForPage:[pdfView currentPage]]];
+    [self updateThumbnailAtPageIndex:index];
 }
 
+- (IBAction)rotateRight:(id)sender {
+    [self rotatePageAtIndex:[[pdfView document] indexForPage:[pdfView currentPage]] by:90];
+}
+
 - (IBAction)rotateLeft:(id)sender {
-    [[pdfView currentPage] setRotation:[[pdfView currentPage] rotation] - 90];
-    [pdfView layoutDocumentView];
-    
-    NSEnumerator *snapshotEnum = [snapshots objectEnumerator];
-    SKSnapshotWindowController *wc;
-    while (wc = [snapshotEnum nextObject]) {
-        if ([wc isPageVisible:[pdfView currentPage]]) {
-            [self snapshotNeedsUpdate:wc];
-            [wc redisplay];
-        }
-    }
-    [self updateThumbnailAtPageIndex:[[pdfView document] indexForPage:[pdfView currentPage]]];
+    [self rotatePageAtIndex:[[pdfView document] indexForPage:[pdfView currentPage]] by:-90];
 }
 
 - (IBAction)rotateAllRight:(id)sender {
+    NSUndoManager *undoManager = [[self document] undoManager];
+    [[undoManager prepareWithInvocationTarget:self] rotateAllLeft:nil];
+    [[self document] updateChangeCount:[undoManager isUndoing] ? NSChangeDone : NSChangeUndone];
+    
     int i, count = [[pdfView document] pageCount];
     for (i = 0 ; i < count; ++ i ) {
         [[[pdfView document] pageAtIndex:i] setRotation:[[[pdfView document] pageAtIndex:i] rotation] + 90];
@@ -947,6 +949,10 @@
 }
 
 - (IBAction)rotateAllLeft:(id)sender {
+    NSUndoManager *undoManager = [[self document] undoManager];
+    [[undoManager prepareWithInvocationTarget:self] rotateAllRight:nil];
+    [[self document] updateChangeCount:[undoManager isUndoing] ? NSChangeDone : NSChangeUndone];
+    
     int i, count = [[pdfView document] pageCount];
     for (i = 0 ; i < count; ++ i ) {
         [[[pdfView document] pageAtIndex:i] setRotation:[[[pdfView document] pageAtIndex:i] rotation] - 90];
@@ -959,34 +965,50 @@
     [self allThumbnailsNeedUpdate];
 }
 
-- (IBAction)crop:(id)sender {
-    NSRect selRect = [pdfView currentSelectionRect];
-    if (NSIsEmptyRect(selRect))
-        return;
+- (void)cropPageAtIndex:(unsigned int)index toRect:(NSRect)rect {
+    NSRect oldRect = [[[pdfView document] pageAtIndex:index] boundsForBox:kPDFDisplayBoxCropBox];
+    NSUndoManager *undoManager = [[self document] undoManager];
+    [[undoManager prepareWithInvocationTarget:self] cropPageAtIndex:index toRect:oldRect];
+    [[self document] updateChangeCount:[undoManager isUndoing] ? NSChangeDone : NSChangeUndone];
     
-    [[pdfView currentPage] setBounds:selRect forBox:kPDFDisplayBoxCropBox];
+    PDFPage *page = [[pdfView document] pageAtIndex:index];
+    [page setBounds:rect forBox:kPDFDisplayBoxCropBox];
     [pdfView layoutDocumentView];
     
     NSEnumerator *snapshotEnum = [snapshots objectEnumerator];
     SKSnapshotWindowController *wc;
     while (wc = [snapshotEnum nextObject]) {
-        if ([wc isPageVisible:[pdfView currentPage]]) {
+        if ([wc isPageVisible:page]) {
             [self snapshotNeedsUpdate:wc];
             [wc redisplay];
         }
     }
-    [self updateThumbnailAtPageIndex:[[pdfView document] indexForPage:[pdfView currentPage]]];
+    [self updateThumbnailAtPageIndex:index];
 }
 
-- (IBAction)cropAll:(id)sender {
+- (IBAction)crop:(id)sender {
     NSRect selRect = [pdfView currentSelectionRect];
     if (NSIsEmptyRect(selRect))
         return;
     
+    [self cropPageAtIndex:[[pdfView document] indexForPage:[pdfView currentPage]] toRect:selRect];
+}
+
+- (void)cropPagesToRects:(NSArray *)rects {
+    NSRect selRect = [pdfView currentSelectionRect];
     int i, count = [[pdfView document] pageCount];
+    NSMutableArray *oldRects = [NSMutableArray arrayWithCapacity:count];
     for (i = 0 ; i < count; ++ i ) {
-        [[[pdfView document] pageAtIndex:i] setBounds:selRect forBox:kPDFDisplayBoxCropBox];
+        PDFPage *page = [[pdfView document] pageAtIndex:i];
+        NSRect rect = rects ? [[rects objectAtIndex:i] rectValue] : selRect;
+        [oldRects addObject:[NSValue valueWithRect:[page boundsForBox:kPDFDisplayBoxCropBox]]];
+        [page setBounds:rect forBox:kPDFDisplayBoxCropBox];
     }
+    
+    NSUndoManager *undoManager = [[self document] undoManager];
+    [[undoManager prepareWithInvocationTarget:self] cropPagesToRects:oldRects];
+    [[self document] updateChangeCount:[undoManager isUndoing] ? NSChangeDone : NSChangeUndone];
+    
     [pdfView layoutDocumentView];
     
     [snapshots makeObjectsPerformSelector:@selector(redisplay) withObject:nil];
@@ -995,6 +1017,14 @@
     [self allThumbnailsNeedUpdate];
 }
 
+- (IBAction)cropAll:(id)sender {
+    NSRect selRect = [pdfView currentSelectionRect];
+    if (NSIsEmptyRect(selRect))
+        return;
+    
+    [self cropPagesToRects:nil];
+}
+
 - (IBAction)getInfo:(id)sender {
     SKInfoWindowController *infoController = [SKInfoWindowController sharedInstance];
     [infoController fillInfoForDocument:[self document]];


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

Revision: 2120
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2120&view=rev
Author:   hofman
Date:     2007-05-23 04:38:06 -0700 (Wed, 23 May 2007)

Log Message:
-----------
Crop pages to integral rects. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-23 00:47:58 UTC (rev 2119)
+++ trunk/SKMainWindowController.m	2007-05-23 11:38:06 UTC (rev 2120)
@@ -987,7 +987,7 @@
 }
 
 - (IBAction)crop:(id)sender {
-    NSRect selRect = [pdfView currentSelectionRect];
+    NSRect selRect = NSIntegralRect([pdfView currentSelectionRect]);
     if (NSIsEmptyRect(selRect))
         return;
     
@@ -995,7 +995,7 @@
 }
 
 - (void)cropPagesToRects:(NSArray *)rects {
-    NSRect selRect = [pdfView currentSelectionRect];
+    NSRect selRect = NSIntegralRect([pdfView currentSelectionRect]);
     int i, count = [[pdfView document] pageCount];
     NSMutableArray *oldRects = [NSMutableArray arrayWithCapacity:count];
     for (i = 0 ; i < count; ++ i ) {
@@ -1018,7 +1018,7 @@
 }
 
 - (IBAction)cropAll:(id)sender {
-    NSRect selRect = [pdfView currentSelectionRect];
+    NSRect selRect = NSIntegralRect([pdfView currentSelectionRect]);
     if (NSIsEmptyRect(selRect))
         return;
     


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

Revision: 2128
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2128&view=rev
Author:   hofman
Date:     2007-05-23 13:39:46 -0700 (Wed, 23 May 2007)

Log Message:
-----------
validate crop toolbar item.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-23 17:38:07 UTC (rev 2127)
+++ trunk/SKMainWindowController.m	2007-05-23 20:39:46 UTC (rev 2128)
@@ -3225,6 +3225,8 @@
         return [pdfView autoScales] == NO;
     } else if ([identifier isEqualToString:SKDocumentToolbarZoomActualItemIdentifier]) {
         return fabs([pdfView scaleFactor] - 1.0) > 0.01;
+    } else if ([identifier isEqualToString:SKDocumentToolbarCropItemIdentifier]) {
+        return NO == NSIsEmptyRect([pdfView currentSelectionRect]);
     } else if ([identifier isEqualToString:SKDocumentToolbarFullScreenItemIdentifier]) {
         return YES;
     } else if ([identifier isEqualToString:SKDocumentToolbarPresentationItemIdentifier]) {


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

Revision: 2134
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2134&view=rev
Author:   hofman
Date:     2007-05-24 04:17:03 -0700 (Thu, 24 May 2007)

Log Message:
-----------
Separate crop and cropAll menu validation.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-24 05:28:00 UTC (rev 2133)
+++ trunk/SKMainWindowController.m	2007-05-24 11:17:03 UTC (rev 2134)
@@ -3316,8 +3316,10 @@
     } else if (action == @selector(toggleAutoScale:)) {
         [menuItem setState:[pdfView autoScales] ? NSOnState : NSOffState];
         return YES;
-    } else if (action == @selector(crop:) || action == @selector(cropAll:)) {
+    } else if (action == @selector(cropAll:)) {
         return NO == NSIsEmptyRect([pdfView currentSelectionRect]) || [[NSUserDefaults standardUserDefaults] boolForKey:@"SKAutomaticallyCropPages"];
+    } else if (action == @selector(crop:)) {
+        return NO == NSIsEmptyRect([pdfView currentSelectionRect]);
     } else if (action == @selector(autoSelectContent:)) {
         return [pdfView toolMode] == SKSelectToolMode;
     } else if (action == @selector(toggleLeftSidePane:)) {


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

Revision: 2140
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2140&view=rev
Author:   hofman
Date:     2007-05-24 10:18:51 -0700 (Thu, 24 May 2007)

Log Message:
-----------
CropAll crops all pages to a common box, determined from a (hopefully) representative set of pages (first 5, last 5, middle 5)

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-24 17:17:55 UTC (rev 2139)
+++ trunk/SKMainWindowController.m	2007-05-24 17:18:51 UTC (rev 2140)
@@ -995,12 +995,12 @@
 }
 
 - (void)cropPagesToRects:(NSArray *)rects {
-    NSRect selRect = NSIntegralRect([pdfView currentSelectionRect]);
     int i, count = [[pdfView document] pageCount];
+    int rectCount = [rects count];
     NSMutableArray *oldRects = [NSMutableArray arrayWithCapacity:count];
-    for (i = 0 ; i < count; ++ i ) {
+    for (i = 0 ; i < count; ++i) {
         PDFPage *page = [[pdfView document] pageAtIndex:i];
-        NSRect rect = rects ? [[rects objectAtIndex:i] rectValue] : selRect;
+        NSRect rect = [[rects objectAtIndex:i < rectCount ? i : rectCount - 1] rectValue];
         [oldRects addObject:[NSValue valueWithRect:[page boundsForBox:kPDFDisplayBoxCropBox]]];
         [page setBounds:rect forBox:kPDFDisplayBoxCropBox];
     }
@@ -1018,26 +1018,24 @@
 }
 
 - (IBAction)cropAll:(id)sender {
-    NSRect selRect = NSIntegralRect([pdfView currentSelectionRect]);
-    if (NSIsEmptyRect(selRect)) {
-        if ([[NSUserDefaults standardUserDefaults] boolForKey:@"SKAutomaticallyCropPages"]) {
-            int i, count = [[pdfView document] pageCount];
-            NSMutableArray *rects = [NSMutableArray arrayWithCapacity:count];
-            // use a local pool to avoid hitting the 32-bit limit when rendering all pages of a large doc
-            NSAutoreleasePool *pool = [NSAutoreleasePool new];
-            for (i = 0 ; i < count; ++ i ) {
-                PDFPage *page = [[pdfView document] pageAtIndex:i];
-                [rects addObject:[NSValue valueWithRect:[page foregroundBox]]];
-                [pool release];
-                pool = [NSAutoreleasePool new];
-            }
-            [pool release];
-            [self cropPagesToRects:rects];
+    NSRect rect = NSIntegralRect([pdfView currentSelectionRect]);
+    if (NSIsEmptyRect(rect)) {
+        int i, count = [[pdfView document] pageCount];
+        rect = NSZeroRect;
+        if (count < 15) {
+            for (i = 0; i < count; ++i)
+                rect = NSUnionRect(rect, [[[pdfView document] pageAtIndex:i] foregroundBox]);
+        } else {
+            for (i = 0; i < 5; ++i)
+                rect = NSUnionRect(rect, [[[pdfView document] pageAtIndex:i] foregroundBox]);
+            for (i = (count - 5) / 2; i < (count + 5) / 2; ++i)
+                rect = NSUnionRect(rect, [[[pdfView document] pageAtIndex:i] foregroundBox]);
+            for (i = count - 5; i < count; ++i)
+                rect = NSUnionRect(rect, [[[pdfView document] pageAtIndex:i] foregroundBox]);
         }
-        return;
     }
     
-    [self cropPagesToRects:nil];
+    [self cropPagesToRects:[NSArray arrayWithObject:[NSValue valueWithRect:rect]]];
     [pdfView setCurrentSelectionRect:NSZeroRect];
 }
 
@@ -3317,7 +3315,7 @@
         [menuItem setState:[pdfView autoScales] ? NSOnState : NSOffState];
         return YES;
     } else if (action == @selector(cropAll:)) {
-        return NO == NSIsEmptyRect([pdfView currentSelectionRect]) || [[NSUserDefaults standardUserDefaults] boolForKey:@"SKAutomaticallyCropPages"];
+        return YES;
     } else if (action == @selector(crop:)) {
         return NO == NSIsEmptyRect([pdfView currentSelectionRect]);
     } else if (action == @selector(autoSelectContent:)) {


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

Revision: 2141
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2141&view=rev
Author:   amaxwell
Date:     2007-05-24 10:27:56 -0700 (Thu, 24 May 2007)

Log Message:
-----------
Reset the current page after a cropAll:

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-24 17:18:51 UTC (rev 2140)
+++ trunk/SKMainWindowController.m	2007-05-24 17:27:56 UTC (rev 2141)
@@ -995,6 +995,9 @@
 }
 
 - (void)cropPagesToRects:(NSArray *)rects {
+    
+    PDFDestination *currentDestination = [pdfView currentDestination];
+    
     int i, count = [[pdfView document] pageCount];
     int rectCount = [rects count];
     NSMutableArray *oldRects = [NSMutableArray arrayWithCapacity:count];
@@ -1015,6 +1018,9 @@
     [self allSnapshotsNeedUpdate];
     
     [self allThumbnailsNeedUpdate];
+    
+    // layout after cropping when you're in the middle of a document can lose the current page
+    [pdfView goToDestination:currentDestination];
 }
 
 - (IBAction)cropAll:(id)sender {


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

Revision: 2142
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2142&view=rev
Author:   hofman
Date:     2007-05-24 10:38:55 -0700 (Thu, 24 May 2007)

Log Message:
-----------
goToDestination does a really bad job, so go back to the visible rect instead.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-24 17:27:56 UTC (rev 2141)
+++ trunk/SKMainWindowController.m	2007-05-24 17:38:55 UTC (rev 2142)
@@ -995,9 +995,9 @@
 }
 
 - (void)cropPagesToRects:(NSArray *)rects {
+    PDFPage *currentPage = [pdfView currentPage];
+    NSRect visibleRect = [pdfView convertRect:[pdfView convertRect:[[pdfView documentView] visibleRect] fromView:[pdfView documentView]] toPage:[pdfView currentPage]];
     
-    PDFDestination *currentDestination = [pdfView currentDestination];
-    
     int i, count = [[pdfView document] pageCount];
     int rectCount = [rects count];
     NSMutableArray *oldRects = [NSMutableArray arrayWithCapacity:count];
@@ -1020,7 +1020,8 @@
     [self allThumbnailsNeedUpdate];
     
     // layout after cropping when you're in the middle of a document can lose the current page
-    [pdfView goToDestination:currentDestination];
+    [pdfView goToPage:currentPage];
+    [[pdfView documentView] scrollRectToVisible:[pdfView convertRect:[pdfView convertRect:visibleRect fromPage:currentPage] toView:[pdfView documentView]]];
 }
 
 - (IBAction)cropAll:(id)sender {


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

Revision: 2143
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2143&view=rev
Author:   hofman
Date:     2007-05-24 11:02:12 -0700 (Thu, 24 May 2007)

Log Message:
-----------
Evenly divide sample for auto-crop between even and odd pages. Allow setting different crops for even/odd pages (not used). 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-24 17:38:55 UTC (rev 2142)
+++ trunk/SKMainWindowController.m	2007-05-24 18:02:12 UTC (rev 2143)
@@ -1003,7 +1003,8 @@
     NSMutableArray *oldRects = [NSMutableArray arrayWithCapacity:count];
     for (i = 0 ; i < count; ++i) {
         PDFPage *page = [[pdfView document] pageAtIndex:i];
-        NSRect rect = [[rects objectAtIndex:i < rectCount ? i : rectCount - 1] rectValue];
+        int index = i < rectCount ? i : rectCount == 1 ? 0 : i % 2;
+        NSRect rect = [[rects objectAtIndex:index] rectValue];
         [oldRects addObject:[NSValue valueWithRect:[page boundsForBox:kPDFDisplayBoxCropBox]]];
         [page setBounds:rect forBox:kPDFDisplayBoxCropBox];
     }
@@ -1029,15 +1030,15 @@
     if (NSIsEmptyRect(rect)) {
         int i, count = [[pdfView document] pageCount];
         rect = NSZeroRect;
-        if (count < 15) {
+        if (count < 18) {
             for (i = 0; i < count; ++i)
                 rect = NSUnionRect(rect, [[[pdfView document] pageAtIndex:i] foregroundBox]);
         } else {
-            for (i = 0; i < 5; ++i)
+            for (i = 0; i < 6; ++i)
                 rect = NSUnionRect(rect, [[[pdfView document] pageAtIndex:i] foregroundBox]);
-            for (i = (count - 5) / 2; i < (count + 5) / 2; ++i)
+            for (i = (count - 6) / 2; i < (count + 6) / 2; ++i)
                 rect = NSUnionRect(rect, [[[pdfView document] pageAtIndex:i] foregroundBox]);
-            for (i = count - 5; i < count; ++i)
+            for (i = count - 6; i < count; ++i)
                 rect = NSUnionRect(rect, [[[pdfView document] pageAtIndex:i] foregroundBox]);
         }
     }


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

Revision: 2144
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2144&view=rev
Author:   hofman
Date:     2007-05-24 11:13:56 -0700 (Thu, 24 May 2007)

Log Message:
-----------
Make sure the crop box isn't larger than the media box.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-24 18:02:12 UTC (rev 2143)
+++ trunk/SKMainWindowController.m	2007-05-24 18:13:56 UTC (rev 2144)
@@ -972,6 +972,7 @@
     [[self document] updateChangeCount:[undoManager isUndoing] ? NSChangeDone : NSChangeUndone];
     
     PDFPage *page = [[pdfView document] pageAtIndex:index];
+    rect = NSIntersectionRect(rect, [page boundsForBox:kPDFDisplayBoxMediaBox]);
     [page setBounds:rect forBox:kPDFDisplayBoxCropBox];
     [pdfView layoutDocumentView];
     
@@ -1004,7 +1005,7 @@
     for (i = 0 ; i < count; ++i) {
         PDFPage *page = [[pdfView document] pageAtIndex:i];
         int index = i < rectCount ? i : rectCount == 1 ? 0 : i % 2;
-        NSRect rect = [[rects objectAtIndex:index] rectValue];
+        NSRect rect = NSIntersectionRect([[rects objectAtIndex:index] rectValue], [page boundsForBox:kPDFDisplayBoxMediaBox]);
         [oldRects addObject:[NSValue valueWithRect:[page boundsForBox:kPDFDisplayBoxCropBox]]];
         [page setBounds:rect forBox:kPDFDisplayBoxCropBox];
     }


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

Revision: 2145
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2145&view=rev
Author:   hofman
Date:     2007-05-24 11:55:06 -0700 (Thu, 24 May 2007)

Log Message:
-----------
Auto crop left/right pages separately, but keep them the same size.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-24 18:13:56 UTC (rev 2144)
+++ trunk/SKMainWindowController.m	2007-05-24 18:55:06 UTC (rev 2145)
@@ -937,7 +937,7 @@
     [[self document] updateChangeCount:[undoManager isUndoing] ? NSChangeDone : NSChangeUndone];
     
     int i, count = [[pdfView document] pageCount];
-    for (i = 0 ; i < count; ++ i ) {
+    for (i = 0; i < count; i++) {
         [[[pdfView document] pageAtIndex:i] setRotation:[[[pdfView document] pageAtIndex:i] rotation] + 90];
     }
     [pdfView layoutDocumentView];
@@ -954,7 +954,7 @@
     [[self document] updateChangeCount:[undoManager isUndoing] ? NSChangeDone : NSChangeUndone];
     
     int i, count = [[pdfView document] pageCount];
-    for (i = 0 ; i < count; ++ i ) {
+    for (i = 0; i < count; i++) {
         [[[pdfView document] pageAtIndex:i] setRotation:[[[pdfView document] pageAtIndex:i] rotation] - 90];
     }
     [pdfView layoutDocumentView];
@@ -1002,10 +1002,9 @@
     int i, count = [[pdfView document] pageCount];
     int rectCount = [rects count];
     NSMutableArray *oldRects = [NSMutableArray arrayWithCapacity:count];
-    for (i = 0 ; i < count; ++i) {
+    for (i = 0; i < count; i++) {
         PDFPage *page = [[pdfView document] pageAtIndex:i];
-        int index = i < rectCount ? i : rectCount == 1 ? 0 : i % 2;
-        NSRect rect = NSIntersectionRect([[rects objectAtIndex:index] rectValue], [page boundsForBox:kPDFDisplayBoxMediaBox]);
+        NSRect rect = NSIntersectionRect([[rects objectAtIndex:i % rectCount] rectValue], [page boundsForBox:kPDFDisplayBoxMediaBox]);
         [oldRects addObject:[NSValue valueWithRect:[page boundsForBox:kPDFDisplayBoxCropBox]]];
         [page setBounds:rect forBox:kPDFDisplayBoxCropBox];
     }
@@ -1027,24 +1026,30 @@
 }
 
 - (IBAction)cropAll:(id)sender {
-    NSRect rect = NSIntegralRect([pdfView currentSelectionRect]);
-    if (NSIsEmptyRect(rect)) {
-        int i, count = [[pdfView document] pageCount];
-        rect = NSZeroRect;
+    NSRect rect[2] = {NSIntegralRect([pdfView currentSelectionRect]), NSZeroRect};
+    NSArray *rectArray;
+    if (NSIsEmptyRect(rect[0])) {
+        int i, j, count = [[pdfView document] pageCount];
+        rect[0] = rect[1] = NSZeroRect;
         if (count < 18) {
-            for (i = 0; i < count; ++i)
-                rect = NSUnionRect(rect, [[[pdfView document] pageAtIndex:i] foregroundBox]);
+            for (i = 0; i < count; i++)
+                rect[i % 2] = NSUnionRect(rect[i % 2], [[[pdfView document] pageAtIndex:i] foregroundBox]);
         } else {
-            for (i = 0; i < 6; ++i)
-                rect = NSUnionRect(rect, [[[pdfView document] pageAtIndex:i] foregroundBox]);
-            for (i = (count - 6) / 2; i < (count + 6) / 2; ++i)
-                rect = NSUnionRect(rect, [[[pdfView document] pageAtIndex:i] foregroundBox]);
-            for (i = count - 6; i < count; ++i)
-                rect = NSUnionRect(rect, [[[pdfView document] pageAtIndex:i] foregroundBox]);
+            int start[3] = {0, count / 2 - 3, count - 6};
+            for (j = 0; j < 3; j++)
+                for (i = start[j]; i < start[j] + 6; i++)
+                    rect[i % 2] = NSUnionRect(rect[i % 2], [[[pdfView document] pageAtIndex:i] foregroundBox]);
         }
+        float w = fmax(NSWidth(rect[0]), NSWidth(rect[1]));
+        float h = fmax(NSHeight(rect[0]), NSHeight(rect[1]));
+        for (j = 0; j < 2; j++)
+            rect[j] = NSMakeRect(floorf(NSMidX(rect[j]) - 0.5 * w), floorf(NSMidY(rect[j]) - 0.5 * h), w, h);
+        rectArray = [NSArray arrayWithObjects:[NSValue valueWithRect:rect[0]], [NSValue valueWithRect:rect[1]], nil];
+    } else {
+        rectArray = [NSArray arrayWithObject:[NSValue valueWithRect:rect[0]]];
     }
     
-    [self cropPagesToRects:[NSArray arrayWithObject:[NSValue valueWithRect:rect]]];
+    [self cropPagesToRects:rectArray];
     [pdfView setCurrentSelectionRect:NSZeroRect];
 }
 


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

Revision: 2146
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2146&view=rev
Author:   hofman
Date:     2007-05-24 12:24:40 -0700 (Thu, 24 May 2007)

Log Message:
-----------
Completely remove hidden default for auto-crop, make it always accessible. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-24 18:55:06 UTC (rev 2145)
+++ trunk/SKMainWindowController.m	2007-05-24 19:24:40 UTC (rev 2146)
@@ -3253,7 +3253,7 @@
     } else if ([identifier isEqualToString:SKDocumentToolbarZoomActualItemIdentifier]) {
         return fabs([pdfView scaleFactor] - 1.0) > 0.01;
     } else if ([identifier isEqualToString:SKDocumentToolbarCropItemIdentifier]) {
-        return NO == NSIsEmptyRect([pdfView currentSelectionRect]) || [[NSUserDefaults standardUserDefaults] boolForKey:@"SKAutomaticallyCropPages"];
+        return YES;
     } else if ([identifier isEqualToString:SKDocumentToolbarFullScreenItemIdentifier]) {
         return YES;
     } else if ([identifier isEqualToString:SKDocumentToolbarPresentationItemIdentifier]) {


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

Revision: 2147
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2147&view=rev
Author:   hofman
Date:     2007-05-24 13:50:15 -0700 (Thu, 24 May 2007)

Log Message:
-----------
Crop single page to foregroundBox when there is no selection.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-24 19:24:40 UTC (rev 2146)
+++ trunk/SKMainWindowController.m	2007-05-24 20:50:15 UTC (rev 2147)
@@ -988,11 +988,10 @@
 }
 
 - (IBAction)crop:(id)sender {
-    NSRect selRect = NSIntegralRect([pdfView currentSelectionRect]);
-    if (NSIsEmptyRect(selRect))
-        return;
-    
-    [self cropPageAtIndex:[[pdfView document] indexForPage:[pdfView currentPage]] toRect:selRect];
+    NSRect rect = NSIntegralRect([pdfView currentSelectionRect]);
+    if (NSIsEmptyRect(rect))
+        rect = [[pdfView currentPage] foregroundBox];
+    [self cropPageAtIndex:[[pdfView document] indexForPage:[pdfView currentPage]] toRect:rect];
 }
 
 - (void)cropPagesToRects:(NSArray *)rects {
@@ -3328,10 +3327,8 @@
     } else if (action == @selector(toggleAutoScale:)) {
         [menuItem setState:[pdfView autoScales] ? NSOnState : NSOffState];
         return YES;
-    } else if (action == @selector(cropAll:)) {
+    } else if (action == @selector(cropAll:) || action == @selector(crop:)) {
         return YES;
-    } else if (action == @selector(crop:)) {
-        return NO == NSIsEmptyRect([pdfView currentSelectionRect]);
     } else if (action == @selector(autoSelectContent:)) {
         return [pdfView toolMode] == SKSelectToolMode;
     } else if (action == @selector(toggleLeftSidePane:)) {


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

Revision: 2152
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2152&view=rev
Author:   hofman
Date:     2007-05-25 05:28:56 -0700 (Fri, 25 May 2007)

Log Message:
-----------
Use convenience methods for setting up toolbar items.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-25 12:27:06 UTC (rev 2151)
+++ trunk/SKMainWindowController.m	2007-05-25 12:28:56 UTC (rev 2152)
@@ -2821,7 +2821,7 @@
 									                          keyEquivalent:@""] autorelease];
 	[menuItem setTarget:self];
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarScaleItemIdentifier];
-    [item setLabel:NSLocalizedString(@"Scale", @"Toolbar item label")];
+    [item setLabels:NSLocalizedString(@"Scale", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Scale", @"Tool tip message")];
     [item setViewWithSizes:scaleField];
     [item setMenuFormRepresentation:menuItem];
@@ -2829,7 +2829,7 @@
     [item release];
     
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarZoomInItemIdentifier];
-    [item setLabel:NSLocalizedString(@"Zoom In", @"Toolbar item label")];
+    [item setLabels:NSLocalizedString(@"Zoom In", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Zoom In", @"Tool tip message")];
     [item setImageNamed:@"ToolbarZoomIn"];
     [item setTarget:self];
@@ -2838,7 +2838,7 @@
     [item release];
     
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarZoomOutItemIdentifier];
-    [item setLabel:NSLocalizedString(@"Zoom Out", @"Toolbar item label")];
+    [item setLabels:NSLocalizedString(@"Zoom Out", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Zoom Out", @"Tool tip message")];
     [item setImageNamed:@"ToolbarZoomOut"];
     [item setTarget:self];
@@ -2847,7 +2847,7 @@
     [item release];
     
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarZoomActualItemIdentifier];
-    [item setLabel:NSLocalizedString(@"Actual Size", @"Toolbar item label")];
+    [item setLabels:NSLocalizedString(@"Actual Size", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Zoom To Actual Size", @"Tool tip message")];
     [item setImageNamed:@"ToolbarZoomActual"];
     [item setTarget:self];
@@ -2856,7 +2856,7 @@
     [item release];
     
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarZoomToFitItemIdentifier];
-    [item setLabel:NSLocalizedString(@"Zoom To Fit", @"Toolbar item label")];
+    [item setLabels:NSLocalizedString(@"Zoom To Fit", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Zoom To Fit", @"Tool tip message")];
     [item setImageNamed:@"ToolbarZoomToFit"];
     [item setTarget:self];
@@ -2865,7 +2865,7 @@
     [item release];
     
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarRotateRightItemIdentifier];
-    [item setLabel:NSLocalizedString(@"Rotate Right", @"Toolbar item label")];
+    [item setLabels:NSLocalizedString(@"Rotate Right", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Rotate Right", @"Tool tip message")];
     [item setImageNamed:@"ToolbarRotateRight"];
     [item setTarget:self];
@@ -2874,7 +2874,7 @@
     [item release];
     
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarRotateLeftItemIdentifier];
-    [item setLabel:NSLocalizedString(@"Rotate Left", @"Toolbar item label")];
+    [item setLabels:NSLocalizedString(@"Rotate Left", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Rotate Left", @"Tool tip message")];
     [item setImageNamed:@"ToolbarRotateLeft"];
     [item setTarget:self];
@@ -2883,7 +2883,7 @@
     [item release];
     
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarCropItemIdentifier];
-    [item setLabel:NSLocalizedString(@"Crop", @"Toolbar item label")];
+    [item setLabels:NSLocalizedString(@"Crop", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Crop", @"Tool tip message")];
     [item setImageNamed:@"ToolbarCrop"];
     [item setTarget:self];
@@ -2892,7 +2892,7 @@
     [item release];
     
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarFullScreenItemIdentifier];
-    [item setLabel:NSLocalizedString(@"Full Screen", @"Toolbar item label")];
+    [item setLabels:NSLocalizedString(@"Full Screen", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Full Screen", @"Tool tip message")];
     [item setImageNamed:@"ToolbarFullScreen"];
     [item setTarget:self];
@@ -2901,7 +2901,7 @@
     [item release];
     
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarPresentationItemIdentifier];
-    [item setLabel:NSLocalizedString(@"Presentation", @"Toolbar item label")];
+    [item setLabels:NSLocalizedString(@"Presentation", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Presentation", @"Tool tip message")];
     [item setImageNamed:@"ToolbarPresentation"];
     [item setTarget:self];
@@ -2921,7 +2921,7 @@
     menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Add Note", @"Toolbar item label") action:NULL keyEquivalent:@""] autorelease];
     [menuItem setSubmenu:menu];
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarNewNoteItemIdentifier];
-    [item setLabel:NSLocalizedString(@"Add Note", @"Toolbar item label")];
+    [item setLabels:NSLocalizedString(@"Add Note", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Add New Note", @"Tool tip message")];
     [item setTarget:self];
     [item setViewWithSizes:notePopUpButton];
@@ -2948,7 +2948,7 @@
     menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Add Circle", @"Toolbar item label") action:NULL keyEquivalent:@""] autorelease];
     [menuItem setSubmenu:menu];
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarNewCircleNoteItemIdentifier];
-    [item setLabel:NSLocalizedString(@"Add Circle", @"Toolbar item label")];
+    [item setLabels:NSLocalizedString(@"Add Circle", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Add New Circle", @"Tool tip message")];
     [item setTarget:self];
     [item setViewWithSizes:circlePopUpButton];
@@ -2979,7 +2979,7 @@
     menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Add Markup", @"Toolbar item label") action:NULL keyEquivalent:@""] autorelease];
     [menuItem setSubmenu:menu];
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarNewMarkupItemIdentifier];
-    [item setLabel:NSLocalizedString(@"Add Markup", @"Toolbar item label")];
+    [item setLabels:NSLocalizedString(@"Add Markup", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Add New Markup", @"Tool tip message")];
     [item setTarget:self];
     [item setViewWithSizes:markupPopUpButton];
@@ -2988,7 +2988,7 @@
     [item release];
     
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarNewArrowItemIdentifier];
-    [item setLabel:NSLocalizedString(@"Add Arrow", @"Toolbar item label")];
+    [item setLabels:NSLocalizedString(@"Add Arrow", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Add New Arrow", @"Tool tip message")];
     [item setTag:SKArrowNote];
     [item setTarget:self];
@@ -3045,7 +3045,7 @@
 	menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Tool Mode", @"Toolbar item label") action:NULL keyEquivalent:@""] autorelease];
     [menuItem setSubmenu:menu];
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarToolModeItemIdentifier];
-    [item setLabel:NSLocalizedString(@"Tool Mode", @"Toolbar item label")];
+    [item setLabels:NSLocalizedString(@"Tool Mode", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Tool Mode", @"Tool tip message")];
     [[toolModeButton cell] setToolTip:NSLocalizedString(@"Text Tool", @"Tool tip message") forSegment:SKTextToolMode];
     [[toolModeButton cell] setToolTip:NSLocalizedString(@"Scroll Tool", @"Tool tip message") forSegment:SKMoveToolMode];
@@ -3104,7 +3104,7 @@
 	menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Display Box", @"Toolbar item label") action:NULL keyEquivalent:@""] autorelease];
     [menuItem setSubmenu:menu];
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarDisplayBoxItemIdentifier];
-    [item setLabel:NSLocalizedString(@"Display Box", @"Toolbar item label")];
+    [item setLabels:NSLocalizedString(@"Display Box", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Display Box", @"Tool tip message")];
     [item setViewWithSizes:displayBoxPopUpButton];
     [item setMenuFormRepresentation:menuItem];
@@ -3112,7 +3112,7 @@
     [item release];
     
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarInfoItemIdentifier];
-    [item setLabel:NSLocalizedString(@"Info", @"Toolbar item label")];
+    [item setLabels:NSLocalizedString(@"Info", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Get Document Info", @"Tool tip message")];
     [item setImageNamed:@"ToolbarInfo"];
     [item setTarget:self];
@@ -3121,7 +3121,7 @@
     [item release];
     
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarContentsPaneItemIdentifier];
-    [item setLabel:NSLocalizedString(@"Contents Pane", @"Toolbar item label")];
+    [item setLabels:NSLocalizedString(@"Contents Pane", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Toggle Contents Pane", @"Tool tip message")];
     [item setImageNamed:@"ToolbarLeftPane"];
     [item setTarget:self];
@@ -3130,7 +3130,7 @@
     [item release];
     
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarNotesPaneItemIdentifier];
-    [item setLabel:NSLocalizedString(@"Notes Pane", @"Toolbar item label")];
+    [item setLabels:NSLocalizedString(@"Notes Pane", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Toggle Notes Pane", @"Tool tip message")];
     [item setImageNamed:@"ToolbarRightPane"];
     [item setTarget:self];


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

Revision: 2159
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2159&view=rev
Author:   hofman
Date:     2007-05-25 13:51:58 -0700 (Fri, 25 May 2007)

Log Message:
-----------
Use undoManager from the document for action name.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-25 20:40:03 UTC (rev 2158)
+++ trunk/SKMainWindowController.m	2007-05-25 20:51:58 UTC (rev 2159)
@@ -927,7 +927,7 @@
 - (void)rotatePageAtIndex:(unsigned int)index by:(int)rotation {
     NSUndoManager *undoManager = [[self document] undoManager];
     [[undoManager prepareWithInvocationTarget:self] rotatePageAtIndex:index by:-rotation];
-    [[self undoManager] setActionName:NSLocalizedString(@"Rotate Page", @"Undo action name")];
+    [undoManager setActionName:NSLocalizedString(@"Rotate Page", @"Undo action name")];
     [[self document] updateChangeCount:[undoManager isUndoing] ? NSChangeDone : NSChangeUndone];
     
     PDFPage *page = [[pdfView document] pageAtIndex:index];
@@ -956,7 +956,7 @@
 - (IBAction)rotateAllRight:(id)sender {
     NSUndoManager *undoManager = [[self document] undoManager];
     [[undoManager prepareWithInvocationTarget:self] rotateAllLeft:nil];
-    [[self undoManager] setActionName:NSLocalizedString(@"Rotate", @"Undo action name")];
+    [undoManager setActionName:NSLocalizedString(@"Rotate", @"Undo action name")];
     [[self document] updateChangeCount:[undoManager isUndoing] ? NSChangeDone : NSChangeUndone];
     
     int i, count = [[pdfView document] pageCount];
@@ -974,7 +974,7 @@
 - (IBAction)rotateAllLeft:(id)sender {
     NSUndoManager *undoManager = [[self document] undoManager];
     [[undoManager prepareWithInvocationTarget:self] rotateAllRight:nil];
-    [[self undoManager] setActionName:NSLocalizedString(@"Rotate", @"Undo action name")];
+    [undoManager setActionName:NSLocalizedString(@"Rotate", @"Undo action name")];
     [[self document] updateChangeCount:[undoManager isUndoing] ? NSChangeDone : NSChangeUndone];
     
     int i, count = [[pdfView document] pageCount];
@@ -993,7 +993,7 @@
     NSRect oldRect = [[[pdfView document] pageAtIndex:index] boundsForBox:kPDFDisplayBoxCropBox];
     NSUndoManager *undoManager = [[self document] undoManager];
     [[undoManager prepareWithInvocationTarget:self] cropPageAtIndex:index toRect:oldRect];
-    [[self undoManager] setActionName:NSLocalizedString(@"Crop Page", @"Undo action name")];
+    [undoManager setActionName:NSLocalizedString(@"Crop Page", @"Undo action name")];
     [[self document] updateChangeCount:[undoManager isUndoing] ? NSChangeDone : NSChangeUndone];
     
     PDFPage *page = [[pdfView document] pageAtIndex:index];
@@ -1035,7 +1035,7 @@
     
     NSUndoManager *undoManager = [[self document] undoManager];
     [[undoManager prepareWithInvocationTarget:self] cropPagesToRects:oldRects];
-    [[self undoManager] setActionName:NSLocalizedString(@"Crop", @"Undo action name")];
+    [undoManager setActionName:NSLocalizedString(@"Crop", @"Undo action name")];
     [[self document] updateChangeCount:[undoManager isUndoing] ? NSChangeDone : NSChangeUndone];
     
     [pdfView layoutDocumentView];


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

Revision: 2186
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2186&view=rev
Author:   hofman
Date:     2007-05-30 11:58:33 -0700 (Wed, 30 May 2007)

Log Message:
-----------
Set alpha for arrow image.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-30 18:54:01 UTC (rev 2185)
+++ trunk/SKMainWindowController.m	2007-05-30 18:58:33 UTC (rev 2186)
@@ -2060,58 +2060,66 @@
     if (noteToolAdornImages[0] == nil) {
         NSSize size = NSMakeSize(23.0, 11.0);
         NSPoint point = NSMakePoint(2.0, 0.0);
+        NSColor *color = [NSColor colorWithDeviceWhite:0.0 alpha:0.75];
         NSBezierPath *arrowPath = [NSBezierPath bezierPath];
         [arrowPath moveToPoint:NSMakePoint(20.5,4.0)];
         [arrowPath lineToPoint:NSMakePoint(18.0,7.0)];
         [arrowPath lineToPoint:NSMakePoint(23.0,7.0)];
         [arrowPath closePath];
-        [[NSColor blackColor] setFill];
         
         noteToolAdornImages[SKFreeTextNote] = [[NSImage alloc] initWithSize:size];
         [noteToolAdornImages[SKFreeTextNote] lockFocus];
         [[NSImage imageNamed:@"TextNoteAdorn"] compositeToPoint:point operation:NSCompositeCopy];
+        [color setFill];
         [arrowPath fill];
         [noteToolAdornImages[SKFreeTextNote] unlockFocus];
         
         noteToolAdornImages[SKAnchoredNote] = [[NSImage alloc] initWithSize:size];
         [noteToolAdornImages[SKAnchoredNote] lockFocus];
         [[NSImage imageNamed:@"AnchoredNoteAdorn"] compositeToPoint:point operation:NSCompositeCopy];
+        [color setFill];
         [arrowPath fill];
         [noteToolAdornImages[SKAnchoredNote] unlockFocus];
         
         noteToolAdornImages[SKCircleNote] = [[NSImage alloc] initWithSize:size];
         [noteToolAdornImages[SKCircleNote] lockFocus];
         [[NSImage imageNamed:@"CircleNoteAdorn"] compositeToPoint:point operation:NSCompositeCopy];
+        [color setFill];
         [arrowPath fill];
         [noteToolAdornImages[SKCircleNote] unlockFocus];
         
         noteToolAdornImages[SKSquareNote] = [[NSImage alloc] initWithSize:size];
         [noteToolAdornImages[SKSquareNote] lockFocus];
         [[NSImage imageNamed:@"SquareNoteAdorn"] compositeToPoint:point operation:NSCompositeCopy];
+        [color setFill];
         [arrowPath fill];
         [noteToolAdornImages[SKSquareNote] unlockFocus];
         
         noteToolAdornImages[SKHighlightNote] = [[NSImage alloc] initWithSize:size];
         [noteToolAdornImages[SKHighlightNote] lockFocus];
         [[NSImage imageNamed:@"HighlightNoteAdorn"] compositeToPoint:point operation:NSCompositeCopy];
+        [color setFill];
         [arrowPath fill];
         [noteToolAdornImages[SKHighlightNote] unlockFocus];
         
         noteToolAdornImages[SKUnderlineNote] = [[NSImage alloc] initWithSize:size];
         [noteToolAdornImages[SKUnderlineNote] lockFocus];
         [[NSImage imageNamed:@"UnderlineNoteAdorn"] compositeToPoint:point operation:NSCompositeCopy];
+        [color setFill];
         [arrowPath fill];
         [noteToolAdornImages[SKUnderlineNote] unlockFocus];
         
         noteToolAdornImages[SKStrikeOutNote] = [[NSImage alloc] initWithSize:size];
         [noteToolAdornImages[SKStrikeOutNote] lockFocus];
         [[NSImage imageNamed:@"StrikeOutNoteAdorn"] compositeToPoint:point operation:NSCompositeCopy];
+        [color setFill];
         [arrowPath fill];
         [noteToolAdornImages[SKStrikeOutNote] unlockFocus];
         
         noteToolAdornImages[SKArrowNote] = [[NSImage alloc] initWithSize:size];
         [noteToolAdornImages[SKArrowNote] lockFocus];
         [[NSImage imageNamed:@"ArrowNoteAdorn"] compositeToPoint:point operation:NSCompositeCopy];
+        [color setFill];
         [arrowPath fill];
         [noteToolAdornImages[SKArrowNote] unlockFocus];
     }


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

Revision: 2187
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2187&view=rev
Author:   hofman
Date:     2007-05-31 01:47:48 -0700 (Thu, 31 May 2007)

Log Message:
-----------
Change zoom to selection when any of the scrollers is not shown.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-05-30 18:58:33 UTC (rev 2186)
+++ trunk/SKMainWindowController.m	2007-05-31 08:47:48 UTC (rev 2187)
@@ -897,11 +897,24 @@
         float scale = 1.0;
         bounds.size.width -= [NSScroller scrollerWidth];
         bounds.size.height -= [NSScroller scrollerWidth];
-        if (NSWidth(bounds) / NSHeight(bounds) > NSWidth(selRect) / NSHeight(selRect))
+        if (NSWidth(bounds) * NSHeight(selRect) > NSWidth(selRect) * NSHeight(bounds))
             scale = NSHeight(bounds) / NSHeight(selRect);
         else
             scale = NSWidth(bounds) / NSWidth(selRect);
         [pdfView setScaleFactor:scale];
+        NSScrollView *scrollView = [[pdfView documentView] enclosingScrollView];
+        if ([scrollView hasHorizontalScroller] == NO || [scrollView hasVerticalScroller] == NO) {
+            bounds = [pdfView bounds];
+            if ([scrollView hasVerticalScroller])
+                bounds.size.width -= [NSScroller scrollerWidth];
+            if ([scrollView hasHorizontalScroller])
+                bounds.size.height -= [NSScroller scrollerWidth];
+            if (NSWidth(bounds) * NSHeight(selRect) > NSWidth(selRect) * NSHeight(bounds))
+                scale = NSHeight(bounds) / NSHeight(selRect);
+            else
+                scale = NSWidth(bounds) / NSWidth(selRect);
+            [pdfView setScaleFactor:scale];
+        }
         [pdfView scrollRect:selRect inPageToVisible:[pdfView currentPage]]; 
     } else NSBeep();
 }


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

Revision: 2214
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2214&view=rev
Author:   hofman
Date:     2007-06-04 10:27:28 -0700 (Mon, 04 Jun 2007)

Log Message:
-----------
End editing text note before saving.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-06-03 21:26:05 UTC (rev 2213)
+++ trunk/SKMainWindowController.m	2007-06-04 17:27:28 UTC (rev 2214)
@@ -291,6 +291,9 @@
     // Application
     [nc addObserver:self selector:@selector(handleApplicationWillTerminateNotification:) 
                              name:SKApplicationWillTerminateNotification object:NSApp];
+    // Document
+    [nc addObserver:self selector:@selector(handleDocumentWillSaveNotification:) 
+                             name:SKDocumentWillSaveNotification object:[self document]];
     // PDFView
     [nc addObserver:self selector:@selector(handlePageChangedNotification:) 
                              name:PDFViewPageChangedNotification object:pdfView];
@@ -2161,6 +2164,10 @@
         [self exitFullScreen:self];
 }
 
+- (void)handleDocumentWillSaveNotification:(NSNotification *)notification {
+    [pdfView endAnnotationEdit:self];
+}
+
 - (void)handleDidChangeActiveAnnotationNotification:(NSNotification *)notification {
     PDFAnnotation *annotation = [pdfView activeAnnotation];
     


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

Revision: 2233
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2233&view=rev
Author:   hofman
Date:     2007-06-05 10:35:36 -0700 (Tue, 05 Jun 2007)

Log Message:
-----------
Fix offset of smart auto-crop. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-06-05 15:13:23 UTC (rev 2232)
+++ trunk/SKMainWindowController.m	2007-06-05 17:35:36 UTC (rev 2233)
@@ -1151,6 +1151,7 @@
     }
     
     NSMutableArray *rectArray = [NSMutableArray array];
+    PDFDocument *pdfDoc = [pdfView document];
     int i, iMax = [[pdfView document] pageCount];
     
 	[progressBar setMaxValue:(double)iMax];
@@ -1160,7 +1161,7 @@
 	[NSApp beginSheet:progressSheet modalForWindow:[self window] modalDelegate:self didEndSelector:NULL contextInfo:NULL];
     
     for (i = 0; i < iMax; i++) {
-        [rectArray addObject:[NSValue valueWithRect:[[[pdfView document] pageAtIndex:i] foregroundBox]]];
+        [rectArray addObject:[NSValue valueWithRect:[[pdfDoc pageAtIndex:i] foregroundBox]]];
         [progressBar incrementBy:1.0];
         [progressBar displayIfNeeded];
         if (i && i % 10 == 0)
@@ -1183,7 +1184,9 @@
     }
     
     NSMutableArray *rectArray = [NSMutableArray array];
-    int i, iMax = [[pdfView document] pageCount];
+    PDFDocument *pdfDoc = [pdfView document];
+    int i, iMax = [pdfDoc pageCount];
+    NSSize size = NSZeroSize;
     
 	[progressBar setMaxValue:1.1 * iMax];
 	[progressBar setDoubleValue:0.0];
@@ -1191,10 +1194,8 @@
     
 	[NSApp beginSheet:progressSheet modalForWindow:[self window] modalDelegate:self didEndSelector:NULL contextInfo:NULL];
     
-    NSSize size = NSZeroSize;
-    
     for (i = 0; i < iMax; i++) {
-        NSRect bbox = [[[pdfView document] pageAtIndex:i] foregroundBox];
+        NSRect bbox = [[pdfDoc pageAtIndex:i] foregroundBox];
         size.width = fmax(size.width, NSWidth(bbox));
         size.height = fmax(size.height, NSHeight(bbox));
         [progressBar incrementBy:1.0];
@@ -1204,8 +1205,9 @@
     }
     [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
     for (i = 0; i < iMax; i++) {
-        NSRect rect = [[[pdfView document] pageAtIndex:i] foregroundBox];
-        NSRect bounds = [[[pdfView document] pageAtIndex:i] boundsForBox:kPDFDisplayBoxMediaBox];
+        PDFPage *page = [pdfDoc pageAtIndex:i];
+        NSRect rect = [page foregroundBox];
+        NSRect bounds = [page boundsForBox:kPDFDisplayBoxMediaBox];
         if (NSMinX(rect) - NSMinX(bounds) > NSMaxX(bounds) - NSMaxX(rect))
             rect.origin.x = NSMaxX(rect) - size.width;
         rect.origin.y = NSMaxY(rect) - size.height;
@@ -1214,7 +1216,7 @@
             rect.origin.x = NSMaxX(bounds) - NSWidth(rect);
         if (NSMinX(rect) < NSMinX(bounds))
             rect.origin.x = NSMinX(bounds);
-        if (NSMaxY(rect) > NSMaxX(bounds))
+        if (NSMaxY(rect) > NSMaxY(bounds))
             rect.origin.y = NSMaxY(bounds) - NSHeight(rect);
         if (NSMinY(rect) < NSMinY(bounds))
             rect.origin.y = NSMinY(bounds);
@@ -1222,9 +1224,11 @@
         if (i && i % 10 == 0) {
             [progressBar incrementBy:1.0];
             [progressBar displayIfNeeded];
+            if (i && i % 100 == 0)
+                [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
         }
     }
-    
+    [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
     [self cropPagesToRects:rectArray];
 	
     [NSApp endSheet:progressSheet];


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

Revision: 2261
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2261&view=rev
Author:   hofman
Date:     2007-06-08 13:36:22 -0700 (Fri, 08 Jun 2007)

Log Message:
-----------
Remove unused macros.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-06-08 13:15:52 UTC (rev 2260)
+++ trunk/SKMainWindowController.m	2007-06-08 20:36:22 UTC (rev 2261)
@@ -107,9 +107,6 @@
 static NSString *SKLeftSidePaneWidthKey = @"SKLeftSidePaneWidth";
 static NSString *SKRightSidePaneWidthKey = @"SKRightSidePaneWidth";
 
-#define TOOLBAR_SEARCHFIELD_MIN_SIZE NSMakeSize(110.0, 22.0)
-#define TOOLBAR_SEARCHFIELD_MAX_SIZE NSMakeSize(1000.0, 22.0)
-
 @interface NSResponder (SKExtensions)
 - (BOOL)isDescendantOf:(NSView *)aView;
 @end


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

Revision: 2354
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2354&view=rev
Author:   hofman
Date:     2007-06-19 14:54:10 -0700 (Tue, 19 Jun 2007)

Log Message:
-----------
Enable the password item always when the PDF is encrypted. It seems isLocked doesn't mean very much. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-06-19 13:01:40 UTC (rev 2353)
+++ trunk/SKMainWindowController.m	2007-06-19 21:54:10 UTC (rev 2354)
@@ -3675,7 +3675,7 @@
         else
             return YES;
     } else if (action == @selector(password:)) {
-        return [[self pdfDocument] isEncrypted] && [[self pdfDocument] isLocked];
+        return [[self pdfDocument] isEncrypted];
     } else if (action == @selector(toggleReadingBar:)) {
         if ([[self pdfView] hasReadingBar])
             [menuItem setTitle:NSLocalizedString(@"Hide Reading Bar", @"Menu item title")];


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

Revision: 2358
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2358&view=rev
Author:   hofman
Date:     2007-06-20 04:57:57 -0700 (Wed, 20 Jun 2007)

Log Message:
-----------
Use small control size for color panel accesssory view to be consistent with the panel itself.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-06-20 11:50:54 UTC (rev 2357)
+++ trunk/SKMainWindowController.m	2007-06-20 11:57:57 UTC (rev 2358)
@@ -463,6 +463,7 @@
                     colorAccessoryView = [[NSButton alloc] init];
                     [colorAccessoryView setButtonType:NSSwitchButton];
                     [colorAccessoryView setTitle:NSLocalizedString(@"Fill color", @"Button title")];
+                    [[colorAccessoryView cell] setControlSize:NSSmallControlSize];
                     [colorAccessoryView setTarget:self];
                     [colorAccessoryView setAction:@selector(changeColorFill:)];
                     [colorAccessoryView sizeToFit];


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

Revision: 2398
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2398&view=rev
Author:   hofman
Date:     2007-06-30 06:03:47 -0700 (Sat, 30 Jun 2007)

Log Message:
-----------
Remove unnecessary argument.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-06-30 11:40:30 UTC (rev 2397)
+++ trunk/SKMainWindowController.m	2007-06-30 13:03:47 UTC (rev 2398)
@@ -577,7 +577,7 @@
         [[self mutableArrayValueForKey:@"thumbnails"] removeAllObjects];
         
         NSArray *snapshotDicts = [snapshots valueForKey:@"currentSetup"];
-        [snapshots makeObjectsPerformSelector:@selector(close) withObject:nil];
+        [snapshots makeObjectsPerformSelector:@selector(close)];
         [[self mutableArrayValueForKey:@"snapshots"] removeAllObjects];
         
         [lastViewedPages removeAllObjects];
@@ -2554,7 +2554,7 @@
         if (displayChanged)
             [self updateThumbnailAtPageIndex:index];
     } else {
-        [snapshots makeObjectsPerformSelector:@selector(redisplay) withObject:nil];
+        [snapshots makeObjectsPerformSelector:@selector(redisplay)];
         [self allSnapshotsNeedUpdate];
         if (displayChanged)
             [self allThumbnailsNeedUpdate];


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

Revision: 2411
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2411&view=rev
Author:   hofman
Date:     2007-07-03 10:28:20 -0700 (Tue, 03 Jul 2007)

Log Message:
-----------
Stop search and remove searchResults before reloading a PDF document.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-07-02 19:35:45 UTC (rev 2410)
+++ trunk/SKMainWindowController.m	2007-07-03 17:28:20 UTC (rev 2411)
@@ -566,25 +566,30 @@
         
         unsigned pageIndex = NSNotFound;
         NSRect visibleRect = NSZeroRect;
+        NSArray *snapshotDicts = nil;
         
         if ([pdfView document]) {
             pageIndex = [[pdfView document] indexForPage:[pdfView currentPage]];
             visibleRect = [pdfView convertRect:[pdfView convertRect:[[pdfView documentView] visibleRect] fromView:[pdfView documentView]] toPage:[pdfView currentPage]];
+            
+            [[pdfView document] cancelFindString];
+            
+            // these will be invalid. If needed, the document will restore them
+            [[self mutableArrayValueForKey:@"searchResults"] removeAllObjects];
+            [[self mutableArrayValueForKey:@"notes"] removeAllObjects];
+            [[self mutableArrayValueForKey:@"thumbnails"] removeAllObjects];
+            
+            snapshotDicts = [snapshots valueForKey:@"currentSetup"];
+            [snapshots makeObjectsPerformSelector:@selector(close)];
+            [[self mutableArrayValueForKey:@"snapshots"] removeAllObjects];
+            
+            [lastViewedPages removeAllObjects];
+            
+            [self unregisterForDocumentNotifications];
+            
+            [[pdfView document] setDelegate:nil];
         }
         
-        // these will be invalid. If needed, the document will restore them
-        [[self mutableArrayValueForKey:@"notes"] removeAllObjects];
-        [[self mutableArrayValueForKey:@"thumbnails"] removeAllObjects];
-        
-        NSArray *snapshotDicts = [snapshots valueForKey:@"currentSetup"];
-        [snapshots makeObjectsPerformSelector:@selector(close)];
-        [[self mutableArrayValueForKey:@"snapshots"] removeAllObjects];
-        
-        [lastViewedPages removeAllObjects];
-        
-        [self unregisterForDocumentNotifications];
-        
-        [[pdfView document] setDelegate:nil];
         [pdfView setDocument:document];
         [[pdfView document] setDelegate:self];
         


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

Revision: 2449
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2449&view=rev
Author:   hofman
Date:     2007-07-08 15:00:33 -0700 (Sun, 08 Jul 2007)

Log Message:
-----------
Remove annotations from the PDFView before reloading the pdf document. Hopefully this fixes some crashers, though I can't really imagine. But I don't understand why the crashes happen either. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-07-08 20:36:47 UTC (rev 2448)
+++ trunk/SKMainWindowController.m	2007-07-08 22:00:33 UTC (rev 2449)
@@ -617,6 +617,14 @@
             
             [[pdfView document] cancelFindString];
             
+            NSEnumerator *e = [notes objectEnumerator];
+            PDFAnnotation *annotation;
+            
+            // remove the current annotations
+            [pdfView setActiveAnnotation:nil];
+            while (annotation = [e nextObject])
+                [[annotation page] removeAnnotation:annotation];
+            
             // these will be invalid. If needed, the document will restore them
             [[self mutableArrayValueForKey:@"searchResults"] removeAllObjects];
             [[self mutableArrayValueForKey:@"notes"] removeAllObjects];
@@ -717,7 +725,6 @@
     PDFAnnotation *annotation;
     
     // remove the current annotations
-    [pdfView endAnnotationEdit:self];
     [pdfView setActiveAnnotation:nil];
     while (annotation = [e nextObject]) {
         [pdfView setNeedsDisplayForAnnotation:annotation];


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

Revision: 2451
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2451&view=rev
Author:   hofman
Date:     2007-07-08 17:05:51 -0700 (Sun, 08 Jul 2007)

Log Message:
-----------
Set resizing struts for status bar. Take status bar into account for fitting window around pdf. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-07-08 22:34:40 UTC (rev 2450)
+++ trunk/SKMainWindowController.m	2007-07-09 00:05:51 UTC (rev 2451)
@@ -1573,6 +1573,7 @@
 - (IBAction)toggleStatusBar:(id)sender {
     if (statusBar == nil) {
         statusBar = [[SKStatusBar alloc] initWithFrame:NSMakeRect(0.0, 0.0, NSWidth([splitView frame]), 20.0)];
+        [statusBar setAutoresizingMask:NSViewWidthSizable | NSViewMaxYMargin];
         [self updateLeftStatus];
         [self updateRightStatus];
     }
@@ -1926,6 +1927,7 @@
     NSRect screenFrame = [[[self window] screen] visibleFrame];
     NSRect frame = [splitView frame];
     NSRect documentRect = [[[self pdfView] documentView] convertRect:[[[self pdfView] documentView] bounds] toView:nil];
+    float bottomOffset = -1.0;
     
     if ([[self pdfView] autoScales]) {
         documentRect.size.width /= [[self pdfView] scaleFactor];
@@ -1934,18 +1936,23 @@
     
     frame.size.width = NSWidth([leftSideContentBox frame]) + NSWidth([rightSideContentBox frame]) + NSWidth(documentRect) + 2 * [splitView dividerThickness] + 2.0;
     if (displayMode == kPDFDisplaySinglePage || displayMode == kPDFDisplayTwoUp) {
-        frame.size.height = NSHeight(documentRect);
+        frame.size.height = NSHeight(documentRect) + 1.0;
     } else {
         NSRect pageBounds = [[self pdfView] convertRect:[[[self pdfView] currentPage] boundsForBox:[[self pdfView] displayBox]] fromPage:[[self pdfView] currentPage]];
         if ([[self pdfView] autoScales]) {
             pageBounds.size.width /= [[self pdfView] scaleFactor];
             pageBounds.size.height /= [[self pdfView] scaleFactor];
         }
-        frame.size.height = NSHeight(pageBounds) + NSWidth(documentRect) - NSWidth(pageBounds);
+        frame.size.height = NSHeight(pageBounds) + NSWidth(documentRect) - NSWidth(pageBounds) + 1.0;
         frame.size.width += [NSScroller scrollerWidth];
     }
+    
+    if ([statusBar isVisible])
+        bottomOffset = NSHeight([statusBar frame]);
+    frame.origin.y -= bottomOffset;
+    frame.size.height += bottomOffset;
+    
     frame.origin = [[self window] convertBaseToScreen:[[[self window] contentView] convertPoint:frame.origin toView:nil]];
-    
     frame = [[self window] frameRectForContentRect:frame];
     if (frame.size.width > NSWidth(screenFrame))
         frame.size.width = NSWidth(screenFrame);


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

Revision: 2455
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2455&view=rev
Author:   hofman
Date:     2007-07-09 07:36:27 -0700 (Mon, 09 Jul 2007)

Log Message:
-----------
No need to remove annotations from the PDF. This will be done by reloading the PDF. The crasher was in keeping the active annotation too long.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-07-09 12:44:48 UTC (rev 2454)
+++ trunk/SKMainWindowController.m	2007-07-09 14:36:27 UTC (rev 2455)
@@ -617,15 +617,9 @@
             
             [[pdfView document] cancelFindString];
             
+            // make sure these will not be activated, or they can lead to a crash
             [pdfView removeHoverRects];
-            
-            NSEnumerator *e = [notes objectEnumerator];
-            PDFAnnotation *annotation;
-            
-            // remove the current annotations
             [pdfView setActiveAnnotation:nil];
-            while (annotation = [e nextObject])
-                [[annotation page] removeAnnotation:annotation];
             
             // these will be invalid. If needed, the document will restore them
             [[self mutableArrayValueForKey:@"searchResults"] removeAllObjects];


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

Revision: 2469
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2469&view=rev
Author:   hofman
Date:     2007-07-10 11:15:36 -0700 (Tue, 10 Jul 2007)

Log Message:
-----------
Handle the odd case of a fullscreen window moving from one screen to another. This could happen when the screen on which the window displays is disconnected. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-07-10 17:49:21 UTC (rev 2468)
+++ trunk/SKMainWindowController.m	2007-07-10 18:15:36 UTC (rev 2469)
@@ -566,6 +566,34 @@
     }
 }
 
+- (void)windowDidChangeScreen:(NSNotification *)notification {
+    if ([[notification object] isEqual:[self window]]) {
+        if ([self isFullScreen]) {
+            NSScreen *screen = [fullScreenWindow screen];
+            [fullScreenWindow setFrame:[screen frame] display:NO];
+            [pdfView layoutDocumentView];
+            [pdfView setNeedsDisplay:YES];
+            
+            if ([[leftSideWindow screen] isEqual:screen] == NO) {
+                [leftSideWindow orderOut:self];
+                [leftSideWindow moveToScreen:screen];
+                [leftSideWindow hideSideWindow];
+                [leftSideWindow orderFront:self];
+            }
+            if ([[rightSideWindow screen] isEqual:screen] == NO) {
+                [rightSideWindow orderOut:self];
+                [leftSideWindow moveToScreen:screen];
+                [rightSideWindow hideSideWindow];
+                [rightSideWindow orderFront:self];
+            }
+        } else if ([self isPresentation]) {
+            [fullScreenWindow setFrame:[[fullScreenWindow screen] frame] display:NO];
+            [pdfView layoutDocumentView];
+            [pdfView setNeedsDisplay:YES];
+        }
+    }
+}
+
 - (void)updateLeftStatus {
     NSString *message = [NSString stringWithFormat:NSLocalizedString(@"Page %i of %i", @"Status message"), [self pageNumber], [[pdfView document] pageCount]];
     [statusBar setLeftStringValue:message];


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

Revision: 2476
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2476&view=rev
Author:   hofman
Date:     2007-07-11 06:44:49 -0700 (Wed, 11 Jul 2007)

Log Message:
-----------
Also re-layout PDF when the normal window changes screen. At least when the PDF auto-resizes, this is needed. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-07-11 13:25:09 UTC (rev 2475)
+++ trunk/SKMainWindowController.m	2007-07-11 13:44:49 UTC (rev 2476)
@@ -571,8 +571,6 @@
         if ([self isFullScreen]) {
             NSScreen *screen = [fullScreenWindow screen];
             [fullScreenWindow setFrame:[screen frame] display:NO];
-            [pdfView layoutDocumentView];
-            [pdfView setNeedsDisplay:YES];
             
             if ([[leftSideWindow screen] isEqual:screen] == NO) {
                 [leftSideWindow orderOut:self];
@@ -588,9 +586,9 @@
             }
         } else if ([self isPresentation]) {
             [fullScreenWindow setFrame:[[fullScreenWindow screen] frame] display:NO];
-            [pdfView layoutDocumentView];
-            [pdfView setNeedsDisplay:YES];
         }
+        [pdfView layoutDocumentView];
+        [pdfView setNeedsDisplay:YES];
     }
 }
 


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

Revision: 2477
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2477&view=rev
Author:   hofman
Date:     2007-07-11 07:48:38 -0700 (Wed, 11 Jul 2007)

Log Message:
-----------
Set window delegate of main/fullscreen window to nil when it's not the current window.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-07-11 13:44:49 UTC (rev 2476)
+++ trunk/SKMainWindowController.m	2007-07-11 14:48:38 UTC (rev 2477)
@@ -1634,7 +1634,6 @@
     // Create the full-screen window if it does not already  exist.
     if (fullScreenWindow == nil) {
         fullScreenWindow = [[SKFullScreenWindow alloc] initWithScreen:screen];
-        [fullScreenWindow setDelegate:self];
     }
         
     // explicitly set window frame; screen may have moved, or may be nil (in which case [fullScreenWindow frame] is wrong, which is weird); the first time through this method, [fullScreenWindow screen] is nil
@@ -1679,12 +1678,14 @@
         }
     }
     
+    [mainWindow setDelegate:nil];
     [self setWindow:fullScreenWindow];
     [fullScreenWindow makeKeyAndOrderFront:self];
     [fullScreenWindow makeFirstResponder:pdfView];
     [fullScreenWindow setAcceptsMouseMovedEvents:YES];
     [fullScreenWindow recalculateKeyViewLoop];
     [mainWindow orderOut:self];    
+    [fullScreenWindow setDelegate:self];
 }
 
 - (void)removeFullScreen {
@@ -1699,6 +1700,7 @@
             [(id)wc setForceOnTop:NO];
     }
     
+    [fullScreenWindow setDelegate:nil];
     [self setWindow:mainWindow];
     [mainWindow orderWindow:NSWindowBelow relativeTo:[fullScreenWindow windowNumber]];
     [mainWindow makeKeyWindow];
@@ -1717,6 +1719,7 @@
     [mainWindow makeKeyAndOrderFront:self];
     [mainWindow makeFirstResponder:pdfView];
     [mainWindow recalculateKeyViewLoop];
+    [mainWindow setDelegate:self];
     
     NSEnumerator *blankScreenEnumerator = [blankingWindows objectEnumerator];
     NSWindow *window;


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

Revision: 2501
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2501&view=rev
Author:   hofman
Date:     2007-07-14 05:34:25 -0700 (Sat, 14 Jul 2007)

Log Message:
-----------
Hide blanking windows on deactivate.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-07-14 11:06:06 UTC (rev 2500)
+++ trunk/SKMainWindowController.m	2007-07-14 12:34:25 UTC (rev 2501)
@@ -1675,6 +1675,7 @@
                 [window setFrame:[screenToBlank frame] display:YES];
                 [window orderFront:nil];
                 [window setReleasedWhenClosed:YES];
+                [window setHidesOnDeactivate:YES];
                 [blankingWindows addObject:window];
                 [window release];
             }
@@ -2513,13 +2514,15 @@
 }
 
 - (void)handleApplicationDidResignActiveNotification:(NSNotification *)notification {
-    if ([self isPresentation])
+    if ([self isPresentation]) {
         [fullScreenWindow setLevel:NSNormalWindowLevel];
+    }
 }
 
 - (void)handleApplicationWillBecomeActiveNotification:(NSNotification *)notification {
-    if ([self isPresentation])
+    if ([self isPresentation]) {
         [fullScreenWindow setLevel:NSPopUpMenuWindowLevel];
+    }
 }
 
 - (void)handleDocumentWillSaveNotification:(NSNotification *)notification {


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

Revision: 2530
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2530&view=rev
Author:   hofman
Date:     2007-07-19 03:06:06 -0700 (Thu, 19 Jul 2007)

Log Message:
-----------
Correct some more layout messed up by nib-loading of the splitview. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-07-19 09:37:36 UTC (rev 2529)
+++ trunk/SKMainWindowController.m	2007-07-19 10:06:06 UTC (rev 2530)
@@ -246,12 +246,27 @@
     
     [pdfView setFrame:[[pdfContentBox contentView] bounds]];
     
+    float width = NSWidth([leftSideContentBox frame]);
     NSRect frame = [leftSideBox frame];
-    frame.size.width = NSWidth([leftSideContentBox frame]);
+    frame.size.width = width;
     [leftSideBox setFrame:frame];
+    frame = [leftSideEdgeView frame];
+    frame.size.width = width;
+    [leftSideEdgeView setFrame:frame];
+    frame = [currentLeftSideView frame];
+    frame.size.width = width;
+    [currentLeftSideView setFrame:frame];
+    
+    width = NSWidth([rightSideContentBox frame]);
     frame = [rightSideBox frame];
-    frame.size.width = NSWidth([rightSideContentBox frame]);
+    frame.size.width = width;
     [rightSideBox setFrame:frame];
+    frame = [rightSideEdgeView frame];
+    frame.size.width = width;
+    [rightSideEdgeView setFrame:frame];
+    frame = [currentRightSideView frame];
+    frame.size.width = width;
+    [currentRightSideView setFrame:frame];
     
     frame = [leftSideButton frame];
     frame.size.height = SEGMENTED_CONTROL_HEIGHT;


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

Revision: 2533
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2533&view=rev
Author:   hofman
Date:     2007-07-19 06:33:06 -0700 (Thu, 19 Jul 2007)

Log Message:
-----------
No need to retain the left/rightSideView as they are now top-level objects in the nib and therefore implicitly retained by the nib's owner.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-07-19 13:22:31 UTC (rev 2532)
+++ trunk/SKMainWindowController.m	2007-07-19 13:33:06 UTC (rev 2533)
@@ -256,14 +256,10 @@
     [[rightSideButton cell] setToolTip:NSLocalizedString(@"View Notes", @"Tool tip message") forSegment:SKNoteSidePaneState];
     [[rightSideButton cell] setToolTip:NSLocalizedString(@"View Snapshots", @"Tool tip message") forSegment:SKSnapshotSidePaneState];
     
-    [leftSideContentView retain];
     [leftSideContentView setFrame:[leftSideContentBox bounds]];
     [leftSideContentBox addSubview:leftSideContentView];
-    [leftSideContentView release];
-    [rightSideContentView retain];
     [rightSideContentView setFrame:[rightSideContentBox bounds]];
     [rightSideContentBox addSubview:rightSideContentView];
-    [rightSideContentView release];
     
     [pdfView setFrame:[[pdfContentBox contentView] bounds]];
     
@@ -1899,10 +1895,8 @@
         
         if ([[leftSideWindow firstResponder] isDescendantOf:leftSideContentView])
             [leftSideWindow makeFirstResponder:nil];
-        [leftSideContentView retain]; // leftSideContentView is removed from its old superview in the process
         [leftSideContentView setFrame:[leftSideContentBox bounds]];
         [leftSideContentBox addSubview:leftSideContentView];
-        [leftSideContentView release];
         
         [leftSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
         [findEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
@@ -1922,10 +1916,8 @@
         
         if ([[rightSideWindow firstResponder] isDescendantOf:rightSideContentView])
             [rightSideWindow makeFirstResponder:nil];
-        [rightSideContentView retain]; // rightSideContentView is removed from its old superview in the process
         [rightSideContentView setFrame:[rightSideContentBox bounds]];
         [rightSideContentBox addSubview:rightSideContentView];
-        [rightSideContentView release];
         
         [rightSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
         


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

Revision: 2538
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2538&view=rev
Author:   hofman
Date:     2007-07-19 16:25:01 -0700 (Thu, 19 Jul 2007)

Log Message:
-----------
Use correct value for scale factor of reopened snapshots.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-07-19 20:11:41 UTC (rev 2537)
+++ trunk/SKMainWindowController.m	2007-07-19 23:25:01 UTC (rev 2538)
@@ -361,7 +361,7 @@
         NSEnumerator *setupEnum = [[[SKBookmarkController sharedBookmarkController] snapshotsAtPath:[[[self document] fileURL] path]] objectEnumerator];
         NSDictionary *setup;
         if (setup = [setupEnum nextObject])
-            [self showSnapshotAtPageNumber:[[setup objectForKey:@"page"] unsignedIntValue] forRect:NSRectFromString([setup objectForKey:@"rect"]) factor:[[setup objectForKey:@"page"] floatValue] display:[[setup objectForKey:@"hasWindow"] boolValue]];
+            [self showSnapshotAtPageNumber:[[setup objectForKey:@"page"] unsignedIntValue] forRect:NSRectFromString([setup objectForKey:@"rect"]) factor:[[setup objectForKey:@"scaleFactor"] floatValue] display:[[setup objectForKey:@"hasWindow"] boolValue]];
     }
     
     // This update toolbar item and other states
@@ -770,7 +770,7 @@
         NSEnumerator *setupEnum = [snapshotDicts objectEnumerator];
         NSDictionary *setup;
         while (setup = [setupEnum nextObject])
-            [self showSnapshotAtPageNumber:[[setup objectForKey:@"page"] unsignedIntValue] forRect:NSRectFromString([setup objectForKey:@"rect"]) factor:[[setup objectForKey:@"page"] floatValue] display:[[setup objectForKey:@"hasWindow"] boolValue]];
+            [self showSnapshotAtPageNumber:[[setup objectForKey:@"page"] unsignedIntValue] forRect:NSRectFromString([setup objectForKey:@"rect"]) factor:[[setup objectForKey:@"scaleFactor"] floatValue] display:[[setup objectForKey:@"hasWindow"] boolValue]];
         
         if (pageIndex != NSNotFound && [document pageCount]) {
             PDFPage *page = [document pageAtIndex:MIN(pageIndex, [document pageCount] - 1)];


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

Revision: 2541
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2541&view=rev
Author:   hofman
Date:     2007-07-22 05:15:02 -0700 (Sun, 22 Jul 2007)

Log Message:
-----------
Validate Physical Size menu item.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-07-22 12:05:03 UTC (rev 2540)
+++ trunk/SKMainWindowController.m	2007-07-22 12:15:02 UTC (rev 2541)
@@ -4241,6 +4241,8 @@
         return [self isPresentation] == NO && [pdfView canZoomOut];
     } else if (action == @selector(doZoomToActualSize:)) {
         return fabs([pdfView scaleFactor] - 1.0 ) > 0.01;
+    } else if (action == @selector(doZoomToPhysicalSize:)) {
+        return [self isPresentation] == NO;
     } else if (action == @selector(doZoomToSelection:)) {
         return [self isPresentation] == NO && NSIsEmptyRect([pdfView currentSelectionRect]) == NO;
     } else if (action == @selector(doZoomToFit:)) {


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

Revision: 2543
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2543&view=rev
Author:   hofman
Date:     2007-07-22 17:23:53 -0700 (Sun, 22 Jul 2007)

Log Message:
-----------
We don't show the progress sheet when cropping to the selection, so don't end it.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-07-22 12:58:37 UTC (rev 2542)
+++ trunk/SKMainWindowController.m	2007-07-23 00:23:53 UTC (rev 2543)
@@ -1413,7 +1413,9 @@
 - (IBAction)cropAll:(id)sender {
     NSRect rect[2] = {NSIntegralRect([pdfView currentSelectionRect]), NSZeroRect};
     NSArray *rectArray;
-    if (NSIsEmptyRect(rect[0])) {
+    BOOL emptySelection = NSIsEmptyRect(rect[0]);
+    
+    if (emptySelection) {
         if (progressSheet == nil) {
             if ([NSBundle loadNibNamed:@"ProgressSheet" owner:self])  {
                 [progressBar setUsesThreadedAnimation:YES];
@@ -1459,8 +1461,10 @@
     [self cropPagesToRects:rectArray];
     [pdfView setCurrentSelectionRect:NSZeroRect];
 	
-    [NSApp endSheet:progressSheet];
-    [progressSheet orderOut:self];
+    if (emptySelection) {
+        [NSApp endSheet:progressSheet];
+        [progressSheet orderOut:self];
+    }
 }
 
 - (IBAction)autoCropAll:(id)sender {


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

Revision: 2552
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2552&view=rev
Author:   hofman
Date:     2007-07-23 10:50:32 -0700 (Mon, 23 Jul 2007)

Log Message:
-----------
Typing to avoid compiler warning. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-07-23 16:32:29 UTC (rev 2551)
+++ trunk/SKMainWindowController.m	2007-07-23 17:50:32 UTC (rev 2552)
@@ -1245,7 +1245,7 @@
 - (IBAction)doZoomToPhysicalSize:(id)sender {
     float scaleFactor = 1.0;
     NSScreen *screen = [[self window] screen];
-	CGDirectDisplayID displayID = [[[screen deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue];
+	CGDirectDisplayID displayID = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue];
 	CGSize physicalSize = CGDisplayScreenSize(displayID);
     NSSize resolution = [[[screen deviceDescription] objectForKey:NSDeviceResolution] sizeValue];
 	


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

Revision: 2578
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2578&view=rev
Author:   hofman
Date:     2007-07-28 07:03:34 -0700 (Sat, 28 Jul 2007)

Log Message:
-----------
Fix nib archiving/unarchiving bug: force the boxes in the splitview to autoresize their subviews.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-07-28 12:43:41 UTC (rev 2577)
+++ trunk/SKMainWindowController.m	2007-07-28 14:03:34 UTC (rev 2578)
@@ -264,6 +264,12 @@
     [[rightSideButton cell] setToolTip:NSLocalizedString(@"View Notes", @"Tool tip message") forSegment:SKNoteSidePaneState];
     [[rightSideButton cell] setToolTip:NSLocalizedString(@"View Snapshots", @"Tool tip message") forSegment:SKSnapshotSidePaneState];
     
+    // This gets sometimes messed up in the nib, AppKit bug rdar://5346690
+    [leftSideContentBox setAutoresizesSubviews:YES];
+    [[leftSideContentBox contentView] setAutoresizesSubviews:YES];
+    [rightSideContentBox setAutoresizesSubviews:YES];
+    [[rightSideContentBox contentView] setAutoresizesSubviews:YES];
+    
     [leftSideContentView setFrame:[leftSideContentBox bounds]];
     [leftSideContentBox addSubview:leftSideContentView];
     [rightSideContentView setFrame:[rightSideContentBox bounds]];


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

Revision: 2583
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2583&view=rev
Author:   hofman
Date:     2007-07-29 03:09:11 -0700 (Sun, 29 Jul 2007)

Log Message:
-----------
Hide hover window when closing left side pane.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-07-29 09:38:47 UTC (rev 2582)
+++ trunk/SKMainWindowController.m	2007-07-29 10:09:11 UTC (rev 2583)
@@ -1775,6 +1775,7 @@
 
 - (IBAction)toggleLeftSidePane:(id)sender {
     if ([self isFullScreen]) {
+        [[SKPDFHoverWindow sharedHoverWindow] hide];
         if ([leftSideWindow state] == NSDrawerOpenState || [leftSideWindow state] == NSDrawerOpeningState)
             [leftSideWindow hideSideWindow];
         else
@@ -1788,7 +1789,9 @@
         NSRect sideFrame = [leftSideContentBox frame];
         NSRect pdfFrame = [pdfContentBox frame];
         
-        if(NSWidth(sideFrame) > 0.0){
+        if (NSWidth(sideFrame) > 0.0) {
+            if (leftSidePaneState == SKOutlineSidePaneState || [[searchField stringValue] length])
+                [[SKPDFHoverWindow sharedHoverWindow] hide];
             lastLeftSidePaneWidth = NSWidth(sideFrame); // cache this
             pdfFrame.size.width += lastLeftSidePaneWidth;
             sideFrame.size.width = 0.0;
@@ -1820,7 +1823,7 @@
         NSRect sideFrame = [rightSideContentBox frame];
         NSRect pdfFrame = [pdfContentBox frame];
         
-        if(NSWidth(sideFrame) > 1.0){
+        if (NSWidth(sideFrame) > 1.0) {
             lastRightSidePaneWidth = NSWidth(sideFrame); // cache this
             pdfFrame.size.width += lastRightSidePaneWidth;
             sideFrame.size.width = 0.0;


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

Revision: 2588
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2588&view=rev
Author:   hofman
Date:     2007-07-30 09:10:03 -0700 (Mon, 30 Jul 2007)

Log Message:
-----------
Increase min width of left/right side collapsible view. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-07-30 14:50:51 UTC (rev 2587)
+++ trunk/SKMainWindowController.m	2007-07-30 16:10:03 UTC (rev 2588)
@@ -240,13 +240,13 @@
     // Set up the panes and subviews, needs to be done before we resize them
     
     [leftSideCollapsibleView setCollapseEdges:BDSKMaxXEdgeMask | BDSKMinYEdgeMask];
-    [leftSideCollapsibleView setMinSize:NSMakeSize(100.0, 42.0)];
+    [leftSideCollapsibleView setMinSize:NSMakeSize(111.0, NSHeight([leftSideCollapsibleView frame]))];
     
     [findCollapsibleView setCollapseEdges:BDSKMaxXEdgeMask | BDSKMinYEdgeMask];
-    [findCollapsibleView setMinSize:NSMakeSize(50.0, 25.0)];
+    [findCollapsibleView setMinSize:NSMakeSize(50.0, NSHeight([findCollapsibleView frame]))];
     
     [rightSideCollapsibleView setCollapseEdges:BDSKMaxXEdgeMask | BDSKMinYEdgeMask];
-    [rightSideCollapsibleView setMinSize:NSMakeSize(100.0, 42.0)];
+    [rightSideCollapsibleView setMinSize:NSMakeSize(111.0, NSHeight([rightSideCollapsibleView frame]))];
     
     [pdfContentBox setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask | BDSKMinYEdgeMask];
     [findEdgeView setEdges:BDSKMaxXEdgeMask];


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

Revision: 2594
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2594&view=rev
Author:   hofman
Date:     2007-07-31 04:31:48 -0700 (Tue, 31 Jul 2007)

Log Message:
-----------
Fade in search view after starting the find so it does not fade in the previous results. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-07-31 11:01:04 UTC (rev 2593)
+++ trunk/SKMainWindowController.m	2007-07-31 11:31:48 UTC (rev 2594)
@@ -2438,8 +2438,8 @@
         else 
             [self fadeInOutlineView];
     } else {
+        [[pdfView document] beginFindString:[sender stringValue] withOptions:NSCaseInsensitiveSearch];
         [self fadeInSearchView];
-        [[pdfView document] beginFindString:[sender stringValue] withOptions:NSCaseInsensitiveSearch];
         
         NSPasteboard *findPboard = [NSPasteboard pasteboardWithName:NSFindPboard];
         [findPboard declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil];


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

Revision: 2612
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2612&view=rev
Author:   hofman
Date:     2007-08-06 06:33:48 -0700 (Mon, 06 Aug 2007)

Log Message:
-----------
Dirty snapshots after unlocking documents.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-08-06 13:23:51 UTC (rev 2611)
+++ trunk/SKMainWindowController.m	2007-08-06 13:33:48 UTC (rev 2612)
@@ -2896,6 +2896,7 @@
     [self didChangeValueForKey:@"pageLabel"];
     
     [self resetThumbnails];
+    [self allSnapshotsNeedUpdate];
     
     if (pdfOutline == nil) {
         pdfOutline = [[pdfDoc outlineRoot] retain];


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

Revision: 2614
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2614&view=rev
Author:   hofman
Date:     2007-08-06 09:10:44 -0700 (Mon, 06 Aug 2007)

Log Message:
-----------
Don't generate thumbnails when the PDF is locked, as it won't have content.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-08-06 15:01:22 UTC (rev 2613)
+++ trunk/SKMainWindowController.m	2007-08-06 16:10:44 UTC (rev 2614)
@@ -965,7 +965,7 @@
 - (id)objectInThumbnailsAtIndex:(unsigned)theIndex {
     SKThumbnail *thumbnail = [thumbnails objectAtIndex:theIndex];
     
-    if ([thumbnail isDirty] && NO == isAnimating && NO == [thumbnailTableView isScrolling]) {
+    if ([thumbnail isDirty] && NO == isAnimating && NO == [thumbnailTableView isScrolling] && [[pdfView document] isLocked] == NO) {
         
         NSSize newSize, oldSize = [[thumbnail image] size];
         PDFDocument *pdfDoc = [pdfView document];


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

Revision: 2617
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2617&view=rev
Author:   hofman
Date:     2007-08-07 03:09:03 -0700 (Tue, 07 Aug 2007)

Log Message:
-----------
Disable fullscreen and presentation mode when  the document is locked as it has weird side effects.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-08-07 09:07:29 UTC (rev 2616)
+++ trunk/SKMainWindowController.m	2007-08-07 10:09:03 UTC (rev 2617)
@@ -2089,7 +2089,7 @@
 - (void)saveNormalSetup {
     if ([self isPresentation] == NO && [self isFullScreen] == NO) {
         NSScrollView *scrollView = [[pdfView documentView] enclosingScrollView];
-        [savedNormalSetup setDictionary:[self currentSetup]];
+        [savedNormalSetup setDictionary:[self currentPDFSettings]];
         [savedNormalSetup setObject:[NSNumber numberWithBool:[scrollView hasHorizontalScroller]] forKey:@"hasHorizontalScroller"];
         [savedNormalSetup setObject:[NSNumber numberWithBool:[scrollView hasVerticalScroller]] forKey:@"hasVerticalScroller"];
         [savedNormalSetup setObject:[NSNumber numberWithBool:[scrollView autohidesScrollers]] forKey:@"autohidesScrollers"];
@@ -4507,13 +4507,13 @@
             [menuItem setTitle:NSLocalizedString(@"Remove Full Screen", @"Menu item title")];
         else
             [menuItem setTitle:NSLocalizedString(@"Full Screen", @"Menu item title")];
-        return YES;
+        return [[self pdfDocument] isLocked] == NO;
     } else if (action == @selector(togglePresentation:)) {
         if ([self isPresentation])
             [menuItem setTitle:NSLocalizedString(@"Remove Presentation", @"Menu item title")];
         else
             [menuItem setTitle:NSLocalizedString(@"Presentation", @"Menu item title")];
-        return YES;
+        return [[self pdfDocument] isLocked] == NO;
     } else if (action == @selector(getInfo:)) {
         return [self isPresentation] == NO;
     } else if (action == @selector(performFit:)) {


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

Revision: 2626
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2626&view=rev
Author:   hofman
Date:     2007-08-08 12:33:39 -0700 (Wed, 08 Aug 2007)

Log Message:
-----------
Update enabled of TOC button when reloading or unlocking the PDF document.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-08-08 17:35:13 UTC (rev 2625)
+++ trunk/SKMainWindowController.m	2007-08-08 19:33:39 UTC (rev 2626)
@@ -760,6 +760,8 @@
             [self updateOutlineSelection];
         }
         
+        [leftSideButton setEnabled:pdfOutline != nil forSegment:SKOutlineSidePaneState];
+        
         [noteOutlineView reloadData];
         
         [self updateNoteSelection];
@@ -2910,6 +2912,7 @@
             [outlineView expandItem: [outlineView itemAtRow: 0] expandChildren: NO];
         [self updateOutlineSelection];
     }
+    [leftSideButton setEnabled:pdfOutline != nil forSegment:SKOutlineSidePaneState];
 }
 
 - (void)handleColorSwatchColorsChangedNotification:(NSNotification *)notification {


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

Revision: 2691
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2691&view=rev
Author:   hofman
Date:     2007-08-21 07:33:23 -0700 (Tue, 21 Aug 2007)

Log Message:
-----------
Show status message during type-select.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-08-21 14:20:35 UTC (rev 2690)
+++ trunk/SKMainWindowController.m	2007-08-21 14:33:23 UTC (rev 2691)
@@ -3559,6 +3559,20 @@
     }
 }
 
+- (void)typeSelectHelper:(SKTypeSelectHelper *)typeSelectHelper updateSearchString:(NSString *)searchString {
+    if ([typeSelectHelper isEqual:[thumbnailTableView typeSelectHelper]]) {
+        if (searchString)
+            [statusBar setLeftStringValue:[NSString stringWithFormat:NSLocalizedString(@"Go to page: %@", @"Status message"), searchString]];
+        else
+            [self updateLeftStatus];
+    } else if ([typeSelectHelper isEqual:[noteOutlineView typeSelectHelper]]) {
+        if (searchString)
+            [statusBar setRightStringValue:[NSString stringWithFormat:NSLocalizedString(@"Finding note: \"%@\"", @"Status message"), searchString]];
+        else
+            [self updateRightStatus];
+    }
+}
+
 #pragma mark Outline
 
 - (int)outlineRowForPageIndex:(unsigned int)pageIndex {


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

Revision: 2706
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2706&view=rev
Author:   hofman
Date:     2007-08-22 15:26:26 -0700 (Wed, 22 Aug 2007)

Log Message:
-----------
Add quotes around type select string in status message.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-08-22 19:53:29 UTC (rev 2705)
+++ trunk/SKMainWindowController.m	2007-08-22 22:26:26 UTC (rev 2706)
@@ -3577,7 +3577,7 @@
             [self updateRightStatus];
     } else if ([typeSelectHelper isEqual:[outlineView typeSelectHelper]]) {
         if (searchString)
-            [statusBar setLeftStringValue:[NSString stringWithFormat:NSLocalizedString(@"Finding: %@", @"Status message"), searchString]];
+            [statusBar setLeftStringValue:[NSString stringWithFormat:NSLocalizedString(@"Finding: \"%@\"", @"Status message"), searchString]];
         else
             [self updateLeftStatus];
     }


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

Revision: 2713
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2713&view=rev
Author:   hofman
Date:     2007-08-23 07:54:57 -0700 (Thu, 23 Aug 2007)

Log Message:
-----------
Return nothing for outlineRowForPageIndex: when there is no outline, as the outlineView may perhaps be stale when the document is reloading.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-08-23 12:59:11 UTC (rev 2712)
+++ trunk/SKMainWindowController.m	2007-08-23 14:54:57 UTC (rev 2713)
@@ -3662,6 +3662,9 @@
 #pragma mark Outline
 
 - (int)outlineRowForPageIndex:(unsigned int)pageIndex {
+    if (pdfOutline == nil)
+        return -1;
+    
 	int i, numRows = [outlineView numberOfRows];
 	for (i = 0; i < numRows; i++) {
 		// Get the destination of the given row....


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

Revision: 2719
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2719&view=rev
Author:   hofman
Date:     2007-08-26 02:40:06 -0700 (Sun, 26 Aug 2007)

Log Message:
-----------
Select row for contextual menu in some tables.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-08-24 17:17:30 UTC (rev 2718)
+++ trunk/SKMainWindowController.m	2007-08-26 09:40:06 UTC (rev 2719)
@@ -3353,6 +3353,8 @@
     NSMenuItem *menuItem;
     
     if ([ov isEqual:noteOutlineView]) {
+        [outlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:[outlineView rowForItem:item]] byExtendingSelection:NO];
+        
         PDFAnnotation *annotation = [item type] ? item : [(SKNoteText *)item annotation];
         menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] init] autorelease];
         if ([self outlineView:ov canDeleteItems:[NSArray arrayWithObjects:item, nil]]) {
@@ -3581,6 +3583,8 @@
         [menuItem setTarget:self];
         [menuItem setRepresentedObject:[[pdfView document] pageAtIndex:row]];
     } else if ([tv isEqual:snapshotTableView]) {
+        [snapshotTableView selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
+        
         menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] init] autorelease];
         SKSnapshotWindowController *controller = [[snapshotArrayController arrangedObjects] objectAtIndex:row];
         NSMenuItem *menuItem = [menu addItemWithTitle:NSLocalizedString(@"Delete", @"Menu item title") action:@selector(deleteSnapshot:) keyEquivalent:@""];


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

Revision: 2720
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2720&view=rev
Author:   hofman
Date:     2007-08-26 12:39:17 -0700 (Sun, 26 Aug 2007)

Log Message:
-----------
Open all remembered snapshot when opening a file.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-08-26 09:40:06 UTC (rev 2719)
+++ trunk/SKMainWindowController.m	2007-08-26 19:39:17 UTC (rev 2720)
@@ -369,7 +369,7 @@
     if ([sud boolForKey:SKRememberSnapshotsKey]) {
         NSEnumerator *setupEnum = [[[SKBookmarkController sharedBookmarkController] snapshotsAtPath:[[[self document] fileURL] path]] objectEnumerator];
         NSDictionary *setup;
-        if (setup = [setupEnum nextObject])
+        while (setup = [setupEnum nextObject])
             [self showSnapshotAtPageNumber:[[setup objectForKey:@"page"] unsignedIntValue] forRect:NSRectFromString([setup objectForKey:@"rect"]) factor:[[setup objectForKey:@"scaleFactor"] floatValue] autoFits:[[setup objectForKey:@"autoFits"] boolValue] display:[[setup objectForKey:@"hasWindow"] boolValue]];
     }
     


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

Revision: 2730
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2730&view=rev
Author:   hofman
Date:     2007-08-27 09:18:01 -0700 (Mon, 27 Aug 2007)

Log Message:
-----------
rename notification.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-08-27 15:39:41 UTC (rev 2729)
+++ trunk/SKMainWindowController.m	2007-08-27 16:18:01 UTC (rev 2730)
@@ -410,7 +410,7 @@
     NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
     // Application
     [nc addObserver:self selector:@selector(handleApplicationWillTerminateNotification:) 
-                             name:SKApplicationWillTerminateNotification object:NSApp];
+                             name:SKApplicationStartsTerminatingNotification object:NSApp];
     [nc addObserver:self selector:@selector(handleApplicationDidResignActiveNotification:) 
                              name:NSApplicationDidResignActiveNotification object:NSApp];
     [nc addObserver:self selector:@selector(handleApplicationWillBecomeActiveNotification:) 


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

Revision: 2762
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2762&view=rev
Author:   hofman
Date:     2007-08-28 14:54:02 -0700 (Tue, 28 Aug 2007)

Log Message:
-----------
Make sure we don't link to stale temporary annotations when reloading PDF.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-08-28 21:52:01 UTC (rev 2761)
+++ trunk/SKMainWindowController.m	2007-08-28 21:54:02 UTC (rev 2762)
@@ -754,6 +754,7 @@
             [temporaryAnnotationTimer invalidate];
             [temporaryAnnotationTimer release];
             temporaryAnnotationTimer = nil;
+            CFSetRemoveAllValues(temporaryAnnotations);
             
             // make sure these will not be activated, or they can lead to a crash
             [pdfView removeHoverRects];


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

Revision: 2761
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2761&view=rev
Author:   hofman
Date:     2007-08-28 14:52:01 -0700 (Tue, 28 Aug 2007)

Log Message:
-----------
Stop temporary annotation timer when reloading PDF.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-08-28 21:34:36 UTC (rev 2760)
+++ trunk/SKMainWindowController.m	2007-08-28 21:52:01 UTC (rev 2761)
@@ -751,6 +751,9 @@
             visibleRect = [pdfView convertRect:[pdfView convertRect:[[pdfView documentView] visibleRect] fromView:[pdfView documentView]] toPage:[pdfView currentPage]];
             
             [[pdfView document] cancelFindString];
+            [temporaryAnnotationTimer invalidate];
+            [temporaryAnnotationTimer release];
+            temporaryAnnotationTimer = nil;
             
             // make sure these will not be activated, or they can lead to a crash
             [pdfView removeHoverRects];


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

Revision: 2790
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2790&view=rev
Author:   hofman
Date:     2007-08-30 16:39:19 -0700 (Thu, 30 Aug 2007)

Log Message:
-----------
Add tool tips for note table.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-08-30 20:49:33 UTC (rev 2789)
+++ trunk/SKMainWindowController.m	2007-08-30 23:39:19 UTC (rev 2790)
@@ -3248,6 +3248,13 @@
     }
 }
 
+- (NSString *)outlineView:(NSOutlineView *)ov toolTipForCell:(NSCell *)cell rect:(NSRectPointer)rect tableColumn:(NSTableColumn *)tableColumn item:(id)item mouseLocation:(NSPoint)mouseLocation {
+    if ([ov isEqual:noteOutlineView] && [[tableColumn identifier] isEqualToString:@"note"]) {
+        return [item type] ? [(PDFAnnotation *)item contents] : [[(SKNoteText *)item contents] string];
+    }
+    return nil;
+}
+
 - (void)outlineViewItemDidExpand:(NSNotification *)notification{
     if ([[notification object] isEqual:outlineView]) {
         [self updateOutlineSelection];


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

Revision: 2829
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2829&view=rev
Author:   hofman
Date:     2007-09-04 11:24:30 -0700 (Tue, 04 Sep 2007)

Log Message:
-----------
Separate method to update page labels, page column widths, and the outline. This is also called when a document is unlocked, as not enough was updated in that case. Make sure the page labels are not nil to avoid a crash when loading an encrypted document.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-09-04 17:16:38 UTC (rev 2828)
+++ trunk/SKMainWindowController.m	2007-09-04 18:24:30 UTC (rev 2829)
@@ -135,6 +135,8 @@
 
 - (void)setupToolbar;
 
+- (void)updatePageLabelsAndOutline;
+
 - (void)showLeftSideWindowOnScreen:(NSScreen *)screen;
 - (void)showRightSideWindowOnScreen:(NSScreen *)screen;
 - (void)hideLeftSideWindow;
@@ -282,6 +284,7 @@
     
     [pdfView setFrame:[[pdfContentBox contentView] bounds]];
     
+    [outlineView setAutoresizesOutlineColumn: NO];
     [self displayOutlineView];
     [self displayNoteView];
     
@@ -726,6 +729,61 @@
     [statusBar setRightStringValue:message];
 }
 
+- (void)updatePageLabelsAndOutline {
+    PDFDocument *pdfDoc = [pdfView document];
+    NSTableColumn *tableColumn = [[thumbnailTableView tableColumns] objectAtIndex:1];
+    id cell = [tableColumn dataCell];
+    float labelWidth = 0.0;
+    int i, count = [pdfDoc pageCount];
+    
+    // update page labels, also update the size of the table columns displaying the labels
+    [self willChangeValueForKey:@"pageLabel"];
+    [self willChangeValueForKey:@"pageLabels"];
+    [pageLabels removeAllObjects];
+    for (i = 0; i < count; i++) {
+        NSString *label = [[pdfDoc pageAtIndex:i] label];
+        if (label == nil)
+            label = [NSString stringWithFormat:@"%i", i+1];
+        [pageLabels addObject:label];
+        [cell setStringValue:label];
+        labelWidth = fmaxf(labelWidth, [cell cellSize].width);
+    }
+    [self didChangeValueForKey:@"pageLabels"];
+    [self didChangeValueForKey:@"pageLabel"];
+    
+    [tableColumn setMinWidth:labelWidth];
+    [tableColumn setMaxWidth:labelWidth];
+    [thumbnailTableView sizeToFit];
+    tableColumn = [[outlineView tableColumns] objectAtIndex:1];
+    [tableColumn setMinWidth:labelWidth];
+    [tableColumn setMaxWidth:labelWidth];
+    [outlineView sizeToFit];
+    tableColumn = [[snapshotTableView tableColumns] objectAtIndex:1];
+    [tableColumn setMinWidth:labelWidth];
+    [tableColumn setMaxWidth:labelWidth];
+    [snapshotTableView sizeToFit];
+    
+    // this uses the pageLabels
+    [[thumbnailTableView typeSelectHelper] rebuildTypeSelectSearchCache];
+    
+    // these carry a label, moreover when this is called the thumbnails will also be invalid
+    [self resetThumbnails];
+    [self allSnapshotsNeedUpdate];
+    
+    // update the outline
+    [pdfOutline release];
+    pdfOutline = [[pdfDoc outlineRoot] retain];
+    [pdfOutlineItems removeAllObjects];
+    if (pdfOutline) {
+        [outlineView reloadData];
+        
+        if ([outlineView numberOfRows] == 1)
+            [outlineView expandItem: [outlineView itemAtRow: 0] expandChildren: NO];
+        [self updateOutlineSelection];
+    }
+    [leftSideButton setEnabled:pdfOutline != nil forSegment:SKOutlineSidePaneState];
+}
+
 #pragma mark Accessors
 
 - (void)setDocument:(NSDocument *)document {
@@ -785,56 +843,12 @@
         
         [self registerForDocumentNotifications];
         
-        [pdfOutline release];
-        pdfOutline = [[[pdfView document] outlineRoot] retain];
-        [pdfOutlineItems removeAllObjects];
-        if (pdfOutline && [[pdfView document] isLocked] == NO) {
-            [outlineView reloadData];
-            [outlineView setAutoresizesOutlineColumn: NO];
-            
-            if ([outlineView numberOfRows] == 1)
-                [outlineView expandItem: [outlineView itemAtRow: 0] expandChildren: NO];
-            [self updateOutlineSelection];
-        }
-        
-        [leftSideButton setEnabled:pdfOutline != nil forSegment:SKOutlineSidePaneState];
-        
         [noteOutlineView reloadData];
         
         [self updateNoteSelection];
         
-        [self resetThumbnails];
-        [self updateThumbnailSelection];
+        [self updatePageLabelsAndOutline];
         
-        NSTableColumn *tableColumn = [[thumbnailTableView tableColumns] objectAtIndex:1];
-        id cell = [tableColumn dataCell];
-        float labelWidth = 0.0;
-        int i, count = [document pageCount];
-        
-        [self willChangeValueForKey:@"pageLabels"];
-        [pageLabels removeAllObjects];
-        for (i = 0; i < count; i++) {
-            NSString *label = [[document pageAtIndex:i] label];
-            [pageLabels addObject:label ? label : @""];
-            [cell setStringValue:label];
-            labelWidth = fmaxf(labelWidth, [cell cellSize].width);
-        }
-        [self didChangeValueForKey:@"pageLabels"];
-        
-        [tableColumn setMinWidth:labelWidth];
-        [tableColumn setMaxWidth:labelWidth];
-        [thumbnailTableView sizeToFit];
-        tableColumn = [[outlineView tableColumns] objectAtIndex:1];
-        [tableColumn setMinWidth:labelWidth];
-        [tableColumn setMaxWidth:labelWidth];
-        [outlineView sizeToFit];
-        tableColumn = [[snapshotTableView tableColumns] objectAtIndex:1];
-        [tableColumn setMinWidth:labelWidth];
-        [tableColumn setMaxWidth:labelWidth];
-        [snapshotTableView sizeToFit];
-        
-        [[thumbnailTableView typeSelectHelper] rebuildTypeSelectSearchCache];
-        
         NSEnumerator *setupEnum = [snapshotDicts objectEnumerator];
         NSDictionary *setup;
         while (setup = [setupEnum nextObject])
@@ -2949,35 +2963,7 @@
 }
 
 - (void)documentDidUnlock:(NSNotification *)notification {
-    PDFDocument *pdfDoc = [self pdfDocument];
-    
-    [self willChangeValueForKey:@"pageLabel"];
-    [self willChangeValueForKey:@"pageLabels"];
-    [pageLabels removeAllObjects];
-    int i, count = [pdfDoc pageCount];
-    for (i = 0; i < count; i++) {
-        NSString *label = [[pdfDoc pageAtIndex:i] label];
-        [pageLabels addObject:label ? label : @""];
-    }
-    [self didChangeValueForKey:@"pageLabels"];
-    [self didChangeValueForKey:@"pageLabel"];
-    
-    [self resetThumbnails];
-    [self allSnapshotsNeedUpdate];
-    
-    if (pdfOutline == nil) {
-        pdfOutline = [[pdfDoc outlineRoot] retain];
-        [pdfOutlineItems removeAllObjects];
-    }
-    if (pdfOutline) {
-        [outlineView reloadData];
-        [outlineView setAutoresizesOutlineColumn: NO];
-        
-        if ([outlineView numberOfRows] == 1)
-            [outlineView expandItem: [outlineView itemAtRow: 0] expandChildren: NO];
-        [self updateOutlineSelection];
-    }
-    [leftSideButton setEnabled:pdfOutline != nil forSegment:SKOutlineSidePaneState];
+    [self updatePageLabelsAndOutline];
 }
 
 - (void)handleColorSwatchColorsChangedNotification:(NSNotification *)notification {
@@ -3775,9 +3761,7 @@
 }
 
 - (void)resetThumbnails {
-    
-    PDFDocument *pdfDoc = [pdfView document];
-    unsigned i, count = [pdfDoc pageCount];
+    unsigned i, count = [pageLabels count];
     [self willChange:NSKeyValueChangeReplacement valuesAtIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, count)] forKey:@"thumbnails"];
     [thumbnails removeAllObjects];
     if (count) {
@@ -3794,7 +3778,7 @@
         [image unlockFocus];
         
         for (i = 0; i < count; i++) {
-            SKThumbnail *thumbnail = [[SKThumbnail alloc] initWithImage:image label:[[pdfDoc pageAtIndex:i] label]];
+            SKThumbnail *thumbnail = [[SKThumbnail alloc] initWithImage:image label:[pageLabels objectAtIndex:i]];
             [thumbnail setDirty:YES];
             [thumbnails addObject:thumbnail];
             [thumbnail release];


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

Revision: 2830
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2830&view=rev
Author:   hofman
Date:     2007-09-04 11:43:49 -0700 (Tue, 04 Sep 2007)

Log Message:
-----------
Reload notes table when page labels have changed.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-09-04 18:24:30 UTC (rev 2829)
+++ trunk/SKMainWindowController.m	2007-09-04 18:43:49 UTC (rev 2830)
@@ -769,6 +769,7 @@
     // these carry a label, moreover when this is called the thumbnails will also be invalid
     [self resetThumbnails];
     [self allSnapshotsNeedUpdate];
+    [noteOutlineView reloadData];
     
     // update the outline
     [pdfOutline release];
@@ -843,12 +844,9 @@
         
         [self registerForDocumentNotifications];
         
-        [noteOutlineView reloadData];
-        
+        [self updatePageLabelsAndOutline];
         [self updateNoteSelection];
         
-        [self updatePageLabelsAndOutline];
-        
         NSEnumerator *setupEnum = [snapshotDicts objectEnumerator];
         NSDictionary *setup;
         while (setup = [setupEnum nextObject])


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

Revision: 2831
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2831&view=rev
Author:   hofman
Date:     2007-09-04 13:50:18 -0700 (Tue, 04 Sep 2007)

Log Message:
-----------
Use simple change notifications rather than indexed one, as we replace all items.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-09-04 18:43:49 UTC (rev 2830)
+++ trunk/SKMainWindowController.m	2007-09-04 20:50:18 UTC (rev 2831)
@@ -3760,7 +3760,7 @@
 
 - (void)resetThumbnails {
     unsigned i, count = [pageLabels count];
-    [self willChange:NSKeyValueChangeReplacement valuesAtIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, count)] forKey:@"thumbnails"];
+    [self willChangeValueForKey:@"thumbnails"];
     [thumbnails removeAllObjects];
     if (count) {
         PDFPage *emptyPage = [[[PDFPage alloc] init] autorelease];
@@ -3782,7 +3782,7 @@
             [thumbnail release];
         }
     }
-    [self didChange:NSKeyValueChangeReplacement valuesAtIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, count)] forKey:@"thumbnails"];
+    [self didChangeValueForKey:@"thumbnails"];
     [self allThumbnailsNeedUpdate];
 }
 


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

Revision: 2839
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2839&view=rev
Author:   hofman
Date:     2007-09-05 13:09:35 -0700 (Wed, 05 Sep 2007)

Log Message:
-----------
Redisplay the find table header when we change the header text.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-09-05 18:51:35 UTC (rev 2838)
+++ trunk/SKMainWindowController.m	2007-09-05 20:09:35 UTC (rev 2839)
@@ -2365,6 +2365,7 @@
     if (findPanelFind == NO) {
         [findArrayController removeObjects:searchResults];
         [[[[findTableView tableColumns] objectAtIndex:1] headerCell] setStringValue:[NSLocalizedString(@"Searching", @"Message in search table header") stringByAppendingEllipsis]];
+        [[findTableView headerView] setNeedsDisplay:YES];
         [statusBar setProgressIndicatorStyle:SKProgressIndicatorBarStyle];
         [[statusBar progressIndicator] setMaxValue:[[note object] pageCount]];
         [[statusBar progressIndicator] setDoubleValue:0.0];
@@ -2377,6 +2378,7 @@
         [self willChangeValueForKey:@"searchResults"];
         [self didChangeValueForKey:@"searchResults"];
         [[[[findTableView tableColumns] objectAtIndex:1] headerCell] setStringValue:[NSString stringWithFormat:NSLocalizedString(@"%i Results", @"Message in search table header"), [searchResults count]]];
+        [[findTableView headerView] setNeedsDisplay:YES];
         [statusBar stopAnimation:self];
         [statusBar setProgressIndicatorStyle:SKProgressIndicatorNone];
     }


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

Revision: 2843
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2843&view=rev
Author:   hofman
Date:     2007-09-07 11:18:54 -0700 (Fri, 07 Sep 2007)

Log Message:
-----------
Add contextual menu items to auto-size rows in the note table.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-09-06 14:05:11 UTC (rev 2842)
+++ trunk/SKMainWindowController.m	2007-09-07 18:18:54 UTC (rev 2843)
@@ -3413,6 +3413,39 @@
     [pdfView setActiveAnnotation:nil];
 }
 
+- (void)autoSizeNoteRows:(id)sender {
+    NSTableColumn *tableColumn = [noteOutlineView tableColumnWithIdentifier:@"note"];
+    id cell = [tableColumn dataCell];
+    float width = NSWidth([cell drawingRectForBounds:NSMakeRect(0.0, 0.0, [tableColumn width], 17.0)]);
+    NSSize size = NSMakeSize(width, FLT_MAX);
+    
+    NSMutableArray *items = [NSMutableArray array];
+    id item = [sender representedObject];
+    
+    if (item) {
+        [items addObject:item];
+    } else {
+        [items addObjectsFromArray:[self notes]];
+        [items addObjectsFromArray:[[self notes] valueForKeyPath:@"@unionOfArrays.texts"]];
+    }
+    
+    int i, count = [items count];
+    NSMutableIndexSet *rowIndexes = [NSMutableIndexSet indexSet];
+    int row;
+    
+    for (i = 0; i < count; i++) {
+        item = [items objectAtIndex:i];
+        [cell setObjectValue:[item contents]];
+        NSAttributedString *attrString = [cell attributedStringValue];
+        NSRect rect = [attrString boundingRectWithSize:size options:NSStringDrawingUsesLineFragmentOrigin];
+        [item setRowHeight:fmaxf(NSHeight(rect) + 3.0, 19.0)];
+        row = [noteOutlineView rowForItem:item];
+        if (row != -1)
+            [rowIndexes addIndex:row];
+    }
+    [noteOutlineView noteHeightOfRowsWithIndexesChanged:rowIndexes];
+}
+
 - (NSMenu *)outlineView:(NSOutlineView *)ov menuForTableColumn:(NSTableColumn *)tableColumn item:(id)item {
     NSMenu *menu = nil;
     NSMenuItem *menuItem;
@@ -3445,6 +3478,13 @@
             [menuItem setTarget:self];
             [menuItem setRepresentedObject:annotation];
         }
+        if ([menu numberOfItems] > 0)
+            [menu addItem:[NSMenuItem separatorItem]];
+        menuItem = [menu addItemWithTitle:NSLocalizedString(@"Auto Size Row", @"Menu item title") action:@selector(autoSizeNoteRows:) keyEquivalent:@""];
+        [menuItem setTarget:self];
+        [menuItem setRepresentedObject:item];
+        menuItem = [menu addItemWithTitle:NSLocalizedString(@"Auto Size All", @"Menu item title") action:@selector(autoSizeNoteRows:) keyEquivalent:@""];
+        [menuItem setTarget:self];
     }
     return menu;
 }


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

Revision: 2845
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2845&view=rev
Author:   hofman
Date:     2007-09-07 17:26:07 -0700 (Fri, 07 Sep 2007)

Log Message:
-----------
Subtract outline triangle width from column width for auto-resizing note rows.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-09-07 19:57:23 UTC (rev 2844)
+++ trunk/SKMainWindowController.m	2007-09-08 00:26:07 UTC (rev 2845)
@@ -3416,7 +3416,7 @@
 - (void)autoSizeNoteRows:(id)sender {
     NSTableColumn *tableColumn = [noteOutlineView tableColumnWithIdentifier:@"note"];
     id cell = [tableColumn dataCell];
-    float width = NSWidth([cell drawingRectForBounds:NSMakeRect(0.0, 0.0, [tableColumn width], 17.0)]);
+    float width = NSWidth([cell drawingRectForBounds:NSMakeRect(0.0, 0.0, [tableColumn width] - 17.0, 17.0)]);
     NSSize size = NSMakeSize(width, FLT_MAX);
     
     NSMutableArray *items = [NSMutableArray array];


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

Revision: 2857
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2857&view=rev
Author:   hofman
Date:     2007-09-09 07:02:24 -0700 (Sun, 09 Sep 2007)

Log Message:
-----------
Don't let reloading the outline change the current page.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-09-09 13:26:40 UTC (rev 2856)
+++ trunk/SKMainWindowController.m	2007-09-09 14:02:24 UTC (rev 2857)
@@ -776,10 +776,11 @@
     pdfOutline = [[pdfDoc outlineRoot] retain];
     [pdfOutlineItems removeAllObjects];
     if (pdfOutline) {
+        updatingOutlineSelection = YES;
         [outlineView reloadData];
-        
         if ([outlineView numberOfRows] == 1)
             [outlineView expandItem: [outlineView itemAtRow: 0] expandChildren: NO];
+        updatingOutlineSelection = NO;
         [self updateOutlineSelection];
     }
     [leftSideButton setEnabled:pdfOutline != nil forSegment:SKOutlineSidePaneState];


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

Revision: 2942
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2942&view=rev
Author:   hofman
Date:     2007-09-19 15:52:52 -0700 (Wed, 19 Sep 2007)

Log Message:
-----------
Set background color of secondary PDF view.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-09-19 20:52:27 UTC (rev 2941)
+++ trunk/SKMainWindowController.m	2007-09-19 22:52:52 UTC (rev 2942)
@@ -1933,6 +1933,7 @@
         [secondaryPdfView setDisplayMode:kPDFDisplaySinglePageContinuous];
         [secondaryPdfView setDisplaysPageBreaks:NO];
         [secondaryPdfView setDisplayBox:kPDFDisplayBoxCropBox];
+        [secondaryPdfView setBackgroundColor:[pdfView backgroundColor]];
         [secondaryPdfView goToPage:[pdfView currentPage]];
         point = [secondaryPdfView convertPoint:[secondaryPdfView convertPoint:point fromPage:[secondaryPdfView currentPage]] toView:[secondaryPdfView documentView]];
         [[secondaryPdfView documentView] scrollPoint:point];
@@ -3040,6 +3041,7 @@
         if ([key isEqualToString:SKBackgroundColorKey]) {
             if ([self isFullScreen] == NO && [self isPresentation] == NO)
                 [pdfView setBackgroundColor:[[NSUserDefaults standardUserDefaults] colorForKey:SKBackgroundColorKey]];
+            [secondaryPdfView setBackgroundColor:[[NSUserDefaults standardUserDefaults] colorForKey:SKBackgroundColorKey]];
         } else if ([key isEqualToString:SKFullScreenBackgroundColorKey]) {
             if ([self isFullScreen]) {
                 NSColor *color = [[NSUserDefaults standardUserDefaults] colorForKey:SKFullScreenBackgroundColorKey];


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

Revision: 2943
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2943&view=rev
Author:   hofman
Date:     2007-09-20 01:46:49 -0700 (Thu, 20 Sep 2007)

Log Message:
-----------
Redisplay secondary PDF view after double-clicking divider.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-09-19 22:52:52 UTC (rev 2942)
+++ trunk/SKMainWindowController.m	2007-09-20 08:46:49 UTC (rev 2943)
@@ -1934,6 +1934,7 @@
         [secondaryPdfView setDisplaysPageBreaks:NO];
         [secondaryPdfView setDisplayBox:kPDFDisplayBoxCropBox];
         [secondaryPdfView setBackgroundColor:[pdfView backgroundColor]];
+        [secondaryPdfView layoutDocumentView];
         [secondaryPdfView goToPage:[pdfView currentPage]];
         point = [secondaryPdfView convertPoint:[secondaryPdfView convertPoint:point fromPage:[secondaryPdfView currentPage]] toView:[secondaryPdfView documentView]];
         [[secondaryPdfView documentView] scrollPoint:point];
@@ -4849,6 +4850,8 @@
         [secondaryPdfContentBox setFrame:secondaryFrame];
         [pdfSplitView setNeedsDisplay:YES];
         [pdfSplitView adjustSubviews];
+        [secondaryPdfView layoutDocumentView];
+        [secondaryPdfView setNeedsDisplay:YES];
     }
 }
 


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

Revision: 2948
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2948&view=rev
Author:   hofman
Date:     2007-09-20 06:31:42 -0700 (Thu, 20 Sep 2007)

Log Message:
-----------
Scroll secondary PDFView after a delay.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-09-20 12:20:12 UTC (rev 2947)
+++ trunk/SKMainWindowController.m	2007-09-20 13:31:42 UTC (rev 2948)
@@ -1891,6 +1891,14 @@
     [self setRightSidePaneState:[sender tag]];
 }
 
+- (void)scrollSecondaryPdfView {
+    NSPoint point = [pdfView bounds].origin;
+    PDFPage *page = [pdfView pageForPoint:point nearest:YES];
+    point = [secondaryPdfView convertPoint:[secondaryPdfView convertPoint:[pdfView convertPoint:point toPage:page] fromPage:page] toView:[secondaryPdfView documentView]];
+    [secondaryPdfView goToPage:page];
+    [[secondaryPdfView documentView] scrollPoint:point];
+}
+
 - (IBAction)toggleSplitPDF:(id)sender {
     if ([secondaryPdfView window]) {
         
@@ -1898,7 +1906,6 @@
         
     } else {
         
-        NSPoint point = [pdfView convertPoint:[pdfView bounds].origin toPage:[pdfView currentPage]];
         NSRect ignored, frame1, frame2;
         
         frame1 = [pdfSplitView bounds];
@@ -1915,8 +1922,7 @@
         [secondaryPdfView setAutoScales:YES];
         [secondaryPdfView layoutDocumentView];
         [secondaryPdfView goToPage:[pdfView currentPage]];
-        point = [secondaryPdfView convertPoint:[secondaryPdfView convertPoint:point fromPage:[secondaryPdfView currentPage]] toView:[secondaryPdfView documentView]];
-        [[secondaryPdfView documentView] scrollPoint:point];
+        [self performSelector:@selector(scrollSecondaryPdfView) withObject:nil afterDelay:0.0];
     }
     
     [pdfSplitView adjustSubviews];


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

Revision: 2952
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2952&view=rev
Author:   hofman
Date:     2007-09-20 11:17:47 -0700 (Thu, 20 Sep 2007)

Log Message:
-----------
Don't let a splitView adjustSubviews, because it's really buggy.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-09-20 17:37:25 UTC (rev 2951)
+++ trunk/SKMainWindowController.m	2007-09-20 18:17:47 UTC (rev 2952)
@@ -1933,7 +1933,6 @@
         [leftSideContentBox setFrame:sideFrame];
         [pdfContentBox setFrame:pdfFrame];
         [splitView setNeedsDisplay:YES];
-        [splitView adjustSubviews];
         
         [self splitViewDidResizeSubviews:nil];
     }
@@ -1971,7 +1970,6 @@
         [rightSideContentBox setFrame:sideFrame];
         [pdfContentBox setFrame:pdfFrame];
         [splitView setNeedsDisplay:YES];
-        [splitView adjustSubviews];
         
         [self splitViewDidResizeSubviews:nil];
     }
@@ -4925,7 +4923,6 @@
         [pdfContentBox setFrame:primaryFrame];
         [secondaryPdfContentBox setFrame:secondaryFrame];
         [pdfSplitView setNeedsDisplay:YES];
-        [pdfSplitView adjustSubviews];
         [secondaryPdfView layoutDocumentView];
         [secondaryPdfView setNeedsDisplay:YES];
     }


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

Revision: 2953
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2953&view=rev
Author:   hofman
Date:     2007-09-20 11:28:37 -0700 (Thu, 20 Sep 2007)

Log Message:
-----------
The splitview around the pdfviews is subview of the main splitview, so use the frame of that when changing splitview sizes.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-09-20 18:17:47 UTC (rev 2952)
+++ trunk/SKMainWindowController.m	2007-09-20 18:28:37 UTC (rev 2953)
@@ -379,10 +379,10 @@
             }
         }
         if (usesDrawers == NO) {
-            frame = [pdfContentBox frame];
+            frame = [pdfSplitView frame];
             frame.size.width = NSWidth([splitView frame]) - NSWidth([leftSideContentBox frame]) - NSWidth([rightSideContentBox frame]) - 2 * [splitView dividerThickness];
             frame.origin.x = NSMaxX([leftSideContentBox frame]) + [splitView dividerThickness];
-            [pdfContentBox setFrame:frame];
+            [pdfSplitView setFrame:frame];
         }
     }
     
@@ -576,10 +576,10 @@
         }
     }
     if (usesDrawers == NO) {
-        frame = [pdfContentBox frame];
+        frame = [pdfSplitView frame];
         frame.size.width = NSWidth([splitView frame]) - NSWidth([leftSideContentBox frame]) - NSWidth([rightSideContentBox frame]) - 2 * [splitView dividerThickness];
         frame.origin.x = NSMaxX([leftSideContentBox frame]) + [splitView dividerThickness];
-        [pdfContentBox setFrame:frame];
+        [pdfSplitView setFrame:frame];
     }
     
     [self applyPDFSettings:setup];
@@ -1913,7 +1913,7 @@
             [leftSideDrawer openOnEdge:NSMinXEdge];
     } else {
         NSRect sideFrame = [leftSideContentBox frame];
-        NSRect pdfFrame = [pdfContentBox frame];
+        NSRect pdfFrame = [pdfSplitView frame];
         
         if (NSWidth(sideFrame) > 0.0) {
             if (leftSidePaneState == SKOutlineSidePaneState || [[searchField stringValue] length])
@@ -1931,7 +1931,7 @@
         }
         pdfFrame.origin.x = NSMaxX(sideFrame) + [splitView dividerThickness];
         [leftSideContentBox setFrame:sideFrame];
-        [pdfContentBox setFrame:pdfFrame];
+        [pdfSplitView setFrame:pdfFrame];
         [splitView setNeedsDisplay:YES];
         
         [self splitViewDidResizeSubviews:nil];
@@ -1952,7 +1952,7 @@
             [rightSideDrawer openOnEdge:NSMaxXEdge];
     } else {
         NSRect sideFrame = [rightSideContentBox frame];
-        NSRect pdfFrame = [pdfContentBox frame];
+        NSRect pdfFrame = [pdfSplitView frame];
         
         if (NSWidth(sideFrame) > 1.0) {
             lastRightSidePaneWidth = NSWidth(sideFrame); // cache this
@@ -1968,7 +1968,7 @@
         }
         sideFrame.origin.x = NSMaxX(pdfFrame) + [splitView dividerThickness];
         [rightSideContentBox setFrame:sideFrame];
-        [pdfContentBox setFrame:pdfFrame];
+        [pdfSplitView setFrame:pdfFrame];
         [splitView setNeedsDisplay:YES];
         
         [self splitViewDidResizeSubviews:nil];


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

Revision: 2956
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2956&view=rev
Author:   hofman
Date:     2007-09-21 04:33:30 -0700 (Fri, 21 Sep 2007)

Log Message:
-----------
Hide hover window when closing left side drawer.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-09-21 08:41:36 UTC (rev 2955)
+++ trunk/SKMainWindowController.m	2007-09-21 11:33:30 UTC (rev 2956)
@@ -1896,7 +1896,7 @@
 - (IBAction)toggleLeftSidePane:(id)sender {
     if ([self isFullScreen]) {
         [[SKPDFHoverWindow sharedHoverWindow] hide];
-        if ([leftSideWindow state] == NSDrawerOpenState || [leftSideWindow state] == NSDrawerOpeningState)
+        if ([self leftSidePaneIsOpen])
             [leftSideWindow collapse];
         else
             [leftSideWindow expand];
@@ -1906,16 +1906,18 @@
         else
             [self showLeftSideWindowOnScreen:[[self window] screen]];
     } else if (usesDrawers) {
-        int state = [leftSideDrawer state];
-        if (state == NSDrawerOpenState || state == NSDrawerOpeningState)
+        if ([self leftSidePaneIsOpen]) {
+            if (leftSidePaneState == SKOutlineSidePaneState || [[searchField stringValue] length])
+                [[SKPDFHoverWindow sharedHoverWindow] hide];
             [leftSideDrawer close];
-        else
+        } else {
             [leftSideDrawer openOnEdge:NSMinXEdge];
+        }
     } else {
         NSRect sideFrame = [leftSideContentBox frame];
         NSRect pdfFrame = [pdfSplitView frame];
         
-        if (NSWidth(sideFrame) > 0.0) {
+        if ([self leftSidePaneIsOpen]) {
             if (leftSidePaneState == SKOutlineSidePaneState || [[searchField stringValue] length])
                 [[SKPDFHoverWindow sharedHoverWindow] hide];
             lastLeftSidePaneWidth = NSWidth(sideFrame); // cache this
@@ -1940,13 +1942,17 @@
 
 - (IBAction)toggleRightSidePane:(id)sender {
     if ([self isFullScreen]) {
-        if ([rightSideWindow state] == NSDrawerOpenState || [rightSideWindow state] == NSDrawerOpeningState)
+        if ([self rightSidePaneIsOpen])
             [rightSideWindow collapse];
         else
             [rightSideWindow expand];
+    } else if ([self isPresentation]) {
+        if ([rightSideWindow isVisible])
+            [self hideRightSideWindow];
+        else
+            [self showRightSideWindowOnScreen:[[self window] screen]];
     } else if (usesDrawers) {
-        int state = [rightSideDrawer state];
-        if (state == NSDrawerOpenState || state == NSDrawerOpeningState)
+        if ([self rightSidePaneIsOpen])
             [rightSideDrawer close];
         else
             [rightSideDrawer openOnEdge:NSMaxXEdge];
@@ -1954,7 +1960,7 @@
         NSRect sideFrame = [rightSideContentBox frame];
         NSRect pdfFrame = [pdfSplitView frame];
         
-        if (NSWidth(sideFrame) > 1.0) {
+        if ([self rightSidePaneIsOpen]) {
             lastRightSidePaneWidth = NSWidth(sideFrame); // cache this
             pdfFrame.size.width += lastRightSidePaneWidth;
             sideFrame.size.width = 0.0;


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

Revision: 2959
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2959&view=rev
Author:   hofman
Date:     2007-09-21 08:32:11 -0700 (Fri, 21 Sep 2007)

Log Message:
-----------
Slightly darker gray for top edge.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-09-21 12:24:50 UTC (rev 2958)
+++ trunk/SKMainWindowController.m	2007-09-21 15:32:11 UTC (rev 2959)
@@ -264,6 +264,7 @@
     
     [pdfEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask | BDSKMinYEdgeMask];
     [secondaryPdfEdgeView setEdges:BDSKEveryEdgeMask];
+	[secondaryPdfEdgeView setColor:[NSColor lightGrayColor] forEdge:NSMaxYEdge];
     [leftSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
     [rightSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
     


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

Revision: 2961
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2961&view=rev
Author:   hofman
Date:     2007-09-21 09:20:18 -0700 (Fri, 21 Sep 2007)

Log Message:
-----------
Always open contents pane in initially, unless there is no outline and the user has chosen so in the prefs.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-09-21 16:01:10 UTC (rev 2960)
+++ trunk/SKMainWindowController.m	2007-09-21 16:20:18 UTC (rev 2961)
@@ -348,22 +348,22 @@
         float width = [sud floatForKey:SKLeftSidePaneWidthKey];
         if (width >= 0.0) {
             frame = [leftSideContentView frame];
-            frame.size.width = width;
-            if (usesDrawers == NO) {
-                [leftSideContentView setFrame:frame];
-            } else if (width > 0.0) {
-                [leftSideDrawer setContentSize:frame.size];
-                [leftSideDrawer openOnEdge:NSMinXEdge];
-            } else {
-                [leftSideDrawer close];
+            if (width > 0.0) {
+                frame.size.width = width;
+                if (usesDrawers == NO) {
+                    [leftSideContentView setFrame:frame];
+                } else {
+                    [leftSideDrawer setContentSize:frame.size];
+                    [leftSideDrawer openOnEdge:NSMinXEdge];
+                }
             }
         }
         width = [sud floatForKey:SKRightSidePaneWidthKey];
         if (width >= 0.0) {
             frame = [rightSideContentView frame];
             frame.size.width = width;
-            frame.origin.x = NSMaxX([splitView frame]) - width;
             if (usesDrawers == NO) {
+                frame.origin.x = NSMaxX([splitView frame]) - width;
                 [rightSideContentView setFrame:frame];
             } else if (width > 0.0) {
                 [rightSideDrawer setContentSize:frame.size];


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

Revision: 2968
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2968&view=rev
Author:   hofman
Date:     2007-09-21 12:14:48 -0700 (Fri, 21 Sep 2007)

Log Message:
-----------
Don't change height of segmented control in drawers.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-09-21 19:11:01 UTC (rev 2967)
+++ trunk/SKMainWindowController.m	2007-09-21 19:14:48 UTC (rev 2968)
@@ -256,6 +256,7 @@
 
 - (void)windowDidLoad{
     NSUserDefaults *sud = [NSUserDefaults standardUserDefaults];
+    NSRect frame;
     
     settingUpWindow = YES;
     
@@ -273,15 +274,17 @@
     [leftSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
     [rightSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
     
-    NSRect frame = [leftSideButton frame];
-    frame.size.height = SEGMENTED_CONTROL_HEIGHT;
-    [leftSideButton setFrame:frame];
+    if (usesDrawers == NO) {
+        frame = [leftSideButton frame];
+        frame.size.height = SEGMENTED_CONTROL_HEIGHT;
+        [leftSideButton setFrame:frame];
+        frame = [rightSideButton frame];
+        frame.size.height = SEGMENTED_CONTROL_HEIGHT;
+        [rightSideButton setFrame:frame];
+    }
+    
     [[leftSideButton cell] setToolTip:NSLocalizedString(@"View Thumbnails", @"Tool tip message") forSegment:SKThumbnailSidePaneState];
     [[leftSideButton cell] setToolTip:NSLocalizedString(@"View Table of Contents", @"Tool tip message") forSegment:SKOutlineSidePaneState];
-    
-    frame = [rightSideButton frame];
-    frame.size.height = SEGMENTED_CONTROL_HEIGHT;
-    [rightSideButton setFrame:frame];
     [[rightSideButton cell] setToolTip:NSLocalizedString(@"View Notes", @"Tool tip message") forSegment:SKNoteSidePaneState];
     [[rightSideButton cell] setToolTip:NSLocalizedString(@"View Snapshots", @"Tool tip message") forSegment:SKSnapshotSidePaneState];
     


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

Revision: 2970
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2970&view=rev
Author:   hofman
Date:     2007-09-22 02:38:58 -0700 (Sat, 22 Sep 2007)

Log Message:
-----------
Different splitview resizing when there are drawers.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-09-21 20:12:38 UTC (rev 2969)
+++ trunk/SKMainWindowController.m	2007-09-22 09:38:58 UTC (rev 2970)
@@ -4898,32 +4898,33 @@
 
 - (void)splitView:(NSSplitView *)sender resizeSubviewsWithOldSize:(NSSize)oldSize {
     if ([sender isEqual:splitView]) {
-        NSView *leftView = [[sender subviews] objectAtIndex:0];
-        NSView *mainView = [[sender subviews] objectAtIndex:1]; // pdfView
-        NSView *rightView = [[sender subviews] objectAtIndex:2];
-        NSRect leftFrame = [leftView frame];
-        NSRect mainFrame = [mainView frame];
-        NSRect rightFrame = [rightView frame];
-        
-        if (NSWidth(leftFrame) <= 1.0)
-            leftFrame.size.width = 0.0;
-        if (NSWidth(rightFrame) <= 1.0)
-            rightFrame.size.width = 0.0;
-        
-        mainFrame.size.width = NSWidth([sender frame]) - NSWidth(leftFrame) - NSWidth(rightFrame) - 2 * [sender dividerThickness];
-        
-        if (NSWidth(mainFrame) < 0.0) {
-            float resizeFactor = 1.0 + NSWidth(mainFrame) / (NSWidth(leftFrame) + NSWidth(rightFrame));
-            leftFrame.size.width = floorf(resizeFactor * NSWidth(leftFrame));
-            rightFrame.size.width = floorf(resizeFactor * NSWidth(rightFrame));
+        if (usesDrawers == NO) {
+            NSView *leftView = [[sender subviews] objectAtIndex:0];
+            NSView *mainView = [[sender subviews] objectAtIndex:1]; // pdfView
+            NSView *rightView = [[sender subviews] objectAtIndex:2];
+            NSRect leftFrame = [leftView frame];
+            NSRect mainFrame = [mainView frame];
+            NSRect rightFrame = [rightView frame];
+            
+            if (NSWidth(leftFrame) <= 1.0)
+                leftFrame.size.width = 0.0;
+            if (NSWidth(rightFrame) <= 1.0)
+                rightFrame.size.width = 0.0;
+            
             mainFrame.size.width = NSWidth([sender frame]) - NSWidth(leftFrame) - NSWidth(rightFrame) - 2 * [sender dividerThickness];
+            
+            if (NSWidth(mainFrame) < 0.0) {
+                float resizeFactor = 1.0 + NSWidth(mainFrame) / (NSWidth(leftFrame) + NSWidth(rightFrame));
+                leftFrame.size.width = floorf(resizeFactor * NSWidth(leftFrame));
+                rightFrame.size.width = floorf(resizeFactor * NSWidth(rightFrame));
+                mainFrame.size.width = NSWidth([sender frame]) - NSWidth(leftFrame) - NSWidth(rightFrame) - 2 * [sender dividerThickness];
+            }
+            mainFrame.origin.x = NSMaxX(leftFrame) + [sender dividerThickness];
+            rightFrame.origin.x =  NSMaxX(mainFrame) + [sender dividerThickness];
+            [leftView setFrame:leftFrame];
+            [rightView setFrame:rightFrame];
+            [mainView setFrame:mainFrame];
         }
-        mainFrame.origin.x = NSMaxX(leftFrame) + [sender dividerThickness];
-        rightFrame.origin.x =  NSMaxX(mainFrame) + [sender dividerThickness];
-        [leftView setFrame:leftFrame];
-        [rightView setFrame:rightFrame];
-        [mainView setFrame:mainFrame];
-        
         [sender adjustSubviews];
     } else if ([sender isEqual:pdfSplitView]) {
         if ([[sender subviews] count] > 1) {
@@ -4957,14 +4958,14 @@
 
 - (void)splitViewDidResizeSubviews:(NSNotification *)notification {
     id sender = [notification object];
-    if ([sender isEqual:splitView] || sender == nil) {
-        if ([[self window] frameAutosaveName] && settingUpWindow == NO) {
-            [[NSUserDefaults standardUserDefaults] setFloat:NSWidth([leftSideContentView frame]) forKey:SKLeftSidePaneWidthKey];
-            [[NSUserDefaults standardUserDefaults] setFloat:NSWidth([rightSideContentView frame]) forKey:SKRightSidePaneWidthKey];
-        }
+    if (([sender isEqual:splitView] || sender == nil) && [[self window] frameAutosaveName] && settingUpWindow == NO && usesDrawers == NO) {
+        [[NSUserDefaults standardUserDefaults] setFloat:NSWidth([leftSideContentView frame]) forKey:SKLeftSidePaneWidthKey];
+        [[NSUserDefaults standardUserDefaults] setFloat:NSWidth([rightSideContentView frame]) forKey:SKRightSidePaneWidthKey];
     }
 }
 
+#pragma mark NSDrawer delegate protocol
+
 - (NSSize)drawerWillResizeContents:(NSDrawer *)sender toSize:(NSSize)contentSize {
     if ([[self window] frameAutosaveName] && settingUpWindow == NO) {
         if ([sender isEqual:leftSideDrawer])


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

Revision: 2979
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2979&view=rev
Author:   hofman
Date:     2007-09-22 05:30:25 -0700 (Sat, 22 Sep 2007)

Log Message:
-----------
Layout secondary pdf view after delay.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-09-22 11:53:47 UTC (rev 2978)
+++ trunk/SKMainWindowController.m	2007-09-22 12:30:25 UTC (rev 2979)
@@ -1960,6 +1960,7 @@
     point = [secondaryPdfView convertPoint:[secondaryPdfView convertPoint:[pdfView convertPoint:point toPage:page] fromPage:page] toView:[secondaryPdfView documentView]];
     [secondaryPdfView goToPage:page];
     [[secondaryPdfView documentView] scrollPoint:point];
+    [secondaryPdfView layoutDocumentView];
 }
 
 - (IBAction)toggleSplitPDF:(id)sender {
@@ -1995,7 +1996,6 @@
             [pdfSplitView addSubview:secondaryPdfEdgeView];
         }
         
-        [secondaryPdfView layoutDocumentView];
         [self performSelector:@selector(scrollSecondaryPdfView) withObject:nil afterDelay:0.0];
     }
     


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

Revision: 2990
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2990&view=rev
Author:   hofman
Date:     2007-09-25 13:25:08 -0700 (Tue, 25 Sep 2007)

Log Message:
-----------
Remove outline before setting the PDFDocument.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-09-25 17:45:50 UTC (rev 2989)
+++ trunk/SKMainWindowController.m	2007-09-25 20:25:08 UTC (rev 2990)
@@ -903,6 +903,10 @@
             [snapshots makeObjectsPerformSelector:@selector(close)];
             [[self mutableArrayValueForKey:@"snapshots"] removeAllObjects];
             
+            [pdfOutline release];
+            pdfOutline = nil;
+            [pdfOutlineItems removeAllObjects];
+            
             [lastViewedPages removeAllObjects];
             
             [self unregisterForDocumentNotifications];


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

Revision: 2992
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2992&view=rev
Author:   amaxwell
Date:     2007-09-28 16:37:40 -0700 (Fri, 28 Sep 2007)

Log Message:
-----------
fix out of bounds exception

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-09-26 15:38:51 UTC (rev 2991)
+++ trunk/SKMainWindowController.m	2007-09-28 23:37:40 UTC (rev 2992)
@@ -412,7 +412,7 @@
     // Go to page?
     if ([sud boolForKey:SKRememberLastPageViewedKey]) {
         unsigned int pageIndex = [[SKBookmarkController sharedBookmarkController] pageIndexForRecentDocumentAtPath:[[[self document] fileURL] path]];
-        if (pageIndex != NSNotFound)
+        if (pageIndex != NSNotFound && [[pdfView document] pageCount] > pageIndex)
             [pdfView goToPage:[[pdfView document] pageAtIndex:pageIndex]];
     }
     


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

Revision: 2994
          http://skim-app.svn.sourceforge.net/skim-app/?rev=2994&view=rev
Author:   amaxwell
Date:     2007-09-28 16:58:26 -0700 (Fri, 28 Sep 2007)

Log Message:
-----------
Fix crash that occurs when the outline goes away in a revert situation.  This
can happen in a TeX situation due to a failed compile, or commenting out
hyperref.  Make sure the side view is set appropriately when this occurs also.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-09-28 23:38:23 UTC (rev 2993)
+++ trunk/SKMainWindowController.m	2007-09-28 23:58:26 UTC (rev 2994)
@@ -839,14 +839,21 @@
     [pdfOutline release];
     pdfOutline = [[pdfDoc outlineRoot] retain];
     [pdfOutlineItems removeAllObjects];
-    if (pdfOutline) {
-        updatingOutlineSelection = YES;
-        [outlineView reloadData];
-        if ([outlineView numberOfRows] == 1)
-            [outlineView expandItem: [outlineView itemAtRow: 0] expandChildren: NO];
-        updatingOutlineSelection = NO;
-        [self updateOutlineSelection];
+    
+    updatingOutlineSelection = YES;
+    // If this is a reload following a TeX run and the user just killed the outline for some reason, we get a crash if the outlineView isn't reloaded, so no longer make it conditional on pdfOutline != nil
+    [outlineView reloadData];
+    if ([outlineView numberOfRows] == 1)
+        [outlineView expandItem: [outlineView itemAtRow: 0] expandChildren: NO];
+    updatingOutlineSelection = NO;
+    [self updateOutlineSelection];
+    
+    // handle the case as above where the outline has disappeared in a reload situation
+    if (nil == pdfOutline && currentLeftSideView == tocView) {
+        [self fadeInThumbnailView];
+        [leftSideButton setSelectedSegment:SKThumbnailSidePaneState];
     }
+
     [leftSideButton setEnabled:pdfOutline != nil forSegment:SKOutlineSidePaneState];
 }
 


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

Revision: 3006
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3006&view=rev
Author:   hofman
Date:     2007-10-01 11:41:00 -0700 (Mon, 01 Oct 2007)

Log Message:
-----------
Respect sticky pref for closed contents pane, unless table of contents should always be shown.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-10-01 17:28:56 UTC (rev 3005)
+++ trunk/SKMainWindowController.m	2007-10-01 18:41:00 UTC (rev 3006)
@@ -351,14 +351,14 @@
         float width = [sud floatForKey:SKLeftSidePaneWidthKey];
         if (width >= 0.0) {
             frame = [leftSideContentView frame];
-            if (width > 0.0) {
-                frame.size.width = width;
-                if (usesDrawers == NO) {
-                    [leftSideContentView setFrame:frame];
-                } else {
-                    [leftSideDrawer setContentSize:frame.size];
-                    [leftSideDrawer openOnEdge:NSMinXEdge];
-                }
+            frame.size.width = width;
+            if (usesDrawers == NO) {
+                [leftSideContentView setFrame:frame];
+            } else if (width > 0.0) {
+                [leftSideDrawer setContentSize:frame.size];
+                [leftSideDrawer openOnEdge:NSMinXEdge];
+            } else {
+                [leftSideDrawer close];
             }
         }
         width = [sud floatForKey:SKRightSidePaneWidthKey];


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

Revision: 3013
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3013&view=rev
Author:   hofman
Date:     2007-10-03 04:25:58 -0700 (Wed, 03 Oct 2007)

Log Message:
-----------
Simplify splitview resizing code.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-10-03 09:39:31 UTC (rev 3012)
+++ trunk/SKMainWindowController.m	2007-10-03 11:25:58 UTC (rev 3013)
@@ -4914,6 +4914,7 @@
 
 - (void)splitView:(NSSplitView *)sender resizeSubviewsWithOldSize:(NSSize)oldSize {
     if ([sender isEqual:splitView]) {
+        
         if (usesDrawers == NO) {
             NSView *leftView = [[sender subviews] objectAtIndex:0];
             NSView *mainView = [[sender subviews] objectAtIndex:1]; // pdfView
@@ -4921,55 +4922,52 @@
             NSRect leftFrame = [leftView frame];
             NSRect mainFrame = [mainView frame];
             NSRect rightFrame = [rightView frame];
+            float contentWidth = NSWidth([sender frame]) - 2 * [sender dividerThickness];
             
             if (NSWidth(leftFrame) <= 1.0)
                 leftFrame.size.width = 0.0;
             if (NSWidth(rightFrame) <= 1.0)
                 rightFrame.size.width = 0.0;
             
-            mainFrame.size.width = NSWidth([sender frame]) - NSWidth(leftFrame) - NSWidth(rightFrame) - 2 * [sender dividerThickness];
-            
-            if (NSWidth(mainFrame) < 0.0) {
-                float resizeFactor = 1.0 + NSWidth(mainFrame) / (NSWidth(leftFrame) + NSWidth(rightFrame));
+            if (contentWidth < NSWidth(leftFrame) + NSWidth(rightFrame)) {
+                float resizeFactor = contentWidth / (oldSize.width - [sender dividerThickness]);
                 leftFrame.size.width = floorf(resizeFactor * NSWidth(leftFrame));
                 rightFrame.size.width = floorf(resizeFactor * NSWidth(rightFrame));
-                mainFrame.size.width = NSWidth([sender frame]) - NSWidth(leftFrame) - NSWidth(rightFrame) - 2 * [sender dividerThickness];
             }
+            
+            mainFrame.size.width = contentWidth - NSWidth(leftFrame) - NSWidth(rightFrame);
             mainFrame.origin.x = NSMaxX(leftFrame) + [sender dividerThickness];
             rightFrame.origin.x =  NSMaxX(mainFrame) + [sender dividerThickness];
             [leftView setFrame:leftFrame];
             [rightView setFrame:rightFrame];
             [mainView setFrame:mainFrame];
         }
-        [sender adjustSubviews];
+        
     } else if ([sender isEqual:pdfSplitView]) {
+        
         if ([[sender subviews] count] > 1) {
             NSView *primaryView = [[sender subviews] objectAtIndex:0];
             NSView *secondaryView = [[sender subviews] objectAtIndex:1];
             NSRect primaryFrame = [primaryView frame];
             NSRect secondaryFrame = [secondaryView frame];
+            float contentHeight = NSHeight([sender frame]) - [sender dividerThickness];
             
             if (NSHeight(secondaryFrame) <= 1.0)
                 secondaryFrame.size.height = 0.0;
             
-            primaryFrame.size.height = NSHeight([sender frame]) - NSHeight(secondaryFrame)  - [sender dividerThickness];
+            if (contentHeight < NSHeight(secondaryFrame))
+                secondaryFrame.size.height = floorf(NSHeight(secondaryFrame) * contentHeight / (oldSize.height - [sender dividerThickness]));
             
-            if (NSHeight(primaryFrame) < 0.0) {
-                float resizeFactor = 1.0 + NSHeight(primaryFrame) / NSHeight(secondaryFrame);
-                secondaryFrame.size.height = floorf(resizeFactor * NSHeight(secondaryFrame));
-                primaryFrame.size.height = NSHeight([sender frame]) - NSHeight(secondaryFrame) - 2 * [sender dividerThickness];
-            }
+            primaryFrame.size.height = contentHeight - NSHeight(secondaryFrame);
             primaryFrame.origin.x = NSMaxY(secondaryFrame) + [sender dividerThickness];
             [primaryView setFrame:primaryFrame];
             [secondaryView setFrame:secondaryFrame];
-            
-            [sender adjustSubviews];
         } else {
-            NSView *primaryView = [[sender subviews] objectAtIndex:0];
-            [primaryView setFrame:[sender bounds]];
-            [sender adjustSubviews];
+            [[[sender subviews] objectAtIndex:0] setFrame:[sender bounds]];
         }
+        
     }
+    [sender adjustSubviews];
 }
 
 - (void)splitViewDidResizeSubviews:(NSNotification *)notification {


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

Revision: 3017
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3017&view=rev
Author:   hofman
Date:     2007-10-05 12:06:51 -0700 (Fri, 05 Oct 2007)

Log Message:
-----------
Set the full frame of splitview subviews ourselves, as the PDFView has layout problems if it is done in stages.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-10-03 20:20:15 UTC (rev 3016)
+++ trunk/SKMainWindowController.m	2007-10-05 19:06:51 UTC (rev 3017)
@@ -4938,6 +4938,7 @@
             mainFrame.size.width = contentWidth - NSWidth(leftFrame) - NSWidth(rightFrame);
             mainFrame.origin.x = NSMaxX(leftFrame) + [sender dividerThickness];
             rightFrame.origin.x =  NSMaxX(mainFrame) + [sender dividerThickness];
+            leftFrame.size.height = rightFrame.size.height = mainFrame.size.height = NSHeight([sender frame]);
             [leftView setFrame:leftFrame];
             [rightView setFrame:rightFrame];
             [mainView setFrame:mainFrame];
@@ -4960,6 +4961,7 @@
             
             primaryFrame.size.height = contentHeight - NSHeight(secondaryFrame);
             primaryFrame.origin.x = NSMaxY(secondaryFrame) + [sender dividerThickness];
+            primaryFrame.size.width = secondaryFrame.size.width = NSWidth([sender frame]);
             [primaryView setFrame:primaryFrame];
             [secondaryView setFrame:secondaryFrame];
         } else {


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

Revision: 3035
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3035&view=rev
Author:   hofman
Date:     2007-10-11 11:10:07 -0700 (Thu, 11 Oct 2007)

Log Message:
-----------
Update the status bar after reloading PDF.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-10-11 17:49:59 UTC (rev 3034)
+++ trunk/SKMainWindowController.m	2007-10-11 18:10:07 UTC (rev 3035)
@@ -955,6 +955,8 @@
         
         // the number of pages may have changed
         [[self window] setTitle:[self windowTitleForDocumentDisplayName:[[self document] displayName]]];
+        [self updateLeftStatus];
+        [self updateRightStatus];
     }
 }
     


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

Revision: 3053
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3053&view=rev
Author:   hofman
Date:     2007-10-21 04:32:19 -0700 (Sun, 21 Oct 2007)

Log Message:
-----------
Rename Add Circle toolbar item to Add Shape.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-10-21 11:22:17 UTC (rev 3052)
+++ trunk/SKMainWindowController.m	2007-10-21 11:32:19 UTC (rev 3053)
@@ -4402,11 +4402,11 @@
     [menuItem setTag:SKSquareNote];
     [menuItem setImage:[NSImage imageNamed:@"ToolbarSquareNote"]];
     [menuItem setTarget:self];
-    menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Add Circle", @"Toolbar item label") action:NULL keyEquivalent:@""] autorelease];
+    menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Add Shape", @"Toolbar item label") action:NULL keyEquivalent:@""] autorelease];
     [menuItem setSubmenu:menu];
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarNewCircleNoteItemIdentifier];
-    [item setLabels:NSLocalizedString(@"Add Circle", @"Toolbar item label")];
-    [item setToolTip:NSLocalizedString(@"Add New Circle", @"Tool tip message")];
+    [item setLabels:NSLocalizedString(@"Add Shape", @"Toolbar item label")];
+    [item setToolTip:NSLocalizedString(@"Add New Circle or Box", @"Tool tip message")];
     [item setTarget:self];
     [item setViewWithSizes:circlePopUpButton];
     [item setMenuFormRepresentation:menuItem];


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

Revision: 3064
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3064&view=rev
Author:   hofman
Date:     2007-10-23 10:10:49 -0700 (Tue, 23 Oct 2007)

Log Message:
-----------
Remove method override that doesn't override.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-10-23 17:06:07 UTC (rev 3063)
+++ trunk/SKMainWindowController.m	2007-10-23 17:10:49 UTC (rev 3064)
@@ -879,10 +879,6 @@
 
 #pragma mark Accessors
 
-- (void)setDocument:(NSDocument *)document {
-    [super setDocument:document];
-}
-
 - (PDFDocument *)pdfDocument{
     return [pdfView document];
 }


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

Revision: 3069
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3069&view=rev
Author:   hofman
Date:     2007-10-24 05:25:43 -0700 (Wed, 24 Oct 2007)

Log Message:
-----------
Reload data after row heights have changed, because noteHeightOfRowsWithIndexesChanged: does not update the rows that are not visible, but those can be scrolled into the visible range.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-10-24 10:07:23 UTC (rev 3068)
+++ trunk/SKMainWindowController.m	2007-10-24 12:25:43 UTC (rev 3069)
@@ -3616,7 +3616,8 @@
         if (row != -1)
             [rowIndexes addIndex:row];
     }
-    [noteOutlineView noteHeightOfRowsWithIndexesChanged:rowIndexes];
+    // don't use noteHeightOfRowsWithIndexesChanged: as this only updates the visible rows and the scrollers
+    [noteOutlineView reloadData];
 }
 
 - (NSMenu *)outlineView:(NSOutlineView *)ov menuForTableColumn:(NSTableColumn *)tableColumn item:(id)item {


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

Revision: 3075
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3075&view=rev
Author:   hofman
Date:     2007-10-25 13:51:39 -0700 (Thu, 25 Oct 2007)

Log Message:
-----------
Add submenu to menu representation of alternate page toolbar item.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-10-25 12:42:24 UTC (rev 3074)
+++ trunk/SKMainWindowController.m	2007-10-25 20:51:39 UTC (rev 3075)
@@ -4237,9 +4237,7 @@
     [toolbarItems setObject:item forKey:SKDocumentToolbarBackForwardItemIdentifier];
     [item release];
     
-	menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Page", @"Menu item title") 
-                                                                     action:@selector(doGoToPage:)
-									                          keyEquivalent:@""] autorelease];
+	menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Page", @"Menu item title") action:@selector(doGoToPage:) keyEquivalent:@""] autorelease];
 	[menuItem setTarget:self];
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarPageNumberItemIdentifier];
     [item setLabels:NSLocalizedString(@"Page", @"Toolbar item label")];
@@ -4249,10 +4247,19 @@
     [toolbarItems setObject:item forKey:SKDocumentToolbarPageNumberItemIdentifier];
     [item release];
     
-	menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Page", @"Menu item title") 
-                                                                     action:@selector(doGoToPage:)
-									                          keyEquivalent:@""] autorelease];
+    menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""] autorelease];
+    menuItem = [menu addItemWithTitle:NSLocalizedString(@"Previous", @"Menu item title") action:@selector(doGoToPreviousPage:) keyEquivalent:@""];
 	[menuItem setTarget:self];
+    menuItem = [menu addItemWithTitle:NSLocalizedString(@"Next", @"Menu item title") action:@selector(doGoTonextPage:) keyEquivalent:@""];
+	[menuItem setTarget:self];
+    menuItem = [menu addItemWithTitle:NSLocalizedString(@"First", @"Menu item title") action:@selector(doGoToFirstPage:) keyEquivalent:@""];
+	[menuItem setTarget:self];
+    menuItem = [menu addItemWithTitle:NSLocalizedString(@"Last", @"Menu item title") action:@selector(doGoToLastPage:) keyEquivalent:@""];
+	[menuItem setTarget:self];
+    menuItem = [menu addItemWithTitle:[NSLocalizedString(@"Page", @"Menu item title") stringByAppendingEllipsis] action:@selector(doGoToPage:) keyEquivalent:@""];
+	[menuItem setTarget:self];
+	menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Page", @"Toolbar item label") action:NULL keyEquivalent:@""] autorelease];
+    [menuItem setSubmenu:menu];
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarPageNumberButtonsItemIdentifier];
     [item setLabels:NSLocalizedString(@"Page", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Go To Page", @"Tool tip message")];
@@ -4271,9 +4278,7 @@
     [toolbarItems setObject:item forKey:SKDocumentToolbarPageNumberButtonsItemIdentifier];
     [item release];
     
-	menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Scale", @"Menu item title") 
-                                                                     action:@selector(chooseScale:)
-									                          keyEquivalent:@""] autorelease];
+	menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Scale", @"Menu item title") action:@selector(chooseScale:) keyEquivalent:@""] autorelease];
 	[menuItem setTarget:self];
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarScaleItemIdentifier];
     [item setLabels:NSLocalizedString(@"Scale", @"Toolbar item label")];
@@ -4873,6 +4878,10 @@
         return [pdfView canGoToNextPage];
     } else if (action == @selector(doGoToPreviousPage:)) {
         return [pdfView canGoToPreviousPage];
+    } else if (action == @selector(doGoToFirstPage:)) {
+        return [pdfView canGoToFirstPage];
+    } else if (action == @selector(doGoToLastPage:)) {
+        return [pdfView canGoToLastPage];
     } else if (action == @selector(doGoBack:)) {
         return [pdfView canGoBack];
     } else if (action == @selector(doGoForward:)) {


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

Revision: 3079
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3079&view=rev
Author:   hofman
Date:     2007-10-27 02:38:23 -0700 (Sat, 27 Oct 2007)

Log Message:
-----------
fix a typo.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-10-26 19:40:40 UTC (rev 3078)
+++ trunk/SKMainWindowController.m	2007-10-27 09:38:23 UTC (rev 3079)
@@ -4250,7 +4250,7 @@
     menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""] autorelease];
     menuItem = [menu addItemWithTitle:NSLocalizedString(@"Previous", @"Menu item title") action:@selector(doGoToPreviousPage:) keyEquivalent:@""];
 	[menuItem setTarget:self];
-    menuItem = [menu addItemWithTitle:NSLocalizedString(@"Next", @"Menu item title") action:@selector(doGoTonextPage:) keyEquivalent:@""];
+    menuItem = [menu addItemWithTitle:NSLocalizedString(@"Next", @"Menu item title") action:@selector(doGoToNextPage:) keyEquivalent:@""];
 	[menuItem setTarget:self];
     menuItem = [menu addItemWithTitle:NSLocalizedString(@"First", @"Menu item title") action:@selector(doGoToFirstPage:) keyEquivalent:@""];
 	[menuItem setTarget:self];


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

Revision: 3154
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3154&view=rev
Author:   hofman
Date:     2007-11-05 02:19:53 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
Delay undirtying of document on Leopard.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-11-05 09:50:55 UTC (rev 3153)
+++ trunk/SKMainWindowController.m	2007-11-05 10:19:53 UTC (rev 3154)
@@ -1566,7 +1566,7 @@
     NSUndoManager *undoManager = [[self document] undoManager];
     [[undoManager prepareWithInvocationTarget:self] rotatePageAtIndex:index by:-rotation];
     [undoManager setActionName:NSLocalizedString(@"Rotate Page", @"Undo action name")];
-    [[self document] updateChangeCount:[undoManager isUndoing] ? NSChangeDone : NSChangeUndone];
+    [[self document] undoableActionDoesntDirtyDocument];
     
     PDFPage *page = [[pdfView document] pageAtIndex:index];
     [page setRotation:[page rotation] + rotation];
@@ -1587,7 +1587,7 @@
     NSUndoManager *undoManager = [[self document] undoManager];
     [[undoManager prepareWithInvocationTarget:self] rotateAllLeft:nil];
     [undoManager setActionName:NSLocalizedString(@"Rotate", @"Undo action name")];
-    [[self document] updateChangeCount:[undoManager isUndoing] ? NSChangeDone : NSChangeUndone];
+    [[self document] undoableActionDoesntDirtyDocument];
     
     int i, count = [[pdfView document] pageCount];
     for (i = 0; i < count; i++) {
@@ -1602,7 +1602,7 @@
     NSUndoManager *undoManager = [[self document] undoManager];
     [[undoManager prepareWithInvocationTarget:self] rotateAllRight:nil];
     [undoManager setActionName:NSLocalizedString(@"Rotate", @"Undo action name")];
-    [[self document] updateChangeCount:[undoManager isUndoing] ? NSChangeDone : NSChangeUndone];
+    [[self document] undoableActionDoesntDirtyDocument];
     
     int i, count = [[pdfView document] pageCount];
     for (i = 0; i < count; i++) {
@@ -1618,7 +1618,7 @@
     NSUndoManager *undoManager = [[self document] undoManager];
     [[undoManager prepareWithInvocationTarget:self] cropPageAtIndex:index toRect:oldRect];
     [undoManager setActionName:NSLocalizedString(@"Crop Page", @"Undo action name")];
-    [[self document] updateChangeCount:[undoManager isUndoing] ? NSChangeDone : NSChangeUndone];
+    [[self document] undoableActionDoesntDirtyDocument];
     
     PDFPage *page = [[pdfView document] pageAtIndex:index];
     rect = NSIntersectionRect(rect, [page boundsForBox:kPDFDisplayBoxMediaBox]);
@@ -1652,7 +1652,7 @@
     NSUndoManager *undoManager = [[self document] undoManager];
     [[undoManager prepareWithInvocationTarget:self] cropPagesToRects:oldRects];
     [undoManager setActionName:NSLocalizedString(@"Crop", @"Undo action name")];
-    [[self document] updateChangeCount:[undoManager isUndoing] ? NSChangeDone : NSChangeUndone];
+    [[self document] undoableActionDoesntDirtyDocument];
     
     [[NSNotificationCenter defaultCenter] postNotificationName:SKPDFDocumentPageBoundsDidChangeNotification 
             object:[pdfView document] userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"crop", @"action", nil]];


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

Revision: 3161
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3161&view=rev
Author:   hofman
Date:     2007-11-06 03:31:11 -0800 (Tue, 06 Nov 2007)

Log Message:
-----------
Initialize ivar.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-11-06 00:50:13 UTC (rev 3160)
+++ trunk/SKMainWindowController.m	2007-11-06 11:31:11 UTC (rev 3161)
@@ -235,6 +235,7 @@
         savedNormalSetup = [[NSMutableDictionary alloc] init];
         leftSidePaneState = SKOutlineSidePaneState;
         rightSidePaneState = SKNoteSidePaneState;
+        findPaneState = SKSingularFindPaneState;
         temporaryAnnotations = CFSetCreateMutable(kCFAllocatorDefault, 0, &kCFTypeSetCallBacks);
         isAnimating = NO;
         updatingColor = NO;


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

Revision: 3173
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3173&view=rev
Author:   hofman
Date:     2007-11-07 04:18:52 -0800 (Wed, 07 Nov 2007)

Log Message:
-----------
Also fade in/out button for left pane state for search.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-11-07 11:13:41 UTC (rev 3172)
+++ trunk/SKMainWindowController.m	2007-11-07 12:18:52 UTC (rev 3173)
@@ -2480,62 +2480,56 @@
 
 - (void)replaceSideView:(NSView *)oldView withView:(NSView *)newView animate:(BOOL)animate {
     if ([newView window] == nil) {
-        BOOL wasFirstResponder;
+        NSMutableArray *viewAnimations = animate ? [NSMutableArray arrayWithCapacity:4] : nil;
+        NSResponder *oldFirstResponder = [[oldView window] firstResponder];
+        BOOL wasFind = [oldView isEqual:findView] || [oldView isEqual:groupedFindView];
+        BOOL isFind = [newView isEqual:findView] || [newView isEqual:groupedFindView];
+        NSSegmentedControl *oldButton = wasFind ? findButton : leftSideButton;
+        NSSegmentedControl *newButton = isFind ? findButton : leftSideButton;
+        NSView *containerView = [newButton superview];
         
         if ([oldView isEqual:tocView] || [oldView isEqual:findView] || [oldView isEqual:groupedFindView])
             [[SKPDFHoverWindow sharedHoverWindow] orderOut:self];
         
-        if ((oldView == findView || oldView == groupedFindView) && (newView != findView && newView != groupedFindView)) {
-            NSView *view = [leftSideButton superview];
-            wasFirstResponder =  [[[findButton window] firstResponder] isEqual:findButton];
-            [leftSideButton setFrame:[findButton frame]];
-            [findButton retain];
-            [[findButton superview] replaceSubview:findButton with:leftSideButton];
-            [view addSubview:findButton];
-            [findButton release];
-            if (wasFirstResponder)
-                [[leftSideButton window] makeFirstResponder:leftSideButton];
+        if (wasFind != isFind) {
+            [newButton setFrame:[oldButton frame]];
+            [newButton setHidden:animate];
+            [[oldButton superview] addSubview:newButton];
+            if (animate) {
+                [viewAnimations addObject:[NSDictionary dictionaryWithObjectsAndKeys:oldButton, NSViewAnimationTargetKey, NSViewAnimationFadeOutEffect, NSViewAnimationEffectKey, nil]];
+                [viewAnimations addObject:[NSDictionary dictionaryWithObjectsAndKeys:newButton, NSViewAnimationTargetKey, NSViewAnimationFadeInEffect, NSViewAnimationEffectKey, nil]];
+            }
         }
         
-        wasFirstResponder = [[[oldView window] firstResponder] isDescendantOf:oldView];
-        
         [newView setFrame:[oldView frame]];
         [newView setHidden:animate];
         [[oldView superview] addSubview:newView];
         
         if (animate) {
-            isAnimating = YES;
-            NSViewAnimation *animation;
-            NSDictionary *fadeOutDict = [[NSDictionary alloc] initWithObjectsAndKeys:oldView, NSViewAnimationTargetKey, NSViewAnimationFadeOutEffect, NSViewAnimationEffectKey, nil];
-            NSDictionary *fadeInDict = [[NSDictionary alloc] initWithObjectsAndKeys:newView, NSViewAnimationTargetKey, NSViewAnimationFadeInEffect, NSViewAnimationEffectKey, nil];
+            [viewAnimations addObject:[NSDictionary dictionaryWithObjectsAndKeys:oldView, NSViewAnimationTargetKey, NSViewAnimationFadeOutEffect, NSViewAnimationEffectKey, nil]];
+            [viewAnimations addObject:[NSDictionary dictionaryWithObjectsAndKeys:newView, NSViewAnimationTargetKey, NSViewAnimationFadeInEffect, NSViewAnimationEffectKey, nil]];
             
-            animation = [[[NSViewAnimation alloc] initWithViewAnimations:[NSArray arrayWithObjects:fadeOutDict, fadeInDict, nil]] autorelease];
-            [fadeOutDict release];
-            [fadeInDict release];
+            NSViewAnimation *animation = [[[NSViewAnimation alloc] initWithViewAnimations:viewAnimations] autorelease];
             
             [animation setAnimationBlockingMode:NSAnimationBlocking];
             [animation setDuration:0.75];
             [animation setAnimationCurve:NSAnimationEaseIn];
+            isAnimating = YES;
             [animation startAnimation];
             isAnimating = NO;
         }
         
-        if (wasFirstResponder)
+        if ([oldFirstResponder isDescendantOf:oldView])
             [[newView window] makeFirstResponder:[newView nextKeyView]];
         [oldView removeFromSuperview];
         [oldView setHidden:NO];
         [[newView window] recalculateKeyViewLoop];
         
-        if ((oldView != findView && oldView != groupedFindView) && (newView == findView || newView == groupedFindView)) {
-            NSView *view = [findButton superview];
-            wasFirstResponder =  [[[leftSideButton window] firstResponder] isEqual:leftSideButton];
-            [findButton setFrame:[leftSideButton frame]];
-            [leftSideButton retain];
-            [[leftSideButton superview] replaceSubview:leftSideButton with:findButton];
-            [view addSubview:leftSideButton];
-            [leftSideButton release];
-            if (wasFirstResponder)
-                [[findButton window] makeFirstResponder:findButton];
+        if (wasFind != isFind) {
+            [containerView addSubview:oldButton];
+            [oldButton setHidden:NO];
+            if ([oldFirstResponder isEqual:oldButton])
+                [[newButton window] makeFirstResponder:newButton];
         }
     }
 }


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

Revision: 3175
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3175&view=rev
Author:   hofman
Date:     2007-11-07 07:19:14 -0800 (Wed, 07 Nov 2007)

Log Message:
-----------
Only update max number of search result per page when needed.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-11-07 12:49:51 UTC (rev 3174)
+++ trunk/SKMainWindowController.m	2007-11-07 15:19:14 UTC (rev 3175)
@@ -2640,18 +2640,21 @@
         
         PDFPage *page = [[instance pages] objectAtIndex:0];
         NSMutableDictionary *dict = [groupedSearchResults lastObject];
+        NSNumber *maxCount = [dict valueForKey:@"maxCount"];
         if ([[dict valueForKey:@"page"] isEqual:page] == NO) {
-            dict = [NSMutableDictionary dictionaryWithObjectsAndKeys:page, @"page", [NSMutableArray array], @"results", nil];
+            dict = [NSMutableDictionary dictionaryWithObjectsAndKeys:page, @"page", [NSMutableArray array], @"results", maxCount, @"maxCount", nil];
             [groupedSearchResults addObject:dict];
         }
         NSMutableArray *results = [dict valueForKey:@"results"];
         [results addObject:instance];
         [dict setValue:[NSNumber numberWithUnsignedInt:[results count]] forKey:@"count"];
         
-        NSNumber *maxCount = [groupedSearchResults valueForKeyPath:@"@max.count"];
-        NSEnumerator *dictEnum = [groupedSearchResults objectEnumerator];
-        while (dict = [dictEnum nextObject])
-            [dict setValue:maxCount forKey:@"maxCount"];
+        if ([results count] > [maxCount unsignedIntValue]) {
+            NSEnumerator *dictEnum = [groupedSearchResults objectEnumerator];
+            maxCount = [NSNumber numberWithUnsignedInt:[results count]];
+            while (dict = [dictEnum nextObject])
+                [dict setValue:maxCount forKey:@"maxCount"];
+        }
     }
 }
 


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

Revision: 3178
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3178&view=rev
Author:   hofman
Date:     2007-11-07 10:51:10 -0800 (Wed, 07 Nov 2007)

Log Message:
-----------
Allow editing or (de)selecting notes when both the anchored note and its child is selected.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-11-07 18:37:45 UTC (rev 3177)
+++ trunk/SKMainWindowController.m	2007-11-07 18:51:10 UTC (rev 3178)
@@ -3775,11 +3775,11 @@
         if ([noteOutlineView isRowSelected:[noteOutlineView rowForItem:item]] == NO)
             [noteOutlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:[noteOutlineView rowForItem:item]] byExtendingSelection:NO];
         
-        NSMutableArray *items = [NSMutableArray array];
+        NSArray *items = [NSMutableArray array];
         NSIndexSet *rowIndexes = [noteOutlineView selectedRowIndexes];
         unsigned int row = [rowIndexes firstIndex];
         while (row != NSNotFound) {
-            [items addObject:[noteOutlineView itemAtRow:row]];
+            [(NSMutableArray *)items addObject:[noteOutlineView itemAtRow:row]];
             row = [rowIndexes indexGreaterThanIndex:row];
         }
         
@@ -3794,21 +3794,22 @@
             [menuItem setTarget:self];
             [menuItem setRepresentedObject:item];
         }
-        if ([pdfView hideNotes] == NO && [items count] == 1) {
-            PDFAnnotation *annotation = [items lastObject];
-            if ([annotation type] == nil)
-                annotation = [(SKNoteText *)annotation annotation];
-            if ([annotation isEditable]) {
-                menuItem = [menu addItemWithTitle:NSLocalizedString(@"Edit", @"Menu item title") action:@selector(editThisAnnotation:) keyEquivalent:@""];
-                [menuItem setTarget:pdfView];
+        if ([pdfView hideNotes] == NO) {
+            items = [self noteItems:items];
+            if ([items count] == 1) {
+                PDFAnnotation *annotation = [items lastObject];
+                if ([annotation isEditable]) {
+                    menuItem = [menu addItemWithTitle:NSLocalizedString(@"Edit", @"Menu item title") action:@selector(editThisAnnotation:) keyEquivalent:@""];
+                    [menuItem setTarget:pdfView];
+                    [menuItem setRepresentedObject:annotation];
+                }
+                if ([pdfView activeAnnotation] == annotation)
+                    menuItem = [menu addItemWithTitle:NSLocalizedString(@"Deselect", @"Menu item title") action:@selector(deselectNote:) keyEquivalent:@""];
+                else
+                    menuItem = [menu addItemWithTitle:NSLocalizedString(@"Select", @"Menu item title") action:@selector(selectNote:) keyEquivalent:@""];
+                [menuItem setTarget:self];
                 [menuItem setRepresentedObject:annotation];
             }
-            if ([pdfView activeAnnotation] == annotation)
-                menuItem = [menu addItemWithTitle:NSLocalizedString(@"Deselect", @"Menu item title") action:@selector(deselectNote:) keyEquivalent:@""];
-            else
-                menuItem = [menu addItemWithTitle:NSLocalizedString(@"Select", @"Menu item title") action:@selector(selectNote:) keyEquivalent:@""];
-            [menuItem setTarget:self];
-            [menuItem setRepresentedObject:annotation];
         }
         if ([menu numberOfItems] > 0)
             [menu addItem:[NSMenuItem separatorItem]];


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

Revision: 3179
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3179&view=rev
Author:   hofman
Date:     2007-11-07 10:53:40 -0800 (Wed, 07 Nov 2007)

Log Message:
-----------
Don't change the items variable as we are still using it.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-11-07 18:51:10 UTC (rev 3178)
+++ trunk/SKMainWindowController.m	2007-11-07 18:53:40 UTC (rev 3179)
@@ -3775,11 +3775,11 @@
         if ([noteOutlineView isRowSelected:[noteOutlineView rowForItem:item]] == NO)
             [noteOutlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:[noteOutlineView rowForItem:item]] byExtendingSelection:NO];
         
-        NSArray *items = [NSMutableArray array];
+        NSMutableArray *items = [NSMutableArray array];
         NSIndexSet *rowIndexes = [noteOutlineView selectedRowIndexes];
         unsigned int row = [rowIndexes firstIndex];
         while (row != NSNotFound) {
-            [(NSMutableArray *)items addObject:[noteOutlineView itemAtRow:row]];
+            [items addObject:[noteOutlineView itemAtRow:row]];
             row = [rowIndexes indexGreaterThanIndex:row];
         }
         
@@ -3795,9 +3795,9 @@
             [menuItem setRepresentedObject:item];
         }
         if ([pdfView hideNotes] == NO) {
-            items = [self noteItems:items];
-            if ([items count] == 1) {
-                PDFAnnotation *annotation = [items lastObject];
+            NSArray *noteItems = [self noteItems:items];
+            if ([noteItems count] == 1) {
+                PDFAnnotation *annotation = [noteItems lastObject];
                 if ([annotation isEditable]) {
                     menuItem = [menu addItemWithTitle:NSLocalizedString(@"Edit", @"Menu item title") action:@selector(editThisAnnotation:) keyEquivalent:@""];
                     [menuItem setTarget:pdfView];


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

Revision: 3180
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3180&view=rev
Author:   hofman
Date:     2007-11-08 07:58:41 -0800 (Thu, 08 Nov 2007)

Log Message:
-----------
Longer time between updates of search result tables.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-11-07 18:53:40 UTC (rev 3179)
+++ trunk/SKMainWindowController.m	2007-11-08 15:58:41 UTC (rev 3180)
@@ -2632,7 +2632,7 @@
 - (void)documentDidEndPageFind:(NSNotification *)note {
     NSNumber *pageIndex = [[note userInfo] objectForKey:@"PDFDocumentPageIndex"];
     [[statusBar progressIndicator] setDoubleValue:[pageIndex doubleValue]];
-    if ([pageIndex unsignedIntValue] % 10 == 0) {
+    if ([pageIndex unsignedIntValue] % 50 == 0) {
         [self willChangeValueForKey:@"searchResults"];
         [self didChangeValueForKey:@"searchResults"];
         [self willChangeValueForKey:@"groupedSearchResults"];


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

Revision: 3193
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3193&view=rev
Author:   hofman
Date:     2007-11-10 17:27:17 -0800 (Sat, 10 Nov 2007)

Log Message:
-----------
Import header

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-11-10 18:56:40 UTC (rev 3192)
+++ trunk/SKMainWindowController.m	2007-11-11 01:27:17 UTC (rev 3193)
@@ -83,6 +83,7 @@
 #import "SKSecondaryPDFView.h"
 #import "SKSheetController.h"
 #import "OBUtilities.h"
+#import "SKApplicationController.h"
 
 #define SEGMENTED_CONTROL_HEIGHT    25.0
 #define WINDOW_X_DELTA              0.0


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

Revision: 3216
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3216&view=rev
Author:   hofman
Date:     2007-11-18 06:51:31 -0800 (Sun, 18 Nov 2007)

Log Message:
-----------
Fix typo.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-11-18 14:49:38 UTC (rev 3215)
+++ trunk/SKMainWindowController.m	2007-11-18 14:51:31 UTC (rev 3216)
@@ -1511,7 +1511,7 @@
 
 - (IBAction)goToMarkedPage:(id)sender {
     PDFDocument *pdfDoc = [pdfView document];
-    if (markedPageIndex == NSNotFound || [pdfDoc isLocked] || [pdfDoc pageCount] == 0);
+    if (markedPageIndex == NSNotFound || [pdfDoc isLocked] || [pdfDoc pageCount] == 0)
         NSBeep();
     else
         [pdfView goToPage:[pdfDoc pageAtIndex:MIN(markedPageIndex, [pdfDoc pageCount] - 1)]];


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

Revision: 3222
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3222&view=rev
Author:   hofman
Date:     2007-11-19 05:27:03 -0800 (Mon, 19 Nov 2007)

Log Message:
-----------
Scroll page to visible after zoom to height.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-11-19 13:08:25 UTC (rev 3221)
+++ trunk/SKMainWindowController.m	2007-11-19 13:27:03 UTC (rev 3222)
@@ -1595,10 +1595,13 @@
         [pdfView setScaleFactor:NSWidth(frame) / width];
     } else {
         // zoom to height
-        float height = NSHeight([pdfView convertRect:[[pdfView currentPage] boundsForBox:[pdfView displayBox]] fromPage:[pdfView currentPage]]) / scaleFactor;
+        NSRect pageRect = [[pdfView currentPage] boundsForBox:[pdfView displayBox]];
+        float height = NSHeight([pdfView convertRect:pageRect fromPage:[pdfView currentPage]]) / scaleFactor;
         if ([pdfView displaysPageBreaks])
             height += 10.0;
         [pdfView setScaleFactor:NSHeight(frame) / height];
+        [pdfView layoutDocumentView];
+        [pdfView scrollRect:pageRect inPageToVisible:[pdfView currentPage]];
     }
 }
 


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

Revision: 3223
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3223&view=rev
Author:   hofman
Date:     2007-11-19 07:49:24 -0800 (Mon, 19 Nov 2007)

Log Message:
-----------
Add some hacks to fix a tiger bug, page history is not registered for goToPage and goToDestination.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-11-19 13:27:03 UTC (rev 3222)
+++ trunk/SKMainWindowController.m	2007-11-19 15:49:24 UTC (rev 3223)
@@ -187,6 +187,9 @@
 
 - (void)replaceSideView:(NSView *)oldView withView:(NSView *)newView animate:(BOOL)animate;
 
+- (void)goToDestination:(PDFDestination *)destination;
+- (void)goToPage:(PDFPage *)page;
+
 - (void)handleApplicationWillTerminateNotification:(NSNotification *)notification;
 - (void)handleApplicationDidResignActiveNotification:(NSNotification *)notification;
 - (void)handleApplicationWillBecomeActiveNotification:(NSNotification *)notification;
@@ -1047,9 +1050,9 @@
     // Check that the page number exists
     unsigned int pageCount = [[pdfView document] pageCount];
     if (pageNumber > pageCount)
-        [pdfView goToPage:[[pdfView document] pageAtIndex:pageCount - 1]];
+        [self goToPage:[[pdfView document] pageAtIndex:pageCount - 1]];
     else if (pageNumber > 0)
-        [pdfView goToPage:[[pdfView document] pageAtIndex:pageNumber - 1]];
+        [self goToPage:[[pdfView document] pageAtIndex:pageNumber - 1]];
 }
 
 - (NSString *)pageLabel {
@@ -1059,7 +1062,7 @@
 - (void)setPageLabel:(NSString *)label {
     unsigned int index = [pageLabels indexOfObject:label];
     if (index != NSNotFound)
-        [pdfView goToPage:[[pdfView document] pageAtIndex:index]];
+        [self goToPage:[[pdfView document] pageAtIndex:index]];
 }
 
 - (BOOL)validatePageLabel:(id *)value error:(NSError **)error {
@@ -1393,7 +1396,7 @@
 
 - (void)goToSelectedOutlineItem {
     updatingOutlineSelection = YES;
-    [pdfView goToDestination: [[outlineView itemAtRow: [outlineView selectedRow]] destination]];
+    [self goToDestination: [[outlineView itemAtRow: [outlineView selectedRow]] destination]];
     updatingOutlineSelection = NO;
 }
 
@@ -1516,10 +1519,10 @@
     if (markedPageIndex == NSNotFound || [pdfDoc isLocked] || [pdfDoc pageCount] == 0) {
         NSBeep();
     } else if (beforeMarkedPageIndex != NSNotFound) {
-        [pdfView goToPage:[pdfDoc pageAtIndex:MIN(beforeMarkedPageIndex, [pdfDoc pageCount] - 1)]];
+        [self goToPage:[pdfDoc pageAtIndex:MIN(beforeMarkedPageIndex, [pdfDoc pageCount] - 1)]];
     } else if (currentPageIndex != markedPageIndex) {
         beforeMarkedPageIndex = currentPageIndex;
-        [pdfView goToPage:[pdfDoc pageAtIndex:MIN(markedPageIndex, [pdfDoc pageCount] - 1)]];
+        [self goToPage:[pdfDoc pageAtIndex:MIN(markedPageIndex, [pdfDoc pageCount] - 1)]];
     }
 }
 
@@ -2888,6 +2891,42 @@
     }
 }
 
+#pragma mark Tiger history fixes
+
+- (void)goToDestination:(PDFDestination *)destination {
+    PDFDestination *dest = [pdfView currentDestination];
+    [pdfView goToDestination:destination];
+    if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) {
+        @try {
+            NSMutableArray *destinationHistory = [pdfView valueForKeyPath:@"pdfPriv.destinationHistory"];
+            int historyIndex = [[pdfView valueForKeyPath:@"pdfPriv.historyIndex"] intValue];
+            if (historyIndex < (int)[destinationHistory count])
+                [destinationHistory removeObjectsInRange:NSMakeRange(historyIndex, [destinationHistory count] - historyIndex)];
+            [destinationHistory addObject:dest];
+            [pdfView setValue:[NSNumber numberWithInt:++historyIndex] forKeyPath:@"pdfPriv.historyIndex"];
+            [[NSNotificationCenter defaultCenter] postNotificationName:PDFViewChangedHistoryNotification object:pdfView];
+        }
+        @catch (id exception) {}
+    }
+}
+
+- (void)goToPage:(PDFPage *)page {
+    PDFDestination *dest = [pdfView currentDestination];
+    [pdfView goToPage:page];
+    if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) {
+        @try {
+            NSMutableArray *destinationHistory = [pdfView valueForKeyPath:@"pdfPriv.destinationHistory"];
+            int historyIndex = [[pdfView valueForKeyPath:@"pdfPriv.historyIndex"] intValue];
+            if (historyIndex < (int)[destinationHistory count])
+                [destinationHistory removeObjectsInRange:NSMakeRange(historyIndex, [destinationHistory count] - historyIndex)];
+            [destinationHistory addObject:dest];
+            [pdfView setValue:[NSNumber numberWithInt:++historyIndex] forKeyPath:@"pdfPriv.historyIndex"];
+            [[NSNotificationCenter defaultCenter] postNotificationName:PDFViewChangedHistoryNotification object:pdfView];
+        }
+        @catch (id exception) {}
+    }
+}
+
 #pragma mark Sub- and note- windows
 
 - (void)showSnapshotAtPageNumber:(int)pageNum forRect:(NSRect)rect scaleFactor:(int)scaleFactor autoFits:(BOOL)autoFits {
@@ -3598,7 +3637,7 @@
 	// Get the destination associated with the search result list. Tell the PDFView to go there.
 	if ([[notification object] isEqual:outlineView] && (updatingOutlineSelection == NO)){
         updatingOutlineSelection = YES;
-		[pdfView goToDestination: [[outlineView itemAtRow: [outlineView selectedRow]] destination]];
+		[self goToDestination: [[outlineView itemAtRow: [outlineView selectedRow]] destination]];
         updatingOutlineSelection = NO;
         if ([self isPresentation] && [[NSUserDefaults standardUserDefaults] boolForKey:SKAutoHidePresentationContentsKey])
             [self hideLeftSideWindow];
@@ -3882,7 +3921,7 @@
         if (updatingThumbnailSelection == NO) {
             int row = [thumbnailTableView selectedRow];
             if (row != -1)
-                [pdfView goToPage:[[pdfView document] pageAtIndex:row]];
+                [self goToPage:[[pdfView document] pageAtIndex:row]];
             
             if ([self isPresentation] && [[NSUserDefaults standardUserDefaults] boolForKey:SKAutoHidePresentationContentsKey])
                 [self hideLeftSideWindow];


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

Revision: 3224
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3224&view=rev
Author:   hofman
Date:     2007-11-19 08:40:42 -0800 (Mon, 19 Nov 2007)

Log Message:
-----------
Combine code.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-11-19 15:49:24 UTC (rev 3223)
+++ trunk/SKMainWindowController.m	2007-11-19 16:40:42 UTC (rev 3224)
@@ -2893,16 +2893,14 @@
 
 #pragma mark Tiger history fixes
 
-- (void)goToDestination:(PDFDestination *)destination {
-    PDFDestination *dest = [pdfView currentDestination];
-    [pdfView goToDestination:destination];
+- (void)registerDestinationHistory:(PDFDestination *)destination {
     if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) {
         @try {
             NSMutableArray *destinationHistory = [pdfView valueForKeyPath:@"pdfPriv.destinationHistory"];
             int historyIndex = [[pdfView valueForKeyPath:@"pdfPriv.historyIndex"] intValue];
             if (historyIndex < (int)[destinationHistory count])
                 [destinationHistory removeObjectsInRange:NSMakeRange(historyIndex, [destinationHistory count] - historyIndex)];
-            [destinationHistory addObject:dest];
+            [destinationHistory addObject:destination];
             [pdfView setValue:[NSNumber numberWithInt:++historyIndex] forKeyPath:@"pdfPriv.historyIndex"];
             [[NSNotificationCenter defaultCenter] postNotificationName:PDFViewChangedHistoryNotification object:pdfView];
         }
@@ -2910,21 +2908,16 @@
     }
 }
 
+- (void)goToDestination:(PDFDestination *)destination {
+    PDFDestination *dest = [pdfView currentDestination];
+    [pdfView goToDestination:destination];
+    [self registerDestinationHistory:dest];
+}
+
 - (void)goToPage:(PDFPage *)page {
     PDFDestination *dest = [pdfView currentDestination];
     [pdfView goToPage:page];
-    if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) {
-        @try {
-            NSMutableArray *destinationHistory = [pdfView valueForKeyPath:@"pdfPriv.destinationHistory"];
-            int historyIndex = [[pdfView valueForKeyPath:@"pdfPriv.historyIndex"] intValue];
-            if (historyIndex < (int)[destinationHistory count])
-                [destinationHistory removeObjectsInRange:NSMakeRange(historyIndex, [destinationHistory count] - historyIndex)];
-            [destinationHistory addObject:dest];
-            [pdfView setValue:[NSNumber numberWithInt:++historyIndex] forKeyPath:@"pdfPriv.historyIndex"];
-            [[NSNotificationCenter defaultCenter] postNotificationName:PDFViewChangedHistoryNotification object:pdfView];
-        }
-        @catch (id exception) {}
-    }
+    [self registerDestinationHistory:dest];
 }
 
 #pragma mark Sub- and note- windows


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

Revision: 3237
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3237&view=rev
Author:   hofman
Date:     2007-11-23 03:05:34 -0800 (Fri, 23 Nov 2007)

Log Message:
-----------
Initially insert thumbnails rather than TOC, otherwise the thumbnails may never show up due to some mysterious AppKit bug.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-11-22 21:10:29 UTC (rev 3236)
+++ trunk/SKMainWindowController.m	2007-11-23 11:05:34 UTC (rev 3237)
@@ -239,7 +239,7 @@
         // @@ remove or set to nil for Leopard?
         pdfOutlineItems = [[NSMutableArray alloc] init];
         savedNormalSetup = [[NSMutableDictionary alloc] init];
-        leftSidePaneState = SKOutlineSidePaneState;
+        leftSidePaneState = SKThumbnailSidePaneState;
         rightSidePaneState = SKNoteSidePaneState;
         findPaneState = SKSingularFindPaneState;
         temporaryAnnotations = CFSetCreateMutable(kCFAllocatorDefault, 0, &kCFTypeSetCallBacks);
@@ -353,7 +353,7 @@
     }
     
     [outlineView setAutoresizesOutlineColumn: NO];
-    [self displayOutlineView];
+    [self displayThumbnailView];
     [self displayNoteView];
     
     // Set up the tool bar
@@ -444,10 +444,10 @@
     // Show/hide left side pane if necessary
     if ([sud boolForKey:SKOpenContentsPaneOnlyForTOCKey] && [self leftSidePaneIsOpen] == (pdfOutline == nil))
         [self toggleLeftSidePane:self];
-    if (pdfOutline == nil) {
-        [self setLeftSidePaneState:SKThumbnailSidePaneState];
+    if (pdfOutline)
+        [self setLeftSidePaneState:SKOutlineSidePaneState];
+    else
         [leftSideButton setEnabled:NO forSegment:SKOutlineSidePaneState];
-    }
     
     // Go to page?
     if ([sud boolForKey:SKRememberLastPageViewedKey]) {


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

Revision: 3239
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3239&view=rev
Author:   hofman
Date:     2007-11-23 05:33:38 -0800 (Fri, 23 Nov 2007)

Log Message:
-----------
Resize table after toggle of side pane, as autoresizing does not always work properly.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-11-23 12:12:12 UTC (rev 3238)
+++ trunk/SKMainWindowController.m	2007-11-23 13:33:38 UTC (rev 3239)
@@ -2044,6 +2044,14 @@
         
         [self splitViewDidResizeSubviews:nil];
     }
+    if ([currentLeftSideView isEqual:thumbnailView])
+        [thumbnailTableView sizeToFit];
+    else if ([currentLeftSideView isEqual:outlineView])
+        [outlineView sizeToFit];
+    else if ([currentLeftSideView isEqual:findView])
+        [findTableView sizeToFit];
+    else if ([currentLeftSideView isEqual:groupedFindView])
+        [groupedFindTableView sizeToFit];
 }
 
 - (IBAction)toggleRightSidePane:(id)sender {
@@ -2085,6 +2093,10 @@
         
         [self splitViewDidResizeSubviews:nil];
     }
+    if ([currentRightSideView isEqual:noteView])
+        [noteOutlineView sizeToFit];
+    else if ([currentRightSideView isEqual:snapshotView])
+        [snapshotTableView sizeToFit];
 }
 
 - (IBAction)changeLeftSidePaneState:(id)sender {


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

Revision: 3286
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3286&view=rev
Author:   hofman
Date:     2007-11-30 08:36:29 -0800 (Fri, 30 Nov 2007)

Log Message:
-----------
Set segment style of buttons in side panes on Leopard.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-11-30 16:09:16 UTC (rev 3285)
+++ trunk/SKMainWindowController.m	2007-11-30 16:36:29 UTC (rev 3286)
@@ -146,6 +146,24 @@
 
 static NSString *noteToolAdornImageNames[] = {@"TextNoteToolAdorn", @"AnchoredNoteToolAdorn", @"CircleNoteToolAdorn", @"SquareNoteToolAdorn", @"HighlightNoteToolAdorn", @"UnderlineNoteToolAdorn", @"StrikeOutNoteToolAdorn", @"LineNoteToolAdorn"};
 
+#if !defined(MAC_OS_X_VERSION_10_5) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5)
+typedef enum _NSSegmentStyle {
+    NSSegmentStyleAutomatic,
+    NSSegmentStyleCapsule,
+    NSSegmentStyleRounded,
+    NSSegmentStyleRoundRect,
+    NSSegmentStyleSmallSquare,
+    NSSegmentStyleTexturedRounded,
+    NSSegmentStyleTexturedSquare
+} NSSegmentStyle;
+@interface NSSegmentedControl (SKLeopardOnly)
+- (NSSegmentStyle)segmentStyle;
+- (void)setSegmentStyle:(NSSegmentStyle)style;
+@end
+#else
+#warning remove this
+#endif
+
 @interface NSResponder (SKExtensions)
 - (BOOL)isDescendantOf:(NSView *)aView;
 @end
@@ -314,6 +332,14 @@
         frame = [rightSideButton frame];
         frame.size.height = SEGMENTED_CONTROL_HEIGHT;
         [rightSideButton setFrame:frame];
+        frame = [findButton frame];
+        frame.size.height = SEGMENTED_CONTROL_HEIGHT;
+        [findButton setFrame:frame];
+        if ([leftSideButton respondsToSelector:@selector(setSegmentStyle:)]) {
+            [leftSideButton setSegmentStyle:NSSegmentStyleTexturedRounded];
+            [rightSideButton setSegmentStyle:NSSegmentStyleTexturedRounded];
+            [findButton setSegmentStyle:NSSegmentStyleTexturedRounded];
+        }
     }
     
     [[leftSideButton cell] setToolTip:NSLocalizedString(@"View Thumbnails", @"Tool tip message") forSegment:SKThumbnailSidePaneState];


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

Revision: 3288
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3288&view=rev
Author:   hofman
Date:     2007-11-30 10:45:24 -0800 (Fri, 30 Nov 2007)

Log Message:
-----------
Animate tables and segmented controls subsequently, as doing it together leads to flickering.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-11-30 18:11:22 UTC (rev 3287)
+++ trunk/SKMainWindowController.m	2007-11-30 18:45:24 UTC (rev 3288)
@@ -2567,7 +2567,6 @@
 
 - (void)replaceSideView:(NSView *)oldView withView:(NSView *)newView animate:(BOOL)animate {
     if ([newView window] == nil) {
-        NSMutableArray *viewAnimations = animate ? [NSMutableArray arrayWithCapacity:4] : nil;
         NSResponder *oldFirstResponder = [[oldView window] firstResponder];
         BOOL wasFind = [oldView isEqual:findView] || [oldView isEqual:groupedFindView];
         BOOL isFind = [newView isEqual:findView] || [newView isEqual:groupedFindView];
@@ -2582,10 +2581,6 @@
             [newButton setFrame:[oldButton frame]];
             [newButton setHidden:animate];
             [[oldButton superview] addSubview:newButton];
-            if (animate) {
-                [viewAnimations addObject:[NSDictionary dictionaryWithObjectsAndKeys:oldButton, NSViewAnimationTargetKey, NSViewAnimationFadeOutEffect, NSViewAnimationEffectKey, nil]];
-                [viewAnimations addObject:[NSDictionary dictionaryWithObjectsAndKeys:newButton, NSViewAnimationTargetKey, NSViewAnimationFadeInEffect, NSViewAnimationEffectKey, nil]];
-            }
         }
         
         [newView setFrame:[oldView frame]];
@@ -2593,17 +2588,29 @@
         [[oldView superview] addSubview:newView];
         
         if (animate) {
-            [viewAnimations addObject:[NSDictionary dictionaryWithObjectsAndKeys:oldView, NSViewAnimationTargetKey, NSViewAnimationFadeOutEffect, NSViewAnimationEffectKey, nil]];
-            [viewAnimations addObject:[NSDictionary dictionaryWithObjectsAndKeys:newView, NSViewAnimationTargetKey, NSViewAnimationFadeInEffect, NSViewAnimationEffectKey, nil]];
+            NSArray *viewAnimations = [NSArray arrayWithObjects:
+                [NSDictionary dictionaryWithObjectsAndKeys:oldView, NSViewAnimationTargetKey, NSViewAnimationFadeOutEffect, NSViewAnimationEffectKey, nil],
+                [NSDictionary dictionaryWithObjectsAndKeys:newView, NSViewAnimationTargetKey, NSViewAnimationFadeInEffect, NSViewAnimationEffectKey, nil], nil];
             
             NSViewAnimation *animation = [[[NSViewAnimation alloc] initWithViewAnimations:viewAnimations] autorelease];
-            
             [animation setAnimationBlockingMode:NSAnimationBlocking];
-            [animation setDuration:0.75];
+            [animation setDuration:0.7];
             [animation setAnimationCurve:NSAnimationEaseIn];
             isAnimating = YES;
             [animation startAnimation];
             isAnimating = NO;
+            
+            if (wasFind != isFind) {
+                viewAnimations = [NSArray arrayWithObjects:
+                    [NSDictionary dictionaryWithObjectsAndKeys:oldButton, NSViewAnimationTargetKey, NSViewAnimationFadeOutEffect, NSViewAnimationEffectKey, nil],
+                    [NSDictionary dictionaryWithObjectsAndKeys:newButton, NSViewAnimationTargetKey, NSViewAnimationFadeInEffect, NSViewAnimationEffectKey, nil], nil];
+                
+                animation = [[[NSViewAnimation alloc] initWithViewAnimations:viewAnimations] autorelease];
+                [animation setAnimationBlockingMode:NSAnimationBlocking];
+                [animation setDuration:0.3];
+                [animation setAnimationCurve:NSAnimationEaseIn];
+                [animation startAnimation];
+            }
         }
         
         if ([oldFirstResponder isDescendantOf:oldView])
@@ -2615,6 +2622,7 @@
         if (wasFind != isFind) {
             [containerView addSubview:oldButton];
             [oldButton setHidden:NO];
+            [newButton setHidden:NO];
             if ([oldFirstResponder isEqual:oldButton])
                 [[newButton window] makeFirstResponder:newButton];
         }


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

Revision: 3289
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3289&view=rev
Author:   hofman
Date:     2007-11-30 11:08:39 -0800 (Fri, 30 Nov 2007)

Log Message:
-----------
Set segment style on Leopard for segmented controls in toolbar.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-11-30 18:45:24 UTC (rev 3288)
+++ trunk/SKMainWindowController.m	2007-11-30 19:08:39 UTC (rev 3289)
@@ -4529,6 +4529,8 @@
     frame = [backForwardButton frame];
     frame.size.height = SEGMENTED_CONTROL_HEIGHT;
     [backForwardButton setFrame:frame];
+    if ([backForwardButton respondsToSelector:@selector(setSegmentStyle:)])
+        [backForwardButton setSegmentStyle:NSSegmentStyleTexturedRounded];
     [item setViewWithSizes:backForwardButton];
     [item setMenuFormRepresentation:menuItem];
     [toolbarItems setObject:item forKey:SKDocumentToolbarBackForwardItemIdentifier];
@@ -4567,9 +4569,13 @@
     frame = [previousPageButton frame];
     frame.size.height = SEGMENTED_CONTROL_HEIGHT;
     [previousPageButton setFrame:frame];
+    if ([previousPageButton respondsToSelector:@selector(setSegmentStyle:)])
+        [previousPageButton setSegmentStyle:NSSegmentStyleTexturedRounded];
     frame = [nextPageButton frame];
     frame.size.height = SEGMENTED_CONTROL_HEIGHT;
     [nextPageButton setFrame:frame];
+    if ([nextPageButton respondsToSelector:@selector(setSegmentStyle:)])
+        [nextPageButton setSegmentStyle:NSSegmentStyleTexturedRounded];
     [item setViewWithSizes:pageNumberButtonsView];
     [item setMenuFormRepresentation:menuItem];
     [toolbarItems setObject:item forKey:SKDocumentToolbarPageNumberButtonsItemIdentifier];
@@ -4645,6 +4651,8 @@
     frame = [zoomInOutButton frame];
     frame.size.height = SEGMENTED_CONTROL_HEIGHT;
     [zoomInOutButton setFrame:frame];
+    if ([zoomInOutButton respondsToSelector:@selector(setSegmentStyle:)])
+        [zoomInOutButton setSegmentStyle:NSSegmentStyleTexturedRounded];
     [item setViewWithSizes:zoomInOutButton];
     [item setMenuFormRepresentation:menuItem];
     [toolbarItems setObject:item forKey:SKDocumentToolbarZoomInOutItemIdentifier];
@@ -4668,6 +4676,8 @@
     frame = [zoomInActualOutButton frame];
     frame.size.height = SEGMENTED_CONTROL_HEIGHT;
     [zoomInActualOutButton setFrame:frame];
+    if ([zoomInActualOutButton respondsToSelector:@selector(setSegmentStyle:)])
+        [zoomInActualOutButton setSegmentStyle:NSSegmentStyleTexturedRounded];
     [item setViewWithSizes:zoomInActualOutButton];
     [item setMenuFormRepresentation:menuItem];
     [toolbarItems setObject:item forKey:SKDocumentToolbarZoomInActualOutItemIdentifier];
@@ -4862,6 +4872,8 @@
     frame = [noteButton frame];
     frame.size.height = SEGMENTED_CONTROL_HEIGHT;
     [noteButton setFrame:frame];
+    if ([noteButton respondsToSelector:@selector(setSegmentStyle:)])
+        [noteButton setSegmentStyle:NSSegmentStyleTexturedRounded];
     [item setViewWithSizes:noteButton];
     [item setMenuFormRepresentation:menuItem];
     [toolbarItems setObject:item forKey:SKDocumentToolbarNewNotesItemIdentifier];
@@ -4918,6 +4930,8 @@
     frame = [toolModeButton frame];
     frame.size.height = SEGMENTED_CONTROL_HEIGHT;
     [toolModeButton setFrame:frame];
+    if ([toolModeButton respondsToSelector:@selector(setSegmentStyle:)])
+        [toolModeButton setSegmentStyle:NSSegmentStyleTexturedRounded];
     [item setViewWithSizes:toolModeButton];
     [item setMenuFormRepresentation:menuItem];
     [toolbarItems setObject:item forKey:SKDocumentToolbarToolModeItemIdentifier];


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

Revision: 3290
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3290&view=rev
Author:   hofman
Date:     2007-11-30 11:43:41 -0800 (Fri, 30 Nov 2007)

Log Message:
-----------
Disable Zoom To Actual Size in presentation mode.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-11-30 19:08:39 UTC (rev 3289)
+++ trunk/SKMainWindowController.m	2007-11-30 19:43:41 UTC (rev 3290)
@@ -5255,7 +5255,7 @@
     } else if (action == @selector(doZoomOut:)) {
         return [self isPresentation] == NO && [pdfView canZoomOut];
     } else if (action == @selector(doZoomToActualSize:)) {
-        return fabsf([pdfView scaleFactor] - 1.0 ) > 0.01;
+        return [self isPresentation] == NO && fabsf([pdfView scaleFactor] - 1.0 ) > 0.01;
     } else if (action == @selector(doZoomToPhysicalSize:)) {
         return [self isPresentation] == NO;
     } else if (action == @selector(doZoomToSelection:)) {


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

Revision: 3336
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3336&view=rev
Author:   hofman
Date:     2007-12-25 03:08:33 -0800 (Tue, 25 Dec 2007)

Log Message:
-----------
Align window at top when zooming to fit the PDF.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-12-23 15:39:59 UTC (rev 3335)
+++ trunk/SKMainWindowController.m	2007-12-25 11:08:33 UTC (rev 3336)
@@ -1952,8 +1952,8 @@
     
     PDFDisplayMode displayMode = [pdfView displayMode];
     NSRect frame = [splitView frame];
+    float top = NSMaxY(frame);
     NSRect documentRect = [[[self pdfView] documentView] convertRect:[[[self pdfView] documentView] bounds] toView:nil];
-    float bottomOffset = -1.0;
     
     if ([[self pdfView] autoScales]) {
         documentRect.size.width /= [[self pdfView] scaleFactor];
@@ -1975,10 +1975,8 @@
         frame.size.width += [NSScroller scrollerWidth];
     }
     
-    if ([statusBar isVisible])
-        bottomOffset = NSHeight([statusBar frame]);
-    frame.origin.y -= bottomOffset;
-    frame.size.height += bottomOffset;
+    frame.size.height += [statusBar isVisible] ? NSHeight([statusBar frame]) : -1;
+    frame.origin.y = top - NSHeight(frame);
     
     frame.origin = [[self window] convertBaseToScreen:[[[self window] contentView] convertPoint:frame.origin toView:nil]];
     frame = [[self window] frameRectForContentRect:frame];


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

Revision: 3337
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3337&view=rev
Author:   hofman
Date:     2007-12-25 04:07:11 -0800 (Tue, 25 Dec 2007)

Log Message:
-----------
Simplify zoom to fit PDF. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-12-25 11:08:33 UTC (rev 3336)
+++ trunk/SKMainWindowController.m	2007-12-25 12:07:11 UTC (rev 3337)
@@ -1951,8 +1951,8 @@
     }
     
     PDFDisplayMode displayMode = [pdfView displayMode];
-    NSRect frame = [splitView frame];
-    float top = NSMaxY(frame);
+    NSSize size, oldSize = [[self pdfView] frame].size;
+    NSRect frame = [[self window] frame];
     NSRect documentRect = [[[self pdfView] documentView] convertRect:[[[self pdfView] documentView] bounds] toView:nil];
     
     if ([[self pdfView] autoScales]) {
@@ -1960,26 +1960,24 @@
         documentRect.size.height /= [[self pdfView] scaleFactor];
     }
     
-    frame.size.width = NSWidth(documentRect);
-    if (usesDrawers == NO)
-        frame.size.width += NSWidth([leftSideContentView frame]) + NSWidth([rightSideContentView frame]) + 2 * [splitView dividerThickness] + 2.0;
+    size.width = NSWidth(documentRect);
     if (displayMode == kPDFDisplaySinglePage || displayMode == kPDFDisplayTwoUp) {
-        frame.size.height = NSHeight(documentRect) + 1.0;
+        size.height = NSHeight(documentRect) + 1.0;
     } else {
         NSRect pageBounds = [[self pdfView] convertRect:[[[self pdfView] currentPage] boundsForBox:[[self pdfView] displayBox]] fromPage:[[self pdfView] currentPage]];
         if ([[self pdfView] autoScales]) {
             pageBounds.size.width /= [[self pdfView] scaleFactor];
             pageBounds.size.height /= [[self pdfView] scaleFactor];
         }
-        frame.size.height = NSHeight(pageBounds) + NSWidth(documentRect) - NSWidth(pageBounds) + 1.0;
-        frame.size.width += [NSScroller scrollerWidth];
+        size.height = NSHeight(pageBounds) + NSWidth(documentRect) - NSWidth(pageBounds) + 1.0;
+        if ([[[self pdfView] document] pageCount] > 1)
+            size.width += [NSScroller scrollerWidth];
     }
     
-    frame.size.height += [statusBar isVisible] ? NSHeight([statusBar frame]) : -1;
-    frame.origin.y = top - NSHeight(frame);
-    
-    frame.origin = [[self window] convertBaseToScreen:[[[self window] contentView] convertPoint:frame.origin toView:nil]];
-    frame = [[self window] frameRectForContentRect:frame];
+    size.width += NSWidth(frame) - oldSize.width;
+    size.height += NSHeight(frame) - oldSize.height;
+    frame.origin.y = NSMaxY(frame) - size.height;
+    frame.size = size;
     frame = SKConstrainRect(frame, [[[self window] screen] visibleFrame]);
     
     [[self window] setFrame:frame display:[[self window] isVisible]];


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

Revision: 3339
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3339&view=rev
Author:   hofman
Date:     2007-12-26 05:21:42 -0800 (Wed, 26 Dec 2007)

Log Message:
-----------
Improve calculations for fit to pdf.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-12-25 22:59:41 UTC (rev 3338)
+++ trunk/SKMainWindowController.m	2007-12-26 13:21:42 UTC (rev 3339)
@@ -1951,31 +1951,40 @@
     }
     
     PDFDisplayMode displayMode = [pdfView displayMode];
+    float scaleFactor = [[self pdfView] scaleFactor];
+    BOOL autoScales = [[self pdfView] autoScales];
+    BOOL isSingleRow;
+    
+    if (displayMode == kPDFDisplaySinglePage || displayMode == kPDFDisplayTwoUp)
+        isSingleRow = YES;
+    else if (displayMode == kPDFDisplaySinglePageContinuous || [[self pdfView] displaysAsBook])
+        isSingleRow = [[[self pdfView] document] pageCount] <= 1;
+    else
+        isSingleRow = [[[self pdfView] document] pageCount] <= 2;
+    
+    NSRect frame = [[self window] frame];
     NSSize size, oldSize = [[self pdfView] frame].size;
-    NSRect frame = [[self window] frame];
     NSRect documentRect = [[[self pdfView] documentView] convertRect:[[[self pdfView] documentView] bounds] toView:nil];
     
-    if ([[self pdfView] autoScales]) {
-        documentRect.size.width /= [[self pdfView] scaleFactor];
-        documentRect.size.height /= [[self pdfView] scaleFactor];
-    }
-    
+    // Calculate the new size for the pdfView
     size.width = NSWidth(documentRect);
-    if (displayMode == kPDFDisplaySinglePage || displayMode == kPDFDisplayTwoUp) {
-        size.height = NSHeight(documentRect) + 1.0;
+    if (autoScales)
+        size.width /= scaleFactor;
+    if (isSingleRow) {
+        size.height = NSHeight(documentRect);
     } else {
-        NSRect pageBounds = [[self pdfView] convertRect:[[[self pdfView] currentPage] boundsForBox:[[self pdfView] displayBox]] fromPage:[[self pdfView] currentPage]];
-        if ([[self pdfView] autoScales]) {
-            pageBounds.size.width /= [[self pdfView] scaleFactor];
-            pageBounds.size.height /= [[self pdfView] scaleFactor];
-        }
-        size.height = NSHeight(pageBounds) + NSWidth(documentRect) - NSWidth(pageBounds) + 1.0;
-        if ([[[self pdfView] document] pageCount] > 1)
-            size.width += [NSScroller scrollerWidth];
+        size.height = NSHeight([[self pdfView] convertRect:[[[self pdfView] currentPage] boundsForBox:[[self pdfView] displayBox]] fromPage:[[self pdfView] currentPage]]);
+        if ([[self pdfView] displaysPageBreaks])
+            size.height += 8.0 * scaleFactor;
+        size.width += [NSScroller scrollerWidth];
     }
+    if (autoScales)
+        size.height /= scaleFactor;
     
-    size.width += NSWidth(frame) - oldSize.width;
-    size.height += NSHeight(frame) - oldSize.height;
+    // Calculate the new size for the window
+    size.width = ceilf(NSWidth(frame) + size.width - oldSize.width);
+    size.height = ceilf(NSHeight(frame) + size.height - oldSize.height);
+    // Align the window frame from the old topleft point and constrain to the screen
     frame.origin.y = NSMaxY(frame) - size.height;
     frame.size = size;
     frame = SKConstrainRect(frame, [[[self window] screen] visibleFrame]);


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

Revision: 3344
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3344&view=rev
Author:   hofman
Date:     2008-01-06 14:16:31 -0800 (Sun, 06 Jan 2008)

Log Message:
-----------
Minor and irrelevant but correction.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-01-06 06:09:13 UTC (rev 3343)
+++ trunk/SKMainWindowController.m	2008-01-06 22:16:31 UTC (rev 3344)
@@ -441,7 +441,7 @@
             frame = [rightSideContentView frame];
             frame.size.width = width;
             if (usesDrawers == NO) {
-                frame.origin.x = NSMaxX([splitView frame]) - width;
+                frame.origin.x = NSMaxX([splitView bounds]) - width;
                 [rightSideContentView setFrame:frame];
             } else if (width > 0.0) {
                 [rightSideDrawer setContentSize:frame.size];


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

Revision: 3348
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3348&view=rev
Author:   hofman
Date:     2008-01-07 11:46:35 -0800 (Mon, 07 Jan 2008)

Log Message:
-----------
Swap in PDFView a little bit later to avoid a resize and relayout. Remove obsolete commented call.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-01-07 19:19:53 UTC (rev 3347)
+++ trunk/SKMainWindowController.m	2008-01-07 19:46:35 UTC (rev 3348)
@@ -475,14 +475,6 @@
     // windowControllerDidLoadNib: is not called automatically because the document overrides makeWindowControllers
     [[self document] windowControllerDidLoadNib:self];
     
-    [pdfView setFrame:[[pdfEdgeView contentView] bounds]];
-    [pdfEdgeView addSubview:pdfView];
-    
-    // this is mainly needed when the pdf auto-scales
-    //[pdfView layoutDocumentView];
-    
-    [[self window] makeFirstResponder:[pdfView documentView]];
-    
     // Show/hide left side pane if necessary
     if ([sud boolForKey:SKOpenContentsPaneOnlyForTOCKey] && [self leftSidePaneIsOpen] == (pdfOutline == nil))
         [self toggleLeftSidePane:self];
@@ -491,6 +483,12 @@
     else
         [leftSideButton setEnabled:NO forSegment:SKOutlineSidePaneState];
     
+    // Due to a bug in Leopard we should only resize and swap in the PDFView after loading the PDFDocument
+    [pdfView setFrame:[[pdfEdgeView contentView] bounds]];
+    [pdfEdgeView addSubview:pdfView];
+    
+    [[self window] makeFirstResponder:[pdfView documentView]];
+    
     // Go to page?
     unsigned int pageIndex = NSNotFound;
     if (hasWindowSetup)


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

Revision: 3375
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3375&view=rev
Author:   hofman
Date:     2008-01-19 16:03:31 -0800 (Sat, 19 Jan 2008)

Log Message:
-----------
Strip extra search criteria from spotlight search pre-filled into search field.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-01-16 18:19:31 UTC (rev 3374)
+++ trunk/SKMainWindowController.m	2008-01-20 00:03:31 UTC (rev 3375)
@@ -2802,8 +2802,15 @@
 - (void)displaySearchResultsForString:(NSString *)string {
     if ([self leftSidePaneIsOpen] == NO)
         [self toggleLeftSidePane:self];
+    // strip extra search criteria, such as kind:pdf
+    NSRange range = [string rangeOfString:@":"];
+    if (range.location != NSNotFound) {
+        range = [string rangeOfCharacterFromSet:[NSCharacterSet whitespaceCharacterSet] options:NSBackwardsSearch range:NSMakeRange(0, range.location)];
+        if (range.location != NSNotFound && range.location > 0)
+            string = [string substringWithRange:NSMakeRange(0, range.location)];
+    }
     [searchField setStringValue:string];
-    [self search:searchField];
+    [searchField sendAction:[searchField action] to:[searchField target]];
 }
 
 - (IBAction)search:(id)sender {


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

Revision: 3379
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3379&view=rev
Author:   hofman
Date:     2008-01-23 08:59:25 -0800 (Wed, 23 Jan 2008)

Log Message:
-----------
Use NSLocale for metric units.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-01-23 16:36:51 UTC (rev 3378)
+++ trunk/SKMainWindowController.m	2008-01-23 16:59:25 UTC (rev 3379)
@@ -825,7 +825,7 @@
            message = @"";
     } else {
         if ([statusBar state] == NSOnState) {
-            BOOL useMetric = [[NSUserDefaults standardUserDefaults] boolForKey:@"AppleMetricUnits"];
+            BOOL useMetric = [[[NSLocale currentLocale] objectForKey:NSLocaleUsesMetricSystem] boolValue];
             NSString *units = useMetric ? @"cm" : @"in";
             float factor = useMetric ? 0.035277778 : 0.013888889;
             message = [NSString stringWithFormat:@"%.2f x %.2f %@", NSWidth(selRect) * factor, NSHeight(selRect) * factor, units];


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

Revision: 3381
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3381&view=rev
Author:   hofman
Date:     2008-01-24 05:44:19 -0800 (Thu, 24 Jan 2008)

Log Message:
-----------
Fix copy contextual menu item.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-01-24 13:05:59 UTC (rev 3380)
+++ trunk/SKMainWindowController.m	2008-01-24 13:44:19 UTC (rev 3381)
@@ -3904,7 +3904,7 @@
         if ([self outlineView:ov canCopyItems:[NSArray arrayWithObjects:item, nil]]) {
             menuItem = [menu addItemWithTitle:NSLocalizedString(@"Copy", @"Menu item title") action:@selector(copyNotes:) keyEquivalent:@""];
             [menuItem setTarget:self];
-            [menuItem setRepresentedObject:item];
+            [menuItem setRepresentedObject:items];
         }
         if ([pdfView hideNotes] == NO) {
             NSArray *noteItems = [self noteItems:items];


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

Revision: 3392
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3392&view=rev
Author:   hofman
Date:     2008-02-12 08:56:26 -0800 (Tue, 12 Feb 2008)

Log Message:
-----------
Fix NSSegmentStyle enum. Fix height of segmented controls on Leopard.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-02-12 12:53:17 UTC (rev 3391)
+++ trunk/SKMainWindowController.m	2008-02-12 16:56:26 UTC (rev 3392)
@@ -85,7 +85,6 @@
 #import "OBUtilities.h"
 #import "SKApplicationController.h"
 
-#define SEGMENTED_CONTROL_HEIGHT    25.0
 #define WINDOW_X_DELTA              0.0
 #define WINDOW_Y_DELTA              70.0
 
@@ -103,6 +102,9 @@
 #define AUTO_HIDES_SCROLLERS_KEY    @"autoHidesScrollers"
 #define PAGE_INDEX_KEY              @"pageIndex"
 
+static float segmentedControlHeight = 23.0;
+static float segmentedControlOffset = 1.0;
+
 static NSString *SKMainWindowFrameAutosaveName = @"SKMainWindow";
 
 static NSString *SKDocumentToolbarIdentifier = @"SKDocumentToolbarIdentifier";
@@ -149,12 +151,12 @@
 #if !defined(MAC_OS_X_VERSION_10_5) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5)
 typedef enum _NSSegmentStyle {
     NSSegmentStyleAutomatic,
-    NSSegmentStyleCapsule,
     NSSegmentStyleRounded,
+    NSSegmentStyleTexturedRounded,
     NSSegmentStyleRoundRect,
-    NSSegmentStyleSmallSquare,
-    NSSegmentStyleTexturedRounded,
-    NSSegmentStyleTexturedSquare
+    NSSegmentStyleTexturedSquare,
+    NSSegmentStyleCapsule,
+    NSSegmentStyleSmallSquare
 } NSSegmentStyle;
 @interface NSSegmentedControl (SKLeopardOnly)
 - (NSSegmentStyle)segmentStyle;
@@ -239,6 +241,11 @@
     OBINITIALIZE;
     
     [NSValueTransformer setValueTransformer:[[[SKUnarchiveFromDataArrayTransformer alloc] init] autorelease] forName:SKUnarchiveFromDataArrayTransformerName];
+    
+    if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) {
+        segmentedControlHeight = 25.0;
+        segmentedControlOffset = 0.0;
+    }
 }
 
 - (id)initWithWindowNibName:(NSString *)windowNibName owner:(id)owner{
@@ -327,20 +334,23 @@
     [rightSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
     
     if (usesDrawers == NO) {
+        if ([leftSideButton respondsToSelector:@selector(setSegmentStyle:)]) {
+            [leftSideButton setSegmentStyle:NSSegmentStyleCapsule];
+            [rightSideButton setSegmentStyle:NSSegmentStyleCapsule];
+            [findButton setSegmentStyle:NSSegmentStyleCapsule];
+        }
         frame = [leftSideButton frame];
-        frame.size.height = SEGMENTED_CONTROL_HEIGHT;
+        frame.size.height = segmentedControlHeight;
+        frame.origin.y += segmentedControlOffset;
         [leftSideButton setFrame:frame];
         frame = [rightSideButton frame];
-        frame.size.height = SEGMENTED_CONTROL_HEIGHT;
+        frame.size.height = segmentedControlHeight;
+        frame.origin.y += segmentedControlOffset;
         [rightSideButton setFrame:frame];
         frame = [findButton frame];
-        frame.size.height = SEGMENTED_CONTROL_HEIGHT;
+        frame.size.height = segmentedControlHeight;
+        frame.origin.y += segmentedControlOffset;
         [findButton setFrame:frame];
-        if ([leftSideButton respondsToSelector:@selector(setSegmentStyle:)]) {
-            [leftSideButton setSegmentStyle:NSSegmentStyleTexturedRounded];
-            [rightSideButton setSegmentStyle:NSSegmentStyleTexturedRounded];
-            [findButton setSegmentStyle:NSSegmentStyleTexturedRounded];
-        }
     }
     
     [[leftSideButton cell] setToolTip:NSLocalizedString(@"View Thumbnails", @"Tool tip message") forSegment:SKThumbnailSidePaneState];
@@ -4517,10 +4527,10 @@
     [[backForwardButton cell] setToolTip:NSLocalizedString(@"Go Back", @"Tool tip message") forSegment:0];
     [[backForwardButton cell] setToolTip:NSLocalizedString(@"Go Forward", @"Tool tip message") forSegment:1];
     frame = [backForwardButton frame];
-    frame.size.height = SEGMENTED_CONTROL_HEIGHT;
+    frame.size.height = segmentedControlHeight;
     [backForwardButton setFrame:frame];
     if ([backForwardButton respondsToSelector:@selector(setSegmentStyle:)])
-        [backForwardButton setSegmentStyle:NSSegmentStyleTexturedRounded];
+        [backForwardButton setSegmentStyle:NSSegmentStyleCapsule];
     [item setViewWithSizes:backForwardButton];
     [item setMenuFormRepresentation:menuItem];
     [toolbarItems setObject:item forKey:SKDocumentToolbarBackForwardItemIdentifier];
@@ -4557,15 +4567,17 @@
     [[nextPageButton cell] setToolTip:NSLocalizedString(@"Go To Next Page", @"Tool tip message") forSegment:0];
     [[nextPageButton cell] setToolTip:NSLocalizedString(@"Go To Last page", @"Tool tip message") forSegment:1];
     frame = [previousPageButton frame];
-    frame.size.height = SEGMENTED_CONTROL_HEIGHT;
+    frame.size.height = segmentedControlHeight;
+    frame.origin.y += segmentedControlOffset;
     [previousPageButton setFrame:frame];
     if ([previousPageButton respondsToSelector:@selector(setSegmentStyle:)])
-        [previousPageButton setSegmentStyle:NSSegmentStyleTexturedRounded];
+        [previousPageButton setSegmentStyle:NSSegmentStyleCapsule];
     frame = [nextPageButton frame];
-    frame.size.height = SEGMENTED_CONTROL_HEIGHT;
+    frame.size.height = segmentedControlHeight;
+    frame.origin.y += segmentedControlOffset;
     [nextPageButton setFrame:frame];
     if ([nextPageButton respondsToSelector:@selector(setSegmentStyle:)])
-        [nextPageButton setSegmentStyle:NSSegmentStyleTexturedRounded];
+        [nextPageButton setSegmentStyle:NSSegmentStyleCapsule];
     [item setViewWithSizes:pageNumberButtonsView];
     [item setMenuFormRepresentation:menuItem];
     [toolbarItems setObject:item forKey:SKDocumentToolbarPageNumberButtonsItemIdentifier];
@@ -4639,10 +4651,10 @@
     [[zoomInOutButton cell] setToolTip:NSLocalizedString(@"Zoom Out", @"Tool tip message") forSegment:0];
     [[zoomInOutButton cell] setToolTip:NSLocalizedString(@"Zoom In", @"Tool tip message") forSegment:1];
     frame = [zoomInOutButton frame];
-    frame.size.height = SEGMENTED_CONTROL_HEIGHT;
+    frame.size.height = segmentedControlHeight;
     [zoomInOutButton setFrame:frame];
     if ([zoomInOutButton respondsToSelector:@selector(setSegmentStyle:)])
-        [zoomInOutButton setSegmentStyle:NSSegmentStyleTexturedRounded];
+        [zoomInOutButton setSegmentStyle:NSSegmentStyleCapsule];
     [item setViewWithSizes:zoomInOutButton];
     [item setMenuFormRepresentation:menuItem];
     [toolbarItems setObject:item forKey:SKDocumentToolbarZoomInOutItemIdentifier];
@@ -4664,10 +4676,10 @@
     [[zoomInActualOutButton cell] setToolTip:NSLocalizedString(@"Zoom To Actual Size", @"Tool tip message") forSegment:1];
     [[zoomInActualOutButton cell] setToolTip:NSLocalizedString(@"Zoom In", @"Tool tip message") forSegment:2];
     frame = [zoomInActualOutButton frame];
-    frame.size.height = SEGMENTED_CONTROL_HEIGHT;
+    frame.size.height = segmentedControlHeight;
     [zoomInActualOutButton setFrame:frame];
     if ([zoomInActualOutButton respondsToSelector:@selector(setSegmentStyle:)])
-        [zoomInActualOutButton setSegmentStyle:NSSegmentStyleTexturedRounded];
+        [zoomInActualOutButton setSegmentStyle:NSSegmentStyleCapsule];
     [item setViewWithSizes:zoomInActualOutButton];
     [item setMenuFormRepresentation:menuItem];
     [toolbarItems setObject:item forKey:SKDocumentToolbarZoomInActualOutItemIdentifier];
@@ -4860,10 +4872,10 @@
     [[noteButton cell] setToolTip:NSLocalizedString(@"Add New Strike Out", @"Tool tip message") forSegment:SKStrikeOutNote];
     [[noteButton cell] setToolTip:NSLocalizedString(@"Add New Line", @"Tool tip message") forSegment:SKLineNote];
     frame = [noteButton frame];
-    frame.size.height = SEGMENTED_CONTROL_HEIGHT;
+    frame.size.height = segmentedControlHeight;
     [noteButton setFrame:frame];
     if ([noteButton respondsToSelector:@selector(setSegmentStyle:)])
-        [noteButton setSegmentStyle:NSSegmentStyleTexturedRounded];
+        [noteButton setSegmentStyle:NSSegmentStyleCapsule];
     [item setViewWithSizes:noteButton];
     [item setMenuFormRepresentation:menuItem];
     [toolbarItems setObject:item forKey:SKDocumentToolbarNewNotesItemIdentifier];
@@ -4918,10 +4930,10 @@
     [[toolModeButton cell] setToolTip:NSLocalizedString(@"Select Tool", @"Tool tip message") forSegment:SKSelectToolMode];
     [[toolModeButton cell] setToolTip:NSLocalizedString(@"Note Tool", @"Tool tip message") forSegment:SKNoteToolMode];
     frame = [toolModeButton frame];
-    frame.size.height = SEGMENTED_CONTROL_HEIGHT;
+    frame.size.height = segmentedControlHeight;
     [toolModeButton setFrame:frame];
     if ([toolModeButton respondsToSelector:@selector(setSegmentStyle:)])
-        [toolModeButton setSegmentStyle:NSSegmentStyleTexturedRounded];
+        [toolModeButton setSegmentStyle:NSSegmentStyleCapsule];
     [item setViewWithSizes:toolModeButton];
     [item setMenuFormRepresentation:menuItem];
     [toolbarItems setObject:item forKey:SKDocumentToolbarToolModeItemIdentifier];


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

Revision: 3398
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3398&view=rev
Author:   hofman
Date:     2008-02-12 12:41:52 -0800 (Tue, 12 Feb 2008)

Log Message:
-----------
Check all documents for validating menu items to navigate in all documents.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-02-12 20:19:30 UTC (rev 3397)
+++ trunk/SKMainWindowController.m	2008-02-12 20:41:52 UTC (rev 3398)
@@ -5248,14 +5248,22 @@
         else
             [menuItem setState:[pdfView annotationMode] == (unsigned)[menuItem tag] ? NSOnState : NSOffState];
         return YES;
-    } else if (action == @selector(doGoToNextPage:) || action == @selector(allGoToNextPage:)) {
+    } else if (action == @selector(doGoToNextPage:)) {
         return [pdfView canGoToNextPage];
-    } else if (action == @selector(doGoToPreviousPage:) || action == @selector(allGoToPreviousPage:)) {
+    } else if (action == @selector(doGoToPreviousPage:) ) {
         return [pdfView canGoToPreviousPage];
-    } else if (action == @selector(doGoToFirstPage:) || action == @selector(allGoToFirstPage:)) {
+    } else if (action == @selector(doGoToFirstPage:)) {
         return [pdfView canGoToFirstPage];
-    } else if (action == @selector(doGoToLastPage:) || action == @selector(allGoToLastPage:)) {
+    } else if (action == @selector(doGoToLastPage:)) {
         return [pdfView canGoToLastPage];
+    } else if (action == @selector(allGoToNextPage:)) {
+        return NO == [[NSApp valueForKeyPath:@"orderedDocuments.pdfView.canGoToNextPage"] containsObject:[NSNumber numberWithBool:NO]];
+    } else if (action == @selector(allGoToPreviousPage:)) {
+        return NO == [[NSApp valueForKeyPath:@"orderedDocuments.pdfView.canGoToPreviousPage"] containsObject:[NSNumber numberWithBool:NO]];
+    } else if (action == @selector(allGoToFirstPage:)) {
+        return NO == [[NSApp valueForKeyPath:@"orderedDocuments.pdfView.canGoToFirstPage"] containsObject:[NSNumber numberWithBool:NO]];
+    } else if (action == @selector(allGoToLastPage:)) {
+        return NO == [[NSApp valueForKeyPath:@"orderedDocuments.pdfView.canGoToLastPage"] containsObject:[NSNumber numberWithBool:NO]];
     } else if (action == @selector(doGoBack:)) {
         return [pdfView canGoBack];
     } else if (action == @selector(doGoForward:)) {


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

Revision: 3412
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3412&view=rev
Author:   hofman
Date:     2008-02-17 16:27:02 -0800 (Sun, 17 Feb 2008)

Log Message:
-----------
Change an order of toolbar items.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-02-17 23:08:07 UTC (rev 3411)
+++ trunk/SKMainWindowController.m	2008-02-18 00:27:02 UTC (rev 3412)
@@ -5234,8 +5234,8 @@
 - (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar {
     return [NSArray arrayWithObjects: 
         SKDocumentToolbarPreviousNextItemIdentifier, 
+        SKDocumentToolbarPreviousItemIdentifier, 
         SKDocumentToolbarPageNumberItemIdentifier, 
-        SKDocumentToolbarPreviousItemIdentifier, 
         SKDocumentToolbarNextItemIdentifier, 
         SKDocumentToolbarPreviousNextFirstLastItemIdentifier, 
         SKDocumentToolbarBackForwardItemIdentifier, 


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

Revision: 3416
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3416&view=rev
Author:   hofman
Date:     2008-02-20 13:52:32 -0800 (Wed, 20 Feb 2008)

Log Message:
-----------
Change order of toolbar items in customization palette.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-02-18 12:44:32 UTC (rev 3415)
+++ trunk/SKMainWindowController.m	2008-02-20 21:52:32 UTC (rev 3416)
@@ -5234,14 +5234,14 @@
 - (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar {
     return [NSArray arrayWithObjects: 
         SKDocumentToolbarPreviousNextItemIdentifier, 
+        SKDocumentToolbarPreviousNextFirstLastItemIdentifier, 
         SKDocumentToolbarPreviousItemIdentifier, 
         SKDocumentToolbarPageNumberItemIdentifier, 
         SKDocumentToolbarNextItemIdentifier, 
-        SKDocumentToolbarPreviousNextFirstLastItemIdentifier, 
         SKDocumentToolbarBackForwardItemIdentifier, 
         SKDocumentToolbarScaleItemIdentifier, 
+        SKDocumentToolbarZoomInActualOutItemIdentifier, 
         SKDocumentToolbarZoomInOutItemIdentifier, 
-        SKDocumentToolbarZoomInActualOutItemIdentifier, 
         SKDocumentToolbarZoomActualItemIdentifier, 
         SKDocumentToolbarZoomToFitItemIdentifier, 
         SKDocumentToolbarZoomToSelectionItemIdentifier, 


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

Revision: 3417
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3417&view=rev
Author:   hofman
Date:     2008-02-20 14:54:30 -0800 (Wed, 20 Feb 2008)

Log Message:
-----------
Change order of toolbar items in customization palette. Group according to menus.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-02-20 21:52:32 UTC (rev 3416)
+++ trunk/SKMainWindowController.m	2008-02-20 22:54:30 UTC (rev 3417)
@@ -5239,29 +5239,29 @@
         SKDocumentToolbarPageNumberItemIdentifier, 
         SKDocumentToolbarNextItemIdentifier, 
         SKDocumentToolbarBackForwardItemIdentifier, 
-        SKDocumentToolbarScaleItemIdentifier, 
         SKDocumentToolbarZoomInActualOutItemIdentifier, 
         SKDocumentToolbarZoomInOutItemIdentifier, 
         SKDocumentToolbarZoomActualItemIdentifier, 
         SKDocumentToolbarZoomToFitItemIdentifier, 
         SKDocumentToolbarZoomToSelectionItemIdentifier, 
+        SKDocumentToolbarScaleItemIdentifier, 
+        SKDocumentToolbarDisplayBoxItemIdentifier, 
         SKDocumentToolbarRotateRightItemIdentifier, 
         SKDocumentToolbarRotateLeftItemIdentifier, 
         SKDocumentToolbarRotateLeftRightItemIdentifier, 
         SKDocumentToolbarCropItemIdentifier, 
-        SKDocumentToolbarFullScreenItemIdentifier, 
-        SKDocumentToolbarPresentationItemIdentifier, 
+        SKDocumentToolbarColorSwatchItemIdentifier, 
         SKDocumentToolbarNewTextNoteItemIdentifier, 
         SKDocumentToolbarNewCircleNoteItemIdentifier, 
         SKDocumentToolbarNewMarkupItemIdentifier,
         SKDocumentToolbarNewLineItemIdentifier,
         SKDocumentToolbarNewNoteItemIdentifier, 
+        SKDocumentToolbarToolModeItemIdentifier, 
+        SKDocumentToolbarFullScreenItemIdentifier, 
+        SKDocumentToolbarPresentationItemIdentifier, 
         SKDocumentToolbarContentsPaneItemIdentifier, 
         SKDocumentToolbarNotesPaneItemIdentifier, 
         SKDocumentToolbarInfoItemIdentifier, 
-        SKDocumentToolbarToolModeItemIdentifier, 
-        SKDocumentToolbarDisplayBoxItemIdentifier, 
-        SKDocumentToolbarColorSwatchItemIdentifier, 
         SKDocumentToolbarColorsItemIdentifier, 
         SKDocumentToolbarFontsItemIdentifier, 
         SKDocumentToolbarLinesItemIdentifier, 


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

Revision: 3420
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3420&view=rev
Author:   hofman
Date:     2008-02-21 06:16:39 -0800 (Thu, 21 Feb 2008)

Log Message:
-----------
Select note to add in menus of new note toolbar items.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-02-21 13:39:14 UTC (rev 3419)
+++ trunk/SKMainWindowController.m	2008-02-21 14:16:39 UTC (rev 3420)
@@ -4862,13 +4862,22 @@
     [menuItem setTag:SKAnchoredNote];
     [menuItem setImage:[NSImage imageNamed:@"ToolbarAnchoredNote"]];
     [menuItem setTarget:self];
+    [textNoteButton setMenu:menu forSegment:0];
+    menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""] autorelease];
+    menuItem = [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item title") action:@selector(createNewNote:) keyEquivalent:@""];
+    [menuItem setTag:SKFreeTextNote];
+    [menuItem setImage:[NSImage imageNamed:@"ToolbarTextNote"]];
+    [menuItem setTarget:self];
+    menuItem = [menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu item title") action:@selector(createNewNote:) keyEquivalent:@""];
+    [menuItem setTag:SKAnchoredNote];
+    [menuItem setImage:[NSImage imageNamed:@"ToolbarAnchoredNote"]];
+    [menuItem setTarget:self];
     menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Add Note", @"Toolbar item label") action:NULL keyEquivalent:@""] autorelease];
     [menuItem setSubmenu:menu];
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarNewTextNoteItemIdentifier];
     [item setLabels:NSLocalizedString(@"Add Note", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Add New Note", @"Tool tip message")];
     [textNoteButton makeCapsule];
-    [textNoteButton setMenu:menu forSegment:0];
     [item setViewWithSizes:textNoteButton];
     [item setMenuFormRepresentation:menuItem];
     [toolbarItems setObject:item forKey:SKDocumentToolbarNewTextNoteItemIdentifier];
@@ -4883,13 +4892,22 @@
     [menuItem setTag:SKSquareNote];
     [menuItem setImage:[NSImage imageNamed:@"ToolbarSquareNote"]];
     [menuItem setTarget:self];
+    [circleNoteButton setMenu:menu forSegment:0];
+    menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""] autorelease];
+    menuItem = [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item title") action:@selector(createNewNote:) keyEquivalent:@""];
+    [menuItem setTag:SKCircleNote];
+    [menuItem setImage:[NSImage imageNamed:@"ToolbarCircleNote"]];
+    [menuItem setTarget:self];
+    menuItem = [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item title") action:@selector(createNewNote:) keyEquivalent:@""];
+    [menuItem setTag:SKSquareNote];
+    [menuItem setImage:[NSImage imageNamed:@"ToolbarSquareNote"]];
+    [menuItem setTarget:self];
     menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Add Shape", @"Toolbar item label") action:NULL keyEquivalent:@""] autorelease];
     [menuItem setSubmenu:menu];
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarNewCircleNoteItemIdentifier];
     [item setLabels:NSLocalizedString(@"Add Shape", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Add New Circle or Box", @"Tool tip message")];
     [circleNoteButton makeCapsule];
-    [circleNoteButton setMenu:menu forSegment:0];
     [item setViewWithSizes:circleNoteButton];
     [item setMenuFormRepresentation:menuItem];
     [toolbarItems setObject:item forKey:SKDocumentToolbarNewCircleNoteItemIdentifier];
@@ -4908,13 +4926,26 @@
     [menuItem setTag:SKStrikeOutNote];
     [menuItem setImage:[NSImage imageNamed:@"ToolbarStrikeOutNote"]];
     [menuItem setTarget:self];
+    [markupNoteButton setMenu:menu forSegment:0];
+    menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""] autorelease];
+    menuItem = [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item title") action:@selector(createNewNote:) keyEquivalent:@""];
+    [menuItem setTag:SKHighlightNote];
+    [menuItem setImage:[NSImage imageNamed:@"ToolbarHighlightNote"]];
+    [menuItem setTarget:self];
+    menuItem = [menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item title") action:@selector(createNewNote:) keyEquivalent:@""];
+    [menuItem setTag:SKUnderlineNote];
+    [menuItem setTarget:self];
+    [menuItem setImage:[NSImage imageNamed:@"ToolbarUnderlineNote"]];
+    menuItem = [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu item title") action:@selector(createNewNote:) keyEquivalent:@""];
+    [menuItem setTag:SKStrikeOutNote];
+    [menuItem setImage:[NSImage imageNamed:@"ToolbarStrikeOutNote"]];
+    [menuItem setTarget:self];
     menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Add Markup", @"Toolbar item label") action:NULL keyEquivalent:@""] autorelease];
     [menuItem setSubmenu:menu];
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarNewMarkupItemIdentifier];
     [item setLabels:NSLocalizedString(@"Add Markup", @"Toolbar item label")];
     [item setToolTip:NSLocalizedString(@"Add New Markup", @"Tool tip message")];
     [markupNoteButton makeCapsule];
-    [markupNoteButton setMenu:menu forSegment:0];
     [item setViewWithSizes:markupNoteButton];
     [item setMenuFormRepresentation:menuItem];
     [toolbarItems setObject:item forKey:SKDocumentToolbarNewMarkupItemIdentifier];
@@ -5309,10 +5340,13 @@
         BOOL isMarkup = [menuItem tag] == SKHighlightNote || [menuItem tag] == SKUnderlineNote || [menuItem tag] == SKStrikeOutNote;
         return [self isPresentation] == NO && ([pdfView toolMode] == SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && (isMarkup == NO || [[[pdfView currentSelection] pages] count]) && [pdfView hideNotes] == NO;
     } else if (action == @selector(createNewTextNote:)) {
+        [menuItem setState:[textNoteButton tag] == [menuItem tag] ? NSOnState : NSOffState];
         return [self isPresentation] == NO && ([pdfView toolMode] == SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [pdfView hideNotes] == NO;
     } else if (action == @selector(createNewCircleNote:)) {
+        [menuItem setState:[circleNoteButton tag] == [menuItem tag] ? NSOnState : NSOffState];
         return [self isPresentation] == NO && ([pdfView toolMode] == SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [pdfView hideNotes] == NO;
     } else if (action == @selector(createNewMarkupNote:)) {
+        [menuItem setState:[markupNoteButton tag] == [menuItem tag] ? NSOnState : NSOffState];
         return [self isPresentation] == NO && ([pdfView toolMode] == SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [[[pdfView currentSelection] pages] count] && [pdfView hideNotes] == NO;
     } else if (action == @selector(editNote:)) {
         PDFAnnotation *annotation = [pdfView activeAnnotation];


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

Revision: 3453
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3453&view=rev
Author:   hofman
Date:     2008-02-26 15:20:12 -0800 (Tue, 26 Feb 2008)

Log Message:
-----------
Don't auto resize outline column in note table.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-02-26 21:31:09 UTC (rev 3452)
+++ trunk/SKMainWindowController.m	2008-02-26 23:20:12 UTC (rev 3453)
@@ -397,6 +397,7 @@
     }
     
     [outlineView setAutoresizesOutlineColumn: NO];
+    [noteOutlineView setAutoresizesOutlineColumn: NO];
     [self displayThumbnailView];
     [self displayNoteView];
     


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

Revision: 3455
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3455&view=rev
Author:   hofman
Date:     2008-02-29 14:25:53 -0800 (Fri, 29 Feb 2008)

Log Message:
-----------
Show page size in print panel.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-02-26 23:50:43 UTC (rev 3454)
+++ trunk/SKMainWindowController.m	2008-02-29 22:25:53 UTC (rev 3455)
@@ -3020,7 +3020,7 @@
     [printAccessoryViewController release];
     
     if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4) {
-        [printPanel setOptions:[printPanel options] | NSPrintPanelShowsOrientation | NSPrintPanelShowsScaling];
+        [printPanel setOptions:NSPrintPanelShowsCopies | NSPrintPanelShowsPageRange | NSPrintPanelShowsPaperSize | NSPrintPanelShowsOrientation | NSPrintPanelShowsScaling | NSPrintPanelShowsPreview];
         
         Class printAccessoryControllerClass = NSClassFromString(@"SKPrintAccessoryController");
         if (printAccessoryControllerClass == Nil) {


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

Revision: 3465
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3465&view=rev
Author:   hofman
Date:     2008-03-11 08:59:54 -0700 (Tue, 11 Mar 2008)

Log Message:
-----------
Make sure the pdf view shows the crop box after cropping.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-03-11 14:35:14 UTC (rev 3464)
+++ trunk/SKMainWindowController.m	2008-03-11 15:59:54 UTC (rev 3465)
@@ -1796,6 +1796,9 @@
     
     [[NSNotificationCenter defaultCenter] postNotificationName:SKPDFDocumentPageBoundsDidChangeNotification 
             object:[pdfView document] userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"crop", @"action", page, @"page", nil]];
+    
+    // make sure we show the crop box
+    [pdfView setDisplayBox:kPDFDisplayBoxCropBox];
 }
 
 - (IBAction)crop:(id)sender {
@@ -1827,6 +1830,8 @@
     [[NSNotificationCenter defaultCenter] postNotificationName:SKPDFDocumentPageBoundsDidChangeNotification 
             object:[pdfView document] userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"crop", @"action", nil]];
     
+    // make sure we show the crop box
+    [pdfView setDisplayBox:kPDFDisplayBoxCropBox];
     // layout after cropping when you're in the middle of a document can lose the current page
     [pdfView goToPage:currentPage];
     [[pdfView documentView] scrollRectToVisible:[pdfView convertRect:[pdfView convertRect:visibleRect fromPage:currentPage] toView:[pdfView documentView]]];


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

Revision: 3484
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3484&view=rev
Author:   hofman
Date:     2008-03-14 18:05:05 -0700 (Fri, 14 Mar 2008)

Log Message:
-----------
redo search when changing search options.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-03-14 18:44:37 UTC (rev 3483)
+++ trunk/SKMainWindowController.m	2008-03-15 01:05:05 UTC (rev 3484)
@@ -2102,10 +2102,14 @@
 
 - (IBAction)toggleCaseInsensitiveSearch:(id)sender {
     caseInsensitiveSearch = NO == caseInsensitiveSearch;
+    if ([[searchField stringValue] length])
+        [self search:searchField];
 }
 
 - (IBAction)toggleWholeWordSearch:(id)sender {
     wholeWordSearch = NO == wholeWordSearch;
+    if ([[searchField stringValue] length])
+        [self search:searchField];
 }
 
 - (IBAction)toggleLeftSidePane:(id)sender {


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

Revision: 3485
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3485&view=rev
Author:   hofman
Date:     2008-03-14 18:30:46 -0700 (Fri, 14 Mar 2008)

Log Message:
-----------
Reset cursor rects after double clicking divider of split view, to correct a Leopard bug.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-03-15 01:05:05 UTC (rev 3484)
+++ trunk/SKMainWindowController.m	2008-03-15 01:30:46 UTC (rev 3485)
@@ -2154,6 +2154,7 @@
         [leftSideContentView setFrame:sideFrame];
         [pdfSplitView setFrame:pdfFrame];
         [splitView setNeedsDisplay:YES];
+        [[self window] invalidateCursorRectsForView:splitView];
         
         [self splitViewDidResizeSubviews:nil];
     }
@@ -2203,6 +2204,7 @@
         [rightSideContentView setFrame:sideFrame];
         [pdfSplitView setFrame:pdfFrame];
         [splitView setNeedsDisplay:YES];
+        [[self window] invalidateCursorRectsForView:splitView];
         
         [self splitViewDidResizeSubviews:nil];
     }
@@ -5597,6 +5599,7 @@
         [pdfSplitView setNeedsDisplay:YES];
         [secondaryPdfView layoutDocumentView];
         [secondaryPdfView setNeedsDisplay:YES];
+        [[self window] invalidateCursorRectsForView:sender];
     }
 }
 


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

Revision: 3488
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3488&view=rev
Author:   hofman
Date:     2008-03-15 11:13:35 -0700 (Sat, 15 Mar 2008)

Log Message:
-----------
Scroll to note using command-arrow in note table.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-03-15 14:38:12 UTC (rev 3487)
+++ trunk/SKMainWindowController.m	2008-03-15 18:13:35 UTC (rev 3488)
@@ -4097,8 +4097,10 @@
 
 - (void)outlineViewCommandKeyPressedDuringNavigation:(NSOutlineView *)ov {
     PDFAnnotation *annotation = [[self selectedNotes] lastObject];
-    if (annotation)
+    if (annotation) {
+        [pdfView scrollAnnotationToVisible:annotation];
         [pdfView setActiveAnnotation:annotation];
+    }
 }
 
 #pragma mark NSTableView delegate protocol


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

Revision: 3512
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3512&view=rev
Author:   hofman
Date:     2008-03-20 06:33:44 -0700 (Thu, 20 Mar 2008)

Log Message:
-----------
Set print accessory controller to nil. Just to be sure, because it should already be nil at this point.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-03-20 13:04:07 UTC (rev 3511)
+++ trunk/SKMainWindowController.m	2008-03-20 13:33:44 UTC (rev 3512)
@@ -3052,6 +3052,7 @@
     NSPrintPanel *printPanel = [printOperation printPanel];
     
     [printAccessoryViewController release];
+    printAccessoryViewController = nil;
     
     if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4) {
         [printPanel setOptions:NSPrintPanelShowsCopies | NSPrintPanelShowsPageRange | NSPrintPanelShowsPaperSize | NSPrintPanelShowsOrientation | NSPrintPanelShowsScaling | NSPrintPanelShowsPreview];


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

Revision: 3522
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3522&view=rev
Author:   hofman
Date:     2008-03-21 05:44:28 -0700 (Fri, 21 Mar 2008)

Log Message:
-----------
Always validate toolbar items, as they're buttons. Instead disable segments if necessary.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-03-20 21:01:18 UTC (rev 3521)
+++ trunk/SKMainWindowController.m	2008-03-21 12:44:28 UTC (rev 3522)
@@ -5339,41 +5339,25 @@
 
 #pragma mark UI validation
 
-- (BOOL)validateToolbarItem:(NSToolbarItem *) toolbarItem {
+- (BOOL)validateToolbarItem:(NSToolbarItem *)toolbarItem {
     NSString *identifier = [toolbarItem itemIdentifier];
-    if ([identifier isEqualToString:SKDocumentToolbarPreviousItemIdentifier]) {
-        return [pdfView canGoToPreviousPage];
-    } else if ([identifier isEqualToString:SKDocumentToolbarNextItemIdentifier]) {
-        return [pdfView canGoToNextPage];
-    } else if ([identifier isEqualToString:SKDocumentToolbarZoomToSelectionItemIdentifier]) {
-        return NSIsEmptyRect([pdfView currentSelectionRect]) == NO;
+    if ([identifier isEqualToString:SKDocumentToolbarZoomToSelectionItemIdentifier]) {
+        [(NSSegmentedControl *)[toolbarItem view] setEnabled:NSIsEmptyRect([pdfView currentSelectionRect]) == NO forSegment:0];
     } else if ([identifier isEqualToString:SKDocumentToolbarZoomToFitItemIdentifier]) {
-        return [pdfView autoScales] == NO;
-    } else if ([identifier isEqualToString:SKDocumentToolbarZoomActualItemIdentifier]) {
-        return fabsf([pdfView scaleFactor] - 1.0) > 0.01;
-    } else if ([identifier isEqualToString:SKDocumentToolbarCropItemIdentifier]) {
-        return YES;
-    } else if ([identifier isEqualToString:SKDocumentToolbarFullScreenItemIdentifier]) {
-        return YES;
-    } else if ([identifier isEqualToString:SKDocumentToolbarPresentationItemIdentifier]) {
-        return YES;
+        [(NSSegmentedControl *)[toolbarItem view] setEnabled:[pdfView autoScales] == NO forSegment:0];
     } else if ([identifier isEqualToString:SKDocumentToolbarNewTextNoteItemIdentifier] || [identifier isEqualToString:SKDocumentToolbarNewCircleNoteItemIdentifier] || [identifier isEqualToString:SKDocumentToolbarNewLineItemIdentifier]) {
-        return ([pdfView toolMode] == SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [pdfView hideNotes] == NO;
+        BOOL enabled = ([pdfView toolMode] == SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [pdfView hideNotes] == NO;
+        [(NSSegmentedControl *)[toolbarItem view] setEnabled:enabled forSegment:0];
     } else if ([identifier isEqualToString:SKDocumentToolbarNewMarkupItemIdentifier]) {
-        return ([pdfView toolMode] == SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [[[pdfView currentSelection] pages] count] && [pdfView hideNotes] == NO;
+        BOOL enabled = ([pdfView toolMode] == SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [[[pdfView currentSelection] pages] count] && [pdfView hideNotes] == NO;
+        [(NSSegmentedControl *)[toolbarItem view] setEnabled:enabled forSegment:0];
     } else if ([identifier isEqualToString:SKDocumentToolbarNewNoteItemIdentifier]) {
-        if (([pdfView toolMode] != SKTextToolMode && [pdfView toolMode] != SKNoteToolMode) || [pdfView hideNotes])
-            return NO;
-        BOOL enabled = [[[pdfView currentSelection] pages] count] > 0;
+        BOOL enabled = ([pdfView toolMode] == SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [[[pdfView currentSelection] pages] count] && [pdfView hideNotes] == NO;
         [noteButton setEnabled:enabled forSegment:SKHighlightNote];
         [noteButton setEnabled:enabled forSegment:SKUnderlineNote];
         [noteButton setEnabled:enabled forSegment:SKStrikeOutNote];
-        return YES;
-    } else if ([identifier isEqualToString:SKDocumentToolbarInfoItemIdentifier]) {
-        return YES;
-    } else {
-        return YES;
     }
+    return YES;
 }
 
 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem {


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

Revision: 3525
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3525&view=rev
Author:   hofman
Date:     2008-03-21 17:38:44 -0700 (Fri, 21 Mar 2008)

Log Message:
-----------
Fully enable toolbar items for the customization palette. Don't copy items that are inserted, as the returned item must always be the same according to the docs.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-03-21 23:18:54 UTC (rev 3524)
+++ trunk/SKMainWindowController.m	2008-03-22 00:38:44 UTC (rev 3525)
@@ -5241,16 +5241,23 @@
     [[self window] setToolbar:toolbar];
 }
 
-- (NSToolbarItem *) toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdent willBeInsertedIntoToolbar:(BOOL) willBeInserted {
+- (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdent willBeInsertedIntoToolbar:(BOOL)willBeInserted {
 
     SKToolbarItem *item = [toolbarItems objectForKey:itemIdent];
-    SKToolbarItem *newItem = [[item copy] autorelease];
-    // the view should not be copied
-    if ([item view] && willBeInserted) {
-        [newItem setView:[item view]];
-        [newItem setDelegate:self];
+    
+    if (willBeInserted == NO) {
+        item = [[item copy] autorelease];
+        [item setEnabled:YES];
+        if ([[item view] respondsToSelector:@selector(setEnabled:)])
+            [(NSControl *)[item view] setEnabled:YES];
+        if ([[item view] respondsToSelector:@selector(setEnabled:forSegment:)]) {
+            unsigned i, count = [(NSSegmentedControl *)[item view] segmentCount];
+            for (i = 0; i < count; i++)
+                [(NSSegmentedControl *)[item view] setEnabled:YES forSegment:i];
+        }
     }
-    return newItem;
+    
+    return item;
 }
 
 - (void)toolbarWillAddItem:(NSNotification *)notification {


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

Revision: 3529
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3529&view=rev
Author:   hofman
Date:     2008-03-22 07:15:42 -0700 (Sat, 22 Mar 2008)

Log Message:
-----------
Disable inserted toolbar items when running customization palette.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-03-22 14:10:18 UTC (rev 3528)
+++ trunk/SKMainWindowController.m	2008-03-22 14:15:42 UTC (rev 3529)
@@ -5338,7 +5338,7 @@
         [noteButton setEnabled:enabled forSegment:SKUnderlineNote];
         [noteButton setEnabled:enabled forSegment:SKStrikeOutNote];
     }
-    return YES;
+    return NO == [[mainWindow toolbar] customizationPaletteIsRunning];
 }
 
 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem {


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

Revision: 3532
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3532&view=rev
Author:   hofman
Date:     2008-03-22 10:28:47 -0700 (Sat, 22 Mar 2008)

Log Message:
-----------
Small improvement to toolbar item validation. Move soem code to segmentedControl category.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-03-22 17:19:04 UTC (rev 3531)
+++ trunk/SKMainWindowController.m	2008-03-22 17:28:47 UTC (rev 3532)
@@ -182,6 +182,12 @@
     return [[self cell] tagForSegment:[self selectedSegment]];
 }
 
+- (void)setEnabledForAllSegments:(BOOL)enabled  {
+    unsigned i, count = [self segmentCount];
+    for (i = 0; i < count; i++)
+        [self setEnabled:enabled forSegment:i];
+}
+
 @end
 
 @interface NSResponder (SKExtensions)
@@ -5247,11 +5253,8 @@
         [item setEnabled:YES];
         if ([[item view] respondsToSelector:@selector(setEnabled:)])
             [(NSControl *)[item view] setEnabled:YES];
-        if ([[item view] respondsToSelector:@selector(setEnabled:forSegment:)]) {
-            unsigned i, count = [(NSSegmentedControl *)[item view] segmentCount];
-            for (i = 0; i < count; i++)
-                [(NSSegmentedControl *)[item view] setEnabled:YES forSegment:i];
-        }
+        if ([[item view] respondsToSelector:@selector(setEnabledForAllSegments:)])
+            [(NSSegmentedControl *)[item view] setEnabledForAllSegments:YES];
     }
     
     return item;
@@ -5313,6 +5316,7 @@
 - (BOOL)validateToolbarItem:(NSToolbarItem *)toolbarItem {
     NSString *identifier = [toolbarItem itemIdentifier];
     BOOL noPalette = NO == [[mainWindow toolbar] customizationPaletteIsRunning];
+    
     if ([identifier isEqualToString:SKDocumentToolbarZoomActualItemIdentifier]) {
         return noPalette && fabsf([pdfView scaleFactor] - 1.0 ) > 0.01;
     } else if ([identifier isEqualToString:SKDocumentToolbarZoomToFitItemIdentifier]) {
@@ -5328,6 +5332,7 @@
         [noteButton setEnabled:enabled forSegment:SKHighlightNote];
         [noteButton setEnabled:enabled forSegment:SKUnderlineNote];
         [noteButton setEnabled:enabled forSegment:SKStrikeOutNote];
+        return noPalette && ([pdfView toolMode] == SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [pdfView hideNotes] == NO;
     }
     return noPalette;
 }


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

Revision: 3576
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3576&view=rev
Author:   hofman
Date:     2008-03-29 04:18:14 -0700 (Sat, 29 Mar 2008)

Log Message:
-----------
Copy text for all selected notes.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-03-29 04:05:25 UTC (rev 3575)
+++ trunk/SKMainWindowController.m	2008-03-29 11:18:14 UTC (rev 3576)
@@ -3876,29 +3876,49 @@
 
 - (void)outlineView:(NSOutlineView *)ov copyItems:(NSArray *)items  {
     if ([ov isEqual:noteOutlineView] && [items count]) {
-        NSEnumerator *itemEnum = [[self noteItems:items] objectEnumerator];
-        PDFAnnotation *item = nil;
-        id firstItem = [items objectAtIndex:0];
-        while (item = [itemEnum nextObject])
-            if ([item isMovable]) break;
         NSPasteboard *pboard = [NSPasteboard generalPasteboard];
         NSMutableArray *types = [NSMutableArray array];
-        NSData *noteData = item ? [NSKeyedArchiver archivedDataWithRootObject:[item dictionaryValue]] : nil;
-        NSAttributedString *attrString = [firstItem type] ? nil : [(SKNoteText *)firstItem string];
-        NSString *string = [firstItem type] ? [firstItem string] : [attrString string];
+        NSData *noteData = nil;
+        NSMutableAttributedString *attrString = [[items valueForKey:@"type"] containsObject:[NSNull null]] ? [[[NSMutableAttributedString alloc] init] autorelease] : nil;
+        NSMutableString *string = [NSMutableString string];
+        NSEnumerator *itemEnum;
+        id item;
+        
+        itemEnum = [[self noteItems:items] objectEnumerator];
+        while (item = [itemEnum nextObject]) {
+            if ([item isMovable]) {
+                noteData = [NSKeyedArchiver archivedDataWithRootObject:[item dictionaryValue]];
+                [types addObject:SKSkimNotePboardType];
+                break;
+            }
+        }
+        itemEnum = [items objectEnumerator];
+        while (item = [itemEnum nextObject]) {
+            if ([string length])
+                [string appendString:@"\n\n"];
+            if ([attrString length])
+                [attrString replaceCharactersInRange:NSMakeRange([attrString length], 0) withString:@"\n\n"];
+            if ([item type]) {
+                [string appendString:[item string]];
+                [attrString replaceCharactersInRange:NSMakeRange([attrString length], 0) withString:[item string]];
+            } else {
+                [string appendString:[[(SKNoteText *)item string] string]];
+                [attrString appendAttributedString:[(SKNoteText *)item string]];
+            }
+        }
         if (noteData)
             [types addObject:SKSkimNotePboardType];
-        if (string)
+        if ([string length])
             [types addObject:NSStringPboardType];
-        if (attrString)
+        if ([attrString length])
             [types addObject:NSRTFPboardType];
         if ([types count])
             [pboard declareTypes:types owner:nil];
         if (noteData)
             [pboard setData:noteData forType:SKSkimNotePboardType];
-        if (string)
+        if ([string length])
             [pboard setString:string forType:NSStringPboardType];
-        if (attrString)
+        if ([attrString length])
             [pboard setData:[attrString RTFFromRange:NSMakeRange(0, [string length]) documentAttributes:nil] forType:NSRTFPboardType];
     }
 }


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

Revision: 3596
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3596&view=rev
Author:   hofman
Date:     2008-04-02 07:27:52 -0700 (Wed, 02 Apr 2008)

Log Message:
-----------
Use pointer equality to compare notes used as keys.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-04-02 12:05:02 UTC (rev 3595)
+++ trunk/SKMainWindowController.m	2008-04-02 14:27:52 UTC (rev 3596)
@@ -3683,7 +3683,7 @@
                 NSUndoManager *undoManager = [[self document] undoManager];
                 if (undoGroupOldPropertiesPerNote == nil) {
                     // We haven't recorded changes for any notes at all since the last undo manager checkpoint. Get ready to start collecting them. We don't want to copy the PDFAnnotations though.
-                    undoGroupOldPropertiesPerNote = (NSMutableDictionary *)CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+                    undoGroupOldPropertiesPerNote = (NSMutableDictionary *)CFDictionaryCreateMutable(NULL, 0, &SKPointerEqualObjectDictionaryKeyCallbacks, &kCFTypeDictionaryValueCallBacks);
                     // Register an undo operation for any note property changes that are going to be coalesced between now and the next invocation of -observeUndoManagerCheckpoint:.
                     [undoManager registerUndoWithTarget:self selector:@selector(setNoteProperties:) object:undoGroupOldPropertiesPerNote];
                 }


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

Revision: 3598
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3598&view=rev
Author:   hofman
Date:     2008-04-02 08:24:16 -0700 (Wed, 02 Apr 2008)

Log Message:
-----------
Add remark.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-04-02 14:32:43 UTC (rev 3597)
+++ trunk/SKMainWindowController.m	2008-04-02 15:24:16 UTC (rev 3598)
@@ -3693,6 +3693,7 @@
                 if (oldNoteProperties == nil) {
                     // We have to create a dictionary to hold old values for the changed note
                     oldNoteProperties = [[NSMutableDictionary alloc] init];
+                    // -setValue:forKey: copies, even if the callback doesn't, so we need to use CF functions
                     CFDictionarySetValue((CFMutableDictionaryRef)undoGroupOldPropertiesPerNote, note, oldNoteProperties);
                     [oldNoteProperties release];
                 }


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

Revision: 3610
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3610&view=rev
Author:   hofman
Date:     2008-04-03 11:07:42 -0700 (Thu, 03 Apr 2008)

Log Message:
-----------
Perform action of outline item when it does not have a destination. Leopard only.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-04-03 17:51:36 UTC (rev 3609)
+++ trunk/SKMainWindowController.m	2008-04-03 18:07:42 UTC (rev 3610)
@@ -1427,8 +1427,13 @@
 }
 
 - (void)goToSelectedOutlineItem {
+    PDFOutline *outlineItem = [outlineView itemAtRow: [outlineView selectedRow]];
+    PDFDestination *dest = [outlineItem destination];
     updatingOutlineSelection = YES;
-    [self goToDestination: [[outlineView itemAtRow: [outlineView selectedRow]] destination]];
+    if (dest)
+        [self goToDestination:dest];
+    else if ([outlineItem respondsToSelector:@selector(action)] && [outlineItem action])
+        [pdfView performAction:[outlineItem action]];
     updatingOutlineSelection = NO;
 }
 
@@ -3813,9 +3818,7 @@
 - (void)outlineViewSelectionDidChange:(NSNotification *)notification{
 	// Get the destination associated with the search result list. Tell the PDFView to go there.
 	if ([[notification object] isEqual:outlineView] && (updatingOutlineSelection == NO)){
-        updatingOutlineSelection = YES;
-		[self goToDestination: [[outlineView itemAtRow: [outlineView selectedRow]] destination]];
-        updatingOutlineSelection = NO;
+        [self goToSelectedOutlineItem];
         if ([self isPresentation] && [[NSUserDefaults standardUserDefaults] boolForKey:SKAutoHidePresentationContentsKey])
             [self hideLeftSideWindow];
     }


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

Revision: 3619
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3619&view=rev
Author:   hofman
Date:     2008-04-04 10:33:59 -0700 (Fri, 04 Apr 2008)

Log Message:
-----------
Always update UI when a note property changes.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-04-04 17:06:40 UTC (rev 3618)
+++ trunk/SKMainWindowController.m	2008-04-04 17:33:59 UTC (rev 3619)
@@ -3560,21 +3560,21 @@
         
     } else if (context == SKPDFAnnotationPropertiesObservationContext) {
         
-        // The value of some note's property has changed. Don't waste memory by recording undo operations affecting notes that would be removed during undo anyway. In Sketch this check matters when you use a creation tool to create a new note and then drag the mouse to resize it; there's no reason to record a change of "bounds" in that situation.
+        // The value of some note's property has changed
         PDFAnnotation *note = (PDFAnnotation *)object;
-        if (NO == [undoGroupInsertedNotes containsObject:note]) {
-
-            // Ignore changes that aren't really changes.
-            // How much processor time does this memory optimization cost? We don't know, because we haven't measured it. The use of NSKeyValueObservingOptionNew in -startObservingNotes:, which makes NSKeyValueChangeNewKey entries appear in change dictionaries, definitely costs something when KVO notifications are sent (it costs virtually nothing at observer registration time). Regardless, it's probably a good idea to do simple memory optimizations like this as they're discovered and debug just enough to confirm that they're saving the expected memory (and not introducing bugs). Later on it will be easier to test for good responsiveness and sample to hunt down processor time problems than it will be to figure out where all the darn memory went when your app turns out to be notably RAM-hungry (and therefore slowing down _other_ apps on your user's computers too, if the problem is bad enough to cause paging).
-            // Is this a premature optimization? No. Leaving out this very simple check, because we're worried about the processor time cost of using NSKeyValueChangeNewKey, would be a premature optimization.
-            id newValue = [change objectForKey:NSKeyValueChangeNewKey];
-            id oldValue = [change objectForKey:NSKeyValueChangeOldKey];
-            // We should be adding undo for nil values also. I'm not sure if KVO does this automatically. Note that -setValuesForKeysWithDictionary: converts NSNull back to nil.
-            if (newValue == nil) newValue = [NSNull null];
-            if (oldValue == nil) oldValue = [NSNull null];
-            // All values are suppsed to be true value objects that should be compared with isEqual:.
-            if ([newValue isEqual:oldValue] == NO) {
-
+        // Ignore changes that aren't really changes.
+        // How much processor time does this memory optimization cost? We don't know, because we haven't measured it. The use of NSKeyValueObservingOptionNew in -startObservingNotes:, which makes NSKeyValueChangeNewKey entries appear in change dictionaries, definitely costs something when KVO notifications are sent (it costs virtually nothing at observer registration time). Regardless, it's probably a good idea to do simple memory optimizations like this as they're discovered and debug just enough to confirm that they're saving the expected memory (and not introducing bugs). Later on it will be easier to test for good responsiveness and sample to hunt down processor time problems than it will be to figure out where all the darn memory went when your app turns out to be notably RAM-hungry (and therefore slowing down _other_ apps on your user's computers too, if the problem is bad enough to cause paging).
+        // Is this a premature optimization? No. Leaving out this very simple check, because we're worried about the processor time cost of using NSKeyValueChangeNewKey, would be a premature optimization.
+        id newValue = [change objectForKey:NSKeyValueChangeNewKey];
+        id oldValue = [change objectForKey:NSKeyValueChangeOldKey];
+        // We should be adding undo for nil values also. I'm not sure if KVO does this automatically. Note that -setValuesForKeysWithDictionary: converts NSNull back to nil.
+        if (newValue == nil) newValue = [NSNull null];
+        if (oldValue == nil) oldValue = [NSNull null];
+        // All values are suppsed to be true value objects that should be compared with isEqual:
+        if ([newValue isEqual:oldValue] == NO) {
+            
+            // Don't waste memory by recording undo operations affecting notes that would be removed during undo anyway. In Sketch this check matters when you use a creation tool to create a new note and then drag the mouse to resize it; there's no reason to record a change of "bounds" in that situation
+            if (NO == [undoGroupInsertedNotes containsObject:note]) {
                 // Is this the first observed note change in the current undo group?
                 NSUndoManager *undoManager = [[self document] undoManager];
                 if (undoGroupOldPropertiesPerNote == nil) {
@@ -3602,56 +3602,58 @@
                 if ([undoManager isUndoing] == NO && [undoManager isRedoing] == NO)
                     [undoManager setActionName:NSLocalizedString(@"Edit Note", @"Undo action name")];
                 
-                // Update the UI
-                
-                PDFPage *page = [note page];
-                NSRect oldRect = NSZeroRect;
-                if ([keyPath isEqualToString:SKPDFAnnotationBoundsKey] && [oldValue isEqual:[NSNull null]] == NO)
-                    oldRect = [note displayRectForBounds:[oldValue rectValue]];
-                
-                [self updateThumbnailAtPageIndex:[note pageIndex]];
-                
-                NSEnumerator *snapshotEnum = [snapshots objectEnumerator];
-                SKSnapshotWindowController *wc;
-                while (wc = [snapshotEnum nextObject]) {
-                    if ([wc isPageVisible:[note page]]) {
-                        [self snapshotNeedsUpdate:wc];
-                        [wc setNeedsDisplayForAnnotation:note onPage:page];
-                        if (NSIsEmptyRect(oldRect) == NO)
-                            [wc setNeedsDisplayInRect:oldRect ofPage:page];
-                    }
+            }
+            
+            // Update the UI, we should always do that unless the value did not really change
+            
+            PDFPage *page = [note page];
+            NSRect oldRect = NSZeroRect;
+            if ([keyPath isEqualToString:SKPDFAnnotationBoundsKey] && [oldValue isEqual:[NSNull null]] == NO)
+                oldRect = [note displayRectForBounds:[oldValue rectValue]];
+            
+            [self updateThumbnailAtPageIndex:[note pageIndex]];
+            
+            NSEnumerator *snapshotEnum = [snapshots objectEnumerator];
+            SKSnapshotWindowController *wc;
+            while (wc = [snapshotEnum nextObject]) {
+                if ([wc isPageVisible:[note page]]) {
+                    [self snapshotNeedsUpdate:wc];
+                    [wc setNeedsDisplayForAnnotation:note onPage:page];
+                    if (NSIsEmptyRect(oldRect) == NO)
+                        [wc setNeedsDisplayInRect:oldRect ofPage:page];
                 }
-                
-                [pdfView setNeedsDisplayForAnnotation:note];
-                [secondaryPdfView setNeedsDisplayForAnnotation:note onPage:page];
-                if (NSIsEmptyRect(oldRect) == NO) {
-                    [pdfView setNeedsDisplayInRect:oldRect ofPage:page];
-                    [secondaryPdfView setNeedsDisplayInRect:oldRect ofPage:page];
+            }
+            
+            [pdfView setNeedsDisplayForAnnotation:note];
+            [secondaryPdfView setNeedsDisplayForAnnotation:note onPage:page];
+            if (NSIsEmptyRect(oldRect) == NO) {
+                [pdfView setNeedsDisplayInRect:oldRect ofPage:page];
+                [secondaryPdfView setNeedsDisplayInRect:oldRect ofPage:page];
+            }
+            if ([[note type] isEqualToString:SKNoteString] && [keyPath isEqualToString:SKPDFAnnotationBoundsKey])
+                [pdfView resetHoverRects];
+            
+            [noteArrayController rearrangeObjects];
+            [noteOutlineView reloadData];
+            
+            // update the various panels if necessary
+            if ([[self window] isMainWindow] && [note isEqual:[pdfView activeAnnotation]]) {
+                if (updatingColor == NO && ([keyPath isEqualToString:SKPDFAnnotationColorKey] || [keyPath isEqualToString:SKPDFAnnotationInteriorColorKey])) {
+                    updatingColor = YES;
+                    [[NSColorPanel sharedColorPanel] setColor:[note color]];
+                    updatingColor = NO;
                 }
-                if ([[note type] isEqualToString:SKNoteString] && [keyPath isEqualToString:SKPDFAnnotationBoundsKey])
-                    [pdfView resetHoverRects];
-                
-                [noteArrayController rearrangeObjects];
-                [noteOutlineView reloadData];
-                if ([[self window] isMainWindow] && [note isEqual:[pdfView activeAnnotation]]) {
-                    if (updatingColor == NO && ([keyPath isEqualToString:SKPDFAnnotationColorKey] || [keyPath isEqualToString:SKPDFAnnotationInteriorColorKey])) {
-                        updatingColor = YES;
-                        [[NSColorPanel sharedColorPanel] setColor:[note color]];
-                        updatingColor = NO;
-                    }
-                    if (updatingFont == NO && ([keyPath isEqualToString:SKPDFAnnotationFontKey])) {
-                        updatingFont = YES;
-                        [[NSFontManager sharedFontManager] setSelectedFont:[(PDFAnnotationFreeText *)note font] isMultiple:NO];
-                        updatingFont = NO;
-                    }
-                    if (updatingLine == NO && ([keyPath isEqualToString:SKPDFAnnotationBorderKey] || [keyPath isEqualToString:SKPDFAnnotationStartLineStyleKey] || [keyPath isEqualToString:SKPDFAnnotationEndLineStyleKey])) {
-                        updatingLine = YES;
-                        [[SKLineInspector sharedLineInspector] setAnnotationStyle:note];
-                        updatingLine = NO;
-                    }
+                if (updatingFont == NO && ([keyPath isEqualToString:SKPDFAnnotationFontKey])) {
+                    updatingFont = YES;
+                    [[NSFontManager sharedFontManager] setSelectedFont:[(PDFAnnotationFreeText *)note font] isMultiple:NO];
+                    updatingFont = NO;
                 }
+                if (updatingLine == NO && ([keyPath isEqualToString:SKPDFAnnotationBorderKey] || [keyPath isEqualToString:SKPDFAnnotationStartLineStyleKey] || [keyPath isEqualToString:SKPDFAnnotationEndLineStyleKey])) {
+                    updatingLine = YES;
+                    [[SKLineInspector sharedLineInspector] setAnnotationStyle:note];
+                    updatingLine = NO;
+                }
             }
-
         }
 
     } else {


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

Revision: 3631
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3631&view=rev
Author:   hofman
Date:     2008-04-05 05:10:40 -0700 (Sat, 05 Apr 2008)

Log Message:
-----------
Use correct key for text in note table.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-04-05 00:35:09 UTC (rev 3630)
+++ trunk/SKMainWindowController.m	2008-04-05 12:10:40 UTC (rev 3631)
@@ -3746,7 +3746,7 @@
     } else if ([ov isEqual:noteOutlineView]) {
         NSString *tcID = [tableColumn  identifier];
         if ([tcID isEqualToString:@"note"]) {
-            return [item type] ? (id)[item text] : (id)[item string];
+            return [item type] ? (id)[item string] : (id)[item text];
         } else if([tcID isEqualToString:@"type"]) {
             return [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:item == [pdfView activeAnnotation]], @"active", [item type], @"type", nil];
         } else if([tcID isEqualToString:@"page"]) {


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

Revision: 3655
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3655&view=rev
Author:   hofman
Date:     2008-04-06 09:48:41 -0700 (Sun, 06 Apr 2008)

Log Message:
-----------
Avoid resetting thumbnails too many times after loading the window.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-04-06 16:38:59 UTC (rev 3654)
+++ trunk/SKMainWindowController.m	2008-04-06 16:48:41 UTC (rev 3655)
@@ -3288,7 +3288,8 @@
 
 - (void)handleDisplayBoxChangedNotification:(NSNotification *)notification {
     [displayBoxButton selectSegmentWithTag:[pdfView displayBox]];
-    [self resetThumbnails];
+    if (notification) // no need to do this when loading the document
+        [self resetThumbnails];
 }
 
 - (void)handleDisplayModeChangedNotification:(NSNotification *)notification {


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

Revision: 3675
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3675&view=rev
Author:   hofman
Date:     2008-04-08 07:59:23 -0700 (Tue, 08 Apr 2008)

Log Message:
-----------
Avoid some unnecessary actions.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-04-08 14:35:13 UTC (rev 3674)
+++ trunk/SKMainWindowController.m	2008-04-08 14:59:23 UTC (rev 3675)
@@ -1155,31 +1155,34 @@
         [undoGroupInsertedNotes unionSet:added];
     }
     
-    NSEnumerator *wcEnum = [[[self document] windowControllers] objectEnumerator];
-    NSWindowController *wc = [wcEnum nextObject];
-    
-    while (wc = [wcEnum nextObject]) {
-        if ([wc isKindOfClass:[SKNoteWindowController class]] && [removed containsObject:[(SKNoteWindowController *)wc note]])
-            [[wc window] orderOut:self];
+    if ([removed count]) {
+        NSEnumerator *wcEnum = [[[self document] windowControllers] objectEnumerator];
+        NSWindowController *wc = [wcEnum nextObject];
+        
+        while (wc = [wcEnum nextObject]) {
+            if ([wc isKindOfClass:[SKNoteWindowController class]] && [removed containsObject:[(SKNoteWindowController *)wc note]])
+                [[wc window] orderOut:self];
+        }
+        
+        NSEnumerator *noteEnum = [removed objectEnumerator];
+        PDFAnnotation *note;
+        
+        while (note = [noteEnum nextObject]) {
+            if ([[note texts] count])
+                CFDictionaryRemoveValue(rowHeights, (const void *)[[note texts] lastObject]);
+            CFDictionaryRemoveValue(rowHeights, (const void *)note);
+        }
+        
+        // Stop observing the removed notes so that
+        [self stopObservingNotes:[removed allObjects]];
     }
-    
-    NSEnumerator *noteEnum = [removed objectEnumerator];
-    PDFAnnotation *note;
-    
-    while (note = [noteEnum nextObject]) {
-        if ([[note texts] count])
-            CFDictionaryRemoveValue(rowHeights, (const void *)[[note texts] lastObject]);
-        CFDictionaryRemoveValue(rowHeights, (const void *)note);
-    }
-    
-    // Stop observing the removed notes so that
-    [self stopObservingNotes:[removed allObjects]];
     [removed release];
     
     [notes setArray:notes];
     
     // Start observing the added notes so that, when they're changed, we can record undo operations.
-    [self startObservingNotes:[added allObjects]];
+    if ([added count])
+        [self startObservingNotes:[added allObjects]];
     [added release];
     
     [noteOutlineView reloadData];
@@ -1274,7 +1277,8 @@
     [removed minusSet:new];
     [new release];
     
-    [dirtySnapshots removeObjectsInArray:[removed allObjects]];
+    if ([removed count])
+        [dirtySnapshots removeObjectsInArray:[removed allObjects]];
     [removed release];
     
     [snapshots setArray:snapshots];


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

Revision: 3690
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3690&view=rev
Author:   hofman
Date:     2008-04-09 10:25:40 -0700 (Wed, 09 Apr 2008)

Log Message:
-----------
Replace some macros by static string constants.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-04-09 16:55:10 UTC (rev 3689)
+++ trunk/SKMainWindowController.m	2008-04-09 17:25:40 UTC (rev 3690)
@@ -91,23 +91,20 @@
 #import "SKCFCallbacks.h"
 #import "NSSegmentedControl_SKExtensions.h"
 
-#define WINDOW_X_DELTA              0.0
-#define WINDOW_Y_DELTA              70.0
+static NSString *SKMainWindowFrameKey = @"windowFrame";
+static NSString *SKMainWindowLeftSidePaneWidthKey = @"leftSidePaneWidth";
+static NSString *SKMainWindowRightSidePaneWidthKey = @"rightSidePaneWidth";
+static NSString *SKMainWindowScaleFactorKey = @"scaleFactor";
+static NSString *SKMainWindowAutoScalesKey = @"autoScales";
+static NSString *SKMainWindowDisplayPageBreaksKey = @"displaysPageBreaks";
+static NSString *SKMainWindowDisplayAsBookKey = @"displaysAsBook"; 
+static NSString *SKMainWindowDisplayModeKey = @"displayMode";
+static NSString *SKMainWindowDisplayBoxKey = @"displayBox" ;
+static NSString *SKMainWindowHasHorizontalScrollerKey = @"hasHorizontalScroller";
+static NSString *SKMainWindowHasVerticalScrollerKey = @"hasVerticalScroller";
+static NSString *SKMainWindowAutoHidesScrollersKey = @"autoHidesScrollers";
+static NSString *SKMainWindowPageIndexKey = @"pageIndex";
 
-#define WINDOW_FRAME_KEY            @"windowFrame"
-#define LEFT_SIDE_PANE_WIDTH_KEY    @"leftSidePaneWidth"
-#define RIGHT_SIDE_PANE_WIDTH_KEY   @"rightSidePaneWidth"
-#define SCALE_FACTOR_KEY            @"scaleFactor"
-#define AUTO_SCALES_KEY             @"autoScales"
-#define DISPLAYS_PAGE_BREAKS_KEY    @"displaysPageBreaks"
-#define DISPLAYS_AS_BOOK_KEY        @"displaysAsBook"    
-#define DISPLAY_MODE_KEY            @"displayMode" 
-#define DISPLAY_BOX_KEY             @"displayBox"  
-#define HAS_HORIZONTAL_SCROLLER_KEY @"hasHorizontalScroller"
-#define HAS_VERTICAL_SCROLLER_KEY   @"hasVerticalScroller"
-#define AUTO_HIDES_SCROLLERS_KEY    @"autoHidesScrollers"
-#define PAGE_INDEX_KEY              @"pageIndex"
-
 static float segmentedControlHeight = 23.0;
 static float segmentedControlOffset = 1.0;
 
@@ -361,7 +358,7 @@
     
     int windowSizeOption = [sud integerForKey:SKInitialWindowSizeOptionKey];
     if (hasWindowSetup) {
-        NSString *rectString = [savedNormalSetup objectForKey:WINDOW_FRAME_KEY];
+        NSString *rectString = [savedNormalSetup objectForKey:SKMainWindowFrameKey];
         if (rectString)
             [[self window] setFrame:NSRectFromString(rectString) display:NO];
     } else if (windowSizeOption == SKMaximizeWindowOption) {
@@ -375,8 +372,8 @@
     [pdfView setGreekingThreshold:[sud floatForKey:SKGreekingThresholdKey]];
     [pdfView setBackgroundColor:[sud colorForKey:SKBackgroundColorKey]];
     
-    NSNumber *leftWidth = [savedNormalSetup objectForKey:LEFT_SIDE_PANE_WIDTH_KEY];
-    NSNumber *rightWidth = [savedNormalSetup objectForKey:RIGHT_SIDE_PANE_WIDTH_KEY];
+    NSNumber *leftWidth = [savedNormalSetup objectForKey:SKMainWindowLeftSidePaneWidthKey];
+    NSNumber *rightWidth = [savedNormalSetup objectForKey:SKMainWindowRightSidePaneWidthKey];
     if (leftWidth == nil)
         leftWidth = [sud objectForKey:SKLeftSidePaneWidthKey];
     if (rightWidth == nil)
@@ -454,7 +451,7 @@
     // Go to page?
     unsigned int pageIndex = NSNotFound;
     if (hasWindowSetup)
-        pageIndex = [[savedNormalSetup objectForKey:PAGE_INDEX_KEY] unsignedIntValue];
+        pageIndex = [[savedNormalSetup objectForKey:SKMainWindowPageIndexKey] unsignedIntValue];
     else if ([sud boolForKey:SKRememberLastPageViewedKey])
         pageIndex = [[SKBookmarkController sharedBookmarkController] pageIndexForRecentDocumentAtPath:[[[self document] fileURL] path]];
     if (pageIndex != NSNotFound && [[pdfView document] pageCount] > pageIndex)
@@ -601,13 +598,13 @@
 - (NSDictionary *)currentSetup {
     NSMutableDictionary *setup = [NSMutableDictionary dictionary];
     
-    [setup setObject:NSStringFromRect([mainWindow frame]) forKey:WINDOW_FRAME_KEY];
-    [setup setObject:[NSNumber numberWithFloat:[self leftSidePaneIsOpen] ? NSWidth([leftSideContentView frame]) : 0.0] forKey:LEFT_SIDE_PANE_WIDTH_KEY];
-    [setup setObject:[NSNumber numberWithFloat:[self rightSidePaneIsOpen] ? NSWidth([rightSideContentView frame]) : 0.0] forKey:RIGHT_SIDE_PANE_WIDTH_KEY];
-    [setup setObject:[NSNumber numberWithUnsignedInt:[[pdfView currentPage] pageIndex]] forKey:PAGE_INDEX_KEY];
+    [setup setObject:NSStringFromRect([mainWindow frame]) forKey:SKMainWindowFrameKey];
+    [setup setObject:[NSNumber numberWithFloat:[self leftSidePaneIsOpen] ? NSWidth([leftSideContentView frame]) : 0.0] forKey:SKMainWindowLeftSidePaneWidthKey];
+    [setup setObject:[NSNumber numberWithFloat:[self rightSidePaneIsOpen] ? NSWidth([rightSideContentView frame]) : 0.0] forKey:SKMainWindowRightSidePaneWidthKey];
+    [setup setObject:[NSNumber numberWithUnsignedInt:[[pdfView currentPage] pageIndex]] forKey:SKMainWindowPageIndexKey];
     if ([self isFullScreen] || [self isPresentation]) {
         [setup addEntriesFromDictionary:savedNormalSetup];
-        [setup removeObjectsForKeys:[NSArray arrayWithObjects:HAS_HORIZONTAL_SCROLLER_KEY, HAS_VERTICAL_SCROLLER_KEY, AUTO_HIDES_SCROLLERS_KEY, nil]];
+        [setup removeObjectsForKeys:[NSArray arrayWithObjects:SKMainWindowHasHorizontalScrollerKey, SKMainWindowHasVerticalScrollerKey, SKMainWindowAutoHidesScrollersKey, nil]];
     } else {
         [setup addEntriesFromDictionary:[self currentPDFSettings]];
     }
@@ -617,17 +614,17 @@
 
 - (void)applyPDFSettings:(NSDictionary *)setup {
     NSNumber *number;
-    if (number = [setup objectForKey:SCALE_FACTOR_KEY])
+    if (number = [setup objectForKey:SKMainWindowScaleFactorKey])
         [pdfView setScaleFactor:[number floatValue]];
-    if (number = [setup objectForKey:AUTO_SCALES_KEY])
+    if (number = [setup objectForKey:SKMainWindowAutoScalesKey])
         [pdfView setAutoScales:[number boolValue]];
-    if (number = [setup objectForKey:DISPLAYS_PAGE_BREAKS_KEY])
+    if (number = [setup objectForKey:SKMainWindowDisplayPageBreaksKey])
         [pdfView setDisplaysPageBreaks:[number boolValue]];
-    if (number = [setup objectForKey:DISPLAYS_AS_BOOK_KEY])
+    if (number = [setup objectForKey:SKMainWindowDisplayAsBookKey])
         [pdfView setDisplaysAsBook:[number boolValue]];
-    if (number = [setup objectForKey:DISPLAY_MODE_KEY])
+    if (number = [setup objectForKey:SKMainWindowDisplayModeKey])
         [pdfView setDisplayMode:[number intValue]];
-    if (number = [setup objectForKey:DISPLAY_BOX_KEY])
+    if (number = [setup objectForKey:SKMainWindowDisplayBoxKey])
         [pdfView setDisplayBox:[number intValue]];
 }
 
@@ -636,14 +633,14 @@
     
     if ([self isPresentation]) {
         [setup setDictionary:savedNormalSetup];
-        [setup removeObjectsForKeys:[NSArray arrayWithObjects:HAS_HORIZONTAL_SCROLLER_KEY, HAS_VERTICAL_SCROLLER_KEY, AUTO_HIDES_SCROLLERS_KEY, nil]];
+        [setup removeObjectsForKeys:[NSArray arrayWithObjects:SKMainWindowHasHorizontalScrollerKey, SKMainWindowHasVerticalScrollerKey, SKMainWindowAutoHidesScrollersKey, nil]];
     } else {
-        [setup setObject:[NSNumber numberWithBool:[pdfView displaysPageBreaks]] forKey:DISPLAYS_PAGE_BREAKS_KEY];
-        [setup setObject:[NSNumber numberWithBool:[pdfView displaysAsBook]] forKey:DISPLAYS_AS_BOOK_KEY];
-        [setup setObject:[NSNumber numberWithInt:[pdfView displayBox]] forKey:DISPLAY_BOX_KEY];
-        [setup setObject:[NSNumber numberWithFloat:[pdfView scaleFactor]] forKey:SCALE_FACTOR_KEY];
-        [setup setObject:[NSNumber numberWithBool:[pdfView autoScales]] forKey:AUTO_SCALES_KEY];
-        [setup setObject:[NSNumber numberWithInt:[pdfView displayMode]] forKey:DISPLAY_MODE_KEY];
+        [setup setObject:[NSNumber numberWithBool:[pdfView displaysPageBreaks]] forKey:SKMainWindowDisplayPageBreaksKey];
+        [setup setObject:[NSNumber numberWithBool:[pdfView displaysAsBook]] forKey:SKMainWindowDisplayAsBookKey];
+        [setup setObject:[NSNumber numberWithInt:[pdfView displayBox]] forKey:SKMainWindowDisplayBoxKey];
+        [setup setObject:[NSNumber numberWithFloat:[pdfView scaleFactor]] forKey:SKMainWindowScaleFactorKey];
+        [setup setObject:[NSNumber numberWithBool:[pdfView autoScales]] forKey:SKMainWindowAutoScalesKey];
+        [setup setObject:[NSNumber numberWithInt:[pdfView displayMode]] forKey:SKMainWindowDisplayModeKey];
     }
     
     return setup;
@@ -2564,9 +2561,9 @@
     if ([self isPresentation] == NO && [self isFullScreen] == NO) {
         NSScrollView *scrollView = [[pdfView documentView] enclosingScrollView];
         [savedNormalSetup setDictionary:[self currentPDFSettings]];
-        [savedNormalSetup setObject:[NSNumber numberWithBool:[scrollView hasHorizontalScroller]] forKey:HAS_HORIZONTAL_SCROLLER_KEY];
-        [savedNormalSetup setObject:[NSNumber numberWithBool:[scrollView hasVerticalScroller]] forKey:HAS_VERTICAL_SCROLLER_KEY];
-        [savedNormalSetup setObject:[NSNumber numberWithBool:[scrollView autohidesScrollers]] forKey:AUTO_HIDES_SCROLLERS_KEY];
+        [savedNormalSetup setObject:[NSNumber numberWithBool:[scrollView hasHorizontalScroller]] forKey:SKMainWindowHasHorizontalScrollerKey];
+        [savedNormalSetup setObject:[NSNumber numberWithBool:[scrollView hasVerticalScroller]] forKey:SKMainWindowHasVerticalScrollerKey];
+        [savedNormalSetup setObject:[NSNumber numberWithBool:[scrollView autohidesScrollers]] forKey:SKMainWindowAutoHidesScrollersKey];
     }
     
     NSDictionary *fullScreenSetup = [[NSUserDefaults standardUserDefaults] objectForKey:SKDefaultFullScreenPDFDisplaySettingsKey];
@@ -2613,10 +2610,10 @@
     NSScrollView *scrollView = [[pdfView documentView] enclosingScrollView];
     [self applyPDFSettings:savedNormalSetup];
     [scrollView setNeverHasHorizontalScroller:NO];
-    [scrollView setHasHorizontalScroller:[[savedNormalSetup objectForKey:HAS_HORIZONTAL_SCROLLER_KEY] boolValue]];
+    [scrollView setHasHorizontalScroller:[[savedNormalSetup objectForKey:SKMainWindowHasHorizontalScrollerKey] boolValue]];
     [scrollView setNeverHasVerticalScroller:NO];
-    [scrollView setHasVerticalScroller:[[savedNormalSetup objectForKey:HAS_VERTICAL_SCROLLER_KEY] boolValue]];
-    [scrollView setAutohidesScrollers:[[savedNormalSetup objectForKey:AUTO_HIDES_SCROLLERS_KEY] boolValue]];
+    [scrollView setHasVerticalScroller:[[savedNormalSetup objectForKey:SKMainWindowHasVerticalScrollerKey] boolValue]];
+    [scrollView setAutohidesScrollers:[[savedNormalSetup objectForKey:SKMainWindowAutoHidesScrollersKey] boolValue]];
     
     NSColor *backgroundColor = [[NSUserDefaults standardUserDefaults] colorForKey:SKFullScreenBackgroundColorKey];
     [pdfView setBackgroundColor:backgroundColor];


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

Revision: 3704
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3704&view=rev
Author:   hofman
Date:     2008-04-11 03:23:46 -0700 (Fri, 11 Apr 2008)

Log Message:
-----------
Use more string constants.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-04-10 21:33:59 UTC (rev 3703)
+++ trunk/SKMainWindowController.m	2008-04-11 10:23:46 UTC (rev 3704)
@@ -120,6 +120,7 @@
 static NSString *SKMainWindowLabelColumnIdentifer = @"label";
 static NSString *SKMainWindowNoteColumnIdentifer = @"note";
 static NSString *SKMainWindowTypeColumnIdentifer = @"type";
+static NSString *SKMainWindowImageColumnIdentifer = @"image";
 static NSString *SKMainWindowRelevanceColumnIdentifer = @"relevance";
 static NSString *SKMainWindowResultsColumnIdentifer = @"results";
 
@@ -4042,7 +4043,7 @@
         NSPasteboard *pboard = [NSPasteboard generalPasteboard];
         NSMutableArray *types = [NSMutableArray array];
         NSData *noteData = nil;
-        NSMutableAttributedString *attrString = [[items valueForKey:@"type"] containsObject:[NSNull null]] ? [[[NSMutableAttributedString alloc] init] autorelease] : nil;
+        NSMutableAttributedString *attrString = [[items valueForKey:SKPDFAnnotationTypeKey] containsObject:[NSNull null]] ? [[[NSMutableAttributedString alloc] init] autorelease] : nil;
         NSMutableString *string = [NSMutableString string];
         NSEnumerator *itemEnum;
         id item;
@@ -4293,7 +4294,7 @@
 - (float)tableView:(NSTableView *)tv heightOfRow:(int)row {
     if ([tv isEqual:thumbnailTableView]) {
         NSSize thumbSize = [[[thumbnails objectAtIndex:row] image] size];
-        NSSize cellSize = NSMakeSize([[tv tableColumnWithIdentifier:@"image"] width], 
+        NSSize cellSize = NSMakeSize([[tv tableColumnWithIdentifier:SKMainWindowImageColumnIdentifer] width], 
                                      fminf(thumbSize.height, roundedThumbnailSize));
         if (thumbSize.height < 1.0)
             return 1.0;
@@ -4303,7 +4304,7 @@
             return fmaxf(1.0, fminf(cellSize.width, thumbSize.width) * thumbSize.height / thumbSize.width);
     } else if ([tv isEqual:snapshotTableView]) {
         NSSize thumbSize = [[[[snapshotArrayController arrangedObjects] objectAtIndex:row] thumbnail] size];
-        NSSize cellSize = NSMakeSize([[tv tableColumnWithIdentifier:@"image"] width], 
+        NSSize cellSize = NSMakeSize([[tv tableColumnWithIdentifier:SKMainWindowImageColumnIdentifer] width], 
                                      fminf(thumbSize.height, roundedSnapshotThumbnailSize));
         if (thumbSize.height < 1.0)
             return 1.0;
@@ -4319,7 +4320,7 @@
     if ([tv isEqual:snapshotTableView]) {
         NSArray *controllers = [[snapshotArrayController arrangedObjects] objectsAtIndexes:rowIndexes];
         [[controllers valueForKey:@"window"] makeObjectsPerformSelector:@selector(orderOut:) withObject:self];
-        [[self mutableArrayValueForKey:@"snapshots"] removeObjectsInArray:controllers];
+        [[self mutableArrayValueForKey:SKMainWindowSnapshotsKey] removeObjectsInArray:controllers];
     }
 }
 
@@ -4373,7 +4374,7 @@
         PDFDestination *dest = [[[findArrayController arrangedObjects] objectAtIndex:row] destination];
         [self showHoverWindowForDestination:dest];
     } else if ([tv isEqual:groupedFindTableView]) {
-        PDFDestination *dest = [[[[[groupedFindArrayController arrangedObjects] objectAtIndex:row] valueForKey:@"results"] objectAtIndex:0] destination];
+        PDFDestination *dest = [[[[[groupedFindArrayController arrangedObjects] objectAtIndex:row] valueForKey:SKSearchResultResultsKey] objectAtIndex:0] destination];
         [self showHoverWindowForDestination:dest];
     }
 }
@@ -4399,7 +4400,7 @@
 - (void)deleteSnapshot:(id)sender {
     SKSnapshotWindowController *controller = [sender representedObject];
     [[controller window] orderOut:self];
-    [[self mutableArrayValueForKey:@"snapshots"] removeObject:controller];
+    [[self mutableArrayValueForKey:SKMainWindowSnapshotsKey] removeObject:controller];
 }
 
 - (void)showSnapshot:(id)sender {
@@ -4578,7 +4579,7 @@
 
 - (void)resetThumbnails {
     unsigned i, count = [pageLabels count];
-    [self willChangeValueForKey:@"thumbnails"];
+    [self willChangeValueForKey:SKMainWindowThumbnailsKey];
     [thumbnails removeAllObjects];
     if (count) {
         PDFPage *emptyPage = [[[PDFPage alloc] init] autorelease];
@@ -4600,7 +4601,7 @@
             [thumbnail release];
         }
     }
-    [self didChangeValueForKey:@"thumbnails"];
+    [self didChangeValueForKey:SKMainWindowThumbnailsKey];
     [self allThumbnailsNeedUpdate];
 }
 


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

Revision: 3741
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3741&view=rev
Author:   hofman
Date:     2008-04-17 06:01:40 -0700 (Thu, 17 Apr 2008)

Log Message:
-----------
Use string constants.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-04-17 09:40:34 UTC (rev 3740)
+++ trunk/SKMainWindowController.m	2008-04-17 13:01:40 UTC (rev 3741)
@@ -3937,9 +3937,9 @@
             NSSortDescriptor *pageIndexSortDescriptor = [[[NSSortDescriptor alloc] initWithKey:SKPDFAnnotationPageIndexKey ascending:ascending] autorelease];
             NSSortDescriptor *boundsSortDescriptor = [[[NSSortDescriptor alloc] initWithKey:SKPDFAnnotationBoundsKey ascending:ascending selector:@selector(boundsCompare:)] autorelease];
             NSMutableArray *sds = [NSMutableArray arrayWithObjects:pageIndexSortDescriptor, boundsSortDescriptor, nil];
-            if ([tcID isEqualToString:@"type"]) {
+            if ([tcID isEqualToString:SKMainWindowTypeColumnIdentifer]) {
                 [sds insertObject:[[[NSSortDescriptor alloc] initWithKey:SKPDFAnnotationTypeKey ascending:YES selector:@selector(noteTypeCompare:)] autorelease] atIndex:0];
-            } else if ([tcID isEqualToString:@"note"]) {
+            } else if ([tcID isEqualToString:SKMainWindowNoteColumnIdentifer]) {
                 [sds insertObject:[[[NSSortDescriptor alloc] initWithKey:SKPDFAnnotationStringKey ascending:YES selector:@selector(localizedCaseInsensitiveNumericCompare:)] autorelease] atIndex:0];
             } else if ([tcID isEqualToString:SKMainWindowPageColumnIdentifer]) {
                 if (oldTableColumn == nil)


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

Revision: 3742
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3742&view=rev
Author:   hofman
Date:     2008-04-17 06:09:36 -0700 (Thu, 17 Apr 2008)

Log Message:
-----------
Use string constants.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-04-17 13:01:40 UTC (rev 3741)
+++ trunk/SKMainWindowController.m	2008-04-17 13:09:36 UTC (rev 3742)
@@ -4153,7 +4153,7 @@
 
 - (void)autoSizeNoteRows:(id)sender {
     float rowHeight = [noteOutlineView rowHeight];
-    NSTableColumn *tableColumn = [noteOutlineView tableColumnWithIdentifier:@"note"];
+    NSTableColumn *tableColumn = [noteOutlineView tableColumnWithIdentifier:SKMainWindowNoteColumnIdentifer];
     id cell = [tableColumn dataCell];
     float indentation = [noteOutlineView indentationPerLevel];
     float width = NSWidth([cell drawingRectForBounds:NSMakeRect(0.0, 0.0, [tableColumn width] - indentation, rowHeight)]);


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

Revision: 3831
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3831&view=rev
Author:   hofman
Date:     2008-04-29 05:00:51 -0700 (Tue, 29 Apr 2008)

Log Message:
-----------
rename some string constants

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-04-29 09:22:09 UTC (rev 3830)
+++ trunk/SKMainWindowController.m	2008-04-29 12:00:51 UTC (rev 3831)
@@ -125,10 +125,10 @@
 static NSString *SKMainWindowRelevanceColumnIdentifer = @"relevance";
 static NSString *SKMainWindowResultsColumnIdentifer = @"results";
 
-static NSString *SKSearchResultCountKey = @"count";
-static NSString *SKSearchResultPageKey = @"page";
-static NSString *SKSearchResultResultsKey = @"results";
-static NSString *SKSearchResultMaxCountKey = @"maxCount";
+static NSString *SKMainWindowSearchCountKey = @"count";
+static NSString *SKMainWindowSearchPageKey = @"page";
+static NSString *SKMainWindowSearchResultsKey = @"results";
+static NSString *SKMainWindowSearchMaxCountKey = @"maxCount";
 
 static float segmentedControlHeight = 23.0;
 static float segmentedControlOffset = 1.0;
@@ -451,7 +451,7 @@
     [snapshotArrayController setSortDescriptors:[NSArray arrayWithObjects:pageIndexSortDescriptor, nil]];
     [ownerController setContent:self];
     
-    NSSortDescriptor *countDescriptor = [[[NSSortDescriptor alloc] initWithKey:SKSearchResultCountKey ascending:NO] autorelease];
+    NSSortDescriptor *countDescriptor = [[[NSSortDescriptor alloc] initWithKey:SKMainWindowSearchCountKey ascending:NO] autorelease];
     [groupedFindArrayController setSortDescriptors:[NSArray arrayWithObjects:countDescriptor, nil]];
     [[[groupedFindTableView tableColumnWithIdentifier:SKMainWindowRelevanceColumnIdentifer] dataCell] setEnabled:NO];
         
@@ -2900,20 +2900,20 @@
         
         PDFPage *page = [[instance pages] objectAtIndex:0];
         NSMutableDictionary *dict = [groupedSearchResults lastObject];
-        NSNumber *maxCount = [dict valueForKey:SKSearchResultMaxCountKey];
-        if ([[dict valueForKey:SKSearchResultPageKey] isEqual:page] == NO) {
-            dict = [NSMutableDictionary dictionaryWithObjectsAndKeys:page, SKSearchResultPageKey, [NSMutableArray array], SKSearchResultResultsKey, maxCount, SKSearchResultMaxCountKey, nil];
+        NSNumber *maxCount = [dict valueForKey:SKMainWindowSearchMaxCountKey];
+        if ([[dict valueForKey:SKMainWindowSearchPageKey] isEqual:page] == NO) {
+            dict = [NSMutableDictionary dictionaryWithObjectsAndKeys:page, SKMainWindowSearchPageKey, [NSMutableArray array], SKMainWindowSearchResultsKey, maxCount, SKMainWindowSearchMaxCountKey, nil];
             [groupedSearchResults addObject:dict];
         }
-        NSMutableArray *results = [dict valueForKey:SKSearchResultResultsKey];
+        NSMutableArray *results = [dict valueForKey:SKMainWindowSearchResultsKey];
         [results addObject:instance];
-        [dict setValue:[NSNumber numberWithUnsignedInt:[results count]] forKey:SKSearchResultCountKey];
+        [dict setValue:[NSNumber numberWithUnsignedInt:[results count]] forKey:SKMainWindowSearchCountKey];
         
         if ([results count] > [maxCount unsignedIntValue]) {
             NSEnumerator *dictEnum = [groupedSearchResults objectEnumerator];
             maxCount = [NSNumber numberWithUnsignedInt:[results count]];
             while (dict = [dictEnum nextObject])
-                [dict setValue:maxCount forKey:SKSearchResultMaxCountKey];
+                [dict setValue:maxCount forKey:SKMainWindowSearchMaxCountKey];
         }
     }
 }
@@ -4394,7 +4394,7 @@
         PDFDestination *dest = [[[findArrayController arrangedObjects] objectAtIndex:row] destination];
         [self showHoverWindowForDestination:dest];
     } else if ([tv isEqual:groupedFindTableView]) {
-        PDFDestination *dest = [[[[[groupedFindArrayController arrangedObjects] objectAtIndex:row] valueForKey:SKSearchResultResultsKey] objectAtIndex:0] destination];
+        PDFDestination *dest = [[[[[groupedFindArrayController arrangedObjects] objectAtIndex:row] valueForKey:SKMainWindowSearchResultsKey] objectAtIndex:0] destination];
         [self showHoverWindowForDestination:dest];
     }
 }


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

Revision: 3891
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3891&view=rev
Author:   hofman
Date:     2008-05-18 04:54:27 -0700 (Sun, 18 May 2008)

Log Message:
-----------
Regroup change notifications.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-05-18 10:29:53 UTC (rev 3890)
+++ trunk/SKMainWindowController.m	2008-05-18 11:54:27 UTC (rev 3891)
@@ -2946,16 +2946,16 @@
         [[statusBar progressIndicator] setMaxValue:[[note object] pageCount]];
         [[statusBar progressIndicator] setDoubleValue:0.0];
         [statusBar startAnimation:self];
+        [self willChangeValueForKey:SKMainWindowSearchResultsKey];
+        [self willChangeValueForKey:SKMainWindowGroupedSearchResultsKey];
     }
 }
 
 - (void)documentDidEndDocumentFind:(NSNotification *)note {
     if (findPanelFind == NO) {
         NSString *message = [NSString stringWithFormat:NSLocalizedString(@"%i Results", @"Message in search table header"), [searchResults count]];
-        [self willChangeValueForKey:SKMainWindowSearchResultsKey];
+        [self didChangeValueForKey:SKMainWindowGroupedSearchResultsKey];
         [self didChangeValueForKey:SKMainWindowSearchResultsKey];
-        [self willChangeValueForKey:SKMainWindowGroupedSearchResultsKey];
-        [self didChangeValueForKey:SKMainWindowGroupedSearchResultsKey];
         [[[findTableView tableColumnWithIdentifier:SKMainWindowResultsColumnIdentifer] headerCell] setStringValue:message];
         [[findTableView headerView] setNeedsDisplay:YES];
         [[[groupedFindTableView tableColumnWithIdentifier:SKMainWindowRelevanceColumnIdentifer] headerCell] setStringValue:message];
@@ -2969,10 +2969,10 @@
     NSNumber *pageIndex = [[note userInfo] objectForKey:@"PDFDocumentPageIndex"];
     [[statusBar progressIndicator] setDoubleValue:[pageIndex doubleValue]];
     if ([pageIndex unsignedIntValue] % 50 == 0) {
+        [self didChangeValueForKey:SKMainWindowGroupedSearchResultsKey];
+        [self didChangeValueForKey:SKMainWindowSearchResultsKey];
         [self willChangeValueForKey:SKMainWindowSearchResultsKey];
-        [self didChangeValueForKey:SKMainWindowSearchResultsKey];
         [self willChangeValueForKey:SKMainWindowGroupedSearchResultsKey];
-        [self didChangeValueForKey:SKMainWindowGroupedSearchResultsKey];
     }
 }
 


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

Revision: 3908
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3908&view=rev
Author:   hofman
Date:     2008-05-22 05:34:39 -0700 (Thu, 22 May 2008)

Log Message:
-----------
rearrange code

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-05-20 15:06:43 UTC (rev 3907)
+++ trunk/SKMainWindowController.m	2008-05-22 12:34:39 UTC (rev 3908)
@@ -2737,28 +2737,6 @@
 
 #pragma mark Searching
 
-- (void)didMatchString:(PDFSelection *)instance {
-    if (findPanelFind == NO) {
-        [searchResults addObject:instance];
-        
-        PDFPage *page = [[instance pages] objectAtIndex:0];
-        SKGroupedSearchResult *result = [groupedSearchResults lastObject];
-        unsigned int maxCount = [result maxCount];
-        if ([[result page] isEqual:page] == NO) {
-            result = [SKGroupedSearchResult groupedSearchResultWithPage:page maxCount:maxCount];
-            [groupedSearchResults addObject:result];
-        }
-        [result addMatch:instance];
-        
-        if ([result count] > maxCount) {
-            NSEnumerator *resultEnum = [groupedSearchResults objectEnumerator];
-            maxCount = [result count];
-            while (result = [resultEnum nextObject])
-                [result setMaxCount:maxCount];
-        }
-    }
-}
-
 - (void)temporaryAnnotationTimerFired:(NSTimer *)timer {
     [self removeTemporaryAnnotations];
 }
@@ -2964,6 +2942,28 @@
 
 #pragma mark PDFDocument delegate
 
+- (void)didMatchString:(PDFSelection *)instance {
+    if (findPanelFind == NO) {
+        [searchResults addObject:instance];
+        
+        PDFPage *page = [[instance pages] objectAtIndex:0];
+        SKGroupedSearchResult *result = [groupedSearchResults lastObject];
+        unsigned int maxCount = [result maxCount];
+        if ([[result page] isEqual:page] == NO) {
+            result = [SKGroupedSearchResult groupedSearchResultWithPage:page maxCount:maxCount];
+            [groupedSearchResults addObject:result];
+        }
+        [result addMatch:instance];
+        
+        if ([result count] > maxCount) {
+            NSEnumerator *resultEnum = [groupedSearchResults objectEnumerator];
+            maxCount = [result count];
+            while (result = [resultEnum nextObject])
+                [result setMaxCount:maxCount];
+        }
+    }
+}
+
 - (void)documentDidBeginDocumentFind:(NSNotification *)note {
     if (findPanelFind == NO) {
         NSString *message = [NSLocalizedString(@"Searching", @"Message in search table header") stringByAppendingEllipsis];


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

Revision: 3922
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3922&view=rev
Author:   hofman
Date:     2008-05-26 13:20:50 -0700 (Mon, 26 May 2008)

Log Message:
-----------
Crop page for current selection rather than the current page in crop: action.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-05-26 18:12:29 UTC (rev 3921)
+++ trunk/SKMainWindowController.m	2008-05-26 20:20:50 UTC (rev 3922)
@@ -1787,9 +1787,12 @@
 
 - (IBAction)crop:(id)sender {
     NSRect rect = NSIntegralRect([pdfView currentSelectionRect]);
+    PDFPage *page = [pdfView currentSelectionPage];
     if (NSIsEmptyRect(rect))
         rect = [[pdfView currentSelectionPage] foregroundBox];
-    [self cropPageAtIndex:[[pdfView currentPage] pageIndex] toRect:rect];
+    if (page == nil)
+        page = [pdfView currentPage];
+    [self cropPageAtIndex:[page pageIndex] toRect:rect];
 }
 
 - (void)cropPagesToRects:(NSArray *)rects {


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

Revision: 3938
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3938&view=rev
Author:   hofman
Date:     2008-05-30 06:43:10 -0700 (Fri, 30 May 2008)

Log Message:
-----------
display location of selection in status bar

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-05-30 12:14:32 UTC (rev 3937)
+++ trunk/SKMainWindowController.m	2008-05-30 13:43:10 UTC (rev 3938)
@@ -662,7 +662,7 @@
     if (NSEqualRects(selRect, NSZeroRect)) {
         float magnification = [pdfView currentMagnification];
         if (magnification > 0.0001)
-            message = [NSString stringWithFormat:@"%.2f x", magnification];
+            message = [NSString stringWithFormat:@"%.2f %C", magnification, 0xD7];
         else
            message = @"";
     } else {
@@ -670,9 +670,9 @@
             BOOL useMetric = [[[NSLocale currentLocale] objectForKey:NSLocaleUsesMetricSystem] boolValue];
             NSString *units = useMetric ? @"cm" : @"in";
             float factor = useMetric ? 0.035277778 : 0.013888889;
-            message = [NSString stringWithFormat:@"%.2f x %.2f %@", NSWidth(selRect) * factor, NSHeight(selRect) * factor, units];
+            message = [NSString stringWithFormat:@"%.2f %C %.2f @ (%.2f, %.2f) %@", NSWidth(selRect) * factor, 0xD7, NSHeight(selRect) * factor, NSMinX(selRect) * factor, NSMinY(selRect) * factor, units];
         } else {
-            message = [NSString stringWithFormat:@"%i x %i pt", (int)NSWidth(selRect), (int)NSHeight(selRect)];
+            message = [NSString stringWithFormat:@"%i %C %i @ (%i, %i) pt", (int)NSWidth(selRect), 0xD7, (int)NSHeight(selRect), (int)NSMinX(selRect), (int)NSMinY(selRect)];
         }
     }
     [statusBar setRightStringValue:message];


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

Revision: 3947
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3947&view=rev
Author:   hofman
Date:     2008-06-01 05:27:48 -0700 (Sun, 01 Jun 2008)

Log Message:
-----------
Animate search highlight after scrolling if needed.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-06-01 12:10:26 UTC (rev 3946)
+++ trunk/SKMainWindowController.m	2008-06-01 12:27:48 UTC (rev 3947)
@@ -2863,8 +2863,6 @@
 }
 
 - (void)findString:(NSString *)string options:(int)options{
-    BOOL canAnimate = [pdfView respondsToSelector:@selector(setCurrentSelection:animate:)];
-    BOOL highlight = canAnimate == NO && [[NSUserDefaults standardUserDefaults] boolForKey:SKShouldHighlightSearchResultsKey];
     PDFSelection *sel = [pdfView currentSelection];
     unsigned pageIndex = [[pdfView currentPage] pageIndex];
     while ([sel string] == nil && pageIndex-- > 0) {
@@ -2875,14 +2873,13 @@
     if (selection == nil && [sel string])
         selection = [self findString:string fromSelection:nil withOptions:options];
     if (selection) {
-        if (canAnimate)
-            [pdfView setCurrentSelection:selection animate:YES];
-        else
-            [pdfView setCurrentSelection:selection];
+        [pdfView setCurrentSelection:selection];
 		[pdfView scrollSelectionToVisible:self];
         [findTableView deselectAll:self];
         [groupedFindTableView deselectAll:self];
-        if (highlight) {
+        if ([pdfView respondsToSelector:@selector(setCurrentSelection:animate:)]) {
+            [pdfView setCurrentSelection:selection animate:YES];
+        } else if ([[NSUserDefaults standardUserDefaults] boolForKey:SKShouldHighlightSearchResultsKey]) {
             [self removeTemporaryAnnotations];
             [self addAnnotationsForSelection:selection];
             temporaryAnnotationTimer = [[NSTimer scheduledTimerWithTimeInterval:10 target:self selector:@selector(temporaryAnnotationTimerFired:) userInfo:NULL repeats:NO] retain];
@@ -2902,10 +2899,7 @@
     // arm:  PDFSelection is mutable, and using -addSelection on an object from selectedObjects will actually mutate the object in searchResults, which does bad things.  MagicHat indicates that PDFSelection implements copyWithZone: even though it doesn't conform to <NSCopying>, so we'll use that since -init doesn't work (-initWithDocument: does, but it's not listed in the header either).  I filed rdar://problem/4888251 and also noticed that PDFKitViewer sample code uses -[PDFSelection copy].
     PDFSelection *currentSel = [[[selE nextObject] copy] autorelease];
     
-    if (canAnimate)
-        [pdfView setCurrentSelection:currentSel animate:YES];
-    else
-        [pdfView setCurrentSelection:currentSel];
+    [pdfView setCurrentSelection:currentSel];
     
     if (scroll && [findResults count])
         [pdfView scrollSelectionToVisible:self];
@@ -2922,7 +2916,10 @@
             [self addAnnotationsForSelection:sel];
     }
     
-    [pdfView setCurrentSelection:currentSel];
+    if (canAnimate)
+        [pdfView setCurrentSelection:currentSel animate:YES];
+    else
+        [pdfView setCurrentSelection:currentSel];
 }
 
 - (void)goToFindResults:(NSArray *)findResults {


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

Revision: 3967
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3967&view=rev
Author:   hofman
Date:     2008-06-04 11:28:49 -0700 (Wed, 04 Jun 2008)

Log Message:
-----------
Scroll full selection to visible when highlighting grouped search results

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-06-04 17:45:15 UTC (rev 3966)
+++ trunk/SKMainWindowController.m	2008-06-04 18:28:49 UTC (rev 3967)
@@ -2875,34 +2875,36 @@
 }
 
 - (void)goToFindResults:(NSArray *)findResults scrollToVisible:(BOOL)scroll {
-    BOOL highlight = [[NSUserDefaults standardUserDefaults] boolForKey:SKShouldHighlightSearchResultsKey];
-    // union all selected objects
+    if ([findResults count] == 0)
+        return;
+    
     NSEnumerator *selE = [findResults objectEnumerator];
     PDFSelection *sel;
     
     // arm:  PDFSelection is mutable, and using -addSelection on an object from selectedObjects will actually mutate the object in searchResults, which does bad things.  MagicHat indicates that PDFSelection implements copyWithZone: even though it doesn't conform to <NSCopying>, so we'll use that since -init doesn't work (-initWithDocument: does, but it's not listed in the header either).  I filed rdar://problem/4888251 and also noticed that PDFKitViewer sample code uses -[PDFSelection copy].
-    PDFSelection *currentSel = [[[selE nextObject] copy] autorelease];
+    PDFSelection *firstSel = [selE nextObject];
+    PDFSelection *currentSel = [[firstSel copy] autorelease];
     
-    [pdfView setCurrentSelection:currentSel];
+    while (sel = [selE nextObject])
+        [currentSel addSelection:sel];
     
-    if (scroll && [findResults count])
+    if (scroll) {
+        [pdfView setCurrentSelection:currentSel];
         [pdfView scrollSelectionToVisible:self];
+    }
     
     [self removeTemporaryAnnotations];
     
     // add an annotation so it's easier to see the search result
-    if (highlight)
-        [self addAnnotationsForSelection:currentSel];
+    if ([[NSUserDefaults standardUserDefaults] boolForKey:SKShouldHighlightSearchResultsKey]) {
+        selE = [findResults objectEnumerator];
+        while (sel = [selE nextObject])
+            [self addAnnotationsForSelection:sel];
+    }
     
     if ([pdfView respondsToSelector:@selector(setCurrentSelection:animate:)])
-        [pdfView setCurrentSelection:currentSel animate:YES];
+        [pdfView setCurrentSelection:firstSel animate:YES];
     
-    while (sel = [selE nextObject]) {
-        [currentSel addSelection:sel];
-        if (highlight)
-            [self addAnnotationsForSelection:sel];
-    }
-    
     [pdfView setCurrentSelection:currentSel];
 }
 


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

Revision: 3968
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3968&view=rev
Author:   hofman
Date:     2008-06-04 13:15:39 -0700 (Wed, 04 Jun 2008)

Log Message:
-----------
Remove selection highlights when there's no find result selected

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-06-04 18:28:49 UTC (rev 3967)
+++ trunk/SKMainWindowController.m	2008-06-04 20:15:39 UTC (rev 3968)
@@ -2875,9 +2875,6 @@
 }
 
 - (void)goToFindResults:(NSArray *)findResults scrollToVisible:(BOOL)scroll {
-    if ([findResults count] == 0)
-        return;
-    
     NSEnumerator *selE = [findResults objectEnumerator];
     PDFSelection *sel;
     
@@ -2888,7 +2885,7 @@
     while (sel = [selE nextObject])
         [currentSel addSelection:sel];
     
-    if (scroll) {
+    if (scroll && firstSel) {
         [pdfView setCurrentSelection:currentSel];
         [pdfView scrollSelectionToVisible:self];
     }
@@ -2902,10 +2899,11 @@
             [self addAnnotationsForSelection:sel];
     }
     
-    if ([pdfView respondsToSelector:@selector(setCurrentSelection:animate:)])
+    if ([pdfView respondsToSelector:@selector(setCurrentSelection:animate:)] && firstSel)
         [pdfView setCurrentSelection:firstSel animate:YES];
     
-    [pdfView setCurrentSelection:currentSel];
+    if (currentSel)
+        [pdfView setCurrentSelection:currentSel];
 }
 
 - (void)goToFindResults:(NSArray *)findResults {


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

Revision: 3990
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3990&view=rev
Author:   hofman
Date:     2008-06-08 05:22:57 -0700 (Sun, 08 Jun 2008)

Log Message:
-----------
Add hidden pref to use same zoom factor in split PDF as the main one

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-06-08 12:07:24 UTC (rev 3989)
+++ trunk/SKMainWindowController.m	2008-06-08 12:22:57 UTC (rev 3990)
@@ -138,6 +138,7 @@
 NSString *SKRightSidePaneWidthKey = @"SKRightSidePaneWidth";
 
 static NSString *SKUsesDrawersKey = @"SKUsesDrawers";
+static NSString *SKSplitPDFCopiesZoomKey = @"SKSplitPDFCopiesZoom";
 
 @interface NSResponder (SKExtensions)
 - (BOOL)isDescendantOf:(NSView *)aView;
@@ -2230,7 +2231,10 @@
             // Because of a PDFView bug, display properties can not be changed before it is placed in a window
             [secondaryPdfView setBackgroundColor:[pdfView backgroundColor]];
             [secondaryPdfView setDisplaysPageBreaks:NO];
-            [secondaryPdfView setAutoScales:YES];
+            if ([pdfView autoScales] || [[NSUserDefaults standardUserDefaults] boolForKey:SKSplitPDFCopiesZoomKey] == NO)
+                [secondaryPdfView setAutoScales:YES];
+            else
+                [secondaryPdfView setScaleFactor:[pdfView scaleFactor]];
             [secondaryPdfView setDocument:[pdfView document]];
         } else {
             [secondaryPdfEdgeView setFrame:frame2];


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

Revision: 4069
          http://skim-app.svn.sourceforge.net/skim-app/?rev=4069&view=rev
Author:   hofman
Date:     2008-06-25 11:44:33 -0700 (Wed, 25 Jun 2008)

Log Message:
-----------
Check matches returned by PDFDocument find  when finding whole words to see if they are really whole words, because PDFDocument itself does not seem to filter for this.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-06-23 20:11:01 UTC (rev 4068)
+++ trunk/SKMainWindowController.m	2008-06-25 18:44:33 UTC (rev 4069)
@@ -2957,6 +2957,22 @@
 
 - (void)didMatchString:(PDFSelection *)instance {
     if (findPanelFind == NO) {
+        if (wholeWordSearch) {
+            PDFSelection *copy = [[instance copy] autorelease];
+            NSString *string = [instance string];
+            unsigned int l = [string length];
+            [copy extendSelectionAtEnd:1];
+            string = [copy string];
+            if ([string length] > l && [[NSCharacterSet letterCharacterSet] characterIsMember:[string characterAtIndex:0]]) {
+                return;
+            }
+            l = [string length];
+            [copy extendSelectionAtStart:1];
+            string = [copy string];
+            if ([string length] > l && [[NSCharacterSet letterCharacterSet] characterIsMember:[string characterAtIndex:l]]) {
+                return;
+            }
+        }
         [searchResults addObject:instance];
         
         PDFPage *page = [[instance pages] objectAtIndex:0];


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

Revision: 4070
          http://skim-app.svn.sourceforge.net/skim-app/?rev=4070&view=rev
Author:   hofman
Date:     2008-06-25 11:59:18 -0700 (Wed, 25 Jun 2008)

Log Message:
-----------
Fix check for whole words

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-06-25 18:44:33 UTC (rev 4069)
+++ trunk/SKMainWindowController.m	2008-06-25 18:59:18 UTC (rev 4070)
@@ -2963,15 +2963,13 @@
             unsigned int l = [string length];
             [copy extendSelectionAtEnd:1];
             string = [copy string];
-            if ([string length] > l && [[NSCharacterSet letterCharacterSet] characterIsMember:[string characterAtIndex:0]]) {
+            if ([string length] > l && [[NSCharacterSet letterCharacterSet] characterIsMember:[string characterAtIndex:l]])
                 return;
-            }
             l = [string length];
             [copy extendSelectionAtStart:1];
             string = [copy string];
-            if ([string length] > l && [[NSCharacterSet letterCharacterSet] characterIsMember:[string characterAtIndex:l]]) {
+            if ([string length] > l && [[NSCharacterSet letterCharacterSet] characterIsMember:[string characterAtIndex:0]])
                 return;
-            }
         }
         [searchResults addObject:instance];
         


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

Revision: 4081
          http://skim-app.svn.sourceforge.net/skim-app/?rev=4081&view=rev
Author:   hofman
Date:     2008-06-27 11:07:23 -0700 (Fri, 27 Jun 2008)

Log Message:
-----------
Use argument of setter instead of ivar to change the pageNumber. Fixes bookmark support.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-06-27 17:58:15 UTC (rev 4080)
+++ trunk/SKMainWindowController.m	2008-06-27 18:07:23 UTC (rev 4081)
@@ -911,8 +911,8 @@
     unsigned int pageCount = [[pdfView document] pageCount];
     if (number > pageCount)
         number = pageCount;
-    if (number > 0 && [[pdfView currentPage] pageIndex] != pageNumber - 1)
-        [self goToPage:[[pdfView document] pageAtIndex:pageNumber - 1]];
+    if (number > 0 && [[pdfView currentPage] pageIndex] != number - 1)
+        [self goToPage:[[pdfView document] pageAtIndex:number - 1]];
 }
 
 - (void)updatePageLabel {


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

Revision: 4207
          http://skim-app.svn.sourceforge.net/skim-app/?rev=4207&view=rev
Author:   amaxwell
Date:     2008-07-14 09:45:39 -0700 (Mon, 14 Jul 2008)

Log Message:
-----------
warn of leak from clang; should just remove calls?

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-07-14 16:44:40 UTC (rev 4206)
+++ trunk/SKMainWindowController.m	2008-07-14 16:45:39 UTC (rev 4207)
@@ -1039,6 +1039,7 @@
 - (void)setNotes:(NSArray *)newNotes {
     NSMutableSet *old = (NSMutableSet *)CFSetCreateMutable(NULL, 0, &SKPointerEqualObjectSetCallbacks);
     NSMutableSet *new = (NSMutableSet *)CFSetCreateMutable(NULL, 0, &SKPointerEqualObjectSetCallbacks);
+#warning fixme: removed and added are leaked
     NSMutableSet *removed = (NSMutableSet *)CFSetCreateMutableCopy(NULL, 0, (CFSetRef)old);
     NSMutableSet *added = (NSMutableSet *)CFSetCreateMutableCopy(NULL, 0, (CFSetRef)new);
     


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

Revision: 4208
          http://skim-app.svn.sourceforge.net/skim-app/?rev=4208&view=rev
Author:   hofman
Date:     2008-07-14 10:14:00 -0700 (Mon, 14 Jul 2008)

Log Message:
-----------
fix leak

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2008-07-14 16:45:39 UTC (rev 4207)
+++ trunk/SKMainWindowController.m	2008-07-14 17:14:00 UTC (rev 4208)
@@ -1039,9 +1039,8 @@
 - (void)setNotes:(NSArray *)newNotes {
     NSMutableSet *old = (NSMutableSet *)CFSetCreateMutable(NULL, 0, &SKPointerEqualObjectSetCallbacks);
     NSMutableSet *new = (NSMutableSet *)CFSetCreateMutable(NULL, 0, &SKPointerEqualObjectSetCallbacks);
-#warning fixme: removed and added are leaked
-    NSMutableSet *removed = (NSMutableSet *)CFSetCreateMutableCopy(NULL, 0, (CFSetRef)old);
-    NSMutableSet *added = (NSMutableSet *)CFSetCreateMutableCopy(NULL, 0, (CFSetRef)new);
+    NSMutableSet *removed;
+    NSMutableSet *added;
     
     [old addObjectsFromArray:notes];
     [new addObjectsFromArray:newNotes];


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