From bbcfe20c5474b3cbe33694f984e8d8c69a0351f9 Mon Sep 17 00:00:00 2001
From: "erik%netscape.com"
 <erik%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 2 Apr 2000 21:58:08 +0000
Subject: [PATCH] bug 30022; added SetTextZoom and some UI stuff for that

git-svn-id: svn://10.0.0.236/trunk@64959 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../browser/public/nsIBrowserInstance.idl     |  1 +
 .../browser/resources/content/navigator.js    | 12 +++++++++
 .../resources/content/navigatorOverlay.xul    | 24 +++++++++++++++---
 .../resources/locale/en-US/navigator.dtd      |  2 ++
 .../xpfe/browser/src/nsBrowserInstance.cpp    | 25 +++++++++++++++++++
 5 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/mozilla/xpfe/browser/public/nsIBrowserInstance.idl b/mozilla/xpfe/browser/public/nsIBrowserInstance.idl
index 80b97a23957..0bdf9f2cfbc 100644
--- a/mozilla/xpfe/browser/public/nsIBrowserInstance.idl
+++ b/mozilla/xpfe/browser/public/nsIBrowserInstance.idl
@@ -53,6 +53,7 @@ interface nsIBrowserInstance : nsISupports {
     void init();
     void setContentWindow( in nsIDOMWindow aWindow );
     void setWebShellWindow( in nsIDOMWindow aWindow );
+    void setTextZoom( in float aTextZoom );
     void SetDocumentCharset(in wstring charset);
     
     // File.
diff --git a/mozilla/xpfe/browser/resources/content/navigator.js b/mozilla/xpfe/browser/resources/content/navigator.js
index aab1ed5c904..a747dea46db 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.js
+++ b/mozilla/xpfe/browser/resources/content/navigator.js
@@ -46,6 +46,7 @@ catch (ex) {
   var overLink = null; 
   var explicitURL = false;
   var statusTextFld = null;
+  var textZoom = 1.0;
 
 
 function UpdateHistory(event)
@@ -801,6 +802,17 @@ function BrowserEditBookmarks()
     }
   }
 
+  function BrowserChangeTextZoom(aChange)
+  {
+    if (appCore != null) {
+      textZoom += (aChange * 0.1);
+      if (textZoom < 0.1) {
+        textZoom = 0.1;
+      }
+      appCore.setTextZoom(textZoom);
+    }
+  }
+
   function BrowserSetDefaultCharacterSet(aCharset)
   {
     if (appCore != null) {
diff --git a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
index 06367844bd2..29eeb9c9547 100644
--- a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
+++ b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
@@ -51,6 +51,14 @@ Contributor(s): ______________________________________. -->
 	<key id="key_selectAll"/>
 	<key id="key_preferences"/>
 
+	<!-- View Menu -->
+	<key id="key_enlargeTextSize" xulkey="true"
+	     key="&enlargeTextSizeCmd.commandkey;"
+	     observes="Browser:EnlargeTextSize"/>
+	<key id="key_reduceTextSize" xulkey="true"
+	     key="&reduceTextSizeCmd.commandkey;"
+	     observes="Browser:ReduceTextSize"/>
+
 	<key id="goForwardKb"         xulkey="true" key="&goForwardCmd.commandkey;" observes="Browser:GoForward" />
 	<key id="goBackwardKb"        xulkey="true" key="&goBackCmd.commandkey;" observes="Browser:GoBackwards" />
     <key id="goHomeKb"            xulkey="true" key="&goHomeCmd.commandkey;" observes="Browser:GoHome" />
@@ -83,6 +91,12 @@ Contributor(s): ______________________________________. -->
 	<broadcaster id="cmd_selectAll"/>
 	<broadcaster id="cmd_preferences"/>
 	
+	<!-- View Menu -->
+	<broadcaster id="Browser:EnlargeTextSize"
+	             oncommand="BrowserChangeTextZoom(1);"/>
+	<broadcaster id="Browser:ReduceTextSize"
+	             oncommand="BrowserChangeTextZoom(-1);"/>
+
 	<broadcaster id="cmd_viewnavbar" oncommand="goToggleToolbar( 'nav-bar','cmd_viewnavbar');" checked="true"/>
 	<broadcaster id="cmd_viewpersonaltoolbar"  oncommand="goToggleToolbar('PersonalToolbar','cmd_viewpersonaltoolbar');" checked="true"/>
 	<broadcaster id="cmd_viewtaskbar" oncommand="goToggleToolbar('taskbar','cmd_viewtaskbar');" checked="true"/>
@@ -181,10 +195,12 @@ Contributor(s): ______________________________________. -->
 		  </menu>
    
       <menuseparator />
-      <menuitem value="&enlargeTextSizeCmd.label;" disabled="true"
-        oncommand="BrowserReload();"/>
-      <menuitem value="&reduceTextSizeCmd.label;" disabled="true"
-        oncommand="BrowserReload();"/>
+      <menuitem value="&enlargeTextSizeCmd.label;"
+        key="key_enlargeTextSize"
+        observes="Browser:EnlargeTextSize"/>
+      <menuitem value="&reduceTextSizeCmd.label;"
+        key="key_reduceTextSize"
+        observes="Browser:ReduceTextSize"/>
       <menuseparator />
       <menu value="&useStyleSheetMenu.label;" disabled="true" oncommand="BrowserReload();">
         <menupopup>
diff --git a/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd b/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd
index 6776892d386..382375c6b7d 100644
--- a/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd
+++ b/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd
@@ -47,7 +47,9 @@
 <!ENTITY personalbarCmd.label "Personal Toolbar">
 <!ENTITY taskbarCmd.label "Taskbar">
 <!ENTITY enlargeTextSizeCmd.label "Enlarge Text Size">
+<!ENTITY enlargeTextSizeCmd.commandkey "+">
 <!ENTITY reduceTextSizeCmd.label "Reduce Text Size">
+<!ENTITY reduceTextSizeCmd.commandkey "-">
 <!ENTITY useStyleSheetMenu.label "Use Stylesheet">
 <!ENTITY useStyleSheetDefaultCmd.label "Default">
 <!ENTITY useStyleSheetEasyReadingCmd.label "Easy Reading">
diff --git a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp
index 91a5ba28529..c5f66c84560 100644
--- a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp
+++ b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp
@@ -242,6 +242,31 @@ nsBrowserAppCore::Init()
   return rv;
 }
 
+NS_IMETHODIMP    
+nsBrowserAppCore::SetTextZoom(float aTextZoom)
+{
+  nsCOMPtr<nsIScriptGlobalObject> globalObj( do_QueryInterface(mContentWindow) );
+  if (!globalObj) {
+    return NS_ERROR_FAILURE;
+  }
+
+  nsCOMPtr<nsIDocShell> docShell;
+  globalObj->GetDocShell(getter_AddRefs(docShell));
+  if (docShell) 
+  {
+    nsCOMPtr<nsIContentViewer> childCV;
+    NS_ENSURE_SUCCESS(docShell->GetContentViewer(getter_AddRefs(childCV)), NS_ERROR_FAILURE);
+    if (childCV) 
+    {
+      nsCOMPtr<nsIMarkupDocumentViewer> markupCV = do_QueryInterface(childCV);
+      if (markupCV) {
+        NS_ENSURE_SUCCESS(markupCV->SetTextZoom(aTextZoom), NS_ERROR_FAILURE);
+      }
+    }
+  }
+  return NS_OK;
+}
+
 NS_IMETHODIMP    
 nsBrowserAppCore::SetDocumentCharset(const PRUnichar *aCharset)
 {