24.2.3 Some fix

tablacus · Feb 3, 2024 · 4900c92 · 4900c92
1 parent c14f2c0
commit 4900c92
Show file tree

Hide file tree

Showing 17 changed files with 239 additions and 95 deletions.
diff --git a/Debug/lib/te32.dll b/Debug/lib/te32.dll
diff --git a/Debug/lib/te64.dll b/Debug/lib/te64.dll
diff --git a/Debug/script/common.js b/Debug/script/common.js
@@ -74,7 +74,7 @@ AddEvent = function (Name, fn, priority) {
 }
 
 ClearEvent = function (Name) {
-	if (/^arrange$||^finalize$^layout$|^load$|^panelcreated$|^resize$/i.test(Name)) {
+	if (/^arrange$|^finalize$|^layout$|^load$|^panelcreated$|^resize$/i.test(Name)) {
 		InvokeUI("ClearEventUI", [Name]);
 		if (/^finalize$/.test(Name)) {
 			return;
@@ -87,6 +87,10 @@ SameText = function (s1, s2) {
 	return String(s1).toLowerCase() == String(s2).toLowerCase();
 }
 
+StartsText = function (s1, s2) {
+	return String(s1).toLowerCase() == String(s2).slice(0, s1.length).toLowerCase();
+}
+
 GetLength = async function (o) {
 	return o ? (o.length || await api.ObjGetI(o, "length")) : 0;
 }
@@ -113,7 +117,7 @@ CreateTab = async function (Ctrl, pt) {
 }
 
 StripAmp = function (s) {
-	return String(s).replace(/\(&\w\)|&/, "").replace(/\.\.\.$/, "");
+	return String(s).replace(/\(&\w\)|&/, "").replace(/ ?\.\.\.$/, "");
 }
 
 EncodeSC = function (s) {
@@ -325,7 +329,7 @@ CalcVersion = function (s) {
 	if (res) {
 		r = "";
 		for (let i = 1; i < 5; ++i) {
-			r += ('00000' + res[i]).substr(-6);
+			r += ('00000' + res[i]).slice(-6);
 		}
 		return r;
 	}

diff --git a/Debug/script/dialog.html b/Debug/script/dialog.html
@@ -17,6 +17,10 @@
       <!--panel_end-->
       <table id="buttons" class="footer">
         <tr>
+          <td style="padding: 0 2px;">
+            <button id="ButtonSearch" class="hide" onclick="SearchIcon(document.getElementById('Content'))">Search</button>
+          </td>
+          <td id="footnote" class="nowrap"></td>
           <td id="Selected" class="nowrap full right"></td>
           <td class="buttons">
             <button id="ButtonOk" class="ok" onclick="SetResult(1)" disabled="true">OK</button>

diff --git a/Debug/script/index.css b/Debug/script/index.css
@@ -237,7 +237,12 @@ a.treebutton:hover {
 }
 
 .separator {
-	color: #a0a0a0;
+	border-left-style: solid;
+	border-width: 1px;
+	border-color: #a0a0a0;
+	margin: 0 2px;
+	display: inline-block;
+	vertical-align: middle;
 }
 
 .splitter {

diff --git a/Debug/script/index.js b/Debug/script/index.js
@@ -481,7 +481,7 @@ Init = async function () {
 	await RunEventUI1("Layout");
 	document.F.style.visibility = "";
 	te.OnArrange = OnArrange;
-	await InitBG(await GetWinColor(window.getComputedStyle ? getComputedStyle(document.body).getPropertyValue('background-color') : document.body.currentStyle.backgroundColor));
+	await InitBG(window.getComputedStyle ? getComputedStyle(document.body).getPropertyValue('background-color') : document.body.currentStyle.backgroundColor, true);
 	await InitWindow();
 	await RunEventUI1("Load");
 	ui_.Show = 1;

diff --git a/Debug/script/location.html b/Debug/script/location.html
@@ -15,7 +15,7 @@
     --><li id="tab2"></li><!--
     --><li id="tab3"></li><!--
     --><li id="tab4"></li><!--
-    --><li id="tab5">@mmcbase.dll,-106</li><!--
+    --><li id="tab5">Icon</li><!--
     --><li id="tab6">Position</li><!--
     --><li id="tab7">Menus</li><!--
     --><li id="tab8">Key</li><!--
@@ -226,7 +226,7 @@
         <table style="width: 100%">
           <tr>
             <td>
-              <label>@mmcbase.dll,-106</label>
+              <label>Icon</label>
             </td>
           </tr>
           <tr>
@@ -287,7 +287,7 @@
               <input type="text" name="Key" onchange="SetKeyShift()" style="width: 100%">
             </td>
             <td style="width: 2em">
-              <button title="Key" onclick="InputKey(document.F.Key);">Input</button>
+              <button onclick="InputKey(document.F.Key);">Input</button>
             </td>
           </tr>
         </table>
@@ -312,7 +312,7 @@
                     <label>Mouse</label>
                   </td>
                   <td>
-                    <button title="Mouse" onclick="InputMouse();">Input</button>
+                    <button onclick="InputMouse();">Input</button>
                   </td>
                   <td align="right" id="__MOUSEDATA">
                   </td>

diff --git a/Debug/script/options.css b/Debug/script/options.css
@@ -21,6 +21,10 @@ textarea {
 	background-color: #ffffe1;
 }
 
+.box {
+  border-top: 1px solid #888;
+}
+
 .color {
 	border-radius: 2px;
 }

diff --git a/Debug/script/options.html b/Debug/script/options.html
@@ -83,7 +83,7 @@
               <button onclick="SetDefault(document.F.Conf_InnerIconSize, '');">Default</button><br><br>
               <label>Menus</label><br>
               <label><input type="checkbox" id="Conf_MenuHidden">Include hidden items</label><br>
-              <label><input type="checkbox" id="Conf_MenuIcon">@mmcbase.dll,-106</label>
+              <label><input type="checkbox" id="Conf_MenuIcon">Icon</label>
               <br><br>
               <label>Input</label><br>
               <label><input type="checkbox" id="!Conf_NoAutocomplete">@ieframe.dll,-12806[Autocomplete]</label>
@@ -111,14 +111,14 @@
               <br><br>
               <label>Trails</label><br>
               <input type="text" id="Conf_TrailColor" title="Color" placeholder="#00ff00" style="width: 9em" onchange="ChangeColor1(this)">
-              <button id="Color_Conf_TrailColor" class="color" title="Color" onclick="ChooseColor2(this)">&ensp;</button><br>
+              <button id="Color_Conf_TrailColor" class="color" onclick="ChooseColor2(this)">&ensp;</button><br>
               <input type="text" name="Conf_TrailSize" title="Size" class="number"><label>@mspaint.exe,-50047[px]</label>
               <button onclick="AddValue('Conf_TrailSize', -1, 0, 16)">-</button>
               <button onclick="AddValue('Conf_TrailSize', 1, 0, 16)">+</button>
               <br><br>
               <label><input type="checkbox" id="!Conf_NoInfotip">Tooltips</label><br><br>
               <label>Drag-and-Drop</label><br>
-              <label><input type="checkbox" id="!Conf_NoDragIcon">@mmcbase.dll,-106</label>
+              <label><input type="checkbox" id="!Conf_NoDragIcon">Icon</label>
             </div>
             <!--panel_end-->
 
@@ -247,7 +247,7 @@
                           <label>Base</label>
                           <select name="Menus_Base" onchange="SwitchMenus();" class="translate">
                             <option value="Normal">Normal
-                            <option value="Exec">Exec
+                            <option value="Exec" disabled>Exec
                             <option value="Context">Context
                             <option value="Background">Background
                             <option value="File">File
@@ -268,7 +268,7 @@
                           <input type="text" name="Menus_Key" placeholder="Key" title="Key" class="full" onchange="ChangeX('Menus')">
                         </td>
                         <td style="width: 1.667em">
-                          <button title="Key" style="line-height: 1.1em" onclick="InputKey(document.F['Menus_Key']);">...</button>
+                          <button style="line-height: 1.1em" onclick="InputKey(document.F['Menus_Key']);">...</button>
                         </td>
                       </tr>
                     </table>
@@ -311,11 +311,11 @@
                         </td>
                       </tr>
                     </table>
-                    <textarea name="Menus_Path" style="width: 100%; height: 16em; height: calc(100vh - 24em); min-height: 2em" onchange="ChangeX('Menus')"></textarea>
+                    <textarea name="Menus_Path" style="width: 100%; height: 16em; height: calc(100vh - 23em); min-height: 2em" onchange="ChangeX('Menus')"></textarea>
                     <table class="layout">
                       <tr>
                         <td class="bottom nowrap">
-                          <label>@mmcbase.dll,-106</label><input type="hidden" name="Height" value="16">&nbsp;
+                          <label>Icon</label><input type="hidden" name="Height" value="16">&nbsp;
                         </td>
                         <td id="_Icon" class="middle full" style="width: 15pt; height: 15pt; overflow: hidden;" align="left">
                         </td>
@@ -341,11 +341,10 @@
               </table>
               <table class="full">
                 <tr>
-                  <td style="width: 12em">
+                  <td>
                     <button onclick="RemoveX('Menus')">Remove</button>
-                    <label><input type="checkbox" id="_EDIT">Edit</label>
-                  </td>
-                  <td align="left" class="nowrap" style="padding-left: 2pt">
+                    <button onclick="CreateMenuX('Menus')">Menus</button>
+                    <label><input type="checkbox" id="_EDIT">Edit</label>&nbsp;
                     <button onclick="TestX('Menus_')">Test</button>
                   </td>
                   <td align="right">
@@ -473,6 +472,7 @@
               </div>
               <div>
                 (*)Windows Vista <label>or higher.</label>
+                (*7)Windows 7 <label>or higher.</label>
               </div>
             </div>
             <!--panel_end-->
@@ -496,10 +496,6 @@
               <label><input type="radio" name="Tree_RootStyle_" id="Tree_RootStyle=0" onclick="SetRadio(this)">Visible</label><br>
               <label><input type="radio" name="Tree_RootStyle_" id="Tree_RootStyle=1" onclick="SetRadio(this)">Hidden</label><br>
               <label><input type="radio" name="Tree_RootStyle_" id="Tree_RootStyle=2" onclick="SetRadio(this)">Expanded</label><br><br>
-              <div>
-                (*)Windows Vista <label>or higher.</label>
-                (*7)Windows 7 <label>or higher.</label>
-              </div>
             </div>
             <!--panel_end-->
 
@@ -512,14 +508,14 @@
               <br><br>
               <label>View</label><br>
               <input type="hidden" name="View_ViewMode">
-              <label><input type="radio" name="View_ViewMode_" id="View_ViewMode=1" onclick="SetRadio(this)">@mmcbase.dll,-106</label>
+              <label><input type="radio" name="View_ViewMode_" id="View_ViewMode=1" onclick="SetRadio(this)">Icon</label>
               <label><input type="radio" name="View_ViewMode_" id="View_ViewMode=2" onclick="SetRadio(this)">@shell32.dll,-33578</label>
               <label><input type="radio" name="View_ViewMode_" id="View_ViewMode=3" onclick="SetRadio(this)">@shell32.dll,-33579</label>
               <label><input type="radio" name="View_ViewMode_" id="View_ViewMode=4" onclick="SetRadio(this)">@shell32.dll,-33580</label>
               <label><input type="radio" name="View_ViewMode_" id="View_ViewMode=5" onclick="SetRadio(this)">Thumbnail</label>
               <br>
               <label><input type="radio" name="View_ViewMode_" id="View_ViewMode=6" onclick="SetRadio(this)">Tile</label>
-              <label><input type="radio" name="View_ViewMode_" id="View_ViewMode=7" onclick="SetRadio(this)">Thumbstrip</label>(*)
+              <label><input type="radio" name="View_ViewMode_" id="View_ViewMode=7" onclick="SetRadio(this)">Thumbstrip</label>
               <label><input type="radio" name="View_ViewMode_" id="View_ViewMode=8" onclick="SetRadio(this)">Content</label>(*7)
               <br>
               <label><input type="checkbox" id="Conf_Layout:0x10000" onclick="SetCheckbox(this)">Auto</label>(*)
@@ -588,7 +584,7 @@
               </div>
               <label>Explorer Browser</label>(*7)<br>
               <input type="text" name="Conf_Layout" style="display: none">
-              <label><input type="checkbox" id="Conf_Layout:0x1" onclick="SetCheckbox(this)">@mmcbase.dll,-106</label><br>
+              <label><input type="checkbox" id="Conf_Layout:0x1" onclick="SetCheckbox(this)">Icon</label><br>
               <label><input type="checkbox" id="Conf_Layout:0x2" onclick="SetCheckbox(this)">@shell32.dll,-33578</label><br>
               <label><input type="checkbox" id="Conf_Layout:0x4" onclick="SetCheckbox(this)">@shell32.dll,-33579</label><br>
               <label><input type="checkbox" id="Conf_Layout:0x8" onclick="SetCheckbox(this)">@shell32.dll,-33580</label><br>
@@ -598,6 +594,7 @@
               <br>
               <div>
                 (*)Windows Vista <label>or higher.</label>
+                (*7)Windows 7 <label>or higher.</label>
               </div>
             </div>
             <input type="hidden" name="View_Options">