Revision: 6811
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6811&view=rev
Author:   hofman
Date:     2010-09-17 21:22:12 +0000 (Fri, 17 Sep 2010)

Log Message:
-----------
scripting support for alignment properties

Modified Paths:
--------------
    trunk/PDFAnnotationFreeText_SKExtensions.h
    trunk/PDFAnnotationFreeText_SKExtensions.m
    trunk/PDFAnnotation_SKExtensions.h
    trunk/PDFAnnotation_SKExtensions.m
    trunk/SKApplicationController.h
    trunk/SKApplicationController.m
    trunk/Skim.sdef

Modified: trunk/PDFAnnotationFreeText_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationFreeText_SKExtensions.h  2010-09-17 20:07:48 UTC (rev 
6810)
+++ trunk/PDFAnnotationFreeText_SKExtensions.h  2010-09-17 21:22:12 UTC (rev 
6811)
@@ -39,12 +39,25 @@
 #import <Cocoa/Cocoa.h>
 #import <Quartz/Quartz.h>
 
+
+enum {
+    SKScriptingAlignmentLeft = 'LeTA',
+    SKScriptingAlignmentRight = 'RiTA',
+    SKScriptingAlignmentCenter = 'CeTA'
+};
+
+extern FourCharCode SKScriptingAlignmentFromIconAlignment(NSTextAlignment 
alignment);
+extern NSTextAlignment SKAlignmentFromScriptingAlignment(FourCharCode 
alignment);
+
+
 extern NSString *SKPDFAnnotationScriptingFontColorKey;
 
+
 @interface PDFAnnotationFreeText (SKExtensions)
 
 - (void)setFontName:(NSString *)fontName;
 - (void)setFontSize:(CGFloat)pointSize;
 - (void)setScriptingFontColor:(NSColor *)newScriptingFontColor;
+- (void)setScriptingAlignment:(FourCharCode)alignment;
 
 @end

Modified: trunk/PDFAnnotationFreeText_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationFreeText_SKExtensions.m  2010-09-17 20:07:48 UTC (rev 
6810)
+++ trunk/PDFAnnotationFreeText_SKExtensions.m  2010-09-17 21:22:12 UTC (rev 
6811)
@@ -44,8 +44,29 @@
 #import "SKFDFParser.h"
 #import "NSUserDefaults_SKExtensions.h"
 
+
+FourCharCode SKScriptingAlignmentFromAlignment(NSTextAlignment alignment) {
+    switch (alignment) {
+        case NSLeftTextAlignment: return SKScriptingAlignmentLeft;
+        case NSRightTextAlignment: return SKScriptingAlignmentRight;
+        case NSCenterTextAlignment: return SKScriptingAlignmentCenter;
+        default: return SKScriptingAlignmentLeft;
+    }
+}
+
+NSTextAlignment SKAlignmentFromScriptingAlignment(FourCharCode alignment) {
+    switch (alignment) {
+        case SKScriptingAlignmentLeft: return NSLeftTextAlignment;
+        case SKScriptingAlignmentRight: return NSRightTextAlignment;
+        case SKScriptingAlignmentCenter: return NSCenterTextAlignment;
+        default: return NSLeftTextAlignment;
+    }
+}
+
+
 NSString *SKPDFAnnotationScriptingFontColorKey = @"scriptingFontColor";
 
+
 @interface PDFAnnotationFreeText (SKNPDFAnnotationFreeTextPrivateDeclarations)
 - (NSInteger)rotation;
 - (void)setRotation:(NSInteger)rotation;
@@ -171,6 +192,16 @@
     }
 }
 
+- (FourCharCode)scriptingAlignment {
+    return SKScriptingAlignmentFromAlignment([self alignment]);
+}
+
+- (void)setScriptingAlignment:(FourCharCode)alignment {
+    if ([self isEditable]) {
+        [self setAlignment:SKAlignmentFromScriptingAlignment(alignment)];
+    }
+}
+
 #pragma mark Accessibility
 
 - (NSArray *)accessibilityAttributeNames {

Modified: trunk/PDFAnnotation_SKExtensions.h
===================================================================
--- trunk/PDFAnnotation_SKExtensions.h  2010-09-17 20:07:48 UTC (rev 6810)
+++ trunk/PDFAnnotation_SKExtensions.h  2010-09-17 21:22:12 UTC (rev 6811)
@@ -128,6 +128,7 @@
 - (id)richText;
 - (void)setBoundsAsQDRect:(NSData *)inQDBoundsAsData;
 - (NSData *)boundsAsQDRect;
+- (FourCharCode)scriptingAlignment;
 - (NSString *)fontName;
 - (CGFloat)fontSize;
 - (NSColor *)scriptingFontColor;

Modified: trunk/PDFAnnotation_SKExtensions.m
===================================================================
--- trunk/PDFAnnotation_SKExtensions.m  2010-09-17 20:07:48 UTC (rev 6810)
+++ trunk/PDFAnnotation_SKExtensions.m  2010-09-17 21:22:12 UTC (rev 6811)
@@ -430,6 +430,10 @@
     return nil;
 }
 
+- (FourCharCode)scriptingAlignment {
+    return SKScriptingAlignmentLeft;
+}
+
 - (FourCharCode)scriptingBorderStyle {
     return SKScriptingBorderStyleFromBorderStyle([self borderStyle]);
 }

Modified: trunk/SKApplicationController.h
===================================================================
--- trunk/SKApplicationController.h     2010-09-17 20:07:48 UTC (rev 6810)
+++ trunk/SKApplicationController.h     2010-09-17 21:22:12 UTC (rev 6811)
@@ -61,7 +61,7 @@
 @property (nonatomic, copy) NSDictionary *defaultPdfViewSettings, 
*defaultFullScreenPdfViewSettings;
 @property (nonatomic, copy) NSColor *backgroundColor, 
*fullScreenBackgroundColor, *pageBackgroundColor, *defaultTextNoteFontColor;
 @property (nonatomic, copy) NSDictionary *defaultNoteColors, 
*defaultLineWidths, *defaultLineStyles, *defaultDashPatterns, 
*defaultFontNames, *defaultFontSizes;
-...@property (nonatomic) FourCharCode defaultStartLineStyle, 
defaultEndLineStyle, defaultIconType;
+...@property (nonatomic) FourCharCode defaultStartLineStyle, 
defaultEndLineStyle, defaultAlignment, defaultIconType;
 
 - (NSArray *)bookmarks;
 - (void)insertObject:(SKBookmark *)bookmark 
inBookmarksAtIndex:(NSUInteger)anIndex;

Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m     2010-09-17 20:07:48 UTC (rev 6810)
+++ trunk/SKApplicationController.m     2010-09-17 21:22:12 UTC (rev 6811)
@@ -109,7 +109,7 @@
 
 @implementation SKApplicationController
 
-...@dynamic defaultPdfViewSettings, defaultFullScreenPdfViewSettings, 
backgroundColor, fullScreenBackgroundColor, pageBackgroundColor, 
defaultNoteColors, defaultLineWidths, defaultLineStyles, defaultDashPatterns, 
defaultStartLineStyle, defaultEndLineStyle, defaultFontNames, defaultFontSizes, 
defaultTextNoteFontColor, defaultIconType;
+...@dynamic defaultPdfViewSettings, defaultFullScreenPdfViewSettings, 
backgroundColor, fullScreenBackgroundColor, pageBackgroundColor, 
defaultNoteColors, defaultLineWidths, defaultLineStyles, defaultDashPatterns, 
defaultStartLineStyle, defaultEndLineStyle, defaultFontNames, defaultFontSizes, 
defaultTextNoteFontColor, defaultAlignment, defaultIconType;
 
 + (void)initialize{
     SKINITIALIZE;
@@ -454,7 +454,7 @@
     if (applicationScriptingKeys == nil)
         applicationScriptingKeys = [[NSSet alloc] 
initWithObjects:@"bookmarks", 
             @"defaultPdfViewSettings", @"defaultFullScreenPdfViewSettings", 
@"backgroundColor", @"fullScreenBackgroundColor", @"pageBackgroundColor", 
-            @"defaultNoteColors", @"defaultLineWidths", @"defaultLineStyles", 
@"defaultDashPatterns", @"defaultStartLineStyle", @"defaultEndLineStyle", 
@"defaultFontNames", @"defaultFontSizes", @"defaultTextNoteFontColor", 
@"defaultIconType", nil];
+            @"defaultNoteColors", @"defaultLineWidths", @"defaultLineStyles", 
@"defaultDashPatterns", @"defaultStartLineStyle", @"defaultEndLineStyle", 
@"defaultFontNames", @"defaultFontSizes", @"defaultTextNoteFontColor", 
@"defaultAlignment", @"defaultIconType", nil];
        return [applicationScriptingKeys containsObject:key];
 }
 
@@ -716,6 +716,14 @@
     [[NSUserDefaults standardUserDefaults] 
setInteger:SKLineStyleFromScriptingLineStyle(style) 
forKey:SKLineNoteEndLineStyleKey];
 }
 
+- (FourCharCode)defaultAlignment {
+    return SKScriptingAlignmentFromAlignment([[NSUserDefaults 
standardUserDefaults] integerForKey:SKFreeTextNoteAlignmentKey]);
+}
+
+- (void)setDefaultAlignment:(FourCharCode)alignment {
+    [[NSUserDefaults standardUserDefaults] 
setInteger:SKAlignmentFromScriptingAlignment(alignment) 
forKey:SKFreeTextNoteAlignmentKey];
+}
+
 - (FourCharCode)defaultIconType {
     return SKScriptingIconTypeFromIconType([[NSUserDefaults 
standardUserDefaults] integerForKey:SKAnchoredNoteIconTypeKey]);
 }

Modified: trunk/Skim.sdef
===================================================================
--- trunk/Skim.sdef     2010-09-17 20:07:48 UTC (rev 6810)
+++ trunk/Skim.sdef     2010-09-17 21:22:12 UTC (rev 6811)
@@ -844,6 +844,10 @@
                 description="The default font color used for new text notes.">
                 <cocoa key="defaultTextNoteFontColor"/>
             </property>
+            <property name="default text note alignment" type="text alignment" 
code="DNAl"
+                description="The default alignment used for new text notes.">
+                <cocoa key="defaultAlignment"/>
+            </property>
             <property name="default note icon type" type="icon type" 
code="DNtI"
                 description="The default icon type used for new anchored 
notes.">
                 <cocoa key="defaultIconType"/>
@@ -1056,6 +1060,10 @@
                 description="The font size in points of a text note.">
                 <cocoa key="fontSize"/>
             </property>
+            <property name="alignment" code="Algn" type="text alignment"
+                description="The text alignment of a text note.">
+                <cocoa key="scriptingAlignment"/>
+            </property>
             <property name="font color" code="FntC" type="RGBA color"
                 description="The text color of a text note.">
                 <cocoa key="scriptingFontColor"/>
@@ -1528,6 +1536,15 @@
                 description="Freehand."/>
         </enumeration>
 
+        <enumeration name="text alignment" code="TAlE">
+            <enumerator name="left alignment" code="LeTA"
+                description="Left text alignment."/>
+            <enumerator name="right alignment" code="RiTA"
+                description="Right text alignment."/>
+            <enumerator name="center alignment" code="CeTA"
+                description="Center text alignment."/>
+        </enumeration>
+
         <enumeration name="icon type" code="ITpE">
             <enumerator name="comment icon" code="ICmt"
                 description="Comment icon."/>


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

------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to