|
1 diff --git a/calendar/base/content/preferences/connection.js b/calendar/base/content/preferences/connection.js |
|
2 --- a/calendar/base/content/preferences/connection.js |
|
3 +++ b/calendar/base/content/preferences/connection.js |
|
4 @@ -69,17 +69,22 @@ var gConnectionsDialog = { |
|
5 } |
|
6 } |
|
7 |
|
8 var noProxiesPref = document.getElementById("network.proxy.no_proxies_on"); |
|
9 noProxiesPref.value = noProxiesPref.value.replace(/[;]/g,','); |
|
10 |
|
11 return true; |
|
12 }, |
|
13 - |
|
14 + |
|
15 + checkForSystemProxy: function () |
|
16 + { |
|
17 + if ("@mozilla.org/system-proxy-settings;1" in Components.classes) |
|
18 + document.getElementById("systemPref").removeAttribute("hidden"); |
|
19 + }, |
|
20 |
|
21 /** |
|
22 * Handler function to be called when the network.proxy.type preference has |
|
23 * changed while the connection preferences dialog is open. |
|
24 */ |
|
25 proxyTypeChanged: function gCD_proxyTypeChanged() { |
|
26 var proxyTypePref = document.getElementById("network.proxy.type"); |
|
27 |
|
28 diff --git a/calendar/base/content/preferences/connection.xul b/calendar/base/content/preferences/connection.xul |
|
29 --- a/calendar/base/content/preferences/connection.xul |
|
30 +++ b/calendar/base/content/preferences/connection.xul |
|
31 @@ -40,16 +40,17 @@ |
|
32 |
|
33 <?xml-stylesheet href="chrome://global/skin/"?> |
|
34 |
|
35 <prefwindow id="ConnectionsDialog" type="child" |
|
36 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" |
|
37 title="&connectionsDialog.title;" |
|
38 dlgbuttons="accept,cancel" |
|
39 onbeforeaccept="return gConnectionsDialog.beforeAccept();" |
|
40 + onload="gConnectionsDialog.checkForSystemProxy();" |
|
41 #ifdef XP_MACOSX |
|
42 style="width: &window.macWidth; !important;"> |
|
43 #else |
|
44 style="width: &window.width; !important;"> |
|
45 #endif |
|
46 |
|
47 <prefpane id="ConnectionsDialogPane"> |
|
48 |
|
49 @@ -88,16 +89,17 @@ |
|
50 |
|
51 <groupbox> |
|
52 <caption label="&proxyTitle.label;"/> |
|
53 |
|
54 <radiogroup id="networkProxyType" preference="network.proxy.type" |
|
55 onsyncfrompreference="return gConnectionsDialog.readProxyType();"> |
|
56 <radio value="0" label="&directTypeRadio.label;" accesskey="&directTypeRadio.accesskey;"/> |
|
57 <radio value="4" label="&WPADTypeRadio.label;" accesskey="&WPADTypeRadio.accesskey;"/> |
|
58 + <radio value="5" label="&systemTypeRadio.label;" accesskey="&systemTypeRadio.accesskey;" id="systemPref" hidden="true"/> |
|
59 <radio value="1" label="&manualTypeRadio.label;" accesskey="&manualTypeRadio.accesskey;"/> |
|
60 <grid class="indent" flex="1"> |
|
61 <columns> |
|
62 <column/> |
|
63 <column flex="1"/> |
|
64 </columns> |
|
65 <rows> |
|
66 <row align="center"> |
|
67 diff --git a/calendar/locales/en-US/chrome/calendar/preferences/connection.dtd b/calendar/locales/en-US/chrome/calendar/preferences/connection.dtd |
|
68 --- a/calendar/locales/en-US/chrome/calendar/preferences/connection.dtd |
|
69 +++ b/calendar/locales/en-US/chrome/calendar/preferences/connection.dtd |
|
70 @@ -43,16 +43,18 @@ |
|
71 <!ENTITY window.width "37em"> |
|
72 <!ENTITY window.macWidth "39em"> |
|
73 |
|
74 <!ENTITY proxyTitle.label "Configure Proxies to Access the Internet"> |
|
75 <!ENTITY directTypeRadio.label "Direct connection to the Internet"> |
|
76 <!ENTITY directTypeRadio.accesskey "d"> |
|
77 <!ENTITY WPADTypeRadio.label "Auto-detect proxy settings for this network"> |
|
78 <!ENTITY WPADTypeRadio.accesskey "w"> |
|
79 +<!ENTITY systemTypeRadio.label "Use system proxy settings"> |
|
80 +<!ENTITY systemTypeRadio.accesskey "u"> |
|
81 <!ENTITY manualTypeRadio.label "Manual proxy configuration:"> |
|
82 <!ENTITY manualTypeRadio.accesskey "m"> |
|
83 <!ENTITY autoTypeRadio.label "Automatic proxy configuration URL:"> |
|
84 <!ENTITY autoTypeRadio.accesskey "A"> |
|
85 <!ENTITY reload.label "Reload"> |
|
86 <!ENTITY reload.accesskey "e"> |
|
87 <!ENTITY ftp.label "FTP Proxy:"> |
|
88 <!ENTITY ftp.accesskey "F"> |