Commit cfd5c78a authored by Markus Stange's avatar Markus Stange
Browse files

Bug 505699 - Add UI for full screen mode on the Mac. ui-r=faaborg, r=dao 

--HG--
extra : rebase_source : b4819e769990532fcb913df8185b6d3911e7efe2
parent 8dc9565b

browser/base/content/browser-menubar.inc

+0 −2
Original line number Diff line number Diff line
@@ -433,14 +433,12 @@ 
                          label="&pageSourceCmd.label;"

                          key="key_viewSource"

                          command="View:PageSource"/>

#ifndef XP_MACOSX

                <menuitem id="fullScreenItem"

                          accesskey="&fullScreenCmd.accesskey;"

                          label="&fullScreenCmd.label;"

                          key="key_fullScreen"

                          type="checkbox"

                          observes="View:FullScreen"/>

#endif

                <menuitem id="menu_showAllTabs"

                          hidden="true"

                          accesskey="&showAllTabsCmd.accesskey;"

browser/base/content/browser-sets.inc

+3 −0
Original line number Diff line number Diff line
@@ -266,6 +266,9 @@ 
    <key id="showAllHistoryKb" key="&showAllHistoryCmd.commandkey;" command="Browser:ShowAllHistory" modifiers="accel,shift"/>

    <key keycode="VK_F5" command="Browser:ReloadSkipCache" modifiers="accel"/>

    <key id="key_fullScreen" keycode="VK_F11" command="View:FullScreen"/>

#else

    <key id="key_fullScreen" key="&fullScreenCmd.macCommandKey;" command="View:FullScreen" modifiers="accel,shift"/>

    <key keycode="VK_F11" command="View:FullScreen"/>

#endif

    <key key="&reloadCmd.commandkey;" command="Browser:Reload" modifiers="accel" id="key_reload"/>

    <key key="&reloadCmd.commandkey;" command="Browser:ReloadSkipCache" modifiers="accel,shift"/>

browser/base/content/browser.js

+0 −2
Original line number Diff line number Diff line
@@ -3778,11 +3778,9 @@ var FullScreen = 
    else

      gNavToolbox.setAttribute("inFullscreen", true);



#ifndef XP_MACOSX

    var controls = document.getElementsByAttribute("fullscreencontrol", "true");

    for (var i = 0; i < controls.length; ++i)

      controls[i].hidden = aShow;

#endif

  }

};

browser/base/content/browser.xul

+0 −8
Original line number Diff line number Diff line
@@ -511,13 +511,11 @@ 
                       label="&pasteCmd.label;"

                       command="cmd_paste"

                       tooltiptext="&pasteButton.tooltip;"/>

#ifndef XP_MACOSX

        <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional"

                       observes="View:FullScreen"

                       type="checkbox"

                       label="&fullScreenCmd.label;"

                       tooltiptext="&fullScreenButton.tooltip;"/>

#endif

    </toolbarpalette>



    <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
@@ -529,17 +527,12 @@ 
             iconsize="large"

#endif

             customizable="true"

#ifdef XP_MACOSX

             defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container"

#else

#ifdef WINCE

             defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,navigator-throbber,fullscreenflex,window-controls"

#else

             defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,fullscreenflex,window-controls"

#endif

#endif

             context="toolbar-context-menu">

#ifndef XP_MACOSX

      <hbox id="fullscreenflex" flex="1" hidden="true" fullscreencontrol="true"/>

      <hbox id="window-controls" hidden="true" fullscreencontrol="true">

        <toolbarbutton id="minimize-button" class="toolbarbutton-1"
@@ -554,7 +547,6 @@ 
                       tooltiptext="&fullScreenClose.tooltip;"

                       oncommand="BrowserTryToCloseWindow();"/>

      </hbox>

#endif

    </toolbar>



    <toolbarset id="customToolbars" context="toolbar-context-menu"/>

browser/locales/en-US/chrome/browser/browser.dtd

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
<!ENTITY pageInfoCmd.commandkey "i">

<!ENTITY fullScreenCmd.label "Full Screen">

<!ENTITY fullScreenCmd.accesskey "F">

<!ENTITY fullScreenCmd.macCommandKey "f">

<!ENTITY showAllTabsCmd.label "Show All Tabs">

<!ENTITY showAllTabsCmd.accesskey "A">