24.2.18

tablacus · Feb 18, 2024 · 6f2403a · 6f2403a
1 parent 6cc4d6f
commit 6f2403a
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 29 deletions.
diff --git a/docs/index.xml b/docs/index.xml
@@ -1,4 +1,5 @@
-<TablacusExplorer><Item Id="forcerefresh"><General><Version>1.10</Version><MinVersion>2024.2.16</MinVersion><pubDate>Fri, 16 Feb 2024 00:00:00 GMT</pubDate><Creator>Gaku</Creator></General><en><Name>Force refresh</Name><Description>Force refresh</Description></en><ja><Name>強制的に更新</Name></ja><zh><Name>自動重新整理</Name></zh></Item>
+<TablacusExplorer><Item Id="tabs"><General><Version>1.27</Version><MinVersion>2024.2.16</MinVersion><pubDate>Sun, 18 Feb 2024 00:00:00 GMT</pubDate><Creator>Gaku</Creator></General><en><Name>Tabs</Name><Description>Tabs</Description></en><ja><Name>タブ</Name></ja></Item>
+<Item Id="forcerefresh"><General><Version>1.10</Version><MinVersion>2024.2.16</MinVersion><pubDate>Fri, 16 Feb 2024 00:00:00 GMT</pubDate><Creator>Gaku</Creator></General><en><Name>Force refresh</Name><Description>Force refresh</Description></en><ja><Name>強制的に更新</Name></ja><zh><Name>自動重新整理</Name></zh></Item>
 <Item Id="tabplus"><General><Version>1.97</Version><MinVersion>2024.2.16</MinVersion><pubDate>Fri, 16 Feb 2024 00:00:00 GMT</pubDate><Creator>Gaku</Creator></General><en><Name>Tab plus</Name><Description>Tab plus</Description></en><ja><Name>タブプラス</Name></ja><zh><Name>進階頁籤</Name></zh></Item>
 <Item Id="renamedialogplus"><General><Version>1.09</Version><MinVersion>2023.9.13</MinVersion><pubDate>Mon, 12 Feb 2024 00:00:00 GMT</pubDate><Creator>Gaku</Creator></General><en><Name>Rename dialog plus</Name><Description>Rename dialog box plus</Description></en><ja><Name>名前の変更ダイアログボックス プラス</Name><Description>名前の変更を拡張子別のダイアログボックスで行います。</Description></ja><zh><Name>重新命名進階對話窗</Name></zh></Item>
 <Item Id="importexplorer"><General><Version>1.12</Version><MinVersion>2023.9.13</MinVersion><pubDate>Mon, 12 Feb 2024 00:00:00 GMT</pubDate><Creator>Gaku</Creator></General><en><Name>Import Explorer</Name><Description>Import Explorer</Description></en><ja><Name>エクスプローラを取り込む</Name><Description>エクスプローラを取り込んでTablacus Explorerで開きます。</Description></ja><zh><Name>匯入檔案總管</Name></zh></Item>
@@ -106,7 +107,6 @@
 <Item Id="touchex"><General><Version>1.10</Version><MinVersion>2021.12.18</MinVersion><pubDate>Sun, 26 Dec 2021 00:00:00 GMT</pubDate><Creator>Gaku</Creator></General><en><Name>Change the timestamp</Name><Description>Change the date and time that the specified file or directory was created, last accessed, or last modified.</Description></en><ja><Name>タイムスタンプの変更</Name><Description>ファイルやフォルダの更新日時、作成日時、アクセス日時の変更</Description></ja><zh><Name>變更時間戳記</Name></zh></Item>
 <Item Id="touch"><General><Version>1.12</Version><MinVersion>2021.12.18</MinVersion><pubDate>Sun, 26 Dec 2021 00:00:00 GMT</pubDate><Creator>Gaku</Creator></General><en><Name>Change the Date modified</Name><Description>Change the Date modified.</Description></en><ja><Name>更新日時の変更</Name></ja><zh><Name>變更修改日期</Name></zh></Item>
 <Item Id="undoclosetab"><General><Version>1.16</Version><MinVersion>2021.12.18</MinVersion><pubDate>Sun, 26 Dec 2021 00:00:00 GMT</pubDate><Creator>Gaku</Creator></General><en><Name>Undo close tab</Name><Description>Undo close tab.</Description></en><ja><Name>閉じたタブを元に戻す</Name></ja><zh><Name>復原已關閉分頁</Name></zh></Item>
-<Item Id="tabs"><General><Version>1.26</Version><MinVersion>2021.12.18</MinVersion><pubDate>Sun, 26 Dec 2021 00:00:00 GMT</pubDate><Creator>Gaku</Creator></General><en><Name>Tabs</Name><Description>Tabs</Description></en><ja><Name>タブ</Name></ja></Item>
 <Item Id="tabgroups"><General><Version>1.45</Version><MinVersion>2021.12.18</MinVersion><pubDate>Sun, 26 Dec 2021 00:00:00 GMT</pubDate><Creator>Gaku</Creator></General><en><Name>Tab groups</Name><Description>Groups all panes containing several tabs into independent workspaces displayed as a tab bar</Description></en><ja><Name>タブグループ</Name><Description>複数のタブを含むフォルダー群をグループ分けしたタブで管理</Description></ja><zh><Name>工作區</Name></zh></Item>
 <Item Id="longpress"><General><Version>1.03</Version><MinVersion>2021.12.18</MinVersion><pubDate>Sat, 25 Dec 2021 00:00:00 GMT</pubDate><Creator>Gaku</Creator></General><en><Name>Long press</Name><Description>Long press. "1-"</Description></en><ja><Name>長押し</Name></ja><zh><Name>長按</Name></zh></Item>
 <Item Id="switchprevpane"><General><Version>1.03</Version><MinVersion>2021.12.18</MinVersion><pubDate>Sat, 25 Dec 2021 00:00:00 GMT</pubDate><Creator>Gaku</Creator></General><en><Name>Switch to previous pane</Name><Description>Command: "Switch to previous pane", Environment: "%prevpane%".</Description></en><ja><Name>前のペインに切り替える</Name><Description>前のペインに切り替えるコマンドと、前のペインを表す環境変数「%prevpane%」を追加します。</Description></ja><zh><Name>上一個窗格</Name></zh></Item>

diff --git a/docs/tabs/tabs_127.zip b/docs/tabs/tabs_127.zip
diff --git a/tabs/config.xml b/tabs/config.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TablacusExplorer>
   <General>
-    <Version>1.26</Version>
-    <MinVersion>2021.12.18</MinVersion>
-    <pubDate>Sun, 26 Dec 2021 00:00:00 GMT</pubDate>
-    <Options>Common:4:4</Options>
+    <Version>1.27</Version>
+    <MinVersion>2024.2.16</MinVersion>
+    <pubDate>Sun, 18 Feb 2024 00:00:00 GMT</pubDate>
+    <Options>Common:0,4:4</Options>
     <Level>2</Level>
     <Creator>Gaku</Creator>
     <URL>https://tablacus.github.io/TablacusExplorerAddons/</URL>

diff --git a/tabs/options.html b/tabs/options.html
@@ -1,20 +1,20 @@
 <form name="E">
-  <label>Style</label><br>
-  <label><input type="checkbox" id="Tab_Style:0x100" onclick="SetCheckbox(this)">Buttons</label>
-  <label><input type="checkbox" id="Tab_Style:0x8" onclick="SetCheckbox(this)">Flat</label>
-  <label><input type="checkbox" id="Tab_Style:0x1" onclick="SetCheckbox(this)">Scroll opposite</label>
-  <br>
-  <label><input type="checkbox" id="Tab_Style:0x200" onclick="SetCheckbox(this)">Multi line</label>
-  <label><input type="checkbox" id="Tab_Style:0x400" onclick="SetCheckbox(this)">Fixed width</label>
-  <label><input type="checkbox" id="Tab_Style:0x800" onclick="SetCheckbox(this)">Ragged right</label>
-  <br>
-  <label><input type="checkbox" id="Tab_Style:0x2" onclick="SetCheckbox(this)">Right/Bottom</label>
-  <label><input type="checkbox" id="Tab_Style:0x80" onclick="SetCheckbox(this)">Vertical</label>
-  <label><input type="checkbox" id="Tab_Style:0x40" onclick="SetCheckbox(this)">Hot track</label>
+  <div>
+    <label>Style</label>
+  </div>
+  <label><input type="checkbox" id="Tab_Style:0x100" onclick="SetCheckbox(this)">Buttons</label><br>
+  <label><input type="checkbox" id="Tab_Style:0x8" onclick="SetCheckbox(this)">Flat</label><br>
+  <label><input type="checkbox" id="Tab_Style:0x1" onclick="SetCheckbox(this)">Scroll opposite</label><br>
+  <label><input type="checkbox" id="Tab_Style:0x200" onclick="SetCheckbox(this)">Multi line</label><br>
+  <label><input type="checkbox" id="Tab_Style:0x400" onclick="SetCheckbox(this)">Fixed width</label><br>
+  <label><input type="checkbox" id="Tab_Style:0x800" onclick="SetCheckbox(this)">Ragged right</label><br>
+  <label><input type="checkbox" id="Tab_Style:0x2" onclick="SetCheckbox(this)">Right/Bottom</label><br>
+  <label><input type="checkbox" id="Tab_Style:0x80" onclick="SetCheckbox(this)">Vertical</label><br>
+  <label><input type="checkbox" id="Tab_Style:0x40" onclick="SetCheckbox(this)">Hot track</label><br>
+  <label><input type="checkbox" id="Tab_Style:0x4000" onclick="SetCheckbox(this)">Tooltips</label><br>
+  <label><input type="checkbox" id="Tab_Style:0x10" onclick="SetCheckbox(this)">Force icon left</label><br>
+  <label><input type="checkbox" id="Tab_Style:0x20" onclick="SetCheckbox(this)">Force label left</label><br>
   <br>
-  <label><input type="checkbox" id="Tab_Style:0x4000" onclick="SetCheckbox(this)">Tooltips</label>
-  <label><input type="checkbox" id="Tab_Style:0x10" onclick="SetCheckbox(this)">Force icon left</label>
-  <label><input type="checkbox" id="Tab_Style:0x20" onclick="SetCheckbox(this)">Force label left</label><br><br>
   <div>
     <label>Align</label>
   </div>
@@ -33,6 +33,9 @@
   <input type="text" name="Tab_TabHeight" size="4" onchange="SetText(this)"><br>
   <br>
   <div>
-    <label><input type="checkbox" id="Conf_TabDefault" onclick="SetCheckbox2(this)">Set Default</label>
+    <label><input type="checkbox" id="Conf_TabDefault" onclick="SetCheckbox2(this)">Default</label>
   </div>
 </form>
+<!--panel-->
+<label><input type="checkbox" id="!NoDragOpen">Open</label><br>
+<input type="checkbox" id="!NoDropTo"><label for="!NoDropTo" id="_DropTo">Drop to Folder</label>
diff --git a/tabs/options.js b/tabs/options.js
@@ -1,7 +1,16 @@
 g_win = MainWindow.g_.OptionsWindow;
 g_doc = parent.document;
 
-await SetTabContents(4, "General", await ReadTextFile("addons\\" + Addon_Id + "\\options.html"));
+const tabs = document.getElementById('tabs');
+const tab = document.getElementById('tab0');
+tabs.removeChild(tab);
+tabs.appendChild(tab);
+
+const ar = (await ReadTextFile(BuildPath(ui_.Installed, "addons", Addon_Id, "options.html"))).split("<!--panel-->");
+await SetTabContents(4, "General", ar[0]);
+await SetTabContents(0, "Drag-and-Drop", ar[1]);
+
+document.getElementById("_DropTo").innerHTML = (await GetTextR("@SRH.dll,-8110[Drop to %1]")).replace(/%1/, await GetText("Folder"));
 
 SetText = function (o) {
 	g_doc.F[o.name].value = o.value;

diff --git a/tabs/sync.js b/tabs/sync.js
@@ -1,4 +1,10 @@
+const Addon_Id = "tabs";
+const item = GetAddonElement(Addon_Id);
+
 Sync.Tabs = {
+	DropTo: !item.getAttribute("NoDropTo"),
+	DragOpen: !item.getAttribute("NoDragOpen"),
+
 	Init: function (Ctrl) {
 		api.SendMessage(Ctrl.hwnd, WM_SETFONT, Sync.Tabs.hFont, 1);
 		api.SendMessage(Ctrl.hwnd, TCM_SETIMAGELIST, 0, Sync.Tabs.himl);
@@ -65,7 +71,7 @@ AddEvent("DragEnter", function (Ctrl, dataObj, grfKeyState, pt, pdwEffect) {
 AddEvent("DragOver", function (Ctrl, dataObj, grfKeyState, pt, pdwEffect) {
 	if (Ctrl.Type == CTRL_TC) {
 		const nIndex = Ctrl.HitTest(pt, TCHT_ONITEM);
-		if (nIndex >= 0) {
+		if (nIndex >= 0 && Sync.Tabs.DragOpen) {
 			if (IsDrag(pt, g_ptDrag)) {
 				g_ptDrag = pt.Clone();
 				InvokeUI("Addons.Tabs.setTimeout", Sync.Tabs.Over, 300);
@@ -77,7 +83,7 @@ AddEvent("DragOver", function (Ctrl, dataObj, grfKeyState, pt, pdwEffect) {
 			return S_OK;
 		}
 		if (nIndex >= 0) {
-			if (dataObj.Count) {
+			if (dataObj.Count && Sync.Tabs.DropTo) {
 				const Target = Ctrl.Item(nIndex).FolderItem;
 				if (!api.ILIsEqual(dataObj.Item(-1), Target)) {
 					const DropTarget = api.DropTarget(Target);
@@ -87,8 +93,10 @@ AddEvent("DragOver", function (Ctrl, dataObj, grfKeyState, pt, pdwEffect) {
 					}
 				}
 			}
-			pdwEffect[0] = DROPEFFECT_NONE;
-			return S_OK;
+			if (Sync.Tabs.DropTo) {
+				pdwEffect[0] = DROPEFFECT_NONE;
+				return S_OK;
+			}
 		}
 		if (dataObj.Item(0) && dataObj.Item(0).IsFolder) {
 			pdwEffect[0] = DROPEFFECT_LINK;
@@ -107,7 +115,7 @@ AddEvent("Drop", function (Ctrl, dataObj, grfKeyState, pt, pdwEffect) {
 			}
 			Sync.Tabs.DragTab.Move(Sync.Tabs.DragIndex, nIndex, Ctrl);
 			Ctrl.SelectedIndex = nIndex;
-		} else if (nIndex >= 0) {
+		} else if (nIndex >= 0 && Sync.Tabs.DropTo) {
 			let hr = S_FALSE;
 			const DropTarget = Ctrl.Item(nIndex).DropTarget;
 			if (DropTarget) {
@@ -118,7 +126,7 @@ AddEvent("Drop", function (Ctrl, dataObj, grfKeyState, pt, pdwEffect) {
 		} else if (dataObj.Count) {
 			for (let i = 0; i < dataObj.Count; i++) {
 				const FV = Ctrl.Selected.Navigate(dataObj.Item(i), SBSP_NEWBROWSER);
-				Ctrl.Move(FV.Index, Ctrl.Count - 1);
+				Ctrl.Move(FV.Index, nIndex >= 0 ? nIndex : Ctrl.Count - 1);
 			}
 		}
 	}