mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-24 02:35:41 +00:00
Add new connection pref panel.
This commit is contained in:
blakeross%telocity.com
parent
2300889e36
commit
8ce32d7936
@ -21,13 +21,12 @@
|
||||
Contributor(s):
|
||||
|
||||
Jason Eager <jce2@po.cwru.edu>
|
||||
-Added a syntax example for the "no proxy" field.
|
||||
-->
|
||||
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
|
||||
|
||||
<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-proxies.dtd" >
|
||||
<!DOCTYPE window SYSTEM "chrome://browser/locale/pref/pref-connection.dtd" >
|
||||
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
onload="parent.initPanel('chrome://communicator/content/pref/pref-proxies.xul');"
|
||||
onload="parent.initPanel('chrome://browser/content/pref/pref-connection.xul');"
|
||||
headertitle="&lHeader;">
|
||||
|
||||
<script type="application/x-javascript">
|
||||
@ -45,7 +44,7 @@
|
||||
|
||||
<stringbundle id="bundle_prefutilities"
|
||||
src="chrome://pref/locale/prefutilities.properties"/>
|
||||
<script type="application/x-javascript" src="chrome://communicator/content/pref/pref-proxies.js"/>
|
||||
<script type="application/x-javascript" src="chrome://browser/content/pref/pref-connection.js"/>
|
||||
|
||||
<groupbox flex="1">
|
||||
<caption label="&proxyTitle.label;"/>
|
||||
@ -1,130 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<!--
|
||||
The contents of this file are subject to the Netscape 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/NPL/
|
||||
|
||||
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 Netscape are
|
||||
Copyright (C) 1998-1999 Netscape Communications Corporation. All
|
||||
Rights Reserved.
|
||||
|
||||
Contributor(s):
|
||||
-->
|
||||
|
||||
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
|
||||
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
|
||||
|
||||
<!DOCTYPE window [
|
||||
<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
|
||||
%brandDTD;
|
||||
<!ENTITY % proxyDTD SYSTEM "chrome://communicator/locale/pref/pref-proxy-manual.dtd" >
|
||||
%proxyDTD;
|
||||
]>
|
||||
|
||||
<window xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
title="&window.title;"
|
||||
class="dialog"
|
||||
onload="if( parent.handle ) parent.handle.onpageload( 'pref-proxy-manual' ); else parent.queuedTag = 'pref-proxy-manual';">
|
||||
|
||||
<keyset id="dialogKeys"/>
|
||||
|
||||
<html:div flex="100%">
|
||||
<vbox>
|
||||
<hbox>
|
||||
<html:div>
|
||||
&intro.label;
|
||||
</html:div>
|
||||
</hbox>
|
||||
<hbox>
|
||||
<html:div>
|
||||
&ftp.label;
|
||||
</html:div>
|
||||
<html:input name="ftpproxy" type="text" id="networkProxyHTTP"
|
||||
pref="true" preftype="string" prefstring="network.proxy.http" size="30"/>
|
||||
<spacer flex="100%"/>
|
||||
<html:div>
|
||||
&port.label;
|
||||
</html:div>
|
||||
<html:input name="ftpproxyport" type="text" id="networkProxyHTTPPort"
|
||||
pref="true" preftype="string" prefstring="network.proxy.http_port" size="5"/>
|
||||
</hbox>
|
||||
<hbox>
|
||||
<html:div>
|
||||
&gopher.label;
|
||||
</html:div>
|
||||
<html:input name="gopherproxy" type="text" id="networkProxyGopher"
|
||||
pref="true" preftype="string" prefstring="network.proxy.gopher" size="30"/>
|
||||
<spacer flex="100%"/>
|
||||
<html:div>
|
||||
&port.label;
|
||||
</html:div>
|
||||
<html:input name="gopherproxyport" type="text" id="networkProxyGopherPort"
|
||||
pref="true" preftype="string" prefstring="network.proxy.gopher_port" size="5"/>
|
||||
</hbox>
|
||||
<hbox>
|
||||
<html:div>
|
||||
&http.label;
|
||||
</html:div>
|
||||
<html:input name="httpproxy" type="text" id="networkProxyHTTP"
|
||||
pref="true" preftype="string" prefstring="network.proxy.http" size="30"/>
|
||||
<spacer flex="100%"/>
|
||||
<html:div>
|
||||
&port.label;
|
||||
</html:div>
|
||||
<html:input name="httpproxyport" type="text" id="networkProxyHTTPPort"
|
||||
pref="true" preftype="string" prefstring="network.proxy.http_port" size="5"/>
|
||||
</hbox>
|
||||
<hbox>
|
||||
<html:div>
|
||||
&wais.label;
|
||||
</html:div>
|
||||
<html:input name="waisproxy" type="text" id="networkProxyWAIS"
|
||||
pref="true" preftype="string" prefstring="network.proxy.wais" size="30"/>
|
||||
<spacer flex="100%"/>
|
||||
<html:div>
|
||||
&port.label;
|
||||
</html:div>
|
||||
<html:input name="waisproxyport" type="text" id="networkProxyWAISPort"
|
||||
pref="true" preftype="string" prefstring="network.proxy.wais_port" size="5"/>
|
||||
</hbox>
|
||||
<hbox>
|
||||
<html:div>
|
||||
&direct.label;
|
||||
</html:div>
|
||||
</hbox>
|
||||
<hbox>
|
||||
<html:div>
|
||||
&noproxy.label;
|
||||
</html:div>
|
||||
<html:input name="noproxy" type="text" id="networProxyNone"
|
||||
pref="true" preftype="string" prefstring="network.proxy.none" size="60"/>
|
||||
</hbox>
|
||||
<hbox>
|
||||
<html:div>
|
||||
&sockhost.label;
|
||||
</html:div>
|
||||
<html:input name="sockshost" type="text" id="networkSocksHost"
|
||||
pref="true" preftype="string" prefstring="network.socks.host" size="30"/>
|
||||
<spacer flex="100%"/>
|
||||
<html:div>
|
||||
&port.label;
|
||||
</html:div>
|
||||
<html:input name="socksport" type="text" id="networkSocksPort"
|
||||
pref="true" preftype="string" prefstring="network.socks.port" size="5"/>
|
||||
</hbox>
|
||||
<hbox id="okCancelButtons"/>
|
||||
</vbox>
|
||||
</html:div>
|
||||
|
||||
</window>
|
||||
@ -87,7 +87,7 @@ function Startup()
|
||||
|
||||
var navbundle = document.getElementById("bundle_navigator");
|
||||
var showSkinsDescription = navbundle.getString("showskinsdescription");
|
||||
if( showSkinsDescription == "false" )
|
||||
if (showSkinsDescription == "false")
|
||||
{
|
||||
gShowDescription = false;
|
||||
var description = document.getElementById("description");
|
||||
|
||||
@ -1,87 +1,78 @@
|
||||
<?xml version="1.0"?>
|
||||
|
||||
<!--
|
||||
The contents of this file are subject to the Netscape 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/NPL/
|
||||
|
||||
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 Netscape are
|
||||
Copyright (C) 1998-1999 Netscape Communications Corporation. All
|
||||
Rights Reserved.
|
||||
|
||||
Contributor(s):
|
||||
|
||||
Ben Goodger <ben@netscape.com>
|
||||
Dave Hyatt (hyatt@apple.com)
|
||||
-->
|
||||
|
||||
<?xul-overlay href="chrome://browser/content/pref/platformPrefOverlay.xul"?>
|
||||
|
||||
<!DOCTYPE window SYSTEM "chrome://browser/locale/pref/preftree.dtd" >
|
||||
|
||||
<overlay id="prefTreeOverlay"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<script>
|
||||
<![CDATA[
|
||||
var _elementIDs = []; // hack
|
||||
]]>
|
||||
</script>
|
||||
|
||||
<tree id="prefsTree" seltype="single" hidecolumnpicker="true"
|
||||
onselect="if( hPrefWindow ) hPrefWindow.switchPage();">
|
||||
<treecols>
|
||||
<treecol id="categoryCol" label="&category.label;" flex="1" primary="true"/>
|
||||
</treecols>
|
||||
|
||||
<treechildren id="panelChildren">
|
||||
<treeitem id="navigator">
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-navigator.xul" label="&navigator.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-fonts.xul" label="&fonts.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
<treeitem id="themes-panel">
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-themes.xul" label="&themes.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
<!-- XXX remove this when overlays.rdf works for navigator -->
|
||||
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-privacy.xul" label="&privacy.label;" />
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
<treeitem id="advancedItem">
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-advanced.xul" label="&advance.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
</treechildren>
|
||||
|
||||
</tree>
|
||||
|
||||
|
||||
|
||||
</overlay>
|
||||
|
||||
<?xml version="1.0"?>
|
||||
|
||||
<!--
|
||||
The contents of this file are subject to the Netscape 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/NPL/
|
||||
|
||||
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 Netscape are
|
||||
Copyright (C) 1998-1999 Netscape Communications Corporation. All
|
||||
Rights Reserved.
|
||||
|
||||
Contributor(s):
|
||||
Ben Goodger <ben@netscape.com>
|
||||
-->
|
||||
|
||||
<?xul-overlay href="chrome://browser/content/pref/platformPrefOverlay.xul"?>
|
||||
|
||||
<!DOCTYPE window SYSTEM "chrome://browser/locale/pref/preftree.dtd" >
|
||||
|
||||
<overlay id="prefTreeOverlay"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<script>
|
||||
<![CDATA[
|
||||
var _elementIDs = []; // hack
|
||||
]]>
|
||||
</script>
|
||||
|
||||
<tree id="prefsTree" seltype="single" hidecolumnpicker="true"
|
||||
onselect="if( hPrefWindow ) hPrefWindow.switchPage();">
|
||||
<treecols>
|
||||
<treecol id="categoryCol" label="&category.label;" flex="1" primary="true"/>
|
||||
</treecols>
|
||||
<treechildren id="panelChildren">
|
||||
<treeitem id="navigator">
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-navigator.xul" label="&navigator.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-fonts.xul" label="&fonts.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="themes-panel">
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-themes.xul" label="&themes.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-privacy.xul" label="&privacy.label;" />
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-connection.xul" label="&connection.label;" />
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-advanced.xul" label="&advance.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
</tree>
|
||||
|
||||
</overlay>
|
||||
|
||||
@ -25,9 +25,8 @@ browser.jar:
|
||||
content/browser/pref/pref-languages.js (content/pref-languages.js)
|
||||
content/browser/pref/pref-navigator.js (content/pref-navigator.js)
|
||||
content/browser/pref/pref-navigator.xul (content/pref-navigator.xul)
|
||||
content/browser/pref/pref-proxies.js (content/pref-proxies.js)
|
||||
content/browser/pref/pref-proxies.xul (content/pref-proxies.xul)
|
||||
content/browser/pref/pref-proxy-manual.xul (content/pref-proxy-manual.xul)
|
||||
content/browser/pref/pref-connection.js (content/pref-connection.js)
|
||||
content/browser/pref/pref-connection.xul (content/pref-connection.xul)
|
||||
content/browser/pref/pref-scripts.xul (content/pref-scripts.xul)
|
||||
content/browser/pref/pref-scripts.js (content/pref-scripts.js)
|
||||
content/browser/pref/pref-privacy.xul (content/pref-privacy.xul)
|
||||
@ -61,8 +60,7 @@ en-US.jar:
|
||||
locale/en-US/browser/pref/pref-languages.dtd (locale/pref-languages.dtd)
|
||||
locale/en-US/browser/pref/pref-languages.properties (locale/pref-languages.properties)
|
||||
locale/en-US/browser/pref/pref-navigator.dtd (locale/pref-navigator.dtd)
|
||||
locale/en-US/browser/pref/pref-proxies.dtd (locale/pref-proxies.dtd)
|
||||
locale/en-US/browser/pref/pref-proxy-manual.dtd (locale/pref-proxy-manual.dtd)
|
||||
locale/en-US/browser/pref/pref-connection.dtd (locale/pref-connection.dtd)
|
||||
locale/en-US/browser/pref/pref-scripts.dtd (locale/pref-scripts.dtd)
|
||||
locale/en-US/browser/pref/pref-privacy.dtd (locale/pref-privacy.dtd)
|
||||
locale/en-US/browser/pref/pref-smart_browsing.dtd (locale/pref-smart_browsing.dtd)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!-- extracted from content/pref-proxies.xul -->
|
||||
|
||||
<!--LOCALIZATION NOTE : FILE The Proxies preferences dialog -->
|
||||
<!ENTITY lHeader "Proxies">
|
||||
<!ENTITY lHeader "Connection">
|
||||
<!ENTITY proxyTitle.label "Configure Proxies to Access the Internet">
|
||||
<!ENTITY directTypeRadio.label "Direct connection to the Internet">
|
||||
<!ENTITY directTypeRadio.accesskey "d">
|
||||
@ -1,12 +0,0 @@
|
||||
<!-- LOCALIZATION NOTE : FILE Proxy management prefs -->
|
||||
|
||||
<!ENTITY window.title "View Manual Proxy Configuration">
|
||||
<!ENTITY intro.label "You may configure a proxy and port number for each of the internet protocols that &brandShortName; supports.">
|
||||
<!ENTITY ftp.label "FTP Proxy:">
|
||||
<!ENTITY gopher.label "Gopher Proxy:">
|
||||
<!ENTITY http.label "HTTP Proxy:">
|
||||
<!ENTITY wais.label "WAIS Proxy:">
|
||||
<!ENTITY port.label "Port:">
|
||||
<!ENTITY direct.label "You may provide a list of domains that &brandShortName; should access directly, rather than via the proxy:">
|
||||
<!ENTITY noproxy.label "No Proxy for:">
|
||||
<!ENTITY sockhost.label "SOCKS v5 Host:">
|
||||
@ -1,5 +1,3 @@
|
||||
<!-- extracted from content/preftree.xul -->
|
||||
|
||||
<!ENTITY category.label "Category">
|
||||
|
||||
<!--LOCALIZATION NOTE : FILE Lists preferences categories that appear on the left of the preferences dialog -->
|
||||
@ -7,19 +5,7 @@
|
||||
<!ENTITY themes.label "Themes and Extensions">
|
||||
<!--LOCALIZATION NOTE (navigator.label): DONT_TRANSLATE -->
|
||||
<!ENTITY navigator.label "General">
|
||||
<!ENTITY bidi.label "Bidi Options">
|
||||
<!ENTITY languages.label "Languages">
|
||||
<!ENTITY applications.label "Helper Applications">
|
||||
<!--LOCALIZATION NOTE (smartBrowse.label): DONT_TRANSLATE -->
|
||||
<!ENTITY smartBrowse.label "Smart Browsing">
|
||||
<!ENTITY privacy.label "Privacy">
|
||||
<!ENTITY advance.label "Advanced">
|
||||
<!ENTITY down.label "Download">
|
||||
<!ENTITY cache.label "Cache">
|
||||
<!ENTITY proxies.label "Proxies">
|
||||
<!ENTITY smart.label "Software Installation">
|
||||
<!ENTITY debug.label "Debug">
|
||||
<!ENTITY debug1.label "Events">
|
||||
<!ENTITY debug2.label "Networking">
|
||||
<!ENTITY download.label "Downloads">
|
||||
<!ENTITY scriptsAndWindows.label "Scripts & Plugins">
|
||||
<!ENTITY connection.label "Connection">
|
||||
Loading…
Reference in New Issue
Block a user