[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit b21deed62ba8e2ae156e73966e96375e7a31777c
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 28 21:09:14 2004 +0000

    WebKit:
    
    	Fixed: <rdar://problem/3197222>: need context menu items for back, forward, refresh.
    
            Reviewed by rjw.
    
            * English.lproj/Localizable.strings:
            * WebView.subproj/WebDefaultContextMenuDelegate.m:
            (-[WebDefaultUIDelegate menuItemWithTag:]): added support for WebMenuItemTagGoBack, WebMenuItemTagGoForward, WebMenuItemTagStop and WebMenuItemTagReload tags
            (-[WebDefaultUIDelegate webView:contextMenuItemsForElement:defaultMenuItems:]): added support for Back, Forward, Stop and Reload
            * WebView.subproj/WebUIDelegate.h: added WebMenuItemTagGoBack, WebMenuItemTagGoForward, WebMenuItemTagStop and WebMenuItemTagReload tags
    
    WebBrowser:
    
    	Fixed: <rdar://problem/3197222>: need context menu items for back, forward, refresh.
    
            Reviewed by rjw.
    
            * ContextMenuHandler.m:
            (-[BrowserWebView webView:contextMenuItemsForElement:defaultMenuItems:]): added support for Back, Forward, Stop and Reload
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5998 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d50f260..dc814e8 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2004-01-28  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3197222>: need context menu items for back, forward, refresh.
+
+        Reviewed by rjw.
+
+        * English.lproj/Localizable.strings:
+        * WebView.subproj/WebDefaultContextMenuDelegate.m:
+        (-[WebDefaultUIDelegate menuItemWithTag:]): added support for WebMenuItemTagGoBack, WebMenuItemTagGoForward, WebMenuItemTagStop and WebMenuItemTagReload tags
+        (-[WebDefaultUIDelegate webView:contextMenuItemsForElement:defaultMenuItems:]): added support for Back, Forward, Stop and Reload
+        * WebView.subproj/WebUIDelegate.h: added WebMenuItemTagGoBack, WebMenuItemTagGoForward, WebMenuItemTagStop and WebMenuItemTagReload tags
+
 2004-01-27  John Sullivan  <sullivan at apple.com>
 
         WebKit part of fixes for:
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index 86594de..2081b35 100644
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 551fdb1..2eba169 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -64,6 +64,26 @@
             action = @selector(copy:);
             [menuItem setTarget:nil];
             break;
+		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");
+            action = @selector(goForward:);
+            [menuItem setTarget:nil];
+            break;
+		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");
+            action = @selector(reload:);
+            [menuItem setTarget:nil];
+            break;
         default:
             [menuItem release];
             return nil;
@@ -102,10 +122,21 @@
     if (!imageURL && !linkURL) {
         if ([[element objectForKey:WebElementIsSelectedKey] boolValue]) {
             [menuItems addObject:[self menuItemWithTag:WebMenuItemTagCopy]];
-        } else {        
+        } else {
+			if ([wv canGoBack]) {
+				[menuItems addObject:[self menuItemWithTag:WebMenuItemTagGoBack]];
+			}
+			if ([wv canGoForward]) {
+				[menuItems addObject:[self menuItemWithTag:WebMenuItemTagGoForward]];
+			}
+			if ([wv isLoading]) {
+				[menuItems addObject:[self menuItemWithTag:WebMenuItemTagStop]];
+			} else {
+				[menuItems addObject:[self menuItemWithTag:WebMenuItemTagReload]];
+			}
+			
             WebFrame *webFrame = [element objectForKey:WebElementFrameKey];
-    
-            if (webFrame != [[webFrame webView] mainFrame]) {
+            if (webFrame != [wv mainFrame]) {
                 [menuItems addObject:[self menuItemWithTag:WebMenuItemTagOpenFrameInNewWindow]];
             }
         }
diff --git a/WebKit/WebView.subproj/WebUIDelegate.h b/WebKit/WebView.subproj/WebUIDelegate.h
index 4dc43c8..fdd0cb8 100644
--- a/WebKit/WebView.subproj/WebUIDelegate.h
+++ b/WebKit/WebView.subproj/WebUIDelegate.h
@@ -23,7 +23,11 @@ enum {
     WebMenuItemTagDownloadImageToDisk,
     WebMenuItemTagCopyImageToClipboard,
     WebMenuItemTagOpenFrameInNewWindow,
-    WebMenuItemTagCopy
+    WebMenuItemTagCopy,
+	WebMenuItemTagGoBack,
+	WebMenuItemTagGoForward,
+	WebMenuItemTagStop,
+	WebMenuItemTagReload
 };
 
 /*!

-- 
WebKit Debian packaging