Bug 1611714 - Remove platform overlays - browser platform overlay. r=frg DONTBUILD
This commit is contained in:
Ian Neal
Родитель
910619c56e
Коммит
794e86296f
|
|
@ -21,7 +21,7 @@ comm.jar:
|
|||
content/navigator/navigator.js
|
||||
content/navigator/navigator.xul
|
||||
content/navigator/navigatorDD.js
|
||||
content/navigator/navigatorOverlay.xul
|
||||
* content/navigator/navigatorOverlay.xul
|
||||
content/navigator/nsBrowserContentListener.js
|
||||
content/navigator/nsBrowserStatusHandler.js
|
||||
content/navigator/sessionHistoryUI.js
|
||||
|
|
@ -31,15 +31,7 @@ comm.jar:
|
|||
content/navigator/urlbarBindings.xml
|
||||
content/navigator/webDeveloperOverlay.js
|
||||
content/navigator/webDeveloperOverlay.xul
|
||||
#ifdef XP_MACOSX
|
||||
content/navigator/platformNavigationBindings.xul (mac/platformNavigationBindings.xul)
|
||||
#else
|
||||
#ifdef XP_WIN
|
||||
content/navigator/platformNavigationBindings.xul (win/platformNavigationBindings.xul)
|
||||
#else
|
||||
content/navigator/platformNavigationBindings.xul (unix/platformNavigationBindings.xul)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
content/navigator/pageinfo/feeds.js (pageinfo/feeds.js)
|
||||
content/navigator/pageinfo/feeds.xml (pageinfo/feeds.xml)
|
||||
content/navigator/pageinfo/pageInfo.css (pageinfo/pageInfo.css)
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
|
||||
<!DOCTYPE overlay SYSTEM "chrome://navigator-platform/locale/platformNavigationBindings.dtd">
|
||||
|
||||
<overlay id="platformNavigationBindings"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<keyset id="navigationKeys">
|
||||
<!-- proper arrow key navigation, 4.xP -->
|
||||
<key keycode="&goBackCmd.keyCode;" command="Browser:Back" modifiers="accel"/>
|
||||
<key keycode="&goForwardCmd.keyCode;" command="Browser:Forward" modifiers="accel"/>
|
||||
<key id="goBackKb" key="&goBackCmd.commandKey;" command="Browser:Back" modifiers="accel"/>
|
||||
<key id="goForwardKb" key="&goForwardCmd.commandKey;" command="Browser:Forward" modifiers="accel"/>
|
||||
<key id="key_stop2" keycode="VK_ESCAPE" oncommand="BrowserStop();"/>
|
||||
<key id="key_stop" key="." oncommand="BrowserStop();" modifiers="accel"/>
|
||||
<key id="goHome" keycode="VK_HOME" oncommand="BrowserHome();" modifiers="meta"/>
|
||||
<key id="key_fullScreen" key="&fullScreenCmd.commandKey;" command="View:FullScreen" modifiers="accel,shift"/>
|
||||
<key id="key_newTabWithTargetFg" keycode="VK_INSERT" modifiers="alt" command="cmd_newTabWithTarget"/>
|
||||
<!-- Add additional sanitize keybinding for Macs without a delete key -->
|
||||
<key id="key_sanitize_mac" command="Tools:Sanitize" keycode="VK_BACK" modifiers="accel,shift"/>
|
||||
</keyset>
|
||||
|
||||
<toolbarbutton id="minimize-button" hidden="true"/>
|
||||
<toolbarbutton id="close-button" hidden="true"/>
|
||||
|
||||
</overlay>
|
||||
|
|
@ -10,7 +10,6 @@
|
|||
<?xul-overlay href="chrome://communicator/content/places/placesOverlay.xul"?>
|
||||
<?xul-overlay href="chrome://communicator/content/charsetOverlay.xul"?>
|
||||
<?xul-overlay href="chrome://navigator/content/mailNavigatorOverlay.xul"?>
|
||||
<?xul-overlay href="chrome://navigator/content/platformNavigationBindings.xul"?>
|
||||
|
||||
<!DOCTYPE overlay [
|
||||
<!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" >
|
||||
|
|
@ -108,9 +107,60 @@
|
|||
oncommand="PlacesCommandHook.showPlacesOrganizer('History');"
|
||||
modifiers="accel"/>
|
||||
<keyset id="viewZoomKeys"/>
|
||||
<keyset id="navigationKeys"/>
|
||||
<keyset id="navigationKeys">
|
||||
#ifndef XP_MACOSX
|
||||
<key id="goBackKb" keycode="VK_LEFT"
|
||||
command="Browser:Back" modifiers="alt"/>
|
||||
<key id="goForwardKb" keycode="VK_RIGHT"
|
||||
command="Browser:Forward" modifiers="alt"/>
|
||||
#else
|
||||
<key id="goBackKb" keycode="VK_LEFT"
|
||||
command="Browser:Back" modifiers="accel"/>
|
||||
<key id="goForwardKb" keycode="VK_RIGHT"
|
||||
command="Browser:Forward" modifiers="accel"/>
|
||||
#endif
|
||||
#ifndef XP_WIN
|
||||
<key id="goBackKb2" key="&goBackCmd.commandKey;"
|
||||
command="Browser:Back" modifiers="accel"/>
|
||||
<key id="goForwardKb2" key="&goForwardCmd.commandKey;"
|
||||
command="Browser:Forward" modifiers="accel"/>
|
||||
#endif
|
||||
<key id="key_stop" keycode="VK_ESCAPE" oncommand="BrowserStop();"/>
|
||||
#ifdef XP_MACOSX
|
||||
<key id="key_stop_mac" key="&stopCmd.macCommandKey;"
|
||||
oncommand="BrowserStop();" modifiers="accel"/>
|
||||
#endif
|
||||
|
||||
#ifndef XP_MACOSX
|
||||
<key keycode="VK_F5" oncommand="BrowserReload();"/>
|
||||
<key keycode="VK_F5"
|
||||
oncommand="BrowserReloadSkipCache();" modifiers="control"/>
|
||||
<key id="goHome" keycode="VK_HOME"
|
||||
oncommand="BrowserHome();" modifiers="alt"/>
|
||||
#else
|
||||
<key id="goHome" keycode="VK_HOME"
|
||||
oncommand="BrowserHome();" modifiers="meta"/>
|
||||
#endif
|
||||
|
||||
#ifdef XP_MACOSX
|
||||
<key keycode="VK_F11" command="View:FullScreen"/>
|
||||
<key id="key_fullScreen" key="&fullScreenCmd.commandKey;"
|
||||
command="View:FullScreen" modifiers="accel,shift"/>
|
||||
#else
|
||||
<key id="key_fullScreen" keycode="VK_F11" command="View:FullScreen"/>
|
||||
<key id="key_newTabWithTargetBg" keycode="VK_INSERT"
|
||||
command="cmd_newTabWithTarget"/>
|
||||
#endif
|
||||
<key id="key_newTabWithTargetFg" keycode="VK_INSERT"
|
||||
modifiers="alt" command="cmd_newTabWithTarget"/>
|
||||
</keyset>
|
||||
<keyset id="tasksKeys"/>
|
||||
<key id="key_sanitize" command="Tools:Sanitize" keycode="VK_DELETE" modifiers="accel,shift"/>
|
||||
<key id="key_sanitize" keycode="VK_DELETE"
|
||||
command="Tools:Sanitize" modifiers="accel,shift"/>
|
||||
#ifdef XP_MACOSX
|
||||
<key id="key_sanitize_mac" keycode="VK_BACK"
|
||||
command="Tools:Sanitize" modifiers="accel,shift"/>
|
||||
#endif
|
||||
</keyset>
|
||||
|
||||
<commandset id="commands">
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
|
||||
<!DOCTYPE overlay SYSTEM "chrome://navigator-platform/locale/platformNavigationBindings.dtd">
|
||||
|
||||
<overlay id="platformNavigationBindings"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<keyset id="navigationKeys">
|
||||
<!-- proper arrow key navigation, 4.xP -->
|
||||
<key id="goBackKb" keycode="&goBackCmd.keyCode;" command="Browser:Back" modifiers="alt"/>
|
||||
<key id="goForwardKb" keycode="&goForwardCmd.keyCode;" command="Browser:Forward" modifiers="alt"/>
|
||||
|
||||
<!-- Some people apparently use this combination too on Unix...
|
||||
we live and learn. -->
|
||||
<key key="&goBackCmd.commandKey;" command="Browser:Back" modifiers="accel"/>
|
||||
<key key="&goForwardCmd.commandKey;" command="Browser:Forward" modifiers="accel"/>
|
||||
<key id="key_stop" keycode="VK_ESCAPE" oncommand="BrowserStop();"/>
|
||||
|
||||
<!-- Supporting IE 'refresh' shortcut key -->
|
||||
<key keycode="VK_F5" oncommand="BrowserReload();"/>
|
||||
<key keycode="VK_F5" modifiers="control" oncommand="BrowserReloadSkipCache();"/>
|
||||
|
||||
<!-- Specific keybinding for Sun keyboard -->
|
||||
<key id="goHome" keycode="VK_HOME" oncommand="BrowserHome();" modifiers="alt"/>
|
||||
<key id="key_fullScreen" keycode="VK_F11" command="View:FullScreen"/>
|
||||
<key id="key_newTabWithTargetBg" keycode="VK_INSERT" command="cmd_newTabWithTarget"/>
|
||||
<key id="key_newTabWithTargetFg" keycode="VK_INSERT" modifiers="alt" command="cmd_newTabWithTarget"/>
|
||||
</keyset>
|
||||
|
||||
</overlay>
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
|
||||
<!DOCTYPE overlay SYSTEM "chrome://navigator-platform/locale/platformNavigationBindings.dtd">
|
||||
|
||||
<overlay id="platformNavigationBindings"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<keyset id="navigationKeys">
|
||||
<!-- back and forward accelerators on Windows, strangely enough, are
|
||||
Alt+Left arrow and Alt+Right arrow. -->
|
||||
<key id="goBackKb" keycode="&goBackCmd.keyCode;" command="Browser:Back" modifiers="alt"/>
|
||||
<key id="goForwardKb" keycode="&goForwardCmd.keyCode;" command="Browser:Forward" modifiers="alt"/>
|
||||
<key id="key_stop" keycode="VK_ESCAPE" oncommand="BrowserStop();"/>
|
||||
|
||||
<!-- Supporting IE 'refresh' shortcut key -->
|
||||
<key keycode="VK_F5" oncommand="BrowserReload();"/>
|
||||
<key keycode="VK_F5" modifiers="control" oncommand="BrowserReloadSkipCache();"/>
|
||||
|
||||
<key id="goHome" keycode="VK_HOME" oncommand="BrowserHome();" modifiers="alt"/>
|
||||
|
||||
<key id="key_fullScreen" keycode="VK_F11" command="View:FullScreen"/>
|
||||
<key id="key_newTabWithTargetBg" keycode="VK_INSERT" command="cmd_newTabWithTarget"/>
|
||||
<key id="key_newTabWithTargetFg" keycode="VK_INSERT" modifiers="alt" command="cmd_newTabWithTarget"/>
|
||||
</keyset>
|
||||
|
||||
</overlay>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
<!-- LOCALIZATION NOTE: RTL languages may wish to switch these -->
|
||||
<!ENTITY goBackCmd.keyCode "VK_LEFT">
|
||||
<!ENTITY goForwardCmd.keyCode "VK_RIGHT">
|
||||
<!ENTITY goBackCmd.commandKey "[">
|
||||
<!ENTITY goForwardCmd.commandKey "]">
|
||||
|
||||
<!ENTITY fullScreenCmd.commandKey "f">
|
||||
|
|
@ -56,6 +56,8 @@
|
|||
<!-- Go Menu -->
|
||||
<!ENTITY goMenu.label "Go">
|
||||
<!ENTITY goMenu.accesskey "G">
|
||||
<!ENTITY goBackCmd.commandKey "[">
|
||||
<!ENTITY goForwardCmd.commandKey "]">
|
||||
<!ENTITY goHomeCmd.label "Home">
|
||||
<!ENTITY goHomeCmd.accesskey "H">
|
||||
<!ENTITY historyCmd.label "History">
|
||||
|
|
@ -144,3 +146,6 @@
|
|||
|
||||
<!ENTITY clearPrivateDataCmd.label "Clear Private Data…">
|
||||
<!ENTITY clearPrivateDataCmd.accesskey "e">
|
||||
|
||||
<!ENTITY stopCmd.macCommandKey ".">
|
||||
<!ENTITY fullScreenCmd.commandKey "f">
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
<!-- LOCALIZATION NOTE: RTL languages may wish to switch these -->
|
||||
<!ENTITY goBackCmd.keyCode "VK_LEFT">
|
||||
<!ENTITY goForwardCmd.keyCode "VK_RIGHT">
|
||||
<!ENTITY goBackCmd.commandKey "[">
|
||||
<!ENTITY goForwardCmd.commandKey "]">
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
<!-- LOCALIZATION NOTE: RTL languages may wish to switch these -->
|
||||
<!ENTITY goBackCmd.keyCode "VK_LEFT">
|
||||
<!ENTITY goForwardCmd.keyCode "VK_RIGHT">
|
||||
|
|
@ -19,9 +19,6 @@
|
|||
% locale messenger-newsblog @AB_CD@ %locale/@AB_CD@/messenger-newsblog/
|
||||
% locale mozldap @AB_CD@ %locale/@AB_CD@/mozldap/
|
||||
% locale navigator @AB_CD@ %locale/@AB_CD@/navigator/
|
||||
% locale navigator-platform @AB_CD@ %locale/@AB_CD@/navigator-platform/gtk/ os=LikeUnix
|
||||
% locale navigator-platform @AB_CD@ %locale/@AB_CD@/navigator-platform/mac/ os=Darwin
|
||||
% locale navigator-platform @AB_CD@ %locale/@AB_CD@/navigator-platform/win/ os=WINNT
|
||||
% locale navigator-region @AB_CD@ %locale/@AB_CD@/navigator-region/
|
||||
locale/@AB_CD@/branding/aboutRights.dtd (%chrome/branding/aboutRights.dtd)
|
||||
locale/@AB_CD@/branding/aboutRights.properties (%chrome/branding/aboutRights.properties)
|
||||
|
|
@ -364,9 +361,6 @@
|
|||
locale/@AB_CD@/navigator/tabbrowser.properties (%chrome/browser/tabbrowser.properties)
|
||||
locale/@AB_CD@/navigator/taskbar.properties (%chrome/browser/taskbar.properties)
|
||||
locale/@AB_CD@/navigator/webDeveloper.dtd (%chrome/browser/webDeveloper.dtd)
|
||||
locale/@AB_CD@/navigator-platform/mac/platformNavigationBindings.dtd (%chrome/browser/mac/platformNavigationBindings.dtd)
|
||||
locale/@AB_CD@/navigator-platform/gtk/platformNavigationBindings.dtd (%chrome/browser/unix/platformNavigationBindings.dtd)
|
||||
locale/@AB_CD@/navigator-platform/win/platformNavigationBindings.dtd (%chrome/browser/win/platformNavigationBindings.dtd)
|
||||
locale/@AB_CD@/navigator-region/region.properties (%chrome/browser/region.properties)
|
||||
locale/@AB_CD@/pippki/pref-certs.dtd (%chrome/common/pref/pref-certs.dtd)
|
||||
locale/@AB_CD@/pippki/pref-masterpass.dtd (%chrome/common/pref/pref-masterpass.dtd)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче