From 90655ab51f1c5629115d45ac92646281137a5f97 Mon Sep 17 00:00:00 2001
From: John Bieling <john.bieling@gmx.de>
Date: Wed, 30 Aug 2023 10:00:19 +0200
Subject: [PATCH] Fix a couple of UI hiccups.

fixes #374
---
 chrome/content/modules/wzQuicktextGroup.jsm |  23 +++++++-------
 chrome/content/quicktext.js                 |  33 ++++----------------
 chrome/content/scripts/messengercompose.js  |  32 ++++++++++++-------
 chrome/skin/button.large.png                | Bin 2967 -> 0 bytes
 chrome/skin/button.small.png                | Bin 1759 -> 0 bytes
 chrome/skin/logo.png                        | Bin 7575 -> 0 bytes
 chrome/skin/quicktext.css                   |  29 +----------------
 7 files changed, 38 insertions(+), 79 deletions(-)
 delete mode 100644 chrome/skin/button.large.png
 delete mode 100644 chrome/skin/button.small.png
 delete mode 100644 chrome/skin/logo.png

diff --git a/chrome/content/modules/wzQuicktextGroup.jsm b/chrome/content/modules/wzQuicktextGroup.jsm
index 24dec31..bc37b3e 100644
--- a/chrome/content/modules/wzQuicktextGroup.jsm
+++ b/chrome/content/modules/wzQuicktextGroup.jsm
@@ -2,21 +2,20 @@ var EXPORTED_SYMBOLS = ["wzQuicktextGroup"];
 
 const kDebug        = true;
 
-function wzQuicktextGroup() {
-  this.mName = "";
-  this.mType = "";
-}
+class wzQuicktextGroup {
+  constructor() {
+    this.mName = "";
+    this.mType = "";
+  }
 
-wzQuicktextGroup.prototype = {
-  get name() { return this.mName; },
+  get name() { return this.mName; }
   set name(aName) { if (typeof aName != 'undefined') return this.mName = aName; }
-,
-  get type() { return this.mType; },
+
+  get type() { return this.mType; }
   set type(aType) { if (typeof aType != 'undefined') return this.mType = aType; }
-,
-  clone: function()
-  {
-    var newGroup = new wzQuicktextGroup();
+
+  clone() {
+    let newGroup = new wzQuicktextGroup();
     newGroup.name = this.mName;
     newGroup.type = this.mType;
 
diff --git a/chrome/content/quicktext.js b/chrome/content/quicktext.js
index acf5a62..4066678 100644
--- a/chrome/content/quicktext.js
+++ b/chrome/content/quicktext.js
@@ -119,27 +119,14 @@ var quicktext = {
     this.mKeywords = {};
 
     // Update the toolbar
-    var toolbar = document.getElementById("quicktext-toolbar");
+    var toolbar = document.getElementById("quicktext-templates-toolbar");
     if (toolbar != null)
     {
 
-      //clear toolbar and store current "variables" and "other" menus (the two rightmost ones)
-      var toolbarbuttonVar = null;
-      var toolbarbuttonOther = null;
+      // Clear template toolbar.
       var length = toolbar.children.length;
-      for(var i = length-1; i >= 0; i--)
-      {
-        var element = toolbar.children[i];
-        switch(element.getAttribute("id"))
-        {
-          case 'quicktext-variables':
-            toolbarbuttonVar = element.cloneNode(true);
-            break;
-          case 'quicktext-other':
-            toolbarbuttonOther = element.cloneNode(true);
-            break;
-        }
-        toolbar.removeChild(element);
+      for(var i = length-1; i >= 0; i--) {
+        toolbar.removeChild(toolbar.children[i]);
       }
 
       //rebuild template groups (the leftmost entries)
@@ -211,16 +198,8 @@ var quicktext = {
         }
       }
 
-      //add a flex spacer to push the VAR and OTHER elements to the right 
-      var spacer = document.createXULElement("spacer");
-      spacer.setAttribute("flex", "1");
-      toolbar.appendChild(spacer);
-      toolbar.appendChild(toolbarbuttonVar);
-      toolbar.appendChild(toolbarbuttonOther);
-
-            
-      // Update the toolbar inside the toolbarpalette and the drop-down menu - if used
-      let optionalUI = ["button-quicktext", "quicktext-popup"];
+      // Update the template menu inside the context menu - if used.
+      let optionalUI = ["quicktext-popup"];
       for (let a=0; a < optionalUI.length; a++) { 
         if (document.getElementById(optionalUI[a] + "-menupopup")) {
           let rootElement = document.getElementById(optionalUI[a] + "-menupopup");
diff --git a/chrome/content/scripts/messengercompose.js b/chrome/content/scripts/messengercompose.js
index 028a910..7f29cb9 100644
--- a/chrome/content/scripts/messengercompose.js
+++ b/chrome/content/scripts/messengercompose.js
@@ -10,23 +10,28 @@ function onLoad(activatedWhileWindowOpen) {
   
   WL.injectCSS("resource://quicktext/skin/quicktext.css");
   WL.injectElements(`
-	<popup id="msgComposeContext">
-		<menuseparator id="quicktext-popupsep" hidden="true" insertafter="spellCheckSuggestionsSeparator"/>
-		<menu id="quicktext-popup" label="&quicktext.label;" hidden="true" insertafter="spellCheckSuggestionsSeparator"  class="menu-iconic quicktext-icon menuitem-iconic" >
-		  <menupopup id="quicktext-popup-menupopup"/>
-		</menu>
-	</popup>
+  <popup id="msgComposeContext">
+    <menuseparator id="quicktext-popupsep" hidden="true" insertafter="spellCheckSuggestionsSeparator" />
+    <menu id="quicktext-popup" label="&quicktext.label;" hidden="true" insertafter="spellCheckSuggestionsSeparator"
+      class="menu-iconic quicktext-icon menuitem-iconic">
+      <menupopup id="quicktext-popup-menupopup" />
+    </menu>
+  </popup>
 
   <menupopup id="menu_View_Popup">
-    <menuitem id="quicktext-view" type="checkbox" label="&quicktext.label;" oncommand="quicktext.toogleToolbar();"/>
+    <menuitem id="quicktext-view" type="checkbox" label="&quicktext.label;" oncommand="quicktext.toogleToolbar();" />
   </menupopup>
 
   <menupopup id="taskPopup">
-    <menuitem id="quicktext-settings" label="&quicktext.label;" oncommand="quicktext.openSettings();" insertafter="tasksMenuAddressBook" class="menu-iconic quicktext-icon menuitem-iconic" />
+    <menuitem id="quicktext-settings" label="&quicktext.label;" oncommand="quicktext.openSettings();"
+      insertafter="tasksMenuAddressBook" class="menu-iconic quicktext-icon menuitem-iconic" />
     <menuseparator insertafter="tasksMenuAddressBook" />
   </menupopup>
 
-  <toolbar id="quicktext-toolbar" insertbefore="messageEditor">
+  <hbox id="quicktext-toolbar" insertbefore="messageEditor">
+    <html:div id="quicktext-templates-toolbar" />
+    <spacer flex="1" />
+    <hbox>
       <button type="menu" id="quicktext-variables" label="&quicktext.variables.label;" tabindex="-1">
         <menupopup>
           <menu label="&quicktext.to.label;">
@@ -39,7 +44,8 @@ function onLoad(activatedWhileWindowOpen) {
               <menuitem label="&quicktext.email.label;" oncommand="quicktext.insertVariable('TO=email');" />
               <menuitem label="&quicktext.worknumber.label;" oncommand="quicktext.insertVariable('TO=workphone');" />
               <menuitem label="&quicktext.faxnumber.label;" oncommand="quicktext.insertVariable('TO=faxnumber');" />
-              <menuitem label="&quicktext.cellularnumber.label;" oncommand="quicktext.insertVariable('TO=cellularnumber');" />
+              <menuitem label="&quicktext.cellularnumber.label;"
+                oncommand="quicktext.insertVariable('TO=cellularnumber');" />
               <menuitem label="&quicktext.jobtitle.label;" oncommand="quicktext.insertVariable('TO=jobtitle');" />
               <menuitem label="&quicktext.custom1.label;" oncommand="quicktext.insertVariable('TO=custom1');" />
               <menuitem label="&quicktext.custom2.label;" oncommand="quicktext.insertVariable('TO=custom2');" />
@@ -57,7 +63,8 @@ function onLoad(activatedWhileWindowOpen) {
               <menuitem label="&quicktext.email.label;" oncommand="quicktext.insertVariable('FROM=email');" />
               <menuitem label="&quicktext.worknumber.label;" oncommand="quicktext.insertVariable('FROM=workphone');" />
               <menuitem label="&quicktext.faxnumber.label;" oncommand="quicktext.insertVariable('FROM=faxnumber');" />
-              <menuitem label="&quicktext.cellularnumber.label;" oncommand="quicktext.insertVariable('FROM=cellularnumber');" />
+              <menuitem label="&quicktext.cellularnumber.label;"
+                oncommand="quicktext.insertVariable('FROM=cellularnumber');" />
               <menuitem label="&quicktext.jobtitle.label;" oncommand="quicktext.insertVariable('FROM=jobtitle');" />
               <menuitem label="&quicktext.custom1.label;" oncommand="quicktext.insertVariable('FROM=custom1');" />
               <menuitem label="&quicktext.custom2.label;" oncommand="quicktext.insertVariable('FROM=custom2');" />
@@ -96,7 +103,8 @@ function onLoad(activatedWhileWindowOpen) {
           <menuitem label="&quicktext.insertTextFromFileAsHTML.label;" oncommand="quicktext.insertContentFromFile(1);" />
         </menupopup>
       </button>
-    </toolbar>`,
+    </hbox>
+  </hbox>`,
   ["chrome://quicktext/locale/quicktext.dtd"]);
   
   window.quicktext.load();
diff --git a/chrome/skin/button.large.png b/chrome/skin/button.large.png
deleted file mode 100644
index bc2b2efd29a905d6ce5524de0aab41cbadd967eb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2967
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
N002ovPDHLkV1i7CgcAS&

diff --git a/chrome/skin/button.small.png b/chrome/skin/button.small.png
deleted file mode 100644
index b359966ca85ea8deb696dc88e61233d4604ec065..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1759
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
BHt_%e

diff --git a/chrome/skin/logo.png b/chrome/skin/logo.png
deleted file mode 100644
index ced65e5ddc6069bf1b72a52fe50c9c2143417767..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7575
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

diff --git a/chrome/skin/quicktext.css b/chrome/skin/quicktext.css
index 7174756..c581dd8 100644
--- a/chrome/skin/quicktext.css
+++ b/chrome/skin/quicktext.css
@@ -1,32 +1,5 @@
-#button-quicktext {
-  list-style-image: url("resource://quicktext/skin/button.large.png");
-  -moz-image-region: rect(0px 24px 24px 0px);
-}
-
-#button-quicktext:hover {
-  -moz-image-region: rect(24px 24px 48px 0px);
-}
-
-#button-quicktext[disabled] {
-  -moz-image-region: rect(48px 24px 72px 0px);
-}
-
-toolbar[iconsize="small"] #button-quicktext {
-  list-style-image: url("resource://quicktext/skin/button.small.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-toolbar[iconsize="small"] #button-quicktext:hover {
-  -moz-image-region: rect(16px 16px 32px 0px);
-}
-
-toolbar[iconsize="small"] #button-quicktext[disabled] {
-  -moz-image-region: rect(32px 16px 48px 0px);
-}
-
 .quicktext-icon {
-  list-style-image: url("resource://quicktext/skin/button.small.png");
-  -moz-image-region: rect(16px 16px 32px 0px);
+  list-style-image: url("resource://quicktext/skin/icon16.png");
 }
 
 dialog[OS=WINNT] legend.insideTab {