[webkit-changes] cvs commit: WebKit/WebView.subproj
WebDefaultContextMenuDelegate.m WebUIDelegate.h
WebUIDelegatePrivate.h
John
sullivan at opensource.apple.com
Tue Aug 2 10:14:42 PDT 2005
sullivan 05/08/02 10:14:41
Modified: . ChangeLog
WebView.subproj WebDefaultContextMenuDelegate.m
WebUIDelegate.h WebUIDelegatePrivate.h
Log:
Reviewed by Darin Adler.
Preemptively moved some WebMenuItemTag values from SPI to API, in anticipation of
approval from macosx-api-reviewers. Retitled one of them in response to API reviewers feedback:
WebMenuItemSearchInGoogle -> WebMenuItemSearchWeb
Note that as a side effect of this change, the actual numbers used for these WebMenuItemTags has
changed from what it was in Tiger. This causes "Search in Spotlight", "Search in Google", and
"Look Up in Dictionary" to not appear in Tiger Safari if running on tip of tree WebKit.
* WebView.subproj/WebUIDelegatePrivate.h:
removed WebMenuItemTagSearchInSpotlight, WebMenuItemTagSearchInGoogle, and WebMenuItemTagLookUpInDictionary
* WebView.subproj/WebUIDelegate.h:
added WebMenuItemTagSearchInSpotlight, WebMenuItemTagSearchWeb, and WebMenuItemTagLookUpInDictionary
* WebView.subproj/WebDefaultContextMenuDelegate.m:
(-[WebDefaultUIDelegate menuItemWithTag:]):
updated for rename
(-[WebDefaultUIDelegate contextMenuItemsForElement:defaultMenuItems:]):
ditto
(-[WebDefaultUIDelegate editingContextMenuItemsForElement:defaultMenuItems:]):
ditto
Revision Changes Path
1.3277 +26 -0 WebKit/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebKit/ChangeLog,v
retrieving revision 1.3276
retrieving revision 1.3277
diff -u -r1.3276 -r1.3277
--- ChangeLog 2 Aug 2005 00:51:26 -0000 1.3276
+++ ChangeLog 2 Aug 2005 17:14:38 -0000 1.3277
@@ -1,3 +1,29 @@
+2005-08-02 John Sullivan <sullivan at apple.com>
+
+ Reviewed by Darin Adler.
+
+ Preemptively moved some WebMenuItemTag values from SPI to API, in anticipation of
+ approval from macosx-api-reviewers. Retitled one of them in response to API reviewers feedback:
+ WebMenuItemSearchInGoogle -> WebMenuItemSearchWeb
+
+ Note that as a side effect of this change, the actual numbers used for these WebMenuItemTags has
+ changed from what it was in Tiger. This causes "Search in Spotlight", "Search in Google", and
+ "Look Up in Dictionary" to not appear in Tiger Safari if running on tip of tree WebKit.
+
+ * WebView.subproj/WebUIDelegatePrivate.h:
+ removed WebMenuItemTagSearchInSpotlight, WebMenuItemTagSearchInGoogle, and WebMenuItemTagLookUpInDictionary
+
+ * WebView.subproj/WebUIDelegate.h:
+ added WebMenuItemTagSearchInSpotlight, WebMenuItemTagSearchWeb, and WebMenuItemTagLookUpInDictionary
+
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ (-[WebDefaultUIDelegate menuItemWithTag:]):
+ updated for rename
+ (-[WebDefaultUIDelegate contextMenuItemsForElement:defaultMenuItems:]):
+ ditto
+ (-[WebDefaultUIDelegate editingContextMenuItemsForElement:defaultMenuItems:]):
+ ditto
+
2005-08-01 Geoffrey Garen <ggaren at apple.com>
Reviewed by NOBODY (OOPS!).
1.84 +3 -3 WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
Index: WebDefaultContextMenuDelegate.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- WebDefaultContextMenuDelegate.m 18 Jul 2005 23:18:22 -0000 1.83
+++ WebDefaultContextMenuDelegate.m 2 Aug 2005 17:14:41 -0000 1.84
@@ -159,7 +159,7 @@
title = localizedMenuTitleFromAppKit(@"Search in Spotlight", @"Search in Spotlight menu title.");
action = @selector(_searchWithSpotlightFromMenu:);
break;
- case WebMenuItemTagSearchInGoogle:
+ case WebMenuItemTagSearchWeb:
// FIXME: Perhaps move this string into WebKit directly when we're not in localization freeze
title = localizedMenuTitleFromAppKit(@"Search in Google", @"Search in Google menu title.");
action = @selector(_searchWithGoogleFromMenu:);
@@ -239,7 +239,7 @@
// current document view conforms to WebDocumentText
ASSERT([[[webFrame frameView] documentView] conformsToProtocol:@protocol(WebDocumentText)]);
[menuItems addObject:[self menuItemWithTag:WebMenuItemTagSearchInSpotlight]];
- [menuItems addObject:[self menuItemWithTag:WebMenuItemTagSearchInGoogle]];
+ [menuItems addObject:[self menuItemWithTag:WebMenuItemTagSearchWeb]];
[menuItems addObject:[NSMenuItem separatorItem]];
// FIXME 4184640: The Look Up in Dictionary item is only implemented in WebHTMLView, and so is present but
@@ -312,7 +312,7 @@
// Add Tiger-only items that aren't in our nib.
// FIXME: When we're not building for Panther anymore we should update the nib to include these.
[menuItems addObject:[self menuItemWithTag:WebMenuItemTagSearchInSpotlight]];
- [menuItems addObject:[self menuItemWithTag:WebMenuItemTagSearchInGoogle]];
+ [menuItems addObject:[self menuItemWithTag:WebMenuItemTagSearchWeb]];
[menuItems addObject:[NSMenuItem separatorItem]];
// FIXME: The NSTextView behavior for looking text up in the dictionary is different if
// there was a selection before you clicked than if the selection was created as part of
1.35 +3 -0 WebKit/WebView.subproj/WebUIDelegate.h
Index: WebUIDelegate.h
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebUIDelegate.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- WebUIDelegate.h 22 Jun 2005 21:32:09 -0000 1.34
+++ WebUIDelegate.h 2 Aug 2005 17:14:41 -0000 1.35
@@ -56,6 +56,9 @@
WebMenuItemTagIgnoreSpelling,
WebMenuItemTagLearnSpelling,
WebMenuItemTagOther,
+ WebMenuItemTagSearchInSpotlight,
+ WebMenuItemTagSearchWeb,
+ WebMenuItemTagLookUpInDictionary,
WebMenuItemTagOpenWithDefaultApplication,
WebMenuItemPDFActualSize,
WebMenuItemPDFZoomIn,
1.14 +0 -7 WebKit/WebView.subproj/WebUIDelegatePrivate.h
Index: WebUIDelegatePrivate.h
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebUIDelegatePrivate.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- WebUIDelegatePrivate.h 5 Jun 2005 17:54:48 -0000 1.13
+++ WebUIDelegatePrivate.h 2 Aug 2005 17:14:41 -0000 1.14
@@ -28,13 +28,6 @@
#import <WebKit/WebUIDelegate.h>
-// FIXME: These should move to WebUIDelegate.h as part of the WebMenuItemTag enum there, when we're not in API freeze
-enum {
- WebMenuItemTagSearchInSpotlight=1000,
- WebMenuItemTagSearchInGoogle,
- WebMenuItemTagLookUpInDictionary,
-};
-
@interface NSObject (WebUIDelegatePrivate)
// webViewPrint: is obsolete; delegates should respond to webView:printFrameView: instead
More information about the webkit-changes
mailing list