4.22 - released 30/06/2021

RealRaven2000 · Jun 30, 2021 · 8db2c66 · 8db2c66
1 parent c508283
commit 8db2c66
Show file tree

Hide file tree

Showing 11 changed files with 1,108 additions and 1,012 deletions.
diff --git a/build.bat b/build.bat
@@ -8,6 +8,6 @@ pwsh -Command "(gc -en UTF8NoBOM manifest.json) -replace 'pre%oldRev%', 'pre%qui
 rem "C:\Program Files\7-Zip\7z" a -xr!.svn quickFolders.zip install.rdf chrome.manifest chrome defaults license.txt
 "C:\Program Files\7-Zip\7z" a -xr!.svn QuickFoldersWeb.zip manifest.json install.rdf chrome.manifest chrome defaults license.txt
 echo %quickFoldersRev% > revision.txt
-move QuickFolders*.xpi "..\..\Release\_Test Versions\4.21\"
+move QuickFolders*.xpi "..\..\Release\_Test Versions\4.22\"
 pwsh -Command "Start-Sleep -m 150"
-rename QuickFoldersWeb.zip QuickFolders-wx-4.21.4pre%quickFoldersRev%.xpi
+rename QuickFoldersWeb.zip QuickFolders-wx-4.22pre%quickFoldersRev%.xpi
diff --git a/chrome/content/overlay.xul b/chrome/content/overlay.xul
@@ -169,6 +169,11 @@
 											oncommand="QuickFolders.Util.loadPlatformStylesheet();"
 											class="menuitem-iconic"
 											/>
+						<menuitem id="QuickFolders-ToolbarPopup-dbg5"
+											label="Refresh Recent folder menus"
+											oncommand="QuickFolders.Interface.onClickRecent(document.getElementById('QuickFolders-Recent-CurrentFolderTool'),null,true);" 
+											class="menuitem-iconic"
+											/>														
 
 
 					</menupopup>

diff --git a/chrome/content/quickfolders-interface.js b/chrome/content/quickfolders-interface.js
diff --git a/chrome/content/quickfolders-quickMove.js b/chrome/content/quickfolders-quickMove.js
@@ -139,7 +139,7 @@ QuickFolders.quickMove = {
         fld = QuickFolders.Model.getMsgFolderFromUri(targetFolderUri, true),
         tabMode = QI.CurrentTabMode,    
         tabmail = document.getElementById("tabmail"),
-        currentTab = (util.Application=='Thunderbird') ? tabmail.selectedTab : tabmail.currentTabInfo;
+        currentTab = (util.Application=="Thunderbird") ? tabmail.selectedTab : tabmail.currentTabInfo;
 
 		this.rememberLastFolder(fld, parentName);
 
@@ -181,16 +181,22 @@ QuickFolders.quickMove = {
 		}
 		catch(ex) { logException('quickMove.execute()', ex); }
 		finally {
-			util.touch(fld); // update MRUTime
-			util.logDebugOptional('quickMove', 'After hideFindPopup');
+      setTimeout(function(){
+        util.touch(fld); // update MRUTime
+        util.logDebugOptional('quickMove', "End of quickMove.execute()\nTimestamp of [" + fld.prettyName + "] = " +  util.getMruTime(fld));
+      },
+      800);
 		}
   },
 
   resetMenu: function resetMenu() {
     let menu = QuickFolders.Util.$('QuickFolders-quickMoveMenu');
     for (let i = menu.children.length-1; i>0; i--) {
       let item = menu.children[i];
-      if (item.className.indexOf('msgUri')>=0 || item.tagName=='menuseparator')
+      if (item.classList.contains('msgUri') || 
+          item.classList.contains('folderUri') || 
+          item.classList.contains('folderCopy') || 
+          item.tagName=='menuseparator')
         menu.removeChild(item);
     }    
   },

diff --git a/chrome/content/quickfolders-util.js b/chrome/content/quickfolders-util.js
@@ -66,7 +66,7 @@ QuickFolders.Util = {
   _isCSSGradients: -1,
 	_isCSSRadius: -1,
 	_isCSSShadow: true,
-	HARDCODED_CURRENTVERSION : "4.21.4", // will later be overriden call to AddonManager
+	HARDCODED_CURRENTVERSION : "4.22", // will later be overriden call to AddonManager
 	HARDCODED_EXTENSION_TOKEN : ".hc",
 	ADDON_ID: "[email protected]",
 	FolderFlags : {  // nsMsgFolderFlags
@@ -992,17 +992,17 @@ QuickFolders.Util = {
 		const util = QuickFolders.Util,
           FLAGS = util.FolderFlags;
 		try {
+      let ct = parseInt(new Date().getTime() / 1000); // current time in secs
       // special folders we do not want / need in recent history:
       if (folder.flags & 
             (FLAGS.MSG_FOLDER_FLAG_TRASH | FLAGS.MSG_FOLDER_FLAG_SENTMAIL | FLAGS.MSG_FOLDER_FLAG_QUEUE | 
              FLAGS.MSG_FOLDER_FLAG_JUNK  | FLAGS.MSG_FOLDER_FLAG_ARCHIVES | FLAGS.MSG_FOLDER_FLAG_DRAFTS)) return;
 			if (folder.SetMRUTime)
 				folder.SetMRUTime();
 			else {
-				let ct = parseInt(new Date().getTime() / 1000); // current time in secs
 				folder.setStringProperty("MRUTime", ct);
 			}
-			let time = folder.getStringProperty("MRUTime");
+			let time = folder.getStringProperty("MRUTime"); // [issue 163] apparently something else may reset the string later?
 			util.logDebug("util.touch(" + folder.prettyName + ")\n" + time + '\n' + util.getMruTime(folder));
 		}
 		catch(ex) {
@@ -1034,7 +1034,7 @@ QuickFolders.Util = {
 	} ,
 
 	getTabInfoByIndex: function getTabInfoByIndex(tabmail, idx) {
-    this.logDebug("getTabInfoByIndex(tabmail, " + idx + ") tabInfo: " + tabmail.tabInfo);
+    // this.logDebug("getTabInfoByIndex(tabmail, " + idx + ") tabInfo: ", tabmail.tabInfo);
 		if (tabmail.tabInfo && tabmail.tabInfo.length)
 			return tabmail.tabInfo[idx];
 		if (tabmail.tabOwners)
@@ -1516,7 +1516,6 @@ QuickFolders.Util = {
 
 	// moved from options.js (then called
 	openURL: function openURL(evt,URL) { // workaround for a bug in TB3 that causes href's not be followed anymore.
-		let ioservice, iuri, eps;
 		if (QuickFolders.Util.Application=='SeaMonkey' || QuickFolders.Util.Application=='Postbox')
 		{
 			this.openLinkInBrowserForced(URL);

diff --git a/chrome/content/quickfolders.js b/chrome/content/quickfolders.js
@@ -423,9 +423,13 @@ END LICENSE BLOCK */
     ## [issue 144] Mark folders + subfolders read stops at first generation (direct child folder) mails  
     ## [issue 145] Thunderbird 60: QuickFolders always offers update to 4.21.2
     
-  4.21.4 QuickFolders Pro - WIP
+  4.21.4 QuickFolders Pro - 28/04/2021
     ## [issue 148] quickMove: parent folder containing an underscore not suggested as parent
     
+  4.22 QuickFolders Pro - 
+    ## [issue 163] quickMove: folder created while moving is not displayed on top of recent folders menu
+    ## [issue 155] Support entering multiple words in a search string to find longer folder names that are composite
+    
     
 	Future Work
 	===========
@@ -530,8 +534,15 @@ var QuickFolders_PrepareSessionStore = function () {
 		mailTabType.modes["folder"].persistTab = function(aTab) {
 			let retval = orgPersist(aTab);
 			if (retval) {
-				util.logDebug("persist tab category: " + aTab.QuickFoldersCategory);
-				retval.QuickFoldersCategory = aTab.QuickFoldersCategory; // add category from the tab to persisted info object
+        if (aTab.QuickFoldersCategory) {
+          util.logDebug("persist tab category: " + aTab.QuickFoldersCategory);
+          retval.QuickFoldersCategory = aTab.QuickFoldersCategory; // add category from the tab to persisted info object
+        }
+        else {
+          retval.QuickFoldersCategory = "";
+          util.logDebug("QuickFolders_PrepareSessionStore() - No QuickFoldersCategory for tab: ");
+          util.logDebug(aTab);
+        }
 			}
 			return retval; 
 		}

diff --git a/defaults/preferences/quickfolders.js b/defaults/preferences/quickfolders.js
@@ -38,7 +38,7 @@ pref("extensions.quickfolders.quickMove.lastFolderName","");
 pref("extensions.quickfolders.quickMove.autoFill",true);
 pref("extensions.quickfolders.quickMove.folderLabel", true);
 pref("extensions.quickfolders.quickMove.reopenMsgTabAfterMove", false);
-pref("extensions.quickfolders.quickMove.gotoNextMsgAfterMove", true);
+pref("extensions.quickfolders.quickMove.gotoNextMsgAfterMove", true);
 pref("extensions.quickfolders.quickCopy.useHotkey", false);
 pref("extensions.quickfolders.quickCopy.Hotkey", 'T');
 pref("extensions.quickfolders.quickCopy.Hotkey.Shift", true);
@@ -247,6 +247,8 @@ pref("extensions.quickfolders.premium.findFolder.maxParentLevel", 2);  // Bug 26
 pref("extensions.quickfolders.premium.findFolder.maxPathItems", 3); // Bug 25991
 pref("extensions.quickfolders.premium.findFolder.folderPathDetail", 2); // Bug 25991
 pref("extensions.quickfolders.quickMove.premium.silentMode", false);
+pref("extensions.quickfolders.quickMove.maxResults",25);
+
 /* popupProFeature( ) counts how often these features are used */
 pref("extensions.quickfolders.premium.advancedTabProperties.usage", 0);
 pref("extensions.quickfolders.premium.bookmarks.usage", 0);

diff --git a/install.rdf b/install.rdf
@@ -13,7 +13,7 @@
    em:icon64URL="chrome://quickfolders/skin/ico/QF64x64.png"
    em:optionsURL="chrome://quickfolders/content/options.xul">
     <em:type>2</em:type>
-	  <em:version>4.21.4</em:version>
+	  <em:version>4.22</em:version>
     <em:homepageURL>https://quickfolders.mozdev.org/index.html</em:homepageURL>
     <em:targetApplication RDF:resource="rdf:#$Vsomz2"/>
     <em:targetApplication RDF:resource="rdf:#$Vsomt2"/>

diff --git a/manifest.json b/manifest.json
@@ -3,7 +3,7 @@
   "manifest_version": 2,
   "name": "QuickFolders",
 	"description": "Bookmark your favorite mail folders in Thunderbird.",
-  "version": "4.21.4",
+  "version": "4.22",
   "developer": {
 	  "name": "Axel Grude",
     "url": "https://quickfolders.org/index.html"

diff --git a/release-notes.html b/release-notes.html
@@ -1,13 +1,21 @@
-Release 4.21.4
+Release 4.22
 
 This release backports some of the fixes that were also done in the new version for Thunderbird 78. If you want to get the latest features, I highly recommend updating Thunderbird to the current 78 release version.
 To support QuickFolders, <a href="http://sites.fastspring.com/quickfolders/product/quickfolders?referrer=atn-version-page">buy a license</a> or <a href="https://quickfolders.org/donate.html?referrer=atn-version-page">donate</a> to support the project.
 
-<b>Bug Fixes</b>
+<b>Improvements</b>
 <ul>
-<li> <a target="_blank" href="https://github.com/RealRaven2000/QuickFolders/issues/148">[issue 148]</a> quickMove: parent folder containing an underscore not suggested as parent if typed from fully. This is a regression caused by changes in             <a target="_blank" href="https://github.com/RealRaven2000/QuickFolders/issues/135">[issue 135]</a> which allows for entering parent names by entering text within the string if that starts with an underscore or space - e.g. to find all child folders of "001_Test" you could just type "tes/". The regression caused it not to be suggested when typing "001_tes/" as it only would evaluate the substrings "001" and "Test" as possible parents.
-</li>
+<li> <a target="_blank" href="https://github.com/RealRaven2000/QuickFolders/issues/155">[issue 155]</a> Support entering multiple words in a search string to find longer folder names that are composited, such as "Fred.Flintstone" "Invoices June 2020" "Research+Development". These can now be found by entering the starting letters of the words within the folder name, in any order. e.g. "f f" "2020 inv" "Dev Res". The following characters are regarded as word boundaries and don't need to be typed:
+_ . - + & @
+
+This can also be combined with the existing parent folder syntax by entering the parent folder start followed by a forward slash "/", e.g. enter "A/rev a" to match subfolders like "AMO » AMO-Reviews" "Addons » Accepted Revisions".
+
+Use the new character ">" to skip any folder within the path.
+
+Use the [?] symbol to the right of the search field to display a help panel.</li>
+<li> <a target="_blank" href="https://github.com/RealRaven2000/QuickFolders/issues/163">[issue 163]</a> quickMove: folder created while moving is not displayed on top of recent folders menu.</li>
 <li>
 I am working on making QuickFolders compatible with Thunderbird 91, which is planned for release in summer 2021. There is a lot of rewriting going on in the background in order to replace internal functionality with the new API model. If you still ust THunderbird 68 or older, consider at least switching to Thunderbird 78 to get the <a href="https://quickfolders.org/version.html#latest">latest version of QuickFolders</a>.
 </li>
+<li>The maximum number of search results in quickMove can now be larger than 25 by editing the following configuration setting: extensions.quickfolders.quickMove.maxResults </li>
 </ul>
diff --git a/revision.txt b/revision.txt
@@ -1 +1 @@
-4 
+36