From 6d11609c795811aec772c885e8d17dc3506b10dc Mon Sep 17 00:00:00 2001
From: "stephend%netscape.com" <stephend%netscape.com>
Date: Mon, 1 Oct 2001 04:54:14 +0000
Subject: [PATCH] Bug 80120.  Implement tooltips for toolbar's expand/collapse
 widgets.  r=german,jglick,sspitzer,robinf,cmanske sr=sspitzer

---
 xpfe/browser/resources/content/navigator.xul              | 5 ++++-
 xpfe/browser/resources/locale/en-US/navigator.dtd         | 3 +++
 xpfe/components/bookmarks/resources/bookmarks.xul         | 6 +++---
 .../bookmarks/resources/locale/en-US/bookmarks.dtd        | 5 +++--
 xpfe/components/console/resources/content/console.xul     | 8 +++++---
 .../components/console/resources/locale/en-US/console.dtd | 3 +++
 xpfe/components/history/resources/history.xul             | 6 ++++--
 .../components/history/resources/locale/en-US/history.dtd | 1 +
 8 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/xpfe/browser/resources/content/navigator.xul b/xpfe/browser/resources/content/navigator.xul
index 14622b29d3d0..7cf317cce754 100644
--- a/xpfe/browser/resources/content/navigator.xul
+++ b/xpfe/browser/resources/content/navigator.xul
@@ -133,9 +133,11 @@ Contributor(s): ______________________________________. -->
 
   <toolbox id="navigator-toolbox" class="toolbox-top" deferattached="true">
     <!-- Menu -->
-    <menubar id="main-menubar" persist="collapsed"/>
+    <menubar id="main-menubar" persist="collapsed"
+             grippytooltip="aTooltip" grippytooltiptext="&menuBar.tooltip;"/>
 
     <toolbar class="toolbar-primary chromeclass-toolbar" id="nav-bar" persist="collapsed" 
+             grippytooltip="aTooltip" grippytooltiptext="&navigationToolbar.tooltip;"
              tbalign="stretch">
       <hbox id="nav-bar-buttons">
         <toolbarbutton id="back-button" type="menu-button" class="toolbarbutton-1"
@@ -226,6 +228,7 @@ Contributor(s): ______________________________________. -->
              ondragdrop="nsDragAndDrop.drop(event, personalToolbarObserver);"
              ondraggesture="nsDragAndDrop.startDrag(event, personalToolbarObserver);"
              ondragexit="nsDragAndDrop.dragExit(event, personalToolbarObserver);"
+             grippytooltip="aTooltip" grippytooltiptext="&personalToolbar.tooltip;"
              tbalign="stretch">
 
       <toolbarbutton id="home-button" class="bookmark-item"
diff --git a/xpfe/browser/resources/locale/en-US/navigator.dtd b/xpfe/browser/resources/locale/en-US/navigator.dtd
index 88af2940f186..2ccb5c89c548 100644
--- a/xpfe/browser/resources/locale/en-US/navigator.dtd
+++ b/xpfe/browser/resources/locale/en-US/navigator.dtd
@@ -269,6 +269,9 @@
 <!ENTITY URIDispatchingDisableCmd.label "Disable Dispatching">
 <!-- LOCALIZATION NOTE END : DO not localize the entities above; QA --> 
 
+<!ENTITY menuBar.tooltip                  "Menu Bar">
+<!ENTITY personalToolbar.tooltip          "Personal Toolbar">
+<!ENTITY navigationToolbar.tooltip        "Navigation Toolbar">
 
 <!-- Toolbar items --> 
 <!ENTITY backButton.label             "Back">
diff --git a/xpfe/components/bookmarks/resources/bookmarks.xul b/xpfe/components/bookmarks/resources/bookmarks.xul
index ea78978e9577..9de003fef5d4 100644
--- a/xpfe/components/bookmarks/resources/bookmarks.xul
+++ b/xpfe/components/bookmarks/resources/bookmarks.xul
@@ -74,6 +74,7 @@
   <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksDD.js"/>
 
   <popupset id="bookmarksPopupset"/>
+  <popupset id="aTooltipSet"/>
 
   <commands id="commands">
     <commandset id="CommandUpdate_Bookmarks"
@@ -85,7 +86,6 @@
     <commandset id="tasksCommands"/>
     <commandset id="bookmarksItems"/>
   
-
     <!-- File Menu -->
     <command id="cmd_newNavigator"/>
     <command id="cmd_newEditor"/>
@@ -128,7 +128,7 @@
   </keyset>
   
   <toolbox id="bookmarks-toolbox">
-    <menubar id="main-menubar" grippy="false">
+    <menubar id="main-menubar" grippytooltip="aTooltip" grippytooltiptext="&menuBar.tooltip;">
       <menu id="menu_File">
         <menupopup id="menu_FilePopup" onpopupshowing="updateSendLinkItem();">
           <menuitem label="&command.newBookmark.label;" 
@@ -233,7 +233,7 @@
       <menu id="menu_Help"/>
     </menubar>
 
-    <toolbar id="command-toolbar" tbalign="stretch" grippy="false">
+    <toolbar id="command-toolbar" tbalign="stretch" grippytooltip="aTooltip" grippytooltiptext="&bookmarkToolbar.tooltip;">
       <toolbarbutton id="newfolder" label="&command.newFolder.label;" 
               command="cmd_newfolder"/>
       <toolbarbutton id="newseparator" label="&command.newSeparator.label;" 
diff --git a/xpfe/components/bookmarks/resources/locale/en-US/bookmarks.dtd b/xpfe/components/bookmarks/resources/locale/en-US/bookmarks.dtd
index a70bbd4f3071..5b9dacf217d8 100644
--- a/xpfe/components/bookmarks/resources/locale/en-US/bookmarks.dtd
+++ b/xpfe/components/bookmarks/resources/locale/en-US/bookmarks.dtd
@@ -22,7 +22,8 @@
   --> 
 
 <!-- extracted from ./bookmarks.xul -->
-
+<!ENTITY menuBar.tooltip               "Menu Bar">
+<!ENTITY bookmarkToolbar.tooltip       "Bookmark Toolbar">
 <!ENTITY command.newBookmark.label     "New Bookmark">
 <!ENTITY command.newBookmark.accesskey "b">
 <!ENTITY command.newFolder.label       "New Folder">
@@ -72,5 +73,5 @@
 <!ENTITY tree.header.lastmod.label      "Last Modified">
 <!ENTITY tree.header.lastvisit.label    "Last Visited">
 <!ENTITY tree.header.description.label  "Description">
-<!ENTITY bookmarksWindowTitle.label	    "Bookmarks">
+<!ENTITY bookmarksWindowTitle.label     "Bookmarks">
 
diff --git a/xpfe/components/console/resources/content/console.xul b/xpfe/components/console/resources/content/console.xul
index b82ea93dfdef..9ebceae16deb 100644
--- a/xpfe/components/console/resources/content/console.xul
+++ b/xpfe/components/console/resources/content/console.xul
@@ -47,6 +47,8 @@ Contributor(s): Joe Hewitt <hewitt@netscape.com>
 <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
 <script type="application/x-javascript" src="chrome://global/content/console.js"/>
 
+<popupset id="aTooltipSet"/>
+
 <stringbundle id="ConsoleBundle" src="chrome://global/locale/console.properties"/>
 <commandset id="tasksCommands"/>
 <command id="cmd_copy"/>
@@ -98,7 +100,7 @@ Contributor(s): Joe Hewitt <hewitt@netscape.com>
 </popupset>
   
 <toolbox>
-  <menubar id="main-menubar" class="chromeclass-menubar">
+  <menubar id="main-menubar" class="chromeclass-menubar" grippytooltip="aTooltip" grippytooltiptext="&menuBar.tooltip;">
     <menu id="menu_File">
       <menupopup id="menu_FilePopup">
         <menuitem id="menu_close"/>
@@ -133,7 +135,7 @@ Contributor(s): Joe Hewitt <hewitt@netscape.com>
     <menu id="menu_Help"/>
   </menubar>
 
-  <toolbar id="ToolbarMode">
+  <toolbar id="ToolbarMode" grippytooltip="aTooltip" grippytooltiptext="&modeToolbar.tooltip;">
     <toolbarbutton observes="Console:modeAll"/>
     <toolbarbutton observes="Console:modeErrors"/>
     <toolbarbutton observes="Console:modeWarnings"/>
@@ -142,7 +144,7 @@ Contributor(s): Joe Hewitt <hewitt@netscape.com>
     <toolbarbutton observes="Console:clear"/>
   </toolbar>
   
-  <toolbar id="ToolbarEval">
+  <toolbar id="ToolbarEval" grippytooltip="aTooltip" grippytooltiptext="&entryToolbar.tooltip;">
     <textbox id="TextboxEval" class="toolbar" value="" onkeypress="onEvalKeyPress(event)" flex="1"/>
     <toolbarbutton id="ButtonEval" label="&evaluate.label;" oncommand="evaluateTypein()"/>
   </toolbar>
diff --git a/xpfe/components/console/resources/locale/en-US/console.dtd b/xpfe/components/console/resources/locale/en-US/console.dtd
index 7e5cb4973172..c09793de8b21 100644
--- a/xpfe/components/console/resources/locale/en-US/console.dtd
+++ b/xpfe/components/console/resources/locale/en-US/console.dtd
@@ -20,6 +20,9 @@ Contributor(s): ______________________________________. -->
 
 <!ENTITY console.title "JavaScript Console">
 
+<!ENTITY menuBar.tooltip      "Menu Bar">
+<!ENTITY modeToolbar.tooltip  "Mode Toolbar">
+<!ENTITY entryToolbar.tooltip "Javascript Entry Toolbar">
 <!ENTITY errFile.label   "Source File:">
 <!ENTITY errLine.label   "Line:">
 <!ENTITY errColumn.label "Column:">
diff --git a/xpfe/components/history/resources/history.xul b/xpfe/components/history/resources/history.xul
index 552cf824dc90..2147d7e3e585 100644
--- a/xpfe/components/history/resources/history.xul
+++ b/xpfe/components/history/resources/history.xul
@@ -44,7 +44,9 @@
   <stringbundle id="historyBundle"
                 src="chrome://communicator/locale/history/history.properties"/>
   <stringbundle id="sortBundle" src="chrome://global/locale/nsOutlinerSorting.properties"/>
-
+  
+  <popupset id="aTooltipSet"/>
+  
 <commandset id="tasksCommands">
   <commandset id="selectEditMenuItems"/>
   <commandset id="globalEditMenuItems"/>
@@ -87,7 +89,7 @@
 <popupset id="historyContextMenu"/>
 
 <toolbox id="history-toolbox">
-<menubar id="history-menu">
+<menubar id="history-menu" grippytooltip="aTooltip" grippytooltiptext="&menuBar.tooltip;">
   <menu id="menu_File">
     <menupopup id="menu_FilePopup">
       <menu id="menu_New">
diff --git a/xpfe/components/history/resources/locale/en-US/history.dtd b/xpfe/components/history/resources/locale/en-US/history.dtd
index 2fa458026a57..3b28ebf35e81 100644
--- a/xpfe/components/history/resources/locale/en-US/history.dtd
+++ b/xpfe/components/history/resources/locale/en-US/history.dtd
@@ -1,5 +1,6 @@
 <!-- extracted from ./history.xul -->
 
+<!ENTITY menuBar.tooltip            "Menu Bar">
 <!ENTITY fileMenu.label             "File">
 <!ENTITY closeCmd.label             "Close">
 <!ENTITY editMenu.label             "Edit">