Revision: 29588
          http://sourceforge.net/p/bibdesk/svn/29588
Author:   hofman
Date:     2025-09-16 15:17:08 +0000 (Tue, 16 Sep 2025)
Log Message:
-----------
move text sixe menu items to before bookmark item

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

Modified: trunk/bibdesk/BDSKWebView.m
===================================================================
--- trunk/bibdesk/BDSKWebView.m 2025-09-16 14:47:49 UTC (rev 29587)
+++ trunk/bibdesk/BDSKWebView.m 2025-09-16 15:17:08 UTC (rev 29588)
@@ -578,50 +578,42 @@
         }
     }
     
-       if ([menuItems count] > 0) 
-               [menuItems addObject:[NSMenuItem separatorItem]];
-       
+    i = [[menuItems valueForKey:@"tag"] indexOfObject:[NSNumber 
numberWithInteger:WebMenuItemTagCopyLinkToClipboard]];
+    if (i == NSNotFound) {
+        i = [[menuItems valueForKey:@"tag"] indexOfObject:[NSNumber 
numberWithInteger:WebMenuItemTagCopy]];
+        if (i == NSNotFound) {
+            i = [[menuItems valueForKey:@"tag"] indexOfObject:[NSNumber 
numberWithInteger:WebMenuItemTagCopyImageToClipboard]];
+            if (i == NSNotFound)
+                i = [menuItems count] > 0 ? [menuItems count] - 1 : 0;
+        }
+    }
+    
+    if ([menuItems count] > 0)
+        [menuItems insertObject:[NSMenuItem separatorItem] atIndex:++i];
+    
     item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Increase Text 
Size", @"Menu item title")
                                                                 
action:@selector(makeTextLarger:)
                                                          keyEquivalent:@""];
     [item setTag:BDSKWebMenuItemTagMakeTextLarger];
     [item setTarget:sender];
-       [menuItems addObject:item];
-       
-       item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Decrease 
Text Size", @"Menu item title")
+    [menuItems insertObject:item atIndex:++i];
+    
+    item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Decrease Text 
Size", @"Menu item title")
                                                                 
action:@selector(makeTextSmaller:)
                                                          keyEquivalent:@""];
     [item setTag:BDSKWebMenuItemTagMakeTextSmaller];
     [item setTarget:sender];
-       [menuItems addObject:item];
-       
-    i = [[menuItems valueForKey:@"tag"] indexOfObject:[NSNumber 
numberWithInteger:WebMenuItemTagCopyLinkToClipboard]];
-    if (i == NSNotFound) {
-        i = [[menuItems valueForKey:@"tag"] indexOfObject:[NSNumber 
numberWithInteger:WebMenuItemTagCopy]];
-        if (i == NSNotFound)
-            i = [[menuItems valueForKey:@"tag"] indexOfObject:[NSNumber 
numberWithInteger:WebMenuItemTagCopyImageToClipboard]];
-    }
+    [menuItems insertObject:item atIndex:++i];
     
-    if (i != 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:BDSKWebMenuItemTagAddBookmark];
-        [item setTarget:sender];
-        [menuItems insertObject:item atIndex:++i];
-    } else {
-        [menuItems addObject:[NSMenuItem separatorItem]];
-        
-        item = [[NSMenuItem alloc] initWithTitle:[NSLocalizedString(@"Bookmark 
This Page", @"Menu item title") stringByAppendingEllipsis]
-                                                                    
action:@selector(addBookmark:)
-                                                             
keyEquivalent:@""];
-        [item setTag:BDSKWebMenuItemTagAddBookmark];
-        [item setTarget:sender];
-        [menuItems addObject:item];
-    }
+    [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:)

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