Bug 1251874 - Allow modification of minimum/maximum zoom levels in Content preference pane. r=IanN, ui-r=Ratty, a=Ratty CLOSED TREE
authorrsx11m <rsx11m.pub@gmail.com>
Mon, 14 Mar 2016 08:25:47 -0500
changeset 8589 1aaa20e835195b6d012aa77b3bb12b82c2892784
parent 8588 ea39931fb02e4e3522a18d953e02e9250fbacbd7
child 8590 e0e906821b4d10adc5cf637876e2e4dac7394610
push id1
push useraxel@mozilla.com
push dateTue, 10 Oct 2017 22:14:06 +0000
reviewersIanN, Ratty, Ratty
bugs1251874
Bug 1251874 - Allow modification of minimum/maximum zoom levels in Content preference pane. r=IanN, ui-r=Ratty, a=Ratty CLOSED TREE X-Channel-Repo: comm-central X-Channel-Converted-Revision: b654ace3f360c939b4ee6aadde86425180dc416a
suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
suite/chrome/common/help/shortcuts_navigator.xhtml
suite/chrome/common/pref/pref-content.dtd
--- a/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
@@ -93,70 +93,72 @@
     subcategories are visible, double-click Appearance to expand the
     list.)</li>
 </ol>
 
 <p>The Content preferences panel allows you to change settings that influence
   how website and message content appears in &brandShortName;.</p>
 
 <ul>
-  <li>Website Icons:
+  <li><strong>Website icons</strong>:
     <ul>
       <li><strong>Show website icons</strong>: Select this if you want see
         site-specific icons, if available, in place of the bookmark icon
         <img src="chrome://communicator/skin/bookmarks/bookmark-item.png"
         alt="Bookmark item icon"/>. Website icons are shown to the left of the
         Location Bar and Browser tabs.</li>
-      <li><strong>Aggressively look for website icons when the page does not
+      <li><strong>Aggressively look for website icons when the page doesn&apos;t
         define one</strong>: If the page itself does not define a website
         icon, turning on this setting makes &brandShortName; look for a
         &quot;favicon&quot; on the server and use that instead.</li>
-      <li>Display website icons in bookmarks menu and toolbar:
-        <ul>
-          <li><strong>Never show icons for bookmarks</strong>: Select this if
-            you only want to see the default icons but not the website&apos;s
-            own icon in the bookmarks menu or the personal toolbar.</li>
-          <li><strong>Only when website was loaded recently</strong>: Select
-            this to show the website&apos;s own icon only if the website has
-            been recently loaded and the icon is currently in the
-            browser&apos;s cache.</li>
-          <li><strong>Always load website icons for bookmarks</strong>: Select
-            this to always load website icons to be displayed in the bookmarks
-            menu or personal toolbar, even if it&apos;s not in the cache.</li>
-        </ul>
-      </li>
+    </ul>
+  </li>
+  <li><strong>Scrolling</strong>:
+    <ul>
+      <li><strong>Use autoscrolling</strong>: Select this to enable
+        autoscrolling.  Clicking the middle mouse button (usually the scroll
+        wheel) lets you scroll the content by moving the mouse around.</li>
+      <li><strong>Use smooth scrolling</strong>: Select this to enable smooth
+        scrolling. Pressing the Page Down key when this is enabled
+        will&mdash;instead of an immediate jump&mdash;smoothly scroll the
+        content down to the next page.</li>
     </ul>
   </li>
-  <li><strong>Use autoscrolling</strong>: Select this to enable autoscrolling.
-    Clicking the middle mouse button (usually the scroll wheel) lets you scroll
-    the content by moving the mouse around.</li>
-  <li><strong>Use smooth scrolling</strong>: Select this to enable smooth
-    scrolling. Pressing the Page Down key when this is enabled
-    will&mdash;instead of an immediate jump&mdash;smoothly scroll the content
-    down to the next page.</li>
+  <li><strong>Zoom options</strong>:
+    <ul>
+      <li><strong>Range from [__] to [__] %</strong>: Defines the range of zoom
+        levels observed when opening the Zoom menu from the View main menu or
+        when using the <a href="cs_nav_prefs_advanced.xhtml#mouse_wheel">mouse
+        wheel</a> or the
+        <a href="shortcuts_navigator.xhtml#page_viewing_shortcuts"> keyboard
+        shortcuts</a> to increase or decrease the zoom. <strong>Note</strong>:
+        after changing these values, they become effective only for
+        <em>new</em> windows, not in the ones which are already open.</li>
+      <li><strong>Zoom only text instead of full pages</strong>: Select this if
+        you want &brandShortName; to only resize text of websites when using
+        the &quot;Zoom&quot; function. If this is not selected, the whole page,
+        including images, will be zoomed.</li>
+      <li><strong>Remember zoom levels on a per-site basis</strong>: Select
+        this if you want the system to remember the specific zoom level for
+        each website you visit.</li>
+      <li><strong>Resize large images to fit in the browser window</strong>:
+        Select this if you want &brandShortName; to automatically shrink large
+        stand-alone images so they will fit in the browser window. Clicking on
+        the resized image will make it appear at full size.</li>
+    </ul>
+  </li>
   <li><strong>Use hardware acceleration when available</strong>: Select this to
     let &brandShortName; use hardware acceleration (if available) to render web
     sites. If you experience problems with the visual presentation of web
     content, disabling hardware acceleration may solve the issue.</li>
-  <li><strong>Resize large images to fit in the browser window</strong>: Select
-    this if you want &brandShortName; to automatically shrink large stand-alone
-    images so they will fit in the browser window. Clicking on the resized
-    image will make it appear at full size.</li>
-  <li><strong>Zoom only text instead of full pages</strong>: Select this if you
-    want &brandShortName; to only resize text of websites when using the
-    &quot;Zoom&quot; function. If this is not selected, the whole page,
-    including images, will be zoomed.</li>
   <li><strong>Warn me when websites try to redirect or reload the
     page</strong>: Select this to let &brandShortName; block automatic meta
     redirection (HTTP-EQUIV=refresh) requests by default. When a redirect is
     supposed to be executed, a notification bar is shown instead which allows
     you to permit the redirect on a case-by-case basis.</li>
-  <li><strong>Remember zoom levels on a per-site basis</strong>: Select
-    this if you want the system to remember the specific zoom level for
-    each website you visit.</li>
 </ul>
 
 <p><strong>Note</strong>: See the separate preferences panels for colors, fonts
   and languages to further customize content appearance and the Privacy &amp;
   Security section for privacy-related settings that also might influence how
   content appears to you.</p>
 
 <p>[<a href="#appearance_preferences">Return to beginning of section</a>]</p>
--- a/suite/chrome/common/help/shortcuts_navigator.xhtml
+++ b/suite/chrome/common/help/shortcuts_navigator.xhtml
@@ -327,19 +327,19 @@
   <tr>
     <td>Zoom Text Larger</td>
     <td>Ctrl++ (plus sign)</td>
     <td>Cmd++ (plus sign)</td>
     <td>Ctrl++ (plus sign)</td>
   </tr>
   <tr>
     <td>No zoom (100%)</td>
-    <td>Ctrl+0</td>
-    <td>Cmd+0</td>
-    <td>Ctrl+0</td>
+    <td>Ctrl+0 (zero)</td>
+    <td>Cmd+0 (zero)</td>
+    <td>Ctrl+0 (zero)</td>
   </tr>
   <tr>
     <td>View Page Information</td>
     <td>Ctrl+I</td>
     <td>Cmd+I</td>
     <td>Ctrl+I</td>
   </tr>
   <tr>
--- a/suite/chrome/common/pref/pref-content.dtd
+++ b/suite/chrome/common/pref/pref-content.dtd
@@ -1,28 +1,43 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!--LOCALIZATION NOTE : FILE The Appearance > Content prefs dialog.  -->
 
 <!ENTITY pref.content.title                     "Content">
 <!ENTITY pref.content.description               "These settings influence how website and message content appears in &brandShortName;.">
+
 <!ENTITY siteIcons.label                        "Website icons">
 <!ENTITY useSiteIcons.label                     "Show website icons">
 <!ENTITY useSiteIcons.accesskey                 "S">
-<!ENTITY useFavIcons.label                      "Aggressively look for website icons when the page does not define one">
+<!ENTITY useFavIcons.label                      "Aggressively look for website icons when the page doesn&apos;t define one">
 <!ENTITY useFavIcons.accesskey                  "A">
-<!ENTITY enableAutomaticImageResizing.label     "Resize large images to fit in the browser window">
-<!ENTITY enableAutomaticImageResizing.accesskey "R">
+
 <!ENTITY scrolling.label                        "Scrolling">
 <!ENTITY useAutoScroll.label                    "Use autoscrolling">
 <!ENTITY useAutoScroll.accesskey                "t">
 <!ENTITY useSmoothScroll.label                  "Use smooth scrolling">
 <!ENTITY useSmoothScroll.accesskey              "U">
-<!ENTITY allowHWAccel.label                     "Use hardware acceleration when available">
-<!ENTITY allowHWAccel.accesskey                 "e">
+
+<!ENTITY zoomPrefs.label                        "Zoom options">
+<!-- LOCALIZATION NOTE (minZoom.label, maxZoom.label, percent.label):
+     single hbox with minZoom.label preceding the minZoom control and
+     maxZoom.label preceding the maxZoom control; percent.label shows
+     the ASCII '%' character at the end of that string -->
+<!ENTITY minZoom.label                          "Range from">
+<!ENTITY minZoom.accesskey                      "f">
+<!ENTITY maxZoom.label                          "to">
+<!ENTITY maxZoom.accesskey                      "o">
+<!ENTITY percent.label                          "&#37;">
+
+<!ENTITY siteSpecific.label                     "Remember zoom levels on per-site basis">
+<!ENTITY siteSpecific.accesskey                 "m">
 <!ENTITY textZoomOnly.label                     "Zoom only text instead of full pages">
 <!ENTITY textZoomOnly.accesskey                 "Z">
+<!ENTITY enableAutomaticImageResizing.label     "Resize large images to fit in the browser window">
+<!ENTITY enableAutomaticImageResizing.accesskey "R">
+
+<!ENTITY allowHWAccel.label                     "Use hardware acceleration when available">
+<!ENTITY allowHWAccel.accesskey                 "e">
 <!ENTITY blockAutoRefresh.label                 "Warn me when websites try to redirect or reload the page">
 <!ENTITY blockAutoRefresh.accesskey             "W">
-<!ENTITY siteSpecific.label                     "Remember zoom levels on per-site basis">
-<!ENTITY siteSpecific.accesskey                 "m">