mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-23 10:15:41 +00:00
bug 349013 - Removes unused connectionPrefs stuff. r1=ctalbert,r2=jminta
This commit is contained in:
mattwillis%gmail.com
parent
1e17074518
commit
0c66676533
@ -79,7 +79,6 @@ calendar-en-US.jar:
|
||||
locale/en-US/calendar/global.dtd (/calendar/locales/en-US/chrome/calendar/global.dtd)
|
||||
locale/en-US/calendar/calendar.dtd (/calendar/locales/en-US/chrome/calendar/calendar.dtd)
|
||||
locale/en-US/calendar/calendarCreation.dtd (/calendar/locales/en-US/chrome/calendar/calendarCreation.dtd)
|
||||
locale/en-US/calendar/selectAddresses.dtd (/calendar/locales/en-US/chrome/calendar/selectAddresses.dtd)
|
||||
locale/en-US/calendar/calendar.properties (/calendar/locales/en-US/chrome/calendar/calendar.properties)
|
||||
locale/en-US/calendar/wcap.properties (/calendar/locales/en-US/chrome/calendar/wcap.properties)
|
||||
locale/en-US/calendar/dateFormat.properties (/calendar/locales/en-US/chrome/calendar/dateFormat.properties)
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
<!--LOCALIZATION NOTE : FILE The Proxies preferences dialog -->
|
||||
<!ENTITY lHeader "Connection Settings">
|
||||
<!ENTITY proxyTitle.label "Configure Proxies to Access the Internet">
|
||||
<!ENTITY directTypeRadio.label "Direct connection to the Internet">
|
||||
<!ENTITY directTypeRadio.accesskey "d">
|
||||
<!ENTITY WPADTypeRadio.label "Auto-detect proxy settings for this network">
|
||||
<!ENTITY WPADTypeRadio.accesskey "w">
|
||||
<!ENTITY manualTypeRadio.label "Manual proxy configuration">
|
||||
<!ENTITY manualTypeRadio.accesskey "m">
|
||||
<!ENTITY autoTypeRadio.label "Automatic proxy configuration URL:">
|
||||
<!ENTITY autoTypeRadio.accesskey "a">
|
||||
<!ENTITY shareproxy.label "Use this proxy server for all protocols">
|
||||
<!ENTITY shareproxy.accesskey "x">
|
||||
<!ENTITY reload.label "Reload">
|
||||
<!ENTITY reload.accesskey "l">
|
||||
<!ENTITY ftp.label "FTP Proxy:">
|
||||
<!ENTITY ftp.accesskey "f">
|
||||
<!ENTITY http.label "HTTP Proxy:">
|
||||
<!ENTITY http.accesskey "h">
|
||||
<!ENTITY ssl.label "SSL Proxy:">
|
||||
<!ENTITY ssl.accesskey "s">
|
||||
<!ENTITY socks.label "SOCKS Host:">
|
||||
<!ENTITY socks.accesskey "c">
|
||||
<!ENTITY socks4.label "SOCKS v4">
|
||||
<!ENTITY socks4.accesskey "k">
|
||||
<!ENTITY socks5.label "SOCKS v5">
|
||||
<!ENTITY socks5.accesskey "v">
|
||||
<!ENTITY port.label "Port:">
|
||||
<!ENTITY HTTPport.accesskey "p">
|
||||
<!ENTITY SSLport.accesskey "o">
|
||||
<!ENTITY FTPport.accesskey "r">
|
||||
<!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">
|
||||
@ -36,6 +36,5 @@ calendar-@AB_CD@.jar:
|
||||
# NOTE:
|
||||
# These files are only used by Sunbird but are included for all so that
|
||||
# calendar-ab-CD.jar is the same for all Calendar products.
|
||||
locale/@AB_CD@/calendar/connectionPrefs.dtd (%chrome/calendar/connectionPrefs.dtd)
|
||||
locale/@AB_CD@/calendar/selectAddresses.dtd (%chrome/calendar/selectAddresses.dtd)
|
||||
#includesubst @LOCALE_SRCDIR@/extra-jar.mn
|
||||
|
||||
@ -1,222 +0,0 @@
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License. You may obtain a copy of the License at
|
||||
# http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is Mozilla Communicator client code, released
|
||||
# March 31, 1998.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 1998-1999
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Simon Paquet <bugzilla@babylonsounds.com>
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
var _elementIDs = ["networkProxyType",
|
||||
"networkProxyFTP", "networkProxyFTP_Port",
|
||||
"networkProxyGopher", "networkProxyGopher_Port",
|
||||
"networkProxyHTTP", "networkProxyHTTP_Port",
|
||||
"networkProxySOCKS", "networkProxySOCKS_Port",
|
||||
"networkProxySOCKSVersion",
|
||||
"networkProxySSL", "networkProxySSL_Port",
|
||||
"networkProxyNone", "networkProxyAutoconfigURL", "shareAllProxies"];
|
||||
|
||||
function Startup()
|
||||
{
|
||||
DoEnabling();
|
||||
}
|
||||
|
||||
function DoEnabling()
|
||||
{
|
||||
var i;
|
||||
var ftp = document.getElementById("networkProxyFTP");
|
||||
var ftpPort = document.getElementById("networkProxyFTP_Port");
|
||||
var http = document.getElementById("networkProxyHTTP");
|
||||
var httpPort = document.getElementById("networkProxyHTTP_Port");
|
||||
var socks = document.getElementById("networkProxySOCKS");
|
||||
var socksPort = document.getElementById("networkProxySOCKS_Port");
|
||||
var socksVersion = document.getElementById("networkProxySOCKSVersion");
|
||||
var socksVersion4 = document.getElementById("networkProxySOCKSVersion4");
|
||||
var socksVersion5 = document.getElementById("networkProxySOCKSVersion5");
|
||||
var ssl = document.getElementById("networkProxySSL");
|
||||
var sslPort = document.getElementById("networkProxySSL_Port");
|
||||
var noProxy = document.getElementById("networkProxyNone");
|
||||
var autoURL = document.getElementById("networkProxyAutoconfigURL");
|
||||
var autoReload = document.getElementById("autoReload");
|
||||
var shareAllProxies = document.getElementById("shareAllProxies");
|
||||
|
||||
// convenience arrays
|
||||
var manual = [ftp, ftpPort, http, httpPort, socks, socksPort, socksVersion, socksVersion4, socksVersion5, ssl, sslPort, noProxy, shareAllProxies];
|
||||
var manual2 = [http, httpPort, noProxy, shareAllProxies];
|
||||
var auto = [autoURL, autoReload];
|
||||
|
||||
// radio buttons
|
||||
var radiogroup = document.getElementById("networkProxyType");
|
||||
|
||||
switch ( radiogroup.value ) {
|
||||
case "0":
|
||||
case "4":
|
||||
for (i = 0; i < manual.length; i++)
|
||||
manual[i].setAttribute( "disabled", "true" );
|
||||
for (i = 0; i < auto.length; i++)
|
||||
auto[i].setAttribute( "disabled", "true" );
|
||||
break;
|
||||
case "1":
|
||||
for (i = 0; i < auto.length; i++)
|
||||
auto[i].setAttribute( "disabled", "true" );
|
||||
if (!radiogroup.disabled && !shareAllProxies.checked) {
|
||||
for (i = 0; i < manual.length; i++) {
|
||||
prefstring = manual[i].getAttribute( "prefstring" );
|
||||
if (!window.opener.top.hPrefWindow.getPrefIsLocked(prefstring))
|
||||
manual[i].removeAttribute( "disabled" );
|
||||
}
|
||||
} else {
|
||||
for (i = 0; i < manual.length; i++)
|
||||
manual[i].setAttribute("disabled", "true");
|
||||
for (i = 0; i < manual2.length; i++) {
|
||||
prefstring = manual2[i].getAttribute( "prefstring" );
|
||||
if (!window.opener.top.hPrefWindow.getPrefIsLocked(prefstring))
|
||||
manual2[i].removeAttribute( "disabled" );
|
||||
}
|
||||
}
|
||||
break;
|
||||
case "2":
|
||||
default:
|
||||
for (i = 0; i < manual.length; i++)
|
||||
manual[i].setAttribute("disabled", "true");
|
||||
if (!radiogroup.disabled)
|
||||
for (i = 0; i < auto.length; i++)
|
||||
auto[i].removeAttribute("disabled");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
function ReloadPAC()
|
||||
{
|
||||
Components.classes["@mozilla.org/network/protocol-proxy-service;1"].
|
||||
getService().reloadPAC();
|
||||
}
|
||||
|
||||
function onConnectionsDialogOK()
|
||||
{
|
||||
var autoURL = document.getElementById("networkProxyAutoconfigURL");
|
||||
var URIFixup = Components.classes["@mozilla.org/docshell/urifixup;1"]
|
||||
.getService(Components.interfaces.nsIURIFixup);
|
||||
try {
|
||||
var fixedUpURI = URIFixup.createFixupURI(autoURL.value, 0);
|
||||
autoURL.value = fixedUpURI.spec;
|
||||
}
|
||||
catch(ex) {
|
||||
}
|
||||
|
||||
window.opener.top.hPrefWindow.wsm.savePageData(window.location.href, window);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
var oldUrls = ["","",""];
|
||||
var oldPorts = ["0","0","0"];
|
||||
|
||||
function toggleProxySettings()
|
||||
{
|
||||
var http = document.getElementById("networkProxyHTTP");
|
||||
var httpPort = document.getElementById("networkProxyHTTP_Port");
|
||||
var ftp = document.getElementById("networkProxyFTP");
|
||||
var ftpPort = document.getElementById("networkProxyFTP_Port");
|
||||
var ssl = document.getElementById("networkProxySSL");
|
||||
var sslPort = document.getElementById("networkProxySSL_Port");
|
||||
var socks = document.getElementById("networkProxySOCKS");
|
||||
var socksPort = document.getElementById("networkProxySOCKS_Port");
|
||||
var socksVersion = document.getElementById("networkProxySOCKSVersion");
|
||||
var socksVersion4 = document.getElementById("networkProxySOCKSVersion4");
|
||||
var socksVersion5 = document.getElementById("networkProxySOCKSVersion5");
|
||||
|
||||
// arrays
|
||||
var urls = [ftp,ssl];
|
||||
var ports = [ftpPort,sslPort];
|
||||
var allFields = [ftp,ssl,ftpPort,sslPort,socks,socksPort,socksVersion,socksVersion4,socksVersion5];
|
||||
|
||||
if (document.getElementById("shareAllProxies").checked) {
|
||||
for (i = 0; i < allFields.length; i++)
|
||||
allFields[i].setAttribute("disabled", "true");
|
||||
for (i = 0; i < urls.length; i++) {
|
||||
oldUrls[i] = urls[i].value;
|
||||
prefstring = urls[i].getAttribute("prefstring");
|
||||
if (!window.opener.top.hPrefWindow.getPrefIsLocked(prefstring))
|
||||
urls[i].value = http.value;
|
||||
}
|
||||
for (i = 0; i < ports.length; i++) {
|
||||
oldPorts[i] = ports[i].value;
|
||||
prefstring = ports[i].getAttribute("prefstring");
|
||||
if (!window.opener.top.hPrefWindow.getPrefIsLocked(prefstring))
|
||||
ports[i].value = httpPort.value;
|
||||
}
|
||||
} else {
|
||||
for (i = 0; i < allFields.length; i++) {
|
||||
prefstring = allFields[i].getAttribute("prefstring");
|
||||
if (!window.opener.top.hPrefWindow.getPrefIsLocked(prefstring))
|
||||
allFields[i].removeAttribute("disabled");
|
||||
}
|
||||
for (i = 0; i < urls.length; i++) {
|
||||
prefstring = urls[i].getAttribute("prefstring");
|
||||
if (!window.opener.top.hPrefWindow.getPrefIsLocked(prefstring))
|
||||
urls[i].value = oldUrls[i];
|
||||
}
|
||||
for (i = 0; i < ports.length; i++) {
|
||||
prefstring = ports[i].getAttribute("prefstring");
|
||||
if (!window.opener.top.hPrefWindow.getPrefIsLocked(prefstring))
|
||||
ports[i].value = oldPorts[i];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function copyProxySettings()
|
||||
{
|
||||
if (!document.getElementById("shareAllProxies").checked)
|
||||
return;
|
||||
|
||||
var http = document.getElementById("networkProxyHTTP");
|
||||
var httpPort = document.getElementById("networkProxyHTTP_Port");
|
||||
var ftp = document.getElementById("networkProxyFTP");
|
||||
var ftpPort = document.getElementById("networkProxyFTP_Port");
|
||||
var ssl = document.getElementById("networkProxySSL");
|
||||
var sslPort = document.getElementById("networkProxySSL_Port");
|
||||
|
||||
var urls = [ftp,ssl];
|
||||
var ports = [ftpPort,sslPort];
|
||||
|
||||
for (i = 0; i < urls.length; i++) {
|
||||
prefstring = urls[i].getAttribute("prefstring");
|
||||
if (!window.opener.top.hPrefWindow.getPrefIsLocked(prefstring))
|
||||
urls[i].value = http.value;
|
||||
}
|
||||
for (i = 0; i < ports.length; i++) {
|
||||
prefstring = ports[i].getAttribute("prefstring");
|
||||
if (!window.opener.top.hPrefWindow.getPrefIsLocked(prefstring))
|
||||
ports[i].value = httpPort.value;
|
||||
}
|
||||
}
|
||||
@ -1,155 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License. You may obtain a copy of the License at
|
||||
# http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is Mozilla Communicator client code, released
|
||||
# March 31, 1998.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 1998-1999
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Jason Eager <jce2@po.cwru.edu>
|
||||
# Simon Paquet <bugzilla@babylonsounds.com>
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
|
||||
|
||||
<!DOCTYPE window SYSTEM "chrome://calendar/locale/connectionPrefs.dtd" >
|
||||
<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
onload="window.opener.top.initPanel('chrome://calendar/content/pref/connectionPrefs.xul', window);"
|
||||
buttons="accept,cancel" ondialogaccept="return onConnectionsDialogOK(event);"
|
||||
title="&lHeader;">
|
||||
|
||||
<stringbundle id="bundle_prefutilities"
|
||||
src="chrome://calendar/locale/prefutilities.properties"/>
|
||||
<script type="application/x-javascript" src="chrome://calendar/content/pref/connectionPrefs.js"/>
|
||||
|
||||
<groupbox>
|
||||
<caption label="&proxyTitle.label;"/>
|
||||
|
||||
<radiogroup id="networkProxyType" prefstring="network.proxy.type">
|
||||
<radio value="0" label="&directTypeRadio.label;" accesskey="&directTypeRadio.accesskey;" oncommand="DoEnabling();"/>
|
||||
<radio value="4" label="&WPADTypeRadio.label;" accesskey="&WPADTypeRadio.accesskey;" oncommand="DoEnabling()"/>
|
||||
<radio value="1" label="&manualTypeRadio.label;" accesskey="&manualTypeRadio.accesskey;" oncommand="DoEnabling();"/>
|
||||
<grid class="indent" flex="1">
|
||||
<columns>
|
||||
<column/>
|
||||
<column flex="1"/>
|
||||
</columns>
|
||||
|
||||
<rows>
|
||||
<row>
|
||||
<hbox/>
|
||||
<hbox>
|
||||
<checkbox id="shareAllProxies" oncommand="toggleProxySettings();"
|
||||
label="&shareproxy.label;" accesskey="&shareproxy.accesskey;"
|
||||
preftype="bool" prefstring="network.proxy.share_proxy_settings"/>
|
||||
</hbox>
|
||||
</row>
|
||||
<row align="center">
|
||||
<hbox align="center" pack="end">
|
||||
<label value="&http.label;" accesskey="&http.accesskey;" control="networkProxyHTTP"/>
|
||||
</hbox>
|
||||
<hbox align="center">
|
||||
<textbox id="networkProxyHTTP" preftype="string" prefstring="network.proxy.http"
|
||||
flex="1" onblur="copyProxySettings()"/>
|
||||
<label value="&port.label;" accesskey="&HTTPport.accesskey;" control="networkProxyHTTP_Port"/>
|
||||
<textbox id="networkProxyHTTP_Port" preftype="int" prefstring="network.proxy.http_port"
|
||||
size="5" onblur="copyProxySettings()"/>
|
||||
</hbox>
|
||||
</row>
|
||||
<row align="center">
|
||||
<hbox align="center" pack="end">
|
||||
<label value="&ssl.label;" accesskey="&ssl.accesskey;" control="networkProxySSL"/>
|
||||
</hbox>
|
||||
<hbox align="center">
|
||||
<textbox id="networkProxySSL" preftype="string" prefstring="network.proxy.ssl"
|
||||
flex="1"/>
|
||||
<label value="&port.label;" accesskey="&SSLport.accesskey;" control="networkProxySSL_Port"/>
|
||||
<textbox id="networkProxySSL_Port" preftype="int" prefstring="network.proxy.ssl_port"
|
||||
size="5"/>
|
||||
</hbox>
|
||||
</row>
|
||||
<row align="center">
|
||||
<hbox align="center" pack="end">
|
||||
<label value="&ftp.label;" accesskey="&ftp.accesskey;" control="networkProxyFTP"/>
|
||||
</hbox>
|
||||
<hbox align="center">
|
||||
<textbox id="networkProxyFTP" preftype="string" prefstring="network.proxy.ftp"
|
||||
flex="1"/>
|
||||
<label value="&port.label;" accesskey="&FTPport.accesskey;" control="networkProxyFTP_Port"/>
|
||||
<textbox id="networkProxyFTP_Port" preftype="int" prefstring="network.proxy.ftp_port"
|
||||
size="5"/>
|
||||
</hbox>
|
||||
</row>
|
||||
<row align="center">
|
||||
<hbox align="center" pack="end">
|
||||
<label value="&socks.label;" accesskey="&socks.accesskey;" control="networkProxySOCKS"/>
|
||||
</hbox>
|
||||
<hbox align="center">
|
||||
<textbox id="networkProxySOCKS" preftype="string" prefstring="network.proxy.socks"
|
||||
flex="1"/>
|
||||
<label value="&port.label;" accesskey="&SOCKSport.accesskey;" control="networkProxySOCKS_Port"/>
|
||||
<textbox id="networkProxySOCKS_Port" preftype="int" prefstring="network.proxy.socks_port"
|
||||
size="5"/>
|
||||
</hbox>
|
||||
</row>
|
||||
<row>
|
||||
<spacer/>
|
||||
<radiogroup id="networkProxySOCKSVersion" orient="horizontal"
|
||||
prefstring="network.proxy.socks_version">
|
||||
<radio id="networkProxySOCKSVersion4" value="4" label="&socks4.label;" accesskey="&socks4.accesskey;" />
|
||||
<radio id="networkProxySOCKSVersion5" value="5" label="&socks5.label;" accesskey="&socks5.accesskey;" />
|
||||
</radiogroup>
|
||||
</row>
|
||||
|
||||
<row align="center">
|
||||
<hbox align="center" pack="end">
|
||||
<label value="&noproxy.label;" accesskey="&noproxy.accesskey;" control="networkProxyNone"/>
|
||||
</hbox>
|
||||
<textbox id="networkProxyNone" preftype="string" prefstring="network.proxy.no_proxies_on"/>
|
||||
</row>
|
||||
<row>
|
||||
<spacer/>
|
||||
<label value="&noproxyExplain.label;" control="networkProxyNone"/>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
<radio value="2" label="&autoTypeRadio.label;" accesskey="&autoTypeRadio.accesskey;" oncommand="DoEnabling();"/>
|
||||
<hbox class="indent" flex="1" align="center">
|
||||
<textbox id="networkProxyAutoconfigURL" flex="1"
|
||||
preftype="string" prefstring="network.proxy.autoconfig_url"/>
|
||||
<button id="autoReload" label="&reload.label;" accesskey="&reload.accesskey;"
|
||||
oncommand="ReloadPAC();"
|
||||
prefstring="pref.advanced.proxies.disable_button.reload"/>
|
||||
</hbox>
|
||||
</radiogroup>
|
||||
|
||||
</groupbox>
|
||||
</dialog>
|
||||
Loading…
Reference in New Issue
Block a user