From 625443019643427d260138881262e11fd083d429 Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com" <blakeross%telocity.com>
Date: Mon, 1 Jan 2001 04:25:06 +0000
Subject: [PATCH] Fix 60005: prefs UI for showing and hiding tooltips.
 r=timeless sr=alecf

---
 modules/libpref/src/init/all.js                    |  1 +
 .../resources/content/pref-appearance.xul          | 14 ++++++++++----
 .../resources/locale/en-US/pref-appearance.dtd     |  4 +++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 1302367835c..af658c8e7e1 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -50,6 +50,7 @@ pref("general.fullcircle_collect_ns_data",  false);
 
 pref("general.open_location.last_url",      "");
 
+pref("browser.chrome.toolbar_tips",         true);
 pref("browser.enable_style_sheets",         true);
 // 0 = blank, 1 = home (browser.startup.homepage), 2 = last
 pref("browser.startup.page",                1);     
diff --git a/xpfe/components/prefwindow/resources/content/pref-appearance.xul b/xpfe/components/prefwindow/resources/content/pref-appearance.xul
index b8f6a5d5354..a649bb374b2 100644
--- a/xpfe/components/prefwindow/resources/content/pref-appearance.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-appearance.xul
@@ -32,17 +32,17 @@
 %prefAppearanceDTD;
 ]>
 <window xmlns:html="http://www.w3.org/1999/xhtml"
-    		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="color-dialog"
-    		orient="vertical"
-  		  onload="parent.initPanel(panel);">
+        orient="vertical"
+        onload="parent.initPanel(panel);">
 
   <script language="JavaScript">
   <![CDATA[
     var panel = "chrome://communicator/content/pref/pref-appearance.xul";
     // the first elements in this array will be poked from chromeregistry loaded
     // overlays once overlays.rdf works properly 
-    _elementIDs = ["generalStartupBrowser", /*"toolbarStyle" */];
+    var _elementIDs = ["generalStartupBrowser", /*"toolbarStyle" */, "showHideTooltips"];
   ]]>
   </script>
           
@@ -71,5 +71,11 @@
       <radio group="toolbarStyle" data="1" value="&textonlyRadio.label;" accesskey="&textonlyRadio.accesskey;"/>
     </radiogroup>
   </titledbox>
+  <box autostretch="never">
+    <checkbox id="showHideTooltips" value="&showHideTooltips.label;"
+              accesskey="&showHideTooltips.accesskey;" pref="true"
+              preftype="bool" prefstring="browser.chrome.toolbar_tips"
+              prefattribute="checked"/>
+  </box>
 
 </window>
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd
index 7749adc6dde..0cea7e398e1 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd
@@ -23,4 +23,6 @@
 <!ENTITY picsOnlyRadio.label "Pictures only">
 <!ENTITY picsOnlyRadio.accesskey "o">
 <!ENTITY textonlyRadio.label "Text only">
-<!ENTITY textonlyRadio.accesskey "t">
+<!ENTITY textonlyRadio.accesskey "x">
+<!ENTITY showHideTooltips.label "Show Tooltips.">
+<!ENTITY showHideTooltips.accesskey "t">