Changeset 152117 in webkit


Ignore:
Timestamp:
Jun 27, 2013 11:13:47 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Polish context menus for media elements
https://bugs.webkit.org/show_bug.cgi?id=118078
<rdar://problem/14278960>

Patch by Ruth Fong <ruth_fong@apple.com> on 2013-06-27
Reviewed by Eric Carlson.

No new tests: media/context-menu-action.html,
which has been disabled by bug 116651, is used to test context menus.

  • English.lproj/Localizable.strings: Changed "Fullscreen" to "Full Screen"

and added strings "Show Controls" and "Hide Controls".

  • page/ContextMenuController.cpp: Updated to include a new context menu item

that toggles betweeen "Show Controls" and "Hide Controls".

  • platform/ContextMenuItem.h:
  • platform/LocalizedStrings.cpp:
  • platform/LocalizedStrings.h:
  • platform/efl/LocalizedStringsEfl.cpp:
  • platform/gtk/LocalizedStringsGtk.cpp:
  • platform/qt/LocalizedStringsQt.cpp:

Added equivalents of localized strings "Show Controls" and "Hide Controls".

Location:
trunk/Source/WebCore
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r152105 r152117  
     12013-06-27  Ruth Fong  <ruth_fong@apple.com>
     2
     3        Polish context menus for media elements
     4        https://bugs.webkit.org/show_bug.cgi?id=118078
     5        <rdar://problem/14278960>
     6
     7        Reviewed by Eric Carlson.
     8
     9        No new tests: media/context-menu-action.html,
     10        which has been disabled by bug 116651, is used to test context menus.
     11
     12        * English.lproj/Localizable.strings: Changed "Fullscreen" to "Full Screen"
     13        and added strings "Show Controls" and "Hide Controls".
     14
     15        * page/ContextMenuController.cpp: Updated to include a new context menu item
     16        that toggles betweeen "Show Controls" and "Hide Controls".
     17
     18        * platform/ContextMenuItem.h:
     19
     20        * platform/LocalizedStrings.cpp:
     21        * platform/LocalizedStrings.h:
     22        * platform/efl/LocalizedStringsEfl.cpp:
     23        * platform/gtk/LocalizedStringsGtk.cpp:
     24        * platform/qt/LocalizedStringsQt.cpp:
     25        Added equivalents of localized strings "Show Controls" and "Hide Controls".
     26
    1272013-06-27  Chris Fleizach  <cfleizach@apple.com>
    228
  • trunk/Source/WebCore/English.lproj/Localizable.strings

    r151713 r152117  
    180180
    181181/* Video Enter Fullscreen context menu item */
    182 "Enter Fullscreen" = "Enter Fullscreen";
     182"Enter Full Screen" = "Enter Full Screen";
    183183
    184184/* Video Exit Fullscreen context menu item */
    185 "Exit Fullscreen" = "Exit Fullscreen";
     185"Exit Full Screen" = "Exit Full Screen";
    186186
    187187/* Default application name for Open With context menu */
     
    203203"HTML content" = "HTML content";
    204204
     205/* Hide Media Controls context menu item */
     206"Hide Controls" = "Hide Controls";
     207
    205208/* menu item title */
    206209"Hide Spelling and Grammar" = "Hide Spelling and Grammar";
     
    410413"Show Colors" = "Show Colors";
    411414
     415/* Show Media Controls context menu item */
     416"Show Controls" = "Show Controls";
     417
    412418/* Show fonts context menu item */
    413419"Show Fonts" = "Show Fonts";
  • trunk/Source/WebCore/page/ContextMenuController.cpp

    r151656 r152117  
    746746#endif
    747747
     748#if PLATFORM(MAC)
     749#define SUPPORTS_TOGGLE_SHOW_HIDE_MEDIA_CONTROLS 1
     750#else
     751#define SUPPORTS_TOGGLE_SHOW_HIDE_MEDIA_CONTROLS 0
     752#endif
     753
    748754void ContextMenuController::populate()
    749755{
     
    772778    ContextMenuItem MediaMute(ActionType, ContextMenuItemTagMediaMute,
    773779        contextMenuItemTagMediaMute());
     780#if SUPPORTS_TOGGLE_SHOW_HIDE_MEDIA_CONTROLS
     781    ContextMenuItem ToggleMediaControls(ActionType, ContextMenuItemTagToggleMediaControls,
     782        contextMenuItemTagHideMediaControls());
     783#else
    774784    ContextMenuItem ToggleMediaControls(CheckableActionType, ContextMenuItemTagToggleMediaControls,
    775785        contextMenuItemTagToggleMediaControls());
     786#endif
    776787    ContextMenuItem ToggleMediaLoop(CheckableActionType, ContextMenuItemTagToggleMediaLoop,
    777788        contextMenuItemTagToggleMediaLoop());
     
    13641375            break;
    13651376        case ContextMenuItemTagToggleMediaControls:
     1377#if SUPPORTS_TOGGLE_SHOW_HIDE_MEDIA_CONTROLS
     1378            item.setTitle(m_hitTestResult.mediaControlsEnabled() ? contextMenuItemTagHideMediaControls() : contextMenuItemTagShowMediaControls());
     1379#else
    13661380            shouldCheck = m_hitTestResult.mediaControlsEnabled();
     1381#endif
    13671382            break;
    13681383        case ContextMenuItemTagToggleMediaLoop:
  • trunk/Source/WebCore/platform/LocalizedStrings.cpp

    r152035 r152117  
    495495}
    496496
     497String contextMenuItemTagShowMediaControls()
     498{
     499    return WEB_UI_STRING("Show Controls", "Show Media Controls context menu item");
     500}
     501
     502String contextMenuItemTagHideMediaControls()
     503{
     504    return WEB_UI_STRING("Hide Controls", "Hide Media Controls context menu item");
     505}
     506
    497507String contextMenuItemTagToggleMediaLoop()
    498508{
     
    502512String contextMenuItemTagEnterVideoFullscreen()
    503513{
    504     return WEB_UI_STRING("Enter Fullscreen", "Video Enter Fullscreen context menu item");
     514    return WEB_UI_STRING("Enter Full Screen", "Video Enter Fullscreen context menu item");
    505515}
    506516
    507517String contextMenuItemTagExitVideoFullscreen()
    508518{
    509     return WEB_UI_STRING("Exit Fullscreen", "Video Exit Fullscreen context menu item");
     519    return WEB_UI_STRING("Exit Full Screen", "Video Exit Fullscreen context menu item");
    510520}
    511521
  • trunk/Source/WebCore/platform/LocalizedStrings.h

    r152035 r152117  
    138138    String contextMenuItemTagCopyAudioLinkToClipboard();
    139139    String contextMenuItemTagToggleMediaControls();
     140    String contextMenuItemTagShowMediaControls();
     141    String contextMenuItemTagHideMediaControls();
    140142    String contextMenuItemTagToggleMediaLoop();
    141143    String contextMenuItemTagEnterVideoFullscreen();
  • trunk/Source/WebCore/platform/efl/LocalizedStringsEfl.cpp

    r151778 r152117  
    154154}
    155155
     156String contextMenuItemTagShowMediaControls()
     157{
     158    return String::fromUTF8("Show Media Controls");
     159}
     160
     161String contextMenuitemTagHideMediaControls()
     162{
     163    return String::fromUTF8("Hide Media Controls");
     164}
     165
    156166String contextMenuItemTagToggleMediaLoop()
    157167{
  • trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp

    r151778 r152117  
    165165{
    166166    return String::fromUTF8(_("_Toggle Media Controls"));
     167}
     168
     169String contextMenuItemTagShowMediaControls()
     170{
     171    return String::fromUTF8(_("_Show Media Controls"));
     172}
     173
     174String contextMenuItemTagHideMediaControls()
     175{
     176    return String::fromUTF8(_("_Hide Media Controls"));
    167177}
    168178
  • trunk/Source/WebCore/platform/qt/LocalizedStringsQt.cpp

    r151656 r152117  
    157157{
    158158    return QCoreApplication::translate("QWebPage", "Toggle Controls", "Toggle Media Controls");
     159}
     160
     161String contextMenuItemTagShowMediaControls()
     162{
     163    return QCoreApplication::translate("QWebPage", "Show Controls", "Show Media Controls");
     164}
     165
     166String contextMenuItemTagHideMediaControls()
     167{
     168    return QCoreApplication::translate("QWebPage", "Hide Controls", "Hide Media Controls");
    159169}
    160170
Note: See TracChangeset for help on using the changeset viewer.