WebKit:

	Fixed: <rdar://problem/3613974>: remove "to Clipboard" from context menus because it is redundant

        Reviewed by john.

        * English.lproj/Localizable.strings:
        * WebView.subproj/WebDefaultContextMenuDelegate.m:
        (-[WebDefaultUIDelegate menuItemWithTag:]):

WebBrowser:

	Fixed: <rdar://problem/3316489>: ER: Safari� image context menu should have "Copy Image Address"

        Reviewed by john.

        * ContextMenuHandler.m:
        (-[BrowserWebView webView:contextMenuItemsForElement:defaultMenuItems:]): added "Copy Image Address" for Tiger only, moved "Add Link to Bookmarks" above "Copy Link" to keep all copy-related menu items at the bottom
        (-[BrowserWebView copyImageAddress:]): new
        * English.lproj/Localizable.strings:
        * English.lproj/StringsNotToBeLocalized.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@6319 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index eddb63d484eb6ddf1fbb78075f40c3e81c542a7e..aa3815b27f8a6aa50ce84aef5bf335f70a216d83 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2004-04-06  Chris Blumenberg  <cblu@apple.com>
+
+       Fixed: <rdar://problem/3613974>: remove "to Clipboard" from context menus because it is redundant
+
+        Reviewed by john.
+
+        * English.lproj/Localizable.strings:
+        * WebView.subproj/WebDefaultContextMenuDelegate.m:
+        (-[WebDefaultUIDelegate menuItemWithTag:]):
+
 2004-04-06  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by Dave

diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index 628c542e11eca355b7146a7b0d3234e303926950..0708e5013001c37c5664bfa6dc3599defe57bbf4 100644 (file)
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ

diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index 5799a0e53040c8e2df854b9885620eef5015ef86..22a94d95d1398ec6cb496ec43bcffbff609f541a 100644 (file)
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -45,7 +45,7 @@
             action = @selector(downloadLinkToDisk:);
             break;
         case WebMenuItemTagCopyLinkToClipboard:
-            title = UI_STRING("Copy Link to Clipboard", "Copy Link to Clipboard context menu item");
+            title = UI_STRING("Copy Link", "Copy Link context menu item");
             action = @selector(copyLinkToClipboard:);
             break;
         case WebMenuItemTagOpenImageInNewWindow:
@@ -57,7 +57,7 @@
             action = @selector(downloadImageToDisk:);
             break;
         case WebMenuItemTagCopyImageToClipboard:
-            title = UI_STRING("Copy Image to Clipboard", "Copy Image to Clipboard context menu item");
+            title = UI_STRING("Copy Image", "Copy Image context menu item");
             action = @selector(copyImageToClipboard:);
             break;
         case WebMenuItemTagOpenFrameInNewWindow:
@@ -69,23 +69,23 @@
             action = @selector(copy:);
             [menuItem setTarget:nil];
             break;
-               case WebMenuItemTagGoBack:
-                       title = UI_STRING("Back", "Back context menu item");
+        case WebMenuItemTagGoBack:
+            title = UI_STRING("Back", "Back context menu item");
             action = @selector(goBack:);
             [menuItem setTarget:nil];
             break;
-               case WebMenuItemTagGoForward:
-                       title = UI_STRING("Forward", "Forward context menu item");
+        case WebMenuItemTagGoForward:
+            title = UI_STRING("Forward", "Forward context menu item");
             action = @selector(goForward:);
             [menuItem setTarget:nil];
             break;
-               case WebMenuItemTagStop:
-                       title = UI_STRING("Stop", "Stop context menu item");
+        case WebMenuItemTagStop:
+            title = UI_STRING("Stop", "Stop context menu item");
             action = @selector(stopLoading:);
             [menuItem setTarget:nil];
             break;
-               case WebMenuItemTagReload:
-                       title = UI_STRING("Reload", "Reload context menu item");
+        case WebMenuItemTagReload:
+            title = UI_STRING("Reload", "Reload context menu item");
             action = @selector(reload:);
             [menuItem setTarget:nil];
             break;