128962 - pref panel for MDN return receipts - not part of build - r/sr=sspitzer,a=asa

2002-03-08 22:17:03 +00:00 · 2002-03-08 22:17:03 +00:00 · 1ac973bd03
--- a/mailnews/base/prefs/resources/content/pref-receipts.js
+++ b/mailnews/base/prefs/resources/content/pref-receipts.js
@ -0,0 +1,75 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+var receiptSend;
+var notInToCcPref;
+var notInToCcLabel;
+var outsideDomainPref;
+var outsideDomainLabel;
+var otherCasesPref;
+var otherCasesLabel;
+
+function Startup() {
+  receiptSend = document.getElementById("receiptSend");
+  notInToCcPref = document.getElementById("notInToCcPref");
+  notInToCcLabel = document.getElementById("notInToCcLabel");
+  outsideDomainPref = document.getElementById("outsideDomainPref");
+  outsideDomainLabel = document.getElementById("outsideDomainLabel");
+  otherCasesPref = document.getElementById("otherCasesPref");
+  otherCasesLabel = document.getElementById("otherCasesLabel");
+
+  EnableDisableAllowedReceipts();
+        
+  return true;
+}
+
+function EnableDisableAllowedReceipts() {
+  if (receiptSend && (receiptSend.getAttribute("value") == 0)) {
+    notInToCcPref.setAttribute("disabled", "true");
+    notInToCcLabel.setAttribute("disabled", "true");
+    outsideDomainPref.setAttribute("disabled", "true");
+    outsideDomainLabel.setAttribute("disabled", "true");
+    otherCasesPref.setAttribute("disabled", "true");
+    otherCasesLabel.setAttribute("disabled", "true");
+  }
+  else {
+    notInToCcPref.removeAttribute("disabled");
+    notInToCcLabel.removeAttribute("disabled");
+    outsideDomainPref.removeAttribute("disabled");
+    outsideDomainLabel.removeAttribute("disabled");
+    otherCasesPref.removeAttribute("disabled");
+    otherCasesLabel.removeAttribute("disabled");
+  }
+  return true;
+}
--- a/mailnews/base/prefs/resources/content/pref-receipts.xul
+++ b/mailnews/base/prefs/resources/content/pref-receipts.xul
@ -1,6 +1,45 @@
 <?xml version="1.0"?>

-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Mozilla Communicator.
+   -
+   - The Initial Developer of the Original Code is
+   - Netscape Communications Corp.
+   - Portions created by the Initial Developer are Copyright (C) 2001
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+
+<?xml-stylesheet href="chrome://messenger/skin/prefPanels.css" type="text/css"?>
+
+<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
+
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-receipts.dtd">

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -9,12 +48,77 @@

  <script type="application/x-javascript">
  <![CDATA[
-    _elementIDs = [];
-    
-    function doCustomize() 
-    {
-    	var dialog = window.openDialog("chrome://messenger/content/custreceipt.xul","","modal=yes,chrome,titlebar,resizable=no", 0);
-    }
-  ]]>  
+    var _elementIDs = ["alwaysRequest", "receiptFolder", "receiptSend", "notInToCcPref", "outsideDomainPref", "otherCasesPref"];
+    ]]>
  </script>
+
+  <script type="application/x-javascript" src="chrome://messenger/content/pref-receipts.js"/>
+
+
+  <groupbox>
+    <caption label="&pane.title;"/>
+
+    <vbox id="returnReceiptSettings">
+      <checkbox id="alwaysRequest" label="&requestReceipt.label;" prefstring="mail.receipt.request_return_receipt_on"/>
+
+      <vbox id="receiptArrive">
+        <description>&receiptArrive.label;</description>
+        <radiogroup id="receiptFolder" prefstring="mail.incorporate.return_receipt">
+          <radio value="0" label="&leaveIt.label;"/>
+          <radio value="1" label="&moveToSent.label;"/> 
+        </radiogroup>
+      </vbox>
+
+      <vbox id="receiptRequest">
+        <description>&requestMDN.label;</description>
+        <radiogroup id="receiptSend" prefstring="mail.receipt.return_some_receipts" oncommand="EnableDisableAllowedReceipts();">
+          <radio value="0" label="&never.label;"/>
+          <radio value="1" label="&returnSome.label;"/> 
+        </radiogroup>
+
+        <hbox id="receiptSendIf" class="indent">
+          <grid>
+            <columns><column/><column/></columns>
+            <rows>
+              <row align="center">
+                <label id="notInToCcLabel">&notInToCc.label;</label>
+                <menulist id="notInToCcPref" prefstring="mail.mdn.report.not_in_to_cc">
+                  <menupopup>
+                    <menuitem value="0" label="&neverSend.label;"/>
+                    <menuitem value="1" label="&alwaysSend.label;"/>
+                    <menuitem value="2" label="&askMe.label;"/>
+                  </menupopup>
+                </menulist>
+              </row>
+              <row align="center">
+                <label id="outsideDomainLabel">&outsideDomain.label;</label>
+                <menulist id="outsideDomainPref" prefstring="mail.mdn.report.outside_domain">
+                  <menupopup>
+                    <menuitem value="0" label="&neverSend.label;"/>
+                    <menuitem value="1" label="&alwaysSend.label;"/>
+                    <menuitem value="2" label="&askMe.label;"/>
+                  </menupopup>
+                </menulist>
+              </row>
+              <row align="center">
+                <label id="otherCasesLabel">&otherCases.label;</label>
+                <menulist id="otherCasesPref" prefstring="mail.mdn.report.other">
+                  <menupopup>
+                    <menuitem value="0" label="&neverSend.label;"/>
+                    <menuitem value="1" label="&alwaysSend.label;"/>
+                    <menuitem value="2" label="&askMe.label;"/>
+                  </menupopup>
+                </menulist>
+              </row>
+            </rows>
+          </grid>
+        </hbox>
+
+      </vbox>
+
+    </vbox>
+
+  </groupbox>
+
 </page>
+
--- a/mailnews/base/prefs/resources/locale/en-US/pref-receipts.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/pref-receipts.dtd
@ -21,7 +21,7 @@ Rights Reserved.
 <!-- LOCALIZATION NOTE pref-receipts.dtd: UI for Mail/News Return Receipts prefs -->
 <!ENTITY pane.title                   "Return Receipts">
 <!ENTITY pane.description             "Settings for requesting or returning receipts">
-<!ENTITY requestReceipt.label         "If I request a receipt when sending a message, I want">
+<!ENTITY requestReceipt.label         "When sending messages, always request a return receipt">
 <!-- LOCALIZATION NOTE dsn.label: don't translate "DSN"  -->
 <!ENTITY dsn.label                    "A delivery receipt from the receiving server (DSN)">
 <!ENTITY dsn.accesskey                "d">
@ -29,16 +29,22 @@ Rights Reserved.
 <!ENTITY mdn.accesskey                "m">
 <!ENTITY both.label                   "Both types of receipt">
 <!ENTITY both.accesskey               "b">
-<!ENTITY receiptArrive.label          "When a receipt arrives">
+<!ENTITY receiptArrive.label          "When a receipt arrives:">
 <!ENTITY leaveIt.label                "Leave it in my Inbox">
 <!ENTITY leaveIt.accesskey            "i">
 <!-- LOCALIZATION NOTE moveToSent.label Translate: 'Sent Mail' according to Netscape glossary -->
 <!ENTITY moveToSent.label             "Move it to my Sent Mail folder">
 <!ENTITY moveToSent.accesskey         "m">
-<!ENTITY requestMDN.label             "When I receive a message and the sender requested a receipt (MDN)">
-<!ENTITY returnSome.label             "Return receipts for some messages">
+<!ENTITY requestMDN.label             "When I receive a request for a return receipt:">
+<!ENTITY returnSome.label             "Allow return receipts for some messages">
 <!ENTITY returnSome.accesskey         "r">
-<!ENTITY never.label                  "Never return a receipt">
+<!ENTITY never.label                  "Never send a return receipt">
 <!ENTITY never.accesskey              "n">
 <!ENTITY custom.label                 "Customize...">
 <!ENTITY custom.accesskey             "c">
+<!ENTITY notInToCc.label              "If I'm not in the To or Cc of the message:">
+<!ENTITY outsideDomain.label          "If the sender is outside my domain:">
+<!ENTITY otherCases.label             "In all other cases:">
+<!ENTITY askMe.label                  "Ask me">
+<!ENTITY alwaysSend.label             "Always send">
+<!ENTITY neverSend.label              "Never send">
--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@ -64,6 +64,7 @@ messenger.jar:
    content/messenger/pref-labels.js                                           (base/prefs/resources/content/pref-labels.js)
    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/custreceipt.xul                                          (base/prefs/resources/content/custreceipt.xul)
    content/messenger/AccountWizard.xul                                        (base/prefs/resources/content/AccountWizard.xul)
    content/messenger/AccountWizard.js                                         (base/prefs/resources/content/AccountWizard.js)
--- a/mailnews/mailnews.js
+++ b/mailnews/mailnews.js
@ -130,14 +130,19 @@ pref("mail.compose.other.header",	    "");
 localDefPref("mail.fcc_folder",                     "");
 pref("mail.encrypt_outgoing_mail",          false);
 pref("mail.crypto_sign_outgoing_mail",      false);
-pref("mail.default_html_action", 0);    // 0=ask, 1=plain, 2=html, 3=both
-pref("mail.smtp.ssl",                       0); // 0 = no, 1 = try, 2 = must use SSL
-pref("mail.mdn.report.not_in_to_cc", 0);      // 0: Never 1: Always 2: Ask me
-pref("mail.mdn.report.outside_domain", 2);    // 0: Never 1: Always 2: Ask me
-pref("mail.mdn.report.other", 2);   // 0: Never 1: Always 2: Ask me 3: Denial
-pref("mail.incorporate.return_receipt", 1); // 0: inbox/filter 1: Sent folder
-pref("mail.request.return_receipt", 2);     // 1: DSN 2: MDN 3: Both
-pref("mail.receipt.request_header_type", 0); // 0: MDN-DNT header  1: RRT header 2: Both (MC)
+pref("mail.default_html_action", 0);          // 0=ask, 1=plain, 2=html, 3=both
+pref("mail.smtp.ssl",0);                      // 0 = no, 1 = try, 2 = must use SSL
+
+pref("mail.mdn.report.not_in_to_cc", 2);               // 0: Never 1: Always 2: Ask me
+pref("mail.mdn.report.outside_domain", 2);             // 0: Never 1: Always 2: Ask me
+pref("mail.mdn.report.other", 2);                      // 0: Never 1: Always 2: Ask me 3: Denial
+
+pref("mail.incorporate.return_receipt", 0);            // 0: Inbox/filter 1: Sent folder
+pref("mail.request.return_receipt", 2);                // 1: DSN 2: MDN 3: Both
+pref("mail.receipt.request_header_type", 0);           // 0: MDN-DNT header  1: RRT header 2: Both (MC)
+pref("mail.receipt.request_return_receipt_on", false);
+pref("mail.receipt.return_some_receipts", 1);          // 0: Never send 1: Send sometimes
+

 pref("news.default_cc",                     "");
 pref("news.default_fcc",                    ""); // mailbox:URL or Imap://Host/OnlineFolderName
--- a/modules/libpref/src/init/mailnews.js
+++ b/modules/libpref/src/init/mailnews.js
@ -130,14 +130,19 @@ pref("mail.compose.other.header",	    "");
 localDefPref("mail.fcc_folder",                     "");
 pref("mail.encrypt_outgoing_mail",          false);
 pref("mail.crypto_sign_outgoing_mail",      false);
-pref("mail.default_html_action", 0);    // 0=ask, 1=plain, 2=html, 3=both
-pref("mail.smtp.ssl",                       0); // 0 = no, 1 = try, 2 = must use SSL
-pref("mail.mdn.report.not_in_to_cc", 0);      // 0: Never 1: Always 2: Ask me
-pref("mail.mdn.report.outside_domain", 2);    // 0: Never 1: Always 2: Ask me
-pref("mail.mdn.report.other", 2);   // 0: Never 1: Always 2: Ask me 3: Denial
-pref("mail.incorporate.return_receipt", 1); // 0: inbox/filter 1: Sent folder
-pref("mail.request.return_receipt", 2);     // 1: DSN 2: MDN 3: Both
-pref("mail.receipt.request_header_type", 0); // 0: MDN-DNT header  1: RRT header 2: Both (MC)
+pref("mail.default_html_action", 0);          // 0=ask, 1=plain, 2=html, 3=both
+pref("mail.smtp.ssl",0);                      // 0 = no, 1 = try, 2 = must use SSL
+
+pref("mail.mdn.report.not_in_to_cc", 2);               // 0: Never 1: Always 2: Ask me
+pref("mail.mdn.report.outside_domain", 2);             // 0: Never 1: Always 2: Ask me
+pref("mail.mdn.report.other", 2);                      // 0: Never 1: Always 2: Ask me 3: Denial
+
+pref("mail.incorporate.return_receipt", 0);            // 0: Inbox/filter 1: Sent folder
+pref("mail.request.return_receipt", 2);                // 1: DSN 2: MDN 3: Both
+pref("mail.receipt.request_header_type", 0);           // 0: MDN-DNT header  1: RRT header 2: Both (MC)
+pref("mail.receipt.request_return_receipt_on", false);
+pref("mail.receipt.return_some_receipts", 1);          // 0: Never send 1: Send sometimes
+

 pref("news.default_cc",                     "");
 pref("news.default_fcc",                    ""); // mailbox:URL or Imap://Host/OnlineFolderName