зеркало из https://github.com/mozilla/pjs.git
Major Prefs overhaul. Move connection prefs from privacy to advanced. remove various pref panels, putting the contents
inside of prefs-advanced. Develop the expander binding to look like a collapsable group box with a description field.
This commit is contained in:
Родитель
e52594bfbb
Коммит
4c0e9bab27
|
@ -1,42 +0,0 @@
|
|||
# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
# 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.org Code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Doron Rosenberg.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2001
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Ben Goodger <ben@netscape.com> (Original Author)
|
||||
#
|
||||
# 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 *****
|
||||
|
||||
expander {
|
||||
-moz-binding: url("chrome://messenger/content/expanderBindings.xml#expander");
|
||||
-moz-box-orient: vertical;
|
||||
}
|
||||
|
|
@ -1,95 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
# 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.org Code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Doron Rosenberg.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2001
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Ben Goodger <ben@netscape.com> (Original Author)
|
||||
# Scott MacGregor <scott@scott-macgregor.org>
|
||||
#
|
||||
# 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 *****
|
||||
|
||||
<bindings id="expanderBindings"
|
||||
xmlns="http://www.mozilla.org/xbl"
|
||||
xmlns:xbl="http://www.mozilla.org/xbl"
|
||||
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<binding id="expander" display="xul:vbox">
|
||||
<content>
|
||||
<xul:hbox align="center">
|
||||
<xul:button type="disclosure" class="expanderButton" anonid="disclosure" xbl:inherits="disabled" mousethrough="always"/>
|
||||
<xul:label class="header expanderButton" anonid="label" xbl:inherits="value=label,disabled" mousethrough="always" flex="1"/>
|
||||
</xul:hbox>
|
||||
<xul:vbox flex="1" anonid="settings" class="settingsContainer" collapsed="true">
|
||||
<children/>
|
||||
</xul:vbox>
|
||||
</content>
|
||||
<implementation>
|
||||
<constructor><![CDATA[
|
||||
var settings = document.getAnonymousElementByAttribute(this, "anonid", "settings");
|
||||
var expander = document.getAnonymousElementByAttribute(this, "anonid", "disclosure");
|
||||
|
||||
var open = this.getAttribute("open") == "true";
|
||||
settings.collapsed = !open;
|
||||
expander.open = open;
|
||||
]]></constructor>
|
||||
<method name="onCommand">
|
||||
<parameter name="aEvent"/>
|
||||
<body><![CDATA[
|
||||
var element = aEvent.originalTarget;
|
||||
var button = element.getAttribute("anonid");
|
||||
switch (button) {
|
||||
case "disclosure":
|
||||
case "label":
|
||||
var settings = document.getAnonymousElementByAttribute(this, "anonid", "settings");
|
||||
settings.collapsed = !settings.collapsed;
|
||||
var disclosure = document.getAnonymousElementByAttribute(this, "anonid", "disclosure");
|
||||
disclosure.open = !disclosure.open;
|
||||
this.setAttribute("open", disclosure.open);
|
||||
break;
|
||||
}
|
||||
]]></body>
|
||||
</method>
|
||||
</implementation>
|
||||
<handlers>
|
||||
<handler event="command"><![CDATA[
|
||||
this.onCommand(event);
|
||||
]]></handler>
|
||||
<handler event="click"><![CDATA[
|
||||
if (event.originalTarget.localName == "label")
|
||||
this.onCommand(event);
|
||||
]]></handler>
|
||||
</handlers>
|
||||
</binding>
|
||||
|
||||
</bindings>
|
||||
|
||||
|
|
@ -0,0 +1,207 @@
|
|||
/* ***** 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.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corp.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2001
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Sean Su <ssu@netscape.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 receiptSend;
|
||||
var notInToCcPref;
|
||||
var notInToCcLabel;
|
||||
var outsideDomainPref;
|
||||
var outsideDomainLabel;
|
||||
var otherCasesPref;
|
||||
var otherCasesLabel;
|
||||
|
||||
function setColorWell(aPicker)
|
||||
{
|
||||
var colorRef;
|
||||
|
||||
colorRef = aPicker.nextSibling; // colour value is held here
|
||||
colorRef.setAttribute( "value", aPicker.color );
|
||||
}
|
||||
|
||||
function getColorFromWellAndSetValue(aPickerId)
|
||||
{
|
||||
var picker;
|
||||
var colorRef;
|
||||
var color;
|
||||
|
||||
picker = document.getElementById(aPickerId);
|
||||
colorRef = picker.nextSibling;
|
||||
color = colorRef.getAttribute("value");
|
||||
picker.color = color;
|
||||
|
||||
return color;
|
||||
}
|
||||
|
||||
function Startup()
|
||||
{
|
||||
getColorFromWellAndSetValue("labelColorPicker1");
|
||||
getColorFromWellAndSetValue("labelColorPicker2");
|
||||
getColorFromWellAndSetValue("labelColorPicker3");
|
||||
getColorFromWellAndSetValue("labelColorPicker4");
|
||||
getColorFromWellAndSetValue("labelColorPicker5");
|
||||
|
||||
// return receipt startup
|
||||
receiptSend = document.getElementById("receiptSend");
|
||||
notInToCcPref = document.getElementById("notInToCcPref");
|
||||
notInToCcLabel = document.getElementById("notInToCcLabel");
|
||||
outsideDomainPref = document.getElementById("outsideDomainPref");
|
||||
outsideDomainLabel = document.getElementById("outsideDomainLabel");
|
||||
otherCasesPref = document.getElementById("otherCasesPref");
|
||||
otherCasesLabel = document.getElementById("otherCasesLabel");
|
||||
|
||||
EnableDisableAllowedReceipts();
|
||||
|
||||
// proxy connection
|
||||
DoEnabling();
|
||||
|
||||
// autocomplete
|
||||
enableAutocomplete();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Function to restore pref values to application defaults */
|
||||
function restoreColorAndDescriptionToDefaults()
|
||||
{
|
||||
var prefColor;
|
||||
var description;
|
||||
var pickerColor;
|
||||
var dataColor;
|
||||
var labelDescription;
|
||||
var prefService = Components.classes["@mozilla.org/preferences-service;1"]
|
||||
.getService(Components.interfaces.nsIPrefService);
|
||||
var prefs = prefService.getDefaultBranch(null);
|
||||
|
||||
/* there are only 5 labels */
|
||||
for(var i = 1; i <= 5; i++)
|
||||
{
|
||||
/* set the default description from prefs */
|
||||
description = prefs.getComplexValue("mailnews.labels.description." + i,
|
||||
Components.interfaces.nsIPrefLocalizedString).data;
|
||||
labelDescription = document.getElementById("label" + i + "TextBox");
|
||||
labelDescription.value = description;
|
||||
|
||||
/* set the default color from prefs */
|
||||
prefColor = prefs.getCharPref("mailnews.labels.color." + i);
|
||||
pickerColor = document.getElementById("labelColorPicker" + i);
|
||||
pickerColor.color = prefColor;
|
||||
|
||||
// need to call setColorWell() so that the default pref value will be updated
|
||||
// in the preferences file.
|
||||
setColorWell(pickerColor);
|
||||
}
|
||||
}
|
||||
|
||||
// return receipts....
|
||||
function EnableDisableAllowedReceipts() {
|
||||
if (receiptSend && (receiptSend.getAttribute("value") == "false")) {
|
||||
notInToCcPref.setAttribute("disabled", "true");
|
||||
notInToCcLabel.setAttribute("disabled", "true");
|
||||
outsideDomainPref.setAttribute("disabled", "true");
|
||||
outsideDomainLabel.setAttribute("disabled", "true");
|
||||
otherCasesPref.setAttribute("disabled", "true");
|
||||
otherCasesLabel.setAttribute("disabled", "true");
|
||||
}
|
||||
else {
|
||||
notInToCcPref.removeAttribute("disabled");
|
||||
notInToCcLabel.removeAttribute("disabled");
|
||||
outsideDomainPref.removeAttribute("disabled");
|
||||
outsideDomainLabel.removeAttribute("disabled");
|
||||
otherCasesPref.removeAttribute("disabled");
|
||||
otherCasesLabel.removeAttribute("disabled");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
// proxy config support
|
||||
function DoEnabling()
|
||||
{
|
||||
var i;
|
||||
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");
|
||||
|
||||
// convenience arrays
|
||||
var manual = [http, httpPort, socks, socksPort, socksVersion, socksVersion4, socksVersion5, ssl, sslPort, noProxy];
|
||||
var auto = [autoURL, autoReload];
|
||||
|
||||
// radio buttons
|
||||
var radiogroup = document.getElementById("networkProxyType");
|
||||
|
||||
switch ( radiogroup.value ) {
|
||||
case "0":
|
||||
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)
|
||||
for (i = 0; i < manual.length; i++)
|
||||
manual[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;
|
||||
}
|
||||
}
|
||||
|
||||
const nsIProtocolProxyService = Components.interfaces.nsIProtocolProxyService;
|
||||
const kPROTPROX_CID = '{e9b301c0-e0e4-11D3-a1a8-0050041caf44}';
|
||||
|
||||
function ReloadPAC() {
|
||||
var autoURL = document.getElementById("networkProxyAutoconfigURL");
|
||||
var pps = Components.classesByID[kPROTPROX_CID]
|
||||
.getService(nsIProtocolProxyService);
|
||||
pps.configureFromPAC(autoURL.value);
|
||||
}
|
||||
|
|
@ -0,0 +1,367 @@
|
|||
<?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.
|
||||
-
|
||||
- The Initial Developer of the Original Code is
|
||||
- Netscape Communications Corp.
|
||||
- Portions created by the Initial Developer are Copyright (C) 2001
|
||||
- the Initial Developer. All Rights Reserved.
|
||||
-
|
||||
- Contributor(s):
|
||||
- Sean Su <ssu@netscape.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 LGPL or the GPL. 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://messenger/skin/prefPanels.css" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://messenger/content/expanderBindings.css" type="text/css"?>
|
||||
|
||||
<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
|
||||
<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
|
||||
|
||||
<!DOCTYPE overlay [
|
||||
<!ENTITY % dtd1 SYSTEM "chrome://messenger/locale/pref-advanced.dtd" > %dtd1;
|
||||
<!ENTITY % dtd2 SYSTEM "chrome://messenger/locale/pref-receipts.dtd" > %dtd2;
|
||||
<!ENTITY % dtd3 SYSTEM "chrome://messenger/locale/addressbook/pref-addressing.dtd" > %dtd3;
|
||||
]>
|
||||
|
||||
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
xmlns:nc="http://home.netscape.com/NC-rdf#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
onload="onLoad();"
|
||||
headertitle="&pane.title;">
|
||||
|
||||
<script type="application/x-javascript" src="chrome://messenger/content/pref-advanced.js"/>
|
||||
<script type="application/x-javascript" src="chrome://messenger/content/addressbook/pref-directory.js"/>
|
||||
|
||||
<script type="application/x-javascript">
|
||||
<![CDATA[
|
||||
|
||||
function onLoad()
|
||||
{
|
||||
createDirectoriesList(true);
|
||||
parent.initPanel('chrome://messenger/content/pref-advanced.xul');
|
||||
}
|
||||
|
||||
var _elementIDs = [ // labels
|
||||
"label1TextBox", "label1Color", "label2TextBox", "label2Color", "label3TextBox",
|
||||
"label3Color", "label4TextBox", "label4Color", "label5TextBox", "label5Color",
|
||||
|
||||
// return receipts
|
||||
"alwaysRequest", "receiptFolder", "receiptSend", "notInToCcPref", "outsideDomainPref", "otherCasesPref",
|
||||
"mailPaneConfig",
|
||||
|
||||
// addressing prefs
|
||||
"emailCollectionOutgoing", "addressingAutocomplete", "autocompleteLDAP",
|
||||
"localDirectoriesList", "directoriesList",
|
||||
|
||||
// connection
|
||||
"networkProxyType",
|
||||
"networkProxyHTTP", "networkProxyHTTP_Port",
|
||||
"networkProxySOCKS", "networkProxySOCKS_Port",
|
||||
"networkProxySOCKSVersion",
|
||||
"networkProxySSL", "networkProxySSL_Port",
|
||||
"networkProxyNone", "networkProxyAutoconfigURL"];
|
||||
]]>
|
||||
</script>
|
||||
|
||||
<vbox id="expanderCategories" class="listBox" flex="1" style="overflow: auto;">
|
||||
|
||||
<!-- Labels -->
|
||||
<expander class="prefExpander" id="labels" label="&labelsSettings.label;" persist="open">
|
||||
<label class="expanderDescription" value="&displayText.label;" flex="1"/>
|
||||
<hbox align="top">
|
||||
<vbox>
|
||||
<!-- label color: 1 (default red) -->
|
||||
<hbox class="indent" align="center">
|
||||
<textbox id="label1TextBox" pref="true" preftype="localizedstring"
|
||||
prefstring="mailnews.labels.description.1" prefattribute="value"/>
|
||||
<colorpicker class="small-margin" type="button" id="labelColorPicker1"
|
||||
palettename="standard" onchange="setColorWell(this);"/>
|
||||
<data id="label1Color" pref="true" preftype="color" prefstring="mailnews.labels.color.1"
|
||||
prefattribute="value" wsm_attributes="value"/>
|
||||
</hbox>
|
||||
|
||||
<!-- label color: 2 (default orange) -->
|
||||
<hbox class="indent" align="center">
|
||||
<textbox id="label2TextBox" pref="true" preftype="localizedstring"
|
||||
prefstring="mailnews.labels.description.2" prefattribute="value"/>
|
||||
<colorpicker class="small-margin" type="button" id="labelColorPicker2"
|
||||
palettename="standard" onchange="setColorWell(this);"/>
|
||||
<data id="label2Color" pref="true" preftype="color" prefstring="mailnews.labels.color.2"
|
||||
prefattribute="value" wsm_attributes="value"/>
|
||||
</hbox>
|
||||
|
||||
<!-- label color: 3 (default green) -->
|
||||
<hbox class="indent" align="center">
|
||||
<textbox id="label3TextBox" pref="true" preftype="localizedstring"
|
||||
prefstring="mailnews.labels.description.3" prefattribute="value"/>
|
||||
<colorpicker class="small-margin" type="button" id="labelColorPicker3"
|
||||
palettename="standard" onchange="setColorWell(this);"/>
|
||||
<data id="label3Color" pref="true" preftype="color" prefstring="mailnews.labels.color.3"
|
||||
prefattribute="value" wsm_attributes="value"/>
|
||||
</hbox>
|
||||
</vbox>
|
||||
|
||||
<vbox>
|
||||
<!-- label color: 4 (default blue) -->
|
||||
<hbox class="indent" align="center">
|
||||
<textbox id="label4TextBox" pref="true" preftype="localizedstring" prefstring="mailnews.labels.description.4" prefattribute="value"/>
|
||||
<colorpicker class="small-margin" type="button" id="labelColorPicker4" palettename="standard" onchange="setColorWell(this);"/>
|
||||
<data id="label4Color" pref="true" preftype="color" prefstring="mailnews.labels.color.4" prefattribute="value" wsm_attributes="value"/>
|
||||
</hbox>
|
||||
|
||||
<!-- label color: 5 (default purple) -->
|
||||
<hbox class="indent" align="center">
|
||||
<textbox id="label5TextBox" pref="true" preftype="localizedstring" prefstring="mailnews.labels.description.5" prefattribute="value"/>
|
||||
<colorpicker class="small-margin" type="button" id="labelColorPicker5" palettename="standard" onchange="setColorWell(this);"/>
|
||||
<data id="label5Color" pref="true" preftype="color" prefstring="mailnews.labels.color.5" prefattribute="value" wsm_attributes="value"/>
|
||||
</hbox>
|
||||
|
||||
<hbox pack="end">
|
||||
<button label="&restoreDefaults.label;" accesskey="&restoreDefaults.accesskey;" oncommand="restoreColorAndDescriptionToDefaults();">
|
||||
</button>
|
||||
</hbox>
|
||||
</vbox>
|
||||
</hbox>
|
||||
</expander>
|
||||
|
||||
<!-- Email Collection (commented out for now until I can figure out why the abs aren't showing up)
|
||||
<expander id="emailCollection" class="prefExpander" label="&emailCollectiontitle.label;" persist="open">
|
||||
<label class="expanderDescription" value="&emailCollectiontext.label;" flex="1"/>
|
||||
<hbox align="center">
|
||||
<checkbox id="emailCollectionOutgoing" label="&emailCollectionPicker.label;" prefstring="mail.collect_email_address_outgoing"/>
|
||||
<menulist id="localDirectoriesList" flex="1" preftype="string" prefstring="mail.collect_addressbook">
|
||||
<menupopup id="abPopup-menupopup" pref="moz-abdirectory://" datasources="rdf:addressdirectory" sortActive="true"
|
||||
sortDirection="ascending" sortResource="http://home.netscape.com/NC-rdf#DirTreeNameSort">
|
||||
<template>
|
||||
<rule nc:IsWriteable="false"/>
|
||||
<rule nc:IsMailList="false">
|
||||
<menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#DirName" value="rdf:http://home.netscape.com/NC-rdf#DirUri"/>
|
||||
</rule>
|
||||
</template>
|
||||
</menupopup>
|
||||
</menulist>
|
||||
</hbox>
|
||||
</expander>
|
||||
|
||||
-->
|
||||
|
||||
<!-- Address Autocomplete -->
|
||||
<expander id="addressAutocompletion" class="prefExpander" label="&addressingTitle.label;" persist="open">
|
||||
<label class="expanderDescription" value="&autocompleteText.label;" flex="1"/>
|
||||
<hbox align="center">
|
||||
<checkbox id="addressingAutocomplete" label="&addressingEnable.label;"
|
||||
prefstring="mail.enable_autocomplete"
|
||||
accesskey="&addressingEnable.accesskey;"/>
|
||||
</hbox>
|
||||
<hbox align="center">
|
||||
<checkbox id="autocompleteLDAP" label="&directories.label;"
|
||||
prefstring="ldap_2.autoComplete.useDirectory"
|
||||
oncommand="enableAutocomplete();"
|
||||
accesskey="&directories.accesskey;"/>
|
||||
<menulist id="directoriesList" flex="1"
|
||||
preftype="string"
|
||||
prefstring="ldap_2.autoComplete.directoryServer">
|
||||
<menupopup id="directoriesListPopup"
|
||||
onpopupshowing="createDirectoriesList(true);">
|
||||
</menupopup>
|
||||
</menulist>
|
||||
<button id="editButton" label="&editDirectories.label;"
|
||||
prefstring="pref.ldap.disable_button.edit_directories"
|
||||
oncommand="onEditDirectories();"
|
||||
accesskey="&editDirectories.accesskey;"/>
|
||||
</hbox>
|
||||
</expander>
|
||||
|
||||
<!-- Window Settings -->
|
||||
<expander id="windowSettings" class="prefExpander" label="&windowSettings.label;" persist="open">
|
||||
<label class="expanderDescription" value="&selectWindowLayout.label;" control="mailPaneConfig" flex="1"/>
|
||||
<hbox align="center" class="indent">
|
||||
<radiogroup id="mailPaneConfig" prefstring="mail.pane_config" orient="horizontal">
|
||||
<radio class="iconic" value="0" id="classic"/>
|
||||
<radio class="iconic" value="1" id="wide"/>
|
||||
</radiogroup>
|
||||
</hbox>
|
||||
</expander>
|
||||
|
||||
<!-- Return Receipts -->
|
||||
<expander id="returnReceipts" class="prefExpander" label="&receiptSettings.label;" persist="open">
|
||||
|
||||
<label class="expanderDescription" value="&returnReceiptsDescription.label;" flex="1"/>
|
||||
|
||||
<vbox id="returnReceiptSettings" class="indent">
|
||||
<checkbox id="alwaysRequest" label="&requestReceipt.label;"
|
||||
prefstring="mail.receipt.request_return_receipt_on"
|
||||
accesskey="&requestReceipt.accesskey;"/>
|
||||
|
||||
<vbox id="receiptArrive">
|
||||
<description>&receiptArrive.label;</description>
|
||||
<radiogroup id="receiptFolder" prefstring="mail.incorporate.return_receipt">
|
||||
<radio value="0" label="&leaveIt.label;" accesskey="&leaveIt.accesskey;"/>
|
||||
<radio value="1" label="&moveToSent.label;" accesskey="&moveToSent.accesskey;"/>
|
||||
</radiogroup>
|
||||
</vbox>
|
||||
|
||||
<vbox id="receiptRequest">
|
||||
<description>&requestMDN.label;</description>
|
||||
<radiogroup id="receiptSend" preftype="bool" prefstring="mail.mdn.report.enabled" oncommand="EnableDisableAllowedReceipts();">
|
||||
<radio value="false" label="&never.label;" accesskey="&never.accesskey;"/>
|
||||
<radio value="true" label="&returnSome.label;" accesskey="&returnSome.accesskey;"/>
|
||||
</radiogroup>
|
||||
|
||||
<hbox id="receiptSendIf" class="indent">
|
||||
<grid>
|
||||
<columns><column/><column/></columns>
|
||||
<rows>
|
||||
<row align="center">
|
||||
<label id="notInToCcLabel" accesskey="¬InToCc.accesskey;"
|
||||
control="notInToCcPref" value="¬InToCc.label;"/>
|
||||
<menulist id="notInToCcPref" prefstring="mail.mdn.report.not_in_to_cc">
|
||||
<menupopup>
|
||||
<menuitem value="0" label="&neverSend.label;"/>
|
||||
<menuitem value="1" label="&alwaysSend.label;"/>
|
||||
<menuitem value="2" label="&askMe.label;"/>
|
||||
</menupopup>
|
||||
</menulist>
|
||||
</row>
|
||||
<row align="center">
|
||||
<label id="outsideDomainLabel" accesskey="&outsideDomain.accesskey;"
|
||||
control="outsideDomainPref" value="&outsideDomain.label;"/>
|
||||
<menulist id="outsideDomainPref" prefstring="mail.mdn.report.outside_domain">
|
||||
<menupopup>
|
||||
<menuitem value="0" label="&neverSend.label;"/>
|
||||
<menuitem value="1" label="&alwaysSend.label;"/>
|
||||
<menuitem value="2" label="&askMe.label;"/>
|
||||
</menupopup>
|
||||
</menulist>
|
||||
</row>
|
||||
<row align="center">
|
||||
<label id="otherCasesLabel" accesskey="&otherCases.accesskey;" control="otherCasesPref"
|
||||
value="&otherCases.label;"/>
|
||||
<menulist id="otherCasesPref" prefstring="mail.mdn.report.other">
|
||||
<menupopup>
|
||||
<menuitem value="0" label="&neverSend.label;"/>
|
||||
<menuitem value="1" label="&alwaysSend.label;"/>
|
||||
<menuitem value="2" label="&askMe.label;"/>
|
||||
</menupopup>
|
||||
</menulist>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
</hbox>
|
||||
</vbox>
|
||||
</vbox>
|
||||
</expander>
|
||||
|
||||
<!-- Connections -->
|
||||
<expander id="connections" class="prefExpander" label="&lHeader.label;" persist="open">
|
||||
<label class="expanderDescription" value="&proxyTitle.label;" flex="1"/>
|
||||
<radiogroup id="networkProxyType" prefstring="network.proxy.type">
|
||||
<radio value="0" label="&directTypeRadio.label;" accesskey="&directTypeRadio.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 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"/>
|
||||
<label value="&port.label;" accesskey="&HTTPport.accesskey;" control="networkProxyHTTP_Port"/>
|
||||
<textbox id="networkProxyHTTP_Port" preftype="int" prefstring="network.proxy.http_port"
|
||||
size="5"/>
|
||||
</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="&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>
|
||||
</expander>
|
||||
|
||||
</vbox>
|
||||
</page>
|
||||
|
|
@ -1,94 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
|
||||
|
||||
<!DOCTYPE page SYSTEM "chrome://messenger/locale/messengercompose/pref-formatting.dtd">
|
||||
|
||||
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
onload="Init()"
|
||||
headertitle="&pane.title;">
|
||||
|
||||
<script type="application/x-javascript">
|
||||
<![CDATA[
|
||||
var _elementIDs = ["mailDefaultHTMLAction","mailhtmldomain","mailplaintextdomain"];
|
||||
]]>
|
||||
</script>
|
||||
<script type="application/x-javascript" src="chrome://messenger/content/messengercompose/pref-formatting.js"/>
|
||||
|
||||
<!-- we are using these DTD values for localization -->
|
||||
|
||||
<data id="domaindlg" htmldlg_title="&add.htmltitle;" htmldlg_msg="&add.htmldomain;"
|
||||
plaintextdlg_title="&add.plaintexttitle;" plaintextdlg_msg="&add.plaintextdomain;"/>
|
||||
<data id="domainerrdlg" domainerrdlg_title="&domainnameError.title;" duperr="&duplicationError.label;"
|
||||
dualerr="&dualEntryError.label;"/>
|
||||
|
||||
<broadcaster id="mailhtmldomain"
|
||||
preftype="string"
|
||||
prefstring="mailnews.html_domains"
|
||||
prefattribute="value"
|
||||
wsm_attributes="value"/>
|
||||
<broadcaster id="mailplaintextdomain"
|
||||
preftype="string"
|
||||
prefstring="mailnews.plaintext_domains"
|
||||
prefattribute="value"
|
||||
wsm_attributes="value"/>
|
||||
|
||||
|
||||
<description>&sendMaildesc.label;</description>
|
||||
|
||||
<groupbox flex="1">
|
||||
<caption label="&sendMail.title;"/>
|
||||
|
||||
<hbox class="indent" align="center" id="thenBox">
|
||||
<menulist id="mailDefaultHTMLAction" preftype="int" prefstring="mail.default_html_action">
|
||||
<menupopup>
|
||||
<menuitem value="0" label="&askMe.label;" accesskey="&askMe.accesskey;"/>
|
||||
<menuitem value="1" label="&convertPlain.label;" accesskey="&convertPlain.accesskey;"/>
|
||||
<menuitem value="2" label="&sendHTML.label;" accesskey="&sendHTML.accesskey;"/>
|
||||
<menuitem value="3" label="&sendBoth.label;" accesskey="&sendBoth.accesskey;"/>
|
||||
</menupopup>
|
||||
</menulist>
|
||||
</hbox>
|
||||
<separator class="thin"/>
|
||||
<description>&override.label;</description>
|
||||
</groupbox>
|
||||
|
||||
<groupbox flex="1">
|
||||
<caption label="&domain.title;"/>
|
||||
|
||||
<description>&domaindesc.label;</description>
|
||||
|
||||
<hbox flex="1">
|
||||
<vbox id="html_box" flex="1">
|
||||
<label value="&HTMLdomaintitle.label;" accesskey="&HTMLdomaintitle.accesskey;" control="html_domains"/>
|
||||
<hbox flex="1">
|
||||
<listbox id="html_domains" flex="1" seltype="multiple"
|
||||
onkeypress="if (event.keyCode == 8 || event.keyCode == 46) RemoveDomains(htmlobj);"/>
|
||||
<vbox>
|
||||
<button label="&AddButton.label;" oncommand="AddDomain(htmlobj);" accesskey="&AddHtmlDomain.accesskey;">
|
||||
<observes element="mailhtmldomain" attribute="disabled"/>
|
||||
</button>
|
||||
<button label="&DeleteButton.label;" oncommand="RemoveDomains(htmlobj);" accesskey="&DeleteHtmlDomain.accesskey;">
|
||||
<observes element="mailhtmldomain" attribute="disabled"/>
|
||||
</button>
|
||||
</vbox>
|
||||
</hbox>
|
||||
</vbox>
|
||||
<vbox id="plaintext_box" flex="1">
|
||||
<label value="&PlainTexttitle.label;" accesskey="&PlainTexttitle.accesskey;" control="plaintext_domains"/>
|
||||
<hbox flex="1">
|
||||
<listbox id="plaintext_domains" flex="1" seltype="multiple"
|
||||
onkeypress="if (event.keyCode == 8 || event.keyCode == 46) RemoveDomains(plainobj);"/>
|
||||
<vbox>
|
||||
<button label="&AddButton.label;" oncommand="AddDomain(plainobj);" accesskey="&AddPlainText.accesskey;">
|
||||
<observes element="mailplaintextdomain" attribute="disabled"/>
|
||||
</button>
|
||||
<button label="&DeleteButton.label;" oncommand="RemoveDomains(plainobj);" accesskey="&DeletePlainText.accesskey;">
|
||||
<observes element="mailplaintextdomain" attribute="disabled"/>
|
||||
</button>
|
||||
</vbox>
|
||||
</hbox>
|
||||
</vbox>
|
||||
</hbox>
|
||||
</groupbox>
|
||||
</page>
|
|
@ -38,8 +38,6 @@ Contributor(s):
|
|||
|
||||
<script type="application/x-javascript" src="chrome://messenger/content/pref-mailnews.js"/>
|
||||
|
||||
<!-- temporarily remove mailPaneConfig from the element IDs list -->
|
||||
|
||||
<script type="application/x-javascript">
|
||||
<![CDATA[
|
||||
|
||||
|
@ -84,33 +82,13 @@ Contributor(s):
|
|||
control="mailnewsStartPageUrl"/>
|
||||
<textbox id="mailnewsStartPageUrl" flex="1" preftype="localizedstring"
|
||||
prefstring="mailnews.start_page.url"/>
|
||||
</hbox>
|
||||
|
||||
<hbox pack="end">
|
||||
<button label="&useDefault.label;" accesskey="&useDefault.accesskey;"
|
||||
<button label="&useDefault.label;" accesskey="&useDefault.accesskey;"
|
||||
oncommand="setHomePageToDefaultPage('mailnewsStartPageUrl');">
|
||||
<observes element="mailnewsStartPageUrl" attribute="disabled"/>
|
||||
</button>
|
||||
</hbox>
|
||||
<observes element="mailnewsStartPageUrl" attribute="disabled"/>
|
||||
</button>
|
||||
</hbox>
|
||||
</groupbox>
|
||||
|
||||
<!-- Temporarily hide the window setting for the alternate 3-pane until we can
|
||||
create more room for it in the prefs panel.
|
||||
|
||||
<groupbox>
|
||||
<caption label="&windowSettings.label;"/>
|
||||
|
||||
<hbox align="center">
|
||||
<label value="&selectWindowLayout.label;" accesskey="&selectWindowLayout.accesskey;" control="mailPaneConfig"/>
|
||||
<spacer flex="1"/>
|
||||
<radiogroup id="mailPaneConfig" prefstring="mail.pane_config" orient="horizontal">
|
||||
<radio class="iconic" value="0" id="classic"/>
|
||||
<radio class="iconic" value="1" id="wide"/>
|
||||
</radiogroup>
|
||||
</hbox>
|
||||
</groupbox>
|
||||
-->
|
||||
|
||||
<groupbox>
|
||||
<caption label="&newMessagesArrive.label;"/>
|
||||
|
||||
|
|
|
@ -41,23 +41,13 @@
|
|||
|
||||
<!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-privacy.dtd">
|
||||
|
||||
<!-- HACK ALERT: shamelesly hack in the connection pref panel into the privacy panel until we can find
|
||||
a better home.... -->
|
||||
|
||||
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
onload="parent.initPanel('chrome://messenger/content/pref-privacy.xul');"
|
||||
headertitle="&pane.title;">
|
||||
|
||||
<script type="application/x-javascript" src="chrome://messenger/content/pref-privacy.js"/>
|
||||
<script type="application/x-javascript">
|
||||
<![CDATA[
|
||||
var _elementIDs = ["javascriptAllowMailNews", "networkImageDisableImagesInMailNews", "networkDisableCookieForMailNews",
|
||||
"networkProxyType",
|
||||
"networkProxyHTTP", "networkProxyHTTP_Port",
|
||||
"networkProxySOCKS", "networkProxySOCKS_Port",
|
||||
"networkProxySOCKSVersion",
|
||||
"networkProxySSL", "networkProxySSL_Port",
|
||||
"networkProxyNone", "networkProxyAutoconfigURL"];
|
||||
var _elementIDs = ["javascriptAllowMailNews", "networkImageDisableImagesInMailNews", "networkDisableCookieForMailNews"];
|
||||
]]>
|
||||
</script>
|
||||
|
||||
|
@ -83,86 +73,4 @@
|
|||
|
||||
<separator class="thin"/>
|
||||
</groupbox>
|
||||
|
||||
<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="1" label="&manualTypeRadio.label;" accesskey="&manualTypeRadio.accesskey;" oncommand="DoEnabling();"/>
|
||||
<grid class="indent" flex="1">
|
||||
<columns>
|
||||
<column/>
|
||||
<column flex="1"/>
|
||||
</columns>
|
||||
|
||||
<rows>
|
||||
<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"/>
|
||||
<label value="&port.label;" accesskey="&HTTPport.accesskey;" control="networkProxyHTTP_Port"/>
|
||||
<textbox id="networkProxyHTTP_Port" preftype="int" prefstring="network.proxy.http_port"
|
||||
size="5"/>
|
||||
</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="&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>
|
||||
|
||||
</page>
|
|
@ -71,9 +71,8 @@
|
|||
<button id="mailcomposepref" orient="vertical" class="buttonBoxButton" type="radio" group="categories" url="chrome://messenger/content/messengercompose/pref-composing_messages.xul" label="&composingMessages.label;"/>
|
||||
<button orient="vertical" class="buttonBoxButton" type="radio" group="categories" url="chrome://communicator/content/pref/pref-fonts.xul" label="&fonts.label;"/>
|
||||
<button orient="vertical" class="buttonBoxButton" type="radio" group="categories" url="chrome://messenger/content/messengercompose/pref-formatting.xul" label="&format.label;"/>
|
||||
<button id="mailaddressbookpref" orient="vertical" class="buttonBoxButton" type="radio" group="categories" url="chrome://messenger/content/addressbook/pref-addressing.xul" label="&address.label;"/>
|
||||
<button orient="vertical" class="buttonBoxButton" type="radio" group="categories" url="chrome://messenger/content/pref-advanced.xul" label="&advanced.label;"/>
|
||||
<button orient="vertical" class="buttonBoxButton" type="radio" group="categories" url="chrome://messenger/content/pref-privacy.xul" label="&privacy.label;"/>
|
||||
<button orient="vertical" class="buttonBoxButton" type="radio" group="categories" url="chrome://messenger/content/pref-advanced.xul" label="&advanced.label;"/>
|
||||
</vbox>
|
||||
|
||||
<vbox flex="1">
|
||||
|
|
|
@ -7,7 +7,6 @@ messenger.jar:
|
|||
content/messenger/pref-advanced.xul (content/pref-advanced.xul)
|
||||
content/messenger/pref-advanced.js (content/pref-advanced.js)
|
||||
content/messenger/pref-privacy.xul (content/pref-privacy.xul)
|
||||
content/messenger/pref-privacy.js (content/pref-privacy.js)
|
||||
* content/messenger/expanderBindings.xml (content/expanderBindings.xml)
|
||||
* content/messenger/expanderBindings.css (content/expanderBindings.css)
|
||||
|
||||
|
@ -29,3 +28,4 @@ en-US.jar:
|
|||
|
||||
classic.jar:
|
||||
skin/classic/communicator/pref/pref.css (skin/pref.css)
|
||||
+ skin/classic/messenger/prefPanels.css (skin/prefPanels.css)
|
||||
|
|
|
@ -0,0 +1,87 @@
|
|||
<!-- ***** 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.
|
||||
-
|
||||
- The Initial Developer of the Original Code is
|
||||
- Netscape Communications Corp.
|
||||
- Portions created by the Initial Developer are Copyright (C) 2001
|
||||
- the Initial Developer. All Rights Reserved.
|
||||
-
|
||||
- Contributor(s):
|
||||
- Sean Su <ssu@netscape.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 LGPL or the GPL. 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 ***** -->
|
||||
|
||||
<!ENTITY pane.title "Advanced">
|
||||
<!ENTITY labelsSettings.label "Labels">
|
||||
<!ENTITY receiptSettings.label "Return Receipts">
|
||||
<!ENTITY displayText.label "Labels can be used to categorize and prioritize your messages.">
|
||||
<!ENTITY restoreDefaults.label "Restore Defaults">
|
||||
<!ENTITY restoreDefaults.accesskey "R">
|
||||
|
||||
<!ENTITY returnReceiptsDescription.label "Configure Return Receipts.">
|
||||
|
||||
<!--LOCALIZATION NOTE : FILE The Proxies preferences dialog -->
|
||||
<!ENTITY lHeader.label "Connection">
|
||||
<!ENTITY proxyTitle.label "Configure Proxies to Access the Internet.">
|
||||
<!ENTITY directTypeRadio.label "Direct connection to the Internet">
|
||||
<!ENTITY directTypeRadio.accesskey "d">
|
||||
<!ENTITY manualTypeRadio.label "Manual proxy configuration">
|
||||
<!ENTITY manualTypeRadio.accesskey "m">
|
||||
<!ENTITY autoTypeRadio.label "Automatic proxy configuration URL:">
|
||||
<!ENTITY autoTypeRadio.accesskey "a">
|
||||
<!ENTITY configAutoconfigText.label "Configuration location (URL):">
|
||||
<!ENTITY configAutoconfigText.accesskey "u">
|
||||
<!ENTITY reload.label "Reload">
|
||||
<!ENTITY reload.accesskey "l">
|
||||
<!ENTITY ftp.label "FTP Proxy:">
|
||||
<!ENTITY ftp.accesskey "f">
|
||||
<!ENTITY gopher.label "Gopher Proxy:">
|
||||
<!ENTITY gopher.accesskey "g">
|
||||
<!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">
|
||||
<!-- No accesskey for gopher (':' doesn't go well) - mpt's going to redesign the window -->
|
||||
<!ENTITY gopherPort.accesskey "">
|
||||
<!ENTITY SOCKSport.accesskey "t">
|
||||
<!ENTITY noproxy.label "No Proxy for:">
|
||||
<!ENTITY noproxy.accesskey "n">
|
||||
<!ENTITY noproxyExplain.label "Example: .mozilla.org, .net.nz">
|
||||
|
||||
<!ENTITY windowSettings.label "Windows">
|
||||
<!ENTITY selectWindowLayout.label "Select the window layout you prefer for Mail.">
|
||||
<!ENTITY selectWindowLayout.accesskey "l">
|
|
@ -35,10 +35,6 @@ Rights Reserved.
|
|||
<!ENTITY useDefault.accesskey "R">
|
||||
<!ENTITY rememberLastMsg.label "Remember the last selected message">
|
||||
<!ENTITY rememberLastMsg.accesskey "e">
|
||||
<!ENTITY windowSettings.label "Windows">
|
||||
<!ENTITY selectWindowLayout.label "Select the window layout you prefer for Mail:">
|
||||
<!ENTITY selectWindowLayout.accesskey "l">
|
||||
<!ENTITY chooseExp.label "Note: For this setting to take effect, you will need to exit and then restart Mail.">
|
||||
<!ENTITY warnOnSendAccelKey.label "Confirm when using keyboard shortcut to send message">
|
||||
<!ENTITY warnOnSendAccelKey.accesskey "o">
|
||||
|
||||
|
|
|
@ -1,48 +0,0 @@
|
|||
<!ENTITY pane.title "Privacy">
|
||||
<!ENTITY features.label "Allow the following features:">
|
||||
<!ENTITY enbJsCheckMailNews.label "JavaScript">
|
||||
<!ENTITY enbJsCheckMailNews.accesskey "s">
|
||||
<!ENTITY enbPluginCheckMailNews.label "Plugins">
|
||||
<!ENTITY enbPluginCheckMailNews.accesskey "p">
|
||||
<!ENTITY disableImageInMailNews.label "Loading of remote images">
|
||||
<!ENTITY disableImageInMailNews.accesskey "L">
|
||||
<!ENTITY disableCookieForMailNews.label "Cookies">
|
||||
<!ENTITY disableCookieForMailNews.accesskey "C">
|
||||
|
||||
<!--LOCALIZATION NOTE : FILE The Proxies preferences dialog -->
|
||||
<!ENTITY lHeader "Connection">
|
||||
<!ENTITY proxyTitle.label "Configure Proxies to Access the Internet">
|
||||
<!ENTITY directTypeRadio.label "Direct connection to the Internet">
|
||||
<!ENTITY directTypeRadio.accesskey "d">
|
||||
<!ENTITY manualTypeRadio.label "Manual proxy configuration">
|
||||
<!ENTITY manualTypeRadio.accesskey "m">
|
||||
<!ENTITY autoTypeRadio.label "Automatic proxy configuration URL:">
|
||||
<!ENTITY autoTypeRadio.accesskey "a">
|
||||
<!ENTITY configAutoconfigText.label "Configuration location (URL):">
|
||||
<!ENTITY configAutoconfigText.accesskey "u">
|
||||
<!ENTITY reload.label "Reload">
|
||||
<!ENTITY reload.accesskey "l">
|
||||
<!ENTITY ftp.label "FTP Proxy:">
|
||||
<!ENTITY ftp.accesskey "f">
|
||||
<!ENTITY gopher.label "Gopher Proxy:">
|
||||
<!ENTITY gopher.accesskey "g">
|
||||
<!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">
|
||||
<!-- No accesskey for gopher (':' doesn't go well) - mpt's going to redesign the window -->
|
||||
<!ENTITY gopherPort.accesskey "">
|
||||
<!ENTITY SOCKSport.accesskey "t">
|
||||
<!ENTITY noproxy.label "No Proxy for:">
|
||||
<!ENTITY noproxy.accesskey "n">
|
||||
<!ENTITY noproxyExplain.label "Example: .mozilla.org, .net.nz">
|
|
@ -96,20 +96,6 @@
|
|||
min-width: 8em;
|
||||
}
|
||||
|
||||
/** Privacy Panel Expander Box **/
|
||||
#privacyCategories {
|
||||
margin: 5px;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
.settingsContainer {
|
||||
padding: 3px 5px 5px 20px;
|
||||
}
|
||||
|
||||
.expanderButton {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
/* Themes/Extensions Items */
|
||||
.themesLink {
|
||||
margin-left: 5px;
|
||||
|
|
|
@ -0,0 +1,71 @@
|
|||
/*
|
||||
* 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):
|
||||
*
|
||||
*/
|
||||
|
||||
/* ===== prefPanels.css =================================================
|
||||
== Styles for the Messenger preference panels.
|
||||
======================================================================= */
|
||||
|
||||
@import url("chrome://messenger/skin/");
|
||||
@import url("chrome://communicator/skin/prefpanels.css");
|
||||
|
||||
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
|
||||
|
||||
/* :::::: layout preference icons ::::: */
|
||||
|
||||
#classic
|
||||
{
|
||||
min-height : 32px;
|
||||
list-style-image : url("chrome://messenger/skin/icons/winclassic.gif");
|
||||
}
|
||||
|
||||
#wide
|
||||
{
|
||||
min-height : 32px;
|
||||
list-style-image : url("chrome://messenger/skin/icons/winwide.gif");
|
||||
}
|
||||
|
||||
.expanderButton
|
||||
{
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.prefExpander
|
||||
{
|
||||
margin: 5px;
|
||||
border: 1px solid ThreeDShadow;
|
||||
-moz-border-radius: 5px;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
.expander-caption
|
||||
{
|
||||
margin: 0px 6px 2px 6px;
|
||||
padding: 0px 3px;
|
||||
background-color: -moz-Dialog;
|
||||
}
|
||||
|
||||
.expanderDescription
|
||||
{
|
||||
padding: 5px 5px;
|
||||
}
|
||||
|
Загрузка…
Ссылка в новой задаче