From 4d447ee234bf535a1b49531bbccf576e290ad0eb Mon Sep 17 00:00:00 2001 From: Axel G Date: Mon, 4 Dec 2023 16:57:07 +0000 Subject: [PATCH] 6.4 --- _locales/de/messages.json | 4 +-- _locales/en/messages.json | 2 +- chrome/content/skin/tb91/qf-options.css | 5 +++ html/options.html | 48 ++++++++++++------------- html/options.js | 7 ++++ manifest.json | 4 +-- popup/popup.css | 11 ------ qf-background.js | 16 +++++---- release-notes.html | 2 +- revision.txt | 2 +- 10 files changed, 50 insertions(+), 51 deletions(-) diff --git a/_locales/de/messages.json b/_locales/de/messages.json index 7a3356293..3b29e8ef3 100644 --- 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 index 7eefb9fd1..959c53da0 100644 --- 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 index 6a5aabfd0..723fc887a 100644 --- 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 index 6ec9fcefb..f1e655444 100644 --- a/html/options.html +++ b/html/options.html @@ -352,34 +352,30 @@ - - - -
-
- __MSG_qf.label.misc__ - - - -
- 		-
- __MSG_qf.update.title__ - -
-
+
+
+ __MSG_qf.label.misc__ + + + +
+
+ __MSG_qf.update.title__ + +
+
diff --git a/html/options.js b/html/options.js index 6fc519a78..2d54863c0 100644 --- 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 index 9663eef9b..9d6009514 100644 --- a/manifest.json +++ b/manifest.json @@ -4,13 +4,13 @@ "gecko" : { "id" : "quickfolders@curious.be", "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 index 9b7877cad..f1566b431 100644 --- 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 index c1e7c227b..0775ba878 100644 --- 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 index 91f03aa5a..d4f7b51e9 100644 --- a/release-notes.html +++ b/release-notes.html @@ -1,6 +1,6 @@ Release 6.4 -Please note that QuickFolders is compatible with the latest version of Thunderbird (115.3.2) - if you get a message that says otherwise after updating from earlier versions (e.g. Tb91) or if QuickFolders cannot be enabled 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 QuickFolders is compatible with the latest version of Thunderbird (115.5.1) - if you get a message that says otherwise after updating from earlier versions (e.g. Tb91) or if QuickFolders cannot be enabled 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 buy a QuickFolders Pro license here. Or get the new cheaper QuickFolders Standard License. This is the preferred way of funding all the ongoing work and improvements. diff --git a/revision.txt b/revision.txt index 02223985f..127fd9c84 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -66 +140