Revision: 29596
          http://sourceforge.net/p/bibdesk/svn/29596
Author:   hofman
Date:     2025-09-17 14:31:21 +0000 (Wed, 17 Sep 2025)
Log Message:
-----------
move Save This Page and Bookmark This Page menu items to directly after Open 
item when available

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

Modified: trunk/bibdesk/BDSKWebView.m
===================================================================
--- trunk/bibdesk/BDSKWebView.m 2025-09-17 14:13:46 UTC (rev 29595)
+++ trunk/bibdesk/BDSKWebView.m 2025-09-17 14:31:21 UTC (rev 29596)
@@ -578,6 +578,24 @@
         }
     }
     
+    i = [[menuItems valueForKey:@"tag"] indexOfObject:[NSNumber 
numberWithInteger:WebMenuItemTagOpenWithDefaultApplication]];
+    
+    if (i != NSNotFound) {
+        item = [[NSMenuItem alloc] initWithTitle:[NSLocalizedString(@"Save 
This Page", @"Menu item title") stringByAppendingEllipsis]
+                                                                    
action:@selector(saveSource:)
+                                                             
keyEquivalent:@""];
+        [item setTag:BDSKWebMenuItemTagSavePage];
+        [item setTarget:sender];
+        [menuItems insertObject:item atIndex:++i];
+        
+        item = [[NSMenuItem alloc] initWithTitle:[NSLocalizedString(@"Bookmark 
This Page", @"Menu item title") stringByAppendingEllipsis]
+                                                                    
action:@selector(addBookmark:)
+                                                             
keyEquivalent:@""];
+        [item setTag:BDSKWebMenuItemTagAddBookmark];
+        [item setTarget:sender];
+        [menuItems insertObject:item atIndex:++i];
+    }
+    
     i = [[menuItems valueForKey:@"tag"] indexOfObject:[NSNumber 
numberWithInteger:WebMenuItemTagCopyLinkToClipboard]];
     if (i == NSNotFound) {
         i = [[menuItems valueForKey:@"tag"] indexOfObject:[NSNumber 
numberWithInteger:WebMenuItemTagCopy]];
@@ -605,22 +623,15 @@
     [item setTarget:sender];
     [menuItems insertObject:item atIndex:++i];
     
-    [menuItems insertObject:[NSMenuItem separatorItem] atIndex:++i];
-    
-    item = [[NSMenuItem alloc] initWithTitle:[NSLocalizedString(@"Bookmark 
This Page", @"Menu item title") stringByAppendingEllipsis]
-                                                                
action:@selector(addBookmark:)
-                                                         keyEquivalent:@""];
-    [item setTag:BDSKWebMenuItemTagAddBookmark];
-    [item setTarget:sender];
-    [menuItems insertObject:item atIndex:++i];
-    
-    if (NSNotFound != [[menuItems valueForKey:@"tag"] indexOfObject:[NSNumber 
numberWithInteger:WebMenuItemTagOpenWithDefaultApplication]]) {
-        item = [[NSMenuItem alloc] initWithTitle:[NSLocalizedString(@"Save 
This Page", @"Menu item title") stringByAppendingEllipsis]
-                                                                    
action:@selector(saveSource:)
+    if ([[menuItems valueForKey:@"tag"] indexOfObject:[NSNumber 
numberWithInteger:BDSKWebMenuItemTagAddBookmark]] == NSNotFound) {
+        [menuItems insertObject:[NSMenuItem separatorItem] atIndex:++i];
+        
+        item = [[NSMenuItem alloc] initWithTitle:[NSLocalizedString(@"Bookmark 
This Page", @"Menu item title") stringByAppendingEllipsis]
+                                                                    
action:@selector(addBookmark:)
                                                              
keyEquivalent:@""];
-        [item setTag:BDSKWebMenuItemTagSavePage];
+        [item setTag:BDSKWebMenuItemTagAddBookmark];
         [item setTarget:sender];
-        [menuItems addObject:item];
+        [menuItems insertObject:item atIndex:++i];
     }
     
     if ([delegate 
respondsToSelector:@selector(webView:contextMenuItemsForElement:defaultMenuItems:)])

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



_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit

Reply via email to