diff --git a/Debug豜 b/Debug豜 deleted file mode 100644 index 4909a55..0000000 Binary files a/Debug豜 and /dev/null differ diff --git a/Generated/InstallerSetup.exe b/Generated/InstallerSetup.exe index 9ba2bfa..c756827 100644 Binary files a/Generated/InstallerSetup.exe and b/Generated/InstallerSetup.exe differ diff --git a/LICENSE.CodeMirror b/LICENSE.CodeMirror new file mode 100644 index 0000000..d21bbea --- /dev/null +++ b/LICENSE.CodeMirror @@ -0,0 +1,19 @@ +Copyright (C) 2014 by Marijn Haverbeke and others + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/others/Autosave/autosave_2025-12-08_07-54-31.suf b/others/Autosave/autosave_2025-12-13_15-10-27.suf similarity index 93% rename from others/Autosave/autosave_2025-12-08_07-54-31.suf rename to others/Autosave/autosave_2025-12-13_15-10-27.suf index 7efe1dc..0d60d8e 100644 --- a/others/Autosave/autosave_2025-12-08_07-54-31.suf +++ b/others/Autosave/autosave_2025-12-13_15-10-27.suf @@ -687,7 +687,7 @@ %StartProgramsFolderCommon%\\%AppShortcutFolderName% Update -appinstaller update /autoupdate +appinstaller update /checkupdate 0 @@ -953,6 +953,152 @@ 0 0 + +0 +E:\Profiles\Bruce\Documents\Visual Studio 2015\Projects\AppInstallerReset\Release\PriFileFormat.dll.config +PriFileFormat.dll.config +E:\Profiles\Bruce\Documents\Visual Studio 2015\Projects\AppInstallerReset\Release +config +µµ°¸ + +1 +0 +%AppFolder% +1 +0 +0 +1000 +0 +0 +0 +0 +0 +0 +0 +0 + + + + + +0 + +0 +0 +0 +0 + +0 +0 +0 +1 +1 +0 +0 +0 +0 + +32768 +65535 +65535 +65535 +65535 +65535 +65535 +65535 +65535 +65535 +65535 +65535 +65535 +65535 +65535 +65535 + + + +All + +None + + +0 +0 +0 + + +0 +E:\Profiles\Bruce\Documents\Visual Studio 2015\Projects\AppInstallerReset\Release\priformatcli.dll.metagen +priformatcli.dll.metagen +E:\Profiles\Bruce\Documents\Visual Studio 2015\Projects\AppInstallerReset\Release +metagen +µµ°¸ + +1 +0 +%AppFolder% +1 +0 +0 +1000 +0 +0 +0 +0 +0 +0 +0 +0 + + + + + +0 + +0 +0 +0 +0 + +0 +0 +0 +1 +1 +0 +0 +0 +0 + +32768 +65535 +65535 +65535 +65535 +65535 +65535 +65535 +65535 +65535 +65535 +65535 +65535 +65535 +65535 +65535 + + + +All + +None + + +0 +0 +0 + @@ -2119,7 +2265,7 @@ end 1 1 0 -0 +1 0 1 0 @@ -2180,7 +2326,98 @@ end < &Back &Cancel &Help -Insert your license agreement text here... +<!DOCTYPE html> +<html> + +<head> + <meta charset="UTF-8"> + <title>End User License Agreement</title> + <style> + body { + /*font-family: "Segoe UI", "Microsoft YaHei", Arial, sans-serif;*/ + font-size: 9pt; + /*color: #333333; + background-color: #ffffff;*/ +-ms-overflow-style: -ms-autohiding-scrollbar; +box-sizing: border-box; + } + + h1 { + font-size: 12.5pt; + font-weight: bold; + margin-bottom: 5px; +text-align: center; + } + + h2 { + font-size: 10.75pt; + font-weight: bold; + margin-top: 5px; + margin-bottom: 5px; + } + + p { + margin: 5px 0; + } + + ul, + ol { + margin: 5px 0; + padding: 0; + } + + a { + color: #1a73e8; + text-decoration: underline; + } + + a:hover { + color: #0b59d1; + text-decoration: none; + } + + strong { + font-weight: bold; + } + + em { + font-style: italic; + } + </style> +</head> + +<body> + <h1>End User License Agreement</h1> + + <p>Please read this license agreement carefully before installing or using this software.</p> + + <h2>1. Copyright</h2> + <p>Copyright © 2025 Windows Modern. This software and its source code are protected by copyright law.</p> + + <h2>2. License</h2> + <p>This software is licensed under the MIT License. You are free to use, copy, modify, and distribute this software and its source code, including for commercial purposes, subject to the terms of the MIT License.</p> + + <h2>3. Third-Party Components</h2> + <p>This software includes the following third-party open source components, which are subject to their original licenses:</p> + <ul> + <li>PriTools (Apache License 2.0) - <a href="https://github.com/chausner/PriTools" target="_blank">https://github.com/chausner/PriTools</a></li> + <li>pugixml (MIT License) - <a href="https://pugixml.org/" target="_blank">https://pugixml.org/</a></li> + <li>RapidJSON (MIT License) - <a href="https://rapidjson.org/" target="_blank">https://rapidjson.org/</a></li> + <li>WinJS (MIT License) - <a href="https://github.com/winjs/winjs" target="_blank">https://github.com/winjs/winjs</a></li> + <li>markdown.js (MIT License) - <a href="https://github.com/evilstreak/markdown-js" target="_blank">https://github.com/evilstreak/markdown-js</a></li> +<li>CodeMirror (MIT License) - <a href="https://codemirror.net/" target="_blank">https://codemirror.net/</a></li> + </ul> + + <h2>4. Disclaimer</h2> + <p>This software is provided "as is", without any express or implied warranties, including but not limited to warranties of merchantability, fitness for a particular purpose, and non-infringement. In no event shall the authors or copyright holders be + liable for any damages arising from the use of this software, whether direct, indirect, incidental, or consequential.</p> + + <h2>5. Acceptance</h2> + <p>By installing or using this software, you agree to this license agreement. If you do not agree, do not install or use the software.</p> +<br> +</body> + +</html> I agree to the terms of this license agreement I do not agree to the terms of this license agreement @@ -2206,7 +2443,95 @@ end < ·µ»Ø(&B) È¡Ïû(&C) °ïÖú(&H) -Ôڴ˲åÈëÄúµÄÐí¿ÉЭÒéÎı¾... +<!DOCTYPE html> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=GB2312"> + <title>×îÖÕÓû§Ðí¿ÉЭÒé</title> + <style> + body { + /*font-family: "Microsoft YaHei", "Segoe UI", Arial, sans-serif;*/ + font-size: 9pt; + /*color: #333333; + background-color: #ffffff;*/ +-ms-overflow-style: -ms-autohiding-scrollbar; +box-sizing: border-box; + } + + h1 { + font-size: 12.5pt; + font-weight: bold; + margin-bottom: 5px; +text-align: center; + } + + h2 { + font-size: 10.75pt; + font-weight: bold; + margin-top: 5px; + margin-bottom: 5px; + } + + p { + margin: 5px 0; + } + + ul, + ol { + margin: 5px 0; + padding: 0; + } + + a { + color: #1a73e8; + text-decoration: underline; + } + + a:hover { + color: #0b59d1; + text-decoration: none; + } + + strong { + font-weight: bold; + } + + em { + font-style: italic; + } + </style> +</head> +<body> +<h1>×îÖÕÓû§Ðí¿ÉЭÒé</h1> + +<p>ÇëÔÚ°²×°»òʹÓñ¾Èí¼þǰ×ÐϸÔĶÁ±¾Ðí¿ÉЭÒé¡£</p> + +<h2>Ò»¡¢°æÈ¨ÉùÃ÷</h2> +<p>Copyright &#169; 2025 Windows Modern. ±¾Èí¼þ¼°ÆäÔ´ÂëÊܰæÈ¨·¨±£»¤¡£</p> + +<h2>¶þ¡¢Ðí¿É·¶Î§</h2> +<p>±¾Èí¼þ×ñÑ­ MIT Ðí¿ÉЭÒé¡£Äú¿ÉÒÔÔÚ·ûºÏ MIT Ðí¿ÉÌõ¼þÏÂ×ÔÓÉʹÓᢸ´ÖÆ¡¢Ð޸ġ¢·Ö·¢±¾Èí¼þ¼°ÆäÔ´Â룬°üÀ¨ÉÌÒµÓÃ;¡£</p> + +<h2>Èý¡¢µÚÈý·½×é¼þ</h2> +<p>±¾Èí¼þ°üº¬ÒÔϵÚÈý·½¿ªÔ´×é¼þ£¬Ê¹ÓÃÕâЩ×é¼þÊÜÆäԭʼÐí¿ÉÖ¤Ô¼Êø£º</p> +<ul> + <li>PriTools (Apache License 2.0) - <a href="https://github.com/chausner/PriTools" target="_blank">https://github.com/chausner/PriTools</a></li> + <li>pugixml (MIT License) - <a href="https://pugixml.org/" target="_blank">https://pugixml.org/</a></li> + <li>RapidJSON (MIT License) - <a href="https://rapidjson.org/" target="_blank">https://rapidjson.org/</a></li> + <li>WinJS (MIT License) - <a href="https://github.com/winjs/winjs" target="_blank">https://github.com/winjs/winjs</a></li> + <li>markdown.js (MIT License) - <a href="https://github.com/evilstreak/markdown-js" target="_blank">https://github.com/evilstreak/markdown-js</a></li> +<li>CodeMirror (MIT License) - <a href="https://codemirror.net/" target="_blank">https://codemirror.net/</a></li> +</ul> + +<h2>ËÄ¡¢ÃâÔðÉùÃ÷</h2> +<p>±¾Èí¼þ°´¡°Ô­Ñù¡±Ìṩ£¬²»¸½´øÈκÎÃ÷ʾ»ò°µÊ¾µÄµ£±££¬°üÀ¨µ«²»ÏÞÓÚÊÊÏúÐÔ¡¢Ìض¨ÓÃ;ÊÊÓÃÐԺͷÇÇÖȨµÄ±£Ö¤¡£ÎÞÂÛÔÚºÎÖÖÇé¿öÏ£¬×÷Õß»ò°æÈ¨³ÖÓÐÈ˾ù²»¶ÔÒòʹÓñ¾Èí¼þ²úÉúµÄÈκÎÖ±½Ó¡¢¼ä½Ó¡¢Å¼È»»òÌØÊâË𺦸ºÔð¡£</p> + +<h2>Îå¡¢½ÓÊÜÌõ¿î</h2> +<p>°²×°»òʹÓñ¾Èí¼þ¼´±íʾÄú½ÓÊܱ¾Ðí¿ÉЭÒé¡£Èç¹ûÄú²»Í¬ÒⱾЭÒ飬Çë²»Òª°²×°»òʹÓñ¾Èí¼þ¡£</p> +<br> +</body> +</html> + ÎÒͬÒâ¸ÃÐí¿ÉЭÒéµÄÌõ¿î ÎÒ²»Í¬Òâ¸ÃÐí¿ÉЭÒéµÄÌõ¿î @@ -4164,7 +4489,7 @@ function CreateShortcut(lnkpath, targetfile, appid) return ret; end function SetDesktopInit(inipath, section, key, value) - ret = File.Run(SessionVar.Expand ("%AppFolder%\\desktopini.exe"), "\"" .. inipath .. "\" \"" .. section .. "\" \"" .. key .. "\" \"" .. value .. "\"", "", SW_SHOWNORMAL, true); + ret = File.Run(SessionVar.Expand ("%AppFolder%\\desktopini.exe"), "\"" .. inipath .. "\" \"" .. section .. "\" \"" .. key .. "\" \"" .. value .. "\"", "", SW_HIDE, true); return ret; end startitemfolder = SessionVar.Expand ("%StartProgramsFolderCommon%\\%AppShortcutFolderName%"); @@ -4179,7 +4504,8 @@ SetDesktopInit (desktopini, ".ShellClassInfo", "ConfirmFileOp", 0); SetDesktopInit (desktopini, "LocalizedFileNames", "App Installer.lnk", SessionVar.Expand("@%AppFolder%\\appinstaller.exe,-300")); SetDesktopInit (desktopini, "LocalizedFileNames", "Settings.lnk", SessionVar.Expand("@%AppFolder%\\settings.exe,-200")); SetDesktopInit (desktopini, "LocalizedFileNames", "Update.lnk", SessionVar.Expand("@%AppFolder%\\reslib.dll,-103")); -SetDesktopInit (desktopini, "LocalizedFileNames", "Uninstaller.lnk", SessionVar.Expand("@%AppFolder%\\reslib.dll,-131")); +SetDesktopInit (desktopini, "LocalizedFileNames", "Uninstall.lnk", SessionVar.Expand("@%AppFolder%\\reslib.dll,-131")); +SetDesktopInit (desktopini, ".ShellClassInfo", "LocalizedResourceName", SessionVar.Expand("@%AppFolder%\\appinstaller.exe,-300")); DlgScrollingText.AppendLine(CTRL_SCROLLTEXT_BODY, "Updating system PATH..."); local appFolder = SessionVar.Expand("%AppFolder%"); @@ -6181,7 +6507,7 @@ g_HandleSystemReboot(); %ProductVer% -0.1.0.0 +0.2.1.0 1 diff --git a/others/buildsetup.suf b/others/buildsetup.suf index 2c466ba..0d60d8e 100644 --- a/others/buildsetup.suf +++ b/others/buildsetup.suf @@ -2405,6 +2405,7 @@ text-align: center; <li>RapidJSON (MIT License) - <a href="https://rapidjson.org/" target="_blank">https://rapidjson.org/</a></li> <li>WinJS (MIT License) - <a href="https://github.com/winjs/winjs" target="_blank">https://github.com/winjs/winjs</a></li> <li>markdown.js (MIT License) - <a href="https://github.com/evilstreak/markdown-js" target="_blank">https://github.com/evilstreak/markdown-js</a></li> +<li>CodeMirror (MIT License) - <a href="https://codemirror.net/" target="_blank">https://codemirror.net/</a></li> </ul> <h2>4. Disclaimer</h2> @@ -2519,6 +2520,7 @@ text-align: center; <li>RapidJSON (MIT License) - <a href="https://rapidjson.org/" target="_blank">https://rapidjson.org/</a></li> <li>WinJS (MIT License) - <a href="https://github.com/winjs/winjs" target="_blank">https://github.com/winjs/winjs</a></li> <li>markdown.js (MIT License) - <a href="https://github.com/evilstreak/markdown-js" target="_blank">https://github.com/evilstreak/markdown-js</a></li> +<li>CodeMirror (MIT License) - <a href="https://codemirror.net/" target="_blank">https://codemirror.net/</a></li> </ul> <h2>ËÄ¡¢ÃâÔðÉùÃ÷</h2> diff --git a/shared/html/settings/appinstaller/about.html b/shared/html/settings/appinstaller/about.html index a0656fe..eb1ce0d 100644 --- a/shared/html/settings/appinstaller/about.html +++ b/shared/html/settings/appinstaller/about.html @@ -85,6 +85,7 @@
  • RapidJSON
  • WinJS
  • markdown.js
  • +
  • CodeMirror