5.11 Release Build. Removed rebuildTreeIcons on startup

_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",

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);

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) {

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);

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",

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');

popup/update.html

@@ -19,12 +19,6 @@ <h1 id="heading-updated"> __MSG_heading-updated__</h1>
         <span id="active-version-info">__MSG_active-version-info__</span>
       </p>
 
-      <div id="new-licensing" class="importantInfo announcement">
-        <h2>__MSG_licenseHead__</h2>
-        <p class="importantInfo">__MSG_licenseTypes__</p>
-        <p class="featureComparison">__MSG_licenseComparison__</p>
-      </div>
-
       <div id="specialBox" class="importantInfo">
 	      <div id="specialOffer" class="specialOffer" collapsed="true">
 	        <img id="bargainIcon" class="bargainIcon" src="bargain30.png" />
@@ -64,6 +58,14 @@ <h2>__MSG_whats-new-head__</h2>
         </div>
       </div>
 
+
+      <div id="new-licensing" class="importantInfo announcement">
+        <h2>__MSG_licenseHead__</h2>
+        <p class="importantInfo">__MSG_licenseTypes__</p>
+        <p class="featureComparison">__MSG_licenseComparison__</p>
+      </div>
+
+
       <p id="licenseExtended">
         __MSG_license-is-extended__
       </p>

release-notes.html

@@ -9,15 +9,18 @@
 
 You can also <a href="https://quickfolders.org/donate.html#donate">donate from here</a>.
 
-
+<b>Improvements</b>
 <ul>
 <li> <a href="https://github.com/RealRaven2000/QuickFolders/issues/283">[issue 283]</a> Slowdown of Thunderbird 102 with QuickFolders
 
 There is some inefficiency in the Thunderbird code base for the folder tree which can be exascerbated by QuickFolders. I have removed as many function calls as I could find without impacting on functionality. On startup some right-click menus have to be generated to make drag+drop, these are now generated at a later stage to yield some time to the User Interface.</li>
+</ul>
+<b>Bugs Fixed</b>
+<ul>
 <li> <a href="https://github.com/RealRaven2000/QuickFolders/issues/279">[issue 279]</a> Fixed: Thunderbird 102 - current category is not remembered / selected; in this solution I store the current category of each tab (folder and messages) whenever a tab is opened / moved or closed. Information is only stored for one single window, so it might get confused if you open multiple windows with different categories per tab. It works reasonably for most general uses of QuickFolder categories.</li>
 <li> <a href="https://github.com/RealRaven2000/QuickFolders/issues/280">[issue 280]</a> Folder tree icons did not work independently of tabs in Thunderbird 102.</li>
 <li>
 <a href="https://github.com/RealRaven2000/QuickFolders/issues/284">[issue 284]</a> Recent folders menu doesn't show or takes a very long time in Thunderbird 102 - There is some inefficent code in Thunderbird 102 at the moment, so I have started to use their own internal function to generate this. </li>
-<li> <a href="https://github.com/RealRaven2000/QuickFolders/issues/287">[issue 287]</a> Fixed the deleting of invalid (orphaned) tabs through the tool menu command "remove invalid tabs". </li>
+<li> <a href="https://github.com/RealRaven2000/QuickFolders/issues/287">[issue 287]</a> Fixed the removal of invalid (orphaned) tabs through the tool menu command "remove invalid tabs". Also renamed it for clarity: this used to be called "find orphaned tabs" </li>
 </ul>        
 

revision.txt

@@ -1 +1 @@
-110 
+116