From 9d173c7a05381f8f7abcbc00e901248c2bb6f0ed Mon Sep 17 00:00:00 2001
From: Stephan Helma <s.p.helma@gmx.net>
Date: Wed, 21 Aug 2019 09:56:21 +0200
Subject: [PATCH] * First step to TB60 compatibility. * But preferences do not
 work.

---
 .../content/replyManagerComposeOverlay.js     | 10 +--
 .../content/replyManagerComposeOverlay.xul    | 13 ++--
 .../chrome/content/replyManagerDateDialog.js  |  2 +-
 .../chrome/content/replyManagerDateDialog.xul |  3 +
 .../content/replyManagerMailWindowOverlay.js  | 23 +++---
 .../content/replyManagerMsgHdrViewOverlay.js  | 12 ++--
 .../chrome/content/replyManagerPreferences.js |  6 +-
 .../content/replyManagerPreferences.xul       | 72 +++++++++----------
 .../content/replyManagerShowAddressDialog.xul |  3 +
 .../defaults/preferences/prefs.js             |  2 +-
 replymonitor@lin.han/install.rdf              |  2 +-
 replymonitor@lin.han/manifest.json            | 19 +++++
 .../modules/replyManagerCalendar.jsm          | 16 ++---
 .../modules/replyManagerUtils.jsm             | 16 ++---
 14 files changed, 115 insertions(+), 84 deletions(-)
 create mode 100644 replymonitor@lin.han/manifest.json

diff --git a/replymonitor@lin.han/chrome/content/replyManagerComposeOverlay.js b/replymonitor@lin.han/chrome/content/replyManagerComposeOverlay.js
index 4a6b109..318efc8 100644
--- a/replymonitor@lin.han/chrome/content/replyManagerComposeOverlay.js
+++ b/replymonitor@lin.han/chrome/content/replyManagerComposeOverlay.js
@@ -1,10 +1,10 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-Components.utils.import("resource://replymanager/modules/replyManagerUtils.jsm");
-Components.utils.import("resource://replymanager/modules/calUtils.jsm");
-Components.utils.import("resource:///modules/gloda/indexer.js");
-Components.utils.import("resource://gre/modules/Preferences.jsm");
+var { replyManagerUtils } = ChromeUtils.import("resource://replymanager/modules/replyManagerUtils.jsm");
+var { calUtils } = ChromeUtils.import("resource://replymanager/modules/calUtils.jsm");
+var { indexer } = ChromeUtils.import("resource:///modules/gloda/indexer.js");
+var { Preferences } = ChromeUtils.import("resource://gre/modules/Preferences.jsm");
 
 function onLoad() {
   // We need both ReplyManager and Gloda indexer enabled to make this feature work.
@@ -75,7 +75,7 @@ replyManagerComposeStateListener.prototype = {
   NotifyComposeBodyReady: function() {},
 
   ComposeProcessDone: function(aResult) {
-    let folder = MailUtils.getFolderForURI(gMsgCompose.savedFolderURI);
+    let folder = MailUtils.getExistingFolder(gMsgCompose.savedFolderURI);
     let msgDB = folder.msgDatabase;
     let savedMsgHdr = msgDB.getMsgHdrForMessageID(this.msgID);
     let toggle = document.getElementById("other-elements-toggle").checked;
diff --git a/replymonitor@lin.han/chrome/content/replyManagerComposeOverlay.xul b/replymonitor@lin.han/chrome/content/replyManagerComposeOverlay.xul
index 77175f0..94b05ee 100644
--- a/replymonitor@lin.han/chrome/content/replyManagerComposeOverlay.xul
+++ b/replymonitor@lin.han/chrome/content/replyManagerComposeOverlay.xul
@@ -2,9 +2,12 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<?xml-stylesheet href="chrome://replymanager/skin/replyManager.css"?>
-<?xml-stylesheet href="chrome://calendar/content/widgets/calendar-widget-bindings.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/content/datetimepickers/datetimepickers.css" type="text/css"?>
+<?xml-stylesheet type="text/css" href="chrome://replymanager/skin/replyManager.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/content/widgets/calendar-widget-bindings.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/content/datetimepickers/datetimepickers.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/widgets/minimonth.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/content/widgets/calendar-widget-bindings.css"?>
+<?xml-stylesheet type="text/css" href="chrome://lightning-common/skin/datetimepickers.css"?>
 <!DOCTYPE window [
   <!ENTITY % replyManagerDTD SYSTEM "chrome://replymanager/locale/replyManager.dtd">
   %replyManagerDTD;
@@ -16,6 +19,8 @@
 <script type="application/javascript" src="chrome://replymanager/content/replyManagerComposeOverlay.js"/>
 <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
 <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
+<script src="chrome://messenger/content/customElements.js"/>
+<script src="chrome://calendar/content/datetimepickers/datetimepickers.js"/>
 
 <commandset>
   <command id="cmd_toggle_other_replymanager_elements" oncommand="toggleOtherReplyManagerElements();"/>
@@ -28,7 +33,7 @@
     <checkbox id="other-elements-toggle" label="&other-elements-toggle.label;" checked="false"
               command="cmd_toggle_other_replymanager_elements"
               class="expectReplyUnchecked"/>
-    <datepicker id="reminder-date" disabled="true"/>
+    <datetimepicker id="reminder-date" disabled="true"/>
   </hbox>
 </toolbox>
 </overlay>
diff --git a/replymonitor@lin.han/chrome/content/replyManagerDateDialog.js b/replymonitor@lin.han/chrome/content/replyManagerDateDialog.js
index d3cec22..58aaafd 100644
--- a/replymonitor@lin.han/chrome/content/replyManagerDateDialog.js
+++ b/replymonitor@lin.han/chrome/content/replyManagerDateDialog.js
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-Components.utils.import("resource://replymanager/modules/replyManagerUtils.jsm");
+var { replyManagerUtils } = ChromeUtils.import("resource://replymanager/modules/replyManagerUtils.jsm");
 
 /**
  * If the message is expecting replies we need to set the datepicker
diff --git a/replymonitor@lin.han/chrome/content/replyManagerDateDialog.xul b/replymonitor@lin.han/chrome/content/replyManagerDateDialog.xul
index 31833fb..13403e8 100644
--- a/replymonitor@lin.han/chrome/content/replyManagerDateDialog.xul
+++ b/replymonitor@lin.han/chrome/content/replyManagerDateDialog.xul
@@ -1,4 +1,7 @@
 <?xml version="1.0"?>
+<!--
+ TODO:
+  https://developer.thunderbird.net/add-ons/tb68/changes#less-than-dialog-greater-than-events-->
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
      License, v. 2.0. If a copy of the MPL was not distributed with this file,
      You can obtain one at http://mozilla.org/MPL/2.0/.-->
diff --git a/replymonitor@lin.han/chrome/content/replyManagerMailWindowOverlay.js b/replymonitor@lin.han/chrome/content/replyManagerMailWindowOverlay.js
index a11a90a..ddc92cf 100644
--- a/replymonitor@lin.han/chrome/content/replyManagerMailWindowOverlay.js
+++ b/replymonitor@lin.han/chrome/content/replyManagerMailWindowOverlay.js
@@ -1,14 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
-Components.utils.import("resource://replymanager/modules/replyManagerUtils.jsm");
-Components.utils.import("resource://replymanager/modules/replyManagerCalendar.jsm");
-Components.utils.import("resource://replymanager/modules/calUtils.jsm");
-Components.utils.import("resource:///modules/gloda/public.js");
-Components.utils.import("resource:///modules/gloda/indexer.js");
-Components.utils.import("resource:///modules/mailServices.js");
-Components.utils.import("resource:///modules/Services.jsm");
-Components.utils.import("resource://gre/modules/Preferences.jsm");
+var { replyManagerUtils } = ChromeUtils.import("resource://replymanager/modules/replyManagerUtils.jsm");
+var { replyManagerCalendar } = ChromeUtils.import("resource://replymanager/modules/replyManagerCalendar.jsm");
+var { calUtils } = ChromeUtils.import("resource://replymanager/modules/calUtils.jsm");
+//var { public } = ChromeUtils.import("resource:///modules/gloda/public.js");
+var { indexer } = ChromeUtils.import("resource:///modules/gloda/indexer.js");
+var { mailServices } = ChromeUtils.import("resource:///modules/mailServices.js");
+var { Services } = ChromeUtils.import("resource:///modules/Services.jsm");
+var { Preferences } = ChromeUtils.import("resource://gre/modules/Preferences.jsm");
 
 function onLoad() {
   let replyManagerMenu = document.getElementById("replyManagerMailContextMenu");
@@ -210,8 +210,11 @@ var replyManagerMailListener = {
   msgsDeleted: function(aItems) {
     let mailEnumerator = aItems.enumerate();
     while (mailEnumerator.hasMoreElements()) {
-      let msg = mailEnumerator.getNext()
-                              .QueryInterface(Components.interfaces.nsIMsgDBHdr);
+      let msg = mailEnumerator.getNext();
+      try {
+        msg = msg.QueryInterface(Components.interfaces.nsIMsgDBHdr);
+      }
+      catch(x) {}
       if (msg instanceof Components.interfaces.nsIMsgDBHdr &&
           ReplyManagerUtils.isHdrExpectReply(msg)) {
         ReplyManagerUtils.resetExpectReplyForHdr(msg);
diff --git a/replymonitor@lin.han/chrome/content/replyManagerMsgHdrViewOverlay.js b/replymonitor@lin.han/chrome/content/replyManagerMsgHdrViewOverlay.js
index 538905a..e624da2 100644
--- a/replymonitor@lin.han/chrome/content/replyManagerMsgHdrViewOverlay.js
+++ b/replymonitor@lin.han/chrome/content/replyManagerMsgHdrViewOverlay.js
@@ -1,12 +1,12 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
-Components.utils.import("resource://replymanager/modules/replyManagerUtils.jsm");
-Components.utils.import("resource://replymanager/modules/calUtils.jsm");
-Components.utils.import("resource:///modules/StringBundle.js");
-Components.utils.import("resource:///modules/Services.jsm");
-Components.utils.import("resource:///modules/gloda/indexer.js");
-Components.utils.import("resource://gre/modules/Preferences.jsm");
+var { replyManagerUtils } = ChromeUtils.import("resource://replymanager/modules/replyManagerUtils.jsm");
+var { calUtils } = ChromeUtils.import("resource://replymanager/modules/calUtils.jsm");
+var { StringBundle } = ChromeUtils.import("resource:///modules/StringBundle.js");
+var { Services } = ChromeUtils.import("resource:///modules/Services.jsm");
+var { indexer } = ChromeUtils.import("resource:///modules/gloda/indexer.js");
+var { Preferences } = ChromeUtils.import("resource://gre/modules/Preferences.jsm");
 
 var replyManagerHdrViewListener = {
   displayedMessage: null,
diff --git a/replymonitor@lin.han/chrome/content/replyManagerPreferences.js b/replymonitor@lin.han/chrome/content/replyManagerPreferences.js
index 6e76b03..aab8fdb 100644
--- a/replymonitor@lin.han/chrome/content/replyManagerPreferences.js
+++ b/replymonitor@lin.han/chrome/content/replyManagerPreferences.js
@@ -1,9 +1,13 @@
+/**
+ * TODO:
+ *    https://developer.thunderbird.net/add-ons/tb68/changes#less-than-prefwindow-greater-than-less-than-prefpane-greater-than-less-than-preferences-greater-than-and-less-than-preference-greater-than
+ */
 /**
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-Components.utils.import("resource://replymanager/modules/replyManagerUtils.jsm");
+var { replyManagerUtils } = ChromeUtils.import("resource://replymanager/modules/replyManagerUtils.jsm");
 
 /**
  * Global Object to hold methods for the Reply Manager pref pane
diff --git a/replymonitor@lin.han/chrome/content/replyManagerPreferences.xul b/replymonitor@lin.han/chrome/content/replyManagerPreferences.xul
index e54033d..b687655 100644
--- a/replymonitor@lin.han/chrome/content/replyManagerPreferences.xul
+++ b/replymonitor@lin.han/chrome/content/replyManagerPreferences.xul
@@ -2,39 +2,20 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://replymanager/skin/replyManager.css"?>
-<!DOCTYPE window SYSTEM "chrome://replymanager/locale/replyManager.dtd">
-
-<prefwindow id="ReplyManagerPaneOverlay"
-            title="Reply Monitor Preferences"
-            xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<prefpane id="ReplyManagerPrefPane"
-          label="Reply Monitor Options">
-  <vbox id="calPreferencesBoxReplyManager" class="replyManagerPrefpaneBox">
-    <script type="application/javascript"
-            src="chrome://replymanager/content/replyManagerPreferences.js"/>
-    <preferences>
-      <preference id="extensions.replymanager.enabled"
-                  name="extensions.replymanager.enabled"
-                  type="bool"
-                  onchange="gReplyManagerPane.toggleReplyManagerEnabled();"/>
-      <preference id="extensions.replymanager.create_calendar_event_enabled"
-                  name="extensions.replymanager.create_calendar_event_enabled"
-                  type="bool"/>
-      <preference id="extensions.replymanager.boilerplate"
-                  name="extensions.replymanager.boilerplate"
-                  type="string"/>
-      <preference id="extensions.replymanager.includecc"
-                  name="extensions.replymanager.includecc"
-                  type="bool"
-                  onchange="gReplyManagerPane.CcBccChanged();"/>
-      <preference id="extensions.replymanager.includebcc"
-                  name="extensions.replymanager.includebcc"
-                  type="bool"
-                  onchange="gReplyManagerPane.CcBccChanged();"/>
-    </preferences>
+<?xml-stylesheet type="text/css" href="chrome://global/skin/"?>
+<?xml-stylesheet type="text/css" href="chrome://messenger/skin/messenger.css"?>
+<?xml-stylesheet type="text/css" href="chrome://replymanager/skin/replyManager.css"?>
+<!DOCTYPE dialog SYSTEM "chrome://replymanager/locale/replyManager.dtd">
 
+<dialog
+   id="ReplyManagerPaneOverlay"
+   buttons="accept"
+   xmlns:html="http://www.w3.org/1999/xhtml"
+   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <vbox
+     id="calPreferencesBoxReplyManager"
+     class="replyManagerPrefpaneBox">
 
     <checkbox id="enableReplyManagerCheckbox"
               label="&enableReplyManagerGroupbox.label;"
@@ -52,11 +33,24 @@
               label="&toggleReplyManagerIncludeBCC.label;"
               preference="extensions.replymanager.includebcc"/>
 
-    <caption label="&prefReplyManagerBoilerplate.label;"/>
-    <textbox id="reminderBoilerplateTextbox" multiline="true"
-             newlines="pasteintact" flex="1"
-             height="300"
-             preference="extensions.replymanager.boilerplate"/>
+    <groupbox>
+      <hbox class="groupbox-title">
+        <label class="header">&prefReplyManagerBoilerplate.label;</label>
+      </hbox>
+      <html:textarea
+         id="reminderBoilerplateTextbox"
+         newlines="pasteintact" flex="1"
+         height="300"
+         preference="extensions.replymanager.boilerplate"/>
+    </groupbox>
+
   </vbox>
-</prefpane>
-</prefwindow>
+
+  <script 
+     src="chrome://global/content/preferencesBindings.js" 
+     type="application/javascript"/>
+  <script
+     type="application/javascript"
+     src="chrome://replymanager/content/replyManagerPreferences.js"/>
+</dialog>
+
diff --git a/replymonitor@lin.han/chrome/content/replyManagerShowAddressDialog.xul b/replymonitor@lin.han/chrome/content/replyManagerShowAddressDialog.xul
index 185484e..f9366e3 100644
--- a/replymonitor@lin.han/chrome/content/replyManagerShowAddressDialog.xul
+++ b/replymonitor@lin.han/chrome/content/replyManagerShowAddressDialog.xul
@@ -1,4 +1,7 @@
 <?xml version="1.0"?>
+<!--
+ TODO:
+  https://developer.thunderbird.net/add-ons/tb68/changes#less-than-dialog-greater-than-events-->
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
      License, v. 2.0. If a copy of the MPL was not distributed with this file,
      You can obtain one at http://mozilla.org/MPL/2.0/.-->
diff --git a/replymonitor@lin.han/defaults/preferences/prefs.js b/replymonitor@lin.han/defaults/preferences/prefs.js
index ad1adfb..81dfde3 100644
--- a/replymonitor@lin.han/defaults/preferences/prefs.js
+++ b/replymonitor@lin.han/defaults/preferences/prefs.js
@@ -3,4 +3,4 @@ pref("extensions.replymanager.create_calendar_event_enabled", true);
 pref("extensions.replymanager.boilerplate", "");
 pref("extensions.replymanager.lightning_installed", false);
 pref("extensions.replymanager.includecc", true);
-pref("extensions.replymanager.includebcc", true);
\ No newline at end of file
+pref("extensions.replymanager.includebcc", true);
diff --git a/replymonitor@lin.han/install.rdf b/replymonitor@lin.han/install.rdf
index 0e2833b..03e9bdd 100644
--- a/replymonitor@lin.han/install.rdf
+++ b/replymonitor@lin.han/install.rdf
@@ -16,7 +16,7 @@
         <!-- Thunderbird -->
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
         <em:minVersion>38.*</em:minVersion>
-        <em:maxVersion>52.*</em:maxVersion>
+        <em:maxVersion>60.*</em:maxVersion>
       </Description>
     </em:targetApplication>
 
diff --git a/replymonitor@lin.han/manifest.json b/replymonitor@lin.han/manifest.json
new file mode 100644
index 0000000..208aa1f
--- /dev/null
+++ b/replymonitor@lin.han/manifest.json
@@ -0,0 +1,19 @@
+{
+    "manifest_version": 2,
+    "applications": {
+        "gecko": {
+            "id": "replymonitor@lin.han",
+            "strict_min_version": "68.0"
+        }
+    },
+    "name": "Reply Monitor",
+    "description": "Keep track of your emails and replies",
+    "version": "2.0.0",
+
+    "legacy": {
+        "type": "xul",
+        "options": {
+            "page": "chrome://replymanager/content/replyManagerPreferences.xul",
+        }
+    }
+}
diff --git a/replymonitor@lin.han/modules/replyManagerCalendar.jsm b/replymonitor@lin.han/modules/replyManagerCalendar.jsm
index 8c53931..43d0499 100644
--- a/replymonitor@lin.han/modules/replyManagerCalendar.jsm
+++ b/replymonitor@lin.han/modules/replyManagerCalendar.jsm
@@ -4,17 +4,17 @@
 
 let EXPORTED_SYMBOLS = ["ReplyManagerCalendar"];
 
-const Cu = Components.utils;
+//const Cu = Components.utils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const ReplyManager = "ReplyManager";
 
-Cu.import("resource://gre/modules/errUtils.js");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource:///modules/gloda/public.js");
-Cu.import("resource:///modules/gloda/index_msg.js");
-Cu.import("resource:///modules/StringBundle.js");
-Cu.import("resource://gre/modules/Preferences.jsm");
+var { errUtils } = ChromeUtils.import("resource://gre/modules/errUtils.js");
+var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+//var { public } = ChromeUtils.import("resource:///modules/gloda/public.js");
+var { index_msg } = ChromeUtils.import("resource:///modules/gloda/index_msg.js");
+var { StringBundle } = ChromeUtils.import("resource:///modules/StringBundle.js");
+var { Preferences } = ChromeUtils.import("resource://gre/modules/Preferences.jsm");
 
 /**
  * ReplyManagerCalendar
@@ -29,7 +29,7 @@ let ReplyManagerCalendar = {
   initCalendar: function()
   {
     try {
-	  Cu.import("resource://calendar/modules/calUtils.jsm");
+	  var { calUtils } = ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
 	} catch(e) {
 	  // If Lightning is not installed, disable the feature
 	  this.disableReplyManager();
diff --git a/replymonitor@lin.han/modules/replyManagerUtils.jsm b/replymonitor@lin.han/modules/replyManagerUtils.jsm
index 7a30421..67d465f 100644
--- a/replymonitor@lin.han/modules/replyManagerUtils.jsm
+++ b/replymonitor@lin.han/modules/replyManagerUtils.jsm
@@ -4,21 +4,21 @@
 
 let EXPORTED_SYMBOLS = ["ReplyManagerUtils"];
 
-const Cu = Components.utils;
+//const Cu = Components.utils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
 const consoleService = Cc["@mozilla.org/consoleservice;1"]
   .getService(Ci.nsIConsoleService);
 
-Cu.import("resource:///modules/gloda/public.js");
-Cu.import("resource://replymanager/modules/replyManagerCalendar.jsm");
-Cu.import("resource:///modules/mailServices.js");
-Cu.import("resource:///modules/gloda/index_msg.js");
-Cu.import("resource:///modules/StringBundle.js");
-Cu.import("resource://gre/modules/Preferences.jsm");
+//var { public } = ChromeUtils.import("resource:///modules/gloda/public.js");
+var { replyManagerCalendar } = ChromeUtils.import("resource://replymanager/modules/replyManagerCalendar.jsm");
+var { mailServices } = ChromeUtils.import("resource:///modules/mailServices.js");
+var { index_msg } = ChromeUtils.import("resource:///modules/gloda/index_msg.js");
+var { StringBundle } = ChromeUtils.import("resource:///modules/StringBundle.js");
+var {Preferences } = ChromeUtils.import("resource://gre/modules/Preferences.jsm");
 try {
-  Cu.import("resource://calendar/modules/calUtils.jsm");
+  var { calUtils } = ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
 } catch(e) {
   consoleService.logStringMessage('Lightning not installed');
 }