mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug #361434 --> Options UI re-design. 

sr=bienvenu
This commit is contained in:
scott%scott-macgregor.org 2006-11-28 01:06:17 +00:00
Родитель 7ad2aaccf0
Коммит 7e4c73ac56
29 изменённых файлов: 687 добавлений и 470 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

53
mail/components/preferences/advanced.js
Просмотреть файл

@ -202,5 +202,58 @@ var gAdvancedPane = {
textbox.disabled = !document.getElementById('markAsRead').checked;
if (!textbox.disabled && aFocusTextBox)
textbox.focus();
},
/**
* open the return receipts configuration dialog
*/
showReturnReceipts: function()
{
document.documentElement.openSubDialog("chrome://messenger/content/preferences/receipts.xul",
"", null);
},
/**
* open the connections dialog
*/
showConnections: function ()
{
document.documentElement
.openSubDialog("chrome://messenger/content/preferences/connection.xul",
"", null);
},
/**
* open the offline settings dialog
*/
showOffline: function()
{
document.documentElement
.openSubDialog("chrome://messenger/content/preferences/offline.xul",
"", null);
},
showCertificates: function ()
{
document.documentElement.openWindow("mozilla:certmanager", "chrome://pippki/content/certManager.xul",
"width=600,height=400", null);
},
showCRLs: function ()
{
document.documentElement.openWindow("Mozilla:CRLManager", "chrome://pippki/content/crlManager.xul",
"width=600,height=400", null);
},
showOCSP: function ()
{
document.documentElement.openSubDialog("chrome://mozapps/content/preferences/ocsp.xul",
"", null);
},
showSecurityDevices: function ()
{
document.documentElement.openWindow("mozilla:devicemanager", "chrome://pippki/content/device_manager.xul",
"width=600,height=400", null);
}
};

100
mail/components/preferences/advanced.xul
Просмотреть файл

@ -63,9 +63,6 @@
<preference id="mail.showFolderPaneColumns" name="mail.showFolderPaneColumns" type="bool"/>
<preference id="mailnews.reuse_message_window" name="mailnews.reuse_message_window" type="bool"/>
<preference id="mailnews.tcptimeout" name="mailnews.tcptimeout" type="int"/>
<preference id="offline.startup_state" name="offline.startup_state" type="int"/>
<preference id="offline.send.unsent_messages" name="offline.send.unsent_messages" type="int"/>
<preference id="offline.download.download_messages" name="offline.download.download_messages" type="int"/>
<preference id="mail.prompt_purge_threshhold" name="mail.prompt_purge_threshhold" type="bool"/>
<preference id="mail.purge_threshhold" name="mail.purge_threshhold" type="int"/>
<preference id="app.update.enabled" name="app.update.enabled" type="bool"
@ -81,13 +78,23 @@
<preference id="app.update.disable_button.showUpdateHistory"
name="app.update.disable_button.showUpdateHistory"
type="bool"/>
<preference id="security.disable_button.openCertManager"
name="security.disable_button.openCertManager"
type="bool"/>
<preference id="security.OCSP.disable_button.managecrl"
name="security.OCSP.disable_button.managecrl"
type="bool"/>
<preference id="security.disable_button.openDeviceManager"
name="security.disable_button.openDeviceManager"
type="bool"/>
</preferences>
<tabbox id="advancedPrefs" flex="1" onselect="gAdvancedPane.tabSelectionChanged();">
<tabs>
<tab label="&itemGeneral.label;"/>
<tab id="offlineTab" label="&itemOffline.label;"/>
<tab id="networkingTab" label="&itemNetworking.label;"/>
<tab label="&itemUpdate.label;"/>
<tab label="&itemCertificates.label;"/>
</tabs>
<tabpanels flex="1">
@ -117,12 +124,6 @@
accesskey="&showFolderColumns.accesskey;" preference="mail.showFolderPaneColumns"/>
</hbox>
<hbox align="center" pack="start">
<label value="&connectionTimeout.label;" accesskey="&connectionTimeout.accesskey;" control="connectionTimeoutBox" />
<textbox id="connectionTimeoutBox" size="3" preference="mailnews.tcptimeout"/>
<label value="&connectionSeconds.label;"/>
</hbox>
<separator class="thin"/>
<vbox>
@ -145,42 +146,42 @@
<button id="configEditor" label="&configEdit.label;"
accesskey="&configEdit.accesskey;" oncommand="gAdvancedPane.showConfigEdit();"/>
</hbox>
<hbox align="center">
<description flex="1">&returnReceiptsInfo.label;</description>
<button label="&showReturnReceipts.label;"
accesskey="&showReturnReceipts.accesskey;"
oncommand="gAdvancedPane.showReturnReceipts();"/>
</hbox>
</tabpanel>
<tabpanel orient="vertical">
<!-- Offline -->
<!-- Networking & Disk Space -->
<groupbox>
<caption label="&offline.label;"/>
<caption label="&connectionsInfo.caption;"/>
<hbox align="center">
<description flex="1" control="catProxiesButton">&proxiesInfo.label;</description>
<button id="catProxiesButton" label="&showConnections.label;"
accesskey="&showConnections.accesskey;"
oncommand="gAdvancedPane.showConnections();"/>
</hbox>
<label value="&textStartUp;"/>
<radiogroup id="whenStartingUp" class="indent" preference="offline.startup_state">
<radio value="0" label="&radioRememberPrevState;" accesskey="&radioRememberPrevState.accesskey;"/>
<radio value="1" label="&radioAskMe;" accesskey="&radioAskMe.accesskey;"/>
<radio value="2" label="&radioAlwaysOnline;" accesskey="&radioAlwaysOnline.accesskey;"/>
</radiogroup>
<separator class="thin"/>
<label value="&textGoingOnline;"/>
<radiogroup id="whengoingOnlinestate" orient="horizontal" class="indent"
preference ="offline.send.unsent_messages">
<radio value="1" label="&radioAutoSend;" accesskey="&radioAutoSend.accesskey;"/>
<radio value="2" label="&radioNotSend;" accesskey="&radioNotSend.accesskey;"/>
<radio value="0" label="&radioAskUnsent;" accesskey="&radioAskUnsent.accesskey;"/>
</radiogroup>
<separator class="thin"/>
<label value="&textGoingOffline;"/>
<radiogroup id="whengoingOfflinestate" orient="horizontal" class="indent"
preference="offline.download.download_messages">
<radio value="1" label="&radioAutoDownload;" accesskey="&radioAutoDownload.accesskey;"/>
<radio value="2" label="&radioNotDownload;" accesskey="&radioNotDownload.accesskey;"/>
<radio value="0" label="&radioAskDownload;" accesskey="&radioAskDownload.accesskey;"/>
</radiogroup>
<hbox align="center" pack="start">
<label value="&connectionTimeout.label;" accesskey="&connectionTimeout.accesskey;" control="connectionTimeoutBox" />
<textbox id="connectionTimeoutBox" size="3" preference="mailnews.tcptimeout"/>
<label value="&connectionSeconds.label;"/>
</hbox>
</groupbox>
<separator class="thin"/>
<groupbox>
<caption label="&offlineInfo.caption;"/>
<hbox align="center">
<description flex="1" control="offlineSettingsButton">&offlineInfo.label;</description>
<button id="offlineSettingsButton" label="&showOffline.label;"
accesskey="&showOffline.accesskey;"
oncommand="gAdvancedPane.showOffline();"/>
</hbox>
</groupbox>
<groupbox>
<caption label="&Diskspace;"/>
@ -235,10 +236,27 @@
oncommand="gAdvancedPane.showUpdates();"/>
</hbox>
</tabpanel>
<!-- Certificates -->
<tabpanel orient="vertical">
<description>&certificatesInfo.label;</description>
<separator class="thin"/>
<description class="indent">
<button label="&viewCertificates.label;" accesskey="&viewCertificates.accesskey;"
oncommand="gAdvancedPane.showCertificates();"
preference="security.disable_button.openCertManager"/>
<button label="&viewCRLs.label;" accesskey="&viewCRLs.accesskey;"
oncommand="gAdvancedPane.showCRLs();"
preference="security.OCSP.disable_button.managecrl"/>
<button label="&viewOCSP.label;" accesskey="&viewOCSP.accesskey;"
oncommand="gAdvancedPane.showOCSP();"/>
<button label="&viewSecurityDevices.label;" accesskey="&viewSecurityDevices.accesskey;"
oncommand="gAdvancedPane.showSecurityDevices();"
preference="security.disable_button.openDeviceManager"/>
</description>
</tabpanel>
</tabpanels>
</tabbox>
<separator/>
</prefpane>
</overlay>

47
mail/components/preferences/compose.js
Просмотреть файл

@ -66,6 +66,8 @@ var gComposePane = {
this.initLanguageMenu();
this.populateFonts();
document.getElementById('downloadDictionaries').setAttribute('href', this.getDictionaryURL());
var preference = document.getElementById("mail.preferences.compose.selectedTabIndex");
@ -91,12 +93,6 @@ var gComposePane = {
}
},
showReturnReceipts: function()
{
document.documentElement.openSubDialog("chrome://messenger/content/preferences/receipts.xul",
"", null);
},
sendOptionsDialog: function()
{
document.documentElement.openSubDialog("chrome://messenger/content/preferences/sendoptions.xul","", null);
@ -400,4 +396,43 @@ var gComposePane = {
languageMenuList.selectedIndex = 0;
},
populateFonts: function()
{
var fontsList = document.getElementById("FontSelect");
try
{
var enumerator = Components.classes["@mozilla.org/gfx/fontenumerator;1"]
.getService(Components.interfaces.nsIFontEnumerator);
var localFontCount = { value: 0 }
var localFonts = enumerator.EnumerateAllFonts(localFontCount);
for (var i = 0; i < localFonts.length; ++i)
{
if (localFonts[i] != "")
fontsList.appendItem(localFonts[i], localFonts[i]);
}
}
catch(e) { }
},
restoreHTMLDefaults: function()
{
// reset throws an exception if the pref value is already the default so
// work around that with some try/catch exception handling
try {
document.getElementById('msgcompose.font_face').reset();
} catch (ex) {}
try {
document.getElementById('msgcompose.font_size').reset();
} catch (ex) {}
try {
document.getElementById('msgcompose.text_color').reset();
} catch (ex) {}
try {
document.getElementById('msgcompose.background_color').reset();
} catch (ex) {}
},
};

85
mail/components/preferences/compose.xul
Просмотреть файл

@ -40,8 +40,10 @@
<!DOCTYPE overlay [
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
<!ENTITY % composeDTD SYSTEM "chrome://messenger/locale/preferences/compose.dtd">
<!ENTITY % editorOverlayDTD SYSTEM "chrome://editor/locale/editorOverlay.dtd">
%brandDTD;
%composeDTD;
%editorOverlayDTD;
]>
<overlay id="ComposePaneOverlay"
@ -73,17 +75,22 @@
<preference id="mail.collect_email_address_outgoing" name="mail.collect_email_address_outgoing" type="bool"/>
<preference id="mail.collect_addressbook" name="mail.collect_addressbook" type="string"/>
<preference id="spellchecker.dictionary" name="spellchecker.dictionary" type="wstring"/>
<preference id="msgcompose.font_face" name="msgcompose.font_face" type="string"/>
<preference id="msgcompose.font_size" name="msgcompose.font_size" type="string"/>
<preference id="msgcompose.text_color" name="msgcompose.text_color" type="string"/>
<preference id="msgcompose.background_color" name="msgcompose.background_color" type="string"/>
</preferences>
<tabbox id="composePrefs" flex="1" onselect="gComposePane.tabSelectionChanged();">
<tabbox id="composePrefs" onselect="gComposePane.tabSelectionChanged();">
<tabs>
<tab label="&itemGeneral.label;"/>
<tab label="&itemAutoComplete.label;"/>
<tab label="&itemSpellCheck.label;"/>
</tabs>
<tabpanels flex="1">
<tabpanels>
<tabpanel orient="vertical">
<groupbox>
<hbox align="center">
<label value="&forwardMsg.label;" accesskey="&forwardMsg.accesskey;" control="forwardMessageMode"/>
<menulist id="forwardMessageMode" preference="mail.forward_message_mode">
@ -94,6 +101,13 @@
</menulist>
</hbox>
<hbox align="center" pack="start">
<checkbox id="autoSave" label="&autoSave.label;" preference="mail.compose.autosave"
accesskey="&autoSave.accesskey;"/>
<textbox id="autoSaveInterval" size="2" preference="mail.compose.autosaveinterval"/>
<label value="&autoSaveEnd.label;" accesskey="&autoSaveEnd.accesskey;" control="autoSaveInterval"/>
</hbox>
<checkbox id="strictlyMime" label="&useMIME.label;"
preference="mail.strictly_mime"
accesskey="&useMIME.accesskey;"/>
@ -102,18 +116,55 @@
preference="mail.warn_on_send_accel_key"
accesskey="&warnOnSendAccelKey.accesskey;"/>
<hbox align="center" pack="start">
<checkbox id="autoSave" label="&autoSave.label;" preference="mail.compose.autosave"
accesskey="&autoSave.accesskey;"/>
<textbox id="autoSaveInterval" size="2" preference="mail.compose.autosaveinterval"/>
<label value="&autoSaveEnd.label;" accesskey="&autoSaveEnd.accesskey;" control="autoSaveInterval"/>
</hbox>
<hbox align="center">
<label value="&wrapOutMsg.label;" accesskey="&wrapOutMsg.accesskey;" control="wrapLength"/>
<textbox id="wrapLength" size="3" preference="mailnews.wraplength"/>
<label value="&char.label;"/>
</hbox>
</groupbox>
<groupbox>
<caption label="&htmlComposeHeader.label;"/>
<hbox align="center">
<label control="FontSelect" value="&font.label;" accesskey="&font.accesskey;"/>
<menulist id="FontSelect" preference="msgcompose.font_face">
<menupopup>
<menuitem value="" label="&fontVarWidth.label;"/>
<menuitem value="tt" label="&fontFixedWidth.label;"/>
<menuseparator/>
<menuitem value="Helvetica, Arial, sans-serif" label="&fontHelveticaFont.label;"/>
<menuitem value="Times New Roman, Times, serif" label="&fontTimes.label;"/>
<menuitem value="Courier New, Courier, monospace" label="&fontCourier.label;"/>
<menuseparator/>
</menupopup>
</menulist>
<label control="fontSizeSelect" value="&size.label;" accesskey="&size.accesskey;"/>
<menulist id="fontSizeSelect" preference="msgcompose.font_size">
<menupopup>
<menuitem value="x-small" label="&size-x-smallCmd.label;"/>
<menuitem value="small" label="&size-smallCmd.label;"/>
<menuitem value="medium" label="&size-mediumCmd.label;"/>
<menuitem value="large" label="&size-largeCmd.label;"/>
<menuitem value="x-large" label="&size-x-largeCmd.label;"/>
<menuitem value="xx-large" label="&size-xx-largeCmd.label;"/>
</menupopup>
</menulist>
</hbox>
<separator class="thin"/>
<hbox align="center">
<label control="textColorButton" value="&fontColor.label;" accesskey="&fontColor.accesskey;"/>
<colorpicker type="button" id="textColorButton" preference="msgcompose.text_color"/>
<spring/>
<label control="backgroundColorButton" value="&bgColor.label;" accesskey="&bgColor.accesskey;"/>
<colorpicker type="button" id="backgroundColorButton" preference="msgcompose.background_color"/>
<spring flex="1"/>
<button label="&restoreHTMLDefaults.label;" accesskey="&restoreHTMLDefaults.accesskey;"
oncommand="gComposePane.restoreHTMLDefaults();"/>
</hbox>
</groupbox>
<hbox align="center">
<description flex="1">&sendOptionsDescription.label;</description>
@ -121,20 +172,6 @@
accesskey="&sendOptions.accesskey;"
oncommand="gComposePane.sendOptionsDialog();"/>
</hbox>
<hbox align="center">
<description flex="1">&htmlComposeDescription.label;</description>
<button label="&htmlCompose.label;"
accesskey="&htmlCompose.accesskey;"
oncommand="gComposePane.htmlComposeDialog();"/>
</hbox>
<hbox align="center">
<description flex="1">&returnReceiptsInfo.label;</description>
<button label="&showReturnReceipts.label;"
accesskey="&showReturnReceipts.accesskey;"
oncommand="gComposePane.showReturnReceipts();"/>
</hbox>
</tabpanel>
<tabpanel orient="vertical">
@ -185,7 +222,7 @@
<checkbox id="inlineSpellCheck" label="&spellCheckInline.label;"
preference="mail.spellcheck.inline"
accesskey="&spellCheckInline.accesskey;"/>
accesskey="&spellCheckInline1.accesskey;"/>
<separator class="thin"/>

60
mail/components/preferences/display.js
Просмотреть файл

@ -46,11 +46,6 @@ var gDisplayPane = {
if (preference.value)
document.getElementById("displayPrefs").selectedIndex = preference.value;
// build the charset menu list. We do this by hand instead of using the xul template
// builder because of Bug #285076,
this.createCharsetMenus(document.getElementById("viewDefaultCharset-menupopup"), "NC:DecodersRoot",
document.getElementById('mailnews.view_default_charset').value);
this.mInitialized = true;
this.mTagListBox = document.getElementById('tagList');
@ -113,61 +108,6 @@ var gDisplayPane = {
"chrome,titlebar,modal",
args);
},
addMenuItem: function(aMenuPopup, aLabel, aValue)
{
var menuItem = document.createElement('menuitem');
menuItem.setAttribute('label', aLabel);
menuItem.setAttribute('value', aValue);
aMenuPopup.appendChild(menuItem);
},
readRDFString: function(aDS,aRes,aProp)
{
var n = aDS.GetTarget(aRes, aProp, true);
return (n) ? n.QueryInterface(Components.interfaces.nsIRDFLiteral).Value : "";
},
createCharsetMenus: function(aMenuPopup, aRoot, aPreferenceValue)
{
var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"]
.getService(Components.interfaces.nsIRDFService);
var kNC_Root = rdfService.GetResource(aRoot);
var kNC_Name = rdfService.GetResource("http://home.netscape.com/NC-rdf#Name");
var rdfDataSource = rdfService.GetDataSource("rdf:charset-menu");
var rdfContainer = Components.classes["@mozilla.org/rdf/container;1"].getService(Components.interfaces.nsIRDFContainer);
rdfContainer.Init(rdfDataSource, kNC_Root);
var charset;
var availableCharsets = rdfContainer.GetElements();
for (var i = 0; i < rdfContainer.GetCount(); i++)
{
charset = availableCharsets.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
this.addMenuItem(aMenuPopup, this.readRDFString(rdfDataSource, charset, kNC_Name), charset.Value);
if (charset.Value == aPreferenceValue)
aMenuPopup.parentNode.value = charset.Value;
}
},
mCharsetMenuInitialized: false,
readDefaultCharset: function()
{
if (!this.mCharsetMenuInitialized)
{
Components.classes["@mozilla.org/observer-service;1"]
.getService(Components.interfaces.nsIObserverService)
.notifyObservers(null, "charsetmenu-selected", "mailedit");
// build the charset menu list. We do this by hand instead of using the xul template
// builder because of Bug #285076,
this.createCharsetMenus(document.getElementById("sendDefaultCharset-menupopup"), "NC:MaileditCharsetMenuRoot",
document.getElementById('mailnews.send_default_charset').value);
this.mCharsetMenuInitialized = true;
}
return undefined;
}
};
function addTagCallback(aName, aColor)

102
mail/components/preferences/display.xul
Просмотреть файл

@ -54,12 +54,11 @@
<preferences>
<preference id="mail.preferences.display.selectedTabIndex" name="mail.preferences.display.selectedTabIndex" type="int"/>
<preference id="mail.wrap_long_lines" name="mail.wrap_long_lines" type="bool"/>
<preference id="mail.display_glyph" name="mail.display_glyph" type="bool"/>
<preference id="mail.fixed_width_messages" name="mail.fixed_width_messages" type="bool"/>
<preference id="mail.quoted_style" name="mail.quoted_style" type="int"/>
<preference id="mail.quoted_size" name="mail.quoted_size" type="int"/>
<preference id="mail.citation_color" name="mail.citation_color" type="string"/>
<preference id="mail.display_glyph" name="mail.display_glyph" type="bool"/>
<preference id="browser.display.foreground_color" name="browser.display.foreground_color" type="string"/>
<preference id="browser.display.background_color" name="browser.display.background_color" type="string"/>
<preference id="mailnews.labels.description.1" name="mailnews.labels.description.1" type="wstring"/>
@ -72,17 +71,12 @@
<preference id="mailnews.labels.color.4" name="mailnews.labels.color.4" type="string"/>
<preference id="mailnews.labels.description.5" name="mailnews.labels.description.5" type="wstring"/>
<preference id="mailnews.labels.color.5" name="mailnews.labels.color.5" type="string"/>
<preference id="mailnews.send_default_charset" name="mailnews.send_default_charset" type="wstring"/>
<preference id="mailnews.view_default_charset" name="mailnews.view_default_charset" type="wstring"/>
<preference id="mailnews.force_charset_override" name="mailnews.force_charset_override" type="bool"/>
<preference id="mailnews.reply_in_default_charset" name="mailnews.reply_in_default_charset" type="bool"/>
</preferences>
<tabbox id="displayPrefs" flex="1" onselect="gDisplayPane.tabSelectionChanged();">
<tabs>
<tab label="&itemFormatting.label;"/>
<tab label="&itemTags.label;"/>
<tab label="&itemFonts.label;"/>
</tabs>
<tabpanels flex="1">
@ -90,17 +84,22 @@
<!-- Plain Text and HTML Formatting -->
<tabpanel orient="vertical">
<groupbox>
<caption label="&displayWidth.label;"/>
<description>&viewingPlainText.label;</description>
<vbox class="indent" align="start">
<checkbox id="wrapLongLines" label="&wrapInMsg.label;"
preference="mail.wrap_long_lines" accesskey="&wrapInMsg.accesskey;"/>
<caption label="&colors.label;"/>
<description>&overrideColors.label;</description>
<hbox align="center" class="indent">
<label value="&textColor.label;" accesskey="&textColor.accesskey;" control="foregroundtextmenu"/>
<colorpicker type="button" id="foregroundtextmenu" palettename="standard" preference="browser.display.foreground_color"/>
<spacer style="width: 25px"/>
<label value="&backgroundColor.label;" accesskey="&backgroundColor.accesskey;" control="backgroundmenu"/>
<colorpicker type="button" id="backgroundmenu" palettename="standard" preference="browser.display.background_color"/>
</hbox>
</groupbox>
<groupbox>
<checkbox id="displayGlyph" label="&convertEmoticons.label;"
preference="mail.display_glyph" accesskey="&convertEmoticons.accesskey;"/>
</vbox>
<separator class="thin"/>
<caption label="&displayWidth.label;"/>
<hbox align="center">
<description>&plainText.label;</description>
@ -138,15 +137,12 @@
</groupbox>
<groupbox>
<caption label="&htmlColors.label;"/>
<description>&overrideSender.label;</description>
<hbox align="center" class="indent">
<label value="&textColor.label;" accesskey="&textColor.accesskey;" control="foregroundtextmenu"/>
<colorpicker type="button" id="foregroundtextmenu" palettename="standard" preference="browser.display.foreground_color"/>
<spacer style="width: 25px"/>
<label value="&backgroundColor.label;" accesskey="&backgroundColor.accesskey;" control="backgroundmenu"/>
<colorpicker type="button" id="backgroundmenu" palettename="standard" preference="browser.display.background_color"/>
<caption label="&fontsAndEncodingsCaption.label;"/>
<hbox align="center">
<description flex="1">&fontAndEncodingsDescription.label;</description>
<button label="&fontOptions.label;"
accesskey="&fontOptions.accesskey;"
oncommand="gDisplayPane.fontOptionsDialog();"/>
</hbox>
</groupbox>
</tabpanel>
@ -163,62 +159,6 @@
</vbox>
</hbox>
</tabpanel>
<tabpanel orient="vertical">
<groupbox>
<caption label="&fontsCaption.label;"/>
<hbox align="center">
<description flex="1">&fontsDescription.label;</description>
<button label="&fontOptions.label;"
accesskey="&fontOptions.accesskey;"
oncommand="gDisplayPane.fontOptionsDialog();"/>
</hbox>
</groupbox>
<groupbox align="start">
<caption label="&languagesTitle.label;"/>
<label value="&composingDescription.label;"/>
<separator class="thin"/>
<grid>
<columns>
<column/>
<column flex="1"/>
</columns>
<rows>
<row align="center" class="indent">
<label control="sendDefaultCharsetList"
value="&sendDefaultCharset.label;" accesskey="&sendDefaultCharset.accesskey;"/>
<menulist id="sendDefaultCharsetList" flex="1" preference="mailnews.send_default_charset" onsyncfrompreference="return gDisplayPane.readDefaultCharset();">
<menupopup id="sendDefaultCharset-menupopup">
</menupopup>
</menulist>
</row>
<row align="center" class="indent">
<label control="viewDefaultCharsetList"
value="&viewDefaultCharsetList.label;" accesskey="&viewDefaultCharsetList.accesskey;"/>
<menulist id="viewDefaultCharsetList" preference="mailnews.view_default_charset">
<menupopup id="viewDefaultCharset-menupopup">
</menupopup>
</menulist>
</row>
</rows>
</grid>
<separator class="thin"/>
<checkbox id="forceCharsetOverride" label="&forceCharsetOverride.label;"
preference="mailnews.force_charset_override"
accesskey="&forceCharsetOverride.accesskey;"/>
<checkbox id="replyInDefaultCharset" label="&replyInDefaultCharset.label;"
preference="mailnews.reply_in_default_charset"
accesskey="&replyInDefaultCharset.accesskey;"/>
</groupbox>
</tabpanel>
</tabpanels>
</tabbox>
<separator/>

61
mail/components/preferences/fonts.js
Просмотреть файл

@ -48,6 +48,13 @@ const kFontSizeFmtFixed = "font.size.fixed.%LANG%";
const kFontMinSizeFmt = "font.minimum-size.%LANG%";
var gFontsDialog = {
_init: function()
{
// build the charset menu list. We do this by hand instead of using the xul template
// builder because of Bug #285076,
this.createCharsetMenus(document.getElementById("viewDefaultCharset-menupopup"), "NC:DecodersRoot",
document.getElementById('mailnews.view_default_charset').value);
},
_selectLanguageGroup: function (aLanguageGroup)
{
@ -140,5 +147,59 @@ var gFontsDialog = {
{
var useDocumentFonts = document.getElementById("useDocumentFonts");
return useDocumentFonts.checked ? 1 : 0;
},
addMenuItem: function(aMenuPopup, aLabel, aValue)
{
var menuItem = document.createElement('menuitem');
menuItem.setAttribute('label', aLabel);
menuItem.setAttribute('value', aValue);
aMenuPopup.appendChild(menuItem);
},
readRDFString: function(aDS,aRes,aProp)
{
var n = aDS.GetTarget(aRes, aProp, true);
return (n) ? n.QueryInterface(Components.interfaces.nsIRDFLiteral).Value : "";
},
createCharsetMenus: function(aMenuPopup, aRoot, aPreferenceValue)
{
var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"]
.getService(Components.interfaces.nsIRDFService);
var kNC_Root = rdfService.GetResource(aRoot);
var kNC_Name = rdfService.GetResource("http://home.netscape.com/NC-rdf#Name");
var rdfDataSource = rdfService.GetDataSource("rdf:charset-menu");
var rdfContainer = Components.classes["@mozilla.org/rdf/container;1"].getService(Components.interfaces.nsIRDFContainer);
rdfContainer.Init(rdfDataSource, kNC_Root);
var charset;
var availableCharsets = rdfContainer.GetElements();
for (var i = 0; i < rdfContainer.GetCount(); i++)
{
charset = availableCharsets.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
this.addMenuItem(aMenuPopup, this.readRDFString(rdfDataSource, charset, kNC_Name), charset.Value);
if (charset.Value == aPreferenceValue)
aMenuPopup.parentNode.value = charset.Value;
}
},
mCharsetMenuInitialized: false,
readDefaultCharset: function()
{
if (!this.mCharsetMenuInitialized)
{
Components.classes["@mozilla.org/observer-service;1"]
.getService(Components.interfaces.nsIObserverService)
.notifyObservers(null, "charsetmenu-selected", "mailedit");
// build the charset menu list. We do this by hand instead of using the xul template
// builder because of Bug #285076,
this.createCharsetMenus(document.getElementById("sendDefaultCharset-menupopup"), "NC:MaileditCharsetMenuRoot",
document.getElementById('mailnews.send_default_charset').value);
this.mCharsetMenuInitialized = true;
}
return undefined;
},
};

53
mail/components/preferences/fonts.xul
Просмотреть файл

@ -47,7 +47,7 @@
<prefwindow id="FontsDialog" type="child"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
title="&fontsDialog.title;"
title="&fontsAndEncodingsDialog.title;"
#ifdef XP_UNIX
#ifdef XP_MACOSX
style="width: &window.macWidth; !important;">
@ -59,7 +59,7 @@
#endif
dlgbuttons="accept,cancel">
<prefpane id="FontsDialogPane">
<prefpane id="FontsDialogPane" onpaneload="gFontsDialog._init();">
<preferences id="fontPreferences">
<preference id="font.language.group" name="font.language.group" type="wstring"/>
@ -67,6 +67,10 @@
name="browser.display.use_document_fonts"
type="int"/>
<preference id="intl.charset.default" name="intl.charset.default" type="wstring"/>
<preference id="mailnews.send_default_charset" name="mailnews.send_default_charset" type="wstring"/>
<preference id="mailnews.view_default_charset" name="mailnews.view_default_charset" type="wstring"/>
<preference id="mailnews.force_charset_override" name="mailnews.force_charset_override" type="bool"/>
<preference id="mailnews.reply_in_default_charset" name="mailnews.reply_in_default_charset" type="bool"/>
</preferences>
<stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
@ -271,6 +275,51 @@
onsynctopreference="return gFontsDialog.writeUseDocumentFonts();"/>
</hbox>
</groupbox>
<groupbox align="start">
<caption label="&languagesTitle1.label;"/>
<label value="&composingDescription.label;"/>
<separator class="thin"/>
<grid>
<columns>
<column/>
<column flex="1"/>
</columns>
<rows>
<row align="center" class="indent">
<label control="sendDefaultCharsetList"
value="&sendDefaultCharset.label;" accesskey="&sendDefaultCharset.accesskey;"/>
<menulist id="sendDefaultCharsetList" flex="1" preference="mailnews.send_default_charset"
onsyncfrompreference="return gFontsDialog.readDefaultCharset();">
<menupopup id="sendDefaultCharset-menupopup">
</menupopup>
</menulist>
</row>
<row align="center" class="indent">
<label control="viewDefaultCharsetList"
value="&viewDefaultCharsetList.label;" accesskey="&viewDefaultCharsetList.accesskey;"/>
<menulist id="viewDefaultCharsetList" preference="mailnews.view_default_charset">
<menupopup id="viewDefaultCharset-menupopup">
</menupopup>
</menulist>
</row>
</rows>
</grid>
<separator class="thin"/>
<checkbox id="forceCharsetOverride" label="&forceCharsetOverride.label;"
preference="mailnews.force_charset_override"
accesskey="&forceCharsetOverride.accesskey;"/>
<checkbox id="replyInDefaultCharset" label="&replyInDefaultCharset.label;"
preference="mailnews.reply_in_default_charset"
accesskey="&replyInDefaultCharset.accesskey;"/>
</groupbox>
<separator/>
</prefpane>
</prefwindow>

89
mail/components/preferences/general.js
Просмотреть файл

@ -42,8 +42,9 @@ var gGeneralPane = {
init: function ()
{
this.mPane = document.getElementById("paneGeneral");
this.startPageCheck();
this.updatePlaySound();
},
#ifdef HAVE_SHELL_SERVICE
@ -103,17 +104,87 @@ var gGeneralPane = {
this.mPane.userChangedValue(startPageUrlField);
},
showConnections: function ()
{
document.documentElement
.openSubDialog("chrome://messenger/content/preferences/connection.xul",
"", null);
},
customizeNewMailBehavior: function()
customizeMailAlert: function()
{
document.documentElement
.openSubDialog("chrome://messenger/content/preferences/notifications.xul",
"", null);
},
convertURLToLocalFile: function(aFileURL)
{
// convert the file url into a nsILocalFile
if (aFileURL)
{
var ios = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService);
var fph = ios.getProtocolHandler("file").QueryInterface(Components.interfaces.nsIFileProtocolHandler);
return fph.getFileFromURLSpec(aFileURL);
}
else
return null;
},
readSoundLocation: function()
{
var soundUrlLocation = document.getElementById("soundUrlLocation");
soundUrlLocation.value = document.getElementById("mail.biff.play_sound.url").value;
if (soundUrlLocation.value)
{
soundUrlLocation.label = this.convertURLToLocalFile(soundUrlLocation.value).leafName;
soundUrlLocation.image = "moz-icon://" + soundUrlLocation.label + "?size=16";
}
return undefined;
},
previewSound: function ()
{
sound = Components.classes["@mozilla.org/sound;1"].createInstance(Components.interfaces.nsISound);
var soundLocation;
soundLocation = document.getElementById('soundType').value == 1 ?
document.getElementById('soundUrlLocation').value : "_moz_mailbeep"
if (soundLocation.indexOf("file://") == -1)
sound.playSystemSound(soundLocation);
else
{
var ioService = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService);
sound.play(ioService.newURI(soundLocation, null, null));
}
},
browseForSoundFile: function ()
{
const nsIFilePicker = Components.interfaces.nsIFilePicker;
var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
// if we already have a sound file, then use the path for that sound file
// as the initial path in the dialog.
var localFile = this.convertURLToLocalFile(document.getElementById('soundUrlLocation').value);
if (localFile)
fp.displayDirectory = localFile;
// XXX todo, persist the last sound directory and pass it in
fp.init(window, document.getElementById("bundlePreferences").getString("soundFilePickerTitle"), nsIFilePicker.modeOpen);
fp.appendFilter("*.wav", "*.wav");
var ret = fp.show();
if (ret == nsIFilePicker.returnOK)
{
// convert the nsILocalFile into a nsIFile url
document.getElementById("mail.biff.play_sound.url").value = fp.fileURL.spec;
this.readSoundLocation(); // XXX We shouldn't have to be doing this by hand
this.updatePlaySound();
}
},
updatePlaySound: function()
{
// update the sound type radio buttons based on the state of the play sound checkbox
var soundsDisabled = !document.getElementById('newMailNotification').checked;
var soundTypeEl = document.getElementById('soundType');
soundTypeEl.disabled = soundsDisabled;
document.getElementById('browseForSound').disabled = soundsDisabled || soundTypeEl.value != 1;
document.getElementById('playSound').disabled = soundsDisabled || soundTypeEl.value != 1;
},
};

53
mail/components/preferences/general.xul
Просмотреть файл

@ -61,11 +61,15 @@
<preference id="pref.general.disable_button.default_mail"
name="pref.general.disable_button.default_mail"
type="bool"/>
<preference id="mail.biff.play_sound.type" name="mail.biff.play_sound.type" type="int"/>
<preference id="mail.biff.play_sound.url" name="mail.biff.play_sound.url" type="string"/>
#ifdef XP_MACOSX
<preference id="mail.biff.animate_dock_icon" name="mail.biff.animate_dock_icon" type="bool"/>
#endif
</preferences>
<stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
#ifdef HAVE_SHELL_SERVICE
<stringbundle id="bundleShell" src="chrome://messenger/locale/shellservice.properties"/>
<stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/>
@ -89,7 +93,7 @@
accesskey="&enableStartPage.accesskey;"/>
</hbox>
<hbox align="center">
<label value="&location.label;" accesskey="&location.accesskey;" control="mailnewsStartPageUrl"/>
<label value="&location.label;" accesskey="&location1.accesskey;" control="mailnewsStartPageUrl"/>
<textbox id="mailnewsStartPageUrl" flex="1" preference="mailnews.start_page.url"/>
<button label="&useDefault.label;" accesskey="&useDefault.accesskey;"
oncommand="gGeneralPane.setHomePageToDefaultPage();">
@ -101,32 +105,45 @@
<groupbox flex="1">
<caption label="&newMessagesArrive.label;"/>
<checkbox id="newMailNotificationAlert" label="&showAnimatedAlert.label;" flex="1" accesskey="&showAnimatedAlert.accesskey;"
preference="mail.biff.show_alert"/>
#ifdef XP_MACOSX
<checkbox id="newMailNotificationBounce" label="&bounceSystemDockIcon.label;"
preference="mail.biff.animate_dock_icon"
accesskey="&bounceSystemDockIcon.accesskey;"/>
#endif
#else
<hbox align="center" flex="1">
<checkbox id="newMailNotification" accesskey="&playSound.accesskey;"
preference="mail.biff.play_sound" label="&playSound.label;" flex="1"/>
<button id="customizeNewMailBehavior" label="&customizeNewMailBehavior.label;" accesskey="&customizeNewMailBehavior.accesskey;"
oncommand="gGeneralPane.customizeNewMailBehavior();"/>
<checkbox id="newMailNotificationAlert" label="&showAnimatedAlert.label;" accesskey="&showAnimatedAlert.accesskey;"
preference="mail.biff.show_alert" flex="1"/>
<button id="customizeMailAlert" label="&customizeMailAlert.label;" accesskey="&customizeMailAlert.accesskey;"
oncommand="gGeneralPane.customizeMailAlert();"/>
</hbox>
</groupbox>
#endif
<checkbox id="newMailNotification" accesskey="&playSound1.accesskey;"
preference="mail.biff.play_sound" label="&playSound.label;"
oncommand="gGeneralPane.updatePlaySound();"/>
<groupbox>
<caption label="&connectionsInfo.caption;"/>
<hbox align="center">
<description flex="1" control="catProxiesButton">&proxiesInfo.label;</description>
<button id="catProxiesButton" label="&showConnections.label;"
accesskey="&showConnections.accesskey;"
oncommand="gGeneralPane.showConnections();"/>
<radiogroup id="soundType" preference="mail.biff.play_sound.type" class="indent"
orient="vertical" oncommand="gGeneralPane.updatePlaySound();">
<radio value="0"
#ifdef XP_MACOSX
label="&systemsoundMac.label;"
#else
label="&systemsound.label;"
#endif
accesskey="&systemsound.accesskey;" id="system"/>
<radio value="1" label="&customsound.label;"
accesskey="&customsound.accesskey;" id="custom"/>
<hbox class="indent">
<filefield id="soundUrlLocation" flex="1" preference="mail.biff.play_sound.url"
preference-editable="true"
onsyncfrompreference="return gGeneralPane.readSoundLocation();"/>
<button id="browseForSound" label="&browse.label;"
accesskey="&browse.accesskey;" oncommand="gGeneralPane.browseForSoundFile();">
<observes element="soundUrlLocation" attribute="disabled"/>
</button>
<button id="playSound" label="&play.label;" accesskey="&play.accesskey;" oncommand="gGeneralPane.previewSound();"/>
</hbox>
</radiogroup>
</groupbox>
<separator/>
</prefpane>
</overlay>

0
mail/components/preferences/htmlcompose.js
Просмотреть файл

0
mail/components/preferences/htmlcompose.xul
Просмотреть файл

4
mail/components/preferences/jar.mn
Просмотреть файл

@ -8,8 +8,6 @@ messenger.jar:
* 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/viewpasswords.js
@ -31,7 +29,7 @@ messenger.jar:
* content/messenger/preferences/fonts.js
* content/messenger/preferences/fonts.xul
* content/messenger/preferences/notifications.xul
* content/messenger/preferences/notifications.js
* content/messenger/preferences/offline.xul
* content/messenger/AccountManager.xul (/mailnews/base/prefs/resources/content/AccountManager.xul)
content/messenger/AccountManager.js (/mailnews/base/prefs/resources/content/AccountManager.js)
content/messenger/am-main.xul (/mailnews/base/prefs/resources/content/am-main.xul)

0
mail/components/preferences/notifications.js
Просмотреть файл

49
mail/components/preferences/notifications.xul
Просмотреть файл

@ -47,11 +47,10 @@
%notificationsDTD;
]>
<prefwindow id="SoundNotificationsDialog" type="child"
<prefwindow id="NotificationsDialog" type="child"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
dlgbuttons="accept,cancel"
style="width: &window.width; !important;"
title="&notificationsDialog1.title;">
title="&notificationsDialog2.title;">
<prefpane id="NotificationsDialogPane" onpaneload="gNotificationsDialog.init();">
<script type="application/x-javascript" src="chrome://messenger/content/preferences/notifications.js"/>
@ -60,56 +59,12 @@
<preference id="mail.biff.alert.show_preview" name="mail.biff.alert.show_preview" type="bool"/>
<preference id="mail.biff.alert.show_subject" name="mail.biff.alert.show_subject" type="bool"/>
<preference id="mail.biff.alert.show_sender" name="mail.biff.alert.show_sender" type="bool"/>
<preference id="mail.biff.play_sound.type" name="mail.biff.play_sound.type" type="int"/>
<preference id="mail.biff.play_sound.url" name="mail.biff.play_sound.url" type="string"/>
</preferences>
<stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
#ifndef XP_MACOSX
<groupbox>
<caption label="&alertCustomization.caption;"/>
<description>&alertCustomization.intro;</description>
<checkbox id="previewText" class="indent" label="&previewText.label;" accesskey="&previewText.accesskey;" preference="mail.biff.alert.show_preview"/>
<checkbox id="subject" class="indent" label="&subject.label;" accesskey="&subject.accesskey;" preference="mail.biff.alert.show_subject"/>
<checkbox id="sender" class="indent" label="&sender.label;" accesskey="&sender.accesskey;" preference="mail.biff.alert.show_sender"/>
</groupbox>
#endif
<groupbox>
<caption label="&soundNotification1.caption;"/>
<radiogroup id="newMailNotificationType" preference="mail.biff.play_sound.type" orient="vertical" oncommand="gNotificationsDialog.systemSoundCheck();">
<radio value="0"
#ifdef XP_MACOSX
label="&systemsoundMac.label;"
#else
label="&systemsound.label;"
#endif
accesskey="&systemsound.accesskey;" id="system"/>
<radio value="1" label="&customsound.label;"
accesskey="&customsound.accesskey;" id="custom"/>
</radiogroup>
<vbox>
<spacer flex="1"/>
<hbox class="indent">
<filefield id="soundUrlLocation" flex="1" preference="mail.biff.play_sound.url"
preference-editable="true"
onsyncfrompreference="return gNotificationsDialog.readSoundLocation();"/>
<button id="browse" label="&browse.label;"
accesskey="&browse.accesskey;" oncommand="gNotificationsDialog.browseForSoundFile();">
<observes element="soundUrlLocation" attribute="disabled"/>
</button>
</hbox>
<separator class="thin"/>
<hbox align="right">
<button id="preview" label="&preview.label;" accesskey="&preview.accesskey;" oncommand="gNotificationsDialog.previewSound();"/>
</hbox>
</vbox>
</groupbox>
<separator/>
</prefpane>

90
mail/components/preferences/offline.xul Normal file
Просмотреть файл

@ -0,0 +1,90 @@
<?xml version="1.0"?>
# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
# ***** 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 the Thunderbird Preferences System.
#
# The Initial Developer of the Original Code is
# Scott MacGregor.
# Portions created by the Initial Developer are Copyright (C) 2006
# 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/"?>
<?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
<?xml-stylesheet href="chrome://mozapps/content/preferences/preferences.css"?>
<!DOCTYPE prefwindow [
<!ENTITY % offlineDTD SYSTEM "chrome://messenger/locale/preferences/offline.dtd">
%offlineDTD;
]>
<prefwindow id="OfflineSettingsDialog" type="child"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
dlgbuttons="accept,cancel"
title="&offlineDialog.title;">
<prefpane id="OfflineSettingsDialogPane" onpaneload="gOfflineDialog.init();">
<preferences>
<preference id="offline.startup_state" name="offline.startup_state" type="int"/>
<preference id="offline.send.unsent_messages" name="offline.send.unsent_messages" type="int"/>
<preference id="offline.download.download_messages" name="offline.download.download_messages" type="int"/>
</preferences>
<label value="&textStartUp;"/>
<radiogroup id="whenStartingUp" class="indent" preference="offline.startup_state">
<radio value="0" label="&radioRememberPrevState;" accesskey="&radioRememberPrevState.accesskey;"/>
<radio value="1" label="&radioAskMe;" accesskey="&radioAskMe.accesskey;"/>
<radio value="2" label="&radioAlwaysOnline;" accesskey="&radioAlwaysOnline.accesskey;"/>
</radiogroup>
<separator class="thin"/>
<label value="&textGoingOnline;"/>
<radiogroup id="whengoingOnlinestate" orient="horizontal" class="indent"
preference ="offline.send.unsent_messages">
<radio value="1" label="&radioAutoSend;" accesskey="&radioAutoSend.accesskey;"/>
<radio value="2" label="&radioNotSend;" accesskey="&radioNotSend.accesskey;"/>
<radio value="0" label="&radioAskUnsent;" accesskey="&radioAskUnsent.accesskey;"/>
</radiogroup>
<separator class="thin"/>
<label value="&textGoingOffline;"/>
<radiogroup id="whengoingOfflinestate" orient="horizontal" class="indent"
preference="offline.download.download_messages">
<radio value="1" label="&radioAutoDownload;" accesskey="&radioAutoDownload.accesskey;"/>
<radio value="2" label="&radioNotDownload;" accesskey="&radioNotDownload.accesskey;"/>
<radio value="0" label="&radioAskDownload;" accesskey="&radioAskDownload.accesskey;"/>
</radiogroup>
<separator/>
</prefpane>
</prefwindow>

24
mail/components/preferences/privacy.js
Просмотреть файл

@ -158,29 +158,5 @@ var gPrivacyPane = {
this.updateMasterPasswordButton();
document.getElementById("setMasterPassword").focus();
}
},
showCertificates: function ()
{
document.documentElement.openWindow("mozilla:certmanager", "chrome://pippki/content/certManager.xul",
"width=600,height=400", null);
},
showCRLs: function ()
{
document.documentElement.openWindow("Mozilla:CRLManager", "chrome://pippki/content/crlManager.xul",
"width=600,height=400", null);
},
showOCSP: function ()
{
document.documentElement.openSubDialog("chrome://mozapps/content/preferences/ocsp.xul",
"", null);
},
showSecurityDevices: function ()
{
document.documentElement.openWindow("mozilla:devicemanager", "chrome://pippki/content/device_manager.xul",
"width=600,height=400", null);
}
};

29
mail/components/preferences/privacy.xul
Просмотреть файл

@ -81,15 +81,6 @@
<preference id="pref.privacy.disable_button.view_passwords"
name="pref.privacy.disable_button.view_passwords"
type="bool"/>
<preference id="security.disable_button.openCertManager"
name="security.disable_button.openCertManager"
type="bool"/>
<preference id="security.OCSP.disable_button.managecrl"
name="security.OCSP.disable_button.managecrl"
type="bool"/>
<preference id="security.disable_button.openDeviceManager"
name="security.disable_button.openDeviceManager"
type="bool"/>
</preferences>
<tabbox id="privacyPrefs" flex="1" onselect="gPrivacyPane.tabSelectionChanged();">
@ -98,7 +89,6 @@
<tab label="&itemPhishing.label;"/>
<tab label="&itemAntiVirus.label;"/>
<tab label="&itemPasswords.label;"/>
<tab label="&itemSecurity.label;"/>
</tabs>
<tabpanels flex="1">
@ -182,25 +172,6 @@
preference="pref.privacy.disable_button.view_passwords"/>
</hbox>
</tabpanel>
<!-- Security -->
<tabpanel orient="vertical">
<description>&certificatesInfo.label;</description>
<separator class="thin"/>
<description class="indent">
<button label="&viewCertificates.label;" accesskey="&viewCertificates.accesskey;"
oncommand="gPrivacyPane.showCertificates();"
preference="security.disable_button.openCertManager"/>
<button label="&viewCRLs.label;" accesskey="&viewCRLs.accesskey;"
oncommand="gPrivacyPane.showCRLs();"
preference="security.OCSP.disable_button.managecrl"/>
<button label="&viewOCSP.label;" accesskey="&viewOCSP.accesskey;"
oncommand="gPrivacyPane.showOCSP();"/>
<button label="&viewSecurityDevices.label;" accesskey="&viewSecurityDevices.accesskey;"
oncommand="gPrivacyPane.showSecurityDevices();"
preference="security.disable_button.openDeviceManager"/>
</description>
</tabpanel>
</tabpanels>
</tabbox>

55
mail/locales/en-US/chrome/messenger/preferences/advanced.dtd
Просмотреть файл

@ -1,6 +1,7 @@
<!ENTITY itemGeneral.label "General">
<!ENTITY itemUpdate.label "Update">
<!ENTITY itemOffline.label "Offline &amp; Disk Space">
<!ENTITY itemNetworking.label "Network &amp; Disk Space">
<!ENTITY itemCertificates.label "Certificates">
<!-- General Settings -->
@ -15,7 +16,7 @@
<!ENTITY markAsReadEnd.label "seconds before marking a message as read">
<!ENTITY markAsReadEnd.accesskey "d">
<!ENTITY showFolderColumns.label "Show expanded columns in the folder pane">
<!ENTITY showFolderColumns.accesskey "f">
<!ENTITY showFolderColumns.accesskey "l">
<!ENTITY rememberLastMsg.label "Remember the last selected message">
<!ENTITY rememberLastMsg.accesskey "b">
<!ENTITY openMsgIn.label "Open messages in:">
@ -29,6 +30,9 @@
<!ENTITY configEditDesc.label "Advanced Configuration">
<!ENTITY configEdit.label "Config Editor...">
<!ENTITY configEdit.accesskey "g">
<!ENTITY returnReceiptsInfo.label "Determine how &brandShortName; handles return receipts">
<!ENTITY showReturnReceipts.label "Return Receipts...">
<!ENTITY showReturnReceipts.accesskey "R">
<!-- Update -->
<!ENTITY autoCheck.label "Automatically check for updates to:">
@ -43,35 +47,32 @@
<!ENTITY modeAutomatic.label "Automatically download and install the update">
<!ENTITY modeAutomatic.accesskey "m">
<!ENTITY modeAutoAddonWarn.label "Warn me if this will disable any of my add-ons">
<!ENTITY modeAutoAddonWarn.accesskey "W">
<!ENTITY modeAutoAddonWarn.accesskey "-">
<!ENTITY showUpdates.label "Show Update History">
<!ENTITY showUpdates.accesskey "U">
<!ENTITY showUpdates.accesskey "y">
<!-- Offline and Disk Space -->
<!ENTITY offline.label "Offline">
<!ENTITY textStartUp "When starting up:">
<!ENTITY radioRememberPrevState "Remember previous online state">
<!ENTITY radioRememberPrevState.accesskey "R">
<!ENTITY radioAskMe "Ask me for online state at startup">
<!ENTITY radioAskMe.accesskey "u">
<!ENTITY radioAlwaysOnline "Always start up online">
<!ENTITY radioAlwaysOnline.accesskey "l">
<!-- Networking and Disk Space -->
<!ENTITY showConnections.label "Connection...">
<!ENTITY showConnections.accesskey "n">
<!ENTITY proxiesInfo.label "Determine how &brandShortName; connects to the Internet.">
<!ENTITY connectionsInfo.caption "Connection">
<!ENTITY offlineInfo.caption "Offline">
<!ENTITY offlineInfo.label "Configure offline settings">
<!ENTITY showOffline.label "Offline...">
<!ENTITY showOffline.accesskey "O">
<!ENTITY textGoingOnline "Send unsent messages when going online?">
<!ENTITY radioAutoSend "Yes">
<!ENTITY radioAutoSend.accesskey "Y">
<!ENTITY radioNotSend "No">
<!ENTITY radioNotSend.accesskey "N">
<!ENTITY radioAskUnsent "Ask me">
<!ENTITY radioAskUnsent.accesskey "s">
<!ENTITY textGoingOffline "Download messages for offline use when going offline?">
<!ENTITY radioAutoDownload "Yes">
<!ENTITY radioAutoDownload.accesskey "e">
<!ENTITY radioNotDownload "No">
<!ENTITY radioNotDownload.accesskey "o">
<!ENTITY radioAskDownload "Ask me">
<!ENTITY radioAskDownload.accesskey "a">
<!ENTITY Diskspace "Disk Space">
<!ENTITY offlineCompact.label "Compact folders when it will save over">
<!ENTITY offlineCompact.accesskey "v">
<!ENTITY kb.label "KB">
<!-- Certificates -->
<!ENTITY certificatesInfo.label "Manage certificates, revocation lists, certificate verification and security devices.">
<!ENTITY viewCertificates.label "View Certificates">
<!ENTITY viewCertificates.accesskey "a">
<!ENTITY viewCRLs.label "Revocation Lists">
<!ENTITY viewCRLs.accesskey "e">
<!ENTITY viewOCSP.label "Verification">
<!ENTITY viewOCSP.accesskey "f">
<!ENTITY viewSecurityDevices.label "Security Devices">
<!ENTITY viewSecurityDevices.accesskey "u">

22
mail/locales/en-US/chrome/messenger/preferences/compose.dtd
Просмотреть файл

@ -11,11 +11,23 @@
<!ENTITY asAttachment.label "As Attachment">
<!ENTITY asAttachment.accesskey "A">
<!ENTITY htmlComposeHeader.label "HTML">
<!ENTITY font.label "Font:">
<!ENTITY font.accesskey "n">
<!ENTITY size.label "Size:">
<!ENTITY size.accesskey "z">
<!ENTITY fontColor.label "Text Color:">
<!ENTITY fontColor.accesskey "x">
<!ENTITY bgColor.label "Background Color:">
<!ENTITY bgColor.accesskey "B">
<!ENTITY restoreHTMLDefaults.label "Restore Defaults">
<!ENTITY restoreHTMLDefaults.accesskey "R">
<!ENTITY sendingMessagesHeader.label "Composing Messages">
<!ENTITY spellCheck.label "Check spelling before sending">
<!ENTITY spellCheck.accesskey "C">
<!ENTITY spellCheckInline.label "Enable spell check as you type">
<!ENTITY spellCheckInline.accesskey "n">
<!ENTITY spellCheckInline1.accesskey "k">
<!ENTITY languagePopup.label "Language:">
<!ENTITY languagePopup.accessKey "g">
<!ENTITY downloadDictionaries.label "Download More Dictionaries">
@ -50,11 +62,3 @@
<!ENTITY sendOptionsDescription.label "Configure text format behavior">
<!ENTITY sendOptions.label "Send Options...">
<!ENTITY sendOptions.accesskey "S">
<!ENTITY htmlComposeDescription.label "Configure default HTML options">
<!ENTITY htmlCompose.label "HTML Options...">
<!ENTITY htmlCompose.accesskey "H">
<!ENTITY returnReceiptsInfo.label "Determine how &brandShortName; handles return receipts">
<!ENTITY showReturnReceipts.label "Return Receipts...">
<!ENTITY showReturnReceipts.accesskey "R">

32
mail/locales/en-US/chrome/messenger/preferences/display.dtd
Просмотреть файл

@ -25,20 +25,17 @@
<!ENTITY variableWidth.label "Variable width font">
<!ENTITY variableWidth.accesskey "V">
<!ENTITY readingMessagesHeader.label "For incoming messages">
<!ENTITY messageWrapping.label "Message Wrapping">
<!ENTITY wrapInMsg.label "Wrap text to fit window width">
<!ENTITY wrapInMsg.accesskey "W">
<!-- LOCALIZATION NOTE : (emoticonsAndStructs.label) 'Emoticons' are also known as 'Smileys', e.g. :-) -->
<!ENTITY convertEmoticons.label "Display emoticons as graphics">
<!ENTITY convertEmoticons.accesskey "D">
<!ENTITY htmlColors.label "HTML Messages">
<!ENTITY overrideSender.label "When displaying HTML messages, use the following:">
<!ENTITY overrideSender.accesskey "n">
<!ENTITY colors.label "Colors">
<!ENTITY overrideColors.label "When displaying messages, use the following colors:">
<!ENTITY textColor.label "Text Color:">
<!ENTITY textColor.accesskey "T">
<!ENTITY backgroundColor.label "Background Color:">
<!ENTITY backgroundColor.accesskey "b">
<!-- LOCALIZATION NOTE : (emoticonsAndStructs.label) 'Emoticons' are also known as 'Smileys', e.g. :-) -->
<!ENTITY convertEmoticons.label "Display emoticons as graphics">
<!ENTITY convertEmoticons.accesskey "D">
<!-- labels -->
<!ENTITY displayTagsText.label "Tags can be used to categorize and prioritize your messages.">
<!ENTITY addTagButton.label "Add">
@ -49,20 +46,7 @@
<!ENTITY removeTagButton.accesskey "l">
<!-- Fonts -->
<!ENTITY fontsDescription.label "Configure the fonts used by &brandShortName;">
<!ENTITY fontsCaption.label "Fonts">
<!ENTITY fontAndEncodingsDescription.label "Configure the fonts and encodings used by &brandShortName;">
<!ENTITY fontsAndEncodingsCaption.label "Fonts &amp; Encodings">
<!ENTITY fontOptions.accesskey "F">
<!ENTITY fontOptions.label "Fonts...">
<!-- Language settings -->
<!ENTITY sendDefaultCharset.label "Outgoing Mail:">
<!ENTITY sendDefaultCharset.accesskey "u">
<!ENTITY languagesTitle.label "Character encodings">
<!ENTITY composingDescription.label "Set the default character encodings for sending and receiving mail">
<!ENTITY viewDefaultCharsetList.label "Incoming Mail:">
<!ENTITY viewDefaultCharsetList.accesskey "I">
<!ENTITY forceCharsetOverride.label "Apply the default character encoding to all incoming messages">
<!ENTITY forceCharsetOverride.accesskey "p">
<!ENTITY replyInDefaultCharset.label "Use the default character encoding in replies">
<!ENTITY replyInDefaultCharset.accesskey "h">

15
mail/locales/en-US/chrome/messenger/preferences/fonts.dtd
Просмотреть файл

@ -1,4 +1,4 @@
<!ENTITY fontsDialog.title "Fonts">
<!ENTITY fontsAndEncodingsDialog.title "Fonts &amp; Encodings">
<!ENTITY window.width "39em">
<!ENTITY window.macWidth "43em">
<!ENTITY window.unixWidth "41em">
@ -64,3 +64,16 @@
<!ENTITY useDocumentFonts.label "Allow messages to use other fonts">
<!ENTITY useDocumentFonts.accesskey "o">
<!-- Language settings -->
<!ENTITY sendDefaultCharset.label "Outgoing Mail:">
<!ENTITY sendDefaultCharset.accesskey "u">
<!ENTITY languagesTitle1.label "Character Encodings">
<!ENTITY composingDescription.label "Set the default character encodings for sending and receiving mail">
<!ENTITY viewDefaultCharsetList.label "Incoming Mail:">
<!ENTITY viewDefaultCharsetList.accesskey "I">
<!ENTITY forceCharsetOverride.label "Apply the default character encoding to all incoming messages">
<!ENTITY forceCharsetOverride.accesskey "A">
<!ENTITY replyInDefaultCharset.label "Use the default character encoding in replies">
<!ENTITY replyInDefaultCharset.accesskey "h">

26
mail/locales/en-US/chrome/messenger/preferences/general.dtd
Просмотреть файл

@ -10,15 +10,11 @@
<!ENTITY checkNow.label "Check Now">
<!ENTITY checkNow.accesskey "N">
<!ENTITY windowSettings.label "Window Configuration">
<!ENTITY selectWindowLayout.label "Select the window layout you prefer for Mail.">
<!ENTITY selectWindowLayout.accesskey "S">
<!ENTITY messengerStartPage.label "&brandShortName; Start Page">
<!ENTITY enableStartPage.label "When &brandShortName; launches, show the Start Page in the message area">
<!ENTITY enableStartPage.accesskey "W">
<!ENTITY location.label "Location:">
<!ENTITY location.accesskey "L">
<!ENTITY location1.accesskey "o">
<!ENTITY useDefault.label "Restore Default">
<!ENTITY useDefault.accesskey "R">
@ -27,13 +23,19 @@
<!ENTITY newMessagesArrive.label "When new messages arrive:">
<!ENTITY playSound.label "Play a sound">
<!ENTITY playSound.accesskey "P">
<!ENTITY playSound1.accesskey "d">
<!ENTITY showAnimatedAlert.label "Show an alert">
<!ENTITY showAnimatedAlert.accesskey "S">
<!ENTITY customizeNewMailBehavior.label "Advanced...">
<!ENTITY customizeNewMailBehavior.accesskey "A">
<!ENTITY customizeMailAlert.label "Customize...">
<!ENTITY customizeMailAlert.accesskey "C">
<!ENTITY showConnections.label "Connection Settings...">
<!ENTITY showConnections.accesskey "o">
<!ENTITY proxiesInfo.label "Determine how &brandShortName; connects to the Internet.">
<!ENTITY connectionsInfo.caption "Connection">
<!ENTITY soundNotification1.caption "Sound">
<!ENTITY play.label "Play">
<!ENTITY play.accesskey "P">
<!ENTITY systemsound.label "Default system sound for new mail">
<!ENTITY systemsoundMac.label "System Alert Sound">
<!ENTITY systemsound.accesskey "y">
<!ENTITY customsound.label "Use the following sound file">
<!ENTITY customsound.accesskey "U">
<!ENTITY browse.label "Browse...">
<!ENTITY browse.accesskey "B">

0
mail/locales/en-US/chrome/messenger/preferences/htmlcompose.dtd
Просмотреть файл

14
mail/locales/en-US/chrome/messenger/preferences/notifications.dtd
Просмотреть файл

@ -1,7 +1,6 @@
<!ENTITY notificationsDialog1.title "Customize New Mail Notifications">
<!ENTITY notificationsDialog2.title "Customize New Mail Alert">
<!ENTITY window.width "30em">
<!ENTITY alertCustomization.caption "Alerts">
<!ENTITY alertCustomization.intro "Choose which fields to show in the alert notification:">
<!ENTITY previewText.label "Message Preview Text">
<!ENTITY previewText.accesskey "M">
@ -9,13 +8,4 @@
<!ENTITY subject.accesskey "S">
<!ENTITY sender.label "Sender">
<!ENTITY sender.accesskey "e">
<!ENTITY soundNotification1.caption "Sound">
<!ENTITY preview.label "Preview Sound">
<!ENTITY preview.accesskey "v">
<!ENTITY systemsound.label "System New Mail Sound">
<!ENTITY systemsoundMac.label "System Alert Sound">
<!ENTITY systemsound.accesskey "y">
<!ENTITY customsound.label "Custom .wav file">
<!ENTITY customsound.accesskey "C">
<!ENTITY browse.label "Browse...">
<!ENTITY browse.accesskey "B">

24
mail/locales/en-US/chrome/messenger/preferences/offline.dtd Normal file
Просмотреть файл

@ -0,0 +1,24 @@
<!ENTITY offlineDialog.title "Offline Settings">
<!ENTITY textStartUp "When starting up:">
<!ENTITY radioRememberPrevState "Remember previous online state">
<!ENTITY radioRememberPrevState.accesskey "R">
<!ENTITY radioAskMe "Ask me for online state at startup">
<!ENTITY radioAskMe.accesskey "u">
<!ENTITY radioAlwaysOnline "Always start up online">
<!ENTITY radioAlwaysOnline.accesskey "l">
<!ENTITY textGoingOnline "Send unsent messages when going online?">
<!ENTITY radioAutoSend "Yes">
<!ENTITY radioAutoSend.accesskey "Y">
<!ENTITY radioNotSend "No">
<!ENTITY radioNotSend.accesskey "N">
<!ENTITY radioAskUnsent "Ask me">
<!ENTITY radioAskUnsent.accesskey "s">
<!ENTITY textGoingOffline "Download messages for offline use when going offline?">
<!ENTITY radioAutoDownload "Yes">
<!ENTITY radioAutoDownload.accesskey "e">
<!ENTITY radioNotDownload "No">
<!ENTITY radioNotDownload.accesskey "o">
<!ENTITY radioAskDownload "Ask me">
<!ENTITY radioAskDownload.accesskey "a">

1
mail/locales/en-US/chrome/messenger/preferences/preferences.dtd
Просмотреть файл

@ -7,6 +7,7 @@
<!ENTITY paneGeneral.title "General">
<!ENTITY paneDisplay.title "Display">
<!ENTITY paneTags.title "Tags">
<!ENTITY paneComposition.title "Composition">
<!ENTITY paneAttachments.title "Attachments">
<!ENTITY panePrivacy.title "Privacy">

13
mail/locales/en-US/chrome/messenger/preferences/privacy.dtd
Просмотреть файл

@ -2,7 +2,6 @@
<!ENTITY itemPhishing.label "E-mail Scams">
<!ENTITY itemPasswords.label "Passwords">
<!ENTITY itemAntiVirus.label "Anti-Virus">
<!ENTITY itemSecurity.label "Security">
<!-- Junk Mail Controls -->
<!ENTITY junkMail.intro "Set your default junk mail settings. Account specific junk mail settings can be configured in Account Settings.">
@ -38,18 +37,6 @@
<!ENTITY viewPasswords.label "View Saved Passwords">
<!ENTITY viewPasswords.accesskey "V">
<!-- Security -->
<!ENTITY certificates.label "Certificates">
<!ENTITY certificatesInfo.label "Manage certificates, revocation lists, certificate verification and security devices.">
<!ENTITY viewCertificates.label "View Certificates">
<!ENTITY viewCertificates.accesskey "i">
<!ENTITY viewCRLs.label "Revocation Lists">
<!ENTITY viewCRLs.accesskey "e">
<!ENTITY viewOCSP.label "Verification">
<!ENTITY viewOCSP.accesskey "f">
<!ENTITY viewSecurityDevices.label "Security Devices">
<!ENTITY viewSecurityDevices.accesskey "u">
<!-- Anti Virus -->
<!ENTITY antiVirus.intro "&brandShortName; can make it easy for anti-virus software to analyze incoming mail messages for viruses before they are stored locally.">
<!ENTITY antiVirus.label "Allow anti-virus clients to quarantine individual incoming messages">

2
mail/locales/jar.mn
Просмотреть файл

@ -107,7 +107,6 @@
locale/@AB_CD@/messenger/preferences/display.dtd (%chrome/messenger/preferences/display.dtd)
locale/@AB_CD@/messenger/preferences/compose.dtd (%chrome/messenger/preferences/compose.dtd)
locale/@AB_CD@/messenger/preferences/sendoptions.dtd (%chrome/messenger/preferences/sendoptions.dtd)
locale/@AB_CD@/messenger/preferences/htmlcompose.dtd (%chrome/messenger/preferences/htmlcompose.dtd)
locale/@AB_CD@/messenger/preferences/privacy.dtd (%chrome/messenger/preferences/privacy.dtd)
locale/@AB_CD@/messenger/preferences/junkLog.dtd (%chrome/messenger/preferences/junkLog.dtd)
locale/@AB_CD@/messenger/preferences/viewpasswords.dtd (%chrome/messenger/preferences/viewpasswords.dtd)
@ -118,6 +117,7 @@
locale/@AB_CD@/messenger/preferences/downloadactions.dtd (%chrome/messenger/preferences/downloadactions.dtd)
locale/@AB_CD@/messenger/preferences/changeaction.dtd (%chrome/messenger/preferences/changeaction.dtd)
locale/@AB_CD@/messenger/preferences/fonts.dtd (%chrome/messenger/preferences/fonts.dtd)
locale/@AB_CD@/messenger/preferences/offline.dtd (%chrome/messenger/preferences/offline.dtd)
locale/@AB_CD@/messenger/preferences/notifications.dtd (%chrome/messenger/preferences/notifications.dtd)
locale/@AB_CD@/messenger/preferences/preferences.properties (%chrome/messenger/preferences/preferences.properties)
locale/@AB_CD@/messenger/migration/migration.dtd (%chrome/messenger/migration/migration.dtd)