Revision: 5570
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5570&view=rev
Author:   hofman
Date:     2009-08-20 14:10:56 +0000 (Thu, 20 Aug 2009)

Log Message:
-----------
register editing of PDFView and note table separately

Modified Paths:
--------------
    trunk/SKMainWindowController.h
    trunk/SKMainWindowController_UI.m

Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h      2009-08-19 20:55:58 UTC (rev 5569)
+++ trunk/SKMainWindowController.h      2009-08-20 14:10:56 UTC (rev 5570)
@@ -242,7 +242,8 @@
         unsigned int settingUpWindow : 1;
         unsigned int isPresentation : 1;
         unsigned int usesDrawers : 1;
-        unsigned int isEditing : 1;
+        unsigned int isEditingPDF : 1;
+        unsigned int isEditingTable : 1;
     } mwcFlags;
 }
 

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2009-08-19 20:55:58 UTC (rev 5569)
+++ trunk/SKMainWindowController_UI.m   2009-08-20 14:10:56 UTC (rev 5570)
@@ -238,7 +238,7 @@
         }
         if ([[pdfView document] isFinding])
             [[pdfView document] cancelFindString];
-        if (mwcFlags.isEditing && [self commitEditing] == NO)
+        if ((mwcFlags.isEditingPDF || mwcFlags.isEditingTable) && [self 
commitEditing] == NO)
             [self discardEditing];
         
         [ownerController setContent:nil];
@@ -1078,27 +1078,28 @@
 #pragma mark NSControl delegate protocol
 
 - (void)controlTextDidBeginEditing:(NSNotification *)note {
-    if ([[note object] isEqual:noteOutlineView] && mwcFlags.isEditing == NO) {
-        [[self document] objectDidBeginEditing:self];
-        mwcFlags.isEditing = YES;
+    if ([[note object] isEqual:noteOutlineView]) {
+        if (mwcFlags.isEditingTable == NO && mwcFlags.isEditingPDF == NO)
+            [[self document] objectDidBeginEditing:self];
+        mwcFlags.isEditingTable = YES;
     }
 }
 
 - (void)controlTextDidEndEditing:(NSNotification *)note {
-    if ([[note object] isEqual:noteOutlineView] && mwcFlags.isEditing) {
-        [[self document] objectDidEndEditing:self];
-        mwcFlags.isEditing = NO;
+    if ([[note object] isEqual:noteOutlineView]) {
+        if (mwcFlags.isEditingTable && mwcFlags.isEditingPDF == NO)
+            [[self document] objectDidEndEditing:self];
+        mwcFlags.isEditingTable = NO;
     }
 }
 
 - (void)setDocument:(NSDocument *)document {
-    if ([self document] && document == nil && mwcFlags.isEditing) {
+    if ([self document] && document == nil && (mwcFlags.isEditingPDF || 
mwcFlags.isEditingTable)) {
         if ([self commitEditing] == NO)
             [self discardEditing];
-        if (mwcFlags.isEditing) {
+        if (mwcFlags.isEditingPDF || mwcFlags.isEditingTable)
             [[self document] objectDidEndEditing:self];
-            mwcFlags.isEditing = NO;
-        }
+        mwcFlags.isEditingPDF = mwcFlags.isEditingTable = NO;
     }
     [super setDocument:document];
 }
@@ -1139,17 +1140,15 @@
 }
 
 - (void)PDFViewDidBeginEditing:(PDFView *)sender {
-    if (mwcFlags.isEditing == NO) {
+    if (mwcFlags.isEditingPDF == NO && mwcFlags.isEditingTable == NO)
         [[self document] objectDidBeginEditing:self];
-        mwcFlags.isEditing = YES;
-    }
+    mwcFlags.isEditingPDF = YES;
 }
 
 - (void)PDFViewDidEndEditing:(PDFView *)sender {
-    if (mwcFlags.isEditing) {
+    if (mwcFlags.isEditingPDF && mwcFlags.isEditingTable == NO)
         [[self document] objectDidEndEditing:self];
-        mwcFlags.isEditing = NO;
-    }
+    mwcFlags.isEditingPDF = NO;
 }
 
 #pragma mark SKSplitView delegate protocol


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