6.4

RealRaven2000 · Dec 4, 2023 · 4d447ee · 4d447ee
1 parent 556ec01
commit 4d447ee
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 51 deletions.
diff --git a/_locales/de/messages.json b/_locales/de/messages.json
@@ -213,7 +213,7 @@
     "message": "Vielen Dank, dass Sie kürzlich Ihre Lizenz verlängert haben oder gespendet haben. Da Sie zur Zukunftssicherung dieses Add-ons beigetragen haben, können Sie dieses Fenster einfach schließen."
   },
   "licenseComparison": {
-    "message": "Um die Funktionen der verschiedenen Versionen zu vergleichen, {linkStart}lesen Sie diese Liste{linkEnd}."
+    "message": "Die Funktionalität der verschiedenen Lizenzen {linkStart}vergleichen Sie hier{linkEnd}."
   },
   "licenseTerms.hide": {
     "message": "🡇 Zur Lizenzauswahl 🡇"
@@ -258,7 +258,7 @@
     "message": "Neuigkeiten"
   },
   "newsSection": {
-    "message": "{P1} Diese neueste Ausgabe von $addonName$ behebt erweiterte Tab-Eigenschaften wie automatische Adressierung pro Tab beim Verfassen neuer E-Mails. {P2}{P1} Sie hat auch viele weitere Funktionen, die jetzt auf Mac und Linux zugänglich sind. {P2}",
+    "message": "{P1} Diese neueste Ausgabe von $addonName$ behebt erweiterte Tab-Eigenschaften wie automatische Adressierung pro Tab beim Verfassen neuer E-Mails. {P2}{P1} Sie verbessert den Zugriff auf weitere Funktionen, die jetzt auch auf Mac und Linux zugänglich sind. {P2}",
     "placeholders": {
         "addonName": {
             "content": "$1",

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -223,7 +223,7 @@
     "message": "Thank you for recently extending your license or if you have donated. As you have helped to future proof this Add-on, you can simply close this window."
   },
   "licenseComparison" : {
-    "message": "To compare the features of the different versions, {linkStart}read this list{linkEnd}."
+    "message": "To compare the features of the different licenses, {linkStart}read this list{linkEnd}."
   },
   "licenseTerms.hide" : {
     "message": "🡇 Continue to License Selection 🡇"

diff --git a/chrome/content/skin/tb91/qf-options.css b/chrome/content/skin/tb91/qf-options.css
@@ -61,3 +61,8 @@ label.themeable {
   -moz-context-properties: fill, fill-opacity, stroke, stroke-opacity !important;  
   background-position: left center;
 }
+
+div.misc {
+  display: flex;
+  gap: 2em;
+}
diff --git a/html/options.html b/html/options.html
@@ -352,34 +352,30 @@
           </div>
         </fieldset>
 
-        <table style="width:100%"> <tr>
-          <td>
-            <fieldset class="vbox">
-              <legend>__MSG_qf.label.misc__</legend>
-              <label class="hasConfigEvent" ><input type="checkbox" title="__MSG_qf.checkbox.displaylabel.tooltip__"
-                preference="qfpa-ShowQuickFoldersLabel"
-                data-pref-name="extensions.quickfolders.showQuickfoldersLabel">__MSG_qf.checkbox.displaylabel__
-                <button class="configSettings"></button>
-              </label>
-              <label><input type="checkbox"
-                title="__MSG_qf.checkbox.hideCategoryBox.tooltip__" preference="qfpa-CollapseCategory"
-                data-pref-name="extensions.quickfolders.collapseCategories">__MSG_qf.checkbox.hideCategoryBox__</label>
-              <label><input type="checkbox"
-                title="__MSG_qf.checkbox.enableTransitions.tooltip__" preference="qfpa-Transitions"
-                data-pref-name="extensions.quickfolders.style.transitions">__MSG_qf.checkbox.enableTransitions__</label>
-            </fieldset>
-          </td>
-          <td style="display:flex;">
-            <fieldset class="hbox" style="flex: 1 1 max-content;">
-              <legend>__MSG_qf.update.title__</legend>
-              <label><input type="checkbox" 
-                preference="qfpa-hideVersionHistory"
-                data-pref-name="extensions.quickfolders.hideVersionOnUpdate">__MSG_qf.update.hideVersionHistory__</label>              
-            </fieldset>
-          </td>
-        </tr></table>
+        <div class="hbox misc">
+          <fieldset class="vbox">
+            <legend>__MSG_qf.label.misc__</legend>
+            <label class="hasConfigEvent" ><input type="checkbox" title="__MSG_qf.checkbox.displaylabel.tooltip__"
+              preference="qfpa-ShowQuickFoldersLabel"
+              data-pref-name="extensions.quickfolders.showQuickfoldersLabel">__MSG_qf.checkbox.displaylabel__
+              <button class="configSettings"></button>
+            </label>
+            <label><input type="checkbox"
+              title="__MSG_qf.checkbox.hideCategoryBox.tooltip__" preference="qfpa-CollapseCategory"
+              data-pref-name="extensions.quickfolders.collapseCategories">__MSG_qf.checkbox.hideCategoryBox__</label>
+            <label><input type="checkbox"
+              title="__MSG_qf.checkbox.enableTransitions.tooltip__" preference="qfpa-Transitions"
+              data-pref-name="extensions.quickfolders.style.transitions">__MSG_qf.checkbox.enableTransitions__</label>
+          </fieldset>
 
+          <fieldset class="vbox" style="flex: 1 1 max-content;">
+            <legend>__MSG_qf.update.title__</legend>
+            <label><input type="checkbox" 
+              preference="qfpa-hideVersionHistory"
+              data-pref-name="extensions.quickfolders.hideVersionOnUpdate">__MSG_qf.update.hideVersionHistory__</label>              
+          </fieldset>
 
+        </div>
 
         <span class="separator thin"> </span>
         <div class="hbox quickhelp-dbg align_center">

diff --git a/html/options.js b/html/options.js
@@ -30,6 +30,13 @@ const activateTab = (event) => {
   }
 }
 
+function activatePrefsPage(params) {
+  debugger;
+  console.log("activatePrefsPage", params);
+}
+
+window.addEventListener("QuickFolders.BackgroundUpdate.activatePrefsPage", activatePrefsPage);
+
 var licenseInfo;
 async function initLicenseInfo() {
   licenseInfo = await messenger.runtime.sendMessage({command:"getLicenseInfo"});

diff --git a/manifest.json b/manifest.json
@@ -4,13 +4,13 @@
     "gecko" : {
       "id" : "[email protected]",
       "strict_min_version" : "111.0",
-      "strict_max_version" : "120.*"
+      "strict_max_version" : "122.*"
     }
   },
   "author": "Axel Grude",
   "name" : "QuickFolders",
   "description" : "__MSG_extensionDescription__",
-  "version" : "6.3",
+  "version" : "6.4",
   "default_locale": "en",
   "developer" : {
       "name" : "Axel Grude",

diff --git a/popup/popup.css b/popup/popup.css
@@ -76,9 +76,6 @@ code.keystroke {
   background-color: rgb(80,75,60) !important;
 }
 
-ul.actions {
-
-}
 
 .actionlinks {
   margin-top: 2em;
@@ -237,14 +234,6 @@ p.featureComparison {
   text-align: center;
 }
 
-#purchaseLicenseListItem { /* test */
-/*
-  background-color: lightyellow;
-  color: rgb(120,0,0);
-  */
-}
-
-
 body, body * {
   background-color: white;
   color: rgb(20,15,05);

diff --git a/qf-background.js b/qf-background.js
@@ -386,14 +386,16 @@ async function main() {
           let found = oldTabs.find( w => w.windowId == currentWin.id);
           if (!found) {
             [found] = oldTabs; // destructure first element
-            await browser.windows.update(found.windowId, {focused:true});
+            await browser.windows.update(found.windowId, {focused:true, drawAttention: true});
+            // activate the license tab!
+            messenger.NotifyTools.notifyExperiment({event: "activatePrefsPage", data});
+          } else {
+            await browser.tabs.update(found.id, {active:true});
           }
-          await browser.tabs.update(found.id, {active:true});
-        }
-        else {
-          let optionWin = await messenger.windows.create(
-            { height: 780, 
-              width: 830, 
+        } else {
+          let optionsWin = await messenger.windows.create(
+            { height: 720, 
+              width: 840, 
               type: "panel", 
               url: `/html/options.html?${params.toString()}`,
               allowScriptsToClose : true

diff --git a/release-notes.html b/release-notes.html
@@ -1,6 +1,6 @@
 <b>Release 6.4</b>
 
-Please note that <b>QuickFolders is compatible with the latest version of Thunderbird (115.3.2)</b> - if you get a message that says otherwise after updating from earlier versions (e.g. Tb91) or <b>if QuickFolders cannot be enabled</b> with the blue slider, simply remove it and reinstall it via "Find more Add-ons" search box on the Extensions tab of Add-ons Manager.
+Please note that <b>QuickFolders is compatible with the latest version of Thunderbird (115.5.1)</b> - if you get a message that says otherwise after updating from earlier versions (e.g. Tb91) or <b>if QuickFolders cannot be enabled</b> with the blue slider, simply remove it and reinstall it via "Find more Add-ons" search box on the Extensions tab of Add-ons Manager.
 
 To support QuickFolders, please <a href="http://sites.fastspring.com/quickfolders/product/quickfolders?referrer=atn-version-page">buy a QuickFolders Pro license</a> here.
 Or get the new cheaper <a href="http://sites.fastspring.com/quickfolders/product/quickfoldersstandard?referrer=qf-version-page" target="_blank">QuickFolders Standard License</a>. This is the preferred way of funding all the ongoing work and improvements.

diff --git a/revision.txt b/revision.txt
@@ -1 +1 @@
-66 
+140