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

Bug 378807 Automatically delete settings are not properly disabled in Junk Settings 

p=me r=mnyromyr sr=neil
This commit is contained in:
iann_cvs%blueyonder.co.uk 2007-06-26 22:44:45 +00:00
Родитель a483d6b35e
Коммит 69bedbf97a
4 изменённых файлов: 32 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -4,10 +4,13 @@
<!ENTITY level.accesskey "E">
<!ENTITY move.label "Move new junk messages to:">
<!ENTITY move.accesskey "M">
<!ENTITY junkFolderOn.label "&quot;Junk&quot; folder on:">
<!ENTITY junkFolderOn.accesskey "u">
<!ENTITY otherFolder.label "Other:">
<!ENTITY otherFolder.accesskey "r">
<!ENTITY purge1.label "Automatically delete junk mail older than">
<!ENTITY purge1.accesskey "u">
<!ENTITY purge1.accesskey "A">
<!ENTITY purge2.label "days">
<!ENTITY whitelist.label "Do not mark mail as junk if the sender is in: ">

20
mailnews/base/prefs/resources/content/am-junk.js
Просмотреть файл

@ -38,6 +38,7 @@
*/
const KEY_ISP_DIRECTORY_LIST = "ISPDL";
var gPrefBranch = null;
function onInit(aPageId, aServerId)
{
@ -88,15 +89,30 @@ function onInit(aPageId, aServerId)
function onPreInit(account, accountValues)
{
gPrefBranch = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefService)
.getBranch("mail.server." +
account.incomingServer.key + ".");
buildServerFilterMenuList();
}
function updateMoveTargetMode(aEnable)
{
if (aEnable)
document.getElementById('broadcaster_moveMode').removeAttribute('disabled');
document.getElementById("broadcaster_moveMode").removeAttribute("disabled");
else
document.getElementById('broadcaster_moveMode').setAttribute('disabled', "true");
document.getElementById("broadcaster_moveMode").setAttribute("disabled", "true");
updatePurgeSpam(aEnable, "purgeSpam");
updatePurgeSpam(aEnable, "purgeSpamInterval");
}
function updatePurgeSpam(aEnable, aPref)
{
if (!aEnable || gPrefBranch.prefIsLocked(aPref))
document.getElementById("server." + aPref).setAttribute("disabled", "true");
else
document.getElementById("server." + aPref).removeAttribute("disabled");
}
function updateSpamLevel()

11
mailnews/base/prefs/resources/content/am-junk.xul
Просмотреть файл

@ -113,7 +113,8 @@
</hbox>
</vbox>
<checkbox id="server.moveOnSpam" label="&move.label;" oncommand="updateMoveTargetMode(this.checked);"
<checkbox id="server.moveOnSpam" label="&move.label;" accesskey="&move.accesskey;"
oncommand="updateMoveTargetMode(this.checked);"
wsm_persist="true" pref="true" preftype="bool" genericattr="true"
prefstring="mail.server.%serverkey%.moveOnSpam"/>
@ -129,12 +130,14 @@
</columns>
<rows>
<row>
<radio id="moveTargetMode0" value="0" label="&junkFolderOn.label;" observes="broadcaster_moveMode"/>
<radio id="moveTargetMode0" value="0" label="&junkFolderOn.label;"
accesskey="&junkFolderOn.accesskey;" observes="broadcaster_moveMode"/>
<menulist id="actionTargetAccount" observes="broadcaster_moveMode"
oncommand="onActionTargetChange(this, 'server.spamActionTargetAccount');" />
</row>
<row>
<radio id="moveTargetMode1" value="1" label="&otherFolder.label;" observes="broadcaster_moveMode"/>
<radio id="moveTargetMode1" value="1" label="&otherFolder.label;"
accesskey="&otherFolder.accesskey;" observes="broadcaster_moveMode"/>
<menulist id="actionTargetFolder" observes="broadcaster_moveMode"
oncommand="onActionTargetChange(this, 'server.spamActionTargetFolder');"/>
</row>
@ -144,10 +147,8 @@
<hbox align="center" class="indent">
<checkbox id="server.purgeSpam" genericattr="true" pref="true" wsm_persist="true" preftype="bool"
observes="broadcaster_moveMode"
prefstring="mail.server.%serverkey%.purgeSpam" accesskey="&purge1.accesskey;" label="&purge1.label;"/>
<textbox size="3" id="server.purgeSpamInterval" genericattr="true" pref="true" wsm_persist="true" preftype="int"
observes="broadcaster_moveMode"
prefstring="mail.server.%serverkey%.purgeSpamInterval"/>
<label id="purgeLabel" value="&purge2.label;" observes="broadcaster_moveMode" control="server.purgeSpamInterval"/>
</hbox>

5
suite/locales/en-US/chrome/mailnews/pref/am-junk.dtd
Просмотреть файл

@ -4,10 +4,13 @@
<!ENTITY level.accesskey "E">
<!ENTITY move.label "Move new junk messages to:">
<!ENTITY move.accesskey "M">
<!ENTITY junkFolderOn.label "&quot;Junk&quot; folder on:">
<!ENTITY junkFolderOn.accesskey "u">
<!ENTITY otherFolder.label "Other:">
<!ENTITY otherFolder.accesskey "r">
<!ENTITY purge1.label "Automatically delete junk mail older than">
<!ENTITY purge1.accesskey "u">
<!ENTITY purge1.accesskey "A">
<!ENTITY purge2.label "days">
<!ENTITY whitelist.label "Do not mark mail as junk if the sender is in: ">