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

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

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

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.

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

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

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

Log Message:
-----------
Make selected font for text notes sticky. Change font in window controller, so the pdfview does not need to be first responder. 

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-04-02 16:20:23 UTC (rev 1698)
+++ trunk/SKMainWindowController.m	2007-04-02 16:43:20 UTC (rev 1699)
@@ -657,6 +657,18 @@
     }
 }
 
+- (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]];
+        if ([annotation respondsToSelector:@selector(setDefaultFont:)] && [annotation respondsToSelector:@selector(font)])
+            [(SKPDFAnnotationFreeText *)annotation setDefaultFont:font];
+        else
+            [(PDFAnnotationFreeText *)annotation setFont:font];
+        [pdfView setNeedsDisplayForAnnotation:annotation];
+    }
+}
+
 - (IBAction)createNewNote:(id)sender{
     int type = [sender tag];
     

Modified: trunk/SKPDFAnnotationNote.h
===================================================================
--- trunk/SKPDFAnnotationNote.h	2007-04-02 16:20:23 UTC (rev 1698)
+++ trunk/SKPDFAnnotationNote.h	2007-04-02 16:43:20 UTC (rev 1699)
@@ -94,6 +94,9 @@
 @end
 
 @interface SKPDFAnnotationFreeText : PDFAnnotationFreeText
+
+- (void)setDefaultFont:(NSFont *)newFont;
+
 @end
 
 @interface SKPDFAnnotationText : PDFAnnotationText

Modified: trunk/SKPDFAnnotationNote.m
===================================================================
--- trunk/SKPDFAnnotationNote.m	2007-04-02 16:20:23 UTC (rev 1698)
+++ trunk/SKPDFAnnotationNote.m	2007-04-02 16:43:20 UTC (rev 1699)
@@ -656,12 +656,17 @@
 @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];
     }
     return self;
 }
@@ -680,6 +685,14 @@
     }
 }
 
+- (void)setDefaultFont:(NSFont *)newFont {
+    [self setFont:newFont];
+    if (freeTextFont != newFont) {
+        [freeTextFont release];
+        freeTextFont = [newFont retain];
+    }
+}
+
 - (BOOL)isNoteAnnotation { return YES; }
 
 - (BOOL)isResizable { return YES; }

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m	2007-04-02 16:20:23 UTC (rev 1698)
+++ trunk/SKPDFView.m	2007-04-02 16:43:20 UTC (rev 1699)
@@ -1017,14 +1017,6 @@
     [self editActiveAnnotation:sender];
 }
 
-- (void)changeFont:(id)sender {
-    if ([activeAnnotation respondsToSelector:@selector(setFont:)] && [activeAnnotation respondsToSelector:@selector(font)]) {
-        NSFont *font = [[NSFontPanel sharedFontPanel] panelConvertFont:[(PDFAnnotationFreeText *)activeAnnotation font]];
-        [(PDFAnnotationFreeText *)activeAnnotation setFont:font];
-        [self setNeedsDisplayForAnnotation:activeAnnotation];
-    }
-}
-
 - (void)editActiveAnnotation:(id)sender {
     if (nil == activeAnnotation)
         return;


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: [1698] trunk/SKMainWindowController.m

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

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.

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

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

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

Log Message:
-----------
Don't edit new text notes, so it can be moved/resized/deleted. Use message as default text.

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

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m	2007-04-02 09:24:41 UTC (rev 1696)
+++ trunk/SKPDFView.m	2007-04-02 13:57:20 UTC (rev 1697)
@@ -936,9 +936,13 @@
     switch (annotationType) {
         case SKFreeTextNote:
             newAnnotation = [[SKPDFAnnotationFreeText alloc] initWithBounds:bounds];
+            if (text == nil)
+                text = NSLocalizedString(@"Double-click to edit.", @"Default text for new text note");
             break;
         case SKAnchoredNote:
             newAnnotation = [[SKPDFAnnotationNote alloc] initWithBounds:bounds];
+            if (text == nil)
+                text = NSLocalizedString(@"New note", @"Default text for new anchored note");
             break;
         case SKCircleNote:
             newAnnotation = [[SKPDFAnnotationCircle alloc] initWithBounds:NSInsetRect(bounds, -5.0, -5.0)];
@@ -956,12 +960,8 @@
             newAnnotation = [[SKPDFAnnotationMarkup alloc] initWithSelection:[self currentSelection] markupType:kPDFMarkupTypeUnderline];
             break;
 	}
-    if (text == nil) {
-        if ([newAnnotation isEditable])
-            text = NSLocalizedString(@"New note", @"Default text for new note");
-        else
-            text = [[[page selectionForRect:bounds] string] stringByCollapsingWhitespaceAndNewlinesAndRemovingSurroundingWhitespaceAndNewlines];
-    }
+    if (text == nil)
+        text = [[[page selectionForRect:bounds] string] stringByCollapsingWhitespaceAndNewlinesAndRemovingSurroundingWhitespaceAndNewlines];
         
     [newAnnotation setContents:text];
     
@@ -972,8 +972,9 @@
 
     [self setActiveAnnotation:newAnnotation];
     [newAnnotation release];
-    if ([newAnnotation isEditable])
-        [self editActiveAnnotation:self];
+    if (annotationType == SKAnchoredNote)
+		[[NSNotificationCenter defaultCenter] postNotificationName:SKPDFViewAnnotationDoubleClickedNotification object:self 
+            userInfo:[NSDictionary dictionaryWithObjectsAndKeys:activeAnnotation, @"annotation", nil]];
 }
 
 - (void)removeActiveAnnotation:(id)sender{


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: [1696] tags/REL_0_2/

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

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

Log Message:
-----------
Tag for release.

Added Paths:
-----------
    tags/REL_0_2/

Copied: tags/REL_0_2 (from rev 1695, trunk)


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: [1695] trunk

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

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

Log Message:
-----------
Update version for release.

Modified Paths:
--------------
    trunk/English.lproj/InfoPlist.strings
    trunk/English.lproj/Skim Help/version.texi
    trunk/Info.plist

Modified: trunk/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)

Modified: trunk/English.lproj/Skim Help/version.texi
===================================================================
--- trunk/English.lproj/Skim Help/version.texi	2007-04-01 18:05:02 UTC (rev 1694)
+++ trunk/English.lproj/Skim Help/version.texi	2007-04-02 09:23:59 UTC (rev 1695)
@@ -1 +1 @@
-@set VERSION 0.1
+@set VERSION 0.2

Modified: trunk/Info.plist
===================================================================
--- trunk/Info.plist	2007-04-01 18:05:02 UTC (rev 1694)
+++ trunk/Info.plist	2007-04-02 09:23:59 UTC (rev 1695)
@@ -231,11 +231,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1</string>
+	<string>0.2</string>
 	<key>CFBundleSignature</key>
 	<string>SKIM</string>
 	<key>CFBundleVersion</key>
-	<string>1.0</string>
+	<string>v2</string>
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSMainNibFile</key>


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: [1694] trunk/NSFileManager_ExtendedAttributes.m

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

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

Log Message:
-----------
Make a copy of the global errno variable, as it can change while looking up the message. 

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

Modified: trunk/NSFileManager_ExtendedAttributes.m
===================================================================
--- trunk/NSFileManager_ExtendedAttributes.m	2007-04-01 17:06:34 UTC (rev 1693)
+++ trunk/NSFileManager_ExtendedAttributes.m	2007-04-01 18:05:02 UTC (rev 1694)
@@ -49,6 +49,7 @@
 {
     const char *fsPath = [self fileSystemRepresentationWithPath:path];
     NSString *errMsg;
+    int err;
     
     int xopts;
     
@@ -64,8 +65,9 @@
     status = listxattr(fsPath, NULL, 0, xopts);
     
     if(status == -1){
-        errMsg = xattrError(errno, fsPath);
-        if(error) *error = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSFilePathErrorKey, errMsg, NSLocalizedDescriptionKey, nil]];
+        err = errno;
+        errMsg = xattrError(err, fsPath);
+        if(error) *error = [NSError errorWithDomain:NSPOSIXErrorDomain code:err userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSFilePathErrorKey, errMsg, NSLocalizedDescriptionKey, nil]];
         return nil;
     }
     
@@ -76,8 +78,9 @@
     status = listxattr(fsPath, namebuf, bufSize, xopts);
     
     if(status == -1){
-        errMsg = xattrError(errno, fsPath);
-        if(error) *error = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSFilePathErrorKey, errMsg, NSLocalizedDescriptionKey, nil]];
+        err = errno;
+        errMsg = xattrError(err, fsPath);
+        if(error) *error = [NSError errorWithDomain:NSPOSIXErrorDomain code:err userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSFilePathErrorKey, errMsg, NSLocalizedDescriptionKey, nil]];
         NSZoneFree(zone, namebuf);
         return nil;
     }
@@ -139,6 +142,7 @@
     const char *fsPath = [self fileSystemRepresentationWithPath:path];
     const char *attrName = [attr UTF8String];
     NSString *errMsg;
+    int err;
     
     int xopts;
     
@@ -152,8 +156,9 @@
     status = getxattr(fsPath, attrName, NULL, 0, 0, xopts);
     
     if(status == -1){
-        errMsg = xattrError(errno, fsPath);
-        if(error) *error = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSFilePathErrorKey, errMsg, NSLocalizedDescriptionKey, nil]];
+        int err = errno;
+        errMsg = xattrError(err, fsPath);
+        if(error) *error = [NSError errorWithDomain:NSPOSIXErrorDomain code:err userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSFilePathErrorKey, errMsg, NSLocalizedDescriptionKey, nil]];
         return nil;
     }
     
@@ -163,8 +168,9 @@
     status = getxattr(fsPath, attrName, namebuf, bufSize, 0, xopts);
     
     if(status == -1){
-        errMsg = xattrError(errno, fsPath);
-        if(error) *error = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSFilePathErrorKey, errMsg, NSLocalizedDescriptionKey, nil]];
+        err = errno;
+        errMsg = xattrError(err, fsPath);
+        if(error) *error = [NSError errorWithDomain:NSPOSIXErrorDomain code:err userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSFilePathErrorKey, errMsg, NSLocalizedDescriptionKey, nil]];
         NSZoneFree(NSDefaultMallocZone(), namebuf);
         return nil;
     }
@@ -243,6 +249,7 @@
     size_t dataSize = [value length];
     const char *attrName = [attr UTF8String];
     NSString *errMsg;
+    int err;
         
     // options passed to xattr functions
     int xopts = 0;
@@ -294,8 +301,9 @@
     } else {
         int status = setxattr(fsPath, attrName, data, dataSize, 0, xopts);
         if(status == -1){
-            errMsg = xattrError(errno, fsPath);
-            if(error) *error = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSFilePathErrorKey, errMsg, NSLocalizedDescriptionKey, nil]];
+            err = errno;
+            errMsg = xattrError(err, fsPath);
+            if(error) *error = [NSError errorWithDomain:NSPOSIXErrorDomain code:err userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSFilePathErrorKey, errMsg, NSLocalizedDescriptionKey, nil]];
             success = NO;
         } else {
             success = YES;
@@ -327,6 +335,7 @@
     const char *fsPath = [self fileSystemRepresentationWithPath:path];
     const char *attrName = [attr UTF8String];
     NSString *errMsg;
+    int err;
     
     int xopts;
     
@@ -388,8 +397,9 @@
     status = removexattr(fsPath, attrName, xopts);
     
     if(status == -1){
-        errMsg = xattrError(errno, fsPath);
-        if(error) *error = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSFilePathErrorKey, errMsg, NSLocalizedDescriptionKey, nil]];
+        err = errno;
+        errMsg = xattrError(err, fsPath);
+        if(error) *error = [NSError errorWithDomain:NSPOSIXErrorDomain code:err userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSFilePathErrorKey, errMsg, NSLocalizedDescriptionKey, nil]];
         return NO;
     } else 
         return YES;    
@@ -413,7 +423,7 @@
 }
 
 // guaranteed to return non-nil
-static NSString *xattrError(int err, const char *myPath)
+static NSString *xattrError(const int err, const char *myPath)
 {
     NSString *errMsg = nil;
     switch (err)


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: [1693] trunk/skimnotes.m

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

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

Log Message:
-----------
Missing skim notes is not an error. 

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

Modified: trunk/skimnotes.m
===================================================================
--- trunk/skimnotes.m	2007-04-01 14:59:06 UTC (rev 1692)
+++ trunk/skimnotes.m	2007-04-01 17:06:34 UTC (rev 1693)
@@ -58,16 +58,25 @@
     
     if ([fm fileExistsAtPath:pdfPath isDirectory:&isDir] == NO || isDir) {
     } else if (action == SKNActionGet) {
-        NSData *data = [fm extendedAttributeNamed:SKIM_NOTES_KEY atPath:pdfPath traverseLink:YES error:NULL];
+        NSError *error = nil;
+        NSData *data = [fm extendedAttributeNamed:SKIM_NOTES_KEY atPath:pdfPath traverseLink:YES error:&error];
+        if (data == nil && [error code] == ENOATTR)
+            data = [NSKeyedArchiver archivedDataWithRootObject:[NSArray array]];
         if (data)
             success = [data writeToFile:notesPath atomically:YES];
     } else if (action == SKNActionSet && notesPath && [fm fileExistsAtPath:notesPath isDirectory:&isDir] && isDir == NO) {
         NSData *data = [NSData dataWithContentsOfFile:notesPath];
-        if (data)
-            success = [fm removeExtendedAttribute:SKIM_NOTES_KEY atPath:pdfPath traverseLink:YES error:NULL] &&
-                      [fm setExtendedAttributeNamed:SKIM_NOTES_KEY toValue:data atPath:pdfPath options:0 error:NULL];
+        NSError *error = nil;
+        if (data) {
+            success = [fm removeExtendedAttribute:SKIM_NOTES_KEY atPath:pdfPath traverseLink:YES error:&error];
+            if (success || [error code] == ENOATTR)
+                success = [fm setExtendedAttributeNamed:SKIM_NOTES_KEY toValue:data atPath:pdfPath options:0 error:NULL];
+        }
     } else if (action == SKNActionRemove) {
-        success = [fm removeExtendedAttribute:SKIM_NOTES_KEY atPath:pdfPath traverseLink:YES error:NULL];
+        NSError *error = nil;
+        success = [fm removeExtendedAttribute:SKIM_NOTES_KEY atPath:pdfPath traverseLink:YES error:&error];
+        if (success == NO && [error code] == ENOATTR)
+            success = YES;
     }
     
     [pool 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: [1692] trunk/skimnotes.m

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

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

Log Message:
-----------
Complete relative paths. Derive notes file path from pdf file path when not provided.

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

Modified: trunk/skimnotes.m
===================================================================
--- trunk/skimnotes.m	2007-04-01 12:27:07 UTC (rev 1691)
+++ trunk/skimnotes.m	2007-04-01 14:59:06 UTC (rev 1692)
@@ -3,7 +3,7 @@
 
 #define SKIM_NOTES_KEY @"net_sourceforge_skim-app_notes"
 
-static char *usageStr = "Usage:\n skimnotes set PDF_FILE SKIM_FILE\n skimnotes get PDF_FILE SKIM_FILE\n skimnotes remove PDF_FILE";
+static char *usageStr = "Usage:\n skimnotes set PDF_FILE [SKIM_FILE]\n skimnotes get PDF_FILE [SKIM_FILE]\n skimnotes remove PDF_FILE";
 static char *versionStr = "SkimNotes command-line client, version 0.1.";
 
 enum {
@@ -12,15 +12,22 @@
     SKNActionRemove
 };
 
+static inline NSString *SKNNormalizedPath(NSString *path, NSString *basePath) {
+    unichar ch = [path length] ? [path characterAtIndex:0] : 0;
+    if (basePath && ch != '/' && ch != '~')
+        path = [basePath stringByAppendingPathComponent:path];
+    return [path stringByStandardizingPath];
+}
+
 int main (int argc, const char * argv[]) {
 	int action = 0;
     
     if (argc == 2 && (strcmp("-h", argv[1]) == 0 || strcmp("-help", argv[1]) == 0)) {
         fprintf (stderr, "%s\n%s\n", usageStr, versionStr);
         exit (0);
-    } else if (argc > 3 && strcmp("get", argv[1]) == 0) {
+    } else if (argc > 2 && strcmp("get", argv[1]) == 0) {
         action = SKNActionGet;
-    } else if (argc > 3 && strcmp("set", argv[1]) == 0) {
+    } else if (argc > 2 && strcmp("set", argv[1]) == 0) {
         action = SKNActionSet;
     } else if (argc > 2 && strcmp("remove", argv[1]) == 0) {
         action = SKNActionRemove;
@@ -29,14 +36,26 @@
         exit (1);
     }
     
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
  
     NSFileManager *fm = [NSFileManager defaultManager];
     BOOL success = NO;
-    NSString *pdfPath = [[[[NSProcessInfo processInfo] arguments] objectAtIndex:2] stringByStandardizingPath];
-    NSString *notesPath = action == SKNActionRemove ? nil : [[[[NSProcessInfo processInfo] arguments] objectAtIndex:3] stringByStandardizingPath];
+    NSString *currentDir = [fm currentDirectoryPath];
+    NSString *pdfPath = SKNNormalizedPath([[[NSProcessInfo processInfo] arguments] objectAtIndex:2], currentDir);
+    NSString *notesPath = argc < 4 ? nil : SKNNormalizedPath([[[NSProcessInfo processInfo] arguments] objectAtIndex:3], currentDir);
     BOOL isDir = NO;
     
+    if (action != SKNActionRemove && notesPath == nil) {
+        if ([[pdfPath pathExtension] caseInsensitiveCompare:@"pdf"] == NSOrderedSame)
+            notesPath = [[pdfPath stringByDeletingPathExtension] stringByAppendingPathExtension:@"skim"];
+        else
+            notesPath = [pdfPath stringByAppendingPathExtension:@"skim"];
+    }
+    
+    if ([[pdfPath pathExtension] caseInsensitiveCompare:@"pdf"] == NSOrderedSame && 
+        ([fm fileExistsAtPath:pdfPath isDirectory:&isDir] == NO || isDir))
+        pdfPath = [pdfPath stringByAppendingPathExtension:@"pdf"];
+    
     if ([fm fileExistsAtPath:pdfPath isDirectory:&isDir] == NO || isDir) {
     } else if (action == SKNActionGet) {
         NSData *data = [fm extendedAttributeNamed:SKIM_NOTES_KEY atPath:pdfPath traverseLink:YES error: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: [1691] trunk/SKMainWindowController.m

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

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.

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

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

Revision: 1690
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1690&view=rev
Author:   hofman
Date:     2007-04-01 02:33:53 -0700 (Sun, 01 Apr 2007)

Log Message:
-----------
Link to copy of help on the web. Add info to reading bar help. 

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-03-31 21:09:35 UTC (rev 1689)
+++ trunk/English.lproj/Skim Help/skim.texi	2007-04-01 09:33:53 UTC (rev 1690)
@@ -764,7 +764,7 @@
 @item To move the reading bar to the next (previous) line, hold down the Option key and press the down arrow (up arrow) key.
 @end itemize
 @itemize
-@item To move the reading bar to the next (previous) page, hold down the Option key and press the left arrow (right arrow) key.
+@item To move the reading bar to the next (previous) page, hold down the Option key and press the right arrow (left arrow) key.
 @end itemize
 @endbox
 
@@ -788,6 +788,8 @@
 @end itemize
 @endbox
 
+You can also choose whether the reading bar should highlight just the current line, or mask all the other text. Select or deselect "Invert bar" in the preferences. 
+
 @heading See also
 @menu
 * Showing the reading bar::
@@ -1039,6 +1041,7 @@
 @heading Online Resources
 @itemize
 @item @uref{http://skim-app.sourceforge.net, Skim Website}
+@item @uref{http://skim-app.sourceforge.net/manual, Online copy of this manual}
 @end itemize
 
 @heading Mailing List


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: [1689] trunk/SKSplitView.m

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

Revision: 1689
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1689&view=rev
Author:   hofman
Date:     2007-03-31 14:09:35 -0700 (Sat, 31 Mar 2007)

Log Message:
-----------
Draw custom splitview handle. No need to calculate the divider rect, it's already been done. 

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

Modified: trunk/SKSplitView.m
===================================================================
--- trunk/SKSplitView.m	2007-03-31 19:50:59 UTC (rev 1688)
+++ trunk/SKSplitView.m	2007-03-31 21:09:35 UTC (rev 1689)
@@ -68,12 +68,12 @@
         for (i = 0; i < (count-1); i++) {
             view = [subviews objectAtIndex:i];
             divRect = [view frame];
-            if ([self isVertical] == NO) {
+            if ([self isVertical]) {
+                divRect.origin.x = NSMaxX (divRect);
+                divRect.size.width = [self dividerThickness];
+            } else {
                 divRect.origin.y = NSMaxY (divRect);
                 divRect.size.height = [self dividerThickness];
-            } else {
-                divRect.origin.x = NSMaxX (divRect);
-                divRect.size.width = [self dividerThickness];
             }
             
             if (NSPointInRect(mouseLoc, divRect)) {
@@ -85,29 +85,55 @@
     [super mouseDown:theEvent];
 }
 
-- (void)drawRect:(NSRect)rect {
-	
-	NSArray *subviews = [self subviews];
-	int i, count = [subviews count];
-	id view;
-	NSRect divRect;
-
-	// draw the dimples 
-	for (i = 0; i < (count-1); i++) {
-		view = [subviews objectAtIndex:i];
-		divRect = [view frame];
-		if ([self isVertical] == NO) {
-			divRect.origin.y = NSMaxY (divRect);
-			divRect.size.height = [self dividerThickness];
-		} else {
-			divRect.origin.x = NSMaxX (divRect);
-			divRect.size.width = [self dividerThickness];
-		}
-		if (NSIntersectsRect(rect, divRect)) {
-			[[NSBezierPath bezierPathWithRect:divRect] fillPathVertically:![self isVertical] withStartColor:[[self class] startColor] endColor:[[self class] endColor]];
-			[self drawDividerInRect: divRect];
-		}
-	}
+- (void)drawDividerInRect:(NSRect)aRect {
+    NSPoint startPoint, endPoint;
+    float handleSize = 20.0;
+    NSColor *darkColor = [NSColor colorWithDeviceWhite:0.6 alpha:1.0];
+    NSColor *lightColor = [NSColor colorWithDeviceWhite:0.95 alpha:1.0];
+    
+    // Draw the gradient
+    [[NSBezierPath bezierPathWithRect:aRect] fillPathVertically:NO == [self isVertical] withStartColor:[[self class] startColor] endColor:[[self class] endColor]];
+    
+    [NSGraphicsContext saveGraphicsState];
+    
+    // Draw the handle
+    [NSBezierPath setDefaultLineWidth:1.0];
+    
+    if ([self isVertical]) {
+        handleSize = fmin(handleSize, 2.0 * floorf(0.5 * NSHeight(aRect)));
+        startPoint = NSMakePoint(NSMinX(aRect) + 1.5, NSMidY(aRect) - 0.5 * handleSize);
+        endPoint = NSMakePoint(startPoint.x, startPoint.y + handleSize);
+        [darkColor set];
+        [NSBezierPath strokeLineFromPoint:startPoint toPoint:endPoint];
+        startPoint.x += 2.0;
+        endPoint.x += 2.0;
+        [NSBezierPath strokeLineFromPoint:startPoint toPoint:endPoint];
+        [lightColor set];
+        startPoint.x -= 1.0;
+        endPoint.x -= 1.0;
+        [NSBezierPath strokeLineFromPoint:startPoint toPoint:endPoint];
+        startPoint.x += 2.0;
+        endPoint.x += 2.0;
+        [NSBezierPath strokeLineFromPoint:startPoint toPoint:endPoint];
+    } else {
+        handleSize = fmin(handleSize, 2.0 * floorf(0.5 * NSWidth(aRect)));
+        startPoint = NSMakePoint(NSMidX(aRect) - 0.5 * handleSize, NSMinY(aRect) + 1.5);
+        endPoint = NSMakePoint(startPoint.x + handleSize, startPoint.y);
+        [darkColor set];
+        [NSBezierPath strokeLineFromPoint:startPoint toPoint:endPoint];
+        startPoint.y += 2.0;
+        endPoint.y += 2.0;
+        [NSBezierPath strokeLineFromPoint:startPoint toPoint:endPoint];
+        [lightColor set];
+        startPoint.y -= 1.0;
+        endPoint.y -= 1.0;
+        [NSBezierPath strokeLineFromPoint:startPoint toPoint:endPoint];
+        startPoint.y += 2.0;
+        endPoint.y += 2.0;
+        [NSBezierPath strokeLineFromPoint:startPoint toPoint:endPoint];
+    }
+    
+    [NSGraphicsContext restoreGraphicsState];
 }
 
 - (float)dividerThickness {


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: [1688] trunk

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

Revision: 1688
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1688&view=rev
Author:   hofman
Date:     2007-03-31 12:50:59 -0700 (Sat, 31 Mar 2007)

Log Message:
-----------
split textstorage editing notifications for anchored notes

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

Modified: trunk/SKPDFAnnotationNote.h
===================================================================
--- trunk/SKPDFAnnotationNote.h	2007-03-31 13:58:14 UTC (rev 1687)
+++ trunk/SKPDFAnnotationNote.h	2007-03-31 19:50:59 UTC (rev 1688)
@@ -110,8 +110,6 @@
 
 - (void)setRichText:(id)newText;
 
-- (void)textStorageDidProcessEditing:(NSNotification *)notification;
-
 @end
 
 @interface SKPDFAnnotationTemporary : PDFAnnotationCircle

Modified: trunk/SKPDFAnnotationNote.m
===================================================================
--- trunk/SKPDFAnnotationNote.m	2007-03-31 13:58:14 UTC (rev 1687)
+++ trunk/SKPDFAnnotationNote.m	2007-03-31 19:50:59 UTC (rev 1688)
@@ -893,12 +893,16 @@
     return texts;
 }
 
-- (void)textStorageDidProcessEditing:(NSNotification *)notification;
+- (void)textStorageWillProcessEditing:(NSNotification *)notification;
 {
     [[NSNotificationCenter defaultCenter] postNotificationName:SKAnnotationWillChangeNotification
             object:self
           userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"text", @"key", nil]];
     [self willChangeValueForKey:@"text"];
+}
+
+- (void)textStorageDidProcessEditing:(NSNotification *)notification;
+{
     [self didChangeValueForKey:@"text"];
     [[NSNotificationCenter defaultCenter] postNotificationName:SKAnnotationDidChangeNotification
             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: [1687] trunk

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

Revision: 1687
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1687&view=rev
Author:   hofman
Date:     2007-03-31 06:58:14 -0700 (Sat, 31 Mar 2007)

Log Message:
-----------
Improve scripting of text properties. Make main text property the contents and type contents of a note rich as text so we can use the text suite. 

Modified Paths:
--------------
    trunk/SKPDFAnnotationNote.h
    trunk/SKPDFAnnotationNote.m
    trunk/Skim.sdef

Modified: trunk/SKPDFAnnotationNote.h
===================================================================
--- trunk/SKPDFAnnotationNote.h	2007-03-30 21:57:18 UTC (rev 1686)
+++ trunk/SKPDFAnnotationNote.h	2007-03-31 13:58:14 UTC (rev 1687)
@@ -68,6 +68,8 @@
 
 - (NSScriptObjectSpecifier *)objectSpecifier;
 - (int)noteType;
+- (id)textContents;
+- (void)setTextContents:(id)text;
 - (id)richText;
 - (void)setBoundsAsQDRect:(NSData *)inQDBoundsAsData;
 - (NSData *)boundsAsQDRect;
@@ -99,13 +101,17 @@
 
 @interface SKPDFAnnotationNote : PDFAnnotationText {
     NSImage *image;
-    NSAttributedString *text;
+    NSTextStorage *textStorage;
     NSArray *texts;
 }
 
 - (void)setImage:(NSImage *)newImage;
 - (void)setText:(NSAttributedString *)newText;
 
+- (void)setRichText:(id)newText;
+
+- (void)textStorageDidProcessEditing:(NSNotification *)notification;
+
 @end
 
 @interface SKPDFAnnotationTemporary : PDFAnnotationCircle

Modified: trunk/SKPDFAnnotationNote.m
===================================================================
--- trunk/SKPDFAnnotationNote.m	2007-03-30 21:57:18 UTC (rev 1686)
+++ trunk/SKPDFAnnotationNote.m	2007-03-31 13:58:14 UTC (rev 1687)
@@ -236,8 +236,22 @@
     return 0;
 }
 
+- (id)textContents;
+{
+    return [self contents] ? [[[NSTextStorage alloc] initWithString:[self contents]] autorelease] : [NSNull null];
+}
+
+- (void)setTextContents:(id)text;
+{
+    [self setContents:[text string]];
+}
+
+- (id)coerceValueForTextContents:(id)value {
+    return [[NSScriptCoercionHandler sharedCoercionHandler] coerceValue:value toClass:[NSTextStorage class]];
+}
+
 - (id)richText {
-    return [self text] ? [[[NSTextStorage alloc] initWithAttributedString:[self text]] autorelease] : [NSNull null];
+    return [NSNull null];
 }
 
 - (void)setBoundsAsQDRect:(NSData *)inQDBoundsAsData {
@@ -694,6 +708,15 @@
     [[NSNotificationCenter defaultCenter] postNotificationName:SKAnnotationDidChangeNotification object:self];
 }
 
+#pragma mark Scripting support
+
+- (id)textContents {
+    NSTextStorage *textContents = [[[NSTextStorage alloc] initWithString:[self contents]] autorelease];
+    if ([self font])
+        [textContents addAttribute:NSFontAttributeName value:[self font] range:NSMakeRange(0, [textContents length])];
+    return [self contents] ? textContents : (id)[NSNull null];
+}
+
 @end
 
 #pragma mark -
@@ -767,6 +790,8 @@
             noteColor = [[NSColor colorWithDeviceRed:1.0 green:1.0 blue:0.5 alpha:1.0] retain];
         [self setColor:noteColor];
         texts = [[NSArray alloc] initWithObjects:[[[SKNoteText alloc] initWithAnnotation:self] autorelease], nil];
+        textStorage = [[NSTextStorage allocWithZone:[self zone]] init];
+        [textStorage setDelegate:self];
     }
     return self;
 }
@@ -780,7 +805,7 @@
 }
 
 - (void)dealloc {
-    [text release];
+    [textStorage release];
     [image release];
     [texts release];
     [super dealloc];
@@ -854,20 +879,13 @@
 
 - (NSAttributedString *)text;
 {
-    return text;
+    return [[[NSAttributedString allocWithZone:[self zone]] initWithAttributedString:textStorage] autorelease];
 }
 
 - (void)setText:(NSAttributedString *)newText;
 {
-    if (text != newText) {
-        [[NSNotificationCenter defaultCenter] postNotificationName:SKAnnotationWillChangeNotification
-                object:self
-              userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"text", @"key", nil]];
-        [text release];
-        text = [newText retain];
-        [[NSNotificationCenter defaultCenter] postNotificationName:SKAnnotationDidChangeNotification
-                object:self
-              userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"text", @"key", nil]];
+    if (textStorage != newText) {
+        [textStorage replaceCharactersInRange:NSMakeRange(0, [textStorage length]) withAttributedString:newText];
     }
 }
 
@@ -875,6 +893,45 @@
     return texts;
 }
 
+- (void)textStorageDidProcessEditing:(NSNotification *)notification;
+{
+    [[NSNotificationCenter defaultCenter] postNotificationName:SKAnnotationWillChangeNotification
+            object:self
+          userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"text", @"key", nil]];
+    [self willChangeValueForKey:@"text"];
+    [self didChangeValueForKey:@"text"];
+    [[NSNotificationCenter defaultCenter] postNotificationName:SKAnnotationDidChangeNotification
+            object:self
+          userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"text", @"key", nil]];
+}
+
+#pragma mark Scripting support
+
+- (id)richText;
+{
+    return textStorage;
+}
+
+- (void)setRichText:(id)newText;
+{
+    if (newText != textStorage) {
+        // We are willing to accept either a string or an attributed string.
+        if ([newText isKindOfClass:[NSAttributedString class]])
+            [textStorage replaceCharactersInRange:NSMakeRange(0, [textStorage length]) withAttributedString:newText];
+        else
+            [textStorage replaceCharactersInRange:NSMakeRange(0, [textStorage length]) withString:newText];
+    }
+}
+
+- (id)coerceValueForRichText:(id)value;
+{
+    // We want to just get Strings unchanged.  We will detect this and do the right thing in setRichText.  We do this because, this way, we will do more reasonable things about attributes when we are receiving plain text.
+    if ([value isKindOfClass:[NSString class]])
+        return value;
+    else
+        return [[NSScriptCoercionHandler sharedCoercionHandler] coerceValue:value toClass:[NSTextStorage class]];
+}
+
 @end
 
 #pragma mark -

Modified: trunk/Skim.sdef
===================================================================
--- trunk/Skim.sdef	2007-03-30 21:57:18 UTC (rev 1686)
+++ trunk/Skim.sdef	2007-03-31 13:58:14 UTC (rev 1687)
@@ -85,6 +85,9 @@
             <responds-to name="save">
                 <cocoa method="handleSaveScriptCommand:"/>
             </responds-to>
+            <responds-to name="find">
+                <cocoa method="handleFindScriptCommand:"/>
+            </responds-to>
         </class>
         
         <class name="window" code="cwin"
@@ -502,6 +505,10 @@
                 description="Notes in the page">
                 <cocoa key="notes"/>
             </element>
+            <contents name="text" code="ctxt" type="rich text" access="r"
+                description="The text of the page.">
+                <cocoa key="richText"/>
+            </contents>
             <property name="label" code="Labl" type="text" access="r"
                 description="The label of the page.">
                 <cocoa key="label"/>
@@ -510,14 +517,6 @@
                 description="The bounding rectangle of the page (left, top, right, bottom).">
                 <cocoa key="boundsAsQDRect"/>
             </property>
-            <property name="text" code="ctxt" type="text" access="r"
-                description="The text of the page.">
-                <cocoa key="text"/>
-            </property>
-            <property name="rich text" code="ricT" type="rich text" access="r"
-                description="The rich text of the page.">
-                <cocoa key="richText"/>
-            </property>
             <responds-to name="go to">
                 <cocoa method="handleGoToScriptCommand:"/>
             </responds-to>
@@ -530,10 +529,10 @@
                 description="The type of note.">
                 <cocoa key="noteType"/>
             </property>
-            <property name="text" code="ctxt" type="text"
-                description="The text of the note.">
-                <cocoa key="contents"/>
-            </property>
+            <contents name="text" code="ctxt" type="rich text"
+                description="The text of the note. Attributes are ignored.">
+                <cocoa key="textContents"/>
+            </contents>
             <property name="color" code="cRGB" type="color"
                 description="The color of the note.">
                 <cocoa key="color"/>
@@ -574,7 +573,7 @@
 
         <command name="go to" code="SKIMGoTo"
             description="Go to a location.">
-            <direct-parameter description="the page or note to go to.">
+            <direct-parameter description="The page or note to go to.">
                 <type type="page"/>
                 <type type="note"/>
             </direct-parameter>


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: [1686] trunk

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

Revision: 1686
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1686&view=rev
Author:   amaxwell
Date:     2007-03-30 14:57:18 -0700 (Fri, 30 Mar 2007)

Log Message:
-----------
Fix fullscreen mode problems with multiple displays, particularly when resolution is different.  The full screen window's frame as returned from init was incorrect, so its screen method returned nil the first time through.

I'm not entirely sure what the problem is with the nav window, but when going fullscreen on a low-res display, then fullscreen on a high-res display, the nav window showed up in the wrong place.  Recreating it always works.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-03-30 21:53:52 UTC (rev 1685)
+++ trunk/SKMainWindowController.m	2007-03-30 21:57:18 UTC (rev 1686)
@@ -964,12 +964,15 @@
     
     if (screen == nil) // @@ screen: can this ever happen?
         screen = [NSScreen mainScreen];
-    
+        
     // Create the full-screen window if it does not already  exist.
     if (fullScreenWindow == nil) {
         fullScreenWindow = [[SKFullScreenWindow alloc] initWithScreen:screen];
         [fullScreenWindow setDelegate:self];
-    } else if (screen != [fullScreenWindow screen]) {
+    }
+        
+    // 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
+    if ([screen isEqual:[fullScreenWindow screen]] == NO) {
         [fullScreenWindow setFrame:[screen frame] display:NO];
     }
     

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m	2007-03-30 21:53:52 UTC (rev 1685)
+++ trunk/SKPDFView.m	2007-03-30 21:57:18 UTC (rev 1686)
@@ -1233,13 +1233,14 @@
     autohidesCursor = hideCursor;
     
     if (hasNavigation) {
-        if (navWindow == nil) {
-            navWindow = [[SKNavigationWindow alloc] initWithPDFView:self];
+        // always recreate the navWindow, since moving between screens of different resolution can mess up the location (in spite of moveToScreen:)
+        if (navWindow != nil)
+            [navWindow release];
+        else
             [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(handleWindowWillCloseNotification:) 
                                                          name: NSWindowWillCloseNotification object: [self window]];
-        } else if ([[self window] screen] != [navWindow screen]) {
-            [navWindow moveToScreen:[[self window] screen]];
-        }
+        navWindow = [[SKNavigationWindow alloc] initWithPDFView:self];
+        [navWindow moveToScreen:[[self window] screen]];
         [navWindow setLevel:[[self window] level]];
     } else if ([navWindow isVisible]) {
         [navWindow orderOut: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: [1685] trunk/SKFullScreenWindow.m

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

Revision: 1685
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1685&view=rev
Author:   amaxwell
Date:     2007-03-30 14:53:52 -0700 (Fri, 30 Mar 2007)

Log Message:
-----------
Fix accessor (though it appears unused)

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

Modified: trunk/SKFullScreenWindow.m
===================================================================
--- trunk/SKFullScreenWindow.m	2007-03-30 18:05:33 UTC (rev 1684)
+++ trunk/SKFullScreenWindow.m	2007-03-30 21:53:52 UTC (rev 1685)
@@ -78,7 +78,7 @@
 }
 
 - (NSView *)mainView {
-    return [[self contentView] lastObject];
+    return [[[self contentView] subviews] lastObject];
 }
 
 - (void)setMainView:(NSView *)view {


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: [1684] trunk/SKPDFAnnotationNote.m

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

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

Log Message:
-----------
Don't create markups from applescript

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

Modified: trunk/SKPDFAnnotationNote.m
===================================================================
--- trunk/SKPDFAnnotationNote.m	2007-03-30 17:26:31 UTC (rev 1683)
+++ trunk/SKPDFAnnotationNote.m	2007-03-30 18:05:33 UTC (rev 1684)
@@ -179,6 +179,10 @@
                 [currentCommand setScriptErrorNumber:NSRequiredArgumentsMissingScriptError]; 
                 [currentCommand setScriptErrorString:NSLocalizedString(@"New notes need a type.", @"Error description")];
                 return nil;
+            } else if (type == SKASHighlightNote || type == SKASStrikeOutNote || type == SKASUnderlineNote) {
+                [currentCommand setScriptErrorNumber:NSArgumentsWrongScriptError]; 
+                [currentCommand setScriptErrorString:NSLocalizedString(@"Text markups cannot be created in scripts.", @"Error description")];
+                return nil;
             }
             
             PDFAnnotation *annotation = nil;


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: [1683] trunk/Skim.sdef

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

Revision: 1683
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1683&view=rev
Author:   hofman
Date:     2007-03-30 10:26:31 -0700 (Fri, 30 Mar 2007)

Log Message:
-----------
Revert the last change. Hit the wrong button.

Modified Paths:
--------------
    trunk/Skim.sdef

Modified: trunk/Skim.sdef
===================================================================
--- trunk/Skim.sdef	2007-03-30 17:25:29 UTC (rev 1682)
+++ trunk/Skim.sdef	2007-03-30 17:26:31 UTC (rev 1683)
@@ -76,10 +76,6 @@
                 description="The text of the document.">
                 <cocoa key="text"/>
             </property>
-            <property name="current selection" code="CSel" type="selection" access="r"
-                description="The selection of the document.">
-                <cocoa key="currentSelection"/>
-            </property>
             <responds-to name="close">
                 <cocoa method="handleCloseScriptCommand:"/>
             </responds-to>
@@ -559,24 +555,6 @@
             </responds-to>
         </class>
         
-        <class name="selection" plural="selections" code="sele" inherits="item"
-            description="A selection.">
-            <cocoa class="PDFSelection"/>
-            <property name="text" code="ctxt" type="text"
-                description="The text of the selection.">
-                <cocoa key="string"/>
-            </property>
-            <property name="pages" code="Pags" access="r"
-                description="The pages for the selection.">
-                <type type="page" list="yes"/>
-                <cocoa key="pages"/>
-            </property>
-            <property name="bounds" code="pbnd" type="rectangle"
-                description="The bounding rectangle of the note (left, top, right, bottom).">
-                <cocoa key="boundsAsQDRect"/>
-            </property>
-        </class>
-        
         <enumeration name="note type" code="NTpE">
             <enumerator name="text note" code="NTxt"
                 description="Text note."/>


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: [1682] trunk/Skim.sdef

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

Revision: 1682
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1682&view=rev
Author:   hofman
Date:     2007-03-30 10:25:29 -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/Skim.sdef

Modified: trunk/Skim.sdef
===================================================================
--- trunk/Skim.sdef	2007-03-30 16:08:16 UTC (rev 1681)
+++ trunk/Skim.sdef	2007-03-30 17:25:29 UTC (rev 1682)
@@ -76,6 +76,10 @@
                 description="The text of the document.">
                 <cocoa key="text"/>
             </property>
+            <property name="current selection" code="CSel" type="selection" access="r"
+                description="The selection of the document.">
+                <cocoa key="currentSelection"/>
+            </property>
             <responds-to name="close">
                 <cocoa method="handleCloseScriptCommand:"/>
             </responds-to>
@@ -555,6 +559,24 @@
             </responds-to>
         </class>
         
+        <class name="selection" plural="selections" code="sele" inherits="item"
+            description="A selection.">
+            <cocoa class="PDFSelection"/>
+            <property name="text" code="ctxt" type="text"
+                description="The text of the selection.">
+                <cocoa key="string"/>
+            </property>
+            <property name="pages" code="Pags" access="r"
+                description="The pages for the selection.">
+                <type type="page" list="yes"/>
+                <cocoa key="pages"/>
+            </property>
+            <property name="bounds" code="pbnd" type="rectangle"
+                description="The bounding rectangle of the note (left, top, right, bottom).">
+                <cocoa key="boundsAsQDRect"/>
+            </property>
+        </class>
+        
         <enumeration name="note type" code="NTpE">
             <enumerator name="text note" code="NTxt"
                 description="Text note."/>


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: [1681] trunk/SKMainWindowController.m

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

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.

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

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

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.

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

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

Revision: 1679
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1679&view=rev
Author:   hofman
Date:     2007-03-30 05:44:24 -0700 (Fri, 30 Mar 2007)

Log Message:
-----------
Use current mouse position for takeSnapshot action if inside a page. 

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

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m	2007-03-30 12:32:33 UTC (rev 1678)
+++ trunk/SKPDFView.m	2007-03-30 12:44:24 UTC (rev 1679)
@@ -1186,9 +1186,15 @@
         point = [[sender representedObject] pointValue];
         page = [self pageForPoint:point nearest:YES];
     } else {
-		NSRect viewFrame = [self frame];
-        point = NSMakePoint(NSMidX(viewFrame), NSMidY(viewFrame));
-        page = [self currentPage];
+		// First try the current mouse position
+        point = [self convertPoint:[[self window] mouseLocationOutsideOfEventStream] fromView:nil];
+        page = [self pageForPoint:point nearest:NO];
+        if (page == nil) {
+            // Get the center
+            NSRect viewFrame = [self frame];
+            point = NSMakePoint(NSMidX(viewFrame), NSMidY(viewFrame));
+            page = [self pageForPoint:point nearest:YES];
+        }
     }
     
     point = [self convertPoint:point toPage:page];


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: [1678] trunk/Images

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

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

Log Message:
-----------
Resize note icons for outlineview

Modified Paths:
--------------
    trunk/Images/AnchoredNoteAdorn.tiff
    trunk/Images/CircleNoteAdorn.tiff
    trunk/Images/HighlightNoteAdorn.tiff
    trunk/Images/SquareNoteAdorn.tiff
    trunk/Images/StrikeOutNoteAdorn.tiff
    trunk/Images/TextNoteAdorn.tiff
    trunk/Images/UnderlineNoteAdorn.tiff

Modified: trunk/Images/AnchoredNoteAdorn.tiff
===================================================================
(Binary files differ)

Modified: trunk/Images/CircleNoteAdorn.tiff
===================================================================
(Binary files differ)

Modified: trunk/Images/HighlightNoteAdorn.tiff
===================================================================
(Binary files differ)

Modified: trunk/Images/SquareNoteAdorn.tiff
===================================================================
(Binary files differ)

Modified: trunk/Images/StrikeOutNoteAdorn.tiff
===================================================================
(Binary files differ)

Modified: trunk/Images/TextNoteAdorn.tiff
===================================================================
(Binary files differ)

Modified: trunk/Images/UnderlineNoteAdorn.tiff
===================================================================
(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: [1677] trunk

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

Revision: 1677
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1677&view=rev
Author:   hofman
Date:     2007-03-30 05:22:58 -0700 (Fri, 30 Mar 2007)

Log Message:
-----------
Rename note icons for outlineview

Modified Paths:
--------------
    trunk/SKNoteOutlineView.m
    trunk/Skim.xcodeproj/project.pbxproj

Added Paths:
-----------
    trunk/Images/AnchoredNoteAdorn.tiff
    trunk/Images/CircleNoteAdorn.tiff
    trunk/Images/HighlightNoteAdorn.tiff
    trunk/Images/SquareNoteAdorn.tiff
    trunk/Images/StrikeOutNoteAdorn.tiff
    trunk/Images/TextNoteAdorn.tiff
    trunk/Images/UnderlineNoteAdorn.tiff

Removed Paths:
-------------
    trunk/Images/AnnotateToolAdorn.tiff
    trunk/Images/CircleToolAdorn.tiff
    trunk/Images/HighlightToolAdorn.tiff
    trunk/Images/NoteToolAdorn.tiff
    trunk/Images/PopUpToolAdorn.tiff
    trunk/Images/SquareToolAdorn.tiff
    trunk/Images/StrikeOutToolAdorn.tiff
    trunk/Images/UnderlineToolAdorn.tiff

Copied: trunk/Images/AnchoredNoteAdorn.tiff (from rev 1671, trunk/Images/NoteToolAdorn.tiff)
===================================================================
(Binary files differ)

Deleted: trunk/Images/AnnotateToolAdorn.tiff
===================================================================
(Binary files differ)

Copied: trunk/Images/CircleNoteAdorn.tiff (from rev 1671, trunk/Images/CircleToolAdorn.tiff)
===================================================================
(Binary files differ)

Deleted: trunk/Images/CircleToolAdorn.tiff
===================================================================
(Binary files differ)

Copied: trunk/Images/HighlightNoteAdorn.tiff (from rev 1671, trunk/Images/HighlightToolAdorn.tiff)
===================================================================
(Binary files differ)

Deleted: trunk/Images/HighlightToolAdorn.tiff
===================================================================
(Binary files differ)

Deleted: trunk/Images/NoteToolAdorn.tiff
===================================================================
(Binary files differ)

Deleted: trunk/Images/PopUpToolAdorn.tiff
===================================================================
(Binary files differ)

Copied: trunk/Images/SquareNoteAdorn.tiff (from rev 1671, trunk/Images/SquareToolAdorn.tiff)
===================================================================
(Binary files differ)

Deleted: trunk/Images/SquareToolAdorn.tiff
===================================================================
(Binary files differ)

Copied: trunk/Images/StrikeOutNoteAdorn.tiff (from rev 1671, trunk/Images/StrikeOutToolAdorn.tiff)
===================================================================
(Binary files differ)

Deleted: trunk/Images/StrikeOutToolAdorn.tiff
===================================================================
(Binary files differ)

Copied: trunk/Images/TextNoteAdorn.tiff (from rev 1671, trunk/Images/AnnotateToolAdorn.tiff)
===================================================================
(Binary files differ)

Copied: trunk/Images/UnderlineNoteAdorn.tiff (from rev 1671, trunk/Images/UnderlineToolAdorn.tiff)
===================================================================
(Binary files differ)

Deleted: trunk/Images/UnderlineToolAdorn.tiff
===================================================================
(Binary files differ)

Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m	2007-03-30 12:03:43 UTC (rev 1676)
+++ trunk/SKNoteOutlineView.m	2007-03-30 12:22:58 UTC (rev 1677)
@@ -243,13 +243,13 @@
     if (textImage == nil) {
         CIFilter *filter = [CIFilter filterWithName:@"CIColorInvert"];    
         
-        textImage = [[NSImage imageNamed:@"AnnotateToolAdorn"] retain];
-        noteImage = [[NSImage imageNamed:@"NoteToolAdorn"] retain];
-        circleImage = [[NSImage imageNamed:@"CircleToolAdorn"] retain];
-        squareImage = [[NSImage imageNamed:@"SquareToolAdorn"] retain];
-        highlightImage = [[NSImage imageNamed:@"HighlightToolAdorn"] retain];
-        strikeOutImage = [[NSImage imageNamed:@"StrikeOutToolAdorn"] retain];
-        underlineImage = [[NSImage imageNamed:@"UnderlineToolAdorn"] retain];
+        textImage = [[NSImage imageNamed:@"TextNoteAdorn"] retain];
+        noteImage = [[NSImage imageNamed:@"AnchoredNoteAdorn"] retain];
+        circleImage = [[NSImage imageNamed:@"CircleNoteAdorn"] retain];
+        squareImage = [[NSImage imageNamed:@"SquareNoteAdorn"] retain];
+        highlightImage = [[NSImage imageNamed:@"HighlightNoteAdorn"] retain];
+        strikeOutImage = [[NSImage imageNamed:@"StrikeOutNoteAdorn"] retain];
+        underlineImage = [[NSImage imageNamed:@"UnderlineNoteAdorn"] retain];
         invertedTextImage = createFilteredImage(textImage, filter);
         invertedNoteImage = createFilteredImage(noteImage, filter);
         invertedCircleImage = createFilteredImage(circleImage, filter);

Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj	2007-03-30 12:03:43 UTC (rev 1676)
+++ trunk/Skim.xcodeproj/project.pbxproj	2007-03-30 12:22:58 UTC (rev 1677)
@@ -59,10 +59,10 @@
 		CE0710190B89BDD600733CC8 /* BDSKEdgeView.m in Sources */ = {isa = PBXBuildFile; fileRef = CE0710160B89BDD600733CC8 /* BDSKEdgeView.m */; };
 		CE07158B0B8A3D6500733CC8 /* NoteDocument.icns in Resources */ = {isa = PBXBuildFile; fileRef = CE0715890B8A3D6300733CC8 /* NoteDocument.icns */; };
 		CE07158C0B8A3D6500733CC8 /* PDFDocument.icns in Resources */ = {isa = PBXBuildFile; fileRef = CE07158A0B8A3D6300733CC8 /* PDFDocument.icns */; };
-		CE15832C0BA0740000D5B03F /* StrikeOutToolAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE1583280BA073FF00D5B03F /* StrikeOutToolAdorn.tiff */; };
+		CE15832C0BA0740000D5B03F /* StrikeOutNoteAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE1583280BA073FF00D5B03F /* StrikeOutNoteAdorn.tiff */; };
 		CE15832D0BA0740000D5B03F /* ToolbarStrikeOutNote.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE1583290BA073FF00D5B03F /* ToolbarStrikeOutNote.tiff */; };
 		CE15832E0BA0740000D5B03F /* ToolbarUnderlineNote.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE15832A0BA073FF00D5B03F /* ToolbarUnderlineNote.tiff */; };
-		CE15832F0BA0740000D5B03F /* UnderlineToolAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE15832B0BA073FF00D5B03F /* UnderlineToolAdorn.tiff */; };
+		CE15832F0BA0740000D5B03F /* UnderlineNoteAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE15832B0BA073FF00D5B03F /* UnderlineNoteAdorn.tiff */; };
 		CE2DE4920B85D48F00D0DA12 /* SKThumbnail.m in Sources */ = {isa = PBXBuildFile; fileRef = CE2DE4910B85D48F00D0DA12 /* SKThumbnail.m */; };
 		CE2DE49D0B85D4F400D0DA12 /* SKFullScreenWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE2DE49C0B85D4F400D0DA12 /* SKFullScreenWindow.m */; };
 		CE2DE4C60B85D78200D0DA12 /* SKMiniaturizeWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE2DE4C50B85D78200D0DA12 /* SKMiniaturizeWindow.m */; };
@@ -79,8 +79,8 @@
 		CE38ECD30B8093B200A1B779 /* NSString_SKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE38ECD20B8093B200A1B779 /* NSString_SKExtensions.m */; };
 		CE3A3D2C0B78C0A0006B64D3 /* SKPDFAnnotationNote.m in Sources */ = {isa = PBXBuildFile; fileRef = CE3A3D2B0B78C0A0006B64D3 /* SKPDFAnnotationNote.m */; };
 		CE3A41580B790C56006B64D3 /* BDSKDragImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = CE3A41570B790C56006B64D3 /* BDSKDragImageView.m */; };
-		CE3A42350B7927D3006B64D3 /* CircleToolAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE3A42330B7927D3006B64D3 /* CircleToolAdorn.tiff */; };
-		CE3A42360B7927D3006B64D3 /* NoteToolAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE3A42340B7927D3006B64D3 /* NoteToolAdorn.tiff */; };
+		CE3A42350B7927D3006B64D3 /* CircleNoteAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE3A42330B7927D3006B64D3 /* CircleNoteAdorn.tiff */; };
+		CE3A42360B7927D3006B64D3 /* AnchoredNoteAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE3A42340B7927D3006B64D3 /* AnchoredNoteAdorn.tiff */; };
 		CE3A45530B7A04A4006B64D3 /* NSBezierPath_BDSKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE3A45520B7A04A4006B64D3 /* NSBezierPath_BDSKExtensions.m */; };
 		CE3A4BA50B7A4D0D006B64D3 /* ToolbarNote.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE3A4BA40B7A4D0C006B64D3 /* ToolbarNote.tiff */; };
 		CE3A4DE30B7A7FC7006B64D3 /* ToolbarPresentation.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE3A4DE20B7A7FC7006B64D3 /* ToolbarPresentation.tiff */; };
@@ -93,7 +93,7 @@
 		CE4A65CC0BAB1E2E004AD07D /* BookmarksWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE4A65CA0BAB1E2E004AD07D /* BookmarksWindow.nib */; };
 		CE4A8BA20BB15980004AD07D /* NSWindowController_SKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE4A8BA10BB15980004AD07D /* NSWindowController_SKExtensions.m */; };
 		CE4DA2380B9D9BE10039E89C /* ToolbarSquareNote.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE4DA2160B9D9AA70039E89C /* ToolbarSquareNote.tiff */; };
-		CE4DA2440B9D9EC00039E89C /* SquareToolAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE4DA2430B9D9E640039E89C /* SquareToolAdorn.tiff */; };
+		CE4DA2440B9D9EC00039E89C /* SquareNoteAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE4DA2430B9D9E640039E89C /* SquareNoteAdorn.tiff */; };
 		CE4DA9240B9E190D0039E89C /* Skim Help in Resources */ = {isa = PBXBuildFile; fileRef = CE4DA9190B9E190D0039E89C /* Skim Help */; };
 		CE4EB8240B7B96D00091F228 /* OutlineViewAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE4EB8220B7B96D00091F228 /* OutlineViewAdorn.tiff */; };
 		CE4EB8250B7B96D00091F228 /* ThumbnailViewAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE4EB8230B7B96D00091F228 /* ThumbnailViewAdorn.tiff */; };
@@ -103,14 +103,13 @@
 		CE4EC88C0B7E6EDB0091F228 /* SKSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = CE4EC88B0B7E6EDB0091F228 /* SKSplitView.m */; };
 		CE546FC40B32D5DB00F8AFB6 /* SKNoteWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE546FC30B32D5DB00F8AFB6 /* SKNoteWindowController.m */; };
 		CE5470030B32D96500F8AFB6 /* NoteWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE5470010B32D96500F8AFB6 /* NoteWindow.nib */; };
-		CE5478C80B33456300F8AFB6 /* AnnotateToolAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE5478B70B33456300F8AFB6 /* AnnotateToolAdorn.tiff */; };
+		CE5478C80B33456300F8AFB6 /* TextNoteAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE5478B70B33456300F8AFB6 /* TextNoteAdorn.tiff */; };
 		CE5478C90B33456300F8AFB6 /* BackAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE5478B80B33456300F8AFB6 /* BackAdorn.tiff */; };
 		CE5478CA0B33456300F8AFB6 /* ForwardAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE5478B90B33456300F8AFB6 /* ForwardAdorn.tiff */; };
 		CE5478CB0B33456300F8AFB6 /* ToolbarFullScreen.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE5478BA0B33456300F8AFB6 /* ToolbarFullScreen.tiff */; };
 		CE5478CD0B33456300F8AFB6 /* MoveToolAdorn.tif in Resources */ = {isa = PBXBuildFile; fileRef = CE5478BC0B33456300F8AFB6 /* MoveToolAdorn.tif */; };
 		CE5478CE0B33456300F8AFB6 /* ToolbarNext.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE5478BD0B33456300F8AFB6 /* ToolbarNext.tiff */; };
 		CE5478CF0B33456300F8AFB6 /* ToolbarNotesDrawer.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE5478BE0B33456300F8AFB6 /* ToolbarNotesDrawer.tiff */; };
-		CE5478D00B33456300F8AFB6 /* PopUpToolAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE5478BF0B33456300F8AFB6 /* PopUpToolAdorn.tiff */; };
 		CE5478D10B33456300F8AFB6 /* ToolbarPrevious.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE5478C00B33456300F8AFB6 /* ToolbarPrevious.tiff */; };
 		CE5478D20B33456300F8AFB6 /* ToolbarRotateLeft.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE5478C10B33456300F8AFB6 /* ToolbarRotateLeft.tiff */; };
 		CE5478D30B33456300F8AFB6 /* ToolbarRotateRight.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE5478C20B33456300F8AFB6 /* ToolbarRotateRight.tiff */; };
@@ -129,7 +128,7 @@
 		CE7468820B7F3C0000CBF969 /* zoomOutCursor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE7467550B7F321A00CBF969 /* zoomOutCursor.tiff */; };
 		CE7469180B7F40B700CBF969 /* Skim.icns in Resources */ = {isa = PBXBuildFile; fileRef = CE7469170B7F40B600CBF969 /* Skim.icns */; };
 		CE9C423C0B8B5633004AD8CF /* PreferenceWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE9C42360B8B5633004AD8CF /* PreferenceWindow.nib */; };
-		CE9DC2E90B9F131900D64F28 /* HighlightToolAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE9DC2E70B9F131800D64F28 /* HighlightToolAdorn.tiff */; };
+		CE9DC2E90B9F131900D64F28 /* HighlightNoteAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE9DC2E70B9F131800D64F28 /* HighlightNoteAdorn.tiff */; };
 		CE9DC2EA0B9F131900D64F28 /* ToolbarHighlightNote.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE9DC2E80B9F131800D64F28 /* ToolbarHighlightNote.tiff */; };
 		CEA575CE0B9206E60003D2E7 /* SKNoteOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = CEA575CD0B9206E60003D2E7 /* SKNoteOutlineView.m */; };
 		CEA575E50B9207B80003D2E7 /* SKThumbnailTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = CEA575E40B9207B80003D2E7 /* SKThumbnailTableView.m */; };
@@ -220,10 +219,10 @@
 		CE0710160B89BDD600733CC8 /* BDSKEdgeView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = BDSKEdgeView.m; sourceTree = "<group>"; };
 		CE0715890B8A3D6300733CC8 /* NoteDocument.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = NoteDocument.icns; path = Images/NoteDocument.icns; sourceTree = "<group>"; };
 		CE07158A0B8A3D6300733CC8 /* PDFDocument.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = PDFDocument.icns; path = Images/PDFDocument.icns; sourceTree = "<group>"; };
-		CE1583280BA073FF00D5B03F /* StrikeOutToolAdorn.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = StrikeOutToolAdorn.tiff; path = Images/StrikeOutToolAdorn.tiff; sourceTree = "<group>"; };
+		CE1583280BA073FF00D5B03F /* StrikeOutNoteAdorn.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = StrikeOutNoteAdorn.tiff; path = Images/StrikeOutNoteAdorn.tiff; sourceTree = "<group>"; };
 		CE1583290BA073FF00D5B03F /* ToolbarStrikeOutNote.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ToolbarStrikeOutNote.tiff; path = Images/ToolbarStrikeOutNote.tiff; sourceTree = "<group>"; };
 		CE15832A0BA073FF00D5B03F /* ToolbarUnderlineNote.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ToolbarUnderlineNote.tiff; path = Images/ToolbarUnderlineNote.tiff; sourceTree = "<group>"; };
-		CE15832B0BA073FF00D5B03F /* UnderlineToolAdorn.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = UnderlineToolAdorn.tiff; path = Images/UnderlineToolAdorn.tiff; sourceTree = "<group>"; };
+		CE15832B0BA073FF00D5B03F /* UnderlineNoteAdorn.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = UnderlineNoteAdorn.tiff; path = Images/UnderlineNoteAdorn.tiff; sourceTree = "<group>"; };
 		CE2DE4900B85D48F00D0DA12 /* SKThumbnail.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKThumbnail.h; sourceTree = "<group>"; };
 		CE2DE4910B85D48F00D0DA12 /* SKThumbnail.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SKThumbnail.m; sourceTree = "<group>"; };
 		CE2DE49B0B85D4F400D0DA12 /* SKFullScreenWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKFullScreenWindow.h; sourceTree = "<group>"; };
@@ -251,8 +250,8 @@
 		CE3A3D2B0B78C0A0006B64D3 /* SKPDFAnnotationNote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SKPDFAnnotationNote.m; sourceTree = "<group>"; };
 		CE3A41560B790C56006B64D3 /* BDSKDragImageView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = BDSKDragImageView.h; sourceTree = "<group>"; };
 		CE3A41570B790C56006B64D3 /* BDSKDragImageView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = BDSKDragImageView.m; sourceTree = "<group>"; };
-		CE3A42330B7927D3006B64D3 /* CircleToolAdorn.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = CircleToolAdorn.tiff; path = Images/CircleToolAdorn.tiff; sourceTree = "<group>"; };
-		CE3A42340B7927D3006B64D3 /* NoteToolAdorn.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = NoteToolAdorn.tiff; path = Images/NoteToolAdorn.tiff; sourceTree = "<group>"; };
+		CE3A42330B7927D3006B64D3 /* CircleNoteAdorn.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = CircleNoteAdorn.tiff; path = Images/CircleNoteAdorn.tiff; sourceTree = "<group>"; };
+		CE3A42340B7927D3006B64D3 /* AnchoredNoteAdorn.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = AnchoredNoteAdorn.tiff; path = Images/AnchoredNoteAdorn.tiff; sourceTree = "<group>"; };
 		CE3A45510B7A04A4006B64D3 /* NSBezierPath_BDSKExtensions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NSBezierPath_BDSKExtensions.h; sourceTree = "<group>"; };
 		CE3A45520B7A04A4006B64D3 /* NSBezierPath_BDSKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = NSBezierPath_BDSKExtensions.m; sourceTree = "<group>"; };
 		CE3A4BA40B7A4D0C006B64D3 /* ToolbarNote.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ToolbarNote.tiff; path = Images/ToolbarNote.tiff; sourceTree = "<group>"; };
@@ -269,7 +268,7 @@
 		CE4A8BA00BB1597F004AD07D /* NSWindowController_SKExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSWindowController_SKExtensions.h; sourceTree = "<group>"; };
 		CE4A8BA10BB15980004AD07D /* NSWindowController_SKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSWindowController_SKExtensions.m; sourceTree = "<group>"; };
 		CE4DA2160B9D9AA70039E89C /* ToolbarSquareNote.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ToolbarSquareNote.tiff; path = Images/ToolbarSquareNote.tiff; sourceTree = "<group>"; };
-		CE4DA2430B9D9E640039E89C /* SquareToolAdorn.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = SquareToolAdorn.tiff; path = Images/SquareToolAdorn.tiff; sourceTree = "<group>"; };
+		CE4DA2430B9D9E640039E89C /* SquareNoteAdorn.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = SquareNoteAdorn.tiff; path = Images/SquareNoteAdorn.tiff; sourceTree = "<group>"; };
 		CE4DA8D00B9E15AD0039E89C /* applehelp.init */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = applehelp.init; path = "Skim Help/applehelp.init"; sourceTree = "<group>"; };
 		CE4DA8D10B9E15AD0039E89C /* postprocess-nontitle.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; name = "postprocess-nontitle.py"; path = "Skim Help/postprocess-nontitle.py"; sourceTree = "<group>"; };
 		CE4DA8D20B9E15C20039E89C /* skim.texi */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = skim.texi; path = "English.lproj/Skim Help/skim.texi"; sourceTree = "<group>"; };
@@ -290,14 +289,13 @@
 		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>"; };
-		CE5478B70B33456300F8AFB6 /* AnnotateToolAdorn.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = AnnotateToolAdorn.tiff; path = Images/AnnotateToolAdorn.tiff; sourceTree = "<group>"; };
+		CE5478B70B33456300F8AFB6 /* TextNoteAdorn.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = TextNoteAdorn.tiff; path = Images/TextNoteAdorn.tiff; sourceTree = "<group>"; };
 		CE5478B80B33456300F8AFB6 /* BackAdorn.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = BackAdorn.tiff; path = Images/BackAdorn.tiff; sourceTree = "<group>"; };
 		CE5478B90B33456300F8AFB6 /* ForwardAdorn.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ForwardAdorn.tiff; path = Images/ForwardAdorn.tiff; sourceTree = "<group>"; };
 		CE5478BA0B33456300F8AFB6 /* ToolbarFullScreen.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ToolbarFullScreen.tiff; path = Images/ToolbarFullScreen.tiff; sourceTree = "<group>"; };
 		CE5478BC0B33456300F8AFB6 /* MoveToolAdorn.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = MoveToolAdorn.tif; path = Images/MoveToolAdorn.tif; sourceTree = "<group>"; };
 		CE5478BD0B33456300F8AFB6 /* ToolbarNext.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ToolbarNext.tiff; path = Images/ToolbarNext.tiff; sourceTree = "<group>"; };
 		CE5478BE0B33456300F8AFB6 /* ToolbarNotesDrawer.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ToolbarNotesDrawer.tiff; path = Images/ToolbarNotesDrawer.tiff; sourceTree = "<group>"; };
-		CE5478BF0B33456300F8AFB6 /* PopUpToolAdorn.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = PopUpToolAdorn.tiff; path = Images/PopUpToolAdorn.tiff; sourceTree = "<group>"; };
 		CE5478C00B33456300F8AFB6 /* ToolbarPrevious.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ToolbarPrevious.tiff; path = Images/ToolbarPrevious.tiff; sourceTree = "<group>"; };
 		CE5478C10B33456300F8AFB6 /* ToolbarRotateLeft.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ToolbarRotateLeft.tiff; path = Images/ToolbarRotateLeft.tiff; sourceTree = "<group>"; };
 		CE5478C20B33456300F8AFB6 /* ToolbarRotateRight.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ToolbarRotateRight.tiff; path = Images/ToolbarRotateRight.tiff; sourceTree = "<group>"; };
@@ -319,7 +317,7 @@
 		CE7469170B7F40B600CBF969 /* Skim.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = Skim.icns; path = Images/Skim.icns; sourceTree = "<group>"; };
 		CE87EF690BA9FF5A0027BBDD /* skimhelp.css */ = {isa = PBXFileReference; explicitFileType = text; fileEncoding = 30; name = skimhelp.css; path = "English.lproj/Skim Help/sty/skimhelp.css"; sourceTree = "<group>"; };
 		CE9C42370B8B5633004AD8CF /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/PreferenceWindow.nib; sourceTree = "<group>"; };
-		CE9DC2E70B9F131800D64F28 /* HighlightToolAdorn.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = HighlightToolAdorn.tiff; path = Images/HighlightToolAdorn.tiff; sourceTree = "<group>"; };
+		CE9DC2E70B9F131800D64F28 /* HighlightNoteAdorn.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = HighlightNoteAdorn.tiff; path = Images/HighlightNoteAdorn.tiff; sourceTree = "<group>"; };
 		CE9DC2E80B9F131800D64F28 /* ToolbarHighlightNote.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ToolbarHighlightNote.tiff; path = Images/ToolbarHighlightNote.tiff; sourceTree = "<group>"; };
 		CEA575CC0B9206E60003D2E7 /* SKNoteOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKNoteOutlineView.h; sourceTree = "<group>"; };
 		CEA575CD0B9206E60003D2E7 /* SKNoteOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SKNoteOutlineView.m; sourceTree = "<group>"; };
@@ -656,20 +654,19 @@
 				CE380A7A0B834E6100A1B779 /* CameraCursor.tiff */,
 				CE5478B80B33456300F8AFB6 /* BackAdorn.tiff */,
 				CE5478B90B33456300F8AFB6 /* ForwardAdorn.tiff */,
-				CE5478B70B33456300F8AFB6 /* AnnotateToolAdorn.tiff */,
-				CE3A42330B7927D3006B64D3 /* CircleToolAdorn.tiff */,
-				CE9DC2E70B9F131800D64F28 /* HighlightToolAdorn.tiff */,
-				CE1583280BA073FF00D5B03F /* StrikeOutToolAdorn.tiff */,
-				CE15832B0BA073FF00D5B03F /* UnderlineToolAdorn.tiff */,
+				CE3A42340B7927D3006B64D3 /* AnchoredNoteAdorn.tiff */,
+				CE3A42330B7927D3006B64D3 /* CircleNoteAdorn.tiff */,
+				CE9DC2E70B9F131800D64F28 /* HighlightNoteAdorn.tiff */,
+				CE1583280BA073FF00D5B03F /* StrikeOutNoteAdorn.tiff */,
+				CE4DA2430B9D9E640039E89C /* SquareNoteAdorn.tiff */,
+				CE5478B70B33456300F8AFB6 /* TextNoteAdorn.tiff */,
+				CE15832B0BA073FF00D5B03F /* UnderlineNoteAdorn.tiff */,
 				CE5478E40B334CAC00F8AFB6 /* MagnifyToolAdorn.tiff */,
 				CE5478BC0B33456300F8AFB6 /* MoveToolAdorn.tif */,
-				CE3A42340B7927D3006B64D3 /* NoteToolAdorn.tiff */,
-				CE5478BF0B33456300F8AFB6 /* PopUpToolAdorn.tiff */,
-				CE4DA2430B9D9E640039E89C /* SquareToolAdorn.tiff */,
+				CE5478C30B33456300F8AFB6 /* TextToolAdorn.tiff */,
 				CE380C600B837B6100A1B779 /* NoteViewAdorn.tiff */,
 				CE4EB8220B7B96D00091F228 /* OutlineViewAdorn.tiff */,
 				CE380C610B837B6100A1B779 /* SnapshotViewAdorn.tiff */,
-				CE5478C30B33456300F8AFB6 /* TextToolAdorn.tiff */,
 				CE4EB8230B7B96D00091F228 /* ThumbnailViewAdorn.tiff */,
 				CE4190C20B94963A00ECF819 /* ToolbarCircleNote.tiff */,
 				CE5478BA0B33456300F8AFB6 /* ToolbarFullScreen.tiff */,
@@ -778,24 +775,23 @@
 				8D15AC2D0486D014006FF6A4 /* MainMenu.nib in Resources */,
 				4530D81D0B27ACAC007C59F4 /* MainWindow.nib in Resources */,
 				CE5470030B32D96500F8AFB6 /* NoteWindow.nib in Resources */,
-				CE5478C80B33456300F8AFB6 /* AnnotateToolAdorn.tiff in Resources */,
+				CE5478C80B33456300F8AFB6 /* TextNoteAdorn.tiff in Resources */,
 				CE5478C90B33456300F8AFB6 /* BackAdorn.tiff in Resources */,
 				CE380A7B0B834E6200A1B779 /* CameraCursor.tiff in Resources */,
-				CE3A42350B7927D3006B64D3 /* CircleToolAdorn.tiff in Resources */,
+				CE3A42350B7927D3006B64D3 /* CircleNoteAdorn.tiff in Resources */,
 				CE5478CA0B33456300F8AFB6 /* ForwardAdorn.tiff in Resources */,
-				CE9DC2E90B9F131900D64F28 /* HighlightToolAdorn.tiff in Resources */,
+				CE9DC2E90B9F131900D64F28 /* HighlightNoteAdorn.tiff in Resources */,
 				CE5478E50B334CAC00F8AFB6 /* MagnifyToolAdorn.tiff in Resources */,
 				CE5478CD0B33456300F8AFB6 /* MoveToolAdorn.tif in Resources */,
 				CE07158B0B8A3D6500733CC8 /* NoteDocument.icns in Resources */,
-				CE3A42360B7927D3006B64D3 /* NoteToolAdorn.tiff in Resources */,
+				CE3A42360B7927D3006B64D3 /* AnchoredNoteAdorn.tiff in Resources */,
 				CE380C620B837B6100A1B779 /* NoteViewAdorn.tiff in Resources */,
 				CE4EB8240B7B96D00091F228 /* OutlineViewAdorn.tiff in Resources */,
 				CE07158C0B8A3D6500733CC8 /* PDFDocument.icns in Resources */,
-				CE5478D00B33456300F8AFB6 /* PopUpToolAdorn.tiff in Resources */,
 				CE7469180B7F40B700CBF969 /* Skim.icns in Resources */,
 				CE380C630B837B6100A1B779 /* SnapshotViewAdorn.tiff in Resources */,
-				CE4DA2440B9D9EC00039E89C /* SquareToolAdorn.tiff in Resources */,
-				CE15832C0BA0740000D5B03F /* StrikeOutToolAdorn.tiff in Resources */,
+				CE4DA2440B9D9EC00039E89C /* SquareNoteAdorn.tiff in Resources */,
+				CE15832C0BA0740000D5B03F /* StrikeOutNoteAdorn.tiff in Resources */,
 				CE5478D40B33456300F8AFB6 /* TextToolAdorn.tiff in Resources */,
 				CE4EB8250B7B96D00091F228 /* ThumbnailViewAdorn.tiff in Resources */,
 				CE4190C40B94963A00ECF819 /* ToolbarCircleNote.tiff in Resources */,
@@ -821,7 +817,7 @@
 				CE5478D80B33456300F8AFB6 /* ToolbarZoomToFit.tiff in Resources */,
 				CE7468810B7F3C0000CBF969 /* zoomInCursor.tiff in Resources */,
 				CE7468820B7F3C0000CBF969 /* zoomOutCursor.tiff in Resources */,
-				CE15832F0BA0740000D5B03F /* UnderlineToolAdorn.tiff in Resources */,
+				CE15832F0BA0740000D5B03F /* UnderlineNoteAdorn.tiff in Resources */,
 				CE2DEAA30B860A7000D0DA12 /* SaveProgressSheet.nib in Resources */,
 				CE2DEB920B86206400D0DA12 /* FindPanel.nib in Resources */,
 				CE9C423C0B8B5633004AD8CF /* PreferenceWindow.nib in Resources */,


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: [1676] trunk/English.lproj/Skim Help/skim.texi

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

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

Log Message:
-----------
add localization language

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-03-30 11:27:41 UTC (rev 1675)
+++ trunk/English.lproj/Skim Help/skim.texi	2007-03-30 12:03:43 UTC (rev 1676)
@@ -108,6 +108,8 @@
 @c The content of the Help Pages starts here...
 @c ======================================================================================
 
+@documentlanguage en
+
 @settitle Skim Help
 
 @ifnottex


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