Revision: 5518
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5518&view=rev
Author:   hofman
Date:     2009-08-03 15:29:45 +0000 (Mon, 03 Aug 2009)

Log Message:
-----------
save presentation transition options in EAs

Modified Paths:
--------------
    trunk/SKMainWindowController.h
    trunk/SKMainWindowController.m
    trunk/SKPDFDocument.h
    trunk/SKPDFDocument.m
    trunk/SKTransitionController.h
    trunk/SKTransitionController.m

Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h      2009-07-30 17:37:08 UTC (rev 5517)
+++ trunk/SKMainWindowController.h      2009-08-03 15:29:45 UTC (rev 5518)
@@ -295,6 +295,9 @@
 - (void)insertObject:(SKGroupedSearchResult *)groupedSearchResult 
inGroupedSearchResultsAtIndex:(NSUInteger)theIndex;
 - (void)removeObjectFromGroupedSearchResultsAtIndex:(NSUInteger)theIndex;
 
+- (NSDictionary *)presentationOptions;
+- (void)setPresentationOptions:(NSDictionary *)dictionary;
+
 - (NSArray *)tags;
 - (double)rating;
 

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2009-07-30 17:37:08 UTC (rev 5517)
+++ trunk/SKMainWindowController.m      2009-08-03 15:29:45 UTC (rev 5518)
@@ -1214,6 +1214,35 @@
     [groupedSearchResults removeObjectAtIndex:theIndex];
 }
 
+
+- (NSDictionary *)presentationOptions {
+    SKTransitionController *transitions = [pdfView transitionController];
+    SKAnimationTransitionStyle style = [transitions transitionStyle];
+    NSString *styleName = [SKTransitionController nameForStyle:style];
+    if (styleName == nil) {
+        return nil;
+    } else {
+        NSMutableDictionary *options = [NSMutableDictionary dictionary];
+        [options setObject:styleName forKey:@"styleName"];
+        [options setObject:[NSNumber numberWithFloat:[transitions duration]] 
forKey:@"duration"];
+        [options setObject:[NSNumber numberWithBool:[transitions 
shouldRestrict]] forKey:@"shouldRestrict"];
+        return options;
+    }
+}
+
+- (void)setPresentationOptions:(NSDictionary *)dictionary {
+    SKTransitionController *transitions = [pdfView transitionController];
+    NSString *styleName = [dictionary objectForKey:@"styleName"];
+    NSNumber *duration = [dictionary objectForKey:@"duration"];
+    NSNumber *shouldRestrict = [dictionary objectForKey:@"shouldRestrict"];
+    if (styleName)
+        [transitions setTransitionStyle:[SKTransitionController 
styleForName:styleName]];
+    if (duration)
+        [transitions setDuration:[duration floatValue]];
+    if (shouldRestrict)
+        [transitions setShouldRestrict:[shouldRestrict boolValue]];
+}
+
 - (NSArray *)tags {
     return tags;
 }

Modified: trunk/SKPDFDocument.h
===================================================================
--- trunk/SKPDFDocument.h       2009-07-30 17:37:08 UTC (rev 5517)
+++ trunk/SKPDFDocument.h       2009-08-03 15:29:45 UTC (rev 5518)
@@ -75,6 +75,7 @@
     // temporary variables:
     PDFDocument *pdfDocument;
     NSArray *noteDicts;
+    NSDictionary *presentationOptions;
     NSArray *openMetaTags;
     double openMetaRating;
     

Modified: trunk/SKPDFDocument.m
===================================================================
--- trunk/SKPDFDocument.m       2009-07-30 17:37:08 UTC (rev 5517)
+++ trunk/SKPDFDocument.m       2009-08-03 15:29:45 UTC (rev 5518)
@@ -78,6 +78,7 @@
 #import "SKTextFieldSheetController.h"
 
 #define BUNDLE_DATA_FILENAME @"data"
+#define PRESENTATION_OPTIONS_KEY 
@"net_sourceforge_skim-app_presentation_options"
 #define OPEN_META_TAGS_KEY @"com.apple.metadata:kOMUserTags"
 #define OPEN_META_RATING_KEY @"com.apple.metadata:kOMStarRating"
 
@@ -96,6 +97,7 @@
 - (void)setPSOrDVIData:(NSData *)data;
 - (void)setPDFDoc:(PDFDocument *)doc;
 - (void)setNoteDicts:(NSArray *)array;
+- (void)setPresentationOptions:(NSDictionary *)array;
 - (void)setOpenMetaTags:(NSArray *)array;
 - (void)setOpenMetaRating:(double)rating;
 
@@ -130,6 +132,7 @@
     [psOrDviData release];
     [pdfDocument release];
     [noteDicts release];
+    [presentationOptions release];
     [openMetaTags release];
     [readNotesAccessoryView release];
     [lastModifiedDate release];
@@ -171,6 +174,10 @@
     [mainController setAnnotationsFromDictionaries:noteDicts undoable:NO];
     [self setNoteDicts:nil];
     
+    if (presentationOptions)
+        [[self mainWindowController] 
setPresentationOptions:presentationOptions];
+    [self setPresentationOptions:nil];
+    
     [mainController setOpenMetaTags:openMetaTags];
     [self setOpenMetaTags:nil];
     
@@ -385,6 +392,11 @@
                 [alert runModal];
             }
             
+            NSDictionary *options = [[self mainWindowController] 
presentationOptions];
+            [[SKNExtendedAttributeManager sharedManager] 
removeExtendedAttributeNamed:PRESENTATION_OPTIONS_KEY atPath:[absoluteURL path] 
traverseLink:YES error:NULL];
+            if (options)
+                [[SKNExtendedAttributeManager sharedManager] 
setExtendedAttributeNamed:PRESENTATION_OPTIONS_KEY toPropertyListValue:options 
atPath:[absoluteURL path] options:kSKNXattrDefault error:NULL];
+            
             if (success)
                 [[NSDistributedNotificationCenter defaultCenter]
                     postNotificationName:SKSkimFileDidSaveNotification 
object:[absoluteURL path]];
@@ -470,10 +482,16 @@
             name = [name stringByAppendingString:@"1"];
         NSData *data;
         NSFileWrapper *fileWrapper = [[NSFileWrapper alloc] 
initDirectoryWithFileWrappers:[NSDictionary dictionary]];
+        NSDictionary *info = [[SKInfoWindowController sharedInstance] 
infoForDocument:self];
+        NSDictionary *options = [[self mainWindowController] 
presentationOptions];
+        if (options) {
+            info = [[info mutableCopy] autorelease];
+            [(NSMutableDictionary *)info setObject:options 
forKey:@"PresentationOptions"];
+        }
         [fileWrapper addRegularFileWithContents:pdfData 
preferredFilename:[name stringByAppendingPathExtension:@"pdf"]];
         if (data = [[[self pdfDocument] string] 
dataUsingEncoding:NSUTF8StringEncoding])
             [fileWrapper addRegularFileWithContents:data 
preferredFilename:[BUNDLE_DATA_FILENAME stringByAppendingPathExtension:@"txt"]];
-        if (data = [NSPropertyListSerialization 
dataFromPropertyList:[[SKInfoWindowController sharedInstance] 
infoForDocument:self] format:NSPropertyListXMLFormat_v1_0 
errorDescription:NULL])
+        if (data = [NSPropertyListSerialization dataFromPropertyList:info 
format:NSPropertyListXMLFormat_v1_0 errorDescription:NULL])
             [fileWrapper addRegularFileWithContents:data 
preferredFilename:[BUNDLE_DATA_FILENAME 
stringByAppendingPathExtension:@"plist"]];
         if ([[self notes] count] > 0) {
             if (data = [self notesData])
@@ -559,6 +577,10 @@
         [[self mainWindowController] setAnnotationsFromDictionaries:noteDicts 
undoable:NO];
         [self setNoteDicts:nil];
         
+        if (presentationOptions)
+            [[self mainWindowController] 
setPresentationOptions:presentationOptions];
+        [self setPresentationOptions:nil];
+        
         [[self mainWindowController] setOpenMetaTags:openMetaTags];
         [self setOpenMetaTags:nil];
         
@@ -634,6 +656,13 @@
     }
 }
 
+- (void)setPresentationOptions:(NSDictionary *)dictionary {
+    if (presentationOptions != dictionary) {
+        [presentationOptions autorelease];
+        presentationOptions = [dictionary retain];
+    }
+}
+
 - (void)setOpenMetaTags:(NSArray *)array {
     if (openMetaTags != array) {
         [openMetaTags autorelease];
@@ -694,6 +723,7 @@
     [self setPSOrDVIData:nil];
     [self setPDFDoc:nil];
     [self setNoteDicts:nil];
+    [self setPresentationOptions:nil];
     [self setOpenMetaTags:nil];
     [self setOpenMetaRating:0.0];
     
@@ -793,6 +823,7 @@
             [lastModifiedDate release];
             lastModifiedDate = [[[[NSFileManager defaultManager] 
fileAttributesAtPath:[absoluteURL path] traverseLink:YES] fileModificationDate] 
retain];
             
+            NSDictionary *dictionary = nil;
             NSArray *array = nil;
             NSNumber *number = nil;
             if (SKIsPDFBundleDocumentType(docType)) {
@@ -803,14 +834,18 @@
                     if (info == nil) {
                         [errorString release];
                     } else if ([info isKindOfClass:[NSDictionary class]]) {
-                        array =[info objectForKey:@"Tags"];
+                        dictionary = [info 
objectForKey:@"PresentationOptions"];
+                        array = [info objectForKey:@"Tags"];
                         number = [info objectForKey:@"Rating"];
                     }
                 }
             } else {
+                dictionary = [[SKNExtendedAttributeManager 
sharedNoSplitManager] 
propertyListFromExtendedAttributeNamed:PRESENTATION_OPTIONS_KEY 
atPath:[absoluteURL path] traverseLink:YES error:NULL];
                 array = [[SKNExtendedAttributeManager sharedNoSplitManager] 
propertyListFromExtendedAttributeNamed:OPEN_META_TAGS_KEY atPath:[absoluteURL 
path] traverseLink:YES error:NULL];
                 number = [[SKNExtendedAttributeManager sharedNoSplitManager] 
propertyListFromExtendedAttributeNamed:OPEN_META_RATING_KEY atPath:[absoluteURL 
path] traverseLink:YES error:NULL];
             }
+            if ([dictionary isKindOfClass:[NSDictionary class]] && [dictionary 
count])
+                [self setPresentationOptions:dictionary];
             if ([array isKindOfClass:[NSArray class]] && [array count])
                 [self setOpenMetaTags:array];
             if ([number respondsToSelector:@selector(doubleValue)] && [number 
doubleValue] > 0.0)

Modified: trunk/SKTransitionController.h
===================================================================
--- trunk/SKTransitionController.h      2009-07-30 17:37:08 UTC (rev 5517)
+++ trunk/SKTransitionController.h      2009-08-03 15:29:45 UTC (rev 5518)
@@ -77,7 +77,11 @@
 }
 
 + (NSArray *)transitionFilterNames;
++ (NSArray *)transitionNames;
 
++ (NSString *)nameForStyle:(SKAnimationTransitionStyle)style;
++ (SKAnimationTransitionStyle)styleForName:(NSString *)name;
+
 - (id)initWithView:(NSView *)aView;
 
 - (NSView *)view;

Modified: trunk/SKTransitionController.m
===================================================================
--- trunk/SKTransitionController.m      2009-07-30 17:37:08 UTC (rev 5517)
+++ trunk/SKTransitionController.m      2009-08-03 15:29:45 UTC (rev 5518)
@@ -114,9 +114,9 @@
 @implementation SKTransitionController
 
 + (NSArray *)transitionFilterNames {
-    static NSMutableArray *transitionFilterNames = nil;
+    static NSArray *transitionFilterNames = nil;
     
-    if(transitionFilterNames == nil) {
+    if (transitionFilterNames == nil) {
         // get all the transition filters
                [CIPlugIn loadAllPlugIns];
         transitionFilterNames = [[CIFilter filterNamesInCategories:[NSArray 
arrayWithObject:kCICategoryTransition]] copy];
@@ -125,6 +125,38 @@
     return transitionFilterNames;
 }
 
++ (NSArray *)transitionNames {
+    static NSArray *transitionNames = nil;
+    
+    if (transitionNames == nil) {
+        transitionNames = [NSArray arrayWithObjects:
+            @"CoreGraphics SKFadeTransition", 
+            @"CoreGraphics SKZoomTransition", 
+            @"CoreGraphics SKRevealTransition", 
+            @"CoreGraphics SKSlideTransition", 
+            @"CoreGraphics SKWarpFadeTransition", 
+            @"CoreGraphics SKSwapTransition", 
+            @"CoreGraphics SKCubeTransition", 
+            @"CoreGraphics SKWarpSwitchTransition", 
+            @"CoreGraphics SKWarpFlipTransition", nil];
+        transitionNames = [[transitionNames 
arrayByAddingObjectsFromArray:[self transitionFilterNames]] copy];
+    }
+    
+    return transitionNames;
+}
+
++ (NSString *)nameForStyle:(SKAnimationTransitionStyle)style {
+    if (style > SKNoTransition && style <= [[self transitionNames] count])
+        return [[self transitionNames] objectAtIndex:style - 1];
+    else
+        return nil;
+}
+
++ (SKAnimationTransitionStyle)styleForName:(NSString *)name {
+    NSUInteger idx = [[self transitionNames] indexOfObject:name];
+    return idx == NSNotFound ? SKNoTransition : idx + 1;
+}
+
 - (id)initWithView:(NSView *)aView {
     if (self = [super init]) {
         transitionWindow = [[SKTransitionWindow alloc] init];


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

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to