Bug 270629: Add printBtn.label, and fix some other errors. p=stefan_h@hem.utfors.se, r=neil, sr=jag

This commit is contained in:
steffen.wilberg%web.de 2004-12-16 22:11:36 +00:00
parent 05ecdea242
commit 420b33c9e4
4 changed files with 51 additions and 64 deletions

View File

@ -9,15 +9,7 @@
<?xul-overlay href="chrome://navigator/content/platformNavigationBindings.xul"?>
<?xul-overlay href="chrome://communicator/content/viewZoomOverlay.xul"?>
<!DOCTYPE window [
<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
%brandDTD;
<!ENTITY % helpDTD SYSTEM "chrome://help/locale/help.dtd" >
%helpDTD;
<!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" >
%navigatorDTD;
]>
<!DOCTYPE window SYSTEM "chrome://help/locale/help.dtd">
<window id="help"
windowtype="mozilla:help"
@ -71,12 +63,8 @@
key="&findAgainCmd.commandkey;" oncommand="find(true, false);" modifiers="accel"/>
<key id="key_findPrev"
key="&findPrevCmd.commandkey;" oncommand="find(true, true);" modifiers="accel, shift"/>
<key id="key_findAgain2" keycode="&findAgainCmd.commandkey2;" oncommand="find(true, false);" />
<key id="key_findAgain2" keycode="&findAgainCmd.commandkey2;" oncommand="find(true, false);"/>
<key id="key_findPrev2" keycode="&findPrevCmd.commandkey2;" oncommand="find(true, true);" modifiers="shift"/>
<key id="key_viewSource" key="&pageSourceCmd.commandkey;"
oncommand="BrowserViewSource();" modifiers="accel"/>
<key id="key_viewInfo" key="&pageInfoCmd.commandkey;"
oncommand="BrowserPageInfo();" modifiers="accel"/>
<key id="key_viewNextHelpPanel" keycode="VK_TAB" oncommand="showRelativePanel(true);" modifiers="control"/>
<key id="key_viewPrevHelpPanel" keycode="VK_TAB" oncommand="showRelativePanel(false);" modifiers="control,shift"/>
</keyset>
@ -92,26 +80,26 @@
tbalign="stretch" persist="collapsed">
<toolbarbutton id="helpBackButton" type="menu-button" class="toolbarbutton-1"
label="&backBtn.label;"
label="&backButton.label;"
oncommand="if (event.target==this) goBack(); else gotoHistoryIndex(event);"
observes="canGoBack" context="backMenu"
tooltiptext="&backButton.tooltip;">
<menupopup context="" onpopupshowing="createBackMenu(event);"/>
</toolbarbutton>
<toolbarbutton id="helpForwardButton" type="menu-button" class="toolbarbutton-1"
label="&fwdBtn.label;"
label="&forwardButton.label;"
tooltiptext="&forwardButton.tooltip;"
oncommand="if (event.target==this) goForward(); else gotoHistoryIndex(event);"
observes="canGoForward" context="forwardMenu">
<menupopup context="" onpopupshowing="createForwardMenu(event);"/>
</toolbarbutton>
<toolbarbutton id="helpHomeButton" class="toolbarbutton-1"
label="&homeBtn.label;" oncommand="goHome();"
tooltiptext="&homeBtn.tooltip;"/>
label="&homeButton.label;" oncommand="goHome();"
tooltiptext="&homeButton.tooltip;"/>
<spacer flex="1"/>
<toolbarbutton id="print" class="toolbarbutton-1"
<toolbarbutton id="helpPrintButton" class="toolbarbutton-1"
label="&printButton.label;" oncommand="print();"
tooltiptext="&printButton.tooltip;"/>
@ -141,13 +129,13 @@
<content uri="?uri"/>
<triple subject="?uri"
predicate="http://home.netscape.com/NC-rdf#subheadings"
object="?subheadings" />
object="?subheadings"/>
<member container="?subheadings" child="?subheading"/>
</conditions>
<bindings>
<binding subject="?subheading"
predicate="http://home.netscape.com/NC-rdf#name"
object="?name" />
object="?name"/>
</bindings>
<action>
@ -185,13 +173,13 @@
<content uri="?uri"/>
<triple subject="?uri"
predicate="http://home.netscape.com/NC-rdf#subheadings"
object="?subheadings" />
object="?subheadings"/>
<member container="?subheadings" child="?subheading"/>
</conditions>
<bindings>
<binding subject="?subheading"
predicate="http://home.netscape.com/NC-rdf#name"
object="?name" />
object="?name"/>
</bindings>
<action>
@ -239,13 +227,13 @@
<rule>
<conditions>
<content uri="?uri"/>
<member container="?uri" child="?subheading" />
<member container="?uri" child="?subheading"/>
</conditions>
<bindings>
<binding subject="?subheading"
predicate="http://home.netscape.com/NC-rdf#name"
object="?name" />
object="?name"/>
</bindings>
<action>
@ -286,14 +274,14 @@
<content uri="?uri"/>
<triple subject="?uri"
predicate="http://home.netscape.com/NC-rdf#subheadings"
object="?subheadings" />
object="?subheadings"/>
<member container="?subheadings" child="?subheading"/>
</conditions>
<bindings>
<binding subject="?subheading"
predicate="http://home.netscape.com/NC-rdf#name"
object="?name" />
object="?name"/>
</bindings>
<action>

View File

@ -1,31 +1,30 @@
<!ENTITY helpWin.ttl "&brandShortName; Help" >
<!-- Toolbar -->
<!ENTITY backButton.label "Back">
<!ENTITY backButton.tooltip "Go back one page">
<!ENTITY forwardButton.label "Forward">
<!ENTITY forwardButton.tooltip "Go forward one page">
<!ENTITY helpThrobber.tooltip "Go to the Help and Support Center">
<!ENTITY homeButton.label "Home">
<!ENTITY homeButton.tooltip "Help and Support Center">
<!ENTITY printButton.tooltip "Print this page">
<!ENTITY printButton.label "Print">
<!ENTITY toolbar.tooltip "Help Toolbar">
<!ENTITY toolbar.tooltip "Help Toolbar" >
<!ENTITY backBtn.label "Back" >
<!ENTITY fwdBtn.label "Forward" >
<!ENTITY homeBtn.label "Home" >
<!ENTITY backBtn.tooltip "Back" >
<!ENTITY fwdBtn.tooltip "Forward" >
<!ENTITY homeBtn.tooltip "Help Home Page" >
<!ENTITY tab1.label "Contents">
<!ENTITY tab2.label "Index">
<!-- added bt PW 1/29/02- please check for correctness-->
<!ENTITY searchtab.label "Search">
<!ENTITY searchtab.accesskey "S">
<!ENTITY searchbtn.label "Find">
<!ENTITY toctab.label "Contents">
<!ENTITY toctab.accesskey "C">
<!ENTITY indextab.label "Index">
<!ENTITY indextab.accesskey "I">
<!ENTITY ixname.label "Name">
<!ENTITY glossarytab.label "Glossary">
<!ENTITY glossarytab.accesskey "G">
<!ENTITY glossname.label "Name">
<!-- added IO 2/7/01 -->
<!ENTITY gobtn.label "Search">
<!ENTITY name.label "Item">
<!ENTITY helpThrobber.tooltip "Go to the Help Home Page">
<!-- Left panel -->
<!ENTITY glossarytab.label "Glossary">
<!ENTITY glossarytab.accesskey "G">
<!ENTITY gobtn.label "Search">
<!ENTITY indextab.label "Index">
<!ENTITY indextab.accesskey "I">
<!ENTITY searchtab.label "Search">
<!ENTITY searchtab.accesskey "S">
<!ENTITY toctab.label "Contents">
<!ENTITY toctab.accesskey "C">
<!-- Command keys -->
<!ENTITY findAgainCmd.commandkey "g">
<!ENTITY findAgainCmd.commandkey2 "VK_F3">
<!ENTITY findPrevCmd.commandkey "g">
<!ENTITY findPrevCmd.commandkey2 "VK_F3">
<!ENTITY findOnCmd.commandkey "f">
<!ENTITY printCmd.commandkey "p">

View File

@ -75,20 +75,20 @@
-moz-image-region: rect(20px 76px 40px 57px) !important;
}
#print {
#helpPrintButton {
list-style-image: url("chrome://communicator/skin/icons/btn1.gif");
-moz-image-region: rect(0px 23px 21px 0px);
}
#print:hover {
#helpPrintButton:hover {
-moz-image-region: rect(0px 46px 21px 23px);
}
#print:hover:active {
#helpPrintButton:hover:active {
-moz-image-region: rect(0px 69px 21px 46px);
}
#print[disabled="true"] {
#helpPrintButton[disabled="true"] {
-moz-image-region: rect(0px 92px 21px 69px) !important;
}

View File

@ -114,20 +114,20 @@
list-style-image: url("chrome://communicator/skin/help/home-dis.gif") !important;
}
#print {
#helpPrintButton {
list-style-image: url("chrome://communicator/skin/icons/btn1.gif");
-moz-image-region: rect(0, 49px, 33px, 0);
}
#print:hover {
#helpPrintButton:hover {
-moz-image-region: rect(0, 99px, 33px, 50px);
}
#print:hover:active {
#helpPrintButton:hover:active {
-moz-image-region: rect(0, 149px, 33px, 100px);
}
#print[disabled="true"] {
#helpPrintButton[disabled="true"] {
-moz-image-region: rect(0, 199px, 33px, 150px) !important;
}