Bug 1389915 - Add "Proxy DNS when using SOCKS v5" and "Do not prompt for authentication if password is saved" to connection prefs dialog. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Mon, 14 Aug 2017 14:52:56 +0200
changeset 29556 4ddeb9d0bb8258010ac1330e6965ee4b3ac4c8e4
parent 29555 20658ec6d032a2dff9c281d6431e9004d5a33968
child 29557 89fef90ea52f78ac6e9a8d4b4fd8d157eefacaa4
push id378
push userclokep@gmail.com
push dateMon, 13 Nov 2017 18:45:35 +0000
reviewersjorgk
bugs1389915
Bug 1389915 - Add "Proxy DNS when using SOCKS v5" and "Do not prompt for authentication if password is saved" to connection prefs dialog. r=jorgk
mail/components/preferences/connection.xul
mail/components/preferences/jar.mn
mail/locales/en-US/chrome/messenger/preferences/connection.dtd
--- a/mail/components/preferences/connection.xul
+++ b/mail/components/preferences/connection.xul
@@ -9,17 +9,22 @@
 
 <?xml-stylesheet href="chrome://global/skin/"?>
 
 <prefwindow id="ConnectionsDialog" type="child"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             title="&connectionsDialog.title;"
             dlgbuttons="accept,cancel"
             onbeforeaccept="return gConnectionsDialog.beforeAccept();"
-            onload="gConnectionsDialog.checkForSystemProxy();">
+            onload="gConnectionsDialog.checkForSystemProxy();"
+#ifdef XP_MACOSX
+            style="width: &window.macWidth; !important;">
+#else
+            style="width: &window.width; !important;">
+#endif
 
   <prefpane id="ConnectionsDialogPane">
     <preferences id="ConnectionPreferences">
       <preference id="network.proxy.type"         name="network.proxy.type"         type="int" onchange="gConnectionsDialog.proxyTypeChanged();"/>
       <preference id="network.proxy.http"         name="network.proxy.http"         type="string"/>
       <preference id="network.proxy.http_port"    name="network.proxy.http_port"    type="int"/>
       <preference id="network.proxy.ssl"          name="network.proxy.ssl"          type="string"/>
       <preference id="network.proxy.ssl_port"     name="network.proxy.ssl_port"     type="int"/>
@@ -35,16 +40,18 @@
       <preference id="pref.advanced.proxies.disable_button.reload"
                   name="pref.advanced.proxies.disable_button.reload"
                   type="bool"/>
 
       <preference id="network.proxy.backup.ssl"          name="network.proxy.backup.ssl"          type="string"/>
       <preference id="network.proxy.backup.ssl_port"     name="network.proxy.backup.ssl_port"     type="int"/>
       <preference id="network.proxy.backup.socks"        name="network.proxy.backup.socks"        type="string"/>
       <preference id="network.proxy.backup.socks_port"   name="network.proxy.backup.socks_port"   type="int"/>
+      <preference id="network.proxy.socks_remote_dns"    name="network.proxy.socks_remote_dns"    type="bool"/>
+      <preference id="signon.autologin.proxy"            name="signon.autologin.proxy"            type="bool"/>
     </preferences>
 
     <script type="application/javascript" src="chrome://messenger/content/preferences/connection.js"/>
 
     <groupbox>
       <caption label="&proxyTitle.label;"/>
 
       <radiogroup id="networkProxyType" preference="network.proxy.type"
@@ -137,10 +144,21 @@
                    preference="network.proxy.autoconfig_url"
                    oninput="gConnectionsDialog.updateReloadButton();"/>
           <button id="autoReload" label="&reload.label;" accesskey="&reload.accesskey;"
                   oncommand="gConnectionsDialog.reloadPAC();"
                   preference="pref.advanced.proxies.disable_button.reload"/>
         </hbox>
       </radiogroup>
     </groupbox>
+    <separator class="thin"/>
+    <checkbox id="autologinProxy"
+              label="&autologinproxy.label;"
+              accesskey="&autologinproxy.accesskey;"
+              preference="signon.autologin.proxy"
+              tooltiptext="&autologinproxy.tooltip;"/>
+    <checkbox id="networkProxySOCKSRemoteDNS"
+              preference="network.proxy.socks_remote_dns"
+              label="&socksRemoteDNS.label;"
+              accesskey="&socksRemoteDNS.accesskey;" />
+    <separator/>
   </prefpane>
 </prefwindow>
--- a/mail/components/preferences/jar.mn
+++ b/mail/components/preferences/jar.mn
@@ -27,17 +27,17 @@ messenger.jar:
     content/messenger/preferences/sendoptions.js
     content/messenger/preferences/security.xul
     content/messenger/preferences/security.js
     content/messenger/preferences/advanced.js
 *   content/messenger/preferences/advanced.xul
     content/messenger/preferences/receipts.js
 *   content/messenger/preferences/receipts.xul
     content/messenger/preferences/connection.js
-    content/messenger/preferences/connection.xul
+*   content/messenger/preferences/connection.xul
     content/messenger/preferences/downloads.js
     content/messenger/preferences/attachmentReminder.js
     content/messenger/preferences/attachmentReminder.xul
 *   content/messenger/preferences/applications.xul
     content/messenger/preferences/applications.js
     content/messenger/preferences/applicationManager.xul
     content/messenger/preferences/applicationManager.js
     content/messenger/preferences/handlers.xml
--- a/mail/locales/en-US/chrome/messenger/preferences/connection.dtd
+++ b/mail/locales/en-US/chrome/messenger/preferences/connection.dtd
@@ -1,13 +1,15 @@
 <!-- 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/. -->
 
 <!ENTITY  connectionsDialog.title       "Connection Settings">
+<!ENTITY  window.width                  "49em">
+<!ENTITY  window.macWidth               "44em">
 
 <!ENTITY  proxyTitle.label              "Configure Proxies to Access the Internet">
 <!ENTITY  noProxyTypeRadio.label        "No proxy">
 <!ENTITY  noProxyTypeRadio.accesskey    "y">
 <!ENTITY  systemTypeRadio.label         "Use system proxy settings">
 <!ENTITY  systemTypeRadio.accesskey     "u">
 <!ENTITY  WPADTypeRadio.label           "Auto-detect proxy settings for this network">
 <!ENTITY  WPADTypeRadio.accesskey       "w">
@@ -33,8 +35,13 @@
 <!ENTITY  SSLport.accesskey             "o">
 <!ENTITY  SOCKSport.label               "Port:">
 <!ENTITY  SOCKSport.accesskey           "t">
 <!ENTITY  noproxy.label                 "No Proxy for:">
 <!ENTITY  noproxy.accesskey             "n">
 <!ENTITY  noproxyExplain.label          "Example: .mozilla.org, .net.nz, 192.168.1.0/24">
 <!ENTITY  shareproxy.label              "Use this proxy server for all protocols">
 <!ENTITY  shareproxy.accesskey          "x">
+<!ENTITY  autologinproxy.label          "Do not prompt for authentication if password is saved">
+<!ENTITY  autologinproxy.accesskey      "i">
+<!ENTITY  autologinproxy.tooltip        "This option silently authenticates you to proxies when you have saved credentials for them. You will be prompted if authentication fails.">
+<!ENTITY  socksRemoteDNS.label          "Proxy DNS when using SOCKS v5">
+<!ENTITY  socksRemoteDNS.accesskey      "d">