[Bibdesk-commit] SF.net SVN: bibdesk:[24241] trunk/bibdesk/BibDocument_UI.m

[hofman--- via Bibdesk-commit]

Revision: 24241
          http://sourceforge.net/p/bibdesk/svn/24241
Author:   hofman
Date:     2019-09-27 14:43:01 +0000 (Fri, 27 Sep 2019)
Log Message:
-----------
use method to update action menu

Modified Paths:
--------------
    trunk/bibdesk/BibDocument_UI.m

Modified: trunk/bibdesk/BibDocument_UI.m
===================================================================
--- trunk/bibdesk/BibDocument_UI.m      2019-09-27 14:35:54 UTC (rev 24240)
+++ trunk/bibdesk/BibDocument_UI.m      2019-09-27 14:43:01 UTC (rev 24241)
@@ -542,6 +542,16 @@
     [anItem setSubmenu:submenu];
 }
 
+- (void)updateActionMenu:(NSMenu *)menu {
+    NSColor *color = nil;
+    if ([self hasGroupTypeSelected:BDSKExternalGroupType] == NO && [self 
isDisplayingFileContentSearch] == NO && [[self clickedOrSelectedPublications] 
count]) {
+        NSSet *set = [NSSet setWithArray:[[self clickedOrSelectedPublications] 
valueForKey:@"color"]];
+        if ([set count] == 1 && [set containsObject:[NSNull null]] == NO)
+            color = [set anyObject];
+    }
+    [colorLabelWell setColor:color ?: [NSColor clearColor]];
+}
+
 - (void)updateTemplatePreviewMenu:(NSMenu *)menu {
     NSArray *styles = [BDSKTemplate 
allStyleNamesForFormat:(BDSKTemplateFormatRichText | 
BDSKTemplateFormatPlainHTML)];
     
@@ -596,13 +606,7 @@
         NSURL *theURL;
         BOOL isSingle;
         
-        NSColor *color = nil;
-        if ([self hasGroupTypeSelected:BDSKExternalGroupType] == NO && [self 
isDisplayingFileContentSearch] == NO && [[self clickedOrSelectedPublications] 
count]) {
-            NSSet *set = [NSSet setWithArray:[[self 
clickedOrSelectedPublications] valueForKey:@"color"]];
-            if ([set count] == 1 && [set containsObject:[NSNull null]] == NO)
-                color = [set anyObject];
-        }
-        [colorLabelWell setColor:color ?: [NSColor clearColor]];
+        [self updateActionMenu:actionMenu];
         
         if([tcId isGeneralURLField] || [tcId isCitationField]){
             if([tcId isEqualToString:BDSKLocalFileString])
@@ -736,18 +740,10 @@
     }
 }
 
-- (void)updateActionMenu:(NSMenu *)menu {
-    NSColor *color = nil;
-    if ([self hasGroupTypeSelected:BDSKExternalGroupType] == NO && [self 
isDisplayingFileContentSearch] == NO && [[self clickedOrSelectedPublications] 
count]) {
-        NSSet *set = [NSSet setWithArray:[[self clickedOrSelectedPublications] 
valueForKey:@"color"]];
-        if ([set count] == 1 && [set containsObject:[NSNull null]] == NO)
-            color = [set anyObject];
-    }
-    [colorLabelWell setColor:color ?: [NSColor clearColor]];
-}
-
 - (void)menuNeedsUpdate:(NSMenu *)menu {
-    if (menu == bottomTemplatePreviewMenu || menu == sideTemplatePreviewMenu)
+    if (menu == actionMenu)
+        [self updateActionMenu:menu];
+    else if (menu == bottomTemplatePreviewMenu || menu == 
sideTemplatePreviewMenu)
         [self updateTemplatePreviewMenu:menu];
     else if (menu == alternateCopyMenu)
         [self updateCopyAsMenu:menu];
@@ -755,8 +751,6 @@
         [self updateMainTableMenu:menu];
     else if (menu == [groupOutlineView menu])
         [self updateGroupTableMenu:menu];
-    else if (menu == actionMenu)
-        [self updateActionMenu:menu];
 }
 
 #pragma mark SplitView delegate

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



_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit