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

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

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

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

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

Log Message:
-----------
Add remark about duplicating a note by option-select. 

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:20:04 UTC (rev 1674)
+++ trunk/English.lproj/Skim Help/skim.texi	2007-03-30 11:27:41 UTC (rev 1675)
@@ -359,6 +359,8 @@
 @end itemize
 @endbox
 
+You can also create a dublicate of a note by selecting the note while holding the Option key. 
+
 @heading See also
 @menu
 * Pasting notes in a PDF file::


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

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

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

Log Message:
-----------
Move readingbar to separate file.

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

Added Paths:
-----------
    trunk/SKReadingBar.h
    trunk/SKReadingBar.m

Modified: trunk/SKPDFView.h
===================================================================
--- trunk/SKPDFView.h	2007-03-30 09:44:50 UTC (rev 1673)
+++ trunk/SKPDFView.h	2007-03-30 11:20:04 UTC (rev 1674)
@@ -126,28 +126,3 @@
 - (void)handleScrollMagnifyNotification:(NSNotification *)note;
 
 @end
-
-
-@interface SKReadingBar : NSObject {
-    PDFPage *page;
-    NSArray *lineBounds;
-    int currentLine;
-}
-
-- (PDFPage *)page;
-- (void)setPage:(PDFPage *)newPage;
-
-- (int)currentLine;
-- (void)setCurrentLine:(int)lineIndex;
-
-- (unsigned int)numberOfLines;
-
-- (NSRect)currentBounds;
-- (NSRect)currentBoundsForBox:(PDFDisplayBox)box;
-
-- (BOOL)goToNextLine;
-- (BOOL)goToPreviousLine;
-- (BOOL)goToNextPage;
-- (BOOL)goToPreviousPage;
-
-@end

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m	2007-03-30 09:44:50 UTC (rev 1673)
+++ trunk/SKPDFView.m	2007-03-30 11:20:04 UTC (rev 1674)
@@ -47,6 +47,7 @@
 #import "SKApplication.h"
 #import "SKStringConstants.h"
 #import "NSUserDefaultsController_SKExtensions.h"
+#import "SKReadingBar.h"
 
 NSString *SKPDFViewToolModeChangedNotification = @"SKPDFViewToolModeChangedNotification";
 NSString *SKPDFViewAnnotationModeChangedNotification = @"SKPDFViewAnnotationModeChangedNotification";
@@ -1973,133 +1974,3 @@
 }
 
 @end
-
-#pragma mark -
-
-@implementation SKReadingBar
-
-- (id)init {
-    if (self = [super init]) {
-        page = nil;
-        lineBounds = nil;
-        currentLine = -1;
-    }
-    return self;
-}
-
-- (void)dealloc {
-    [page release];
-    [lineBounds release];
-    [super dealloc];
-}
-
-- (PDFPage *)page {
-    return page;
-}
-
-- (void)setPage:(PDFPage *)newPage {
-    if (page != newPage) {
-        [page release];
-        page = [newPage retain];
-        [lineBounds release];
-        lineBounds = [[page lineBounds] retain];
-        currentLine = -1;
-    } 
-}
-
-- (int)currentLine {
-    return currentLine;
-}
-
-- (void)setCurrentLine:(int)lineIndex {
-    currentLine = lineIndex;
-}
-
-- (unsigned int)numberOfLines {
-    return [lineBounds count];
-}
-
-- (NSRect)currentBounds {
-    if (page == nil || currentLine == -1)
-        return NSZeroRect;
-    return [[lineBounds objectAtIndex:currentLine] rectValue];
-}
-
-- (NSRect)currentBoundsForBox:(PDFDisplayBox)box {
-    if (page == nil || currentLine == -1)
-        return NSZeroRect;
-    NSRect rect = [self currentBounds];
-    NSRect bounds = [page boundsForBox:box];
-    rect.origin.x = NSMinX(bounds);
-    rect.size.width = NSWidth(bounds);
-    return rect;
-}
-
-- (BOOL)goToNextLine {
-    BOOL didMove = NO;
-    if (currentLine < (int)[lineBounds count] - 1) {
-        ++currentLine;
-        didMove = YES;
-    } else if ([self goToNextPage]) {
-        didMove = YES;
-    }
-    return didMove;
-}
-
-- (BOOL)goToPreviousLine {
-    BOOL didMove = NO;
-    if (currentLine == -1 && [lineBounds count])
-        currentLine = [lineBounds count];
-    if (currentLine > 0) {
-        --currentLine;
-        didMove =  YES;
-    } else if ([self goToPreviousPage]) {
-        currentLine = [lineBounds count] - 1;
-        didMove = YES;
-    }
-    return didMove;
-}
-
-- (BOOL)goToNextPage {
-    BOOL didMove = NO;
-    PDFDocument *doc = [page document];
-    int i = [doc indexForPage:page], iMax = [doc pageCount];
-    
-    while (++i < iMax) {
-        PDFPage *nextPage = [doc pageAtIndex:i];
-        NSArray *lines = [nextPage lineBounds];
-        if ([lines count]) {
-            [page release];
-            page = [nextPage retain];
-            [lineBounds release];
-            lineBounds = [lines retain];
-            currentLine = 0;
-            didMove = YES;
-            break;
-        }
-    }
-    return didMove;
-}
-
-- (BOOL)goToPreviousPage {
-    BOOL didMove = NO;
-    PDFDocument *doc = [page document];
-    int i = [doc indexForPage:page];
-    
-    while (i-- > 0) {
-        PDFPage *prevPage = [doc pageAtIndex:i];
-        NSArray *lines = [prevPage lineBounds];
-        if ([lines count]) {
-            [page release];
-            page = [prevPage retain];
-            [lineBounds release];
-            lineBounds = [lines retain];
-            currentLine = 0;
-            didMove = YES;
-            break;
-        }
-    }
-    return didMove;
-}
-
-@end

Added: trunk/SKReadingBar.h
===================================================================
--- trunk/SKReadingBar.h	                        (rev 0)
+++ trunk/SKReadingBar.h	2007-03-30 11:20:04 UTC (rev 1674)
@@ -0,0 +1,65 @@
+//
+//  SKReadingBar.h
+//  Skim
+//
+//  Created by Christiaan Hofman on 3/30/07.
+/*
+ This software is Copyright (c) 2007
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Cocoa/Cocoa.h>
+#import <Quartz/Quartz.h>
+
+
+@interface SKReadingBar : NSObject {
+    PDFPage *page;
+    NSArray *lineBounds;
+    int currentLine;
+}
+
+- (PDFPage *)page;
+- (void)setPage:(PDFPage *)newPage;
+
+- (int)currentLine;
+- (void)setCurrentLine:(int)lineIndex;
+
+- (unsigned int)numberOfLines;
+
+- (NSRect)currentBounds;
+- (NSRect)currentBoundsForBox:(PDFDisplayBox)box;
+
+- (BOOL)goToNextLine;
+- (BOOL)goToPreviousLine;
+- (BOOL)goToNextPage;
+- (BOOL)goToPreviousPage;
+
+@end

Added: trunk/SKReadingBar.m
===================================================================
--- trunk/SKReadingBar.m	                        (rev 0)
+++ trunk/SKReadingBar.m	2007-03-30 11:20:04 UTC (rev 1674)
@@ -0,0 +1,169 @@
+//
+//  SKReadingBar.m
+//  Skim
+//
+//  Created by Christiaan Hofman on 3/30/07.
+/*
+ This software is Copyright (c) 2007
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "SKReadingBar.h"
+#import "PDFPage_SKExtensions.h"
+
+
+@implementation SKReadingBar
+
+- (id)init {
+    if (self = [super init]) {
+        page = nil;
+        lineBounds = nil;
+        currentLine = -1;
+    }
+    return self;
+}
+
+- (void)dealloc {
+    [page release];
+    [lineBounds release];
+    [super dealloc];
+}
+
+- (PDFPage *)page {
+    return page;
+}
+
+- (void)setPage:(PDFPage *)newPage {
+    if (page != newPage) {
+        [page release];
+        page = [newPage retain];
+        [lineBounds release];
+        lineBounds = [[page lineBounds] retain];
+        currentLine = -1;
+    } 
+}
+
+- (int)currentLine {
+    return currentLine;
+}
+
+- (void)setCurrentLine:(int)lineIndex {
+    currentLine = lineIndex;
+}
+
+- (unsigned int)numberOfLines {
+    return [lineBounds count];
+}
+
+- (NSRect)currentBounds {
+    if (page == nil || currentLine == -1)
+        return NSZeroRect;
+    return [[lineBounds objectAtIndex:currentLine] rectValue];
+}
+
+- (NSRect)currentBoundsForBox:(PDFDisplayBox)box {
+    if (page == nil || currentLine == -1)
+        return NSZeroRect;
+    NSRect rect = [self currentBounds];
+    NSRect bounds = [page boundsForBox:box];
+    rect.origin.x = NSMinX(bounds);
+    rect.size.width = NSWidth(bounds);
+    return rect;
+}
+
+- (BOOL)goToNextLine {
+    BOOL didMove = NO;
+    if (currentLine < (int)[lineBounds count] - 1) {
+        ++currentLine;
+        didMove = YES;
+    } else if ([self goToNextPage]) {
+        didMove = YES;
+    }
+    return didMove;
+}
+
+- (BOOL)goToPreviousLine {
+    BOOL didMove = NO;
+    if (currentLine == -1 && [lineBounds count])
+        currentLine = [lineBounds count];
+    if (currentLine > 0) {
+        --currentLine;
+        didMove =  YES;
+    } else if ([self goToPreviousPage]) {
+        currentLine = [lineBounds count] - 1;
+        didMove = YES;
+    }
+    return didMove;
+}
+
+- (BOOL)goToNextPage {
+    BOOL didMove = NO;
+    PDFDocument *doc = [page document];
+    int i = [doc indexForPage:page], iMax = [doc pageCount];
+    
+    while (++i < iMax) {
+        PDFPage *nextPage = [doc pageAtIndex:i];
+        NSArray *lines = [nextPage lineBounds];
+        if ([lines count]) {
+            [page release];
+            page = [nextPage retain];
+            [lineBounds release];
+            lineBounds = [lines retain];
+            currentLine = 0;
+            didMove = YES;
+            break;
+        }
+    }
+    return didMove;
+}
+
+- (BOOL)goToPreviousPage {
+    BOOL didMove = NO;
+    PDFDocument *doc = [page document];
+    int i = [doc indexForPage:page];
+    
+    while (i-- > 0) {
+        PDFPage *prevPage = [doc pageAtIndex:i];
+        NSArray *lines = [prevPage lineBounds];
+        if ([lines count]) {
+            [page release];
+            page = [prevPage retain];
+            [lineBounds release];
+            lineBounds = [lines retain];
+            currentLine = 0;
+            didMove = YES;
+            break;
+        }
+    }
+    return didMove;
+}
+
+@end

Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj	2007-03-30 09:44:50 UTC (rev 1673)
+++ trunk/Skim.xcodeproj/project.pbxproj	2007-03-30 11:20:04 UTC (rev 1674)
@@ -87,6 +87,7 @@
 		CE4190C40B94963A00ECF819 /* ToolbarCircleNote.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE4190C20B94963A00ECF819 /* ToolbarCircleNote.tiff */; };
 		CE4190C50B94963A00ECF819 /* ToolbarTextNote.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE4190C30B94963A00ECF819 /* ToolbarTextNote.tiff */; };
 		CE41A6CC0B975E5000ECF819 /* Skim.sdef in Resources */ = {isa = PBXBuildFile; fileRef = CE41A6CB0B975E5000ECF819 /* Skim.sdef */; };
+		CE4294A30BBD29120016FDC2 /* SKReadingBar.m in Sources */ = {isa = PBXBuildFile; fileRef = CE4294A20BBD29120016FDC2 /* SKReadingBar.m */; };
 		CE4373B40BB5440E00A56987 /* PSDocument.icns in Resources */ = {isa = PBXBuildFile; fileRef = CE4373B30BB5440E00A56987 /* PSDocument.icns */; };
 		CE4A659F0BAB1598004AD07D /* SKBookmarkController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE4A659E0BAB1598004AD07D /* SKBookmarkController.m */; };
 		CE4A65CC0BAB1E2E004AD07D /* BookmarksWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE4A65CA0BAB1E2E004AD07D /* BookmarksWindow.nib */; };
@@ -259,6 +260,8 @@
 		CE4190C20B94963A00ECF819 /* ToolbarCircleNote.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ToolbarCircleNote.tiff; path = Images/ToolbarCircleNote.tiff; sourceTree = "<group>"; };
 		CE4190C30B94963A00ECF819 /* ToolbarTextNote.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ToolbarTextNote.tiff; path = Images/ToolbarTextNote.tiff; sourceTree = "<group>"; };
 		CE41A6CB0B975E5000ECF819 /* Skim.sdef */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.sdef; path = Skim.sdef; sourceTree = "<group>"; };
+		CE4294A10BBD29120016FDC2 /* SKReadingBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKReadingBar.h; sourceTree = "<group>"; };
+		CE4294A20BBD29120016FDC2 /* SKReadingBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SKReadingBar.m; sourceTree = "<group>"; };
 		CE4373B30BB5440E00A56987 /* PSDocument.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = PSDocument.icns; path = Images/PSDocument.icns; sourceTree = "<group>"; };
 		CE4A659D0BAB1598004AD07D /* SKBookmarkController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKBookmarkController.h; sourceTree = "<group>"; };
 		CE4A659E0BAB1598004AD07D /* SKBookmarkController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SKBookmarkController.m; sourceTree = "<group>"; };
@@ -610,6 +613,8 @@
 			children = (
 				CE3A3D2A0B78C0A0006B64D3 /* SKPDFAnnotationNote.h */,
 				CE3A3D2B0B78C0A0006B64D3 /* SKPDFAnnotationNote.m */,
+				CE4294A10BBD29120016FDC2 /* SKReadingBar.h */,
+				CE4294A20BBD29120016FDC2 /* SKReadingBar.m */,
 				CE2DE4900B85D48F00D0DA12 /* SKThumbnail.h */,
 				CE2DE4910B85D48F00D0DA12 /* SKThumbnail.m */,
 				CEF7117C0B90B58E003A2771 /* SKVersionNumber.h */,
@@ -934,6 +939,7 @@
 				F98DC2690BA090D8008E46EC /* BDSKImagePopUpButtonCell.m in Sources */,
 				CE4A659F0BAB1598004AD07D /* SKBookmarkController.m in Sources */,
 				CE4A8BA20BB15980004AD07D /* NSWindowController_SKExtensions.m in Sources */,
+				CE4294A30BBD29120016FDC2 /* SKReadingBar.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};


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

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

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

Log Message:
-----------
Fix a few bad pixels in document icons

Modified Paths:
--------------
    trunk/Images/NoteDocument.icns
    trunk/Images/PDFDocument.icns

Modified: trunk/Images/NoteDocument.icns
===================================================================
(Binary files differ)

Modified: trunk/Images/PDFDocument.icns
===================================================================
(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: [1672] trunk/SKMainWindowController.m

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

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

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

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

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


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

[Skim-app-commit] SF.net SVN: skim-app: [1671] trunk/SKDocument.m

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

Revision: 1671
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1671&view=rev
Author:   amaxwell
Date:     2007-03-29 16:02:40 -0700 (Thu, 29 Mar 2007)

Log Message:
-----------
Shorten message text and fix some typos

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

Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m	2007-03-29 19:49:44 UTC (rev 1670)
+++ trunk/SKDocument.m	2007-03-29 23:02:40 UTC (rev 1671)
@@ -238,7 +238,7 @@
                                                  defaultButton:NSLocalizedString(@"No", @"Button title")
                                                alternateButton:NSLocalizedString(@"Yes", @"Button title")
                                                    otherButton:nil
-                                     informativeTextWithFormat:NSLocalizedString(@"Skim was not able to read the notes at %@. %@ Do you want to continue to open the PDF document anyway?", @"Informative text in alert dialog"), [absoluteURL path], [[error userInfo] objectForKey:NSLocalizedDescriptionKey]];
+                                     informativeTextWithFormat:NSLocalizedString(@"Skim was not able to read the notes at %@. %@ Do you want to continue to open the PDF document anyway?", @"Informative text in alert dialog"), [[absoluteURL path] stringByAbbreviatingWithTildeInPath], [[error userInfo] objectForKey:NSLocalizedDescriptionKey]];
                 if ([alert runModal] == NSAlertDefaultReturn) {
                     [data release];
                     data = nil;
@@ -252,7 +252,7 @@
                                                      defaultButton:NSLocalizedString(@"Yes", @"Button title")
                                                    alternateButton:NSLocalizedString(@"No", @"Button title")
                                                        otherButton:nil
-                                         informativeTextWithFormat:NSLocalizedString(@"Skim was not able to read the notes at %@, but there a Skim notes file %@ with the same name was found. Do you want Skim the read the from this file?", @"Informative text in alert dialog"), [absoluteURL path], path];
+                                         informativeTextWithFormat:NSLocalizedString(@"Unable to read notes for %@, but a Skim notes file with the same name was found.  Do you want Skim to read the notes from this file?", @"Informative text in alert dialog"), [[absoluteURL path] stringByAbbreviatingWithTildeInPath]];
                     if ([alert runModal] == NSAlertDefaultReturn) {
                         NSArray *array = [NSKeyedUnarchiver unarchiveObjectWithFile:path];
                         if (array) {


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: [1670] trunk/English.lproj/ReleaseNotes.rtf

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

Revision: 1670
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1670&view=rev
Author:   hofman
Date:     2007-03-29 12:49:44 -0700 (Thu, 29 Mar 2007)

Log Message:
-----------
Fix links in release notes

Modified Paths:
--------------
    trunk/English.lproj/ReleaseNotes.rtf

Modified: trunk/English.lproj/ReleaseNotes.rtf
===================================================================
--- trunk/English.lproj/ReleaseNotes.rtf	2007-03-29 19:16:56 UTC (rev 1669)
+++ trunk/English.lproj/ReleaseNotes.rtf	2007-03-29 19:49:44 UTC (rev 1670)
@@ -28,7 +28,7 @@
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
 \f1\i0\b0\fs22 \cf0 \
-The Skim website is at {\field{\*\fldinst{HYPERLINK "http://bibdesk.sourceforge.net/"}}{\fldrslt http://skim-app.sourceforge.net}} - check there for current information and ways to find out more about the program and the development efforts.\
+The Skim website is at {\field{\*\fldinst{HYPERLINK "http://skim-app.sourceforge.net/"}}{\fldrslt http://skim-app.sourceforge.net}} - check there for current information and ways to find out more about the program and the development efforts.\
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
@@ -36,7 +36,7 @@
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
 \f1\i0\b0\fs22 \cf0 \
-If you have a problem with using the program and you'd like to talk with other users about it, there is a mailing list set up for discussing using Skim. Information about it is available at {\field{\*\fldinst{HYPERLINK "http://lists.sourceforge.net/mailman/listinfo/bibdesk-users"}}{\fldrslt http://lists.sourceforge.net/mailman/listinfo/skim-app-users}}.\
+If you have a problem with using the program and you'd like to talk with other users about it, there is a mailing list set up for discussing using Skim. Information about it is available at {\field{\*\fldinst{HYPERLINK "http://lists.sourceforge.net/mailman/listinfo/skim-app-users"}}{\fldrslt http://lists.sourceforge.net/mailman/listinfo/skim-app-users}}.\
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 


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

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

Revision: 1669
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1669&view=rev
Author:   hofman
Date:     2007-03-29 12:16:56 -0700 (Thu, 29 Mar 2007)

Log Message:
-----------
Use new skim site reverse DNS for app identifier and xattr keys and names.

Modified Paths:
--------------
    trunk/Info.plist
    trunk/NSFileManager_ExtendedAttributes.m
    trunk/SKDocument.m
    trunk/skimnotes.m

Modified: trunk/Info.plist
===================================================================
--- trunk/Info.plist	2007-03-29 18:25:11 UTC (rev 1668)
+++ trunk/Info.plist	2007-03-29 19:16:56 UTC (rev 1669)
@@ -223,7 +223,7 @@
 	<key>CFBundleIconFile</key>
 	<string>Skim</string>
 	<key>CFBundleIdentifier</key>
-	<string>net.sourceforge.bibdesk.skim</string>
+	<string>net.sourceforge.skim-app.skim</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

Modified: trunk/NSFileManager_ExtendedAttributes.m
===================================================================
--- trunk/NSFileManager_ExtendedAttributes.m	2007-03-29 18:25:11 UTC (rev 1668)
+++ trunk/NSFileManager_ExtendedAttributes.m	2007-03-29 19:16:56 UTC (rev 1669)
@@ -130,9 +130,9 @@
 
 #define MAX_XATTR_LENGTH 2048
 #define UNIQUE_VALUE [[NSProcessInfo processInfo] globallyUniqueString]
-#define UNIQUE_KEY @"net_sourceforge_skim_unique_key"
-#define WRAPPER_KEY @"net_sourceforge_skim_has_wrapper"
-#define FRAGMENTS_KEY @"net_sourceforge_skim_number_of_fragments"
+#define UNIQUE_KEY @"net_sourceforge_skim-app_unique_key"
+#define WRAPPER_KEY @"net_sourceforge_skim-app_has_wrapper"
+#define FRAGMENTS_KEY @"net_sourceforge_skim-app_number_of_fragments"
 
 - (NSData *)extendedAttributeNamed:(NSString *)attr atPath:(NSString *)path traverseLink:(BOOL)follow error:(NSError **)error;
 {

Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m	2007-03-29 18:25:11 UTC (rev 1668)
+++ trunk/SKDocument.m	2007-03-29 19:16:56 UTC (rev 1669)
@@ -305,7 +305,7 @@
         NSError *error = nil;
         
         // first remove all old notes
-        if ([fm removeExtendedAttribute:@"net_sourceforge_skim_notes" atPath:path traverseLink:YES error:&error] == NO) {
+        if ([fm removeExtendedAttribute:@"net_sourceforge_skim-app_notes" atPath:path traverseLink:YES error:&error] == NO) {
             // should we set success to NO and return an error?
             //NSLog(@"%@: %@", self, error);
         }
@@ -315,7 +315,7 @@
             [rootObject addObject:[[notes objectAtIndex:i] dictionaryValue]];
         }
         data = [NSKeyedArchiver archivedDataWithRootObject:rootObject];
-        if ([fm setExtendedAttributeNamed:@"net_sourceforge_skim_notes" toValue:data atPath:path options:nil error:&error] == NO) {
+        if ([fm setExtendedAttributeNamed:@"net_sourceforge_skim-app_notes" toValue:data atPath:path options:nil error:&error] == NO) {
             success = NO;
             if (outError) *outError = error;
             NSLog(@"%@: %@", self, error);
@@ -331,7 +331,7 @@
     
     if ([aURL isFileURL]) {
 
-        NSData *data = [fm extendedAttributeNamed:@"net_sourceforge_skim_notes" atPath:[aURL path] traverseLink:YES error:&error];
+        NSData *data = [fm extendedAttributeNamed:@"net_sourceforge_skim-app_notes" atPath:[aURL path] traverseLink:YES error:&error];
         
         if (noteDicts)
             [noteDicts release];

Modified: trunk/skimnotes.m
===================================================================
--- trunk/skimnotes.m	2007-03-29 18:25:11 UTC (rev 1668)
+++ trunk/skimnotes.m	2007-03-29 19:16:56 UTC (rev 1669)
@@ -1,24 +1,29 @@
 #import <Foundation/Foundation.h>
 #import "NSFileManager_ExtendedAttributes.h"
 
-#define SKIM_NOTES_KEY @"net_sourceforge_skim_notes"
+#define SKIM_NOTES_KEY @"net_sourceforge_skim-app_notes"
 
-static char *usageStr = "Usage: skimnotes get|set file.pdf file.skim";
+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 {
+    SKNActionGet,
+    SKNActionSet,
+    SKNActionRemove
+};
+
 int main (int argc, const char * argv[]) {
-	BOOL get = YES; 
+	int action = 0;
     
-    if (argc == 2 &&  (strcmp("-h", argv[1]) == 0 || strcmp("-help", argv[1]) == 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 < 4 ) {
-        fprintf (stderr, "%s\n%s\n", usageStr, versionStr);
-        exit (1);
-    } else if (strcmp("get", argv[1]) == 0) {
-        get = YES;
-    } else if (strcmp("set", argv[1]) == 0) {
-        get = NO;
+    } else if (argc > 3 && strcmp("get", argv[1]) == 0) {
+        action = SKNActionGet;
+    } else if (argc > 3 && strcmp("set", argv[1]) == 0) {
+        action = SKNActionSet;
+    } else if (argc > 2 && strcmp("remove", argv[1]) == 0) {
+        action = SKNActionRemove;
     } else {
         fprintf (stderr, "%s\n%s\n", usageStr, versionStr);
         exit (1);
@@ -29,20 +34,21 @@
     NSFileManager *fm = [NSFileManager defaultManager];
     BOOL success = NO;
     NSString *pdfPath = [[[[NSProcessInfo processInfo] arguments] objectAtIndex:2] stringByStandardizingPath];
-    NSString *notesPath = [[[[NSProcessInfo processInfo] arguments] objectAtIndex:3] stringByStandardizingPath];
+    NSString *notesPath = action == SKNActionRemove ? nil : [[[[NSProcessInfo processInfo] arguments] objectAtIndex:3] stringByStandardizingPath];
     BOOL isDir = NO;
     
     if ([fm fileExistsAtPath:pdfPath isDirectory:&isDir] == NO || isDir) {
-    } else if (get) {
+    } else if (action == SKNActionGet) {
         NSData *data = [fm extendedAttributeNamed:SKIM_NOTES_KEY atPath:pdfPath traverseLink:YES error:NULL];
         if (data)
             success = [data writeToFile:notesPath atomically:YES];
-    } else if (notesPath && [fm fileExistsAtPath:notesPath isDirectory:&isDir] && isDir == NO) {
+    } else if (action == SKNActionSet && notesPath && [fm fileExistsAtPath:notesPath isDirectory:&isDir] && isDir == NO) {
         NSData *data = [NSData dataWithContentsOfFile:notesPath];
-        if (data) {
+        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];
-        }
+    } else if (action == SKNActionRemove) {
+        success = [fm removeExtendedAttribute:SKIM_NOTES_KEY atPath:pdfPath traverseLink:YES error:NULL];
     }
     
     [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: [1668] trunk/SKMainWindowController.m

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

Revision: 1668
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1668&view=rev
Author:   hofman
Date:     2007-03-29 11:25:11 -0700 (Thu, 29 Mar 2007)

Log Message:
-----------
Use popupmenu window level instead of screensaver window level for presentation mode, so it never covers the force quit window.

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-03-29 17:11:16 UTC (rev 1667)
+++ trunk/SKMainWindowController.m	2007-03-29 18:25:11 UTC (rev 1668)
@@ -977,7 +977,7 @@
         [mainWindow makeFirstResponder:nil];
     [fullScreenWindow setMainView:pdfView];
     [fullScreenWindow setBackgroundColor:backgroundColor];
-    [fullScreenWindow setLevel:[self isPresentation] ? NSScreenSaverWindowLevel : NSNormalWindowLevel];
+    [fullScreenWindow setLevel:[self isPresentation] ? NSPopUpMenuWindowLevel : NSNormalWindowLevel];
     [pdfView setBackgroundColor:backgroundColor];
     [pdfView layoutDocumentView];
     [pdfView setNeedsDisplay:YES];
@@ -1156,7 +1156,7 @@
         NSColor *backgroundColor = [NSColor blackColor];
         [pdfView setBackgroundColor:backgroundColor];
         [fullScreenWindow setBackgroundColor:backgroundColor];
-        [fullScreenWindow setLevel:NSScreenSaverWindowLevel];
+        [fullScreenWindow setLevel:NSPopUpMenuWindowLevel];
         
         isPresentation = YES;
     //}


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

[Skim-app-commit] SF.net SVN: skim-app: [1667] trunk/SKSideWindow.m

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

Revision: 1667
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1667&view=rev
Author:   hofman
Date:     2007-03-29 10:11:16 -0700 (Thu, 29 Mar 2007)

Log Message:
-----------
offset side window in y direction. 

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

Modified: trunk/SKSideWindow.m
===================================================================
--- trunk/SKSideWindow.m	2007-03-29 14:33:17 UTC (rev 1666)
+++ trunk/SKSideWindow.m	2007-03-29 17:11:16 UTC (rev 1667)
@@ -82,10 +82,10 @@
 
 - (void)moveToScreen:(NSScreen *)screen {
     NSRect screenFrame = [screen frame];
-    NSRect frame = [self frame];
-    frame.size.height = NSHeight(screenFrame);
+    NSRect frame = screenFrame;
     frame.size.width = WINDOW_OFFSET;
-    frame.origin.x = edge == NSMaxXEdge ? NSMaxX(screenFrame) - WINDOW_OFFSET : NSMinX(screenFrame);
+    if (edge == NSMaxXEdge)
+        frame.origin.x = NSMaxX(screenFrame) - WINDOW_OFFSET;
     frame = NSInsetRect(frame, 0.0, WINDOW_INSET);
     [self setFrame:frame display:NO];
 }


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