Changeset 18540 in webkit

Timestamp:

Jan 2, 2007 5:05:09 PM (17 years ago)

Author:

sullivan

Message:

Reviewed by Kevin Decker

• fixed <rdar://problem/4892525> Cannot open PDF in Preview if you attempted to open it in Preview while PDF was loading

• WebView/WebPDFView.mm: (-[WebPDFView menuForEvent:]): added comment (-[WebPDFView validateUserInterfaceItem:]): disable this menu item when there's no document yet (-[WebPDFView _openWithFinder:]): If this is invoked when there is no document yet (e.g. via the PDFKit delegate method), just beep and return. I should make a nice error message here, but I'll do that separately.

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebPDFView.mm (modified) (3 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-01-02  John Sullivan  <sullivan@apple.com>
+
+        Reviewed by Kevin Decker
+
+        - fixed <rdar://problem/4892525> Cannot open PDF in Preview if you attempted to 
+          open it in Preview while PDF was loading
+
+        * WebView/WebPDFView.mm:
+        (-[WebPDFView menuForEvent:]):
+        added comment
+        (-[WebPDFView validateUserInterfaceItem:]):
+        disable this menu item when there's no document yet
+        (-[WebPDFView _openWithFinder:]):
+        If this is invoked when there is no document yet (e.g. via the PDFKit delegate method), 
+        just beep and return. I should make a nice error message here, but I'll do that separately.
+
 2007-01-03  Nikolas Zimmermann  <zimmermann@kde.org>
 

trunk/WebKit/WebView/WebPDFView.mm

@@ -336 +336 @@
         appName = UI_STRING("Finder", "Default application name for Open With context menu");
     
+    // To match the PDFKit style, we'll add Open with Preview even when there's no document yet to view, and
+    // disable it using validateUserInterfaceItem.
     NSString *title = [NSString stringWithFormat:UI_STRING("Open with %@", "context menu item for PDF"), appName];
     NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:title action:@selector(_openWithFinder:) keyEquivalent:@""];
@@ -445 +447 @@
     if (action == @selector(takeFindStringFromSelection:) || action == @selector(centerSelectionInVisibleArea:) || action == @selector(jumpToSelection:))
         return [PDFSubview currentSelection] != nil;
+    
+    if (action == @selector(_openWithFinder:))
+        return [PDFSubview document] != nil;
 
     return YES;
@@ -1001 +1006 @@
 - (void)_openWithFinder:(id)sender
 {
+    // We don't want to write the file until we have a document to write (see 4892525).
+    if (![PDFSubview document]) {
+        NSBeep();
+        return;
+    }
+    
     NSString *opath = [self _path];