18.6.7 Some fix

tablacus · Jun 7, 2018 · f07f199 · f07f199
1 parent f39b50b
commit f07f199
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 16 deletions.
diff --git a/Debug/addons/remember/config.xml b/Debug/addons/remember/config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TablacusExplorer>
   <General>
-    <Version>1.33</Version>
-    <MinVersion>2018.5.8</MinVersion>
-    <pubDate>Tue, 08 May 2018 00:00:00 GMT</pubDate>
+    <Version>1.34</Version>
+    <MinVersion>2018.6.2</MinVersion>
+    <pubDate>Wed, 06 Jun 2018 00:00:00 GMT</pubDate>
     <Options>Common:0:0</Options>
     <Creator>Gaku</Creator>
     <URL>http://tablacus.github.io/TablacusExplorerAddons/</URL>

diff --git a/Debug/addons/remember/script.js b/Debug/addons/remember/script.js
@@ -10,6 +10,7 @@ if (window.Addon == 1) {
 		db: {},
 		ID: ["Time", "ViewMode", "IconSize", "Columns", "SortColumn", "Group", "SortColumns", "Path"],
 		nFormat: api.QuadPart(GetAddonOption(Addon_Id, "Format")),
+		nSM: api.GetSystemMetrics(SM_CXSMICON) * 96 / screen.deviceXDPI,
 
 		RememberFolder: function (FV)
 		{
@@ -61,6 +62,9 @@ if (window.Addon == 1) {
 			var ar = Addons.Remember.db[Addons.Remember.GetPath(Ctrl)];
 			if (ar) {
 				fs.ViewMode = ar[1];
+				if (ar[2] > Addons.Remember.nSM && (ar[1] > FVM_ICON && ar[1] <= FVM_DETAILS)) {
+					ar[2] = Addons.Remember.nSM;
+				}
 				fs.ImageSize = ar[2];
 				Ctrl.Data.Setting = 'Remember';
 			}
@@ -76,6 +80,9 @@ if (window.Addon == 1) {
 			if (Ctrl.Data && Ctrl.Data.Setting == 'Remember') {
 				var ar = Addons.Remember.db[Ctrl.Data.Remember];
 				if (ar) {
+					if (ar[2] > Addons.Remember.nSM && (ar[1] > FVM_ICON && ar[1] <= FVM_DETAILS)) {
+						ar[2] = Addons.Remember.nSM;
+					}
 					Ctrl.CurrentViewMode(ar[1], ar[2]);
 					Ctrl.Columns = ar[3];
 					var col = Ctrl.Columns(Addons.Remember.nFormat);

diff --git a/Debug/addons/tabplus/config.xml b/Debug/addons/tabplus/config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TablacusExplorer>
   <General>
-    <Version>1.43</Version>
-    <MinVersion>2018.4.12</MinVersion>
-    <pubDate>Thu, 12 Apr 2018 00:00:00 GMT</pubDate>
+    <Version>1.44</Version>
+    <MinVersion>2018.6.2</MinVersion>
+    <pubDate>Wed, 06 Jun 2018 00:00:00 GMT</pubDate>
     <Options>Common:0:0</Options>
     <Creator>Gaku</Creator>
     <URL>http://tablacus.github.io/TablacusExplorerAddons/</URL>

diff --git a/Debug/addons/tabplus/script.js b/Debug/addons/tabplus/script.js
@@ -532,12 +532,12 @@ if (window.Addon == 1) {
 			if (TC) {
 				var nIndex = Addons.TabPlus.FromPt(TC.Id, pt);
 				if (nIndex >= 0) {
+					if (IsDrag(pt, g_ptDrag)) {
+						clearTimeout(Addons.TabPlus.tid);
+						g_ptDrag = pt.Clone();
+						Addons.TabPlus.tid = setTimeout("Addons.TabPlus.Over(" + TC.Id + ");" , 300);
+					}
 					if (dataObj.Count) {
-						if (IsDrag(pt, g_ptDrag)) {
-							clearTimeout(Addons.TabPlus.tid);
-							g_ptDrag = pt.Clone();
-							Addons.TabPlus.tid = setTimeout("Addons.TabPlus.Over(" + TC.Id + ");" , 300);
-						}
 						var Target = TC.Item(nIndex).FolderItem;
 						if (!api.ILIsEqual(dataObj.Item(-1), Target)) {
 							var DropTarget = api.DropTarget(Target);
@@ -671,7 +671,7 @@ if (window.Addon == 1) {
 	Addons.TabPlus.ImgLock = MakeImgSrc(item.getAttribute("IconLock") || "bitmap:ieframe.dll,545,13,2", 0, true, 13);
 	Addons.TabPlus.ImgClose = MakeImgSrc(item.getAttribute("IconClose") || "bitmap:ieframe.dll,545,13,1", 0, true, 13);
 } else {
-	var ado = OpenAdodbFromTextFile(fso.BuildPath(fso.GetParentFolderName(api.GetModuleFileName(null)), "addons\\"+ Addon_Id + "\\options.html"));
+	var ado = OpenAdodbFromTextFile("addons\\"+ Addon_Id + "\\options.html");
 	if (ado) {
 		var Icon = document.F.Icon;
 		if (Icon) {

diff --git a/Debug/script/common.js b/Debug/script/common.js
@@ -80,9 +80,12 @@ FolderMenu =
 		if (!FolderItem) {
 			return;
 		}
+		if (!/object/i.test(typeof FolderItem)) {
+			FolderItem = api.ILCreateFromPath(FolderItem);
+		}
 		var bSep = false;
 		if (!nParent && !api.ILIsEmpty(FolderItem) && !api.ILIsParent(1, FolderItem, false)) {
-			var Item = api.ILRemoveLastID(FolderItem);
+			Item = api.ILRemoveLastID(FolderItem);
 			var bMatch = IsFolderEx(Item);
 			if (this.Filter) {
 				bMatch = PathMatchEx(bMatch ? Item.Name + ".folder" : Item.Name, this.Filter);
@@ -1550,7 +1553,7 @@ PathMatchEx = function (path, s)
 
 IsFolderEx = function (Item)
 {
-	if (Item && Item.IsFolder) {
+	if (Item && Item.IsFolder && !api.ILIsParent(ssfBITBUCKET, Item, true)) {
 		var wfd = api.Memory("WIN32_FIND_DATA");
 		var hr = api.SHGetDataFromIDList(Item, SHGDFIL_FINDDATA, wfd, wfd.Size);
 		return (hr < 0) || (wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0 || !/^[A-Z]:\\|^\\\\[A-Z].*\\.*\\/i.test(Item.Path);

diff --git a/TE/Resource.h b/TE/Resource.h
@@ -9,7 +9,7 @@
 #define STRING2(str) #str
 #define VER_Y		18
 #define VER_M		6
-#define VER_D		2
+#define VER_D		7
 
 //Icon
 #define IDI_TE		1

diff --git a/TE/TE.cpp b/TE/TE.cpp
@@ -21015,7 +21015,7 @@ STDMETHODIMP CteTreeView::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WO
 					}
 					LPITEMIDLIST pidl;
 					teGetIDListFromVariant(&pidl, &pDispParams->rgvarg[nArg]);
-					if (::ILIsEqual(pidl, g_pidls[CSIDL_RESULTSFOLDER]) || ::ILIsParent(g_pidls[CSIDL_INTERNET], pidl, FALSE)) {
+					if (::ILIsEqual(pidl, g_pidls[CSIDL_RESULTSFOLDER]) || ::ILIsParent(g_pidls[CSIDL_INTERNET], pidl, FALSE) || teILFolderExists(pidl) != S_OK) {
 						teCoTaskMemFree(pidl);
 						return S_OK;
 					}