skim-app-commit — This tracks source code changes in Subversion.

[Skim-app-commit] SF.net SVN: skim-app: [1725] trunk/English.lproj/MainMenu.nib/keyedobjects. nib

[<ho...@us...>]

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

Log Message:
-----------
Change keyboard shortcuts for markup.

Modified Paths:
--------------
    trunk/English.lproj/MainMenu.nib/keyedobjects.nib

Modified: trunk/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)


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

[Skim-app-commit] SF.net SVN: skim-app: [1724] trunk

[<ho...@us...>]

Revision: 1724
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1724&view=rev
Author:   hofman
Date:     2007-04-04 03:53:28 -0700 (Wed, 04 Apr 2007)

Log Message:
-----------
Save font for text notes to prefs and use a smaller default font. 

Modified Paths:
--------------
    trunk/InitialUserDefaults.plist
    trunk/SKPDFAnnotationNote.m
    trunk/SKStringConstants.h
    trunk/SKStringConstants.m

Modified: trunk/InitialUserDefaults.plist
===================================================================
--- trunk/InitialUserDefaults.plist	2007-04-04 10:09:24 UTC (rev 1723)
+++ trunk/InitialUserDefaults.plist	2007-04-04 10:53:28 UTC (rev 1724)
@@ -62,6 +62,10 @@
         <real>0.7</real>
         <key>SKReadingBarInvert</key>
         <true/>
+        <key>SKTextNoteFontName</key>
+        <string>LucidaGrande</string>
+        <key>SKTextNoteFontSize</key>
+        <real>11.0</real>
     </dict>
 	<key>ResettableKeys</key>
 	<array>
@@ -87,6 +91,8 @@
         <string>SKReadingBarColor</string>
         <string>SKReadingBarTransparency</string>
         <string>SKReadingBarInvert</string>
+        <string>SKTextNoteFontName</string>
+        <string>SKTextNoteFontSize</string>
     </array>
 </dict>
 </plist>

Modified: trunk/SKPDFAnnotationNote.m
===================================================================
--- trunk/SKPDFAnnotationNote.m	2007-04-04 10:09:24 UTC (rev 1723)
+++ trunk/SKPDFAnnotationNote.m	2007-04-04 10:53:28 UTC (rev 1724)
@@ -662,17 +662,16 @@
 @implementation SKPDFAnnotationFreeText
 
 static NSColor *freeTextColor = nil;
-static NSFont *freeTextFont = nil;
 
 - (id)initWithBounds:(NSRect)bounds {
     if (self = [super initWithBounds:bounds]) {
         if (freeTextColor == nil)
             freeTextColor = [[NSColor colorWithDeviceRed:1.0 green:1.0 blue:0.5 alpha:1.0] retain];
         [self setColor:freeTextColor];
-        if (freeTextFont == nil)
-            freeTextFont = [[self font] retain];
-        else
-            [self setFont:freeTextFont];
+        NSFont *font = [NSFont fontWithName:[[NSUserDefaults standardUserDefaults] stringForKey:SKTextNoteFontNameKey]
+                                       size:[[NSUserDefaults standardUserDefaults] floatForKey:SKTextNoteFontSizeKey]];
+        if (font)
+            [self setFont:font];
     }
     return self;
 }
@@ -693,10 +692,8 @@
 
 - (void)setDefaultFont:(NSFont *)newFont {
     [self setFont:newFont];
-    if (freeTextFont != newFont) {
-        [freeTextFont release];
-        freeTextFont = [newFont retain];
-    }
+    [[NSUserDefaults standardUserDefaults] setObject:[newFont fontName] forKey:SKTextNoteFontNameKey];
+    [[NSUserDefaults standardUserDefaults] setFloat:[newFont pointSize] forKey:SKTextNoteFontSizeKey];
 }
 
 - (BOOL)isNoteAnnotation { return YES; }

Modified: trunk/SKStringConstants.h
===================================================================
--- trunk/SKStringConstants.h	2007-04-04 10:09:24 UTC (rev 1723)
+++ trunk/SKStringConstants.h	2007-04-04 10:53:28 UTC (rev 1724)
@@ -62,3 +62,5 @@
 extern NSString *SKReadingBarColorKey;
 extern NSString *SKReadingBarTransparencyKey;
 extern NSString *SKReadingBarInvertKey;
+extern NSString *SKTextNoteFontNameKey;
+extern NSString *SKTextNoteFontSizeKey;

Modified: trunk/SKStringConstants.m
===================================================================
--- trunk/SKStringConstants.m	2007-04-04 10:09:24 UTC (rev 1723)
+++ trunk/SKStringConstants.m	2007-04-04 10:53:28 UTC (rev 1724)
@@ -63,3 +63,5 @@
 NSString *SKReadingBarColorKey = @"SKReadingBarColor";
 NSString *SKReadingBarTransparencyKey = @"SKReadingBarTransparency";
 NSString *SKReadingBarInvertKey = @"SKReadingBarInvert";
+NSString *SKTextNoteFontNameKey = @"SKTextNoteFontName";
+NSString *SKTextNoteFontSizeKey = @"SKTextNoteFontSize";


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

[Skim-app-commit] SF.net SVN: skim-app: [1723] trunk/NSFileManager_ExtendedAttributes.m

[<ho...@us...>]

Revision: 1723
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1723&view=rev
Author:   hofman
Date:     2007-04-04 03:09:24 -0700 (Wed, 04 Apr 2007)

Log Message:
-----------
Prefix skim reverse DNS to unique xattr names. Should not affect reading of previously written notes. 

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

Modified: trunk/NSFileManager_ExtendedAttributes.m
===================================================================
--- trunk/NSFileManager_ExtendedAttributes.m	2007-04-04 09:36:47 UTC (rev 1722)
+++ trunk/NSFileManager_ExtendedAttributes.m	2007-04-04 10:09:24 UTC (rev 1723)
@@ -133,6 +133,7 @@
 
 #define MAX_XATTR_LENGTH 2048
 #define UNIQUE_VALUE [[NSProcessInfo processInfo] globallyUniqueString]
+#define NAME_PREFIX @"net_sourceforge_skim-app_"
 #define UNIQUE_KEY @"net_sourceforge_skim-app_unique_key"
 #define WRAPPER_KEY @"net_sourceforge_skim-app_has_wrapper"
 #define FRAGMENTS_KEY @"net_sourceforge_skim-app_number_of_fragments"
@@ -268,7 +269,7 @@
         value = [value bzip2];
         
         // this will be a unique identifier for the set of keys we're about to write (appending a counter to the UUID)
-        NSString *uniqueValue = UNIQUE_VALUE;
+        NSString *uniqueValue = [NAME_PREFIX stringByAppendingString:UNIQUE_VALUE];
         unsigned numberOfFragments = ([value length] / MAX_XATTR_LENGTH) + ([value length] % MAX_XATTR_LENGTH ? 1 : 0);
         NSDictionary *wrapper = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:YES], WRAPPER_KEY, uniqueValue, UNIQUE_KEY, [NSNumber numberWithUnsignedInt:numberOfFragments], FRAGMENTS_KEY, nil];
         NSData *wrapperData = [NSPropertyListSerialization dataFromPropertyList:wrapper format:NSPropertyListBinaryFormat_v1_0 errorDescription:NULL];


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

[Skim-app-commit] SF.net SVN: skim-app: [1722] trunk/English.lproj/Skim Help/skim.texi

[<ho...@us...>]

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

Log Message:
-----------
some more typos

Modified Paths:
--------------
    trunk/English.lproj/Skim Help/skim.texi

Modified: trunk/English.lproj/Skim Help/skim.texi
===================================================================
--- trunk/English.lproj/Skim Help/skim.texi	2007-04-04 09:20:16 UTC (rev 1721)
+++ trunk/English.lproj/Skim Help/skim.texi	2007-04-04 09:36:47 UTC (rev 1722)
@@ -251,7 +251,7 @@
 @end itemize
 @endbox
 
-By default, the contents pane always opens automatically. However you can choose to open the contents pane automatically only when the PDF file has a table of contents. To set the contents pane to open automatically only if there is a table of contents, choose Skim > Preferences, click PDF, and select "Open pane only for Table of Contents."
+By default, the contents pane always opens automatically. However you can choose to open the contents pane automatically only when the PDF file has a table of contents. To set the contents pane to open automatically only if there is a table of contents, choose Skim > Preferences, click General, and select "Open pane only for Table of Contents."
 
 @heading See also
 @menu


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

[Skim-app-commit] SF.net SVN: skim-app: [1721] trunk/English.lproj/Skim Help/skim.texi

[<ho...@us...>]

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

Log Message:
-----------
some more typos

Modified Paths:
--------------
    trunk/English.lproj/Skim Help/skim.texi

Modified: trunk/English.lproj/Skim Help/skim.texi
===================================================================
--- trunk/English.lproj/Skim Help/skim.texi	2007-04-04 08:39:06 UTC (rev 1720)
+++ trunk/English.lproj/Skim Help/skim.texi	2007-04-04 09:20:16 UTC (rev 1721)
@@ -160,7 +160,7 @@
 @item In the Finder, select a PDF document.
 @item Choose File > Get Info.
 @item Click Open with:.
-@item Choose Preview from the pop-up menu, and click Change All.
+@item Choose Skim from the pop-up menu, and click Change All.
 @end enumerate
 @endbox
 
@@ -672,7 +672,7 @@
 @end enumerate
 @endbox
 
-If you turn on the "Anti-alias text and line art" option, large characters and line art are smoothed out and do not appear to be so jagged. Preview may take longer to display your document when smoothing out characters and line art.
+If you turn on the "Anti-alias text and line art" option, large characters and line art are smoothed out and do not appear to be so jagged. Skim may take longer to display your document when smoothing out characters and line art.
 
 @heading See also
 @menu
@@ -685,7 +685,7 @@
 
 @topic Small text is unreadable in my PDF document
 
-When you view a PDF file in Preview, small text may look fuzzy or illegible. You can change a few options to make the text more legible.
+When you view a PDF file in Skim, small text may look fuzzy or illegible. You can change a few options to make the text more legible.
 
 @box{taskbox}
 @heading To make small text more readable:


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

[Skim-app-commit] SF.net SVN: skim-app: [1720] trunk/English.lproj/Skim Help/skim.texi

[<ho...@us...>]

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

Log Message:
-----------
fix some typos

Modified Paths:
--------------
    trunk/English.lproj/Skim Help/skim.texi

Modified: trunk/English.lproj/Skim Help/skim.texi
===================================================================
--- trunk/English.lproj/Skim Help/skim.texi	2007-04-03 22:30:01 UTC (rev 1719)
+++ trunk/English.lproj/Skim Help/skim.texi	2007-04-04 08:39:06 UTC (rev 1720)
@@ -238,7 +238,7 @@
 @item If a PDF has a table of contents (TOC), a TOC icon appears at the top of the left side pane. Click the icon to use the TOC to navigate the PDF.
 @end itemize
 @itemize
-@item To navigate using thumbnail images of the document's pages, click the Thumbnails icon in the drawer and click the thumbnail image for the page.
+@item To navigate using thumbnail images of the document's pages, click the Thumbnails icon in the contents pane and click the thumbnail image for the page.
 @end itemize
 @itemize
 @item To jump to the next page, press the Down Arrow or Page Down key. To jump to the previous page, press the Up Arrow or Page Up key.
@@ -251,7 +251,7 @@
 @end itemize
 @endbox
 
-By default, the contents pane opens automatically only if you open a PDF file with a table of contents. To set the drawer to open automatically even if there is no table of contents, choose Skim > Preferences, click PDF, and deselect "Open pane only for Table of Contents."
+By default, the contents pane always opens automatically. However you can choose to open the contents pane automatically only when the PDF file has a table of contents. To set the contents pane to open automatically only if there is a table of contents, choose Skim > Preferences, click PDF, and select "Open pane only for Table of Contents."
 
 @heading See also
 @menu
@@ -263,7 +263,7 @@
 
 @topic Scrolling PDF pages
 
-When you open a PDF file with multiple pages in Skim, you select the page you want to view by clicking it in the drawer. If the page does not fit within the window size, then you use the vertical or horizontal scroll bars to view the hidden parts of the current page.
+When you open a PDF file with multiple pages in Skim, you select the page you want to view by clicking it in the contents pane. If the page does not fit within the window size, then you use the vertical or horizontal scroll bars to view the hidden parts of the current page.
 
 By default, you can't use the vertical scroll bar to view the next or previous pages of the document. However, you can change this by turning on continuous scrolling.
 
@@ -316,7 +316,7 @@
 @heading To find all occurrences of text:
 @enumerate
 @item Open the PDF file. If the Contents pane isn't open, choose View Show Contents Pane.
-@item Type some text in the search field and press Return. A list of places where the text occurs appears in the drawer.
+@item Type some text in the search field and press Return. A list of places where the text occurs appears in the contents pane.
 @item Click an occurrence of the text in the Contents pane. Skim shows the page where the text occurs, and highlights the text.
 @end enumerate
 @heading To find a single occurrences of text:
@@ -423,7 +423,7 @@
 @item To view the table of contents, Choose View > Show Contents Pane, and click the TOC button or choose View > Table Of Contents.
 @end itemize
 @itemize
-@item To jump to a specific section, click its name in the drawer. 
+@item To jump to a specific section, click its name in the contents pane. 
 @end itemize
 @endbox
 


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

[Skim-app-commit] SF.net SVN: skim-app: [1719] trunk/SKMainWindowController.m

[<ama...@us...>]

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.

[Skim-app-commit] SF.net SVN: skim-app: [1718] trunk/SKMainWindowController.m

[<ho...@us...>]

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.

[Skim-app-commit] SF.net SVN: skim-app: [1717] trunk/SKMainWindowController.m

[<ho...@us...>]

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
-
-
-@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.

[Skim-app-commit] SF.net SVN: skim-app: [1716] trunk/SKMainWindowController.m

[<ho...@us...>]

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.

[Skim-app-commit] SF.net SVN: skim-app: [1715] trunk/SKMainWindowController.m

[<ama...@us...>]

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.

[Skim-app-commit] SF.net SVN: skim-app: [1714] trunk

[<ho...@us...>]

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

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

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-03 14:54:15 UTC (rev 1713)
+++ trunk/SKMainWindowController.m	2007-04-03 15:08:34 UTC (rev 1714)
@@ -2176,7 +2176,7 @@
 
 - (BOOL)tableView:(NSTableView *)tv commandSelectRow:(int)row {
     if ([tv isEqual:thumbnailTableView]) {
-        NSRect rect = [[[pdfView document] pageAtIndex:row] boundsForBox:[pdfView displayBox]];
+        NSRect rect = [[[pdfView document] pageAtIndex:row] boundsForBox:kPDFDisplayBoxCropBox];
         
         rect.origin.y = NSMidY(rect) - 100.0;
         rect.size.height = 200.0;

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m	2007-04-03 14:54:15 UTC (rev 1713)
+++ trunk/SKPDFView.m	2007-04-03 15:08:34 UTC (rev 1714)
@@ -1207,10 +1207,8 @@
     
     point = [self convertPoint:point toPage:page];
     
-    rect.origin.x = [self convertPoint:[page boundsForBox:[self displayBox]].origin fromPage:page].x;
+    rect = [self convertRect:[page boundsForBox:kPDFDisplayBoxCropBox] fromPage:page];
     rect.origin.y = point.y - 100.0;
-    // rowSizeForPage: allows for facing pages, but the snapshot is single page width
-    rect.size.width = NSWidth([page boundsForBox:[self displayBox]]);
     rect.size.height = 200.0;
     
     SKMainWindowController *controller = [[self window] windowController];
@@ -1845,10 +1843,8 @@
             point.y -= 100.0;
         }
         
-        rect.origin.x = [self convertPoint:[page boundsForBox:[self displayBox]].origin fromPage:page].x;
+        rect = [self convertRect:[page boundsForBox:kPDFDisplayBoxCropBox] fromPage:page];
         rect.origin.y = point.y - 100.0;
-        // rowSizeForPage: allows for facing pages, but the snapshot is single page width
-        rect.size.width = NSWidth([page boundsForBox:[self displayBox]]);
         rect.size.height = 200.0;
         
     } else {


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

[Skim-app-commit] SF.net SVN: skim-app: [1713] trunk

[<ho...@us...>]

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

Log Message:
-----------
Delegate command-mousedown on thumbnail table, so we can show a snapshot. 

Modified Paths:
--------------
    trunk/SKThumbnailTableView.h
    trunk/SKThumbnailTableView.m

Modified: trunk/SKThumbnailTableView.h
===================================================================
--- trunk/SKThumbnailTableView.h	2007-04-03 14:47:14 UTC (rev 1712)
+++ trunk/SKThumbnailTableView.h	2007-04-03 14:54:15 UTC (rev 1713)
@@ -60,4 +60,5 @@
 
 @interface NSObject (SKThumbnailTableViewDelegate)
 - (NSArray *)tableViewHighlightedRows:(NSTableView *)tableView;
+- (BOOL)tableView:(NSTableView *)tableView commandSelectRow:(int)rowIndex;
 @end

Modified: trunk/SKThumbnailTableView.m
===================================================================
--- trunk/SKThumbnailTableView.m	2007-04-03 14:47:14 UTC (rev 1712)
+++ trunk/SKThumbnailTableView.m	2007-04-03 14:54:15 UTC (rev 1713)
@@ -75,6 +75,15 @@
     [super highlightSelectionInClipRect:clipRect]; 
 }
 
+- (void)mouseDown:(NSEvent *)theEvent {
+    if (([theEvent modifierFlags] & NSCommandKeyMask) && [[self delegate] respondsToSelector:@selector(tableView:commandSelectRow:)]) {
+        int row = [self rowAtPoint:[self convertPoint:[theEvent locationInWindow] fromView:nil]];
+        if (row != -1 && [[self delegate] tableView:self commandSelectRow:row])
+            return;
+    }
+    [super mouseDown:theEvent];
+}
+
 @end
 
 #pragma mark -


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

[Skim-app-commit] SF.net SVN: skim-app: [1712] trunk/SKMainWindowController.m

[<ho...@us...>]

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.

[Skim-app-commit] SF.net SVN: skim-app: [1711] trunk/SKPDFView.m

[<ho...@us...>]

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

Log Message:
-----------
add copy/cut/paste to contextual menu if available

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

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m	2007-04-03 13:07:01 UTC (rev 1710)
+++ trunk/SKPDFView.m	2007-04-03 13:25:23 UTC (rev 1711)
@@ -784,15 +784,6 @@
     
     if ([self toolMode] == SKTextToolMode) {
         
-        PDFPage *page = [self pageForPoint:point nearest:YES];
-        PDFAnnotation *annotation = nil;
-        
-        if (page) {
-            annotation = [page annotationAtPoint:[self convertPoint:point toPage:page]];
-            if ([annotation isNoteAnnotation] == NO)
-                annotation = nil;
-        }
-        
         [menu addItem:[NSMenuItem separatorItem]];
         
         submenu = [[NSMenu allocWithZone:[menu zone]] init];
@@ -838,6 +829,28 @@
         [item setSubmenu:submenu];
         [submenu release];
         
+        [menu addItem:[NSMenuItem separatorItem]];
+        
+        if ([self currentSelection] || ([activeAnnotation isNoteAnnotation] && [activeAnnotation isMovable])) {
+            item = [menu addItemWithTitle:NSLocalizedString(@"Copy", @"Menu item title") action:@selector(copy:) keyEquivalent:@""];
+            if ([activeAnnotation isNoteAnnotation] && [activeAnnotation isMovable])
+                item = [menu addItemWithTitle:NSLocalizedString(@"Cut", @"Menu item title") action:@selector(copy:) keyEquivalent:@""];
+        }
+        
+        if ([[NSPasteboard generalPasteboard] availableTypeFromArray:[NSArray arrayWithObjects:SKSkimNotePboardType, NSStringPboardType, nil]]) {
+            SEL selector = ([theEvent modifierFlags] & NSAlternateKeyMask) ? @selector(alternatePaste:) : @selector(paste:);
+            item = [menu addItemWithTitle:NSLocalizedString(@"Paste", @"Menu item title") action:selector keyEquivalent:@""];
+        }
+        
+        PDFPage *page = [self pageForPoint:point nearest:YES];
+        PDFAnnotation *annotation = nil;
+        
+        if (page) {
+            annotation = [page annotationAtPoint:[self convertPoint:point toPage:page]];
+            if ([annotation isNoteAnnotation] == NO)
+                annotation = nil;
+        }
+        
         if (annotation) {
             item = [menu addItemWithTitle:NSLocalizedString(@"Remove Note", @"Menu item title") action:@selector(removeThisAnnotation:) keyEquivalent:@""];
             [item setRepresentedObject:annotation];


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

[Skim-app-commit] SF.net SVN: skim-app: [1710] trunk/SKMainWindowController.m

[<ho...@us...>]

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.

[Skim-app-commit] SF.net SVN: skim-app: [1709] trunk/English.lproj/Localizable.strings

[<ho...@us...>]

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

Log Message:
-----------
Add localized strings file.

Added Paths:
-----------
    trunk/English.lproj/Localizable.strings

Added: trunk/English.lproj/Localizable.strings
===================================================================
(Binary files differ)


Property changes on: trunk/English.lproj/Localizable.strings
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


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

[Skim-app-commit] SF.net SVN: skim-app: [1708] trunk

[<ho...@us...>]

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

Log Message:
-----------
Add localized strings file. Add some localized string comments. Fix typos. 

Modified Paths:
--------------
    trunk/NSString_SKExtensions.h
    trunk/NSString_SKExtensions.m
    trunk/SKDocument.m
    trunk/SKMainWindowController.m
    trunk/SKPSProgressController.m
    trunk/Skim.xcodeproj/project.pbxproj

Modified: trunk/NSString_SKExtensions.h
===================================================================
--- trunk/NSString_SKExtensions.h	2007-04-02 22:12:09 UTC (rev 1707)
+++ trunk/NSString_SKExtensions.h	2007-04-02 23:10:53 UTC (rev 1708)
@@ -42,5 +42,6 @@
 @interface NSString (SKExtensions)
 
 - (NSString *)stringByCollapsingWhitespaceAndNewlinesAndRemovingSurroundingWhitespaceAndNewlines;
+- (NSString *)stringByAppendingEllipsis;
 
 @end

Modified: trunk/NSString_SKExtensions.m
===================================================================
--- trunk/NSString_SKExtensions.m	2007-04-02 22:12:09 UTC (rev 1707)
+++ trunk/NSString_SKExtensions.m	2007-04-02 23:10:53 UTC (rev 1708)
@@ -105,4 +105,9 @@
     return [(id)SKStringCreateByCollapsingAndTrimmingWhitespaceAndNewlines(CFAllocatorGetDefault(), (CFStringRef)self) autorelease];
 }
 
+- (NSString *)stringByAppendingEllipsis;
+{
+    return [self stringByAppendingFormat:@"%C", 0x2026];
+}
+
 @end

Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m	2007-04-02 22:12:09 UTC (rev 1707)
+++ trunk/SKDocument.m	2007-04-02 23:10:53 UTC (rev 1708)
@@ -159,7 +159,7 @@
         if (array && (data = [NSKeyedArchiver archivedDataWithRootObject:array]))
             didWrite = [data writeToURL:absoluteURL options:NSAtomicWrite error:outError];
         else if (outError != NULL)
-            *outError = [NSError errorWithDomain:SKDocumentErrorDomain code:1 userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to write notes", @""), NSLocalizedDescriptionKey, nil]];
+            *outError = [NSError errorWithDomain:SKDocumentErrorDomain code:1 userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to write notes", @"Error description"), NSLocalizedDescriptionKey, nil]];
             
     }
     return didWrite;
@@ -219,7 +219,7 @@
     }
     
     if (didRead == NO && outError != NULL)
-        *outError = error ? error : [NSError errorWithDomain:SKDocumentErrorDomain code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to load file", @""), NSLocalizedDescriptionKey, nil]];
+        *outError = error ? error : [NSError errorWithDomain:SKDocumentErrorDomain code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to load file", @"Error description"), NSLocalizedDescriptionKey, nil]];
     
     return didRead;
 }
@@ -288,7 +288,7 @@
     }
     
     if (didRead == NO && outError != NULL)
-        *outError = error ? error : [NSError errorWithDomain:SKDocumentErrorDomain code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to load file", @""), NSLocalizedDescriptionKey, nil]];
+        *outError = error ? error : [NSError errorWithDomain:SKDocumentErrorDomain code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to load file", @"Error description"), NSLocalizedDescriptionKey, nil]];
     
     return didRead;
 }
@@ -343,7 +343,7 @@
     } else {
         success = NO;
         if(error == nil && outError) 
-            *outError = [NSError errorWithDomain:NSPOSIXErrorDomain code:ENOENT userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"The file does not exist or is not a file.", @""), NSLocalizedDescriptionKey, nil]];
+            *outError = [NSError errorWithDomain:NSPOSIXErrorDomain code:ENOENT userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"The file does not exist or is not a file.", @"Error description"), NSLocalizedDescriptionKey, nil]];
     }
     if (success == NO) {
         [noteDicts release];
@@ -413,7 +413,7 @@
                     didEndSelector:@selector(archiveSavePanelDidEnd:returnCode:contextInfo:)
                        contextInfo:NULL];
     } else {
-        NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"You must save this file first", @"") defaultButton:nil alternateButton:nil otherButton:nil informativeTextWithFormat:NSLocalizedString(@"The document has unsaved changes, or has not previously been saved to disk.", @"")];
+        NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"You must save this file first", @"Alert text when trying to create archive for unsaved document") defaultButton:nil alternateButton:nil otherButton:nil informativeTextWithFormat:NSLocalizedString(@"The document has unsaved changes, or has not previously been saved to disk.", @"Informative text in alert dialog")];
         [alert beginSheetModalForWindow:[self windowForSheet] modalDelegate:nil didEndSelector:NULL contextInfo:NULL];
     }
 }

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-02 22:12:09 UTC (rev 1707)
+++ trunk/SKMainWindowController.m	2007-04-02 23:10:53 UTC (rev 1708)
@@ -432,7 +432,7 @@
         
         if (pageIndex != NSNotFound && [document pageCount]) {
             PDFPage *page = [document pageAtIndex:MIN(pageIndex, [document pageCount])];
-            dest = [[[PDFDestination alloc] initWithPage:page point:point] autorelease];
+            dest = [[[PDFDestination alloc] initWithPage:page atPoint:point] autorelease];
             [pdfView goToDestination:dest];
         }
         
@@ -2851,7 +2851,7 @@
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarContentsPaneItemIdentifier];
     [item setLabel:NSLocalizedString(@"Contents Pane", @"Toolbar item label")];
     [item setPaletteLabel:NSLocalizedString(@"Contents Pane", @"Toolbar item label")];
-    [item setToolTip:NSLocalizedString(@"Toogle Contents Pan", @"Tool tip message")];
+    [item setToolTip:NSLocalizedString(@"Toggle Contents Pane", @"Tool tip message")];
     [item setImage:[NSImage imageNamed:@"ToolbarLeftPane"]];
     [item setTarget:self];
     [item setAction:@selector(toggleLeftSidePane:)];
@@ -2861,7 +2861,7 @@
     item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarNotesPaneItemIdentifier];
     [item setLabel:NSLocalizedString(@"Notes Pane", @"Toolbar item label")];
     [item setPaletteLabel:NSLocalizedString(@"Notes Pane", @"Toolbar item label")];
-    [item setToolTip:NSLocalizedString(@"Toogle Notes Pan", @"Tool tip message")];
+    [item setToolTip:NSLocalizedString(@"Toggle Notes Pane", @"Tool tip message")];
     [item setImage:[NSImage imageNamed:@"ToolbarRightPane"]];
     [item setTarget:self];
     [item setAction:@selector(toggleRightSidePane:)];

Modified: trunk/SKPSProgressController.m
===================================================================
--- trunk/SKPSProgressController.m	2007-04-02 22:12:09 UTC (rev 1707)
+++ trunk/SKPSProgressController.m	2007-04-02 23:10:53 UTC (rev 1708)
@@ -37,6 +37,7 @@
  */
 
 #import "SKPSProgressController.h"
+#import "NSString_SKExtensions.h"
 
 typedef enum {
     SKPSConversionCanceled = -1,
@@ -117,8 +118,8 @@
 
     if (CGPSConverterAbort(converter) == false) {
         NSBeep();
-        [textField setStringValue:NSLocalizedString(@"Converter already stopped.", @"")];
-        [cancelButton setTitle:NSLocalizedString(@"Close", @"")];
+        [textField setStringValue:NSLocalizedString(@"Converter already stopped.", @"PS conversion progress message")];
+        [cancelButton setTitle:NSLocalizedString(@"Close", @"Button title")];
         [cancelButton setAction:@selector(close:)];
     }
 }
@@ -208,21 +209,21 @@
 
 - (void)processingPostScriptPage:(NSNumber *)page;
 {
-    [textField setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Processing page %d%C", @""), [page intValue], 0x2026]];
+    [textField setStringValue:[[NSString stringWithFormat:NSLocalizedString(@"Processing page %d", @"PS conversion progress message"), [page intValue]] stringByAppendingEllipsis]];
 }
 
 - (void)postscriptConversionCompleted:(BOOL)didComplete;
 {
-    [textField setStringValue:NSLocalizedString(@"File successfully converted!", @"")];
+    [textField setStringValue:NSLocalizedString(@"File successfully converted!", @"PS conversion progress message")];
     [progressBar stopAnimation:nil];
-    [cancelButton setTitle:NSLocalizedString(@"Close", @"")];
+    [cancelButton setTitle:NSLocalizedString(@"Close", @"Button title")];
     [cancelButton setAction:@selector(close:)];
 }
 
 - (void)postscriptConversionStarted;
 {
     [progressBar startAnimation:nil];
-    [textField setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Converting PostScript%C", @""), 0x2026]];
+    [textField setStringValue:[[NSString stringWithFormat:NSLocalizedString(@"Converting PostScript", @"PS conversion progress message")] stringByAppendingEllipsis]];
 }
 
 - (void)showPostScriptConversionMessage:(NSString *)message;

Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj	2007-04-02 22:12:09 UTC (rev 1707)
+++ trunk/Skim.xcodeproj/project.pbxproj	2007-04-02 23:10:53 UTC (rev 1708)
@@ -101,6 +101,7 @@
 		CE4EC87F0B7E6E110091F228 /* NSBezierPath_CoreImageExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE4EC87E0B7E6E110091F228 /* NSBezierPath_CoreImageExtensions.m */; };
 		CE4EC8830B7E6E920091F228 /* CIImage_BDSKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE4EC8820B7E6E920091F228 /* CIImage_BDSKExtensions.m */; };
 		CE4EC88C0B7E6EDB0091F228 /* SKSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = CE4EC88B0B7E6EDB0091F228 /* SKSplitView.m */; };
+		CE4F9DEE0BC1BE3A005BE0A1 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE4F9DEC0BC1BE3A005BE0A1 /* Localizable.strings */; };
 		CE546FC40B32D5DB00F8AFB6 /* SKNoteWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE546FC30B32D5DB00F8AFB6 /* SKNoteWindowController.m */; };
 		CE5470030B32D96500F8AFB6 /* NoteWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE5470010B32D96500F8AFB6 /* NoteWindow.nib */; };
 		CE5478C80B33456300F8AFB6 /* TextNoteAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE5478B70B33456300F8AFB6 /* TextNoteAdorn.tiff */; };
@@ -286,6 +287,7 @@
 		CE4EC8820B7E6E920091F228 /* CIImage_BDSKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = CIImage_BDSKExtensions.m; sourceTree = "<group>"; };
 		CE4EC88A0B7E6EDB0091F228 /* SKSplitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKSplitView.h; sourceTree = "<group>"; };
 		CE4EC88B0B7E6EDB0091F228 /* SKSplitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SKSplitView.m; sourceTree = "<group>"; };
+		CE4F9DED0BC1BE3A005BE0A1 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; };
 		CE546FC20B32D5DB00F8AFB6 /* SKNoteWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKNoteWindowController.h; sourceTree = "<group>"; };
 		CE546FC30B32D5DB00F8AFB6 /* SKNoteWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SKNoteWindowController.m; sourceTree = "<group>"; };
 		CE5470020B32D96500F8AFB6 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NoteWindow.nib; sourceTree = "<group>"; };
@@ -464,6 +466,7 @@
 				CE54AA8D0BBC037400008750 /* ReleaseNotes.rtf */,
 				8D15AC360486D014006FF6A4 /* Info.plist */,
 				089C165FFE840EACC02AAC07 /* InfoPlist.strings */,
+				CE4F9DEC0BC1BE3A005BE0A1 /* Localizable.strings */,
 				45A3BD380B4F097D002B297F /* InitialUserDefaults.plist */,
 				CE41A6CB0B975E5000ECF819 /* Skim.sdef */,
 				CE4A65CA0BAB1E2E004AD07D /* BookmarksWindow.nib */,
@@ -828,6 +831,7 @@
 				CE4A65CC0BAB1E2E004AD07D /* BookmarksWindow.nib in Resources */,
 				CE4373B40BB5440E00A56987 /* PSDocument.icns in Resources */,
 				CE54AA8F0BBC037400008750 /* ReleaseNotes.rtf in Resources */,
+				CE4F9DEE0BC1BE3A005BE0A1 /* Localizable.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1028,6 +1032,14 @@
 			name = "Skim Help";
 			sourceTree = "<group>";
 		};
+		CE4F9DEC0BC1BE3A005BE0A1 /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CE4F9DED0BC1BE3A005BE0A1 /* English */,
+			);
+			name = Localizable.strings;
+			sourceTree = "<group>";
+		};
 		CE5470010B32D96500F8AFB6 /* NoteWindow.nib */ = {
 			isa = PBXVariantGroup;
 			children = (


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

[Skim-app-commit] SF.net SVN: skim-app: [1707] trunk/SKMainWindowController.m

[<ho...@us...>]

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.

[Skim-app-commit] SF.net SVN: skim-app: [1706] trunk/SKPDFAnnotationNote.m

[<ho...@us...>]

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

Log Message:
-----------
Print notes.

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

Modified: trunk/SKPDFAnnotationNote.m
===================================================================
--- trunk/SKPDFAnnotationNote.m	2007-04-02 20:33:00 UTC (rev 1705)
+++ trunk/SKPDFAnnotationNote.m	2007-04-02 21:44:13 UTC (rev 1706)
@@ -310,6 +310,8 @@
 
 - (BOOL)isMovable { return YES; }
 
+- (BOOL)shouldPrint { return YES; }
+
 - (void)setBounds:(NSRect)bounds {
     [super setBounds:bounds];
     [[NSNotificationCenter defaultCenter] postNotificationName:SKAnnotationDidChangeNotification object:self];
@@ -357,6 +359,8 @@
 
 - (BOOL)isMovable { return YES; }
 
+- (BOOL)shouldPrint { return YES; }
+
 - (void)setBounds:(NSRect)bounds {
     [super setBounds:bounds];
     [[NSNotificationCenter defaultCenter] postNotificationName:SKAnnotationDidChangeNotification object:self];
@@ -624,6 +628,8 @@
 
 - (BOOL)isNoteAnnotation { return YES; }
 
+- (BOOL)shouldPrint { return YES; }
+
 - (void)setBounds:(NSRect)bounds {
     [super setBounds:bounds];
     [[NSNotificationCenter defaultCenter] postNotificationName:SKAnnotationDidChangeNotification object:self];
@@ -701,6 +707,8 @@
 
 - (BOOL)isEditable { return YES; }
 
+- (BOOL)shouldPrint { return YES; }
+
 - (void)setBounds:(NSRect)bounds {
     [super setBounds:bounds];
     [[NSNotificationCenter defaultCenter] postNotificationName:SKAnnotationDidChangeNotification object:self];
@@ -759,6 +767,8 @@
 
 - (BOOL)isEditable { return YES; }
 
+- (BOOL)shouldPrint { return YES; }
+
 - (void)setBounds:(NSRect)bounds {
     [[NSNotificationCenter defaultCenter] postNotificationName:SKAnnotationWillChangeNotification
             object:self
@@ -837,6 +847,8 @@
 
 - (BOOL)isEditable { return YES; }
 
+- (BOOL)shouldPrint { return YES; }
+
 - (void)setBounds:(NSRect)bounds {
     [[NSNotificationCenter defaultCenter] postNotificationName:SKAnnotationWillChangeNotification
             object:self


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

[Skim-app-commit] SF.net SVN: skim-app: [1705] trunk/SKMainWindowController.m

[<ho...@us...>]

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.

[Skim-app-commit] SF.net SVN: skim-app: [1704] trunk/English.lproj/PreferenceWindow.nib/ keyedobjects.nib

[<ho...@us...>]

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

Log Message:
-----------
Add some more tooltips

Modified Paths:
--------------
    trunk/English.lproj/PreferenceWindow.nib/keyedobjects.nib

Modified: trunk/English.lproj/PreferenceWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)


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

[Skim-app-commit] SF.net SVN: skim-app: [1703] trunk/SKPDFView.m

[<ama...@us...>]

Revision: 1703
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1703&view=rev
Author:   amaxwell
Date:     2007-04-02 11:48:10 -0700 (Mon, 02 Apr 2007)

Log Message:
-----------
Condense some code.

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

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m	2007-04-02 18:42:44 UTC (rev 1702)
+++ trunk/SKPDFView.m	2007-04-02 18:48:10 UTC (rev 1703)
@@ -1110,7 +1110,7 @@
         i = -1;
     }
     if (annotation) {
-        [[self documentView] scrollRectToVisible:[self convertRect:[self convertRect:[annotation bounds] fromPage:[annotation page]] toView:[self documentView]]];
+        [self scrollAnnotationToVisible:annotation];
         [self setActiveAnnotation:annotation];
         if ([[annotation type] isEqualToString:@"Link"]) {
             NSRect bounds = [annotation bounds]; 
@@ -1153,7 +1153,7 @@
         i = [[[pdfDoc pageAtIndex:pageIndex] annotations] count];
     }
     if (annotation) {
-        [[self documentView] scrollRectToVisible:[self convertRect:[self convertRect:[annotation bounds] fromPage:[annotation page]] toView:[self documentView]]];
+        [self scrollAnnotationToVisible:annotation];
         [self setActiveAnnotation:annotation];
         if ([[annotation type] isEqualToString:@"Link"]) {
             NSRect bounds = [annotation bounds]; 


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

[Skim-app-commit] SF.net SVN: skim-app: [1702] trunk/SKPDFView.m

[<ama...@us...>]

Revision: 1702
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1702&view=rev
Author:   amaxwell
Date:     2007-04-02 11:42:44 -0700 (Mon, 02 Apr 2007)

Log Message:
-----------
Make sure notes are added to a visible page.

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

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m	2007-04-02 18:28:43 UTC (rev 1701)
+++ trunk/SKPDFView.m	2007-04-02 18:42:44 UTC (rev 1702)
@@ -912,8 +912,10 @@
         NSSize defaultSize = (annotationType == SKAnchoredNote) ? NSMakeSize(16.0, 16.0) : NSMakeSize(128.0, 64.0);
 		// First try the current mouse position
         NSPoint center = [self convertPoint:[[self window] mouseLocationOutsideOfEventStream] fromView:nil];
-        page = [self pageForPoint:center nearest:NO];
         
+        // if the mouse was in the toolbar and there is a page below the toolbar, we get a point outside of the visible rect
+        page = NSPointInRect(center, [[self documentView] visibleRect]) ? [self pageForPoint:center nearest:NO] : nil;
+        
         if (page == nil) {
             // Get center of the PDFView.
             NSRect viewFrame = [self frame];


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

[Skim-app-commit] SF.net SVN: skim-app: [1701] trunk/English.lproj/MainMenu.nib/keyedobjects. nib

[<ho...@us...>]

Revision: 1701
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1701&view=rev
Author:   hofman
Date:     2007-04-02 11:28:43 -0700 (Mon, 02 Apr 2007)

Log Message:
-----------
change shortcuts for font sizes, as they conflict with zoom

Modified Paths:
--------------
    trunk/English.lproj/MainMenu.nib/keyedobjects.nib

Modified: trunk/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)


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