Revision: 5754
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5754&view=rev
Author:   hofman
Date:     2009-09-16 16:52:21 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
implement undo for transition controller in pdfview using KVO

Modified Paths:
--------------
    trunk/SKPDFView.m
    trunk/SKPresentationOptionsSheetController.m
    trunk/SKTransitionController.h
    trunk/SKTransitionController.m

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m   2009-09-16 16:39:50 UTC (rev 5753)
+++ trunk/SKPDFView.m   2009-09-16 16:52:21 UTC (rev 5754)
@@ -107,6 +107,7 @@
 #define SKReadingBarNumberOfLinesKey @"SKReadingBarNumberOfLines"
 
 static char SKPDFViewDefaultsObservationContext;
+static char SKPDFViewTransitionsObservationContext;
 
 static NSUInteger moveReadingBarModifiers = NSAlternateKeyMask;
 static NSUInteger resizeReadingBarModifiers = NSAlternateKeyMask | 
NSShiftKeyMask;
@@ -262,6 +263,10 @@
     [[NSUserDefaultsController sharedUserDefaultsController] 
removeObserver:self forKeys:
         [NSArray arrayWithObjects:SKReadingBarColorKey, SKReadingBarInvertKey, 
nil]];
     [[NSNotificationCenter defaultCenter] removeObserver:self];
+    [transitionController removeObserver:self forKeyPath:@"transitionStyle"];
+    [transitionController removeObserver:self forKeyPath:@"duration"];
+    [transitionController removeObserver:self forKeyPath:@"shouldRestrict"];
+    [transitionController removeObserver:self forKeyPath:@"pageTransitions"];
     [self showNavWindow:NO];
     [self doAutohide:NO];
     [[SKPDFToolTipWindow sharedToolTipWindow] orderOut:self];
@@ -631,8 +636,14 @@
 }
 
 - (SKTransitionController * )transitionController {
-    if (transitionController == nil)
+    if (transitionController == nil) {
         transitionController = [[SKTransitionController alloc] 
initWithView:self];
+        NSKeyValueObservingOptions options = (NSKeyValueObservingOptionNew | 
NSKeyValueObservingOptionOld);
+        [transitionController addObserver:self forKeyPath:@"transitionStyle" 
options:options context:&SKPDFViewTransitionsObservationContext];
+        [transitionController addObserver:self forKeyPath:@"duration" 
options:options context:&SKPDFViewTransitionsObservationContext];
+        [transitionController addObserver:self forKeyPath:@"shouldRestrict" 
options:options context:&SKPDFViewTransitionsObservationContext];
+        [transitionController addObserver:self forKeyPath:@"pageTransitions" 
options:options context:&SKPDFViewTransitionsObservationContext];
+    }
     return transitionController;
 }
 
@@ -2453,6 +2464,10 @@
 
 #pragma mark KVO
 
+- (void)setTransitionControllerValue:(id)value forKey:(NSString *)key {
+    [transitionController setValue:value forKey:key];
+}
+
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object 
change:(NSDictionary *)change context:(void *)context {
     if (context == &SKPDFViewDefaultsObservationContext) {
         NSString *key = [keyPath substringFromIndex:7];
@@ -2463,6 +2478,10 @@
                     object:self userInfo:[NSDictionary 
dictionaryWithObjectsAndKeys:[readingBar page], SKPDFViewOldPageKey, 
[readingBar page], SKPDFViewNewPageKey, nil]];
             }
         }
+    } else if (context == &SKPDFViewTransitionsObservationContext) {
+        id oldValue = [change objectForKey:NSKeyValueChangeOldKey];
+        if ([oldValue isEqual:[NSNull null]]) oldValue = nil;
+        [[[self undoManager] prepareWithInvocationTarget:self] 
setTransitionControllerValue:oldValue forKey:keyPath];
     } else {
         [super observeValueForKeyPath:keyPath ofObject:object change:change 
context:context];
     }

Modified: trunk/SKPresentationOptionsSheetController.m
===================================================================
--- trunk/SKPresentationOptionsSheetController.m        2009-09-16 16:39:50 UTC 
(rev 5753)
+++ trunk/SKPresentationOptionsSheetController.m        2009-09-16 16:52:21 UTC 
(rev 5754)
@@ -211,7 +211,7 @@
             [transitionController setDuration:[transition duration]];
             [transitionController setShouldRestrict:[transition 
shouldRestrict]];
             [transitionController setPageTransitions:[self pageTransitions]];
-            [[transitionController undoManager] 
setActionName:NSLocalizedString(@"Change Transitions", @"Undo action name")];
+            [[controller undoManager] setActionName:NSLocalizedString(@"Change 
Transitions", @"Undo action name")];
         }
         [controller setPresentationNotesDocument:[self notesDocument]];
         [super dismiss:sender];

Modified: trunk/SKTransitionController.h
===================================================================
--- trunk/SKTransitionController.h      2009-09-16 16:39:50 UTC (rev 5753)
+++ trunk/SKTransitionController.h      2009-09-16 16:52:21 UTC (rev 5754)
@@ -104,8 +104,6 @@
 - (NSArray *)pageTransitions;
 - (void)setPageTransitions:(NSArray *)newPageTransitions;
 
-- (NSUndoManager *)undoManager;
-
 - (void)prepareAnimationForRect:(NSRect)rect;
 - (void)prepareAnimationForRect:(NSRect)rect from:(NSUInteger)fromIndex 
to:(NSUInteger)toIndex;
 - (void)animateForRect:(NSRect)rect forward:(BOOL)forward;

Modified: trunk/SKTransitionController.m
===================================================================
--- trunk/SKTransitionController.m      2009-09-16 16:39:50 UTC (rev 5753)
+++ trunk/SKTransitionController.m      2009-09-16 16:52:21 UTC (rev 5754)
@@ -204,7 +204,6 @@
 
 - (void)setTransitionStyle:(SKAnimationTransitionStyle)style {
     if (transitionStyle != style) {
-        [[[self undoManager] prepareWithInvocationTarget:self] 
setTransitionStyle:transitionStyle];
         transitionStyle = style;
     }
 }
@@ -214,7 +213,6 @@
 }
 
 - (void)setDuration:(CGFloat)newDuration {
-    [(SKTransitionController *)[[self undoManager] 
prepareWithInvocationTarget:self] setDuration:duration];
     duration = newDuration;
 }
 
@@ -223,10 +221,7 @@
 }
 
 - (void)setShouldRestrict:(BOOL)flag {
-    if (shouldRestrict != flag) {
-        [[[self undoManager] prepareWithInvocationTarget:self] 
setShouldRestrict:shouldRestrict];
-        shouldRestrict = flag;
-    }
+    shouldRestrict = flag;
 }
 
 - (NSArray *)pageTransitions {
@@ -235,16 +230,11 @@
 
 - (void)setPageTransitions:(NSArray *)newPageTransitions {
     if (pageTransitions != newPageTransitions) {
-        [[[self undoManager] prepareWithInvocationTarget:self] 
setPageTransitions:pageTransitions];
         [pageTransitions release];
         pageTransitions = [newPageTransitions copy];
     }
 }
 
-- (NSUndoManager *)undoManager {
-    return [view respondsToSelector:@selector(undoManager)] ? [view 
undoManager] : nil;
-}
-
 - (CIFilter *)filterWithName:(NSString *)name {
     if (filters == nil)
         filters = [[NSMutableDictionary alloc] init];


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

------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to