Revision: 3955
http://skim-app.svn.sourceforge.net/skim-app/?rev=3955&view=rev
Author: hofman
Date: 2008-06-03 13:54:54 -0700 (Tue, 03 Jun 2008)
Log Message:
-----------
Set shouldPrint flag in superclass of notes. Make sure notes are hidden if
necessary when converting.
Modified Paths:
--------------
trunk/PDFAnnotationCircle_SKExtensions.m
trunk/PDFAnnotationFreeText_SKExtensions.m
trunk/PDFAnnotationMarkup_SKExtensions.m
trunk/PDFAnnotationSquare_SKExtensions.m
trunk/PDFAnnotation_SKExtensions.m
trunk/SKPDFAnnotationNote.m
trunk/SKPDFDocument.m
Modified: trunk/PDFAnnotationCircle_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationCircle_SKExtensions.m 2008-06-03 20:42:37 UTC (rev
3954)
+++ trunk/PDFAnnotationCircle_SKExtensions.m 2008-06-03 20:54:54 UTC (rev
3955)
@@ -49,7 +49,6 @@
- (id)initNoteWithBounds:(NSRect)bounds {
if (self = [super initNoteWithBounds:bounds]) {
- [self setShouldPrint:YES];
NSColor *color = [[NSUserDefaults standardUserDefaults]
colorForKey:SKCircleNoteInteriorColorKey];
if ([color alphaComponent] > 0.0)
[self setInteriorColor:color];
Modified: trunk/PDFAnnotationFreeText_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationFreeText_SKExtensions.m 2008-06-03 20:42:37 UTC (rev
3954)
+++ trunk/PDFAnnotationFreeText_SKExtensions.m 2008-06-03 20:54:54 UTC (rev
3955)
@@ -60,7 +60,6 @@
- (id)initNoteWithBounds:(NSRect)bounds {
if (self = [super initNoteWithBounds:bounds]) {
- [self setShouldPrint:YES];
NSFont *font = [NSFont fontWithName:[[NSUserDefaults
standardUserDefaults] stringForKey:SKTextNoteFontNameKey]
size:[[NSUserDefaults
standardUserDefaults] floatForKey:SKTextNoteFontSizeKey]];
if (font)
Modified: trunk/PDFAnnotationMarkup_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationMarkup_SKExtensions.m 2008-06-03 20:42:37 UTC (rev
3954)
+++ trunk/PDFAnnotationMarkup_SKExtensions.m 2008-06-03 20:54:54 UTC (rev
3955)
@@ -170,7 +170,6 @@
- (id)initNoteWithBounds:(NSRect)bounds markupType:(int)type
quadrilateralPointsAsStrings:(NSArray *)pointStrings {
if (self = [super initNoteWithBounds:bounds]) {
- [self setShouldPrint:YES];
[self setMarkupType:type];
NSColor *color = defaultColorForMarkupType(type);
Modified: trunk/PDFAnnotationSquare_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationSquare_SKExtensions.m 2008-06-03 20:42:37 UTC (rev
3954)
+++ trunk/PDFAnnotationSquare_SKExtensions.m 2008-06-03 20:54:54 UTC (rev
3955)
@@ -49,7 +49,6 @@
- (id)initNoteWithBounds:(NSRect)bounds {
if (self = [super initNoteWithBounds:bounds]) {
- [self setShouldPrint:YES];
NSColor *color = [[NSUserDefaults standardUserDefaults]
colorForKey:SKSquareNoteInteriorColorKey];
if ([color alphaComponent] > 0.0)
[self setInteriorColor:color];
Modified: trunk/PDFAnnotation_SKExtensions.m
===================================================================
--- trunk/PDFAnnotation_SKExtensions.m 2008-06-03 20:42:37 UTC (rev 3954)
+++ trunk/PDFAnnotation_SKExtensions.m 2008-06-03 20:54:54 UTC (rev 3955)
@@ -131,6 +131,7 @@
- (id)initNoteWithBounds:(NSRect)bounds {
if (self = [self initWithBounds:bounds]) {
+ [self setShouldPrint:YES];
[self setNote:YES];
}
return self;
Modified: trunk/SKPDFAnnotationNote.m
===================================================================
--- trunk/SKPDFAnnotationNote.m 2008-06-03 20:42:37 UTC (rev 3954)
+++ trunk/SKPDFAnnotationNote.m 2008-06-03 20:54:54 UTC (rev 3955)
@@ -58,7 +58,6 @@
- (id)initNoteWithBounds:(NSRect)bounds {
if (self = [super initNoteWithBounds:bounds]) {
- [self setShouldPrint:YES];
[self setColor:[[NSUserDefaults standardUserDefaults]
colorForKey:SKAnchoredNoteColorKey]];
[self setIconType:[[NSUserDefaults standardUserDefaults]
integerForKey:SKAnchoredNoteIconTypeKey]];
texts = [[NSArray alloc] initWithObjects:[[[SKNoteText alloc]
initWithAnnotation:self] autorelease], nil];
Modified: trunk/SKPDFDocument.m
===================================================================
--- trunk/SKPDFDocument.m 2008-06-03 20:42:37 UTC (rev 3954)
+++ trunk/SKPDFDocument.m 2008-06-03 20:54:54 UTC (rev 3955)
@@ -883,6 +883,10 @@
- (void)addAsNote:(PDFAnnotation *)annotation {
[[[self undoManager] prepareWithInvocationTarget:self]
removeAsNote:annotation];
+ [[[self undoManager] prepareWithInvocationTarget:annotation]
setShouldDisplay:[annotation shouldDisplay]];
+ [[[self undoManager] prepareWithInvocationTarget:annotation]
setShouldPrint:[annotation shouldPrint]];
+ [annotation setShouldDisplay:[[self pdfView] hideNotes] == NO];
+ [annotation setShouldPrint:[[self pdfView] hideNotes] == NO];
[annotation setNote:YES];
[[self mainWindowController] addNote:annotation];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
