fix: 修复一些问题；移除有缺陷的组件；更新打包脚本；

Author: Wing-summer

CMakeLists.txt

@@ -235,8 +235,6 @@ set(CLASS_SRC
     src/class/languagemanager.cpp
     src/class/settingmanager.h
     src/class/settingmanager.cpp
-    src/class/wingprogressdialog.h
-    src/class/wingprogressdialog.cpp
     src/class/asdebugger.h
     src/class/asdebugger.cpp
     src/class/scriptconsolemachine.h
@@ -284,7 +282,9 @@ set(CLASS_SRC
     src/class/crashhandler.h
     src/class/crashhandler.cpp
     src/class/pluginsystem.h
-    src/class/pluginsystem.cpp)
+    src/class/pluginsystem.cpp
+    src/class/inspectqtloghelper.h
+    src/class/inspectqtloghelper.cpp)
 
 set(INTERNAL_PLG_SRC
     src/class/wingangelapi.h src/class/wingangelapi.cpp

images/qtloginspect.png

@@ -187,6 +187,8 @@ def main():
     os.mkdir(os.path.join(exeBasePath, "aslib"))
 
     shutil.copy2(exemain_src, os.path.join(exeBasePath, package_name))
+    shutil.copy2(os.path.join(projectdeb, "WingPlugin", "libWingPlugin.so"),
+                 os.path.join(exeBasePath, "libWingPlugin.so"))
 
     desktopPath = os.path.join(exeDebPath, "usr", "share", "applications")
     os.makedirs(desktopPath)

lang/zh_CN/winghex_zh_CN.ts

@@ -13,6 +13,7 @@
 
 from colorama import Fore, Style
 
+
 def run_command_interactive(command):
     """
     Run a command interactively, printing its stdout in real-time.
@@ -21,8 +22,8 @@ def run_command_interactive(command):
     :return: The return code of the command
     """
     process = subprocess.Popen(
-        command, 
-        stdout=subprocess.PIPE, 
+        command,
+        stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,  # Capture both stdout and stderr
         text=True  # Ensure the output is in text mode
     )
@@ -32,15 +33,16 @@ def run_command_interactive(command):
         if output == "" and process.poll() is not None:
             break
         if output:
-            print(Fore.GREEN + output.strip() + Style.RESET_ALL) 
+            print(Fore.GREEN + output.strip() + Style.RESET_ALL)
 
     return_code = process.wait()
     return return_code
 
+
 def main():
     parser = argparse.ArgumentParser(
         prog="mkdeb.py", description="A deb installer maker for WingHexExplorer2")
-    
+
     parser.add_argument(
         "folder", help="A folder that has contained the binary build", type=str
     )
@@ -57,7 +59,7 @@ def main():
         "--no-build", dest="build", action="store_false", help="Skip building the installer"
     )
     parser.set_defaults(build=True)
-    
+
     args = parser.parse_args()
 
     # checking build toolkits
@@ -81,15 +83,15 @@ def main():
         print(
             Fore.RED + "[Error] This is not a CMake build directory!" + Style.RESET_ALL)
         exit(-1)
-    
+
     deploy_exec = ""
-    
+
     with open(cmake_cache, 'r') as cmake_config:
-        while(True):
+        while (True):
             line = cmake_config.readline()
             if not line:
                 break
-            if(line.startswith("WINDEPLOYQT_EXECUTABLE:FILEPATH")):
+            if (line.startswith("WINDEPLOYQT_EXECUTABLE:FILEPATH")):
                 set = line.split('=', 1)
                 deploy_exec = set[1].strip('\n')
                 pass
@@ -124,20 +126,24 @@ def main():
 
     # check
     exemain_src = ""
-    exesym_src = ""   
-        
-    if(os.path.exists(os.path.join(projectdeb, "WingHexExplorer2.sln"))):
-        exemain_src = os.path.join(projectdeb, "RelWithDebInfo", exe_name)  
+    exesym_src = ""
+    exeplg_src = ""
+
+    if (os.path.exists(os.path.join(projectdeb, "WingHexExplorer2.sln"))):
+        exemain_src = os.path.join(projectdeb, "RelWithDebInfo", exe_name)
         exesym_src = os.path.join(projectdeb, "RelWithDebInfo", sym_name)
+        exeplg_src = os.path.join(
+            projectdeb, "WingPlugin", "RelWithDebInfo", "WingPlugin.dll")
     else:
         exemain_src = os.path.join(projectdeb, exe_name)
         exesym_src = os.path.join(projectdeb, sym_name)
-    
+        exeplg_src = os.path.join(projectdeb, "WingPlugin", "WingPlugin.dll")
+
     if (os.path.exists(exemain_src) == False):
         print(
             Fore.RED + "[Error] WingHexExplorer2.exe is not found!" + Style.RESET_ALL)
         exit(-3)
-        
+
     # calculate the md5 checksum
     with open(exemain_src, 'rb') as file_to_check:
         data = file_to_check.read()
@@ -155,6 +161,8 @@ def main():
 
     shutil.copy2(exemain_src, os.path.join(exeDebPath, exe_name))
     shutil.copy2(exesym_src, os.path.join(exeDebPath, sym_name))
+    shutil.copy2(exeplg_src,
+                 os.path.join(exeDebPath, "WingPlugin.dll"))
 
     shutil.copytree(os.path.join(buildinstaller, "share"),
                     os.path.join(exeDebPath, "share"))
@@ -173,23 +181,24 @@ def main():
 
     shutil.copyfile(os.path.join(projectbase, "images", "author.jpg"),
                     os.path.join(exeDebPath, "author.jpg"))
-    
-    # deploy the software 
+
+    # deploy the software
 
     print(Fore.GREEN + ">> Copying finished, deploying the software..." + Style.RESET_ALL)
 
     try:
-        subprocess.run([deploy_exec, os.path.join(exeDebPath, exe_name) ], check=True,
-                                  stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        subprocess.run([deploy_exec, os.path.join(exeDebPath, exe_name)], check=True,
+                       stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     except subprocess.CalledProcessError as e:
-        print(Fore.RED + f"[Error] deploy package error: \n{e.stderr.decode('utf-8')}" + Style.RESET_ALL)
+        print(
+            Fore.RED + f"[Error] deploy package error: \n{e.stderr.decode('utf-8')}" + Style.RESET_ALL)
         exit(-4)
     except FileNotFoundError:
-        exit(-4)        
+        exit(-4)
 
     # generate iss file
     print(Fore.GREEN + ">> Copying finished, generate ISCC script..." + Style.RESET_ALL)
-    
+
     iss_content = fr"""
 ; Script generated by the mkinnopak.py by wingsummer.
 
@@ -243,8 +252,10 @@ def main():
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 """
-    iss_content += fr'Source: "{exeDebPath}\*"; ' + r'DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "*.iss,{#MyOutputBaseFilename}.exe,README.md"' + '\n'
-    iss_content += fr'Source: "{exeDebPath}\README.md"; ' + r'DestDir: "{app}"; Flags: isreadme'
+    iss_content += fr'Source: "{exeDebPath}\*"; ' + \
+        r'DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "*.iss,{#MyOutputBaseFilename}.exe,README.md"' + '\n'
+    iss_content += fr'Source: "{exeDebPath}\README.md"; ' + \
+        r'DestDir: "{app}"; Flags: isreadme'
 
     iss_content += """
 [Registry]
@@ -271,21 +282,21 @@ def main():
 """
 
     script_src = os.path.join(exeDebPath, "mkiss.iss")
-    with codecs.open(script_src,'w', "utf-8-sig") as iss:
+    with codecs.open(script_src, 'w', "utf-8-sig") as iss:
         iss.write(iss_content)
 
     if args.build == False:
         exit(0)
-        
+
     print(Fore.GREEN + ">> Copying finished, running ISCC building..." + Style.RESET_ALL)
-    
+
     pak_out = ""
     if args.output is None:
-        pak_out = os.path.join(exeDebPath,"..") 
+        pak_out = os.path.join(exeDebPath, "..")
     else:
         pak_out = args.output
-    
-    ret = run_command_interactive([args.cc, f'/O{pak_out}', script_src]) 
+
+    ret = run_command_interactive([args.cc, f'/O{pak_out}', script_src])
     exit(ret)
 
 

lang/zh_TW/winghex_zh_TW.ts

@@ -161,6 +161,9 @@ def main():
     for item in deploy_files:
         shutil.copy2(os.path.join(installer_path, item),
                      os.path.join(installer_path_exec, item))
+        
+    shutil.copy2(os.path.join(build_path, "WingPlugin", "libWingPlugin.so"),
+                 os.path.join(installer_path_exec, "lib" , "libWingPlugin.so"))
 
     # finally, copy other files
     print(Fore.GREEN + ">> Copying License and other materials..." + Style.RESET_ALL)

mkinstaller/deb/mkdeb.py

@@ -117,6 +117,8 @@ def update(build_path):
     print(Fore.GREEN + ">> Installing..." + Style.RESET_ALL)
 
     shutil.copy2(exemain_src, os.path.join(INSTALL_PATH, PACKAGE_NAME))
+    shutil.copy2(os.path.join(build_path, "WingPlugin", "libWingPlugin.so"),
+                 os.path.join(INSTALL_PATH, "libWingPlugin.so"))
 
     create_dir(os.path.join(INSTALL_PATH, "plugin"))
     create_dir(os.path.join(INSTALL_PATH, "scripts"))

mkinstaller/innoSetup/mkinnopak.py

@@ -69,6 +69,7 @@
         <file>images/plugin.png</file>
         <file>images/pro.png</file>
         <file>images/qt.png</file>
+        <file>images/qtloginspect.png</file>
         <file>images/readonly.png</file>
         <file>images/recent.png</file>
         <file>images/redo.png</file>