Bug #285158 --> unfork a bunch of preferences files now that we are sharing them with firefox in toolkit\mozapps\preferences

This commit is contained in:
scott%scott-macgregor.org 2005-03-11 04:03:23 +00:00
Родитель 18b04774f4
Коммит 699973bcc4
31 изменённых файлов: 3 добавлений и 918 удалений

Просмотреть файл

@ -1,126 +0,0 @@
# -*- Mode: Java; tab-width: 2; 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 the Thunderbird Preferences System.
#
# The Initial Developer of the Original Code is Scott MacGregor.
# Portions created by the Initial Developer are Copyright (C) 2005
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Scott MacGregor <mscott@mozilla.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 *****
var gAdvancedPane = {
mPane: null,
mInitialized: false,
init: function ()
{
this.mPane = document.getElementById("paneAdvanced");
this.updateMarkAsReadTextbox(false);
var preference = document.getElementById("mail.preferences.advanced.selectedTabIndex");
if (preference.value)
document.getElementById("advancedPrefs").selectedIndex = preference.value;
this.mInitialized = true;
},
tabSelectionChanged: function ()
{
if (this.mInitialized)
{
var preference = document.getElementById("mail.preferences.advanced.selectedTabIndex");
preference.valueFromPreferences = document.getElementById("advancedPrefs").selectedIndex;
}
},
showCertificates: function ()
{
document.documentElement.openSubDialog("chrome://pippki/content/certManager.xul",
"width=600,height=400", null);
},
showCRLs: function ()
{
document.documentElement.openSubDialog("chrome://pippki/content/crlManager.xul",
"width=600,height=400", null);
},
showOCSP: function ()
{
document.documentElement.openSubDialog("chrome://messenger/content/preferences/ocsp.xul",
"", null);
},
showSecurityDevices: function ()
{
document.documentElement.openSubDialog("chrome://pippki/content/device_manager.xul",
"width=600,height=400", null);
},
updateAppUpdateUI: function ()
{
var preference = document.getElementById("app.update.autoUpdateEnabled");
var ids = ["enableAutoInstall", "autoInstallMode", "updateAnd"];
if (!preference.value)
for (var i = 0; i < ids.length; ++i)
document.getElementById(ids[i]).disabled = true;
else
{
document.getElementById("enableAutoInstall").disabled = false;
this.updateAutoInstallUI();
}
return undefined;
},
updateAutoInstallUI: function ()
{
var preference = document.getElementById("app.update.autoInstallEnabled");
var ids = ["autoInstallMode", "updateAnd"];
for (var i = 0; i < ids.length; ++i)
document.getElementById(ids[i]).disabled = !preference.value;
return undefined;
},
checkForUpdates: function (aType)
{
var updates = Components.classes["@mozilla.org/updates/update-service;1"]
.getService(Components.interfaces.nsIUpdateService);
updates.checkForUpdates([], 0, aType,
Components.interfaces.nsIUpdateService.SOURCE_EVENT_USER,
null);
},
updateMarkAsReadTextbox: function(aFocusTextBox)
{
var textbox = document.getElementById('markAsReadDelay');
var checkbox = document.getElementById('markAsRead');
textbox.disabled = !checkbox.checked;
if (!textbox.disabled && aFocusTextBox)
textbox.focus();
},
};

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

@ -1,220 +0,0 @@
# -*- Mode: Java; tab-width: 2; 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 the Thunderbird Preferences System.
#
# The Initial Developer of the Original Code is Ben Goodger.
# Portions created by the Initial Developer are Copyright (C) 2005
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Scott MacGregor <mscott@mozilla.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 *****
const kDefaultFontType = "font.default.%LANG%";
const kFontNameFmtSerif = "font.name.serif.%LANG%";
const kFontNameFmtSansSerif = "font.name.sans-serif.%LANG%";
const kFontNameFmtMonospace = "font.name.monospace.%LANG%";
const kFontNameListFmtSerif = "font.name-list.serif.%LANG%";
const kFontNameListFmtSansSerif = "font.name-list.sans-serif.%LANG%";
const kFontNameListFmtMonospace = "font.name-list.monospace.%LANG%";
const kFontSizeFmtVariable = "font.size.variable.%LANG%";
const kFontSizeFmtFixed = "font.size.fixed.%LANG%";
const kFontMinSizeFmt = "font.minimum-size.%LANG%";
var gFontsDialog = {
_selectLanguageGroup: function (aLanguageGroup)
{
var prefs = [{ format: kDefaultFontType, type: "string", element: "defaultFontType", fonttype: null},
{ format: kFontNameFmtSerif, type: "unichar", element: "serif", fonttype: "serif" },
{ format: kFontNameFmtSansSerif, type: "unichar", element: "sans-serif", fonttype: "sans-serif" },
{ format: kFontNameFmtMonospace, type: "unichar", element: "monospace", fonttype: "monospace" },
{ format: kFontNameListFmtSerif, type: "unichar", element: null, fonttype: "serif" },
{ format: kFontNameListFmtSansSerif, type: "unichar", element: null, fonttype: "sans-serif" },
{ format: kFontNameListFmtMonospace, type: "unichar", element: null, fonttype: "monospace" },
{ format: kFontSizeFmtVariable, type: "int", element: "sizeVar", fonttype: null },
{ format: kFontSizeFmtFixed, type: "int", element: "sizeMono", fonttype: null },
{ format: kFontMinSizeFmt, type: "int", element: "minSize", fonttype: null }];
var preferences = document.getElementById("fontPreferences");
for (var i = 0; i < prefs.length; ++i) {
var preference = document.getElementById(prefs[i].format.replace(/%LANG%/, aLanguageGroup));
if (!preference) {
preference = document.createElement("preference");
var name = prefs[i].format.replace(/%LANG%/, aLanguageGroup);
preference.id = name;
preference.setAttribute("name", name);
preference.setAttribute("type", prefs[i].type);
preferences.appendChild(preference);
}
if (!prefs[i].element)
continue;
var element = document.getElementById(prefs[i].element);
if (element) {
element.setAttribute("preference", preference.id);
if (prefs[i].fonttype)
FontBuilder.buildFontList(aLanguageGroup, prefs[i].fonttype, element);
preference.setElementValue(element);
}
}
},
readFontLanguageGroup: function ()
{
var languagePref = document.getElementById("font.language.group");
this._selectLanguageGroup(languagePref.value);
return undefined;
},
readFontSelection: function (aElement)
{
// Determine the appropriate value to select, for the following cases:
// - there is no setting
// - the font selected by the user is no longer present (e.g. deleted from
// fonts folder)
var preference = document.getElementById(aElement.getAttribute("preference"));
if (preference.value) {
var fontItems = aElement.getElementsByAttribute("value", preference.value);
// There is a setting that actually is in the list. Respect it.
if (fontItems.length > 0)
return undefined;
}
var defaultValue = aElement.firstChild.firstChild.getAttribute("value");
var languagePref = document.getElementById("font.language.group");
preference = document.getElementById("font.name-list." + aElement.id + "." + languagePref.value);
if (!preference || !preference.hasUserValue)
return defaultValue;
var fontNames = preference.value.split(",");
var stripWhitespace = /^\s*(.*)\s*$/;
for (var i = 0; i < fontNames.length; ++i) {
var fontName = fontNames[i].replace(stripWhitespace, "$1");
fontItems = aElement.getElementsByAttribute("value", fontName);
if (fontItems.length)
break;
}
if (fontItems.length)
return fontItems[0].getAttribute("value");
return defaultValue;
},
readUseDocumentFonts: function ()
{
var preference = document.getElementById("browser.display.use_document_fonts");
return preference.value == 1;
},
writeUseDocumentFonts: function ()
{
var useDocumentFonts = document.getElementById("useDocumentFonts");
return useDocumentFonts.checked ? 1 : 0;
},
readScreenResolution: function ()
{
// Initialize the display names of the default values the first time
// the preference is read. We can NOT do this in the init function since
// that is called after preference loading.
var defaultResolution = document.getElementById("defaultResolution");
if (defaultResolution.label == "") {
var bundlePreferences = document.getElementById("bundlePreferences");
var otherResolution = document.getElementById("otherResolution");
otherResolution.label = bundlePreferences.getFormattedString("fontScalingResolutionFormat",
[otherResolution.getAttribute("value")]);
defaultResolution.label = bundlePreferences.getFormattedString("fontScalingResolutionFormat",
[defaultResolution.getAttribute("value")]);
}
return undefined;
},
changeScreenResolution: function (aMenulist)
{
var userResolution = document.getElementById("userResolution");
var screenResolution = document.getElementById("screenResolution");
var lastSelected = screenResolution.getElementsByAttribute("lastSelected", "true")
if (lastSelected.length > 0)
lastSelected = lastSelected[0];
else {
var preference = document.getElementById("browser.display.screen_resolution");
lastSelected = screenResolution.getElementsByAttribute("value", preference.value);
if (lastSelected.length > 0)
lastSelected = lastSelected[0];
else
lastSelected = document.getElementById("defaultResolution");
}
if (aMenulist.selectedItem.value == "choose") {
var rv = { newdpi: -1 };
document.documentElement.openSubDialog("chrome://messenger/content/preferences/fontscaling.xul",
"", rv);
if (rv.newdpi != -1) {
this._setResolution(rv.newdpi);
lastSelected.removeAttribute("lastSelected");
screenResolution.selectedItem.setAttribute("lastSelected", "true");
}
else
screenResolution.selectedItem = lastSelected;
}
else if (!(screenResolution.value == userResolution.value)) {
// User has selected one of the hard-coded resolutions
userResolution.hidden = true;
lastSelected.removeAttribute("lastSelected");
screenResolution.selectedItem.setAttribute("lastSelected", "true");
}
},
_setResolution: function (aResolution)
{
// Given a number, if it's equal to a hard-coded resolution we use that,
// otherwise we set the userResolution field.
var screenResolution = document.getElementById("screenResolution");
var userResolution = document.getElementById("userResolution");
var items = screenResolution.getElementsByAttribute("value", aResolution);
if (items[0]) {
// If it's one of the hard-coded values, we'll select it directly
screenResolution.selectedItem = items[0];
userResolution.hidden = true;
}
else {
// Otherwise we need to set up the userResolution field
var bundlePreferences = document.getElementById("bundlePreferences");
var label = bundlePreferences.getFormattedString("fontScalingResolutionFormat",
[aResolution]);
userResolution.value = aResolution;
userResolution.label = label;
userResolution.hidden = false;
screenResolution.selectedItem = userResolution;
}
}
};

Просмотреть файл

@ -1,279 +0,0 @@
<?xml version="1.0"?>
# -*- Mode: Java; tab-width: 2; 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 the Thunderbird Preferences System.
#
# The Initial Developer of the Original Code is Scott MacGregor.
# Portions created by the Initial Developer are Copyright (C) 2005
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Scott MacGregor <mscott@mozilla.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 *****
<?xml-stylesheet href="chrome://global/skin/"?>
<!DOCTYPE prefwindow [
<!ENTITY % fontsDTD SYSTEM "chrome://messenger/locale/preferences/fonts.dtd" >
%fontsDTD;
]>
<prefwindow id="FontsDialog" type="child"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
title="&fontsDialog.title;"
dlgbuttons="accept,cancel"
style="width: 39em !important;">
<prefpane id="FontsDialogPane">
<preferences id="fontPreferences">
<preference id="font.language.group" name="font.language.group" type="wstring"/>
<preference id="browser.display.screen_resolution"
name="browser.display.screen_resolution"
type="int"/>
<preference id="browser.display.use_document_fonts"
name="browser.display.use_document_fonts"
type="int"/>
<preference id="intl.charset.default" name="intl.charset.default" type="wstring"/>
</preferences>
<stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
<script type="application/x-javascript" src="chrome://messenger/content/preferences/fontbuilder.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/preferences/fonts.js"/>
<groupbox>
<caption>
<hbox align="center">
<label value="&language.label;" accesskey="&language.accesskey;" control="selectLangs"/>
</hbox>
<menulist id="selectLangs" onpreferenceread="return gFontsDialog.readFontLanguageGroup();"
preference="font.language.group">
<menupopup>
<menuitem value="x-western" label="&font.langGroup.latin1;"/>
<menuitem value="x-central-euro" label="&font.langGroup.latin2;"/>
<menuitem value="ja" label="&font.langGroup.japanese;"/>
<menuitem value="zh-TW" label="&font.langGroup.trad-chinese;"/>
<menuitem value="zh-CN" label="&font.langGroup.simpl-chinese;"/>
<menuitem value="zh-HK" label="&font.langGroup.trad-chinese-hk;"/>
<menuitem value="ko" label="&font.langGroup.korean;"/>
<menuitem value="x-cyrillic" label="&font.langGroup.cyrillic;"/>
<menuitem value="x-baltic" label="&font.langGroup.baltic;"/>
<menuitem value="el" label="&font.langGroup.el;"/>
<menuitem value="tr" label="&font.langGroup.turkish;"/>
<menuitem value="x-unicode" label="&font.langGroup.unicode;"/>
<menuitem value="x-user-def" label="&font.langGroup.user-def;"/>
<menuitem value="th" label="&font.langGroup.thai;"/>
<menuitem value="he" label="&font.langGroup.hebrew;"/>
<menuitem value="ar" label="&font.langGroup.arabic;"/>
<menuitem value="x-devanagari" label="&font.langGroup.devanagari;"/>
<menuitem value="x-tamil" label="&font.langGroup.tamil;"/>
</menupopup>
</menulist>
</caption>
<separator class="thin"/>
<grid>
<columns>
<column/>
<column flex="1"/>
<column/>
<column/>
</columns>
<rows>
<row>
<separator class="thin"/>
</row>
<row align="center">
<hbox align="center" pack="end">
<label accesskey="&proportional.accesskey;" control="proportionalFont">&proportional.label;</label>
</hbox>
<menulist id="defaultFontType" flex="1" style="width: 0px;">
<menupopup>
<menuitem value="serif" label="&useDefaultFontSerif.label;"/>
<menuitem value="sans-serif" label="&useDefaultFontSansSerif.label;"/>
</menupopup>
</menulist>
<hbox align="center" pack="end">
<label value="&sizes.label;"/>
</hbox>
<menulist id="sizeVar" class="small-margin">
<menupopup>
<menuitem value="8" label="8"/>
<menuitem value="9" label="9"/>
<menuitem value="10" label="10"/>
<menuitem value="11" label="11"/>
<menuitem value="12" label="12"/>
<menuitem value="13" label="13"/>
<menuitem value="14" label="14"/>
<menuitem value="15" label="15"/>
<menuitem value="16" label="16"/>
<menuitem value="17" label="17"/>
<menuitem value="18" label="18"/>
<menuitem value="20" label="20"/>
<menuitem value="22" label="22"/>
<menuitem value="24" label="24"/>
<menuitem value="26" label="26"/>
<menuitem value="28" label="28"/>
<menuitem value="30" label="30"/>
<menuitem value="32" label="32"/>
<menuitem value="34" label="34"/>
<menuitem value="36" label="36"/>
<menuitem value="40" label="40"/>
<menuitem value="44" label="44"/>
<menuitem value="48" label="48"/>
<menuitem value="56" label="56"/>
<menuitem value="64" label="64"/>
<menuitem value="72" label="72"/>
</menupopup>
</menulist>
</row>
<row align="center">
<hbox align="center" pack="end">
<label accesskey="&serif.accesskey;" control="serif">&serif.label;</label>
</hbox>
<menulist id="serif" flex="1" style="width: 0px;"
onpreferenceread="return gFontsDialog.readFontSelection(document.getElementById('serif'));"/>
<spacer/>
</row>
<row align="center">
<hbox align="center" pack="end">
<label accesskey="&sans-serif.accesskey;" control="sans-serif">&sans-serif.label;</label>
</hbox>
<menulist id="sans-serif" flex="1" style="width: 0px;"
onpreferenceread="return gFontsDialog.readFontSelection(document.getElementById('sans-serif'));"/>
<spacer/>
</row>
<row align="center">
<hbox align="center" pack="end">
<label accesskey="&monospace.accesskey;" control="monospace">&monospace.label;</label>
</hbox>
<menulist id="monospace" flex="1" style="width: 0px;" crop="right"
onpreferenceread="return gFontsDialog.readFontSelection(document.getElementById('monospace'));"/>
<hbox align="center" pack="end">
<label>&sizes.label;</label>
</hbox>
<menulist id="sizeMono" class="small-margin">
<menupopup>
<menuitem value="8" label="8"/>
<menuitem value="9" label="9"/>
<menuitem value="10" label="10"/>
<menuitem value="11" label="11"/>
<menuitem value="12" label="12"/>
<menuitem value="13" label="13"/>
<menuitem value="14" label="14"/>
<menuitem value="15" label="15"/>
<menuitem value="16" label="16"/>
<menuitem value="17" label="17"/>
<menuitem value="18" label="18"/>
<menuitem value="20" label="20"/>
<menuitem value="22" label="22"/>
<menuitem value="24" label="24"/>
<menuitem value="26" label="26"/>
<menuitem value="28" label="28"/>
<menuitem value="30" label="30"/>
<menuitem value="32" label="32"/>
<menuitem value="34" label="34"/>
<menuitem value="36" label="36"/>
<menuitem value="40" label="40"/>
<menuitem value="44" label="44"/>
<menuitem value="48" label="48"/>
<menuitem value="56" label="56"/>
<menuitem value="64" label="64"/>
<menuitem value="72" label="72"/>
</menupopup>
</menulist>
</row>
</rows>
</grid>
<separator class="thin"/>
<hbox flex="1">
<hbox align="center" pack="end">
<label accesskey="&resolution.accesskey;" control="screenResolution">&resolution.label;</label>
<menulist id="screenResolution"
oncommand="gFontsDialog.changeScreenResolution(this)"
preference="browser.display.screen_resolution"
onpreferenceread="return gFontsDialog.readScreenResolution();">
<menupopup>
<menuitem id="otherResolution" value="72"/>
<menuitem id="defaultResolution" value="96"/>
#ifdef XP_UNIX
#ifndef XP_MACOSX
<menuitem id="systemResolution" value="0" label="&resolution.system.label;"/>
#endif
#endif
<menuseparator id="resolutionSeparator"/>
<menuitem id="userResolution" hidden="true"/>
<menuitem id="chooseUserResolution" value="choose" label="&resolution.other;"/>
</menupopup>
</menulist>
</hbox>
<spacer flex="1"/>
<hbox align="center" pack="end">
<label accesskey="&minSize.accesskey;" control="minSize">&minSize.label;</label>
<menulist id="minSize">
<menupopup>
<menuitem value="0" label="&minSize.none;"/>
<menuitem value="9" label="9"/>
<menuitem value="10" label="10"/>
<menuitem value="11" label="11"/>
<menuitem value="12" label="12"/>
<menuitem value="13" label="13"/>
<menuitem value="14" label="14"/>
<menuitem value="15" label="15"/>
<menuitem value="16" label="16"/>
<menuitem value="17" label="17"/>
<menuitem value="18" label="18"/>
<menuitem value="20" label="20"/>
<menuitem value="22" label="22"/>
<menuitem value="24" label="24"/>
</menupopup>
</menulist>
</hbox>
</hbox>
<separator class="thin"/>
<hbox>
<checkbox id="useDocumentFonts"
label="&useDocumentFonts.label;" accesskey="&useDocumentFonts.accesskey;"
preference="browser.display.use_document_fonts"
onpreferenceread="return gFontsDialog.readUseDocumentFonts();"
onpreferencewrite="return gFontsDialog.writeUseDocumentFonts();"/>
</hbox>
</groupbox>
<separator/>
</prefpane>
</prefwindow>

Просмотреть файл

Просмотреть файл

Просмотреть файл

@ -1,43 +0,0 @@
messenger.jar:
* content/messenger/preferences/preferences.xul
* content/messenger/preferences/general.xul
* content/messenger/preferences/general.js
* content/messenger/preferences/display.xul
* content/messenger/preferences/display.js
* content/messenger/preferences/compose.xul
* content/messenger/preferences/compose.js
* content/messenger/preferences/sendoptions.xul
* content/messenger/preferences/sendoptions.js
* content/messenger/preferences/htmlcompose.xul
* content/messenger/preferences/htmlcompose.js
* content/messenger/preferences/privacy.xul
* content/messenger/preferences/privacy.js
* content/messenger/preferences/removemp.js
* content/messenger/preferences/removemp.xul
* content/messenger/preferences/changemp.js
* content/messenger/preferences/changemp.xul
* content/messenger/preferences/viewpasswords.js
* content/messenger/preferences/viewpasswords.xul
* content/messenger/preferences/advanced.js
* content/messenger/preferences/advanced.xul
* content/messenger/preferences/ocsp.js
* content/messenger/preferences/ocsp.xul
* content/messenger/preferences/receipts.xul
* content/messenger/preferences/connection.js
* content/messenger/preferences/connection.xul
* content/messenger/preferences/downloads.js
* content/messenger/preferences/downloads.xul
* content/messenger/preferences/downloadactions.js
* content/messenger/preferences/downloadactions.xul
* content/messenger/preferences/actionsshared.js
* content/messenger/preferences/changeaction.js
* content/messenger/preferences/changeaction.xul
* content/messenger/preferences/fonts.js
* content/messenger/preferences/fonts.xul
* content/messenger/preferences/fontscaling.js
* content/messenger/preferences/fontscaling.xul
* content/messenger/preferences/fontbuilder.js
* content/messenger/preferences/notifications.xul
* content/messenger/preferences/notifications.js
* content/messenger/preferences/preferences.xml
* content/messenger/preferences/preferences.css

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

@ -1,85 +0,0 @@
<?xml version="1.0"?>
# -*- Mode: Java; tab-width: 2; 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 the Thunderbird Preferences System.
#
# The Initial Developer of the Original Code is Scott MacGregor.
# Portions created by the Initial Developer are Copyright (C) 2005
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Scott MacGregor <mscott@mozilla.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 *****
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
<?xml-stylesheet href="chrome://messenger/content/preferences/preferences.css"?>
<!DOCTYPE prefwindow [
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
<!ENTITY % preferencesDTD SYSTEM "chrome://messenger/locale/preferences/preferences.dtd">
%brandDTD;
%preferencesDTD;
]>
<prefwindow type="prefwindow"
id="MailPreferences"
windowtype="Mail:Preferences"
#ifdef XP_WIN
title="&prefWindow.titleWin;"
#else
#ifdef XP_UNIX
#ifndef XP_MACOSX
title="&prefWindow.titleGNOME;"
#endif
#endif
#endif
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
#ifdef XP_WIN
style="&prefWindow.styleWin;">
#else
#ifdef XP_MACOSX
style="&prefWindow.styleMac;">
#else
style="&prefWindow.styleUnix;">
#endif
#endif
<prefpane id="paneGeneral" label="&paneGeneral.title;"
src="chrome://messenger/content/preferences/general.xul"/>
<prefpane id="paneDisplay" label="&paneDisplay.title;"
src="chrome://messenger/content/preferences/display.xul"/>
<prefpane id="paneCompose" label="&paneComposition.title;"
src="chrome://messenger/content/preferences/compose.xul"/>
<prefpane id="panePrivacy" label="&panePrivacy.title;"
src="chrome://messenger/content/preferences/privacy.xul"/>
<prefpane id="paneDownloads" label="&paneAttachments.title;"
src="chrome://messenger/content/preferences/downloads.xul"/>
<prefpane id="paneAdvanced" label="&paneAdvanced.title;"
src="chrome://messenger/content/preferences/advanced.xul"/>
</prefwindow>

Просмотреть файл

@ -1,140 +0,0 @@
# -*- Mode: Java; tab-width: 2; 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 the Thunderbird Preferences System.
#
# The Initial Developer of the Original Code is Scott MacGregor.
# Portions created by the Initial Developer are Copyright (C) 2005
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Scott MacGregor <mscott@mozilla.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 *****
var gPrivacyPane = {
mPane: null,
mInitialized: false,
init: function ()
{
this.mPane = document.getElementById("panePrivacy");
this.updateRemoteImagesState();
// Update the MP buttons
this.updateMasterPasswordButton();
var preference = document.getElementById("mail.preferences.privacy.selectedTabIndex");
if (preference.value)
document.getElementById("privacyPrefs").selectedIndex = preference.value;
this.mInitialized = true;
},
tabSelectionChanged: function ()
{
if (this.mInitialized)
{
var preference = document.getElementById("mail.preferences.privacy.selectedTabIndex");
preference.valueFromPreferences = document.getElementById("privacyPrefs").selectedIndex;
}
},
updateRemoteImagesState: function()
{
var checkbox = document.getElementById('networkImageDisableImagesInMailNews');
if (checkbox.checked)
{
document.getElementById('useWhiteList').removeAttribute('disabled');
document.getElementById('whiteListAbURI').removeAttribute('disabled');
}
else
{
document.getElementById('useWhiteList').setAttribute('disabled', 'true');
document.getElementById('whiteListAbURI').setAttribute('disabled', 'true');
}
},
initReencryptCallback: function()
{
var wallet = Components.classes['@mozilla.org/wallet/wallet-service;1'];
wallet = wallet.getService().QueryInterface(Components.interfaces.nsIWalletService);
wallet.WALLET_InitReencryptCallback(window);
},
viewPasswords: function()
{
document.documentElement.openSubDialog("chrome://messenger/content/preferences/viewpasswords.xul",
"", null);
},
changeMasterPassword: function ()
{
document.documentElement.openSubDialog("chrome://messenger/content/preferences/changemp.xul",
"", null);
this.updateMasterPasswordButton();
},
updateMasterPasswordButton: function ()
{
// See if there's a master password and set the button label accordingly
var secmodDB = Components.classes["@mozilla.org/security/pkcs11moduledb;1"]
.getService(Components.interfaces.nsIPKCS11ModuleDB);
var slot = secmodDB.findSlotByName("");
if (slot) {
const nsIPKCS11Slot = Components.interfaces.nsIPKCS11Slot;
var status = slot.status;
var noMP = status == nsIPKCS11Slot.SLOT_UNINITIALIZED ||
status == nsIPKCS11Slot.SLOT_READY;
var bundle = document.getElementById("bundlePreferences");
var button = document.getElementById("setMasterPassword");
button.label = bundle.getString(noMP ? "setMasterPassword" : "changeMasterPassword");
var removeButton = document.getElementById("removeMasterPassword");
removeButton.disabled = noMP;
}
},
removeMasterPassword: function ()
{
var secmodDB = Components.classes["@mozilla.org/security/pkcs11moduledb;1"]
.getService(Components.interfaces.nsIPKCS11ModuleDB);
if (secmodDB.isFIPSEnabled)
{
var bundle = document.getElementById("bundlePreferences");
promptService.alert(window,
bundle.getString("pw_change_failed_title"),
bundle.getString("pw_change2empty_in_fips_mode"));
}
else
{
document.documentElement.openSubDialog("chrome://messenger/content/preferences/removemp.xul",
"", null);
this.updateMasterPasswordButton();
document.getElementById("setMasterPassword").focus();
}
},
};

Просмотреть файл

Просмотреть файл

Просмотреть файл

@ -34,6 +34,7 @@ locale/en-US/necko, en-US/locale/en-
locale/en-US/mozapps, en-US/locale/en-US/mozapps
locale/en-US/mozapps/downloads, en-US/locale/en-US/mozapps/downloads
locale/en-US/mozapps/extensions, en-US/locale/en-US/mozapps/extensions
locale/en-US/mozapps/preferences, en-US/locale/en-US/mozapps/preferences
locale/en-US/mozapps/profile, en-US/locale/en-US/mozapps/profile
locale/en-US/mozapps/update, en-US/locale/en-US/mozapps/update
locale/en-US/mozapps/xpinstall, en-US/locale/en-US/mozapps/xpinstall

Просмотреть файл

@ -16,7 +16,7 @@ content/messenger-smime, msg/content/messenger-smime
content/messenger-views, msg/content/messenger-views
content/messenger/messengercompose, msg/content/messenger/messengercompose
content/messenger/preferences, msg/content/messenger/preferences
content/editor/images, msg/content/editor/images
content/editor/images, msg/content/editor/images
content/messenger/addressbook, msg/content/messenger/addressbook
content/messenger/migration, msg/content/messenger/migration
content/branding, msg/content/branding
@ -135,6 +135,7 @@ content/mozapps/extensions, toolkit/content/mozapps/ex
content/mozapps/update, toolkit/content/mozapps/update
content/mozapps/shared, toolkit/content/mozapps/shared
content/mozapps/xpinstall, toolkit/content/mozapps/xpinstall
content/mozapps/preferences, toolkit/content/mozapps/preferences
content/mozapps/contents.rdf, toolkit/content/mozapps/contents.rdf
# from xpfe\components

Просмотреть файл

@ -430,13 +430,3 @@ function openDeviceManager()
}
}
function openOCSPDialog()
{
window.openDialog("chrome://messenger-smime/content/ocsp.xul", "_blank",
"chrome,resizable=yes,centerscreen","ocsp");
}
function openCRLManager ()
{
window.open('chrome://pippki/content/crlManager.xul', "", 'chrome,width=500,height=400,resizable=1');
}

Просмотреть файл

@ -119,10 +119,6 @@
<hbox align="center">
<button label="&managecerts.button;" oncommand="openCertManager();" id="openCertManagerButton"
accesskey="&managecerts.accesskey;" prefstring="security.disable_button.openCertManager"/>
<button label="&viewCRLs.button;" oncommand="openCRLManager();" id="viewCRLsButton"
accesskey="&viewCRLs.accesskey;"/>
<button label="&viewOCSP.button;" oncommand="openOCSPDialog();" id="viewOCSPButton"
accesskey="&viewOCSP.accesskey;"/>
<button label="&managedevices.button;" oncommand="openDeviceManager();" id="openDeviceManagerButton"
accesskey="&managedevices.accesskey;" prefstring="security.disable_button.openDeviceManager"/>
</hbox>

Просмотреть файл

Просмотреть файл

Просмотреть файл

@ -4,8 +4,6 @@ messenger.jar:
*+ content/messenger-smime/msgCompSecurityInfo.xul (content/msgCompSecurityInfo.xul)
*+ content/messenger-smime/msgHdrViewSMIMEOverlay.js (content/msgHdrViewSMIMEOverlay.js)
*+ content/messenger-smime/pref-smime-advanced.xul (content/pref-smime-advanced.xul)
* content/messenger-smime/ocsp.xul (content/ocsp.xul)
* content/messenger-smime/ocsp.js (content/ocsp.js)
*+ content/messenger/am-smime.xul (content/am-smime.xul)
*+ content/messenger/am-smime.js (content/am-smime.js)
*+ content/messenger-smime/contents.rdf (content/contents.rdf)

Просмотреть файл

Просмотреть файл

@ -18,7 +18,3 @@
<!ENTITY managecerts.accesskey "V">
<!ENTITY managedevices.button "Security Devices">
<!ENTITY managedevices.accesskey "S">
<!ENTITY viewCRLs.button "Revocation Lists">
<!ENTITY viewCRLs.accesskey "e">
<!ENTITY viewOCSP.button "Verification">
<!ENTITY viewOCSP.accesskey "i">

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

@ -116,18 +116,14 @@
locale/@AB_CD@/messenger/preferences/sendoptions.dtd (@AB_CD@/chrome/messenger/preferences/sendoptions.dtd)
locale/@AB_CD@/messenger/preferences/htmlcompose.dtd (@AB_CD@/chrome/messenger/preferences/htmlcompose.dtd)
locale/@AB_CD@/messenger/preferences/privacy.dtd (@AB_CD@/chrome/messenger/preferences/privacy.dtd)
locale/@AB_CD@/messenger/preferences/removemp.dtd (@AB_CD@/chrome/messenger/preferences/removemp.dtd)
locale/@AB_CD@/messenger/preferences/changemp.dtd (@AB_CD@/chrome/messenger/preferences/changemp.dtd)
locale/@AB_CD@/messenger/preferences/viewpasswords.dtd (@AB_CD@/chrome/messenger/preferences/viewpasswords.dtd)
locale/@AB_CD@/messenger/preferences/advanced.dtd (@AB_CD@/chrome/messenger/preferences/advanced.dtd)
locale/@AB_CD@/messenger/preferences/ocsp.dtd (@AB_CD@/chrome/messenger/preferences/ocsp.dtd)
locale/@AB_CD@/messenger/preferences/receipts.dtd (@AB_CD@/chrome/messenger/preferences/receipts.dtd)
locale/@AB_CD@/messenger/preferences/connection.dtd (@AB_CD@/chrome/messenger/preferences/connection.dtd)
locale/@AB_CD@/messenger/preferences/downloads.dtd (@AB_CD@/chrome/messenger/preferences/downloads.dtd)
locale/@AB_CD@/messenger/preferences/downloadactions.dtd (@AB_CD@/chrome/messenger/preferences/downloadactions.dtd)
locale/@AB_CD@/messenger/preferences/changeaction.dtd (@AB_CD@/chrome/messenger/preferences/changeaction.dtd)
locale/@AB_CD@/messenger/preferences/fonts.dtd (@AB_CD@/chrome/messenger/preferences/fonts.dtd)
locale/@AB_CD@/messenger/preferences/fontscaling.dtd (@AB_CD@/chrome/messenger/preferences/fontscaling.dtd)
locale/@AB_CD@/messenger/preferences/notifications.dtd (@AB_CD@/chrome/messenger/preferences/notifications.dtd)
locale/@AB_CD@/messenger/preferences/preferences.properties (@AB_CD@/chrome/messenger/preferences/preferences.properties)
locale/@AB_CD@/messenger/migration/migration.dtd (@AB_CD@/chrome/messenger/migration/migration.dtd)