Bug 732816 Add preference entry to control new domain name highlighting feature r=InvisibleSmiley
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Wed, 07 Mar 2012 20:33:30 +0000
changeset 11021 c1fa6cb7574e3303fc1579a3fb71bb124538c9a6
parent 11020 53fcee1f9ec3259491f61478e55e77620a0b67c6
child 11022 0935f4dd69c4c5d2f8cbdda51f8da3636996560a
push id463
push userbugzilla@standard8.plus.com
push dateTue, 24 Apr 2012 17:34:51 +0000
treeherdercomm-beta@e53588e8f7b0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersInvisibleSmiley
bugs732816
Bug 732816 Add preference entry to control new domain name highlighting feature r=InvisibleSmiley
suite/common/pref/pref-locationbar.xul
suite/locales/en-US/chrome/common/help/cs_nav_prefs_navigator.xhtml
suite/locales/en-US/chrome/common/pref/pref-locationbar.dtd
--- a/suite/common/pref/pref-locationbar.xul
+++ b/suite/common/pref/pref-locationbar.xul
@@ -61,16 +61,19 @@
       <preference id="browser.urlbar.autoFill"
                   name="browser.urlbar.autoFill"
                   type="bool"
                   onchange="updateMatchPrefs();"/>
       <preference id="browser.urlbar.showPopup"
                   name="browser.urlbar.showPopup"
                   type="bool"
                   onchange="updateMatchPrefs();"/>
+      <preference id="browser.urlbar.formatting.enabled"
+                  name="browser.urlbar.formatting.enabled"
+                  type="bool"/>
       <preference id="browser.urlbar.showSearch"
                   name="browser.urlbar.showSearch"
                   type="bool"/>
       <preference id="browser.fixup.alternate.enabled"
                   name="browser.fixup.alternate.enabled"
                   type="bool"/>
       <preference id="keyword.enabled"
                   name="keyword.enabled"
@@ -118,16 +121,24 @@
       <checkbox id="showPopup"
                 class="indent"
                 label="&autoCompleteShowPopup.label;"
                 accesskey="&autoCompleteShowPopup.accesskey;"
                 preference="browser.urlbar.showPopup"/>
     </groupbox>
 
     <groupbox>
+      <caption label="&formatting.label;"/>
+      <checkbox id="domainFormattingEnabled"
+                label="&domainFormatting.label;"
+                accesskey="&domainFormatting.accesskey;"
+                preference="browser.urlbar.formatting.enabled"/>
+    </groupbox>
+
+    <groupbox>
       <caption label="&searchEngine.label;"/>
       <checkbox id="showSearch"
                 label="&showSearchEngine.label;"
                 accesskey="&showSearchEngine.accesskey;"
                 preference="browser.urlbar.showSearch"/>
     </groupbox>
 
     <groupbox>
--- a/suite/locales/en-US/chrome/common/help/cs_nav_prefs_navigator.xhtml
+++ b/suite/locales/en-US/chrome/common/help/cs_nav_prefs_navigator.xhtml
@@ -334,16 +334,23 @@
             matching visited web addresses.
             <span class="unix"><strong>Note</strong>: If you have turned off
             <q>Autocomplete from your browsing history as you type</q>
             matching results from locations on your hard drive will still be
             shown in the drop-down list.</span></li>
         </ul></li>
     </ul>
   </li>
+  <li><strong>Formatting</strong>:
+    <ul>
+      <li><strong>Highlight the effective domain for websites and FTP
+        servers</strong>: Grays out all of the URL except for the effective
+        domain, so that it is clear which site you are visiting.</li>
+    </ul>
+  </li>
   <li><strong>Internet Search Engine</strong>:
     <ul>
       <li><strong>Show default search engine</strong>: Shows a drop-down list item,
         allowing you to search with the default search engine for words you
         enter.</li>
     </ul>
   </li>
   <li><strong>Unknown Locations</strong>
@@ -355,20 +362,17 @@
         detailed information about this feature, see the online document
         <a href="http://www.mozilla.org/docs/end-user/domain-guessing.html">
         Domain Guessing</a>.</li>
       <li><strong>Perform a web search when entered text is not a web
         location</strong>: Select this to let &brandShortName; automatically
         search the web for text entered in the Location Bar. If the text
         you&apos;ve typed is not a web location, &brandShortName; will do a web
         search when you press <kbd class="noMac">Enter</kbd>
-        <kbd class="mac">Return</kbd> in the Location Bar.
-        <strong>Note</strong>: The search engine used can not be
-        changed by the <a href="#internet_search">Internet Search
-        Preferences</a>.</li>
+        <kbd class="mac">Return</kbd> in the Location Bar.</li>
     </ul>
   </li>
 </ul>
 
 <p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p>
 
 <h2 id="internet_search">Browser Preferences - Internet Search</h2>
 
--- a/suite/locales/en-US/chrome/common/pref/pref-locationbar.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-locationbar.dtd
@@ -18,17 +18,21 @@
 -->
 <!ENTITY autoCompleteMatch.label               "Match">
 <!ENTITY autoCompleteMatch.accesskey           "M">
 <!ENTITY autoCompleteMatchAnywhere             "Anywhere in the location or title">
 <!ENTITY autoCompleteMatchWordsFirst           "Anywhere but preferring word boundaries">
 <!ENTITY autoCompleteMatchWords                "Only on word boundaries">
 <!ENTITY autoCompleteMatchStart                "Only at the beginning of the location or title">
 
+<!ENTITY formatting.label                      "Formatting">
+<!ENTITY domainFormatting.label                "Highlight the effective domain for websites and FTP servers">
+<!ENTITY domainFormatting.accesskey            "d">
+
 <!ENTITY searchEngine.label                    "Internet Search Engine">
 <!ENTITY showSearchEngine.label                "Show default search engine">
 <!ENTITY showSearchEngine.accesskey            "e">
 
 <!ENTITY unknownLocations.label                "Unknown Locations">
 <!ENTITY domainGuessing.label                  "Add &quot;www.&quot; and &quot;.com&quot; to the location if a web page is not found">
-<!ENTITY domainGuessing.accesskey              "d">
+<!ENTITY domainGuessing.accesskey              "w">
 <!ENTITY keywords.label                        "Perform a web search when entered text is not a web location">
 <!ENTITY keywords.accesskey                    "P">