[Skim-app-commit] SF.net SVN: skim-app:[13656] trunk

[hofman--- via Skim-app-commit]

Revision: 13656
          http://sourceforge.net/p/skim-app/code/13656
Author:   hofman
Date:     2023-09-10 21:56:07 +0000 (Sun, 10 Sep 2023)
Log Message:
-----------
allow editing in note window from notes table when not in text or note tool mode

Modified Paths:
--------------
    trunk/SKMainWindowController_UI.m
    trunk/SKPDFView.m

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2023-09-10 17:07:41 UTC (rev 13655)
+++ trunk/SKMainWindowController_UI.m   2023-09-10 21:56:07 UTC (rev 13656)
@@ -1279,18 +1279,16 @@
                             item = [menu 
addItemWithTitle:[NSLocalizedString(@"Edit", @"Menu item title") 
stringByAppendingEllipsis] action:@selector(editNoteTextFromTable:) 
target:self];
                             [item setRepresentedObject:annotation];
                         }
-                    } else if ([[rightSideController.noteOutlineView 
tableColumnWithIdentifier:NOTE_COLUMNID] isHidden] && [pdfView canAddNotes]) {
+                    } else if ([[rightSideController.noteOutlineView 
tableColumnWithIdentifier:NOTE_COLUMNID] isHidden]) {
                         item = [menu 
addItemWithTitle:[NSLocalizedString(@"Edit", @"Menu item title") 
stringByAppendingEllipsis] action:@selector(editThisAnnotation:) 
target:pdfView];
                         [item setRepresentedObject:annotation];
                     } else {
                         item = [menu 
addItemWithTitle:NSLocalizedString(@"Edit", @"Menu item title") 
action:@selector(editNoteFromTable:) target:self];
                         [item setRepresentedObject:annotation];
-                        if ([pdfView canAddNotes]) {
-                            item = [menu 
addItemWithTitle:[NSLocalizedString(@"Edit", @"Menu item title") 
stringByAppendingEllipsis] action:@selector(editThisAnnotation:) 
target:pdfView];
-                            [item setRepresentedObject:annotation];
-                            [item 
setKeyEquivalentModifierMask:NSEventModifierFlagOption];
-                            [item setAlternate:YES];
-                        }
+                        item = [menu 
addItemWithTitle:[NSLocalizedString(@"Edit", @"Menu item title") 
stringByAppendingEllipsis] action:@selector(editThisAnnotation:) 
target:pdfView];
+                        [item setRepresentedObject:annotation];
+                        [item 
setKeyEquivalentModifierMask:NSEventModifierFlagOption];
+                        [item setAlternate:YES];
                     }
                 }
                 if ([pdfView hideNotes] == NO && [[self pdfDocument] 
allowsNotes]) {

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m   2023-09-10 17:07:41 UTC (rev 13655)
+++ trunk/SKPDFView.m   2023-09-10 21:56:07 UTC (rev 13656)
@@ -2224,7 +2224,7 @@
     item = [menu insertItemWithTitle:NSLocalizedString(@"Take Snapshot", 
@"Menu item title") action:@selector(takeSnapshot:) target:self atIndex:0];
     [item setRepresentedObject:pointValue];
     
-    if (([self toolMode] == SKTextToolMode || [self toolMode] == 
SKNoteToolMode) && [self hideNotes] == NO && [[self document] allowsNotes]) {
+    if ([self canAddNotes]) {
         
         [menu insertItem:[NSMenuItem separatorItem] atIndex:0];
         
@@ -2344,7 +2344,7 @@
         if ([[menu itemAtIndex:0] isSeparatorItem])
             [menu removeItemAtIndex:0];
         
-    } else if ((toolMode == SKSelectToolMode && NSIsEmptyRect(selectionRect) 
== NO) || ([self toolMode] == SKTextToolMode && [self hideNotes] && [[self 
currentSelection] hasCharacters])) {
+    } else if ((toolMode == SKSelectToolMode && NSIsEmptyRect(selectionRect) 
== NO) || ([self toolMode] == SKTextToolMode && [[self currentSelection] 
hasCharacters])) {
         
         [menu insertItem:[NSMenuItem separatorItem] atIndex:0];
         
@@ -2893,9 +2893,15 @@
     if (annotation == nil || [self isEditingAnnotation:annotation])
         return;
     
-    if (currentAnnotation != annotation)
-        [self setCurrentAnnotation:annotation];
-    [self editCurrentAnnotation:nil];
+    if ([self canAddNotes] && [self window]) {
+        if (currentAnnotation != annotation)
+            [self setCurrentAnnotation:annotation];
+        [self editCurrentAnnotation:nil];
+    } else if ([currentAnnotation isEditable] && [[self delegate] 
respondsToSelector:@selector(PDFView:editAnnotation:)]) {
+        [[SKImageToolTipWindow sharedToolTipWindow] orderOut:self];
+        
+        [[self delegate] PDFView:self editAnnotation:annotation];
+    }
 }
 
 - (void)editCurrentAnnotation:(id)sender {

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



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit