Revision: 3590
http://skim-app.svn.sourceforge.net/skim-app/?rev=3590&view=rev
Author: hofman
Date: 2008-04-01 17:16:07 -0700 (Tue, 01 Apr 2008)
Log Message:
-----------
Move string constants to appropriate files.
Modified Paths:
--------------
trunk/PDFAnnotation_SKExtensions.h
trunk/PDFAnnotation_SKExtensions.m
trunk/SKMainWindowController.m
trunk/SKPDFAnnotationCircle.h
trunk/SKPDFAnnotationCircle.m
trunk/SKPDFAnnotationFreeText.h
trunk/SKPDFAnnotationFreeText.m
trunk/SKPDFAnnotationLine.h
trunk/SKPDFAnnotationLine.m
trunk/SKPDFAnnotationMarkup.h
trunk/SKPDFAnnotationMarkup.m
trunk/SKPDFAnnotationNote.h
trunk/SKPDFAnnotationNote.m
trunk/SKPDFAnnotationSquare.m
Modified: trunk/PDFAnnotation_SKExtensions.h
===================================================================
--- trunk/PDFAnnotation_SKExtensions.h 2008-04-01 23:56:21 UTC (rev 3589)
+++ trunk/PDFAnnotation_SKExtensions.h 2008-04-02 00:16:07 UTC (rev 3590)
@@ -75,33 +75,8 @@
extern NSString *SKPDFAnnotationBorderStyleKey;
extern NSString *SKPDFAnnotationDashPatternKey;
-extern NSString *SKPDFAnnotationInteriorColorKey;
-
-extern NSString *SKPDFAnnotationQuadrilateralPointsKey;
-
-extern NSString *SKPDFAnnotationFontKey;
-extern NSString *SKPDFAnnotationFontNameKey;
-extern NSString *SKPDFAnnotationFontSizeKey;
-extern NSString *SKPDFAnnotationRotationKey;
-
-extern NSString *SKPDFAnnotationIconTypeKey;
-extern NSString *SKPDFAnnotationTextKey;
-extern NSString *SKPDFAnnotationImageKey;
-
-extern NSString *SKPDFAnnotationStartLineStyleKey;
-extern NSString *SKPDFAnnotationEndLineStyleKey;
-extern NSString *SKPDFAnnotationStartPointKey;
-extern NSString *SKPDFAnnotationEndPointKey;
-
extern NSString *SKPDFAnnotationScriptingNoteTypeKey;
-extern NSString *SKPDFAnnotationScriptingIconTypeKey;
-extern NSString *SKPDFAnnotationRichTextKey;
-extern NSString *SKPDFAnnotationStartPointAsQDPointKey;
-extern NSString *SKPDFAnnotationEndPointAsQDPointKey;
-extern NSString *SKPDFAnnotationScriptingStartLineStyleKey;
-extern NSString *SKPDFAnnotationScriptingEndLineStyleKey;
extern NSString *SKPDFAnnotationScriptingBorderStyleKey;
-extern NSString *SKPDFAnnotationSelectionSpecifierKey;
@interface PDFAnnotation (SKExtensions)
Modified: trunk/PDFAnnotation_SKExtensions.m
===================================================================
--- trunk/PDFAnnotation_SKExtensions.m 2008-04-01 23:56:21 UTC (rev 3589)
+++ trunk/PDFAnnotation_SKExtensions.m 2008-04-02 00:16:07 UTC (rev 3590)
@@ -87,33 +87,8 @@
NSString *SKPDFAnnotationBorderStyleKey = @"borderStyle";
NSString *SKPDFAnnotationDashPatternKey = @"dashPattern";
-NSString *SKPDFAnnotationInteriorColorKey = @"color";
-
-NSString *SKPDFAnnotationQuadrilateralPointsKey = @"quadrilateralPoints";
-
-NSString *SKPDFAnnotationFontKey = @"font";
-NSString *SKPDFAnnotationFontNameKey = @"fontName";
-NSString *SKPDFAnnotationFontSizeKey = @"fontSize";
-NSString *SKPDFAnnotationRotationKey = @"rotation";
-
-NSString *SKPDFAnnotationIconTypeKey = @"iconType";
-NSString *SKPDFAnnotationTextKey = @"text";
-NSString *SKPDFAnnotationImageKey = @"image";
-
-NSString *SKPDFAnnotationStartLineStyleKey = @"startLineStyle";
-NSString *SKPDFAnnotationEndLineStyleKey = @"endLineStyle";
-NSString *SKPDFAnnotationStartPointKey = @"startPoint";
-NSString *SKPDFAnnotationEndPointKey = @"endPoint";
-
NSString *SKPDFAnnotationScriptingNoteTypeKey = @"scriptingNoteType";
-NSString *SKPDFAnnotationScriptingIconTypeKey = @"scriptingIconType";
-NSString *SKPDFAnnotationRichTextKey = @"richText";
-NSString *SKPDFAnnotationStartPointAsQDPointKey = @"startPointAsQDPoint";
-NSString *SKPDFAnnotationEndPointAsQDPointKey = @"endPointAsQDPoint";
-NSString *SKPDFAnnotationScriptingStartLineStyleKey =
@"scriptingStartLineStyle";
-NSString *SKPDFAnnotationScriptingEndLineStyleKey = @"scriptingEndLineStyle";
NSString *SKPDFAnnotationScriptingBorderStyleKey = @"scriptingBorderStyle";
-NSString *SKPDFAnnotationSelectionSpecifierKey = @"selectionSpecifier";
@implementation PDFAnnotation (SKExtensions)
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2008-04-01 23:56:21 UTC (rev 3589)
+++ trunk/SKMainWindowController.m 2008-04-02 00:16:07 UTC (rev 3590)
@@ -57,6 +57,8 @@
#import "BDSKEdgeView.h"
#import "BDSKGradientView.h"
#import "PDFAnnotation_SKExtensions.h"
+#import "SKPDFAnnotationFreeText.h"
+#import "SKPDFAnnotationCircle.h"
#import "SKPDFAnnotationLine.h"
#import "SKPDFAnnotationNote.h"
#import "SKPDFAnnotationTemporary.h"
Modified: trunk/SKPDFAnnotationCircle.h
===================================================================
--- trunk/SKPDFAnnotationCircle.h 2008-04-01 23:56:21 UTC (rev 3589)
+++ trunk/SKPDFAnnotationCircle.h 2008-04-02 00:16:07 UTC (rev 3590)
@@ -39,6 +39,7 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+extern NSString *SKPDFAnnotationInteriorColorKey;
@interface SKPDFAnnotationCircle : PDFAnnotationCircle
@end
Modified: trunk/SKPDFAnnotationCircle.m
===================================================================
--- trunk/SKPDFAnnotationCircle.m 2008-04-01 23:56:21 UTC (rev 3589)
+++ trunk/SKPDFAnnotationCircle.m 2008-04-02 00:16:07 UTC (rev 3590)
@@ -38,10 +38,15 @@
#import "SKPDFAnnotationCircle.h"
#import "PDFAnnotation_SKExtensions.h"
+#import "SKPDFAnnotationLine.h"
+#import "SKPDFAnnotationMarkup.h"
+#import "SKPDFAnnotationFreeText.h"
+#import "SKPDFAnnotationNote.h"
#import "PDFBorder_SKExtensions.h"
#import "SKStringConstants.h"
#import "NSUserDefaultsController_SKExtensions.h"
+NSString *SKPDFAnnotationInteriorColorKey = @"color";
@implementation SKPDFAnnotationCircle
Modified: trunk/SKPDFAnnotationFreeText.h
===================================================================
--- trunk/SKPDFAnnotationFreeText.h 2008-04-01 23:56:21 UTC (rev 3589)
+++ trunk/SKPDFAnnotationFreeText.h 2008-04-02 00:16:07 UTC (rev 3590)
@@ -39,7 +39,12 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+extern NSString *SKPDFAnnotationFontKey;
+extern NSString *SKPDFAnnotationFontNameKey;
+extern NSString *SKPDFAnnotationFontSizeKey;
+extern NSString *SKPDFAnnotationRotationKey;
+
@interface SKPDFAnnotationFreeText : PDFAnnotationFreeText
- (void)setFontName:(NSString *)fontName;
Modified: trunk/SKPDFAnnotationFreeText.m
===================================================================
--- trunk/SKPDFAnnotationFreeText.m 2008-04-01 23:56:21 UTC (rev 3589)
+++ trunk/SKPDFAnnotationFreeText.m 2008-04-02 00:16:07 UTC (rev 3590)
@@ -39,10 +39,19 @@
#import "SKPDFAnnotationFreeText.h"
#import "PDFAnnotation_SKExtensions.h"
#import "PDFBorder_SKExtensions.h"
+#import "SKPDFAnnotationCircle.h"
+#import "SKPDFAnnotationLine.h"
+#import "SKPDFAnnotationMarkup.h"
+#import "SKPDFAnnotationNote.h"
#import "SKStringConstants.h"
#import "NSUserDefaultsController_SKExtensions.h"
+NSString *SKPDFAnnotationFontKey = @"font";
+NSString *SKPDFAnnotationFontNameKey = @"fontName";
+NSString *SKPDFAnnotationFontSizeKey = @"fontSize";
+NSString *SKPDFAnnotationRotationKey = @"rotation";
+
@interface PDFAnnotationFreeText (SKPDFAnnotationFreeTextPrivateDeclarations)
- (int)rotation;
- (void)setRotation:(int)rotation;
Modified: trunk/SKPDFAnnotationLine.h
===================================================================
--- trunk/SKPDFAnnotationLine.h 2008-04-01 23:56:21 UTC (rev 3589)
+++ trunk/SKPDFAnnotationLine.h 2008-04-02 00:16:07 UTC (rev 3590)
@@ -52,6 +52,18 @@
extern int SKScriptingLineStyleFromLineStyle(int lineStyle);
extern int SKLineStyleFromScriptingLineStyle(int lineStyle);
+
+extern NSString *SKPDFAnnotationStartLineStyleKey;
+extern NSString *SKPDFAnnotationEndLineStyleKey;
+extern NSString *SKPDFAnnotationStartPointKey;
+extern NSString *SKPDFAnnotationEndPointKey;
+
+extern NSString *SKPDFAnnotationStartPointAsQDPointKey;
+extern NSString *SKPDFAnnotationEndPointAsQDPointKey;
+extern NSString *SKPDFAnnotationScriptingStartLineStyleKey;
+extern NSString *SKPDFAnnotationScriptingEndLineStyleKey;
+
+
@interface SKPDFAnnotationLine : PDFAnnotationLine
- (void)setStartPointAsQDPoint:(NSData *)inQDPointAsData;
Modified: trunk/SKPDFAnnotationLine.m
===================================================================
--- trunk/SKPDFAnnotationLine.m 2008-04-01 23:56:21 UTC (rev 3589)
+++ trunk/SKPDFAnnotationLine.m 2008-04-02 00:16:07 UTC (rev 3590)
@@ -38,6 +38,10 @@
#import "SKPDFAnnotationLine.h"
#import "PDFAnnotation_SKExtensions.h"
+#import "SKPDFAnnotationCircle.h"
+#import "SKPDFAnnotationMarkup.h"
+#import "SKPDFAnnotationFreeText.h"
+#import "SKPDFAnnotationNote.h"
#import "PDFBorder_SKExtensions.h"
#import "SKStringConstants.h"
#import "NSUserDefaultsController_SKExtensions.h"
@@ -69,6 +73,17 @@
}
+NSString *SKPDFAnnotationStartLineStyleKey = @"startLineStyle";
+NSString *SKPDFAnnotationEndLineStyleKey = @"endLineStyle";
+NSString *SKPDFAnnotationStartPointKey = @"startPoint";
+NSString *SKPDFAnnotationEndPointKey = @"endPoint";
+
+NSString *SKPDFAnnotationStartPointAsQDPointKey = @"startPointAsQDPoint";
+NSString *SKPDFAnnotationEndPointAsQDPointKey = @"endPointAsQDPoint";
+NSString *SKPDFAnnotationScriptingStartLineStyleKey =
@"scriptingStartLineStyle";
+NSString *SKPDFAnnotationScriptingEndLineStyleKey = @"scriptingEndLineStyle";
+
+
@implementation SKPDFAnnotationLine
- (id)initWithBounds:(NSRect)bounds {
Modified: trunk/SKPDFAnnotationMarkup.h
===================================================================
--- trunk/SKPDFAnnotationMarkup.h 2008-04-01 23:56:21 UTC (rev 3589)
+++ trunk/SKPDFAnnotationMarkup.h 2008-04-02 00:16:07 UTC (rev 3590)
@@ -40,6 +40,11 @@
#import <Quartz/Quartz.h>
+extern NSString *SKPDFAnnotationQuadrilateralPointsKey;
+
+extern NSString *SKPDFAnnotationSelectionSpecifierKey;
+
+
extern void SKCGContextSetDefaultRGBColorSpace(CGContextRef context);
Modified: trunk/SKPDFAnnotationMarkup.m
===================================================================
--- trunk/SKPDFAnnotationMarkup.m 2008-04-01 23:56:21 UTC (rev 3589)
+++ trunk/SKPDFAnnotationMarkup.m 2008-04-02 00:16:07 UTC (rev 3590)
@@ -38,6 +38,10 @@
#import "SKPDFAnnotationMarkup.h"
#import "PDFAnnotation_SKExtensions.h"
+#import "SKPDFAnnotationCircle.h"
+#import "SKPDFAnnotationLine.h"
+#import "SKPDFAnnotationFreeText.h"
+#import "SKPDFAnnotationNote.h"
#import "PDFBorder_SKExtensions.h"
#import "SKStringConstants.h"
#import "PDFSelection_SKExtensions.h"
@@ -45,6 +49,11 @@
#import "NSGeometry_SKExtensions.h"
+NSString *SKPDFAnnotationQuadrilateralPointsKey = @"quadrilateralPoints";
+
+NSString *SKPDFAnnotationSelectionSpecifierKey = @"selectionSpecifier";
+
+
void SKCGContextSetDefaultRGBColorSpace(CGContextRef context) {
CMProfileRef profile;
CMGetDefaultProfileBySpace(cmRGBData, &profile);
Modified: trunk/SKPDFAnnotationNote.h
===================================================================
--- trunk/SKPDFAnnotationNote.h 2008-04-01 23:56:21 UTC (rev 3589)
+++ trunk/SKPDFAnnotationNote.h 2008-04-02 00:16:07 UTC (rev 3590)
@@ -55,6 +55,14 @@
extern int SKIconTypeFromScriptingIconType(int iconType);
+extern NSString *SKPDFAnnotationIconTypeKey;
+extern NSString *SKPDFAnnotationTextKey;
+extern NSString *SKPDFAnnotationImageKey;
+
+extern NSString *SKPDFAnnotationScriptingIconTypeKey;
+extern NSString *SKPDFAnnotationRichTextKey;
+
+
@interface PDFAnnotationText (SKLeopardDeprecated)
// these are deprecated on 10.5, but we don't want to use the popup for 10.4
compatibility; we check for existence before using this anyway
- (BOOL)windowIsOpen;
Modified: trunk/SKPDFAnnotationNote.m
===================================================================
--- trunk/SKPDFAnnotationNote.m 2008-04-01 23:56:21 UTC (rev 3589)
+++ trunk/SKPDFAnnotationNote.m 2008-04-02 00:16:07 UTC (rev 3590)
@@ -38,6 +38,10 @@
#import "SKPDFAnnotationNote.h"
#import "PDFAnnotation_SKExtensions.h"
+#import "SKPDFAnnotationCircle.h"
+#import "SKPDFAnnotationLine.h"
+#import "SKPDFAnnotationMarkup.h"
+#import "SKPDFAnnotationFreeText.h"
#import "PDFBorder_SKExtensions.h"
#import "SKStringConstants.h"
#import "NSUserDefaultsController_SKExtensions.h"
@@ -72,6 +76,14 @@
}
+NSString *SKPDFAnnotationIconTypeKey = @"iconType";
+NSString *SKPDFAnnotationTextKey = @"text";
+NSString *SKPDFAnnotationImageKey = @"image";
+
+NSString *SKPDFAnnotationScriptingIconTypeKey = @"scriptingIconType";
+NSString *SKPDFAnnotationRichTextKey = @"richText";
+
+
@implementation SKPDFAnnotationNote
- (id)initWithBounds:(NSRect)bounds {
Modified: trunk/SKPDFAnnotationSquare.m
===================================================================
--- trunk/SKPDFAnnotationSquare.m 2008-04-01 23:56:21 UTC (rev 3589)
+++ trunk/SKPDFAnnotationSquare.m 2008-04-02 00:16:07 UTC (rev 3590)
@@ -38,6 +38,11 @@
#import "SKPDFAnnotationSquare.h"
#import "PDFAnnotation_SKExtensions.h"
+#import "SKPDFAnnotationCircle.h"
+#import "SKPDFAnnotationLine.h"
+#import "SKPDFAnnotationMarkup.h"
+#import "SKPDFAnnotationFreeText.h"
+#import "SKPDFAnnotationNote.h"
#import "PDFBorder_SKExtensions.h"
#import "SKStringConstants.h"
#import "NSUserDefaultsController_SKExtensions.h"
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://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
