Changeset 80344 in webkit


Ignore:
Timestamp:
Mar 4, 2011 5:18:23 AM (13 years ago)
Author:
christian@webkit.org
Message:

Enable Copy Image Address context menu item in the Gtk port
​https://bugs.webkit.org/show_bug.cgi?id=55136

Reviewed by Gustavo Noronha Silva.

  • page/ContextMenuController.cpp:
  • platform/ContextMenuItem.h:
  • platform/LocalizationStrategy.h:
  • platform/LocalizedStrings.cpp:
  • platform/LocalizedStrings.h:
  • platform/gtk/ContextMenuItemGtk.cpp:
  • platform/gtk/LocalizedStringsGtk.cpp:
Location:
trunk/Source/WebCore
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r80342 r80344  
     12011-03-04  Christian Dywan  <christian@lanedo.com>
     2
     3        Reviewed by Gustavo Noronha Silva.
     4
     5        Enable Copy Image Address context menu item in the Gtk port
     6        https://bugs.webkit.org/show_bug.cgi?id=55136
     7
     8        * page/ContextMenuController.cpp:
     9        * platform/ContextMenuItem.h:
     10        * platform/LocalizationStrategy.h:
     11        * platform/LocalizedStrings.cpp:
     12        * platform/LocalizedStrings.h:
     13        * platform/gtk/ContextMenuItemGtk.cpp:
     14        * platform/gtk/LocalizedStringsGtk.cpp:
     15
    1162011-03-04  Pavel Feldman  <pfeldman@chromium.org>
    217

  • trunk/Source/WebCore/page/ContextMenuController.cpp

    r78632 r80344  
    208208        frame->editor()->copyImage(m_hitTestResult);
    209209        break;
    210 #if PLATFORM(QT)
     210#if PLATFORM(QT) || PLATFORM(GTK)
    211211    case ContextMenuItemTagCopyImageUrlToClipboard:
    212212        frame->editor()->copyURL(m_hitTestResult.absoluteImageURL(), m_hitTestResult.textContent());
    … …  
    648648    ContextMenuItem CopyImageItem(ActionType, ContextMenuItemTagCopyImageToClipboard,
    649649        contextMenuItemTagCopyImageToClipboard());
    650 #if PLATFORM(QT)
     650#if PLATFORM(QT) || PLATFORM(GTK)
    651651    ContextMenuItem CopyImageUrlItem(ActionType, ContextMenuItemTagCopyImageUrlToClipboard,
    652652        contextMenuItemTagCopyImageUrlToClipboard());
    … …  
    734734            if (imageURL.isLocalFile() || m_hitTestResult.image())
    735735                appendItem(CopyImageItem, m_contextMenu.get());
    736 #if PLATFORM(QT)
     736#if PLATFORM(QT) || PLATFORM(GTK)
    737737            appendItem(CopyImageUrlItem, m_contextMenu.get());
    738738#endif
    … …  
    11981198        case ContextMenuItemTagDownloadImageToDisk:
    11991199        case ContextMenuItemTagCopyImageToClipboard:
    1200 #if PLATFORM(QT)
     1200#if PLATFORM(QT) || PLATFORM(GTK)
    12011201        case ContextMenuItemTagCopyImageUrlToClipboard:
    12021202#endif

  • trunk/Source/WebCore/platform/ContextMenuItem.h

    r77892 r80344  
    6666        ContextMenuItemTagDownloadImageToDisk,
    6767        ContextMenuItemTagCopyImageToClipboard,
    68 #if PLATFORM(QT)
     68#if PLATFORM(QT) || PLATFORM(GTK)
    6969        ContextMenuItemTagCopyImageUrlToClipboard,
    7070#endif

  • trunk/Source/WebCore/platform/LocalizationStrategy.h

    r78842 r80344  
    5757    virtual String contextMenuItemTagDownloadImageToDisk() = 0;
    5858    virtual String contextMenuItemTagCopyImageToClipboard() = 0;
    59 #if PLATFORM(QT)
     59#if PLATFORM(QT) || PLATFORM(GTK)
    6060    virtual String contextMenuItemTagCopyImageUrlToClipboard() = 0;
    6161#endif

  • trunk/Source/WebCore/platform/LocalizedStrings.cpp

    r78842 r80344  
    110110}
    111111
    112 #if PLATFORM(QT)
     112#if PLATFORM(QT) || PLATFORM(GTK)
    113113String contextMenuItemTagCopyImageUrlToClipboard()
    114114{

  • trunk/Source/WebCore/platform/LocalizedStrings.h

    r80014 r80344  
    5353    String contextMenuItemTagDownloadImageToDisk();
    5454    String contextMenuItemTagCopyImageToClipboard();
    55 #if PLATFORM(QT)
     55#if PLATFORM(QT) || PLATFORM(GTK)
    5656    String contextMenuItemTagCopyImageUrlToClipboard();
    5757#endif

  • trunk/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp

    r75481 r80344  
    108108    case ContextMenuItemTagToggleMediaControls:
    109109    case ContextMenuItemTagToggleMediaLoop:
     110    case ContextMenuItemTagCopyImageUrlToClipboard:
    110111        // No icon for this.
    111112        return 0;

  • trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp

    r78842 r80344  
    115115{
    116116    return String::fromUTF8(_("Cop_y Image"));
     117}
     118
     119String contextMenuItemTagCopyImageUrlToClipboard()
     120{
     121    return String::fromUTF8(_("Copy Image _Address"));
    117122}
    118123
Note: See TracChangeset for help on using the changeset viewer.