Revision: 4136
http://skim-app.svn.sourceforge.net/skim-app/?rev=4136&view=rev
Author: hofman
Date: 2008-07-05 07:06:01 -0700 (Sat, 05 Jul 2008)
Log Message:
-----------
Rename some methods in accordance to changes in SkimNotes framework.
Modified Paths:
--------------
trunk/PDFAnnotationMarkup_SKExtensions.m
trunk/PDFAnnotation_SKExtensions.m
trunk/SKMainWindowController_UI.m
trunk/SKPDFDocument.m
trunk/SKPDFView.m
Modified: trunk/PDFAnnotationMarkup_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationMarkup_SKExtensions.m 2008-07-05 14:04:36 UTC (rev
4135)
+++ trunk/PDFAnnotationMarkup_SKExtensions.m 2008-07-05 14:06:01 UTC (rev
4136)
@@ -143,7 +143,7 @@
return CFDictionaryContainsKey(lineRectsDict, self);
}
-+ (NSColor *)defaultColorForMarkupType:(int)markupType
++ (NSColor *)defaultSkimNoteColorForMarkupType:(int)markupType
{
switch (markupType) {
case kPDFMarkupTypeUnderline:
@@ -160,7 +160,7 @@
if (self = [super initSkimNoteWithBounds:bounds]) {
[self setMarkupType:type];
- NSColor *color = [[self class] defaultColorForMarkupType:type];
+ NSColor *color = [[self class] defaultSkimNoteColorForMarkupType:type];
if (color)
[self setColor:color];
Modified: trunk/PDFAnnotation_SKExtensions.m
===================================================================
--- trunk/PDFAnnotation_SKExtensions.m 2008-07-05 14:04:36 UTC (rev 4135)
+++ trunk/PDFAnnotation_SKExtensions.m 2008-07-05 14:06:01 UTC (rev 4136)
@@ -302,7 +302,7 @@
// to support the 'duplicate' command
- (id)copyWithZone:(NSZone *)zone {
if ([self isMovable]) // we don't want to duplicate markup
- return [[PDFAnnotation allocWithZone:zone]
initSkimNoteWithProperties:[self properties]];
+ return [[PDFAnnotation allocWithZone:zone]
initSkimNoteWithProperties:[self SkimNoteProperties]];
else
return nil;
}
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2008-07-05 14:04:36 UTC (rev 4135)
+++ trunk/SKMainWindowController_UI.m 2008-07-05 14:06:01 UTC (rev 4136)
@@ -657,7 +657,7 @@
itemEnum = [[self noteItems:items] objectEnumerator];
while (item = [itemEnum nextObject]) {
if ([item isMovable]) {
- noteData = [NSKeyedArchiver archivedDataWithRootObject:[item
properties]];
+ noteData = [NSKeyedArchiver archivedDataWithRootObject:[item
SkimNoteProperties]];
[types addObject:SKSkimNotePboardType];
break;
}
Modified: trunk/SKPDFDocument.m
===================================================================
--- trunk/SKPDFDocument.m 2008-07-05 14:04:36 UTC (rev 4135)
+++ trunk/SKPDFDocument.m 2008-07-05 14:06:01 UTC (rev 4136)
@@ -324,7 +324,7 @@
}
- if (NO == [[NSFileManager defaultManager] writeSkimNotes:[[self
notes] valueForKey:@"properties"] textNotes:[self notesString]
richTextNotes:[self notesRTFData] toExtendedAttributesAtURL:absoluteURL
error:NULL]) {
+ if (NO == [[NSFileManager defaultManager] writeSkimNotes:[[self
notes] valueForKey:@"SkimNoteProperties"] textNotes:[self notesString]
richTextNotes:[self notesRTFData] toExtendedAttributesAtURL:absoluteURL
error:NULL]) {
NSString *message = saveNotesOK ? NSLocalizedString(@"The
notes could not be saved with the PDF at \"[EMAIL PROTECTED]". However a
companion .skim file was successfully updated.", @"Informative text in alert
dialog") :
NSLocalizedString(@"The
notes could not be saved with the PDF at \"[EMAIL PROTECTED]"", @"Informative
text in alert dialog");
NSAlert *alert = [NSAlert alertWithMessageText:[NSString
stringWithFormat:NSLocalizedString(@"Unable to save notes", @"Message in alert
dialog")]
@@ -415,7 +415,7 @@
// notes are only saved as a dry-run to test if we can write, they are
not copied to the final destination.
// if we automatically save a .skim backup we silently ignore this
problem
if (didWrite && NO == [[NSUserDefaults standardUserDefaults]
boolForKey:SKAutoSaveSkimNotesKey])
- didWrite = [[NSFileManager defaultManager] writeSkimNotes:[[self
notes] valueForKey:@"properties"] textNotes:[self notesString]
richTextNotes:[self notesRTFData] toExtendedAttributesAtURL:absoluteURL
error:&error];
+ didWrite = [[NSFileManager defaultManager] writeSkimNotes:[[self
notes] valueForKey:@"SkimNoteProperties"] textNotes:[self notesString]
richTextNotes:[self notesRTFData] toExtendedAttributesAtURL:absoluteURL
error:&error];
} else if (SKIsPDFBundleDocumentType(typeName)) {
NSString *name = [[[absoluteURL path] lastPathComponent]
stringByDeletingPathExtension];
if ([name caseInsensitiveCompare:BUNDLE_DATA_FILENAME] ==
NSOrderedSame)
@@ -440,7 +440,7 @@
didWrite = [fileWrapper writeToFile:[absoluteURL path] atomically:NO
updateFilenames:NO];
[fileWrapper release];
} else if (SKIsNotesDocumentType(typeName)) {
- didWrite = [[NSFileManager defaultManager] writeSkimNotes:[[self
notes] valueForKey:@"properties"] toSkimFileAtURL:absoluteURL error:&error];
+ didWrite = [[NSFileManager defaultManager] writeSkimNotes:[[self
notes] valueForKey:@"SkimNoteProperties"] toSkimFileAtURL:absoluteURL
error:&error];
} else if (SKIsNotesRTFDocumentType(typeName)) {
NSData *data = [self notesRTFData];
if (data)
@@ -732,7 +732,7 @@
#pragma mark Notes
- (NSData *)notesData {
- NSArray *array = [[self notes] valueForKey:@"properties"];
+ NSArray *array = [[self notes] valueForKey:@"SkimNoteProperties"];
return array ? [NSKeyedArchiver archivedDataWithRootObject:array] : nil;
}
@@ -872,7 +872,7 @@
while (annotation = [annEnum nextObject]) {
if ([annotation isSkimNote] == NO && [annotation
isConvertibleAnnotation]) {
if ([[annotation type] isEqualToString:SKNTextString]) {
- PDFAnnotation *newAnnotation = [[SKNPDFAnnotationNote
alloc] initSkimNoteWithProperties:[annotation properties]];
+ PDFAnnotation *newAnnotation = [[SKNPDFAnnotationNote
alloc] initSkimNoteWithProperties:[annotation SkimNoteProperties]];
[[self pdfView] removeAnnotation:annotation];
[[self pdfView] addAnnotation:newAnnotation toPage:page];
[newAnnotation release];
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2008-07-05 14:04:36 UTC (rev 4135)
+++ trunk/SKPDFView.m 2008-07-05 14:06:01 UTC (rev 4136)
@@ -756,7 +756,7 @@
NSData *tiffData = nil;
if ([self hideNotes] == NO && [activeAnnotation isSkimNote] &&
[activeAnnotation isMovable]) {
- if (noteData = [NSKeyedArchiver
archivedDataWithRootObject:[activeAnnotation properties]])
+ if (noteData = [NSKeyedArchiver
archivedDataWithRootObject:[activeAnnotation SkimNoteProperties]])
[types addObject:SKSkimNotePboardType];
}
@@ -2943,7 +2943,7 @@
if (hideNotes == NO && page != nil) {
if (([theEvent modifierFlags] & NSAlternateKeyMask) &&
[newActiveAnnotation isMovable]) {
// select a new copy of the annotation
- PDFAnnotation *newAnnotation = [[PDFAnnotation alloc]
initSkimNoteWithProperties:[newActiveAnnotation properties]];
+ PDFAnnotation *newAnnotation = [[PDFAnnotation alloc]
initSkimNoteWithProperties:[newActiveAnnotation SkimNoteProperties]];
[self addAnnotation:newAnnotation toPage:page];
[[self undoManager] setActionName:NSLocalizedString(@"Add Note",
@"Undo action name")];
newActiveAnnotation = newAnnotation;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
