Revision: 5552
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5552&view=rev
Author:   hofman
Date:     2009-08-14 10:19:47 +0000 (Fri, 14 Aug 2009)

Log Message:
-----------
Always register the windowcontrollers as editors with the document. The PDFView 
now notifies its delegate when it changes its editing status. Make absolutely 
sure that the windowcontrollers end editing before the document is set to nil 
so no loose editors are registered.

Modified Paths:
--------------
    trunk/SKMainWindowController.h
    trunk/SKNoteWindowController.h
    trunk/SKNoteWindowController.m
    trunk/SKPDFView.h
    trunk/SKPDFView.m

Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h      2009-08-14 10:19:15 UTC (rev 5551)
+++ trunk/SKMainWindowController.h      2009-08-14 10:19:47 UTC (rev 5552)
@@ -240,6 +240,7 @@
         unsigned int settingUpWindow : 1;
         unsigned int isPresentation : 1;
         unsigned int usesDrawers : 1;
+        unsigned int isEditing : 1;
     } mwcFlags;
 }
 

Modified: trunk/SKNoteWindowController.h
===================================================================
--- trunk/SKNoteWindowController.h      2009-08-14 10:19:15 UTC (rev 5551)
+++ trunk/SKNoteWindowController.h      2009-08-14 10:19:47 UTC (rev 5552)
@@ -52,6 +52,7 @@
     
     BOOL keepOnTop;
     BOOL forceOnTop;
+    BOOL isEditing;
     
     NSUndoManager *textViewUndoManager;
 }

Modified: trunk/SKNoteWindowController.m
===================================================================
--- trunk/SKNoteWindowController.m      2009-08-14 10:19:15 UTC (rev 5551)
+++ trunk/SKNoteWindowController.m      2009-08-14 10:19:47 UTC (rev 5552)
@@ -198,12 +198,12 @@
 }
 
 - (BOOL)windowShouldClose:(id)window {
-    return [noteController commitEditing];
+    return [self commitEditing];
 }
 
 - (void)windowWillClose:(NSNotification *)aNotification {
-    if ([noteController commitEditing] == NO)
-        [noteController discardEditing];
+    if ([self commitEditing] == NO)
+        [self discardEditing];
     if ([note respondsToSelector:@selector(setWindowIsOpen:)])
         [(PDFAnnotationText *)note setWindowIsOpen:NO];
     if ([[self window] isKeyWindow])
@@ -214,8 +214,12 @@
 
 - (void)setDocument:(NSDocument *)document {
     // in case the document is reset before windowWillClose: is called, I 
think this can happen on Tiger
-    if ([self document] && document == nil && [noteController commitEditing] 
== NO)
-        [noteController discardEditing];
+    if ([self document] && document == nil && [self commitEditing] == NO)
+        [self discardEditing];
+    if (isEditing) {
+        [[self document] objectDidEndEditing:self];
+        isEditing = NO;
+    }
     [super setDocument:document];
 }
 
@@ -284,16 +288,44 @@
     return textViewUndoManager;
 }
 
-#pragma mark NSEditorRegistration protocol
+#pragma mark NSEditorRegistration and NSEditor protocol
 
 - (void)objectDidBeginEditing:(id)editor {
-    [[self document] objectDidBeginEditing:editor];
+    if (isEditing == NO) {
+        [[self document] objectDidBeginEditing:self];
+        isEditing = YES;
+    }
 }
 
 - (void)objectDidEndEditing:(id)editor {
-    [[self document] objectDidEndEditing:editor];
+    if (isEditing) {
+        [[self document] objectDidEndEditing:self];
+        isEditing = NO;
+    }
 }
 
+- (void)discardEditing {
+    [noteController discardEditing];
+}
+
+- (BOOL)commitEditing {
+    return [noteController commitEditing];
+}
+
+- (void)commitEditingWithDelegate:(id)delegate 
didCommitSelector:(SEL)didCommitSelector contextInfo:(void *)contextInfo {
+    BOOL didCommit = [self commitEditing];
+    if (delegate && didCommitSelector) {
+        // - (void)editor:(id)editor didCommit:(BOOL)didCommit 
contextInfo:(void *)contextInfo
+        NSInvocation *invocation = [NSInvocation 
invocationWithMethodSignature:[delegate 
methodSignatureForSelector:didCommitSelector]];
+        [invocation setTarget:delegate];
+        [invocation setSelector:didCommitSelector];
+        [invocation setArgument:&self atIndex:2];
+        [invocation setArgument:&didCommit atIndex:3];
+        [invocation setArgument:&contextInfo atIndex:4];
+        [invocation invoke];
+    }
+}
+
 #pragma mark BDSKDragImageView delegate protocol
 
 - (BOOL)dragImageView:(BDSKDragImageView *)view 
writeDataToPasteboard:(NSPasteboard *)pasteboard {

Modified: trunk/SKPDFView.h
===================================================================
--- trunk/SKPDFView.h   2009-08-14 10:19:15 UTC (rev 5551)
+++ trunk/SKPDFView.h   2009-08-14 10:19:47 UTC (rev 5552)
@@ -218,4 +218,6 @@
 
 @interface NSObject (SKPDFViewDelegate)
 - (void)PDFView:(PDFView *)sender editAnnotation:(PDFAnnotation *)annotation;
+- (void)PDFViewDidBeginEditing:(PDFView *)sender;
+- (void)PDFViewDidEndEditing:(PDFView *)sender;
 @end

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m   2009-08-14 10:19:15 UTC (rev 5551)
+++ trunk/SKPDFView.m   2009-08-14 10:19:47 UTC (rev 5552)
@@ -2119,7 +2119,8 @@
         
         [self setNeedsDisplayForAnnotation:activeAnnotation];
         
-        [[[[self window] windowController] document] 
objectDidBeginEditing:self];
+        if ([[self delegate] 
respondsToSelector:@selector(PDFViewDidBeginEditing:)])
+            [[self delegate] PDFViewDidBeginEditing:self];
         
     } else if ([activeAnnotation isEditable]) {
         
@@ -2142,7 +2143,8 @@
         if ([[activeAnnotation type] isEqualToString:SKNFreeTextString])
             [self setNeedsDisplayForAnnotation:activeAnnotation];
         
-        [[[[self window] windowController] document] objectDidEndEditing:self];
+        if ([[self delegate] 
respondsToSelector:@selector(PDFViewDidEndEditing:)])
+            [[self delegate] PDFViewDidEndEditing:self];
     }
 }
 
@@ -2159,25 +2161,12 @@
         if ([[activeAnnotation type] isEqualToString:SKNFreeTextString])
             [self setNeedsDisplayForAnnotation:activeAnnotation];
         
-        [[[[self window] windowController] document] objectDidEndEditing:self];
+        if ([[self delegate] 
respondsToSelector:@selector(PDFViewDidEndEditing:)])
+            [[self delegate] PDFViewDidEndEditing:self];
     }
     return YES;
 }
 
-- (void)commitEditingWithDelegate:(id)delegate 
didCommitSelector:(SEL)didCommitSelector contextInfo:(void *)contextInfo {
-    BOOL didCommit = [self commitEditing];
-    if (delegate && didCommitSelector) {
-        // - (void)editor:(id)editor didCommit:(BOOL)didCommit 
contextInfo:(void *)contextInfo
-        NSInvocation *invocation = [NSInvocation 
invocationWithMethodSignature:[delegate 
methodSignatureForSelector:didCommitSelector]];
-        [invocation setTarget:delegate];
-        [invocation setSelector:didCommitSelector];
-        [invocation setArgument:&self atIndex:2];
-        [invocation setArgument:&didCommit atIndex:3];
-        [invocation setArgument:&contextInfo atIndex:4];
-        [invocation invoke];
-    }
-}
-
 - (BOOL)control:(NSControl *)control textView:(NSTextView *)textView 
doCommandBySelector:(SEL)command {
     BOOL rv = NO;
     if ([control isEqual:editField]) {


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