wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 714172 - Change fullscreen menu for Lion [r=gavin]

Browse Source
This commit is contained in:
Paul O’Shannessy 2012-05-14 17:04:19 -07:00
parent 25e86e496d
commit 531cd2d374
4 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
browser/base/content/browser-menubar.inc
View File

@ -308,12 +308,30 @@
</menu> </menu>
#include browser-charsetmenu.inc #include browser-charsetmenu.inc
<menuseparator/> <menuseparator/>
#ifdef XP_MACOSX
<menuitem id="enterFullScreenItem"
accesskey="&enterFullScreenCmd.accesskey;"
label="&enterFullScreenCmd.label;"
key="key_fullScreen">
<observes element="View:FullScreen" attribute="oncommand"/>
<observes element="View:FullScreen" attribute="disabled"/>
</menuitem>
<menuitem id="exitFullScreenItem"
accesskey="&exitFullScreenCmd.accesskey;"
label="&exitFullScreenCmd.label;"
key="key_fullScreen"
hidden="true">
<observes element="View:FullScreen" attribute="oncommand"/>
<observes element="View:FullScreen" attribute="disabled"/>
</menuitem>
#else
<menuitem id="fullScreenItem" <menuitem id="fullScreenItem"
accesskey="&fullScreenCmd.accesskey;" accesskey="&fullScreenCmd.accesskey;"
label="&fullScreenCmd.label;" label="&fullScreenCmd.label;"
key="key_fullScreen" key="key_fullScreen"
type="checkbox" type="checkbox"
observes="View:FullScreen"/> observes="View:FullScreen"/>
#endif
<menuitem id="menu_showAllTabs" <menuitem id="menu_showAllTabs"
hidden="true" hidden="true"
accesskey="&showAllTabsCmd.accesskey;" accesskey="&showAllTabsCmd.accesskey;"

3
browser/base/content/browser-sets.inc
View File

@ -341,7 +341,8 @@
<key keycode="VK_F6" command="Browser:FocusNextFrame" modifiers="shift"/> <key keycode="VK_F6" command="Browser:FocusNextFrame" modifiers="shift"/>
<key id="key_fullScreen" keycode="VK_F11" command="View:FullScreen"/> <key id="key_fullScreen" keycode="VK_F11" command="View:FullScreen"/>
#else #else
<key id="key_fullScreen" key="&fullScreenCmd.macCommandKey;" command="View:FullScreen" modifiers="accel,shift"/> <key id="key_fullScreen" key="&fullScreenCmd.macCommandKey;" command="View:FullScreen" modifiers="accel,control"/>
<key id="key_fullScreen_old" key="&fullScreenCmd.macCommandKey;" command="View:FullScreen" modifiers="accel,shift"/>
<key keycode="VK_F11" command="View:FullScreen"/> <key keycode="VK_F11" command="View:FullScreen"/>
#endif #endif
<key key="&reloadCmd.commandkey;" command="Browser:Reload" modifiers="accel" id="key_reload"/> <key key="&reloadCmd.commandkey;" command="Browser:Reload" modifiers="accel" id="key_reload"/>

6
browser/base/content/browser.js
View File

@ -3958,6 +3958,12 @@ var FullScreen = {
// fullscreen menuitem, menubars, and the appmenu. // fullscreen menuitem, menubars, and the appmenu.
document.getElementById("View:FullScreen").setAttribute("checked", enterFS); document.getElementById("View:FullScreen").setAttribute("checked", enterFS);
#ifdef XP_MACOSX
// Make sure the menu items are adjusted.
document.getElementById("enterFullScreenItem").hidden = enterFS;
document.getElementById("exitFullScreenItem").hidden = !enterFS;
#endif
// On OS X Lion we don't want to hide toolbars when entering fullscreen, unless // On OS X Lion we don't want to hide toolbars when entering fullscreen, unless
// we're entering DOM fullscreen, in which case we should hide the toolbars. // we're entering DOM fullscreen, in which case we should hide the toolbars.
// If we're leaving fullscreen, then we'll go through the exit code below to // If we're leaving fullscreen, then we'll go through the exit code below to

6
browser/locales/en-US/chrome/browser/browser.dtd
View File

@ -77,6 +77,12 @@ can reach it easily. -->
<!ENTITY pageInfoCmd.label "Page Info"> <!ENTITY pageInfoCmd.label "Page Info">
<!ENTITY pageInfoCmd.accesskey "I"> <!ENTITY pageInfoCmd.accesskey "I">
<!ENTITY pageInfoCmd.commandkey "i"> <!ENTITY pageInfoCmd.commandkey "i">
<!-- LOCALIZATION NOTE (enterFullScreenCmd.label, exitFullScreenCmd.label):
These should match what Safari and other Apple applications use on OS X Lion. -->
<!ENTITY enterFullScreenCmd.label "Enter Full Screen">
<!ENTITY enterFullScreenCmd.accesskey "F">
<!ENTITY exitFullScreenCmd.label "Exit Full Screen">
<!ENTITY exitFullScreenCmd.accesskey "F">
<!ENTITY fullScreenCmd.label "Full Screen"> <!ENTITY fullScreenCmd.label "Full Screen">
<!ENTITY fullScreenCmd.accesskey "F"> <!ENTITY fullScreenCmd.accesskey "F">
<!ENTITY fullScreenCmd.macCommandKey "f"> <!ENTITY fullScreenCmd.macCommandKey "f">