From b48d29ccd265dec5b815e1c1fb5bae8701411ffc Mon Sep 17 00:00:00 2001
From: "BlakeR1234%aol.com" <BlakeR1234%aol.com>
Date: Thu, 14 Sep 2006 05:52:19 +0000
Subject: [PATCH] Fix bug 37940, implement IE-style Text Size menu. Thanks to
 jag for the help. r=jag

---
 suite/browser/navigator.js                    | 12 +++++-
 suite/browser/navigatorOverlay.xul            | 37 ++++++++++++-------
 .../en-US/chrome/browser/navigator.dtd        | 14 ++++++-
 3 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/suite/browser/navigator.js b/suite/browser/navigator.js
index 69e39e7f3b27..4eeaac5c345f 100644
--- a/suite/browser/navigator.js
+++ b/suite/browser/navigator.js
@@ -18,6 +18,7 @@
  * Rights Reserved.
  *
  * Contributor(s): 
+ *    Blake Ross <BlakeR1234@aol.com>
  */
 
 var pref = null;
@@ -1028,6 +1029,16 @@ function BrowserEditBookmarks()
     }
   }
 
+function BrowserChangeTextSize(newSize)
+  {
+
+     var oldSize = document.getElementById("menu_TextSize_Popup").getAttribute("oldsize");
+      var diff = newSize - oldSize; 
+      If (diff != 0) BrowserChangeTextZoom(diff);
+      document.getElementById("menu_TextSize_Popup").setAttribute("oldsize", newSize);           
+      
+  }
+                
   function BrowserSetDefaultCharacterSet(aCharset)
   {
     if (appCore != null) {
@@ -1664,4 +1675,3 @@ function FillInHTMLTooltip ( tipElement )
   
   return retVal;
 }
-
diff --git a/suite/browser/navigatorOverlay.xul b/suite/browser/navigatorOverlay.xul
index 138016d97202..887e95240c37 100644
--- a/suite/browser/navigatorOverlay.xul
+++ b/suite/browser/navigatorOverlay.xul
@@ -17,7 +17,7 @@ Communications Corporation. Portions created by Netscape are
 Copyright (C) 1998-1999 Netscape Communications Corporation. All
 Rights Reserved.
 
-Contributor(s): ______________________________________. -->
+Contributor(s): Blake Ross <BlakeR1234@aol.com>. -->
 
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
@@ -108,7 +108,15 @@ Contributor(s): ______________________________________. -->
 	             oncommand="BrowserChangeTextZoom(1);"/>
 	<broadcaster id="Browser:ReduceTextSize"
 	             oncommand="BrowserChangeTextZoom(-1);"/>
-
+	<broadcaster id="largestTextSizeCmd" value="&largestTextSizeCmd.label;"
+                                  accesskey="&largestTextSizeCmd.accesskey;" oncommand="BrowserChangeTextSize(5);"/>
+	<broadcaster id="largerTextSizeCmd" value="&largerTextSizeCmd.label;"
+                                  accesskey="&largerTextSizeCmd.accesskey;" oncommand="BrowserChangeTextSize(4);"/>
+	<broadcaster id="mediumTextSizeCmd" value="&mediumTextSizeCmd.label;"
+                                  accesskey="&mediumTextSizeCmd.accesskey;" oncommand="BrowserChangeTextSize(3);"/>
+	<broadcaster id="smallerTextSizeCmd" value="&smallerTextSizeCmd.label;"
+                                  accesskey="&smallerTextSizeCmd.accesskey;" oncommand="BrowserChangeTextSize(2);"/>
+	<broadcaster id="smallestTextSizeCmd" value="&smallestTextSizeCmd.label;"                                   accesskey="&smallestTextSizeCmd.accesskey;" oncommand="BrowserChangeTextSize(1);"/>
 	<broadcaster id="cmd_viewnavbar" type="checkbox" oncommand="goToggleToolbar( 'nav-bar','cmd_viewnavbar');" checked="true"/>
 	<broadcaster id="cmd_viewpersonaltoolbar" type="checkbox" oncommand="goToggleToolbar('PersonalToolbar','cmd_viewpersonaltoolbar');" checked="true"/>
 	<broadcaster id="cmd_viewtaskbar" type="checkbox" oncommand="goToggleToolbar('taskbar','cmd_viewtaskbar');" checked="true"/>
@@ -195,16 +203,18 @@ Contributor(s): ______________________________________. -->
 		  		<menuitem value="&personalbarCmd.label;" observes="cmd_viewpersonaltoolbar" />
 		  		<menuitem value="&taskbarCmd.label;" observes="cmd_viewtaskbar" />
 		  	</menupopup>
-		  </menu>
-   
+	</menu>   
       <menuseparator />
-      <menuitem value="&enlargeTextSizeCmd.label;"
-        observes="Browser:EnlargeTextSize"/>
-        <!-- key="key_enlargeTextSize" -->
-      <menuitem value="&reduceTextSizeCmd.label;"
-        observes="Browser:ReduceTextSize"/>
+	<menu id="menu_TextSize_Popup" value="&textSizeMenu.label;"                                                                                                     accesskey="&textSizeMenu.accesskey;" oldsize="3">
+		<menupopup>
+			<menuitem type="radio" observes="largestTextSizeCmd"/>
+			<menuitem type="radio" observes="largerTextSizeCmd"/>
+			<menuitem type="radio" observes="mediumTextSizeCmd" checked="true"/>
+			<menuitem type="radio" observes="smallerTextSizeCmd"/>
+			<menuitem type="radio" observes="smallestTextSizeCmd"/>
+		</menupopup>
+	</menu>
         <!-- key="key_reduceTextSize" -->
-      <menuseparator />
       <menu value="&useStyleSheetMenu.label;" disabled="true" oncommand="BrowserReload();">
         <menupopup>
           <menuitem type="radio" name="stylesheet_group"
@@ -223,10 +233,9 @@ Contributor(s): ______________________________________. -->
         </menupopup>
       </menu>
       <menuseparator />
-      <menuitem  id="menuitem-reload" value="&reloadCmd.label;" observes="canReload" />
+      <menuitem id="menuitem-reload" value="&reloadCmd.label;" observes="canReload" />
       <menuitem value="&showImagesCmd.label;" disabled="true" oncommand="BrowserReload();"/>
-      <menuitem value="&stopCmd.label;" id="menuitem-stop" 
-        oncommand="BrowserStop();"/>
+      <menuitem value="&stopCmd.label;" id="menuitem-stop" oncommand="BrowserStop();"/>
       <menuseparator />
       <menuitem value="&pageSourceCmd.label;" oncommand="BrowserViewSource();"/>
       <menuitem value="&pageInfoCmd.label;" oncommand="BrowserPageInfo();"/>
@@ -508,4 +517,4 @@ END of Deprecated -->
     <statusbarpanel class="statusbarpanel-icononly" id="security-button" tooltip="aTooltip"/>
   </statusbar>
 
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/suite/locales/en-US/chrome/browser/navigator.dtd b/suite/locales/en-US/chrome/browser/navigator.dtd
index 2a95156d1f87..803ef0fa8647 100644
--- a/suite/locales/en-US/chrome/browser/navigator.dtd
+++ b/suite/locales/en-US/chrome/browser/navigator.dtd
@@ -50,6 +50,18 @@
 <!ENTITY enlargeTextSizeCmd.commandkey "+">
 <!ENTITY reduceTextSizeCmd.label "Reduce Text Size">
 <!ENTITY reduceTextSizeCmd.commandkey "-">
+<!ENTITY textSizeMenu.label "Text Size">
+<!ENTITY textSizeMenu.accesskey "x">
+<!ENTITY largestTextSizeCmd.label "Largest">
+<!ENTITY largestTextSizeCmd.accesskey "g">
+<!ENTITY largerTextSizeCmd.label "Larger">
+<!ENTITY largerTextSizeCmd.accesskey "l">
+<!ENTITY mediumTextSizeCmd.label "Medium">
+<!ENTITY mediumTextSizeCmd.accesskey "m">
+<!ENTITY smallerTextSizeCmd.label "Smaller">
+<!ENTITY smallerTextSizeCmd.accesskey "s">
+<!ENTITY smallestTextSizeCmd.label "Smallest">
+<!ENTITY smallestTextSizeCmd.accesskey "a">
 <!ENTITY useStyleSheetMenu.label "Use Stylesheet">
 <!ENTITY useStyleSheetDefaultCmd.label "Default">
 <!ENTITY useStyleSheetEasyReadingCmd.label "Easy Reading">
@@ -319,7 +331,7 @@
 
 <!-- Statusbar -->
 <!ENTITY  statusText.label            "Document: Done">
-<!ENTITY  buildId.label               "Build ID: 2000061408">
+<!ENTITY  buildId.label               "Build ID: 2000073008">
 
 <!-- Context Menu -->                 
 <!ENTITY blockImageCmd.label          "Block Image from Loading">