зеркало из https://github.com/mozilla/gecko-dev.git
Bug 279227 - Move find bar strings out of browser, #ifdef USE_FIND_BAR the find bar code that Thunderbird builds. r=mconnor
This commit is contained in:
jwalden%mit.edu
Родитель
6f866d06fa
Коммит
d9fae2c0bd
|
|
@ -7,7 +7,7 @@
|
|||
%globalRegionDTD;
|
||||
<!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charsetOverlay.dtd" >
|
||||
%charsetDTD;
|
||||
<!ENTITY % findDTD SYSTEM "chrome://global/locale/finddialog.dtd" >
|
||||
%findDTD;
|
||||
<!ENTITY % findBarDTD SYSTEM "chrome://global/locale/findbar.dtd" >
|
||||
%findBarDTD;
|
||||
]>
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
<stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
|
||||
<stringbundle id="bundle_shell" src="chrome://browser/locale/shellservice.properties"/>
|
||||
<stringbundle id="bundle_browser" src="chrome://browser/locale/browser.properties"/>
|
||||
<stringbundle id="bundle_findBar" src="chrome://browser/locale/browser.properties"/>
|
||||
<stringbundle id="bundle_findBar" src="chrome://global/locale/findbar.properties"/>
|
||||
<stringbundle id="bundle_preferences" src="chrome://browser/locale/preferences/preferences.properties"/>
|
||||
</stringbundleset>
|
||||
|
||||
|
|
|
|||
|
|
@ -318,8 +318,6 @@
|
|||
<!ENTITY copyButton.tooltip "Copy">
|
||||
<!ENTITY pasteButton.tooltip "Paste">
|
||||
|
||||
<!ENTITY findOnSearchBarCmd.label "Find in This Page">
|
||||
|
||||
<!ENTITY quitApplicationCmdWin.label "Exit">
|
||||
<!ENTITY quitApplicationCmdWin.accesskey "x">
|
||||
<!ENTITY goBackCmd.commandKey "[">
|
||||
|
|
@ -356,15 +354,6 @@
|
|||
<!ENTITY bidiSwitchTextDirectionItem.accesskey "w">
|
||||
<!ENTITY bidiSwitchTextDirectionItem.commandkey "X">
|
||||
|
||||
<!ENTITY find.label "Find:">
|
||||
<!ENTITY findNext.label "Find Next">
|
||||
<!ENTITY findNext.tooltip "Find the next occurrence of the phrase">
|
||||
<!ENTITY findPrevious.label "Find Previous">
|
||||
<!ENTITY findPrevious.tooltip "Find the previous occurrence of the phrase">
|
||||
<!ENTITY findCloseButton.tooltip "Close Find bar">
|
||||
<!ENTITY highlight.label "Highlight">
|
||||
<!ENTITY highlight.tooltip "Highlight all occurrences of the phrase (Ctrl+Enter)">
|
||||
|
||||
<!ENTITY findOnCmd.label "Find in This Page...">
|
||||
<!ENTITY findOnCmd.accesskey "F">
|
||||
<!ENTITY findOnCmd.commandkey "f">
|
||||
|
|
|
|||
|
|
@ -90,10 +90,6 @@ saveFormInformationNo=Don't Save
|
|||
missingpluginsMessage.title=Additional plugins are required to display all the media on this page.
|
||||
missingpluginsMessage.button.label=Install Missing Plugins...
|
||||
|
||||
NotFound=Phrase not found
|
||||
WrappedToTop=Reached end of page, continued from top
|
||||
WrappedToBottom=Reached top of page, continued from bottom
|
||||
|
||||
# Sanitize
|
||||
sanitizeWithPromptLabel=Sanitize %S...
|
||||
sanitizeButton=Sanitize Now
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
# Contributor(s):
|
||||
# R.J. Keller <rlk@trfenv.com>
|
||||
# Steffen Wilberg <steffen.wilberg@web.de>
|
||||
# Jeff Walden <jwalden+code@mit.edu>
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
|
|
@ -47,10 +48,8 @@
|
|||
%brandDTD;
|
||||
<!ENTITY % helpDTD SYSTEM "chrome://help/locale/help.dtd">
|
||||
%helpDTD;
|
||||
<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
|
||||
%browserDTD;
|
||||
<!ENTITY % findDTD SYSTEM "chrome://global/locale/finddialog.dtd" >
|
||||
%findDTD;
|
||||
<!ENTITY % findBarDTD SYSTEM "chrome://global/locale/findbar.dtd" >
|
||||
%findBarDTD;
|
||||
<!ENTITY % globalRegionDTD SYSTEM "chrome://global-region/locale/region.dtd">
|
||||
%globalRegionDTD;
|
||||
]>
|
||||
|
|
@ -76,12 +75,11 @@
|
|||
|
||||
<script type="application/x-javascript" src="chrome://help/content/toolbarCustomization.js"/>
|
||||
<script type="application/x-javascript" src="chrome://help/content/help.js"/>
|
||||
<script type="application/x-javascript" src="chrome://browser/content/sessionHistoryUI.js"/>
|
||||
<script type="application/x-javascript" src="chrome://global/content/findBar.js"/>
|
||||
<script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>
|
||||
<script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
|
||||
|
||||
<stringbundle id="bundle_findBar" src="chrome://browser/locale/browser.properties"/>
|
||||
<stringbundle id="bundle_findBar" src="chrome://global/locale/findbar.properties"/>
|
||||
|
||||
<menupopup id="backMenu" position="after_start"
|
||||
onpopupshowing="return createBackMenu(event);"
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
|
||||
<!ENTITY findOnCmd.commandkey "F">
|
||||
<!ENTITY findAgainCmd.commandkey "G">
|
||||
<!ENTITY findAgainCmd.commandkey2 "VK_F3">
|
||||
|
||||
<!ENTITY backButton.label "Back">
|
||||
<!ENTITY backButton.accesskey "B">
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
# Roger B. Sidje <rbs@maths.uq.edu.au>
|
||||
# Pierre Chanial <p_ch@verizon.net>
|
||||
# Blake Ross <blake@cs.stanford.edu>
|
||||
# Jeff Walden <jwalden+code@mit.edu>
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
|
|
@ -51,11 +52,8 @@
|
|||
%brandDTD;
|
||||
<!ENTITY % sourceDTD SYSTEM "chrome://global/locale/viewSource.dtd" >
|
||||
%sourceDTD;
|
||||
<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
|
||||
%browserDTD;
|
||||
<!ENTITY % findDTD SYSTEM "chrome://global/locale/finddialog.dtd" >
|
||||
%findDTD;
|
||||
|
||||
<!ENTITY % findBarDTD SYSTEM "chrome://global/locale/findbar.dtd" >
|
||||
%findBarDTD;
|
||||
]>
|
||||
|
||||
<window id="main-window"
|
||||
|
|
@ -80,7 +78,7 @@
|
|||
<script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>
|
||||
<script type="application/x-javascript" src="chrome://global/content/contentAreaUtils.js"/>
|
||||
|
||||
<stringbundle id="bundle_findBar" src="chrome://browser/locale/browser.properties"/>
|
||||
<stringbundle id="bundle_findBar" src="chrome://global/locale/findbar.properties"/>
|
||||
|
||||
<command id="cmd_savePage" oncommand="ViewSourceSavePage();"/>
|
||||
<command id="cmd_print" oncommand="PrintUtils.print();"/>
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
# Roger B. Sidje <rbs@maths.uq.edu.au>
|
||||
# Pierre Chanial <p_ch@verizon.net>
|
||||
# Blake Ross <blake@cs.stanford.edu>
|
||||
# Jeff Walden <jwalden+code@mit.edu>
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
|
|
@ -40,9 +41,15 @@
|
|||
#
|
||||
#***** END LICENSE BLOCK ***** -->
|
||||
|
||||
#ifndef MOZ_THUNDERBIRD
|
||||
#define USE_FIND_TOOLBAR
|
||||
#endif
|
||||
|
||||
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://global/content/viewSource.css" type="text/css"?>
|
||||
#ifdef USE_FIND_TOOLBAR
|
||||
<?xml-stylesheet href="chrome://global/skin/findBar.css" type="text/css"?>
|
||||
#endif
|
||||
<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
|
||||
<?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
|
||||
|
||||
|
|
@ -51,12 +58,10 @@
|
|||
%brandDTD;
|
||||
<!ENTITY % sourceDTD SYSTEM "chrome://global/locale/viewSource.dtd" >
|
||||
%sourceDTD;
|
||||
#ifdef MOZ_PHOENIX
|
||||
<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
|
||||
%browserDTD;
|
||||
#ifdef USE_FIND_TOOLBAR
|
||||
<!ENTITY % findBarDTD SYSTEM "chrome://global/locale/findbar.dtd" >
|
||||
%findBarDTD;
|
||||
#endif
|
||||
<!ENTITY % findDTD SYSTEM "chrome://global/locale/finddialog.dtd" >
|
||||
%findDTD;
|
||||
]>
|
||||
|
||||
<window id="main-window"
|
||||
|
|
@ -78,15 +83,18 @@
|
|||
<script type="application/x-javascript" src="chrome://global/content/viewSource.js"/>
|
||||
<script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>
|
||||
#ifdef MOZ_PHOENIX
|
||||
<script type="application/x-javascript" src="chrome://global/content/findBar.js"/>
|
||||
<script type="application/x-javascript" src="chrome://global/content/contentAreaUtils.js"/>
|
||||
<stringbundle id="bundle_findBar" src="chrome://browser/locale/browser.properties"/>
|
||||
#else
|
||||
<script type="application/x-javascript" src="chrome://global/content/findUtils.js"/>
|
||||
<script type="application/x-javascript" src="chrome://communicator/content/contentAreaUtils.js"/>
|
||||
<!-- XPCNativeWrapper.js is needed by xpfe's contentAreaUtils.js (introduced by bug 220215) -->
|
||||
<script type="application/x-javascript" src="chrome://global/content/XPCNativeWrapper.js"/>
|
||||
<script type="application/x-javascript" src="chrome://communicator/content/utilityOverlay.js"/>
|
||||
#endif
|
||||
#ifdef USE_FIND_TOOLBAR
|
||||
<script type="application/x-javascript" src="chrome://global/content/findBar.js"/>
|
||||
<stringbundle id="bundle_findBar" src="chrome://global/locale/findbar.properties"/>
|
||||
#else
|
||||
<script type="application/x-javascript" src="chrome://global/content/findUtils.js"/>
|
||||
#endif
|
||||
<stringbundle id="viewSourceBundle" src="chrome://global/locale/viewSource.properties"/>
|
||||
|
||||
|
|
@ -96,7 +104,7 @@
|
|||
<command id="cmd_pagesetup" oncommand="PrintUtils.showPageSetup();"/>
|
||||
<command id="cmd_close" oncommand="window.close();"/>
|
||||
<commandset id="editMenuCommands"/>
|
||||
#ifdef MOZ_PHOENIX
|
||||
#ifdef USE_FIND_TOOLBAR
|
||||
<command id="cmd_find" oncommand="onFindCmd();"/>
|
||||
<command id="cmd_findAgain" oncommand="onFindAgainCmd();"/>
|
||||
<command id="cmd_findPrevious" oncommand="onFindPreviousCmd();"/>
|
||||
|
|
@ -122,7 +130,7 @@
|
|||
<key id="key_textZoomEnlarge2" key="&textEnlarge.commandkey2;" command="cmd_textZoomEnlarge" modifiers="accel"/>
|
||||
<key id="key_textZoomReduce" key="&textReduce.commandkey;" command="cmd_textZoomReduce" modifiers="accel"/>
|
||||
<key id="key_textZoomReset" key="&textReset.commandkey;" oncommand="ZoomManager.prototype.getInstance().reset();" modifiers="accel"/>
|
||||
#ifdef MOZ_PHOENIX
|
||||
#ifdef USE_FIND_TOOLBAR
|
||||
<key id="key_find" key="&findOnCmd.commandkey;" command="cmd_find" modifiers="accel"/>
|
||||
<key id="key_findAgain" key="&findAgainCmd.commandkey;" command="cmd_findAgain" modifiers="accel"/>
|
||||
<key id="key_findPrevious" key="&findAgainCmd.commandkey;" command="cmd_findPrevious" modifiers="accel,shift"/>
|
||||
|
|
@ -205,7 +213,7 @@
|
|||
|
||||
<browser id="content" type="content-primary" name="content" src="about:blank" flex="1"
|
||||
context="viewSourceContextMenu"/>
|
||||
#ifdef MOZ_PHOENIX
|
||||
#ifdef USE_FIND_TOOLBAR
|
||||
#include ../../typeaheadfind/content/findBar.inc
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
<!-- LOCALIZATION NOTE : FILE This file contains the entities needed to -->
|
||||
<!-- LOCALIZATION NOTE : FILE use the Find Bar. -->
|
||||
|
||||
<!-- entities split out from browser.dtd -->
|
||||
<!ENTITY find.label "Find:">
|
||||
<!ENTITY findNext.label "Find Next">
|
||||
<!ENTITY findNext.tooltip "Find the next occurrence of the phrase">
|
||||
<!ENTITY findPrevious.label "Find Previous">
|
||||
<!ENTITY findPrevious.tooltip "Find the previous occurrence of the phrase">
|
||||
<!ENTITY findCloseButton.tooltip "Close Find bar">
|
||||
<!ENTITY highlight.label "Highlight">
|
||||
<!ENTITY highlight.tooltip "Highlight all occurrences of the phrase (Ctrl+Enter)">
|
||||
<!ENTITY caseSensitiveCheckbox.label "Match case">
|
||||
<!ENTITY caseSensitiveCheckbox.accesskey "c">
|
||||
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
# strings used by the Find bar, split from browser.properties
|
||||
NotFound=Phrase not found
|
||||
WrappedToTop=Reached end of page, continued from top
|
||||
WrappedToBottom=Reached top of page, continued from bottom
|
||||
|
|
@ -43,3 +43,11 @@
|
|||
<!ENTITY menu_textEnlarge.accesskey "I">
|
||||
<!ENTITY menu_textReduce.label "Decrease Text Size">
|
||||
<!ENTITY menu_textReduce.accesskey "D">
|
||||
|
||||
<!ENTITY findOnCmd.label "Find in This Page...">
|
||||
<!ENTITY findOnCmd.accesskey "F">
|
||||
<!ENTITY findOnCmd.commandkey "f">
|
||||
<!ENTITY findAgainCmd.label "Find Again">
|
||||
<!ENTITY findAgainCmd.accesskey "g">
|
||||
<!ENTITY findAgainCmd.commandkey "g">
|
||||
<!ENTITY findAgainCmd.commandkey2 "VK_F3">
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
+ locale/@AB_CD@/global/editMenuOverlay.dtd (%chrome/global/editMenuOverlay.dtd)
|
||||
locale/@AB_CD@/global/filepicker.dtd (%chrome/global/filepicker.dtd)
|
||||
locale/@AB_CD@/global/filepicker.properties (%chrome/global/filepicker.properties)
|
||||
locale/@AB_CD@/global/findbar.dtd (%chrome/global/findbar.dtd)
|
||||
locale/@AB_CD@/global/findbar.properties (%chrome/global/findbar.properties)
|
||||
+ locale/@AB_CD@/global/finddialog.dtd (%chrome/global/finddialog.dtd)
|
||||
+ locale/@AB_CD@/global/finddialog.properties (%chrome/global/finddialog.properties)
|
||||
+ locale/@AB_CD@/global/intl.css (%chrome/global/intl.css)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче