diff --git a/_locales/en/messages.json b/_locales/en/messages.json index a3ed7ce07..b10064287 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1723,8 +1723,7 @@ "message": "Upgrade your features and save {boldStart}$reduction${boldEnd} by buying a {linkStartPro}QuickFolders Pro license{linkEnd}! This special offer will be available until {boldStart}$expirydate${boldEnd}. Or choose the standard functions with the new {linkStart}Standard License{linkEnd}.", "placeholders": { "expirydate": { - "content": "$1", - "example": "August 22" + "content": "$1" }, "reduction": { "content": "$2", @@ -1749,8 +1748,7 @@ "message": "Upgrade now from QuickFolders Standard to Pro and save {boldStart}$reduction${boldEnd}! This special offer will be available until {boldStart}$expirydate${boldEnd}.", "placeholders": { "expirydate": { - "content": "$1", - "example": "September 11" + "content": "$1" }, "reduction": { "content": "$2", diff --git a/chrome/content/quickfolders-interface.js b/chrome/content/quickfolders-interface.js index b31b3de7f..6bcff000d 100644 --- a/chrome/content/quickfolders-interface.js +++ b/chrome/content/quickfolders-interface.js @@ -516,12 +516,15 @@ QuickFolders.Interface = { quickFoldersLabel.label = prefs.TextQuickfoldersLabel; quickFoldersLabel.collapsed = !showLabelBox; // force Renew QuickFolders to be visible! + if (QuickFolders.Util.licenseInfo.isExpired) { + quickFoldersLabel.classList.add("expired"); + } + if (prefs.getBoolPref("hasNews")) { quickFoldersLabel.classList.add("newsflash"); quickFoldersLabel.setAttribute("tooltiptext", util.getBundleString("update.tooltip",["QuickFolders"])); } else if (QuickFolders.Util.licenseInfo.isExpired) { - quickFoldersLabel.classList.add("expired"); quickFoldersLabel.classList.remove("newsflash"); let txtExpired = util.getBundleString("qf.premium.renewLicense.tooltip").replace("{1}", QuickFolders.Util.licenseInfo.expiredDays); diff --git a/chrome/content/quickfolders.js b/chrome/content/quickfolders.js index 13f11ac87..c7b4b1b37 100644 --- a/chrome/content/quickfolders.js +++ b/chrome/content/quickfolders.js @@ -469,16 +469,19 @@ var QuickFolders = { let folderTree = QuickFolders.mailFolderTree; // add an onSelect event! folderTree.addEventListener("select", QuickFolders.FolderTreeSelect, false); - // [Bug 26566] - Folder Tree doesn't show icons - let time = prefs.getIntPref('treeIconsDelay'); - util.logDebug("Repair Icons for " + util.Application + " " + util.ApplicationVersion + " in " + time/1000 + " sec..."); - win.setTimeout( - function () { - util.logDebug("Repair Icons:"); - QI.repairTreeIcons(true); // silently - }, time - ); - + + if (QuickFolders.Util.versionSmaller(QuickFolders.Util.Appversion, "102")) { + // [Bug 26566] - Folder Tree doesn't show icons + let time = prefs.getIntPref('treeIconsDelay'); + util.logDebug("Repair Icons for " + util.Application + " " + util.ApplicationVersion + " in " + time/1000 + " sec..."); + win.setTimeout( + function () { + util.logDebug("Repair Icons:"); + QI.repairTreeIcons(true); // silently + }, time + ); + } + util.logDebug("Adding Search Input event handler..."); let findFolderBox = QI.FindFolderBox; // #QuickFolders-FindFolder if (findFolderBox) { diff --git a/chrome/content/scripts/quickfoldersDefaults.js b/chrome/content/scripts/quickfoldersDefaults.js index f7cfff2bf..48af05e97 100644 --- a/chrome/content/scripts/quickfoldersDefaults.js +++ b/chrome/content/scripts/quickfoldersDefaults.js @@ -66,7 +66,7 @@ pref("extensions.quickfolders.tooltips.serverName", true); pref("extensions.quickfolders.tooltips.virtualFlag", true); pref("extensions.quickfolders.tooltips.msgFolderFlags", false); pref("extensions.quickfolders.autoValidateFolders", true); // check if folder exists when clicking a tab -pref("extensions.quickfolders.treeIconsDelay", 7500); // repair icons [Bug 26566] +pref("extensions.quickfolders.treeIconsDelay", 7500); // repair icons [Bug 26566] - deprecated from TB102 // Current Folder Toolbar pref("extensions.quickfolders.showCurrentFolderToolbar", true); pref("extensions.quickfolders.showCurrentFolderToolbar.messageWindow", false); diff --git a/manifest.json b/manifest.json index a1fa7ffe7..ba35c36c2 100644 --- a/manifest.json +++ b/manifest.json @@ -10,7 +10,7 @@ "author": "Axel Grude, Klaus Buecher/opto", "name" : "QuickFolders", "description" : "__MSG_extensionDescription__", - "version" : "5.11pre110", + "version" : "5.11", "default_locale": "en", "developer" : { "name" : "Axel Grude, Klaus Buecher/opto", diff --git a/popup/popup.js b/popup/popup.js index 18dc7fe48..c0fef82bf 100644 --- a/popup/popup.js +++ b/popup/popup.js @@ -67,6 +67,7 @@ async function updateActions(addonName) { hide('new-licensing'); // hide box that explains new licensing system.. if (isExpired) { // License Renewal + hide('purchaseHeader'); hide('extendLicenseListItem'); hide('extend'); show('renewLicenseListItem'); diff --git a/popup/update.html b/popup/update.html index 6ba04b197..5f097581c 100644 --- a/popup/update.html +++ b/popup/update.html @@ -19,12 +19,6 @@

__MSG_heading-updated__

__MSG_active-version-info__

-
-

__MSG_licenseHead__

-

__MSG_licenseTypes__

-

__MSG_licenseComparison__

-
-
@@ -64,6 +58,14 @@

__MSG_whats-new-head__

+ +
+

__MSG_licenseHead__

+

__MSG_licenseTypes__

+

__MSG_licenseComparison__

+
+ +

__MSG_license-is-extended__

diff --git a/release-notes.html b/release-notes.html index cee25a786..36493ac6f 100644 --- a/release-notes.html +++ b/release-notes.html @@ -9,15 +9,18 @@ You can also donate from here. - +Improvements +Bugs Fixed + diff --git a/revision.txt b/revision.txt index a7bef4265..0781f4a5a 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -110 +116