mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 20:05:49 +00:00
Bug 127423 Offline prefs appear when MailNews isn't installed p=diego@biurrun.de r=me sr=mscott
This commit is contained in:
parent
16ed2a9a54
commit
6bda94e8a4
@ -118,6 +118,11 @@
|
||||
<treecell url="chrome://messenger/content/pref-receipts.xul" label="&return.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://messenger/content/pref-offline.xul" label="&offline.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
|
@ -21,3 +21,4 @@
|
||||
<!ENTITY return.label "Return Receipts">
|
||||
<!ENTITY disk.label "Disk Space">
|
||||
<!ENTITY labels.label "Labels">
|
||||
<!ENTITY offline.label "Offline & Disk Space">
|
||||
|
@ -67,6 +67,7 @@ messenger.jar:
|
||||
content/messenger/pref-viewing_messages.xul (base/prefs/resources/content/pref-viewing_messages.xul)
|
||||
content/messenger/pref-receipts.xul (base/prefs/resources/content/pref-receipts.xul)
|
||||
content/messenger/pref-receipts.js (base/prefs/resources/content/pref-receipts.js)
|
||||
content/messenger/pref-offline.xul (base/prefs/resources/content/pref-offline.xul)
|
||||
content/messenger/AccountWizard.xul (base/prefs/resources/content/AccountWizard.xul)
|
||||
content/messenger/AccountWizard.js (base/prefs/resources/content/AccountWizard.js)
|
||||
content/messenger/aw-accounttype.js (base/prefs/resources/content/aw-accounttype.js)
|
||||
@ -256,6 +257,7 @@ en-US.jar:
|
||||
locale/en-US/messenger/pref-labels.dtd (base/prefs/resources/locale/en-US/pref-labels.dtd)
|
||||
locale/en-US/messenger/pref-receipts.dtd (base/prefs/resources/locale/en-US/pref-receipts.dtd)
|
||||
locale/en-US/messenger/pref-viewing_messages.dtd (base/prefs/resources/locale/en-US/pref-viewing_messages.dtd)
|
||||
locale/en-US/messenger/pref-offline.dtd (base/prefs/resources/locale/en-US/pref-offline.dtd)
|
||||
locale/en-US/messenger/AccountManager.dtd (base/prefs/resources/locale/en-US/AccountManager.dtd)
|
||||
locale/en-US/messenger/AccountWizard.dtd (base/prefs/resources/locale/en-US/AccountWizard.dtd)
|
||||
locale/en-US/messenger/am-advanced.dtd (base/prefs/resources/locale/en-US/am-advanced.dtd)
|
||||
|
@ -37,25 +37,7 @@
|
||||
|
||||
<script type="application/x-javascript">
|
||||
<![CDATA[
|
||||
var _elementIDs = ["offlineStartupstate", "whengoingOnlinestate", "whengoingOfflinestate", "offlineCompactFolder", "offlineCompactFolderMin"];
|
||||
|
||||
function Startup()
|
||||
{
|
||||
var aCheckbox = document.getElementById("offlineCompactFolder");
|
||||
enableField(aCheckbox, "offlineCompactFolderMin", false);
|
||||
}
|
||||
|
||||
function enableField(aCheckbox, aNodeID, setFocus)
|
||||
{
|
||||
var aField = document.getElementById(aNodeID);
|
||||
if (aCheckbox.checked)
|
||||
aField.removeAttribute("disabled");
|
||||
else
|
||||
aField.setAttribute("disabled", "true");
|
||||
|
||||
if (!aField.disabled && setFocus)
|
||||
aField.focus();
|
||||
}
|
||||
var _elementIDs = ["offlineStartupstate"];
|
||||
]]>
|
||||
</script>
|
||||
|
||||
@ -70,35 +52,5 @@
|
||||
<radio value="1" label="&radioUsePrev;"/>
|
||||
</radiogroup> -->
|
||||
|
||||
<separator class="thin"/>
|
||||
<label value="&textGoingOnline;"/>
|
||||
<radiogroup id="whengoingOnlinestate"
|
||||
prefstring="offline.send.unsent_messages">
|
||||
<radio value="0" label="&radioAskUnsent;"/>
|
||||
<radio value="1" label="&radioAutoSend;"/>
|
||||
<radio value="2" label="&radioNotSend;"/>
|
||||
</radiogroup>
|
||||
|
||||
<separator class="thin"/>
|
||||
<label value="&textGoingOffline;"/>
|
||||
<radiogroup id="whengoingOfflinestate"
|
||||
prefstring="offline.download.download_messages">
|
||||
<radio value="0" label="&radioAskDownload;"/>
|
||||
<radio value="1" label="&radioAutoDownload;"/>
|
||||
<radio value="2" label="&radioNotDownload;"/>
|
||||
</radiogroup>
|
||||
|
||||
</groupbox>
|
||||
|
||||
<groupbox>
|
||||
<caption label="&Diskspace;"/>
|
||||
<hbox align="center">
|
||||
<checkbox id="offlineCompactFolder" label="&offlineCompact.label;" accesskey="&offlineCompact.accesskey;"
|
||||
prefstring="mail.prompt_purge_threshhold"
|
||||
oncommand="enableField(this,'offlineCompactFolderMin',true);"/>
|
||||
<textbox id="offlineCompactFolderMin" size="5" value="100"
|
||||
preftype="int" prefstring="mail.purge_threshhold"/>
|
||||
<label value="&kb.label;"/>
|
||||
</hbox>
|
||||
</groupbox>
|
||||
</page>
|
||||
|
@ -183,11 +183,14 @@
|
||||
</treechildren>
|
||||
</treeitem>
|
||||
|
||||
<!-- commented out until bug 82487 is fixed -->
|
||||
<!--
|
||||
<treeitem id="offlineItem">
|
||||
<treerow>
|
||||
<treecell url="chrome://communicator/content/pref/pref-offline.xul" label="&offline.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
-->
|
||||
</treechildren>
|
||||
</tree>
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
<!-- extracted from content/pref-offline.xul -->
|
||||
|
||||
<!--LOCALIZATION NOTE : FILE The 'Offline' preferences dialog -->
|
||||
<!ENTITY window.title "Offline & Disk Space">
|
||||
<!ENTITY boxHeader "Offline & Disk Space">
|
||||
<!ENTITY window.title "Offline">
|
||||
<!ENTITY boxHeader "Offline">
|
||||
<!ENTITY rHeader "Offline">
|
||||
<!--LOCALIZATION NOTE (textStart): Don't translate "&brandShortName;".
|
||||
Place "&brandShortName;" in the phrase where the name of the application should
|
||||
@ -11,15 +11,3 @@
|
||||
<!ENTITY textStart "When starting &brandShortName;:">
|
||||
<!ENTITY radioAskMode "Ask me if I want online or offline mode">
|
||||
<!ENTITY radioUsePrev "Use my previous online/offline state">
|
||||
<!ENTITY textGoingOnline "When going online:">
|
||||
<!ENTITY radioAskUnsent "Ask me if I want to send my unsent messages">
|
||||
<!ENTITY radioAutoSend "Automatically send my unsent messages">
|
||||
<!ENTITY radioNotSend "Do not send my unsent messages">
|
||||
<!ENTITY textGoingOffline "When going offline:">
|
||||
<!ENTITY radioAskDownload "Ask me if I want to download messages for offline use">
|
||||
<!ENTITY radioAutoDownload "Automatically download messages for offline use">
|
||||
<!ENTITY radioNotDownload "Do not download messages for offline use">
|
||||
<!ENTITY Diskspace "Disk Space">
|
||||
<!ENTITY offlineCompact.label "Compact folders when it will save over">
|
||||
<!ENTITY offlineCompact.accesskey "c">
|
||||
<!ENTITY kb.label "KB">
|
@ -17,7 +17,7 @@
|
||||
<!ENTITY compose.label "Composer">
|
||||
<!ENTITY editing.label "New Page Settings">
|
||||
<!ENTITY publish.label "Publish">
|
||||
<!ENTITY offline.label "Offline & Disk Space">
|
||||
<!ENTITY offline.label "Offline">
|
||||
<!ENTITY security.label "Privacy & Security">
|
||||
<!ENTITY advance.label "Advanced">
|
||||
<!ENTITY down.label "Download">
|
||||
|
Loading…
Reference in New Issue
Block a user