光电吊舱页面布局修改，部分控制按钮添加

PayloadAPP.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 13.0.2, 2024-07-07T12:15:22. -->
+<!-- Written by QtCreator 13.0.2, 2024-07-07T13:09:24. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -97,7 +97,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt6.653.win64_msvc2019_64_kit</value>
    <value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
-   <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">1</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
     <value type="int" key="EnableQmlDebugging">0</value>
     <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\QT\Custom_projects\Project_14\PayloadAPP\build\Desktop_Qt_6_5_3_MSVC2019_64bit-Debug</value>
@@ -244,14 +244,35 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="bool" key="PE.EnvironmentAspect.PrintOnRun">false</value>
     <value type="QString" key="PerfRecordArgsId">-e cpu-cycles --call-graph &quot;dwarf,4096&quot; -F 250</value>
+    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable">D:\QT\Custom_projects\Project_14\PayloadAPP\build\Desktop_Qt_6_5_3_MSVC2019_64bit-Debug\debug\PayloadAPP.exe</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
     <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
+    <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">true</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory">D:/QT/Custom_projects/Project_14/PayloadAPP/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.1">
+    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <value type="int" key="Analyzer.Valgrind.Callgrind.CostFormat">0</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <valuelist type="QVariantList" key="CustomOutputParsers"/>
+    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="bool" key="PE.EnvironmentAspect.PrintOnRun">false</value>
+    <value type="QString" key="PerfRecordArgsId">-e cpu-cycles --call-graph &quot;dwarf,4096&quot; -F 250</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/QT/Custom_projects/Project_14/PayloadAPP/PayloadAPP.pro</value>
+    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">D:/QT/Custom_projects/Project_14/PayloadAPP/PayloadAPP.pro</value>
     <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/QT/Custom_projects/Project_14/PayloadAPP/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug</value>
    </valuemap>
-   <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">2</value>
   </valuemap>
  </data>
  <data>

build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug/Makefile

@@ -1,9 +1,9 @@
 #############################################################################
 # Makefile for building: PayloadAPP
 # Generated by qmake (3.1) (Qt 6.5.3)
-# Project:  D:\QTdemo\playerApp\PayloadAPP.pro
+# Project:  D:\QT\Custom_projects\Project_14\PayloadAPP\PayloadAPP.pro
 # Template: app
-# Command: D:\QT\6.5.3\msvc2019_64\bin\qmake.exe -o Makefile D:\QTdemo\playerApp\PayloadAPP.pro -spec win32-msvc "CONFIG+=debug" "CONFIG+=qml_debug"
+# Command: D:\QT\6.5.3\msvc2019_64\bin\qmake.exe -o Makefile D:\QT\Custom_projects\Project_14\PayloadAPP\PayloadAPP.pro -spec win32-msvc "CONFIG+=debug" "CONFIG+=qml_debug"
 #############################################################################
 
 MAKEFILE      = Makefile
@@ -84,7 +84,7 @@ release-uninstall: FORCE
 	@set MAKEFLAGS=$(MAKEFLAGS)
 	$(MAKE) -f $(MAKEFILE).Release uninstall
 
-Makefile: D:\QTdemo\playerApp\PayloadAPP.pro D:\QT\6.5.3\msvc2019_64\mkspecs\win32-msvc\qmake.conf D:\QT\6.5.3\msvc2019_64\mkspecs\features\spec_pre.prf \
+Makefile: D:\QT\Custom_projects\Project_14\PayloadAPP\PayloadAPP.pro D:\QT\6.5.3\msvc2019_64\mkspecs\win32-msvc\qmake.conf D:\QT\6.5.3\msvc2019_64\mkspecs\features\spec_pre.prf \
 		D:\QT\6.5.3\msvc2019_64\mkspecs\common\windows-desktop.conf \
 		D:\QT\6.5.3\msvc2019_64\mkspecs\features\win32\windows_vulkan_sdk.prf \
 		D:\QT\6.5.3\msvc2019_64\mkspecs\common\windows-vulkan.conf \
@@ -93,10 +93,6 @@ Makefile: D:\QTdemo\playerApp\PayloadAPP.pro D:\QT\6.5.3\msvc2019_64\mkspecs\win
 		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_ext_freetype.pri \
 		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_ext_libjpeg.pri \
 		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_ext_libpng.pri \
-		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_charts.pri \
-		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_charts_private.pri \
-		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_chartsqml.pri \
-		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_chartsqml_private.pri \
 		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_concurrent.pri \
 		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_concurrent_private.pri \
 		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_core.pri \
@@ -186,8 +182,6 @@ Makefile: D:\QTdemo\playerApp\PayloadAPP.pro D:\QT\6.5.3\msvc2019_64\mkspecs\win
 		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_quicktemplates2.pri \
 		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_quicktemplates2_private.pri \
 		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_quicktestutilsprivate_private.pri \
-		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_quicktimeline.pri \
-		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_quicktimeline_private.pri \
 		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_quickwidgets.pri \
 		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_quickwidgets_private.pri \
 		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_sql.pri \
@@ -212,6 +206,12 @@ Makefile: D:\QTdemo\playerApp\PayloadAPP.pro D:\QT\6.5.3\msvc2019_64\mkspecs\win
 		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_webenginequickdelegatesqml_private.pri \
 		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_webenginewidgets.pri \
 		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_webenginewidgets_private.pri \
+		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_websockets.pri \
+		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_websockets_private.pri \
+		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_webview.pri \
+		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_webview_private.pri \
+		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_webviewquick.pri \
+		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_webviewquick_private.pri \
 		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_widgets.pri \
 		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_widgets_private.pri \
 		D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_xml.pri \
@@ -248,7 +248,7 @@ Makefile: D:\QTdemo\playerApp\PayloadAPP.pro D:\QT\6.5.3\msvc2019_64\mkspecs\win
 		D:\QT\6.5.3\msvc2019_64\mkspecs\features\exceptions.prf \
 		D:\QT\6.5.3\msvc2019_64\mkspecs\features\yacc.prf \
 		D:\QT\6.5.3\msvc2019_64\mkspecs\features\lex.prf \
-		D:\QTdemo\playerApp\PayloadAPP.pro \
+		D:\QT\Custom_projects\Project_14\PayloadAPP\PayloadAPP.pro \
 		D:\QT\6.5.3\msvc2019_64\lib\Qt6WebEngineWidgets.prl \
 		D:\QT\6.5.3\msvc2019_64\lib\Qt6PrintSupport.prl \
 		D:\QT\6.5.3\msvc2019_64\lib\Qt6Widgets.prl \
@@ -264,7 +264,7 @@ Makefile: D:\QTdemo\playerApp\PayloadAPP.pro D:\QT\6.5.3\msvc2019_64\mkspecs\win
 		D:\QT\6.5.3\msvc2019_64\lib\Qt6Core.prl \
 		D:\QT\6.5.3\msvc2019_64\lib\Qt6EntryPoint.prl \
 		D:\QT\6.5.3\msvc2019_64\mkspecs\features\build_pass.prf \
-		D:\QTdemo\playerApp\mainwindow.qrc \
+		D:\QT\Custom_projects\Project_14\PayloadAPP\mainwindow.qrc \
 		debug\qmake_qmake_qm_files.qrc \
 		D:\QT\6.5.3\msvc2019_64\lib\Qt6WebEngineWidgetsd.prl \
 		D:\QT\6.5.3\msvc2019_64\lib\Qt6PrintSupportd.prl \
@@ -281,7 +281,7 @@ Makefile: D:\QTdemo\playerApp\PayloadAPP.pro D:\QT\6.5.3\msvc2019_64\mkspecs\win
 		D:\QT\6.5.3\msvc2019_64\lib\Qt6Cored.prl \
 		D:\QT\6.5.3\msvc2019_64\lib\Qt6EntryPointd.prl \
 		release\qmake_qmake_qm_files.qrc
-	$(QMAKE) -o Makefile D:\QTdemo\playerApp\PayloadAPP.pro -spec win32-msvc "CONFIG+=debug" "CONFIG+=qml_debug"
+	$(QMAKE) -o Makefile D:\QT\Custom_projects\Project_14\PayloadAPP\PayloadAPP.pro -spec win32-msvc "CONFIG+=debug" "CONFIG+=qml_debug"
 D:\QT\6.5.3\msvc2019_64\mkspecs\features\spec_pre.prf:
 D:\QT\6.5.3\msvc2019_64\mkspecs\common\windows-desktop.conf:
 D:\QT\6.5.3\msvc2019_64\mkspecs\features\win32\windows_vulkan_sdk.prf:
@@ -291,10 +291,6 @@ D:\QT\6.5.3\msvc2019_64\mkspecs\qconfig.pri:
 D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_ext_freetype.pri:
 D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_ext_libjpeg.pri:
 D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_ext_libpng.pri:
-D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_charts.pri:
-D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_charts_private.pri:
-D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_chartsqml.pri:
-D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_chartsqml_private.pri:
 D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_concurrent.pri:
 D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_concurrent_private.pri:
 D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_core.pri:
@@ -384,8 +380,6 @@ D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_quickshapes_private.pri:
 D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_quicktemplates2.pri:
 D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_quicktemplates2_private.pri:
 D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_quicktestutilsprivate_private.pri:
-D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_quicktimeline.pri:
-D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_quicktimeline_private.pri:
 D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_quickwidgets.pri:
 D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_quickwidgets_private.pri:
 D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_sql.pri:
@@ -410,6 +404,12 @@ D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_webenginequickdelegatesqml.pri:
 D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_webenginequickdelegatesqml_private.pri:
 D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_webenginewidgets.pri:
 D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_webenginewidgets_private.pri:
+D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_websockets.pri:
+D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_websockets_private.pri:
+D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_webview.pri:
+D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_webview_private.pri:
+D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_webviewquick.pri:
+D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_webviewquick_private.pri:
 D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_widgets.pri:
 D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_widgets_private.pri:
 D:\QT\6.5.3\msvc2019_64\mkspecs\modules\qt_lib_xml.pri:
@@ -446,7 +446,7 @@ D:\QT\6.5.3\msvc2019_64\mkspecs\features\testcase_targets.prf:
 D:\QT\6.5.3\msvc2019_64\mkspecs\features\exceptions.prf:
 D:\QT\6.5.3\msvc2019_64\mkspecs\features\yacc.prf:
 D:\QT\6.5.3\msvc2019_64\mkspecs\features\lex.prf:
-D:\QTdemo\playerApp\PayloadAPP.pro:
+D:\QT\Custom_projects\Project_14\PayloadAPP\PayloadAPP.pro:
 D:\QT\6.5.3\msvc2019_64\lib\Qt6WebEngineWidgets.prl:
 D:\QT\6.5.3\msvc2019_64\lib\Qt6PrintSupport.prl:
 D:\QT\6.5.3\msvc2019_64\lib\Qt6Widgets.prl:
@@ -462,7 +462,7 @@ D:\QT\6.5.3\msvc2019_64\lib\Qt6Positioning.prl:
 D:\QT\6.5.3\msvc2019_64\lib\Qt6Core.prl:
 D:\QT\6.5.3\msvc2019_64\lib\Qt6EntryPoint.prl:
 D:\QT\6.5.3\msvc2019_64\mkspecs\features\build_pass.prf:
-D:\QTdemo\playerApp\mainwindow.qrc:
+D:\QT\Custom_projects\Project_14\PayloadAPP\mainwindow.qrc:
 debug\qmake_qmake_qm_files.qrc:
 D:\QT\6.5.3\msvc2019_64\lib\Qt6WebEngineWidgetsd.prl:
 D:\QT\6.5.3\msvc2019_64\lib\Qt6PrintSupportd.prl:
@@ -480,7 +480,7 @@ D:\QT\6.5.3\msvc2019_64\lib\Qt6Cored.prl:
 D:\QT\6.5.3\msvc2019_64\lib\Qt6EntryPointd.prl:
 release\qmake_qmake_qm_files.qrc:
 qmake: FORCE
-	@$(QMAKE) -o Makefile D:\QTdemo\playerApp\PayloadAPP.pro -spec win32-msvc "CONFIG+=debug" "CONFIG+=qml_debug"
+	@$(QMAKE) -o Makefile D:\QT\Custom_projects\Project_14\PayloadAPP\PayloadAPP.pro -spec win32-msvc "CONFIG+=debug" "CONFIG+=qml_debug"
 
 qmake_all: FORCE
 

build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug/debug/qmake_qmake_qm_files.qrc

@@ -1,5 +1,5 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource prefix="i18n">
-<file alias="PayloadAPP_zh_CN.qm">D:/QTdemo/playerApp/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug/debug/PayloadAPP_zh_CN.qm</file>
+<file alias="PayloadAPP_zh_CN.qm">D:/QT/Custom_projects/Project_14/PayloadAPP/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug/debug/PayloadAPP_zh_CN.qm</file>
 </qresource>
 </RCC>

build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug/debug/qrc_mainwindow.cpp

@@ -7,7 +7,7 @@
 *****************************************************************************/
 
 static const unsigned char qt_resource_data[] = {
-  // D:/QTdemo/playerApp/res/homepage.png
+  // D:/QT/Custom_projects/Project_14/PayloadAPP/res/homepage.png
   0x0,0x0,0x6,0x6b,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -113,7 +113,7 @@ static const unsigned char qt_resource_data[] = {
   0x58,0x7,0x1d,0xf6,0xc,0x90,0x14,0xb0,0xa,0x17,0x3,0xac,0xc2,0xc5,0x0,0xab,
   0xf0,0x1f,0xc7,0x32,0xf9,0xd,0xb0,0x8,0x5,0x1c,0x37,0xef,0x84,0x99,0x0,0x0,
   0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/QTdemo/playerApp/res/Help.png
+    // D:/QT/Custom_projects/Project_14/PayloadAPP/res/Help.png
   0x0,0x0,0x3,0x31,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -168,7 +168,7 @@ static const unsigned char qt_resource_data[] = {
   0x8a,0x9b,0xb2,0x98,0x89,0x5e,0x20,0xfc,0xc1,0xe9,0xe7,0x1f,0xa8,0x7b,0xad,0x11,
   0x11,0xba,0xc,0xf6,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
   
-    // D:/QTdemo/playerApp/res/Sign.png
+    // D:/QT/Custom_projects/Project_14/PayloadAPP/res/Sign.png
   0x0,0x0,0x2,0x8e,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -212,7 +212,7 @@ static const unsigned char qt_resource_data[] = {
   0xf3,0x81,0x29,0x34,0xe4,0x84,0xe2,0x4c,0xa0,0x38,0x13,0x28,0xce,0x4,0x8a,0x33,
   0x81,0xe2,0x4c,0xa0,0x38,0x9,0xb7,0xe5,0xf,0x4b,0x8b,0x3b,0x6d,0x3d,0xd0,0x15,
   0xf7,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/QTdemo/playerApp/res/3DModeling.png
+    // D:/QT/Custom_projects/Project_14/PayloadAPP/res/3DModeling.png
   0x0,0x0,0x2,0x31,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -251,7 +251,7 @@ static const unsigned char qt_resource_data[] = {
   0x2,0x28,0x2d,0x80,0xd2,0x2,0x28,0x4f,0xce,0xe5,0xfa,0xb,0xd2,0x1e,0x6b,0x79,
   0x7b,0x5c,0x1f,0xd7,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
   
-    // D:/QTdemo/playerApp/res/SearchPayload.png
+    // D:/QT/Custom_projects/Project_14/PayloadAPP/res/SearchPayload.png
   0x0,0x0,0x7,0xc9,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -379,7 +379,7 @@ static const unsigned char qt_resource_data[] = {
   0x7e,0xc0,0xf3,0xe8,0x37,0x65,0xca,0x14,0xf5,0x1c,0xde,0x49,0x5,0x69,0x3d,0xfb,
   0x1f,0x7a,0xc8,0xf,0x6a,0x42,0x26,0x71,0xde,0x2b,0xf3,0x4d,0x0,0x0,0x0,0x0,
   0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/QTdemo/playerApp/res/tm.ico
+    // D:/QT/Custom_projects/Project_14/PayloadAPP/res/tm.ico
   0x0,0x0,0x5,0xd3,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -476,7 +476,7 @@ static const unsigned char qt_resource_data[] = {
   0x80,0x8,0x80,0x8,0x80,0x8,0x80,0x8,0x80,0x8,0x80,0x56,0xd8,0x4f,0x4,0x8d,
   0x95,0xb1,0x95,0xee,0xda,0x57,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,
   0x60,0x82,
-    // D:/QTdemo/playerApp/res/PDTColony.png
+    // D:/QT/Custom_projects/Project_14/PayloadAPP/res/PDTColony.png
   0x0,0x0,0x3,0x9e,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -537,7 +537,7 @@ static const unsigned char qt_resource_data[] = {
   0x40,0x2e,0x6a,0xb8,0x5e,0x98,0x81,0x59,0x5c,0x9d,0x13,0x68,0x67,0xde,0x84,0xea,
   0x5a,0xc,0x23,0x6c,0x70,0x48,0x18,0xa1,0x3f,0x49,0x36,0xb1,0x17,0x84,0x57,0x9c,
   0xdf,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/QTdemo/playerApp/res/LChain.png
+    // D:/QT/Custom_projects/Project_14/PayloadAPP/res/LChain.png
   0x0,0x0,0x1,0x6b,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -563,7 +563,7 @@ static const unsigned char qt_resource_data[] = {
   0xb,0x14,0xdd,0xcf,0x4e,0x74,0xf8,0xe1,0x1d,0xaa,0xdf,0x5c,0x86,0x40,0x78,0x8f,
   0x7d,0x7c,0x27,0xce,0xd0,0x1e,0x6d,0x69,0x0,0xc7,0xd6,0x20,0x75,0xa0,0x0,0x0,
   0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/QTdemo/playerApp/res/GDDC.png
+    // D:/QT/Custom_projects/Project_14/PayloadAPP/res/GDDC.png
   0x0,0x0,0x9,0x14,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -712,7 +712,7 @@ static const unsigned char qt_resource_data[] = {
   0x3b,0x75,0xea,0xd4,0x3f,0x77,0xa,0xbd,0x3a,0x32,0xd1,0xa3,0x92,0xfc,0x7,0x2c,
   0x56,0xe8,0xfe,0xd0,0x3e,0x36,0xcf,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,
   0x42,0x60,0x82,
-    // D:/QTdemo/playerApp/res/Kusatellite.png
+    // D:/QT/Custom_projects/Project_14/PayloadAPP/res/Kusatellite.png
   0x0,0x0,0x9,0x81,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -868,7 +868,7 @@ static const unsigned char qt_resource_data[] = {
   0xe,0xd6,0x73,0x8f,0x30,0x85,0xff,0x71,0x94,0x90,0x7f,0x0,0x21,0x21,0x2e,0x3d,
   0xec,0x35,0x47,0xe1,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
   
-    // D:/QTdemo/playerApp/res/SDFP.png
+    // D:/QT/Custom_projects/Project_14/PayloadAPP/res/SDFP.png
   0x0,0x0,0x8,0x1e,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -1001,7 +1001,7 @@ static const unsigned char qt_resource_data[] = {
   0x52,0x8c,0x84,0x47,0x8a,0x91,0xf0,0x48,0x31,0x12,0x1e,0x29,0x46,0xc2,0x23,0xc5,
   0x48,0x78,0xa4,0x18,0x9,0xca,0x3f,0xf6,0x2f,0x9f,0x44,0x5f,0x24,0xd,0xca,0x78,
   0xea,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/QTdemo/playerApp/res/setting.png
+    // D:/QT/Custom_projects/Project_14/PayloadAPP/res/setting.png
   0x0,0x0,0x3,0x4e,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -1057,7 +1057,7 @@ static const unsigned char qt_resource_data[] = {
   0xcd,0xcd,0x70,0x1f,0xea,0x5,0x64,0xb0,0x5,0xbf,0xf7,0x33,0xfe,0x2b,0xf3,0x80,
   0xbf,0x4d,0x1c,0xfb,0x5e,0x99,0xcb,0xf3,0xf,0x54,0x2,0x38,0xe2,0xde,0x82,0x11,
   0xa3,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    // D:/QTdemo/playerApp/res/adHoc.png
+    // D:/QT/Custom_projects/Project_14/PayloadAPP/res/adHoc.png
   0x0,0x0,0x2,0x74,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -1100,13 +1100,8 @@ static const unsigned char qt_resource_data[] = {
   0x81,0xe1,0x4c,0x60,0x38,0x13,0x18,0xce,0x4,0x86,0x93,0x70,0x79,0xfe,0x1,0x2,
   0xee,0x5d,0x80,0x25,0x75,0x7e,0xad,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,
   0x42,0x60,0x82,
-<<<<<<< HEAD
-    // D:/QTdemo/playerApp/res/Qss/qss.qss
-  0x0,0x0,0x8,0x28,
-=======
     // D:/QT/Custom_projects/Project_14/PayloadAPP/res/Qss/qss.qss
   0x0,0x0,0x8,0xaa,
->>>>>>> cyh
   0x2f,
   0x2a,0x68,0x6f,0x76,0x65,0x72,0xe6,0xa0,0xb7,0xe5,0xbc,0x8f,0x2a,0x2f,0xd,0xa,
   0x51,0x50,0x75,0x73,0x68,0x42,0x75,0x74,0x74,0x6f,0x6e,0x3a,0x68,0x6f,0x76,0x65,
@@ -1347,50 +1342,46 @@ static const unsigned char qt_resource_struct[] = {
 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
   // :/res/setting.png
   0x0,0x0,0x1,0x48,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x3b,0xdf,
-0x0,0x0,0x1,0x90,0x87,0xe4,0xe0,0xfc,
+0x0,0x0,0x1,0x90,0x7b,0x61,0x17,0xfa,
   // :/res/Kusatellite.png
   0x0,0x0,0x1,0xe,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x2a,0x38,
-0x0,0x0,0x1,0x90,0x87,0xe4,0xe0,0xf7,
+0x0,0x0,0x1,0x90,0x7b,0x62,0xcb,0x6d,
   // :/res/tm.ico
   0x0,0x0,0x0,0xac,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x16,0x38,
-0x0,0x0,0x1,0x90,0x87,0xe4,0xe0,0xfd,
+0x0,0x0,0x1,0x90,0x7c,0xec,0x12,0xaf,
   // :/res/SearchPayload.png
   0x0,0x0,0x0,0x78,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0xe,0x6b,
-0x0,0x0,0x1,0x90,0x87,0xe4,0xe0,0xfa,
+0x0,0x0,0x1,0x90,0x7b,0x63,0x4,0x8e,
   // :/res/LChain.png
   0x0,0x0,0x0,0xde,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1f,0xb1,
-0x0,0x0,0x1,0x90,0x87,0xe4,0xe0,0xf7,
+0x0,0x0,0x1,0x90,0x7b,0x62,0x25,0xbd,
   // :/res/GDDC.png
   0x0,0x0,0x0,0xf8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x21,0x20,
-0x0,0x0,0x1,0x90,0x87,0xe4,0xe0,0xf6,
+0x0,0x0,0x1,0x90,0x7b,0x61,0xf1,0xea,
   // :/res/SDFP.png
   0x0,0x0,0x1,0x32,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x33,0xbd,
-0x0,0x0,0x1,0x90,0x87,0xe4,0xe0,0xfa,
+0x0,0x0,0x1,0x90,0x7b,0x6b,0xa6,0xdc,
   // :/res/homepage.png
   0x0,0x0,0x0,0xc,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,
-0x0,0x0,0x1,0x90,0x87,0xe4,0xe0,0xfb,
+0x0,0x0,0x1,0x90,0x7b,0x5f,0x6b,0x8,
   // :/res/Help.png
   0x0,0x0,0x0,0x2a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x6,0x6f,
-0x0,0x0,0x1,0x90,0x87,0xe4,0xe0,0xf6,
+0x0,0x0,0x1,0x90,0x7b,0x61,0xa9,0x4b,
   // :/res/3DModeling.png
   0x0,0x0,0x0,0x56,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0xc,0x36,
-0x0,0x0,0x1,0x90,0x87,0xe4,0xe0,0xf5,
+0x0,0x0,0x1,0x90,0x7b,0x60,0xaa,0x43,
   // :/res/adHoc.png
   0x0,0x0,0x1,0x64,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x3f,0x31,
-0x0,0x0,0x1,0x90,0x87,0xe4,0xe0,0xfb,
+0x0,0x0,0x1,0x90,0x7b,0x62,0x4f,0x50,
   // :/res/PDTColony.png
   0x0,0x0,0x0,0xbe,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1c,0xf,
-0x0,0x0,0x1,0x90,0x87,0xe4,0xe0,0xf8,
+0x0,0x0,0x1,0x90,0x7b,0x62,0x74,0x94,
   // :/res/Sign.png
   0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x9,0xa4,
-0x0,0x0,0x1,0x90,0x87,0xe4,0xe0,0xfa,
+0x0,0x0,0x1,0x90,0x7b,0x61,0x6c,0x8a,
   // :/res/Qss/qss.qss
   0x0,0x0,0x1,0x7c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x41,0xa9,
-<<<<<<< HEAD
+0x0,0x0,0x1,0x90,0x8b,0x5d,0x14,0x7,
-0x0,0x0,0x1,0x90,0x87,0xe4,0xe0,0xf9,
-=======
-0x0,0x0,0x1,0x90,0x8b,0x4e,0xe4,0x18,
->>>>>>> cyh
 
 };
 

build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug/debug/qrc_qmake_qmake_qm_files.cpp

@@ -7,7 +7,7 @@
 *****************************************************************************/
 
 static const unsigned char qt_resource_data[] = {
-  // D:/QTdemo/playerApp/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug/debug/PayloadAPP_zh_CN.qm
+  // D:/QT/Custom_projects/Project_14/PayloadAPP/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug/debug/PayloadAPP_zh_CN.qm
   0x0,0x0,0x0,0x1a,
   0x3c,
   0xb8,0x64,0x18,0xca,0xef,0x9c,0x95,0xcd,0x21,0x1c,0xbf,0x60,0xa1,0xbd,0xdd,0xa7,
@@ -39,7 +39,7 @@ static const unsigned char qt_resource_struct[] = {
 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
   // :/i18n/PayloadAPP_zh_CN.qm
   0x0,0x0,0x0,0xe,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,
-0x0,0x0,0x1,0x90,0x87,0xe4,0xdd,0xbc,
+0x0,0x0,0x1,0x90,0x8b,0x5a,0xf8,0xb0,
 
 };
 

build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug/release/qmake_qmake_qm_files.qrc

@@ -1,5 +1,5 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource prefix="i18n">
-<file alias="PayloadAPP_zh_CN.qm">D:/QTdemo/playerApp/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug/release/PayloadAPP_zh_CN.qm</file>
+<file alias="PayloadAPP_zh_CN.qm">D:/QT/Custom_projects/Project_14/PayloadAPP/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug/release/PayloadAPP_zh_CN.qm</file>
 </qresource>
 </RCC>

build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug/ui_gddcdlg.h

@@ -12,11 +12,13 @@
 #include <QtCore/QVariant>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QComboBox>
+#include <QtWidgets/QGridLayout>
 #include <QtWidgets/QGroupBox>
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QLineEdit>
 #include <QtWidgets/QPushButton>
 #include <QtWidgets/QTabWidget>
+#include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QWidget>
 
 QT_BEGIN_NAMESPACE
@@ -24,6 +26,9 @@ QT_BEGIN_NAMESPACE
 class Ui_GDDCdlg
 {
 public:
+    QGridLayout *gridLayout;
+    QVBoxLayout *verticalLayout;
+    QLabel *label;
     QTabWidget *tabWidget;
     QWidget *tab_1;
     QPushButton *pushButton_1_1;
@@ -128,16 +133,40 @@ public:
     QPushButton *pushButton_6_3;
     QPushButton *pushButton_6_4;
     QPushButton *pushButton_6_5;
-    QLabel *label;
+    QGroupBox *groupBox_5;
 
     void setupUi(QWidget *GDDCdlg)
     {
         if (GDDCdlg->objectName().isEmpty())
             GDDCdlg->setObjectName("GDDCdlg");
-        GDDCdlg->resize(1800, 900);
+        GDDCdlg->resize(823, 536);
+        gridLayout = new QGridLayout(GDDCdlg);
+        gridLayout->setObjectName("gridLayout");
+        verticalLayout = new QVBoxLayout();
+        verticalLayout->setObjectName("verticalLayout");
+        label = new QLabel(GDDCdlg);
+        label->setObjectName("label");
+        QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(label->sizePolicy().hasHeightForWidth());
+        label->setSizePolicy(sizePolicy);
+        label->setMinimumSize(QSize(192, 108));
+        label->setMaximumSize(QSize(1920, 1080));
+        label->setLayoutDirection(Qt::LeftToRight);
+        label->setStyleSheet(QString::fromUtf8("background-color: rgb(70, 70, 70);"));
+        label->setAlignment(Qt::AlignCenter);
+
+        verticalLayout->addWidget(label);
+
         tabWidget = new QTabWidget(GDDCdlg);
         tabWidget->setObjectName("tabWidget");
-        tabWidget->setGeometry(QRect(0, 630, 1491, 261));
+        QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Minimum);
+        sizePolicy1.setHorizontalStretch(0);
+        sizePolicy1.setVerticalStretch(0);
+        sizePolicy1.setHeightForWidth(tabWidget->sizePolicy().hasHeightForWidth());
+        tabWidget->setSizePolicy(sizePolicy1);
+        tabWidget->setMinimumSize(QSize(0, 250));
         tabWidget->setStyleSheet(QString::fromUtf8(""));
         tabWidget->setTabPosition(QTabWidget::North);
         tabWidget->setTabShape(QTabWidget::Rounded);
@@ -536,18 +565,26 @@ public:
         pushButton_6_5->setGeometry(QRect(730, 80, 211, 30));
         pushButton_6_5->setStyleSheet(QString::fromUtf8(""));
         tabWidget->addTab(tab_6, QString());
-        label = new QLabel(GDDCdlg);
+
-        label->setObjectName("label");
+        verticalLayout->addWidget(tabWidget);
-        label->setGeometry(QRect(0, 0, 1491, 631));
+
-        label->setMinimumSize(QSize(192, 108));
+
-        label->setMaximumSize(QSize(1920, 1080));
+        gridLayout->addLayout(verticalLayout, 0, 0, 1, 1);
-        label->setLayoutDirection(Qt::LeftToRight);
+
-        label->setStyleSheet(QString::fromUtf8("background-color: rgb(70, 70, 70);"));
+        groupBox_5 = new QGroupBox(GDDCdlg);
-        label->setAlignment(Qt::AlignCenter);
+        groupBox_5->setObjectName("groupBox_5");
+        QSizePolicy sizePolicy2(QSizePolicy::Preferred, QSizePolicy::Expanding);
+        sizePolicy2.setHorizontalStretch(0);
+        sizePolicy2.setVerticalStretch(0);
+        sizePolicy2.setHeightForWidth(groupBox_5->sizePolicy().hasHeightForWidth());
+        groupBox_5->setSizePolicy(sizePolicy2);
+
+        gridLayout->addWidget(groupBox_5, 0, 1, 1, 1);
+
 
         retranslateUi(GDDCdlg);
 
-        tabWidget->setCurrentIndex(2);
+        tabWidget->setCurrentIndex(0);
 
 
         QMetaObject::connectSlotsByName(GDDCdlg);
@@ -556,6 +593,7 @@ public:
     void retranslateUi(QWidget *GDDCdlg)
     {
         GDDCdlg->setWindowTitle(QCoreApplication::translate("GDDCdlg", "Form", nullptr));
+        label->setText(QCoreApplication::translate("GDDCdlg", "TextLabel", nullptr));
         pushButton_1_1->setText(QCoreApplication::translate("GDDCdlg", "\345\220\212\350\210\261\346\227\266\351\227\264\346\233\264\346\226\260", nullptr));
         groupBox_1_1->setTitle(QCoreApplication::translate("GDDCdlg", "\347\233\256\346\240\207\350\267\237\350\270\252\346\250\241\346\235\277\345\244\247\345\260\217\350\256\276\347\275\256", nullptr));
         pushButton_1_2->setText(QCoreApplication::translate("GDDCdlg", "\350\256\276\347\275\256", nullptr));
@@ -648,7 +686,7 @@ public:
         pushButton_6_4->setText(QCoreApplication::translate("GDDCdlg", "\347\233\256\346\240\207\346\243\200\346\265\213\346\241\206\350\256\276\347\275\256", nullptr));
         pushButton_6_5->setText(QCoreApplication::translate("GDDCdlg", "\346\243\200\346\265\213\345\205\264\350\266\243\345\214\272\345\237\237\344\275\215\347\275\256\350\256\276\347\275\256", nullptr));
         tabWidget->setTabText(tabWidget->indexOf(tab_6), QCoreApplication::translate("GDDCdlg", "AI\346\243\200\346\265\213", nullptr));
-        label->setText(QCoreApplication::translate("GDDCdlg", "TextLabel", nullptr));
+        groupBox_5->setTitle(QCoreApplication::translate("GDDCdlg", "GroupBox", nullptr));
     } // retranslateUi
 
 };

build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug/ui_mainwindow.h

@@ -14,6 +14,7 @@
 #include <QtGui/QIcon>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QGridLayout>
+#include <QtWidgets/QHBoxLayout>
 #include <QtWidgets/QMainWindow>
 #include <QtWidgets/QMenuBar>
 #include <QtWidgets/QPushButton>
@@ -40,20 +41,9 @@ public:
     QAction *toolbar_action8;
     QWidget *centralwidget;
     QGridLayout *gridLayout;
-<<<<<<< HEAD
-    QVBoxLayout *verticalLayout;
-    QSpacerItem *verticalSpacer_2;
-=======
     QVBoxLayout *verticalLayout_2;
-    QHBoxLayout *horizontalLayout;
-    QSpacerItem *horizontalSpacer;
-    QPushButton *pushButton_9;
-    QPushButton *pushButton_10;
-    QPushButton *pushButton_11;
-    QWidget *widget;
     QVBoxLayout *verticalLayout;
     QSpacerItem *verticalSpacer;
->>>>>>> cyh
     QPushButton *pushButton;
     QPushButton *pushButton_2;
     QPushButton *pushButton_3;
@@ -62,13 +52,14 @@ public:
     QPushButton *pushButton_6;
     QPushButton *pushButton_7;
     QPushButton *pushButton_8;
-<<<<<<< HEAD
+    QSpacerItem *verticalSpacer_2;
-    QSpacerItem *verticalSpacer;
     QSpacerItem *horizontalSpacer;
     QVBoxLayout *webView;
-=======
+    QHBoxLayout *horizontalLayout;
-    QSpacerItem *verticalSpacer_2;
+    QSpacerItem *horizontalSpacer1;
->>>>>>> cyh
+    QPushButton *pushButton_9;
+    QPushButton *pushButton_10;
+    QPushButton *pushButton_11;
     QStatusBar *statusbar;
     QMenuBar *menuBar;
 
@@ -76,11 +67,7 @@ public:
     {
         if (MainWindow->objectName().isEmpty())
             MainWindow->setObjectName("MainWindow");
-<<<<<<< HEAD
+        MainWindow->resize(1079, 570);
-        MainWindow->resize(1462, 953);
-=======
-        MainWindow->resize(862, 534);
->>>>>>> cyh
         QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
         sizePolicy.setHorizontalStretch(0);
         sizePolicy.setVerticalStretch(0);
@@ -165,74 +152,16 @@ public:
         centralwidget->setContextMenuPolicy(Qt::NoContextMenu);
         gridLayout = new QGridLayout(centralwidget);
         gridLayout->setObjectName("gridLayout");
-<<<<<<< HEAD
-        verticalLayout = new QVBoxLayout();
-        verticalLayout->setObjectName("verticalLayout");
-        verticalSpacer_2 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
-
-        verticalLayout->addItem(verticalSpacer_2);
-=======
         verticalLayout_2 = new QVBoxLayout();
         verticalLayout_2->setObjectName("verticalLayout_2");
 
         gridLayout->addLayout(verticalLayout_2, 0, 1, 1, 1);
 
-        horizontalLayout = new QHBoxLayout();
-        horizontalLayout->setObjectName("horizontalLayout");
-        horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-
-        horizontalLayout->addItem(horizontalSpacer);
-
-        pushButton_9 = new QPushButton(centralwidget);
-        pushButton_9->setObjectName("pushButton_9");
-        sizePolicy1.setHeightForWidth(pushButton_9->sizePolicy().hasHeightForWidth());
-        pushButton_9->setSizePolicy(sizePolicy1);
-        pushButton_9->setContextMenuPolicy(Qt::DefaultContextMenu);
-        pushButton_9->setLayoutDirection(Qt::LeftToRight);
-        pushButton_9->setStyleSheet(QString::fromUtf8(""));
-        pushButton_9->setIcon(icon);
-        pushButton_9->setIconSize(QSize(25, 25));
-
-        horizontalLayout->addWidget(pushButton_9);
-
-        pushButton_10 = new QPushButton(centralwidget);
-        pushButton_10->setObjectName("pushButton_10");
-        sizePolicy1.setHeightForWidth(pushButton_10->sizePolicy().hasHeightForWidth());
-        pushButton_10->setSizePolicy(sizePolicy1);
-        pushButton_10->setContextMenuPolicy(Qt::DefaultContextMenu);
-        pushButton_10->setStyleSheet(QString::fromUtf8(""));
-        pushButton_10->setIcon(icon1);
-        pushButton_10->setIconSize(QSize(25, 25));
-
-        horizontalLayout->addWidget(pushButton_10);
-
-        pushButton_11 = new QPushButton(centralwidget);
-        pushButton_11->setObjectName("pushButton_11");
-        sizePolicy1.setHeightForWidth(pushButton_11->sizePolicy().hasHeightForWidth());
-        pushButton_11->setSizePolicy(sizePolicy1);
-        pushButton_11->setContextMenuPolicy(Qt::DefaultContextMenu);
-        pushButton_11->setStyleSheet(QString::fromUtf8(""));
-        pushButton_11->setIcon(icon2);
-        pushButton_11->setIconSize(QSize(25, 25));
-        pushButton_11->setAutoDefault(false);
-
-        horizontalLayout->addWidget(pushButton_11);
-
-
-        gridLayout->addLayout(horizontalLayout, 0, 4, 1, 1);
-
-        widget = new QWidget(centralwidget);
-        widget->setObjectName("widget");
-        widget->setStyleSheet(QString::fromUtf8("background-color: rgb(85, 170, 255);"));
-
-        gridLayout->addWidget(widget, 1, 4, 1, 1);
-
         verticalLayout = new QVBoxLayout();
         verticalLayout->setObjectName("verticalLayout");
         verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
 
         verticalLayout->addItem(verticalSpacer);
->>>>>>> cyh
 
         pushButton = new QPushButton(centralwidget);
         pushButton->setObjectName("pushButton");
@@ -325,30 +254,65 @@ public:
 
         verticalLayout->addWidget(pushButton_8);
 
-<<<<<<< HEAD
-        verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
-
-        verticalLayout->addItem(verticalSpacer);
-
-
-        gridLayout->addLayout(verticalLayout, 5, 1, 1, 1);
-=======
         verticalSpacer_2 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
 
         verticalLayout->addItem(verticalSpacer_2);
->>>>>>> cyh
 
 
-<<<<<<< HEAD
+        gridLayout->addLayout(verticalLayout, 1, 1, 1, 1);
+
+        horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
         gridLayout->addItem(horizontalSpacer, 6, 2, 1, 1);
 
         webView = new QVBoxLayout();
         webView->setObjectName("webView");
 
-        gridLayout->addLayout(webView, 5, 2, 1, 2);
+        gridLayout->addLayout(webView, 1, 2, 1, 1);
-=======
+
-        gridLayout->addLayout(verticalLayout, 1, 1, 1, 1);
+        horizontalLayout = new QHBoxLayout();
->>>>>>> cyh
+        horizontalLayout->setObjectName("horizontalLayout");
+        horizontalSpacer1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        horizontalLayout->addItem(horizontalSpacer1);
+
+        pushButton_9 = new QPushButton(centralwidget);
+        pushButton_9->setObjectName("pushButton_9");
+        sizePolicy1.setHeightForWidth(pushButton_9->sizePolicy().hasHeightForWidth());
+        pushButton_9->setSizePolicy(sizePolicy1);
+        pushButton_9->setContextMenuPolicy(Qt::DefaultContextMenu);
+        pushButton_9->setLayoutDirection(Qt::LeftToRight);
+        pushButton_9->setStyleSheet(QString::fromUtf8(""));
+        pushButton_9->setIcon(icon);
+        pushButton_9->setIconSize(QSize(25, 25));
+
+        horizontalLayout->addWidget(pushButton_9);
+
+        pushButton_10 = new QPushButton(centralwidget);
+        pushButton_10->setObjectName("pushButton_10");
+        sizePolicy1.setHeightForWidth(pushButton_10->sizePolicy().hasHeightForWidth());
+        pushButton_10->setSizePolicy(sizePolicy1);
+        pushButton_10->setContextMenuPolicy(Qt::DefaultContextMenu);
+        pushButton_10->setStyleSheet(QString::fromUtf8(""));
+        pushButton_10->setIcon(icon1);
+        pushButton_10->setIconSize(QSize(25, 25));
+
+        horizontalLayout->addWidget(pushButton_10);
+
+        pushButton_11 = new QPushButton(centralwidget);
+        pushButton_11->setObjectName("pushButton_11");
+        sizePolicy1.setHeightForWidth(pushButton_11->sizePolicy().hasHeightForWidth());
+        pushButton_11->setSizePolicy(sizePolicy1);
+        pushButton_11->setContextMenuPolicy(Qt::DefaultContextMenu);
+        pushButton_11->setStyleSheet(QString::fromUtf8(""));
+        pushButton_11->setIcon(icon2);
+        pushButton_11->setIconSize(QSize(25, 25));
+        pushButton_11->setAutoDefault(false);
+
+        horizontalLayout->addWidget(pushButton_11);
+
+
+        gridLayout->addLayout(horizontalLayout, 0, 2, 1, 1);
 
         MainWindow->setCentralWidget(centralwidget);
         statusbar = new QStatusBar(MainWindow);
@@ -358,11 +322,7 @@ public:
         MainWindow->setStatusBar(statusbar);
         menuBar = new QMenuBar(MainWindow);
         menuBar->setObjectName("menuBar");
-<<<<<<< HEAD
+        menuBar->setGeometry(QRect(0, 0, 1079, 20));
-        menuBar->setGeometry(QRect(0, 0, 1462, 25));
-=======
-        menuBar->setGeometry(QRect(0, 0, 862, 20));
->>>>>>> cyh
         MainWindow->setMenuBar(menuBar);
 
         retranslateUi(MainWindow);
@@ -401,6 +361,9 @@ public:
         pushButton_6->setText(QCoreApplication::translate("MainWindow", "Ku\345\215\253\351\200\232    ", nullptr));
         pushButton_7->setText(QCoreApplication::translate("MainWindow", "\346\220\234\346\225\221\350\275\275\350\215\267  ", nullptr));
         pushButton_8->setText(QCoreApplication::translate("MainWindow", "\344\270\211\347\273\264\345\273\272\346\250\241  ", nullptr));
+        pushButton_9->setText(QString());
+        pushButton_10->setText(QString());
+        pushButton_11->setText(QString());
     } // retranslateUi
 
 };

build/Desktop_Qt_6_5_3_MSVC2019_64bit-Release/.qmake.stash

@@ -0,0 +1,21 @@
+QMAKE_CXX.QT_COMPILER_STDCXX = 199711L
+QMAKE_CXX.QMAKE_MSC_VER = 1935
+QMAKE_CXX.QMAKE_MSC_FULL_VER = 193532217
+QMAKE_CXX.COMPILER_MACROS = \
+    QT_COMPILER_STDCXX \
+    QMAKE_MSC_VER \
+    QMAKE_MSC_FULL_VER
+QMAKE_CXX.INCDIRS = \
+    "D:\\Microsoft Visual Studio\\IDE\\VC\\Tools\\MSVC\\14.35.32215\\include" \
+    "D:\\Microsoft Visual Studio\\IDE\\VC\\Tools\\MSVC\\14.35.32215\\ATLMFC\\include" \
+    "D:\\Microsoft Visual Studio\\IDE\\VC\\Auxiliary\\VS\\include" \
+    "D:\\Windows Kits\\10\\include\\10.0.22621.0\\ucrt" \
+    "D:\\Windows Kits\\10\\\\include\\10.0.22621.0\\\\um" \
+    "D:\\Windows Kits\\10\\\\include\\10.0.22621.0\\\\shared" \
+    "D:\\Windows Kits\\10\\\\include\\10.0.22621.0\\\\winrt" \
+    "D:\\Windows Kits\\10\\\\include\\10.0.22621.0\\\\cppwinrt"
+QMAKE_CXX.LIBDIRS = \
+    "D:\\Microsoft Visual Studio\\IDE\\VC\\Tools\\MSVC\\14.35.32215\\ATLMFC\\lib\\x64" \
+    "D:\\Microsoft Visual Studio\\IDE\\VC\\Tools\\MSVC\\14.35.32215\\lib\\x64" \
+    "D:\\Windows Kits\\10\\lib\\10.0.22621.0\\ucrt\\x64" \
+    "D:\\Windows Kits\\10\\\\lib\\10.0.22621.0\\\\um\\x64"