Revision: 5551
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5551&view=rev
Author:   hofman
Date:     2009-08-14 10:19:15 +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_UI.m

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2009-08-14 09:35:12 UTC (rev 5550)
+++ trunk/SKMainWindowController_UI.m   2009-08-14 10:19:15 UTC (rev 5551)
@@ -237,6 +237,8 @@
         }
         if ([[pdfView document] isFinding])
             [[pdfView document] cancelFindString];
+        if (mwcFlags.isEditing && [self commitEditing] == NO)
+            [self discardEditing];
         
         [ownerController setContent:nil];
     }
@@ -1075,21 +1077,27 @@
 #pragma mark NSControl delegate protocol
 
 - (void)controlTextDidBeginEditing:(NSNotification *)note {
-    if ([[note object] isEqual:noteOutlineView])
+    if ([[note object] isEqual:noteOutlineView] && mwcFlags.isEditing == NO) {
         [[self document] objectDidBeginEditing:self];
+        mwcFlags.isEditing = YES;
+    }
 }
 
 - (void)controlTextDidEndEditing:(NSNotification *)note {
-    if ([[note object] isEqual:noteOutlineView])
+    if ([[note object] isEqual:noteOutlineView] && mwcFlags.isEditing) {
         [[self document] objectDidEndEditing:self];
+        mwcFlags.isEditing = NO;
+    }
 }
 
 - (void)setDocument:(NSDocument *)document {
-    if ([self document] && document == nil) {
+    if ([self document] && document == nil && mwcFlags.isEditing) {
         if ([self commitEditing] == NO)
             [self discardEditing];
-        if ([pdfView isEditing] && [pdfView commitEditing] == NO)
-            [pdfView discardEditing];
+        if (mwcFlags.isEditing) {
+            [[self document] objectDidEndEditing:self];
+            mwcFlags.isEditing = NO;
+        }
     }
     [super setDocument:document];
 }
@@ -1097,19 +1105,16 @@
 #pragma mark NSEditor protocol
 
 - (void)discardEditing {
-    int row = [noteOutlineView editedRow];
-    if (row != -1) {
-        id item = [noteOutlineView itemAtRow:row];
-        [[noteOutlineView currentEditor] setString:[item string]];
-        [[noteOutlineView window] makeFirstResponder:noteOutlineView];
-    }
+    [noteOutlineView abortEditing];
+    [pdfView discardEditing];
 }
 
 - (BOOL)commitEditing {
+    if ([pdfView isEditing])
+        return [pdfView commitEditing];
     if ([noteOutlineView editedRow] != -1)
         return [[noteOutlineView window] makeFirstResponder:noteOutlineView];
-    else
-        return YES;
+    return YES;
 }
 
 - (void)commitEditingWithDelegate:(id)delegate 
didCommitSelector:(SEL)didCommitSelector contextInfo:(void *)contextInfo {
@@ -1132,6 +1137,20 @@
     [self showNote:annotation];
 }
 
+- (void)PDFViewDidBeginEditing:(PDFView *)sender {
+    if (mwcFlags.isEditing == NO) {
+        [[self document] objectDidBeginEditing:self];
+        mwcFlags.isEditing = YES;
+    }
+}
+
+- (void)PDFViewDidEndEditing:(PDFView *)sender {
+    if (mwcFlags.isEditing) {
+        [[self document] objectDidEndEditing:self];
+        mwcFlags.isEditing = NO;
+    }
+}
+
 #pragma mark SKSplitView delegate protocol
 
 - (void)splitView:(SKSplitView *)sender 
doubleClickedDividerAt:(NSInteger)offset{


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