解决冲突

pull/2/head
caoyuhui 8 months ago
commit b2f390904e

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 13.0.2, 2024-07-06T21:31:51. -->
<!-- Written by QtCreator 13.0.2, 2024-07-07T12:15:22. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
<value type="QByteArray">{c21801a3-ae2b-45ac-9dbf-ccd10de58748}</value>
<value type="QByteArray">{a4cfdcc4-9e92-4192-b732-d379deab22e3}</value>
</data>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
@ -83,6 +83,9 @@
<valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
<value type="bool" key="ClangTools.UseGlobalSettings">true</value>
</valuemap>
<valuemap type="QVariantMap" key="CppEditor.QuickFix">
<value type="bool" key="UseGlobalSettings">true</value>
</valuemap>
</valuemap>
</data>
<data>
@ -97,8 +100,8 @@
<value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<value type="int" key="EnableQmlDebugging">0</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\QTdemo\playerApp\build\Desktop_Qt_6_5_3_MSVC2019_64bit-Debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/QTdemo/playerApp/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug</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>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/QT/Custom_projects/Project_14/PayloadAPP/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@ -136,8 +139,8 @@
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\QTdemo\playerApp\build\Desktop_Qt_6_5_3_MSVC2019_64bit-Release</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/QTdemo/playerApp/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Release</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\QT\Custom_projects\Project_14\PayloadAPP\build\Desktop_Qt_6_5_3_MSVC2019_64bit-Release</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/QT/Custom_projects/Project_14/PayloadAPP/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Release</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@ -177,8 +180,8 @@
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
<value type="int" key="EnableQmlDebugging">0</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\QTdemo\playerApp\build\Desktop_Qt_6_5_3_MSVC2019_64bit-Profile</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/QTdemo/playerApp/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Profile</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\QT\Custom_projects\Project_14\PayloadAPP\build\Desktop_Qt_6_5_3_MSVC2019_64bit-Profile</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/QT/Custom_projects/Project_14/PayloadAPP/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Profile</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@ -217,10 +220,54 @@
<value type="int" key="QtQuickCompiler">0</value>
<value type="int" key="SeparateDebugInfo">0</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.3">
<value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">部署</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">部署</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
<valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
<value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
<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">ProjectExplorer.CustomExecutableRunConfiguration</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
<value type="bool" key="ProjectExplorer.RunConfiguration.Customized">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.Target.1</variable>
<valuemap type="QVariantMap">
<value type="QString" key="DeviceType">Desktop</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 6.7.2 MSVC2019 64bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 6.7.2 MSVC2019 64bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt6.672.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>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<value type="int" key="EnableQmlDebugging">0</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\QTdemo\playerApp\build\Desktop_Qt_6_5_3_MSVC2019_64bit-Debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/QTdemo/playerApp/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\QT\Custom_projects\Project_14\PayloadAPP\build\Desktop_Qt_6_7_2_MSVC2019_64bit-Debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/QT/Custom_projects/Project_14/PayloadAPP/build/Desktop_Qt_6_7_2_MSVC2019_64bit-Debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@ -253,11 +300,93 @@
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">4</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\QT\Custom_projects\Project_14\PayloadAPP\build\Desktop_Qt_6_7_2_MSVC2019_64bit-Release</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/QT/Custom_projects/Project_14/PayloadAPP/build/Desktop_Qt_6_7_2_MSVC2019_64bit-Release</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">构建</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">清除</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">清除</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
<value type="int" key="QtQuickCompiler">0</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
<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_7_2_MSVC2019_64bit-Profile</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/QT/Custom_projects/Project_14/PayloadAPP/build/Desktop_Qt_6_7_2_MSVC2019_64bit-Profile</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">构建</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">清除</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">清除</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
<value type="int" key="QtQuickCompiler">0</value>
<value type="int" key="SeparateDebugInfo">0</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
@ -282,20 +411,19 @@
<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:/QTdemo/playerApp/PayloadAPP.pro</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">D:/QTdemo/playerApp/PayloadAPP.pro</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:/QTdemo/playerApp/build/Desktop_Qt_6_5_3_MSVC2019_64bit-Debug</value>
</valuemap>
<value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.TargetCount</variable>
<value type="qlonglong">1</value>
<value type="qlonglong">2</value>
</data>
<data>
<variable>ProjectExplorer.Project.Updater.FileVersion</variable>

File diff suppressed because one or more lines are too long

@ -1100,8 +1100,13 @@ 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,
@ -1127,113 +1132,121 @@ static const unsigned char qt_resource_data[] = {
0x20,0x31,0x32,0x70,0x74,0x20,0x22,0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,
0x20,0x59,0x61,0x48,0x65,0x69,0x20,0x55,0x49,0x22,0x3b,0xd,0xa,0x7d,0xd,0xa,
0x51,0x47,0x72,0x6f,0x75,0x70,0x42,0x6f,0x78,0x7b,0xd,0xa,0x20,0x20,0x20,0x20,
0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x72,0x67,0x62,0x28,0x32,0x35,0x35,0x2c,0x32,0x35,
0x35,0x2c,0x32,0x35,0x35,0x29,0x3b,0xd,0xa,0x7d,0xd,0xa,0xd,0xa,0x2f,0x2a,
0xe8,0xae,0xbe,0xe7,0xbd,0xae,0x54,0x61,0x62,0x57,0x69,0x64,0x67,0x65,0x74,0xe4,
0xb8,0xad,0x74,0x61,0x62,0x5f,0x31,0xe7,0x9a,0x84,0xe6,0xa0,0xb7,0xe5,0xbc,0x8f,
0x2a,0x2f,0xd,0xa,0x23,0x74,0x61,0x62,0x5f,0x31,0x2e,0x51,0x57,0x69,0x64,0x67,
0x65,0x74,0x7b,0xd,0xa,0x20,0x20,0x20,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,
0x75,0x6e,0x64,0x2d,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x72,0x67,0x62,0x28,0x30,
0x2c,0x20,0x30,0x2c,0x20,0x30,0x29,0x3b,0xd,0xa,0x7d,0xd,0xa,0x23,0x74,0x61,
0x62,0x5f,0x32,0x2e,0x51,0x57,0x69,0x64,0x67,0x65,0x74,0x7b,0xd,0xa,0x20,0x20,
0x20,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x2d,0x63,0x6f,0x6c,
0x6f,0x72,0x3a,0x20,0x72,0x67,0x62,0x28,0x30,0x2c,0x20,0x30,0x2c,0x20,0x30,0x29,
0x3b,0xd,0xa,0x7d,0xd,0xa,0x23,0x74,0x61,0x62,0x5f,0x33,0x2e,0x51,0x57,0x69,
0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x72,0x67,0x62,0x28,0x31,0x35,0x33,0x2c,0x32,0x35,
0x35,0x2c,0x31,0x35,0x33,0x29,0x3b,0xd,0xa,0x20,0x20,0x20,0x20,0x66,0x6f,0x6e,
0x74,0x2d,0x66,0x61,0x6d,0x69,0x6c,0x79,0x3a,0x43,0x6f,0x6e,0x73,0x6f,0x6c,0x61,
0x73,0x3b,0xd,0xa,0x20,0x20,0x20,0x20,0x66,0x6f,0x6e,0x74,0x2d,0x73,0x69,0x7a,
0x65,0x3a,0x31,0x32,0x70,0x74,0x3b,0xd,0xa,0x7d,0xd,0xa,0xd,0xa,0xd,0xa,
0x2f,0x2a,0xe8,0xae,0xbe,0xe7,0xbd,0xae,0x54,0x61,0x62,0x57,0x69,0x64,0x67,0x65,
0x74,0xe4,0xb8,0xad,0x74,0x61,0x62,0x5f,0x31,0xe7,0x9a,0x84,0xe6,0xa0,0xb7,0xe5,
0xbc,0x8f,0x2a,0x2f,0xd,0xa,0x23,0x74,0x61,0x62,0x5f,0x31,0x2e,0x51,0x57,0x69,
0x64,0x67,0x65,0x74,0x7b,0xd,0xa,0x20,0x20,0x20,0x20,0x62,0x61,0x63,0x6b,0x67,
0x72,0x6f,0x75,0x6e,0x64,0x2d,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x72,0x67,0x62,
0x28,0x30,0x2c,0x20,0x30,0x2c,0x20,0x30,0x29,0x3b,0xd,0xa,0x7d,0xd,0xa,0x23,
0x74,0x61,0x62,0x5f,0x34,0x2e,0x51,0x57,0x69,0x64,0x67,0x65,0x74,0x7b,0xd,0xa,
0x74,0x61,0x62,0x5f,0x32,0x2e,0x51,0x57,0x69,0x64,0x67,0x65,0x74,0x7b,0xd,0xa,
0x20,0x20,0x20,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x2d,0x63,
0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x72,0x67,0x62,0x28,0x30,0x2c,0x20,0x30,0x2c,0x20,
0x30,0x29,0x3b,0xd,0xa,0x7d,0xd,0xa,0x23,0x74,0x61,0x62,0x5f,0x35,0x2e,0x51,
0x30,0x29,0x3b,0xd,0xa,0x7d,0xd,0xa,0x23,0x74,0x61,0x62,0x5f,0x33,0x2e,0x51,
0x57,0x69,0x64,0x67,0x65,0x74,0x7b,0xd,0xa,0x20,0x20,0x20,0x20,0x62,0x61,0x63,
0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x2d,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x72,
0x67,0x62,0x28,0x30,0x2c,0x20,0x30,0x2c,0x20,0x30,0x29,0x3b,0xd,0xa,0x7d,0xd,
0xa,0x23,0x74,0x61,0x62,0x5f,0x36,0x2e,0x51,0x57,0x69,0x64,0x67,0x65,0x74,0x7b,
0xa,0x23,0x74,0x61,0x62,0x5f,0x34,0x2e,0x51,0x57,0x69,0x64,0x67,0x65,0x74,0x7b,
0xd,0xa,0x20,0x20,0x20,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,
0x2d,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x72,0x67,0x62,0x28,0x30,0x2c,0x20,0x30,
0x2c,0x20,0x30,0x29,0x3b,0xd,0xa,0x7d,0xd,0xa,0xd,0xa,0x2f,0x2a,0xe8,0xae,
0xbe,0xe7,0xbd,0xae,0x54,0x61,0x62,0x57,0x69,0x64,0x67,0x65,0x74,0xe4,0xb8,0xad,
0x51,0x54,0x61,0x62,0x42,0x61,0x72,0xe7,0x9a,0x84,0xe6,0xa0,0xb7,0xe5,0xbc,0x8f,
0x2a,0x2f,0xd,0xa,0x51,0x54,0x61,0x62,0x42,0x61,0x72,0x3a,0x3a,0x74,0x61,0x62,
0x7b,0xd,0xa,0x20,0x20,0x20,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,
0x64,0x2d,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x23,0x30,0x42,0x30,0x45,0x31,0x31,
0x3b,0xd,0xa,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x66,0x6f,0x6e,0x74,0x2d,
0x66,0x61,0x6d,0x69,0x6c,0x79,0x3a,0x43,0x6f,0x6e,0x73,0x6f,0x6c,0x61,0x73,0x3b,
0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x2f,
0x2a,0xe8,0xae,0xbe,0xe7,0xbd,0xae,0x74,0x61,0x62,0xe4,0xb8,0xad,0xe7,0x9a,0x84,
0xe6,0x96,0x87,0xe6,0x9c,0xac,0xe7,0x9a,0x84,0xe5,0xad,0x97,0xe4,0xbd,0x93,0x2a,
0x2f,0xd,0xa,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x66,0x6f,0x6e,0x74,0x2d,
0x73,0x69,0x7a,0x65,0x3a,0x31,0x32,0x70,0x74,0x3b,0xd,0xa,0x20,0x20,0x20,0x20,
0x20,0x20,0x20,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x72,0x67,0x62,0x28,0x32,0x35,
0x35,0x2c,0x32,0x35,0x35,0x2c,0x32,0x35,0x35,0x29,0x3b,0x20,0x20,0x20,0x20,0x20,
0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x2f,0x2a,0xe8,0xae,0xbe,0xe7,0xbd,0xae,
0x74,0x61,0x62,0xe4,0xb8,0xad,0xe7,0x9a,0x84,0xe6,0x96,0x87,0xe6,0x9c,0xac,0xe7,
0x9a,0x84,0xe9,0xa2,0x9c,0xe8,0x89,0xb2,0x2a,0x2f,0xd,0xa,0x20,0x20,0x20,0x20,
0x20,0x20,0x20,0x20,0x62,0x6f,0x72,0x64,0x65,0x72,0x2d,0x74,0x6f,0x70,0x2d,0x6c,
0x65,0x66,0x74,0x2d,0x72,0x61,0x64,0x69,0x75,0x73,0x3a,0x20,0x35,0x70,0x78,0x3b,
0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x2f,0x2a,0xe8,0xae,0xbe,0xe7,0xbd,0xae,
0x74,0x61,0x62,0xe7,0x9a,0x84,0xe8,0xbe,0xb9,0xe6,0xa1,0x86,0xe7,0x9a,0x84,0xe5,
0x9c,0x86,0xe8,0xa7,0x92,0xef,0xbc,0x88,0xe5,0xb7,0xa6,0xe4,0xb8,0x8a,0xe5,0x9c,
0x86,0xe8,0xa7,0x92,0xef,0xbc,0x89,0x2a,0x2f,0xd,0xa,0x20,0x20,0x20,0x20,0x20,
0x20,0x20,0x20,0x62,0x6f,0x72,0x64,0x65,0x72,0x2d,0x74,0x6f,0x70,0x2d,0x72,0x69,
0x67,0x68,0x74,0x2d,0x72,0x61,0x64,0x69,0x75,0x73,0x3a,0x20,0x35,0x70,0x78,0x3b,
0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x2f,0x2a,0xe8,0xae,0xbe,0xe7,0xbd,0xae,0x74,
0x61,0x62,0xe7,0x9a,0x84,0xe8,0xbe,0xb9,0xe6,0xa1,0x86,0xe7,0x9a,0x84,0xe5,0x9c,
0x86,0xe8,0xa7,0x92,0xef,0xbc,0x88,0xe5,0x8f,0xb3,0xe4,0xb8,0x8a,0xe5,0x9c,0x86,
0xe8,0xa7,0x92,0xef,0xbc,0x89,0x2a,0x2f,0xd,0xa,0x20,0x20,0x20,0x20,0x20,0x20,
0x20,0x20,0x6d,0x69,0x6e,0x2d,0x77,0x69,0x64,0x74,0x68,0x3a,0x20,0x31,0x32,0x70,
0x78,0x3b,0xd,0xa,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x70,0x61,0x64,0x64,
0x69,0x6e,0x67,0x3a,0x20,0x35,0x70,0x78,0x3b,0xd,0xa,0x20,0x20,0x20,0x20,0x20,
0x20,0x20,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x2d,0x63,0x6f,
0x6c,0x6f,0x72,0x3a,0x20,0x72,0x67,0x62,0x28,0x30,0x2c,0x20,0x30,0x2c,0x20,0x30,
0x29,0x3b,0xd,0xa,0x7d,0xd,0xa,0xd,0xa,0x2f,0x2a,0xe8,0xae,0xbe,0xe7,0xbd,
0xae,0x54,0x61,0x62,0x57,0x69,0x64,0x67,0x65,0x74,0xe4,0xb8,0xad,0x51,0x54,0x61,
0x62,0x42,0x61,0x72,0xe7,0x9a,0x84,0x74,0x61,0x62,0xe8,0xa2,0xab,0xe9,0x80,0x89,
0xe4,0xb8,0xad,0xe6,0x97,0xb6,0xe7,0x9a,0x84,0xe6,0xa0,0xb7,0xe5,0xbc,0x8f,0x2a,
0x2f,0xd,0xa,0x51,0x54,0x61,0x62,0x42,0x61,0x72,0x3a,0x3a,0x74,0x61,0x62,0x3a,
0x73,0x65,0x6c,0x65,0x63,0x74,0x65,0x64,0x7b,0xd,0xa,0x20,0x20,0x20,0x20,0x62,
0x2c,0x20,0x30,0x29,0x3b,0xd,0xa,0x7d,0xd,0xa,0x23,0x74,0x61,0x62,0x5f,0x35,
0x2e,0x51,0x57,0x69,0x64,0x67,0x65,0x74,0x7b,0xd,0xa,0x20,0x20,0x20,0x20,0x62,
0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x2d,0x63,0x6f,0x6c,0x6f,0x72,0x3a,
0x20,0x72,0x67,0x62,0x28,0x32,0x30,0x34,0x2c,0x20,0x32,0x32,0x39,0x2c,0x20,0x32,
0x35,0x35,0x29,0x3b,0xd,0xa,0x20,0x20,0x20,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3a,
0x20,0x72,0x67,0x62,0x28,0x30,0x2c,0x20,0x30,0x2c,0x20,0x30,0x29,0x3b,0xd,0xa,
0x7d,0xd,0xa,0xd,0xa,0x2f,0x2a,0xe8,0xae,0xbe,0xe7,0xbd,0xae,0x54,0x61,0x62,
0x57,0x69,0x64,0x67,0x65,0x74,0xe4,0xb8,0xad,0xe9,0xbc,0xa0,0xe6,0xa0,0x87,0xe6,
0x82,0xac,0xe6,0xb5,0xae,0xe5,0x9c,0xa8,0x51,0x54,0x61,0x62,0x42,0x61,0x72,0xe7,
0x9a,0x84,0x74,0x61,0x62,0xe4,0xb8,0x8a,0xef,0xbc,0x8c,0xe4,0xbd,0x86,0xe6,0x9c,
0xaa,0xe9,0x80,0x89,0xe4,0xb8,0xad,0xe8,0xaf,0xa5,0x54,0x61,0x62,0xe7,0x9a,0x84,
0xe6,0xa0,0xb7,0xe5,0xbc,0x8f,0x2a,0x2f,0xd,0xa,0x51,0x54,0x61,0x62,0x42,0x61,
0x72,0x3a,0x3a,0x74,0x61,0x62,0x3a,0x68,0x6f,0x76,0x65,0x72,0x3a,0x21,0x73,0x65,
0x6c,0x65,0x63,0x74,0x65,0x64,0x20,0x7b,0xd,0xa,0x20,0x20,0x20,0x20,0x62,0x61,
0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x2d,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,
0x72,0x67,0x62,0x28,0x32,0x32,0x34,0x2c,0x20,0x32,0x32,0x34,0x2c,0x20,0x32,0x32,
0x34,0x29,0x3b,0xd,0xa,0x20,0x20,0x20,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,
0x72,0x67,0x62,0x28,0x30,0x2c,0x20,0x30,0x2c,0x20,0x30,0x29,0x3b,0xd,0xa,0x7d,
0xd,0xa,0xd,0xa,0x2f,0x2a,0xe8,0xae,0xbe,0xe7,0xbd,0xae,0x54,0x61,0x62,0x57,
0x69,0x64,0x67,0x65,0x74,0xe7,0x9a,0x84,0xe8,0xbe,0xb9,0xe6,0xa1,0x86,0xe7,0x9a,
0x84,0xe6,0xa0,0xb7,0xe5,0xbc,0x8f,0x2a,0x2f,0xd,0xa,0x51,0x54,0x61,0x62,0x57,
0x69,0x64,0x67,0x65,0x74,0x3a,0x3a,0x70,0x61,0x6e,0x65,0x20,0x7b,0xd,0xa,0x20,
0x20,0x20,0x20,0x62,0x6f,0x72,0x64,0x65,0x72,0x3a,0x20,0x31,0x70,0x78,0x20,0x73,
0x6f,0x6c,0x69,0x64,0x20,0x72,0x67,0x62,0x28,0x31,0x30,0x38,0x2c,0x20,0x31,0x31,
0x37,0x2c,0x20,0x31,0x32,0x35,0x29,0x3b,0xd,0xa,0x7d,0xd,0xa,0xd,0xa,0x2f,
0x2a,0xe5,0xbd,0x93,0xe6,0x89,0x93,0xe5,0xbc,0x80,0xe5,0xa4,0x9a,0xe4,0xb8,0xaa,
0x74,0x61,0x62,0xef,0xbc,0x8c,0xe5,0x8f,0xb3,0xe4,0xbe,0xa7,0xe5,0x87,0xba,0xe7,
0x8e,0xb0,0xef,0xbc,0x8c,0xe7,0x82,0xb9,0xe5,0x87,0xbb,0xe5,0x90,0x8e,0xef,0xbc,
0x8c,0xe5,0x8f,0xaf,0xe4,0xbb,0xa5,0xe5,0x90,0x91,0xe5,0x89,0x8d,0xe5,0x90,0x91,
0xe5,0x90,0x8e,0xe7,0x9a,0x84,0xe6,0x8c,0x89,0xe9,0x92,0xae,0xe7,0x9a,0x84,0xe6,
0xa0,0xb7,0xe5,0xbc,0x8f,0x2a,0x2f,0xd,0xa,0x51,0x54,0x61,0x62,0x42,0x61,0x72,
0x20,0x51,0x54,0x6f,0x6f,0x6c,0x42,0x75,0x74,0x74,0x6f,0x6e,0x20,0x7b,0xd,0xa,
0x20,0x20,0x20,0x20,0x62,0x6f,0x72,0x64,0x65,0x72,0x3a,0x20,0x6e,0x6f,0x6e,0x65,
0x3b,0xd,0xa,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x63,0x6f,0x6c,0x6f,0x72,
0x3a,0x20,0x72,0x67,0x62,0x28,0x32,0x35,0x35,0x2c,0x20,0x32,0x30,0x36,0x2c,0x20,
0x36,0x29,0x3b,0xd,0xa,0x20,0x20,0x20,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,
0x75,0x6e,0x64,0x2d,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x23,0x30,0x62,0x30,0x65,
0x31,0x31,0x3b,0xd,0xa,0x7d,0xd,0xa,0xd,0xa,0x51,0x54,0x61,0x62,0x42,0x61,
0x72,0x20,0x51,0x54,0x6f,0x6f,0x6c,0x42,0x75,0x74,0x74,0x6f,0x6e,0x3a,0x68,0x6f,
0x76,0x65,0x72,0x20,0x7b,0xd,0xa,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x62,
0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x2d,0x63,0x6f,0x6c,0x6f,0x72,0x3a,
0x20,0x72,0x67,0x62,0x28,0x30,0x2c,0x20,0x30,0x2c,0x20,0x30,0x29,0x3b,0xd,0xa,
0x7d,0xd,0xa,0xd,0xa,0xd,0xa,
0x7d,0xd,0xa,0x23,0x74,0x61,0x62,0x5f,0x36,0x2e,0x51,0x57,0x69,0x64,0x67,0x65,
0x74,0x7b,0xd,0xa,0x20,0x20,0x20,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,
0x6e,0x64,0x2d,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x72,0x67,0x62,0x28,0x30,0x2c,
0x20,0x30,0x2c,0x20,0x30,0x29,0x3b,0xd,0xa,0x7d,0xd,0xa,0xd,0xa,0x2f,0x2a,
0xe8,0xae,0xbe,0xe7,0xbd,0xae,0x54,0x61,0x62,0x57,0x69,0x64,0x67,0x65,0x74,0xe4,
0xb8,0xad,0x51,0x54,0x61,0x62,0x42,0x61,0x72,0xe7,0x9a,0x84,0xe6,0xa0,0xb7,0xe5,
0xbc,0x8f,0x2a,0x2f,0xd,0xa,0x51,0x54,0x61,0x62,0x42,0x61,0x72,0x3a,0x3a,0x74,
0x61,0x62,0x7b,0xd,0xa,0x20,0x20,0x20,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,
0x75,0x6e,0x64,0x2d,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x23,0x30,0x42,0x30,0x45,
0x31,0x31,0x3b,0xd,0xa,0x20,0x20,0x20,0x20,0x66,0x6f,0x6e,0x74,0x2d,0x66,0x61,
0x6d,0x69,0x6c,0x79,0x3a,0x43,0x6f,0x6e,0x73,0x6f,0x6c,0x61,0x73,0x3b,0x20,0x20,
0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x2f,0x2a,0xe8,
0xae,0xbe,0xe7,0xbd,0xae,0x74,0x61,0x62,0xe4,0xb8,0xad,0xe7,0x9a,0x84,0xe6,0x96,
0x87,0xe6,0x9c,0xac,0xe7,0x9a,0x84,0xe5,0xad,0x97,0xe4,0xbd,0x93,0x2a,0x2f,0xd,
0xa,0x20,0x20,0x20,0x20,0x66,0x6f,0x6e,0x74,0x2d,0x73,0x69,0x7a,0x65,0x3a,0x31,
0x32,0x70,0x74,0x3b,0xd,0xa,0x20,0x20,0x20,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3a,
0x72,0x67,0x62,0x28,0x32,0x35,0x35,0x2c,0x32,0x35,0x35,0x2c,0x32,0x35,0x35,0x29,
0x3b,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x2f,0x2a,
0xe8,0xae,0xbe,0xe7,0xbd,0xae,0x74,0x61,0x62,0xe4,0xb8,0xad,0xe7,0x9a,0x84,0xe6,
0x96,0x87,0xe6,0x9c,0xac,0xe7,0x9a,0x84,0xe9,0xa2,0x9c,0xe8,0x89,0xb2,0x2a,0x2f,
0xd,0xa,0x20,0x20,0x20,0x20,0x62,0x6f,0x72,0x64,0x65,0x72,0x2d,0x74,0x6f,0x70,
0x2d,0x6c,0x65,0x66,0x74,0x2d,0x72,0x61,0x64,0x69,0x75,0x73,0x3a,0x20,0x35,0x70,
0x78,0x3b,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x2f,0x2a,0xe8,0xae,0xbe,0xe7,
0xbd,0xae,0x74,0x61,0x62,0xe7,0x9a,0x84,0xe8,0xbe,0xb9,0xe6,0xa1,0x86,0xe7,0x9a,
0x84,0xe5,0x9c,0x86,0xe8,0xa7,0x92,0xef,0xbc,0x88,0xe5,0xb7,0xa6,0xe4,0xb8,0x8a,
0xe5,0x9c,0x86,0xe8,0xa7,0x92,0xef,0xbc,0x89,0x2a,0x2f,0xd,0xa,0x20,0x20,0x20,
0x20,0x62,0x6f,0x72,0x64,0x65,0x72,0x2d,0x74,0x6f,0x70,0x2d,0x72,0x69,0x67,0x68,
0x74,0x2d,0x72,0x61,0x64,0x69,0x75,0x73,0x3a,0x20,0x35,0x70,0x78,0x3b,0x20,0x20,
0x20,0x20,0x20,0x20,0x20,0x2f,0x2a,0xe8,0xae,0xbe,0xe7,0xbd,0xae,0x74,0x61,0x62,
0xe7,0x9a,0x84,0xe8,0xbe,0xb9,0xe6,0xa1,0x86,0xe7,0x9a,0x84,0xe5,0x9c,0x86,0xe8,
0xa7,0x92,0xef,0xbc,0x88,0xe5,0x8f,0xb3,0xe4,0xb8,0x8a,0xe5,0x9c,0x86,0xe8,0xa7,
0x92,0xef,0xbc,0x89,0x2a,0x2f,0xd,0xa,0x20,0x20,0x20,0x20,0x6d,0x69,0x6e,0x2d,
0x77,0x69,0x64,0x74,0x68,0x3a,0x20,0x31,0x32,0x70,0x78,0x3b,0xd,0xa,0x20,0x20,
0x20,0x20,0x70,0x61,0x64,0x64,0x69,0x6e,0x67,0x3a,0x20,0x35,0x70,0x78,0x3b,0xd,
0xa,0x20,0x20,0x20,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x2d,
0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x72,0x67,0x62,0x28,0x30,0x2c,0x20,0x30,0x2c,
0x20,0x30,0x29,0x3b,0xd,0xa,0x7d,0xd,0xa,0xd,0xa,0x2f,0x2a,0xe8,0xae,0xbe,
0xe7,0xbd,0xae,0x54,0x61,0x62,0x57,0x69,0x64,0x67,0x65,0x74,0xe4,0xb8,0xad,0x51,
0x54,0x61,0x62,0x42,0x61,0x72,0xe7,0x9a,0x84,0x74,0x61,0x62,0xe8,0xa2,0xab,0xe9,
0x80,0x89,0xe4,0xb8,0xad,0xe6,0x97,0xb6,0xe7,0x9a,0x84,0xe6,0xa0,0xb7,0xe5,0xbc,
0x8f,0x2a,0x2f,0xd,0xa,0x51,0x54,0x61,0x62,0x42,0x61,0x72,0x3a,0x3a,0x74,0x61,
0x62,0x3a,0x73,0x65,0x6c,0x65,0x63,0x74,0x65,0x64,0x7b,0xd,0xa,0x20,0x20,0x20,
0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x2d,0x63,0x6f,0x6c,0x6f,
0x72,0x3a,0x20,0x72,0x67,0x62,0x28,0x32,0x30,0x34,0x2c,0x20,0x32,0x32,0x39,0x2c,
0x20,0x32,0x35,0x35,0x29,0x3b,0xd,0xa,0x20,0x20,0x20,0x20,0x63,0x6f,0x6c,0x6f,
0x72,0x3a,0x20,0x72,0x67,0x62,0x28,0x30,0x2c,0x20,0x30,0x2c,0x20,0x30,0x29,0x3b,
0xd,0xa,0x7d,0xd,0xa,0xd,0xa,0x2f,0x2a,0xe8,0xae,0xbe,0xe7,0xbd,0xae,0x54,
0x61,0x62,0x57,0x69,0x64,0x67,0x65,0x74,0xe4,0xb8,0xad,0xe9,0xbc,0xa0,0xe6,0xa0,
0x87,0xe6,0x82,0xac,0xe6,0xb5,0xae,0xe5,0x9c,0xa8,0x51,0x54,0x61,0x62,0x42,0x61,
0x72,0xe7,0x9a,0x84,0x74,0x61,0x62,0xe4,0xb8,0x8a,0xef,0xbc,0x8c,0xe4,0xbd,0x86,
0xe6,0x9c,0xaa,0xe9,0x80,0x89,0xe4,0xb8,0xad,0xe8,0xaf,0xa5,0x54,0x61,0x62,0xe7,
0x9a,0x84,0xe6,0xa0,0xb7,0xe5,0xbc,0x8f,0x2a,0x2f,0xd,0xa,0x51,0x54,0x61,0x62,
0x42,0x61,0x72,0x3a,0x3a,0x74,0x61,0x62,0x3a,0x68,0x6f,0x76,0x65,0x72,0x3a,0x21,
0x73,0x65,0x6c,0x65,0x63,0x74,0x65,0x64,0x20,0x7b,0xd,0xa,0x20,0x20,0x20,0x20,
0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x2d,0x63,0x6f,0x6c,0x6f,0x72,
0x3a,0x20,0x72,0x67,0x62,0x28,0x32,0x32,0x34,0x2c,0x20,0x32,0x32,0x34,0x2c,0x20,
0x32,0x32,0x34,0x29,0x3b,0xd,0xa,0x20,0x20,0x20,0x20,0x63,0x6f,0x6c,0x6f,0x72,
0x3a,0x20,0x72,0x67,0x62,0x28,0x30,0x2c,0x20,0x30,0x2c,0x20,0x30,0x29,0x3b,0xd,
0xa,0x7d,0xd,0xa,0xd,0xa,0x2f,0x2a,0xe8,0xae,0xbe,0xe7,0xbd,0xae,0x54,0x61,
0x62,0x57,0x69,0x64,0x67,0x65,0x74,0xe7,0x9a,0x84,0xe8,0xbe,0xb9,0xe6,0xa1,0x86,
0xe7,0x9a,0x84,0xe6,0xa0,0xb7,0xe5,0xbc,0x8f,0x2a,0x2f,0xd,0xa,0x51,0x54,0x61,
0x62,0x57,0x69,0x64,0x67,0x65,0x74,0x3a,0x3a,0x70,0x61,0x6e,0x65,0x20,0x7b,0xd,
0xa,0x20,0x20,0x20,0x20,0x62,0x6f,0x72,0x64,0x65,0x72,0x3a,0x20,0x31,0x70,0x78,
0x20,0x73,0x6f,0x6c,0x69,0x64,0x20,0x72,0x67,0x62,0x28,0x31,0x30,0x38,0x2c,0x20,
0x31,0x31,0x37,0x2c,0x20,0x31,0x32,0x35,0x29,0x3b,0xd,0xa,0x7d,0xd,0xa,0xd,
0xa,0x2f,0x2a,0xe5,0xbd,0x93,0xe6,0x89,0x93,0xe5,0xbc,0x80,0xe5,0xa4,0x9a,0xe4,
0xb8,0xaa,0x74,0x61,0x62,0xef,0xbc,0x8c,0xe5,0x8f,0xb3,0xe4,0xbe,0xa7,0xe5,0x87,
0xba,0xe7,0x8e,0xb0,0xef,0xbc,0x8c,0xe7,0x82,0xb9,0xe5,0x87,0xbb,0xe5,0x90,0x8e,
0xef,0xbc,0x8c,0xe5,0x8f,0xaf,0xe4,0xbb,0xa5,0xe5,0x90,0x91,0xe5,0x89,0x8d,0xe5,
0x90,0x91,0xe5,0x90,0x8e,0xe7,0x9a,0x84,0xe6,0x8c,0x89,0xe9,0x92,0xae,0xe7,0x9a,
0x84,0xe6,0xa0,0xb7,0xe5,0xbc,0x8f,0x2a,0x2f,0xd,0xa,0x51,0x54,0x61,0x62,0x42,
0x61,0x72,0x20,0x51,0x54,0x6f,0x6f,0x6c,0x42,0x75,0x74,0x74,0x6f,0x6e,0x20,0x7b,
0xd,0xa,0x20,0x20,0x20,0x20,0x62,0x6f,0x72,0x64,0x65,0x72,0x3a,0x20,0x6e,0x6f,
0x6e,0x65,0x3b,0xd,0xa,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x63,0x6f,0x6c,
0x6f,0x72,0x3a,0x20,0x72,0x67,0x62,0x28,0x32,0x35,0x35,0x2c,0x20,0x32,0x30,0x36,
0x2c,0x20,0x36,0x29,0x3b,0xd,0xa,0x20,0x20,0x20,0x20,0x62,0x61,0x63,0x6b,0x67,
0x72,0x6f,0x75,0x6e,0x64,0x2d,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x23,0x30,0x62,
0x30,0x65,0x31,0x31,0x3b,0xd,0xa,0x7d,0xd,0xa,0xd,0xa,0x51,0x54,0x61,0x62,
0x42,0x61,0x72,0x20,0x51,0x54,0x6f,0x6f,0x6c,0x42,0x75,0x74,0x74,0x6f,0x6e,0x3a,
0x68,0x6f,0x76,0x65,0x72,0x20,0x7b,0xd,0xa,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x2d,0x63,0x6f,0x6c,0x6f,
0x72,0x3a,0x20,0x72,0x67,0x62,0x28,0x30,0x2c,0x20,0x30,0x2c,0x20,0x30,0x29,0x3b,
0xd,0xa,0x7d,0xd,0xa,0xd,0xa,0xd,0xa,0x2f,0x2a,0x51,0x4c,0x61,0x62,0x65,
0x6c,0xe8,0xae,0xbe,0xe7,0xbd,0xae,0x2a,0x2f,0xd,0xa,0x51,0x4c,0x61,0x62,0x65,
0x6c,0x7b,0xd,0xa,0x20,0x20,0x20,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x72,
0x67,0x62,0x28,0x32,0x35,0x35,0x2c,0x20,0x32,0x35,0x35,0x2c,0x20,0x32,0x35,0x35,
0x29,0x3b,0xd,0xa,0x20,0x20,0x20,0x20,0x66,0x6f,0x6e,0x74,0x2d,0x66,0x61,0x6d,
0x69,0x6c,0x79,0x3a,0x43,0x6f,0x6e,0x73,0x6f,0x6c,0x61,0x73,0x3b,0xd,0xa,0x20,
0x20,0x20,0x20,0x66,0x6f,0x6e,0x74,0x2d,0x73,0x69,0x7a,0x65,0x3a,0x31,0x31,0x70,
0x74,0x3b,0xd,0xa,0x7d,0xd,0xa,0xd,0xa,
};
@ -1373,7 +1386,11 @@ static const unsigned char qt_resource_struct[] = {
0x0,0x0,0x1,0x90,0x87,0xe4,0xe0,0xfa,
// :/res/Qss/qss.qss
0x0,0x0,0x1,0x7c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x41,0xa9,
<<<<<<< HEAD
0x0,0x0,0x1,0x90,0x87,0xe4,0xe0,0xf9,
=======
0x0,0x0,0x1,0x90,0x8b,0x4e,0xe4,0x18,
>>>>>>> cyh
};

@ -14,6 +14,7 @@
#include <QtWidgets/QComboBox>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QTabWidget>
#include <QtWidgets/QWidget>
@ -28,34 +29,70 @@ public:
QPushButton *pushButton_1_1;
QGroupBox *groupBox_1_1;
QPushButton *pushButton_1_2;
QLineEdit *lineEdit1_1;
QLineEdit *lineEdit_1_2;
QLabel *label_1_1;
QLabel *label_1_2;
QComboBox *comboBox_1_1;
QLabel *label_1_4;
QGroupBox *groupBox_1_2;
QPushButton *pushButton_1_3;
QComboBox *comboBox_1_2;
QLabel *label_1_5;
QGroupBox *groupBox_1_3;
QPushButton *pushButton_1_4;
QLineEdit *lineEdit_1_3;
QLabel *label_1_3;
QWidget *tab_2;
QPushButton *pushButton_9;
QPushButton *pushButton_11;
QPushButton *pushButton_13;
QPushButton *pushButton_15;
QPushButton *pushButton_16;
QPushButton *pushButton_12;
QPushButton *pushButton_14;
QPushButton *pushButton_17;
QPushButton *pushButton_18;
QPushButton *pushButton_36;
QPushButton *pushButton_33;
QPushButton *pushButton_34;
QPushButton *pushButton_2_1;
QPushButton *pushButton_2_2;
QPushButton *pushButton_2_7;
QPushButton *pushButton_2_4;
QPushButton *pushButton_2_8;
QPushButton *pushButton_2_3;
QPushButton *pushButton_2_5;
QPushButton *pushButton_2_6;
QPushButton *pushButton_2_9;
QPushButton *pushButton_2_10;
QPushButton *pushButton_2_11;
QGroupBox *groupBox;
QComboBox *comboBox_2;
QPushButton *pushButton_2_12;
QLabel *label_2_1;
QWidget *tab_3;
QGroupBox *groupBox_6;
QPushButton *pushButton_39;
QPushButton *pushButton_14;
QPushButton *pushButton_10;
QPushButton *pushButton_9;
QLineEdit *lineEdit;
QPushButton *pushButton_8;
QPushButton *pushButton_6;
QPushButton *pushButton_7;
QPushButton *pushButton_35;
QPushButton *pushButton_5;
QPushButton *pushButton_23;
QPushButton *pushButton_25;
QPushButton *pushButton_42;
QPushButton *pushButton_15;
QPushButton *pushButton_16;
QPushButton *pushButton_17;
QPushButton *pushButton_18;
QPushButton *pushButton_19;
QPushButton *pushButton_20;
QPushButton *pushButton_21;
QPushButton *pushButton_22;
QGroupBox *groupBox_2;
QLineEdit *lineEdit_2;
QPushButton *pushButton_33;
QPushButton *pushButton_11;
QPushButton *pushButton_12;
QPushButton *pushButton_13;
QPushButton *pushButton_43;
QGroupBox *groupBox_3;
QComboBox *comboBox_3;
QPushButton *pushButton_25;
QGroupBox *groupBox_4;
QPushButton *pushButton_35;
QLineEdit *lineEdit_3;
QWidget *tab_4;
QPushButton *pushButton_4_1;
QPushButton *pushButton_4_2;
@ -110,126 +147,254 @@ public:
tab_1->setStyleSheet(QString::fromUtf8(""));
pushButton_1_1 = new QPushButton(tab_1);
pushButton_1_1->setObjectName("pushButton_1_1");
pushButton_1_1->setGeometry(QRect(40, 70, 100, 30));
pushButton_1_1->setGeometry(QRect(1020, 40, 100, 30));
pushButton_1_1->setStyleSheet(QString::fromUtf8(""));
groupBox_1_1 = new QGroupBox(tab_1);
groupBox_1_1->setObjectName("groupBox_1_1");
groupBox_1_1->setGeometry(QRect(200, 20, 281, 141));
groupBox_1_1->setGeometry(QRect(30, 20, 281, 191));
groupBox_1_1->setAlignment(Qt::AlignCenter);
pushButton_1_2 = new QPushButton(groupBox_1_1);
pushButton_1_2->setObjectName("pushButton_1_2");
pushButton_1_2->setGeometry(QRect(110, 110, 61, 30));
pushButton_1_2->setGeometry(QRect(80, 140, 121, 30));
pushButton_1_2->setStyleSheet(QString::fromUtf8(""));
lineEdit1_1 = new QLineEdit(groupBox_1_1);
lineEdit1_1->setObjectName("lineEdit1_1");
lineEdit1_1->setGeometry(QRect(140, 70, 113, 23));
lineEdit_1_2 = new QLineEdit(groupBox_1_1);
lineEdit_1_2->setObjectName("lineEdit_1_2");
lineEdit_1_2->setGeometry(QRect(140, 100, 113, 23));
label_1_1 = new QLabel(groupBox_1_1);
label_1_1->setObjectName("label_1_1");
label_1_1->setGeometry(QRect(40, 70, 81, 20));
label_1_2 = new QLabel(groupBox_1_1);
label_1_2->setObjectName("label_1_2");
label_1_2->setGeometry(QRect(40, 100, 81, 20));
comboBox_1_1 = new QComboBox(groupBox_1_1);
comboBox_1_1->setObjectName("comboBox_1_1");
comboBox_1_1->setGeometry(QRect(140, 40, 111, 23));
label_1_4 = new QLabel(groupBox_1_1);
label_1_4->setObjectName("label_1_4");
label_1_4->setGeometry(QRect(40, 40, 81, 20));
groupBox_1_2 = new QGroupBox(tab_1);
groupBox_1_2->setObjectName("groupBox_1_2");
groupBox_1_2->setGeometry(QRect(540, 20, 271, 141));
groupBox_1_2->setGeometry(QRect(370, 20, 271, 191));
groupBox_1_2->setAlignment(Qt::AlignCenter);
pushButton_1_3 = new QPushButton(groupBox_1_2);
pushButton_1_3->setObjectName("pushButton_1_3");
pushButton_1_3->setGeometry(QRect(110, 110, 61, 30));
pushButton_1_3->setGeometry(QRect(80, 140, 121, 30));
pushButton_1_3->setStyleSheet(QString::fromUtf8(""));
comboBox_1_2 = new QComboBox(groupBox_1_2);
comboBox_1_2->setObjectName("comboBox_1_2");
comboBox_1_2->setGeometry(QRect(30, 80, 211, 23));
label_1_5 = new QLabel(groupBox_1_2);
label_1_5->setObjectName("label_1_5");
label_1_5->setGeometry(QRect(30, 50, 101, 20));
groupBox_1_3 = new QGroupBox(tab_1);
groupBox_1_3->setObjectName("groupBox_1_3");
groupBox_1_3->setGeometry(QRect(870, 20, 261, 141));
groupBox_1_3->setGeometry(QRect(700, 20, 261, 191));
groupBox_1_3->setAlignment(Qt::AlignCenter);
pushButton_1_4 = new QPushButton(groupBox_1_3);
pushButton_1_4->setObjectName("pushButton_1_4");
pushButton_1_4->setGeometry(QRect(100, 110, 61, 30));
pushButton_1_4->setGeometry(QRect(110, 140, 61, 30));
pushButton_1_4->setStyleSheet(QString::fromUtf8(""));
lineEdit_1_3 = new QLineEdit(groupBox_1_3);
lineEdit_1_3->setObjectName("lineEdit_1_3");
lineEdit_1_3->setGeometry(QRect(70, 80, 121, 23));
label_1_3 = new QLabel(groupBox_1_3);
label_1_3->setObjectName("label_1_3");
label_1_3->setGeometry(QRect(70, 50, 81, 20));
tabWidget->addTab(tab_1, QString());
tab_2 = new QWidget();
tab_2->setObjectName("tab_2");
pushButton_9 = new QPushButton(tab_2);
pushButton_9->setObjectName("pushButton_9");
pushButton_9->setGeometry(QRect(30, 30, 100, 30));
pushButton_9->setStyleSheet(QString::fromUtf8(""));
pushButton_11 = new QPushButton(tab_2);
pushButton_11->setObjectName("pushButton_11");
pushButton_11->setGeometry(QRect(150, 30, 100, 30));
pushButton_11->setStyleSheet(QString::fromUtf8(""));
pushButton_13 = new QPushButton(tab_2);
pushButton_13->setObjectName("pushButton_13");
pushButton_13->setGeometry(QRect(630, 30, 100, 30));
pushButton_13->setStyleSheet(QString::fromUtf8(""));
pushButton_15 = new QPushButton(tab_2);
pushButton_15->setObjectName("pushButton_15");
pushButton_15->setGeometry(QRect(390, 30, 100, 30));
pushButton_15->setStyleSheet(QString::fromUtf8(""));
pushButton_16 = new QPushButton(tab_2);
pushButton_16->setObjectName("pushButton_16");
pushButton_16->setGeometry(QRect(510, 30, 100, 30));
pushButton_16->setStyleSheet(QString::fromUtf8(""));
pushButton_12 = new QPushButton(tab_2);
pushButton_12->setObjectName("pushButton_12");
pushButton_12->setGeometry(QRect(270, 30, 100, 30));
pushButton_12->setStyleSheet(QString::fromUtf8(""));
pushButton_14 = new QPushButton(tab_2);
pushButton_14->setObjectName("pushButton_14");
pushButton_14->setGeometry(QRect(750, 30, 100, 30));
pushButton_14->setStyleSheet(QString::fromUtf8(""));
pushButton_17 = new QPushButton(tab_2);
pushButton_17->setObjectName("pushButton_17");
pushButton_17->setGeometry(QRect(30, 110, 100, 30));
pushButton_17->setStyleSheet(QString::fromUtf8(""));
pushButton_18 = new QPushButton(tab_2);
pushButton_18->setObjectName("pushButton_18");
pushButton_18->setGeometry(QRect(150, 110, 100, 30));
pushButton_18->setStyleSheet(QString::fromUtf8(""));
pushButton_36 = new QPushButton(tab_2);
pushButton_36->setObjectName("pushButton_36");
pushButton_36->setGeometry(QRect(270, 110, 100, 30));
pushButton_36->setStyleSheet(QString::fromUtf8(""));
pushButton_33 = new QPushButton(tab_2);
pushButton_33->setObjectName("pushButton_33");
pushButton_33->setGeometry(QRect(390, 110, 100, 30));
pushButton_33->setStyleSheet(QString::fromUtf8(""));
pushButton_34 = new QPushButton(tab_2);
pushButton_34->setObjectName("pushButton_34");
pushButton_34->setGeometry(QRect(510, 110, 100, 30));
pushButton_34->setStyleSheet(QString::fromUtf8(""));
pushButton_2_1 = new QPushButton(tab_2);
pushButton_2_1->setObjectName("pushButton_2_1");
pushButton_2_1->setGeometry(QRect(30, 30, 100, 30));
pushButton_2_1->setStyleSheet(QString::fromUtf8(""));
pushButton_2_2 = new QPushButton(tab_2);
pushButton_2_2->setObjectName("pushButton_2_2");
pushButton_2_2->setGeometry(QRect(30, 80, 100, 30));
pushButton_2_2->setStyleSheet(QString::fromUtf8(""));
pushButton_2_7 = new QPushButton(tab_2);
pushButton_2_7->setObjectName("pushButton_2_7");
pushButton_2_7->setGeometry(QRect(170, 130, 100, 30));
pushButton_2_7->setStyleSheet(QString::fromUtf8(""));
pushButton_2_4 = new QPushButton(tab_2);
pushButton_2_4->setObjectName("pushButton_2_4");
pushButton_2_4->setGeometry(QRect(30, 180, 100, 30));
pushButton_2_4->setStyleSheet(QString::fromUtf8(""));
pushButton_2_8 = new QPushButton(tab_2);
pushButton_2_8->setObjectName("pushButton_2_8");
pushButton_2_8->setGeometry(QRect(170, 180, 100, 30));
pushButton_2_8->setStyleSheet(QString::fromUtf8(""));
pushButton_2_3 = new QPushButton(tab_2);
pushButton_2_3->setObjectName("pushButton_2_3");
pushButton_2_3->setGeometry(QRect(30, 130, 100, 30));
pushButton_2_3->setStyleSheet(QString::fromUtf8(""));
pushButton_2_5 = new QPushButton(tab_2);
pushButton_2_5->setObjectName("pushButton_2_5");
pushButton_2_5->setGeometry(QRect(170, 30, 100, 30));
pushButton_2_5->setStyleSheet(QString::fromUtf8(""));
pushButton_2_6 = new QPushButton(tab_2);
pushButton_2_6->setObjectName("pushButton_2_6");
pushButton_2_6->setGeometry(QRect(170, 80, 100, 30));
pushButton_2_6->setStyleSheet(QString::fromUtf8(""));
pushButton_2_9 = new QPushButton(tab_2);
pushButton_2_9->setObjectName("pushButton_2_9");
pushButton_2_9->setGeometry(QRect(310, 30, 100, 30));
pushButton_2_9->setStyleSheet(QString::fromUtf8(""));
pushButton_2_10 = new QPushButton(tab_2);
pushButton_2_10->setObjectName("pushButton_2_10");
pushButton_2_10->setGeometry(QRect(310, 80, 100, 30));
pushButton_2_10->setStyleSheet(QString::fromUtf8(""));
pushButton_2_11 = new QPushButton(tab_2);
pushButton_2_11->setObjectName("pushButton_2_11");
pushButton_2_11->setGeometry(QRect(310, 130, 100, 30));
pushButton_2_11->setStyleSheet(QString::fromUtf8(""));
groupBox = new QGroupBox(tab_2);
groupBox->setObjectName("groupBox");
groupBox->setGeometry(QRect(440, 10, 221, 201));
groupBox->setAlignment(Qt::AlignCenter);
comboBox_2 = new QComboBox(groupBox);
comboBox_2->setObjectName("comboBox_2");
comboBox_2->setGeometry(QRect(50, 80, 111, 23));
pushButton_2_12 = new QPushButton(groupBox);
pushButton_2_12->setObjectName("pushButton_2_12");
pushButton_2_12->setGeometry(QRect(50, 150, 111, 30));
pushButton_2_12->setStyleSheet(QString::fromUtf8(""));
label_2_1 = new QLabel(groupBox);
label_2_1->setObjectName("label_2_1");
label_2_1->setGeometry(QRect(52, 50, 131, 20));
tabWidget->addTab(tab_2, QString());
tab_3 = new QWidget();
tab_3->setObjectName("tab_3");
groupBox_6 = new QGroupBox(tab_3);
groupBox_6->setObjectName("groupBox_6");
groupBox_6->setGeometry(QRect(30, 10, 241, 151));
groupBox_6->setGeometry(QRect(10, 10, 261, 201));
groupBox_6->setAlignment(Qt::AlignCenter);
pushButton_39 = new QPushButton(groupBox_6);
pushButton_39->setObjectName("pushButton_39");
pushButton_39->setGeometry(QRect(70, 110, 100, 30));
pushButton_39->setGeometry(QRect(140, 140, 101, 30));
pushButton_39->setStyleSheet(QString::fromUtf8(""));
pushButton_14 = new QPushButton(groupBox_6);
pushButton_14->setObjectName("pushButton_14");
pushButton_14->setGeometry(QRect(20, 140, 100, 30));
pushButton_14->setStyleSheet(QString::fromUtf8(""));
pushButton_10 = new QPushButton(groupBox_6);
pushButton_10->setObjectName("pushButton_10");
pushButton_10->setGeometry(QRect(20, 90, 100, 30));
pushButton_10->setStyleSheet(QString::fromUtf8(""));
pushButton_9 = new QPushButton(groupBox_6);
pushButton_9->setObjectName("pushButton_9");
pushButton_9->setGeometry(QRect(20, 40, 100, 30));
pushButton_9->setStyleSheet(QString::fromUtf8(""));
lineEdit = new QLineEdit(groupBox_6);
lineEdit->setObjectName("lineEdit");
lineEdit->setGeometry(QRect(140, 90, 101, 31));
pushButton_8 = new QPushButton(tab_3);
pushButton_8->setObjectName("pushButton_8");
pushButton_8->setGeometry(QRect(400, 50, 100, 30));
pushButton_8->setGeometry(QRect(990, 100, 100, 30));
pushButton_8->setStyleSheet(QString::fromUtf8(""));
pushButton_6 = new QPushButton(tab_3);
pushButton_6->setObjectName("pushButton_6");
pushButton_6->setGeometry(QRect(400, 100, 100, 30));
pushButton_6->setGeometry(QRect(1110, 100, 100, 30));
pushButton_6->setStyleSheet(QString::fromUtf8(""));
pushButton_7 = new QPushButton(tab_3);
pushButton_7->setObjectName("pushButton_7");
pushButton_7->setGeometry(QRect(290, 50, 100, 30));
pushButton_7->setGeometry(QRect(990, 50, 100, 30));
pushButton_7->setStyleSheet(QString::fromUtf8(""));
pushButton_35 = new QPushButton(tab_3);
pushButton_35->setObjectName("pushButton_35");
pushButton_35->setGeometry(QRect(770, 110, 100, 30));
pushButton_35->setStyleSheet(QString::fromUtf8(""));
pushButton_5 = new QPushButton(tab_3);
pushButton_5->setObjectName("pushButton_5");
pushButton_5->setGeometry(QRect(290, 100, 100, 30));
pushButton_5->setGeometry(QRect(1110, 50, 100, 30));
pushButton_5->setStyleSheet(QString::fromUtf8(""));
pushButton_23 = new QPushButton(tab_3);
pushButton_23->setObjectName("pushButton_23");
pushButton_23->setGeometry(QRect(630, 110, 100, 30));
pushButton_23->setGeometry(QRect(1110, 150, 100, 30));
pushButton_23->setStyleSheet(QString::fromUtf8(""));
pushButton_25 = new QPushButton(tab_3);
pushButton_25->setObjectName("pushButton_25");
pushButton_25->setGeometry(QRect(900, 110, 100, 30));
pushButton_25->setStyleSheet(QString::fromUtf8(""));
pushButton_42 = new QPushButton(tab_3);
pushButton_42->setObjectName("pushButton_42");
pushButton_42->setGeometry(QRect(1030, 110, 100, 30));
pushButton_42->setGeometry(QRect(870, 150, 100, 30));
pushButton_42->setStyleSheet(QString::fromUtf8(""));
pushButton_15 = new QPushButton(tab_3);
pushButton_15->setObjectName("pushButton_15");
pushButton_15->setGeometry(QRect(750, 50, 100, 30));
pushButton_15->setStyleSheet(QString::fromUtf8(""));
pushButton_16 = new QPushButton(tab_3);
pushButton_16->setObjectName("pushButton_16");
pushButton_16->setGeometry(QRect(750, 100, 100, 30));
pushButton_16->setStyleSheet(QString::fromUtf8(""));
pushButton_17 = new QPushButton(tab_3);
pushButton_17->setObjectName("pushButton_17");
pushButton_17->setGeometry(QRect(870, 50, 100, 30));
pushButton_17->setStyleSheet(QString::fromUtf8(""));
pushButton_18 = new QPushButton(tab_3);
pushButton_18->setObjectName("pushButton_18");
pushButton_18->setGeometry(QRect(870, 100, 100, 30));
pushButton_18->setStyleSheet(QString::fromUtf8(""));
pushButton_19 = new QPushButton(tab_3);
pushButton_19->setObjectName("pushButton_19");
pushButton_19->setGeometry(QRect(630, 100, 100, 30));
pushButton_19->setStyleSheet(QString::fromUtf8(""));
pushButton_20 = new QPushButton(tab_3);
pushButton_20->setObjectName("pushButton_20");
pushButton_20->setGeometry(QRect(630, 50, 100, 30));
pushButton_20->setStyleSheet(QString::fromUtf8(""));
pushButton_21 = new QPushButton(tab_3);
pushButton_21->setObjectName("pushButton_21");
pushButton_21->setGeometry(QRect(630, 150, 100, 30));
pushButton_21->setStyleSheet(QString::fromUtf8(""));
pushButton_22 = new QPushButton(tab_3);
pushButton_22->setObjectName("pushButton_22");
pushButton_22->setGeometry(QRect(750, 150, 100, 30));
pushButton_22->setStyleSheet(QString::fromUtf8(""));
groupBox_2 = new QGroupBox(tab_3);
groupBox_2->setObjectName("groupBox_2");
groupBox_2->setGeometry(QRect(300, 10, 261, 201));
groupBox_2->setAlignment(Qt::AlignCenter);
lineEdit_2 = new QLineEdit(groupBox_2);
lineEdit_2->setObjectName("lineEdit_2");
lineEdit_2->setGeometry(QRect(140, 90, 101, 31));
pushButton_33 = new QPushButton(groupBox_2);
pushButton_33->setObjectName("pushButton_33");
pushButton_33->setGeometry(QRect(140, 140, 100, 30));
pushButton_33->setStyleSheet(QString::fromUtf8(""));
pushButton_11 = new QPushButton(groupBox_2);
pushButton_11->setObjectName("pushButton_11");
pushButton_11->setGeometry(QRect(20, 40, 100, 30));
pushButton_11->setStyleSheet(QString::fromUtf8(""));
pushButton_12 = new QPushButton(groupBox_2);
pushButton_12->setObjectName("pushButton_12");
pushButton_12->setGeometry(QRect(20, 90, 100, 30));
pushButton_12->setStyleSheet(QString::fromUtf8(""));
pushButton_13 = new QPushButton(groupBox_2);
pushButton_13->setObjectName("pushButton_13");
pushButton_13->setGeometry(QRect(20, 140, 100, 30));
pushButton_13->setStyleSheet(QString::fromUtf8(""));
pushButton_43 = new QPushButton(tab_3);
pushButton_43->setObjectName("pushButton_43");
pushButton_43->setGeometry(QRect(990, 150, 100, 30));
pushButton_43->setStyleSheet(QString::fromUtf8(""));
groupBox_3 = new QGroupBox(tab_3);
groupBox_3->setObjectName("groupBox_3");
groupBox_3->setGeometry(QRect(1220, 10, 120, 201));
groupBox_3->setAlignment(Qt::AlignCenter);
comboBox_3 = new QComboBox(groupBox_3);
comboBox_3->setObjectName("comboBox_3");
comboBox_3->setGeometry(QRect(11, 70, 101, 23));
pushButton_25 = new QPushButton(groupBox_3);
pushButton_25->setObjectName("pushButton_25");
pushButton_25->setGeometry(QRect(10, 150, 100, 30));
pushButton_25->setStyleSheet(QString::fromUtf8(""));
groupBox_4 = new QGroupBox(tab_3);
groupBox_4->setObjectName("groupBox_4");
groupBox_4->setGeometry(QRect(1360, 10, 120, 201));
groupBox_4->setAlignment(Qt::AlignCenter);
pushButton_35 = new QPushButton(groupBox_4);
pushButton_35->setObjectName("pushButton_35");
pushButton_35->setGeometry(QRect(10, 150, 100, 30));
pushButton_35->setStyleSheet(QString::fromUtf8(""));
lineEdit_3 = new QLineEdit(groupBox_4);
lineEdit_3->setObjectName("lineEdit_3");
lineEdit_3->setGeometry(QRect(10, 70, 101, 23));
tabWidget->addTab(tab_3, QString());
tab_4 = new QWidget();
tab_4->setObjectName("tab_4");
@ -391,37 +556,63 @@ public:
void retranslateUi(QWidget *GDDCdlg)
{
GDDCdlg->setWindowTitle(QCoreApplication::translate("GDDCdlg", "Form", nullptr));
pushButton_1_1->setText(QCoreApplication::translate("GDDCdlg", "\346\216\210\346\227\266", 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));
label_1_1->setText(QCoreApplication::translate("GDDCdlg", "\347\233\256\346\240\207\346\250\241\346\235\277\345\256\275\357\274\232", nullptr));
label_1_2->setText(QCoreApplication::translate("GDDCdlg", "\347\233\256\346\240\207\346\250\241\346\235\277\351\253\230\357\274\232", nullptr));
label_1_4->setText(QCoreApplication::translate("GDDCdlg", "\347\261\273\345\236\213\351\200\211\346\213\251\357\274\232", nullptr));
groupBox_1_2->setTitle(QCoreApplication::translate("GDDCdlg", "\350\247\206\351\242\221\346\230\276\347\244\272\346\250\241\345\274\217\350\256\276\347\275\256", nullptr));
pushButton_1_3->setText(QCoreApplication::translate("GDDCdlg", "\350\256\276\347\275\256", nullptr));
label_1_5->setText(QCoreApplication::translate("GDDCdlg", "\346\230\276\347\244\272\346\250\241\345\274\217\351\200\211\346\213\251\357\274\232", nullptr));
groupBox_1_3->setTitle(QCoreApplication::translate("GDDCdlg", "IP\350\256\276\347\275\256", nullptr));
pushButton_1_4->setText(QCoreApplication::translate("GDDCdlg", "\350\256\276\347\275\256", nullptr));
label_1_3->setText(QCoreApplication::translate("GDDCdlg", "\345\205\211\347\224\265\345\220\212\350\210\261IP:", nullptr));
tabWidget->setTabText(tabWidget->indexOf(tab_1), QCoreApplication::translate("GDDCdlg", "\347\263\273\347\273\237\346\216\247\345\210\266", nullptr));
pushButton_9->setText(QCoreApplication::translate("GDDCdlg", "\345\233\276\345\203\217\345\210\207\346\215\242", nullptr));
pushButton_11->setText(QCoreApplication::translate("GDDCdlg", "\346\212\223\345\233\276", nullptr));
pushButton_13->setText(QCoreApplication::translate("GDDCdlg", "\345\274\200\345\247\213\345\275\225\345\203\217", nullptr));
pushButton_15->setText(QCoreApplication::translate("GDDCdlg", "\345\201\234\346\255\242\350\277\236\347\273\255\346\212\223\345\233\276", nullptr));
pushButton_16->setText(QCoreApplication::translate("GDDCdlg", "\345\201\234\346\255\242\345\275\225\345\203\217", nullptr));
pushButton_12->setText(QCoreApplication::translate("GDDCdlg", "\345\274\200\345\247\213\350\277\236\347\273\255\346\212\223\345\233\276", nullptr));
pushButton_14->setText(QCoreApplication::translate("GDDCdlg", "\345\255\227\347\254\246\345\217\240\345\212\240", nullptr));
pushButton_17->setText(QCoreApplication::translate("GDDCdlg", "\351\200\211\347\202\271\350\267\237\350\270\252", nullptr));
pushButton_18->setText(QCoreApplication::translate("GDDCdlg", "\345\217\226\346\266\210\350\267\237\350\270\252", nullptr));
pushButton_36->setText(QCoreApplication::translate("GDDCdlg", "\345\215\225\346\254\241\346\265\213\350\267\235", nullptr));
pushButton_33->setText(QCoreApplication::translate("GDDCdlg", "\345\274\200\345\220\257\350\277\236\347\273\255\346\265\213\350\267\235", nullptr));
pushButton_34->setText(QCoreApplication::translate("GDDCdlg", "\345\201\234\346\255\242\350\277\236\347\273\255\346\265\213\350\267\235", nullptr));
pushButton_2_1->setText(QCoreApplication::translate("GDDCdlg", "\345\233\276\345\203\217\345\210\207\346\215\242", nullptr));
pushButton_2_2->setText(QCoreApplication::translate("GDDCdlg", "\346\212\223\345\233\276", nullptr));
pushButton_2_7->setText(QCoreApplication::translate("GDDCdlg", "\345\274\200\345\247\213\345\275\225\345\203\217", nullptr));
pushButton_2_4->setText(QCoreApplication::translate("GDDCdlg", "\345\201\234\346\255\242\350\277\236\347\273\255\346\212\223\345\233\276", nullptr));
pushButton_2_8->setText(QCoreApplication::translate("GDDCdlg", "\345\201\234\346\255\242\345\275\225\345\203\217", nullptr));
pushButton_2_3->setText(QCoreApplication::translate("GDDCdlg", "\345\274\200\345\247\213\350\277\236\347\273\255\346\212\223\345\233\276", nullptr));
pushButton_2_5->setText(QCoreApplication::translate("GDDCdlg", "\351\200\211\347\202\271\350\267\237\350\270\252", nullptr));
pushButton_2_6->setText(QCoreApplication::translate("GDDCdlg", "\345\217\226\346\266\210\350\267\237\350\270\252", nullptr));
pushButton_2_9->setText(QCoreApplication::translate("GDDCdlg", "\345\215\225\346\254\241\346\265\213\350\267\235", nullptr));
pushButton_2_10->setText(QCoreApplication::translate("GDDCdlg", "\345\274\200\345\220\257\350\277\236\347\273\255\346\265\213\350\267\235", nullptr));
pushButton_2_11->setText(QCoreApplication::translate("GDDCdlg", "\345\201\234\346\255\242\350\277\236\347\273\255\346\265\213\350\267\235", nullptr));
groupBox->setTitle(QCoreApplication::translate("GDDCdlg", "\345\255\227\347\254\246\345\217\240\345\212\240\350\256\276\347\275\256", nullptr));
pushButton_2_12->setText(QCoreApplication::translate("GDDCdlg", "\350\256\276\347\275\256", nullptr));
label_2_1->setText(QCoreApplication::translate("GDDCdlg", "OSD\347\261\273\345\236\213\351\200\211\346\213\251\357\274\232", nullptr));
tabWidget->setTabText(tabWidget->indexOf(tab_2), QCoreApplication::translate("GDDCdlg", "\350\275\275\350\215\267\345\205\254\347\224\250", nullptr));
groupBox_6->setTitle(QCoreApplication::translate("GDDCdlg", "\345\217\257\350\247\201\345\205\211\347\233\270\346\234\272\350\256\276\347\275\256", nullptr));
groupBox_6->setTitle(QCoreApplication::translate("GDDCdlg", "\344\272\256\345\272\246\350\256\276\347\275\256", nullptr));
pushButton_39->setText(QCoreApplication::translate("GDDCdlg", "\350\256\276\347\275\256", nullptr));
pushButton_14->setText(QCoreApplication::translate("GDDCdlg", "\350\207\252\345\212\250\344\272\256\345\272\246", nullptr));
pushButton_10->setText(QCoreApplication::translate("GDDCdlg", "\344\272\256\345\272\246-", nullptr));
pushButton_9->setText(QCoreApplication::translate("GDDCdlg", "\344\272\256\345\272\246+", nullptr));
pushButton_8->setText(QCoreApplication::translate("GDDCdlg", "\345\217\230\345\200\215-", nullptr));
pushButton_6->setText(QCoreApplication::translate("GDDCdlg", "\347\204\246\350\267\235-", nullptr));
pushButton_7->setText(QCoreApplication::translate("GDDCdlg", "\345\217\230\345\200\215+", nullptr));
pushButton_35->setText(QCoreApplication::translate("GDDCdlg", "\347\204\246\350\267\235\350\256\276\347\275\256", nullptr));
pushButton_5->setText(QCoreApplication::translate("GDDCdlg", "\347\204\246\350\267\235+", nullptr));
pushButton_23->setText(QCoreApplication::translate("GDDCdlg", "\344\275\216\347\205\247\345\272\246\346\250\241\345\274\217", nullptr));
pushButton_42->setText(QCoreApplication::translate("GDDCdlg", "\346\201\242\345\244\215\345\207\272\345\234\272\350\256\276\347\275\256", nullptr));
pushButton_15->setText(QCoreApplication::translate("GDDCdlg", "\350\207\252\345\212\250ICR\345\274\200", nullptr));
pushButton_16->setText(QCoreApplication::translate("GDDCdlg", "\350\207\252\345\212\250ICR\345\205\263", nullptr));
pushButton_17->setText(QCoreApplication::translate("GDDCdlg", "\347\224\265\345\255\220\347\250\263\345\203\217\345\274\200", nullptr));
pushButton_18->setText(QCoreApplication::translate("GDDCdlg", "\347\224\265\345\255\220\347\250\263\345\203\217\345\205\263", nullptr));
pushButton_19->setText(QCoreApplication::translate("GDDCdlg", "\345\242\236\347\233\212-", nullptr));
pushButton_20->setText(QCoreApplication::translate("GDDCdlg", "\345\242\236\347\233\212+", nullptr));
pushButton_21->setText(QCoreApplication::translate("GDDCdlg", "\350\207\252\345\212\250\345\242\236\347\233\212", nullptr));
pushButton_22->setText(QCoreApplication::translate("GDDCdlg", "\345\217\257\350\247\201\345\205\211\351\225\234\345\244\264\345\210\235\345\247\213\345\214\226", nullptr));
groupBox_2->setTitle(QCoreApplication::translate("GDDCdlg", "\345\257\271\346\257\224\345\272\246\350\256\276\347\275\256", nullptr));
pushButton_33->setText(QCoreApplication::translate("GDDCdlg", "\350\256\276\347\275\256", nullptr));
pushButton_11->setText(QCoreApplication::translate("GDDCdlg", "\345\257\271\346\257\224\345\272\246+", nullptr));
pushButton_12->setText(QCoreApplication::translate("GDDCdlg", "\345\257\271\346\257\224\345\272\246-", nullptr));
pushButton_13->setText(QCoreApplication::translate("GDDCdlg", "\350\207\252\345\212\250\345\257\271\346\257\224\345\272\246", nullptr));
pushButton_43->setText(QCoreApplication::translate("GDDCdlg", "\346\201\242\345\244\215\351\273\230\350\256\244", nullptr));
groupBox_3->setTitle(QCoreApplication::translate("GDDCdlg", "\351\200\217\351\233\276\346\250\241\345\274\217\350\256\276\347\275\256", nullptr));
pushButton_25->setText(QCoreApplication::translate("GDDCdlg", "\351\200\217\351\233\276\346\250\241\345\274\217", nullptr));
pushButton_42->setText(QCoreApplication::translate("GDDCdlg", "\345\257\271\346\257\224\345\272\246\350\256\276\347\275\256", nullptr));
groupBox_4->setTitle(QCoreApplication::translate("GDDCdlg", "\347\204\246\350\267\235\350\256\276\347\275\256", nullptr));
pushButton_35->setText(QCoreApplication::translate("GDDCdlg", "\347\204\246\350\267\235\350\256\276\347\275\256", nullptr));
tabWidget->setTabText(tabWidget->indexOf(tab_3), QCoreApplication::translate("GDDCdlg", "\345\217\257\350\247\201\345\205\211", nullptr));
pushButton_4_1->setText(QCoreApplication::translate("GDDCdlg", "\347\272\242\345\244\226\350\260\203\347\204\246", nullptr));
pushButton_4_2->setText(QCoreApplication::translate("GDDCdlg", "\350\247\202\346\265\213\346\250\241\345\274\217", nullptr));

@ -28,7 +28,7 @@ public:
QHBoxLayout *horizontalLayout_2;
QPushButton *pushButton_2;
QGroupBox *groupBox_3;
QWidget *widget;
QWidget *layoutWidget;
QHBoxLayout *horizontalLayout;
QPushButton *pushButton;
QSpacerItem *horizontalSpacer;
@ -51,7 +51,7 @@ public:
{
if (HomePageDlg->objectName().isEmpty())
HomePageDlg->setObjectName("HomePageDlg");
HomePageDlg->resize(839, 682);
HomePageDlg->resize(942, 470);
verticalLayout_2 = new QVBoxLayout(HomePageDlg);
verticalLayout_2->setObjectName("verticalLayout_2");
groupBox_4 = new QGroupBox(HomePageDlg);
@ -68,13 +68,13 @@ public:
groupBox_3 = new QGroupBox(HomePageDlg);
groupBox_3->setObjectName("groupBox_3");
widget = new QWidget(groupBox_3);
widget->setObjectName("widget");
widget->setGeometry(QRect(50, 30, 731, 71));
horizontalLayout = new QHBoxLayout(widget);
layoutWidget = new QWidget(groupBox_3);
layoutWidget->setObjectName("layoutWidget");
layoutWidget->setGeometry(QRect(50, 30, 731, 71));
horizontalLayout = new QHBoxLayout(layoutWidget);
horizontalLayout->setObjectName("horizontalLayout");
horizontalLayout->setContentsMargins(0, 0, 0, 0);
pushButton = new QPushButton(widget);
pushButton = new QPushButton(layoutWidget);
pushButton->setObjectName("pushButton");
horizontalLayout->addWidget(pushButton);
@ -83,7 +83,7 @@ public:
horizontalLayout->addItem(horizontalSpacer);
pushButton_8 = new QPushButton(widget);
pushButton_8 = new QPushButton(layoutWidget);
pushButton_8->setObjectName("pushButton_8");
horizontalLayout->addWidget(pushButton_8);
@ -92,7 +92,7 @@ public:
horizontalLayout->addItem(horizontalSpacer_2);
pushButton_12 = new QPushButton(widget);
pushButton_12 = new QPushButton(layoutWidget);
pushButton_12->setObjectName("pushButton_12");
horizontalLayout->addWidget(pushButton_12);

@ -40,8 +40,20 @@ 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;
@ -50,9 +62,13 @@ public:
QPushButton *pushButton_6;
QPushButton *pushButton_7;
QPushButton *pushButton_8;
<<<<<<< HEAD
QSpacerItem *verticalSpacer;
QSpacerItem *horizontalSpacer;
QVBoxLayout *webView;
=======
QSpacerItem *verticalSpacer_2;
>>>>>>> cyh
QStatusBar *statusbar;
QMenuBar *menuBar;
@ -60,7 +76,11 @@ public:
{
if (MainWindow->objectName().isEmpty())
MainWindow->setObjectName("MainWindow");
<<<<<<< HEAD
MainWindow->resize(1462, 953);
=======
MainWindow->resize(862, 534);
>>>>>>> cyh
QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
@ -145,11 +165,74 @@ 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");
@ -242,21 +325,30 @@ 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
horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
<<<<<<< HEAD
gridLayout->addItem(horizontalSpacer, 6, 2, 1, 1);
webView = new QVBoxLayout();
webView->setObjectName("webView");
gridLayout->addLayout(webView, 5, 2, 1, 2);
=======
gridLayout->addLayout(verticalLayout, 1, 1, 1, 1);
>>>>>>> cyh
MainWindow->setCentralWidget(centralwidget);
statusbar = new QStatusBar(MainWindow);
@ -266,7 +358,11 @@ public:
MainWindow->setStatusBar(statusbar);
menuBar = new QMenuBar(MainWindow);
menuBar->setObjectName("menuBar");
<<<<<<< HEAD
menuBar->setGeometry(QRect(0, 0, 1462, 25));
=======
menuBar->setGeometry(QRect(0, 0, 862, 20));
>>>>>>> cyh
MainWindow->setMenuBar(menuBar);
retranslateUi(MainWindow);

@ -47,8 +47,8 @@
<widget class="QPushButton" name="pushButton_1_1">
<property name="geometry">
<rect>
<x>40</x>
<y>70</y>
<x>1020</x>
<y>40</y>
<width>100</width>
<height>30</height>
</rect>
@ -57,16 +57,16 @@
<string notr="true"/>
</property>
<property name="text">
<string>授时</string>
<string>吊舱时间更新</string>
</property>
</widget>
<widget class="QGroupBox" name="groupBox_1_1">
<property name="geometry">
<rect>
<x>200</x>
<x>30</x>
<y>20</y>
<width>281</width>
<height>141</height>
<height>191</height>
</rect>
</property>
<property name="title">
@ -78,9 +78,9 @@
<widget class="QPushButton" name="pushButton_1_2">
<property name="geometry">
<rect>
<x>110</x>
<y>110</y>
<width>61</width>
<x>80</x>
<y>140</y>
<width>121</width>
<height>30</height>
</rect>
</property>
@ -91,14 +91,83 @@
<string>设置</string>
</property>
</widget>
<widget class="QLineEdit" name="lineEdit1_1">
<property name="geometry">
<rect>
<x>140</x>
<y>70</y>
<width>113</width>
<height>23</height>
</rect>
</property>
</widget>
<widget class="QLineEdit" name="lineEdit_1_2">
<property name="geometry">
<rect>
<x>140</x>
<y>100</y>
<width>113</width>
<height>23</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_1_1">
<property name="geometry">
<rect>
<x>40</x>
<y>70</y>
<width>81</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>目标模板宽:</string>
</property>
</widget>
<widget class="QLabel" name="label_1_2">
<property name="geometry">
<rect>
<x>40</x>
<y>100</y>
<width>81</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>目标模板高:</string>
</property>
</widget>
<widget class="QComboBox" name="comboBox_1_1">
<property name="geometry">
<rect>
<x>140</x>
<y>40</y>
<width>111</width>
<height>23</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_1_4">
<property name="geometry">
<rect>
<x>40</x>
<y>40</y>
<width>81</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>类型选择:</string>
</property>
</widget>
</widget>
<widget class="QGroupBox" name="groupBox_1_2">
<property name="geometry">
<rect>
<x>540</x>
<x>370</x>
<y>20</y>
<width>271</width>
<height>141</height>
<height>191</height>
</rect>
</property>
<property name="title">
@ -110,9 +179,9 @@
<widget class="QPushButton" name="pushButton_1_3">
<property name="geometry">
<rect>
<x>110</x>
<y>110</y>
<width>61</width>
<x>80</x>
<y>140</y>
<width>121</width>
<height>30</height>
</rect>
</property>
@ -123,14 +192,37 @@
<string>设置</string>
</property>
</widget>
<widget class="QComboBox" name="comboBox_1_2">
<property name="geometry">
<rect>
<x>30</x>
<y>80</y>
<width>211</width>
<height>23</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_1_5">
<property name="geometry">
<rect>
<x>30</x>
<y>50</y>
<width>101</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>显示模式选择:</string>
</property>
</widget>
</widget>
<widget class="QGroupBox" name="groupBox_1_3">
<property name="geometry">
<rect>
<x>870</x>
<x>700</x>
<y>20</y>
<width>261</width>
<height>141</height>
<height>191</height>
</rect>
</property>
<property name="title">
@ -142,8 +234,8 @@
<widget class="QPushButton" name="pushButton_1_4">
<property name="geometry">
<rect>
<x>100</x>
<y>110</y>
<x>110</x>
<y>140</y>
<width>61</width>
<height>30</height>
</rect>
@ -155,13 +247,36 @@
<string>设置</string>
</property>
</widget>
<widget class="QLineEdit" name="lineEdit_1_3">
<property name="geometry">
<rect>
<x>70</x>
<y>80</y>
<width>121</width>
<height>23</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_1_3">
<property name="geometry">
<rect>
<x>70</x>
<y>50</y>
<width>81</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>光电吊舱IP:</string>
</property>
</widget>
</widget>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>载荷公用</string>
</attribute>
<widget class="QPushButton" name="pushButton_9">
<widget class="QPushButton" name="pushButton_2_1">
<property name="geometry">
<rect>
<x>30</x>
@ -177,11 +292,11 @@
<string>图像切换</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_11">
<widget class="QPushButton" name="pushButton_2_2">
<property name="geometry">
<rect>
<x>150</x>
<y>30</y>
<x>30</x>
<y>80</y>
<width>100</width>
<height>30</height>
</rect>
@ -193,11 +308,11 @@
<string>抓图</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_13">
<widget class="QPushButton" name="pushButton_2_7">
<property name="geometry">
<rect>
<x>630</x>
<y>30</y>
<x>170</x>
<y>130</y>
<width>100</width>
<height>30</height>
</rect>
@ -209,11 +324,11 @@
<string>开始录像</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_15">
<widget class="QPushButton" name="pushButton_2_4">
<property name="geometry">
<rect>
<x>390</x>
<y>30</y>
<x>30</x>
<y>180</y>
<width>100</width>
<height>30</height>
</rect>
@ -225,11 +340,11 @@
<string>停止连续抓图</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_16">
<widget class="QPushButton" name="pushButton_2_8">
<property name="geometry">
<rect>
<x>510</x>
<y>30</y>
<x>170</x>
<y>180</y>
<width>100</width>
<height>30</height>
</rect>
@ -241,11 +356,11 @@
<string>停止录像</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_12">
<widget class="QPushButton" name="pushButton_2_3">
<property name="geometry">
<rect>
<x>270</x>
<y>30</y>
<x>30</x>
<y>130</y>
<width>100</width>
<height>30</height>
</rect>
@ -257,10 +372,10 @@
<string>开始连续抓图</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_14">
<widget class="QPushButton" name="pushButton_2_5">
<property name="geometry">
<rect>
<x>750</x>
<x>170</x>
<y>30</y>
<width>100</width>
<height>30</height>
@ -270,14 +385,14 @@
<string notr="true"/>
</property>
<property name="text">
<string>字符叠加</string>
<string>选点跟踪</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_17">
<widget class="QPushButton" name="pushButton_2_6">
<property name="geometry">
<rect>
<x>30</x>
<y>110</y>
<x>170</x>
<y>80</y>
<width>100</width>
<height>30</height>
</rect>
@ -286,14 +401,14 @@
<string notr="true"/>
</property>
<property name="text">
<string>选点跟踪</string>
<string>取消跟踪</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_18">
<widget class="QPushButton" name="pushButton_2_9">
<property name="geometry">
<rect>
<x>150</x>
<y>110</y>
<x>310</x>
<y>30</y>
<width>100</width>
<height>30</height>
</rect>
@ -302,14 +417,14 @@
<string notr="true"/>
</property>
<property name="text">
<string>取消跟踪</string>
<string>单次测距</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_36">
<widget class="QPushButton" name="pushButton_2_10">
<property name="geometry">
<rect>
<x>270</x>
<y>110</y>
<x>310</x>
<y>80</y>
<width>100</width>
<height>30</height>
</rect>
@ -318,14 +433,14 @@
<string notr="true"/>
</property>
<property name="text">
<string>单次测距</string>
<string>开启连续测距</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_33">
<widget class="QPushButton" name="pushButton_2_11">
<property name="geometry">
<rect>
<x>390</x>
<y>110</y>
<x>310</x>
<y>130</y>
<width>100</width>
<height>30</height>
</rect>
@ -334,15 +449,40 @@
<string notr="true"/>
</property>
<property name="text">
<string>开启连续测距</string>
<string>停止连续测距</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_34">
<widget class="QGroupBox" name="groupBox">
<property name="geometry">
<rect>
<x>510</x>
<y>110</y>
<width>100</width>
<x>440</x>
<y>10</y>
<width>221</width>
<height>201</height>
</rect>
</property>
<property name="title">
<string>字符叠加设置</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<widget class="QComboBox" name="comboBox_2">
<property name="geometry">
<rect>
<x>50</x>
<y>80</y>
<width>111</width>
<height>23</height>
</rect>
</property>
</widget>
<widget class="QPushButton" name="pushButton_2_12">
<property name="geometry">
<rect>
<x>50</x>
<y>150</y>
<width>111</width>
<height>30</height>
</rect>
</property>
@ -350,10 +490,24 @@
<string notr="true"/>
</property>
<property name="text">
<string>停止连续测距</string>
<string>设置</string>
</property>
</widget>
<widget class="QLabel" name="label_2_1">
<property name="geometry">
<rect>
<x>52</x>
<y>50</y>
<width>131</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>OSD类型选择</string>
</property>
</widget>
</widget>
</widget>
<widget class="QWidget" name="tab_3">
<attribute name="title">
<string>可见光</string>
@ -361,14 +515,14 @@
<widget class="QGroupBox" name="groupBox_6">
<property name="geometry">
<rect>
<x>30</x>
<x>10</x>
<y>10</y>
<width>241</width>
<height>151</height>
<width>261</width>
<height>201</height>
</rect>
</property>
<property name="title">
<string>可见光相机设置</string>
<string>亮度设置</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@ -376,9 +530,9 @@
<widget class="QPushButton" name="pushButton_39">
<property name="geometry">
<rect>
<x>70</x>
<y>110</y>
<width>100</width>
<x>140</x>
<y>140</y>
<width>101</width>
<height>30</height>
</rect>
</property>
@ -389,12 +543,70 @@
<string>设置</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_14">
<property name="geometry">
<rect>
<x>20</x>
<y>140</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>自动亮度</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_10">
<property name="geometry">
<rect>
<x>20</x>
<y>90</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>亮度-</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_9">
<property name="geometry">
<rect>
<x>20</x>
<y>40</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>亮度+</string>
</property>
</widget>
<widget class="QLineEdit" name="lineEdit">
<property name="geometry">
<rect>
<x>140</x>
<y>90</y>
<width>101</width>
<height>31</height>
</rect>
</property>
</widget>
</widget>
<widget class="QPushButton" name="pushButton_8">
<property name="geometry">
<rect>
<x>400</x>
<y>50</y>
<x>990</x>
<y>100</y>
<width>100</width>
<height>30</height>
</rect>
@ -409,7 +621,7 @@
<widget class="QPushButton" name="pushButton_6">
<property name="geometry">
<rect>
<x>400</x>
<x>1110</x>
<y>100</y>
<width>100</width>
<height>30</height>
@ -425,7 +637,7 @@
<widget class="QPushButton" name="pushButton_7">
<property name="geometry">
<rect>
<x>290</x>
<x>990</x>
<y>50</y>
<width>100</width>
<height>30</height>
@ -438,11 +650,11 @@
<string>变倍+</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_35">
<widget class="QPushButton" name="pushButton_5">
<property name="geometry">
<rect>
<x>770</x>
<y>110</y>
<x>1110</x>
<y>50</y>
<width>100</width>
<height>30</height>
</rect>
@ -451,13 +663,61 @@
<string notr="true"/>
</property>
<property name="text">
<string>焦距设置</string>
<string>焦距+</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_5">
<widget class="QPushButton" name="pushButton_23">
<property name="geometry">
<rect>
<x>1110</x>
<y>150</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>低照度模式</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_42">
<property name="geometry">
<rect>
<x>870</x>
<y>150</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>恢复出场设置</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_15">
<property name="geometry">
<rect>
<x>750</x>
<y>50</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>自动ICR开</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_16">
<property name="geometry">
<rect>
<x>290</x>
<x>750</x>
<y>100</y>
<width>100</width>
<height>30</height>
@ -467,14 +727,46 @@
<string notr="true"/>
</property>
<property name="text">
<string>焦距+</string>
<string>自动ICR关</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_23">
<widget class="QPushButton" name="pushButton_17">
<property name="geometry">
<rect>
<x>870</x>
<y>50</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>电子稳像开</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_18">
<property name="geometry">
<rect>
<x>870</x>
<y>100</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>电子稳像关</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_19">
<property name="geometry">
<rect>
<x>630</x>
<y>110</y>
<y>100</y>
<width>100</width>
<height>30</height>
</rect>
@ -483,14 +775,193 @@
<string notr="true"/>
</property>
<property name="text">
<string>低照度模式</string>
<string>增益-</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_20">
<property name="geometry">
<rect>
<x>630</x>
<y>50</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>增益+</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_21">
<property name="geometry">
<rect>
<x>630</x>
<y>150</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>自动增益</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_22">
<property name="geometry">
<rect>
<x>750</x>
<y>150</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>可见光镜头初始化</string>
</property>
</widget>
<widget class="QGroupBox" name="groupBox_2">
<property name="geometry">
<rect>
<x>300</x>
<y>10</y>
<width>261</width>
<height>201</height>
</rect>
</property>
<property name="title">
<string>对比度设置</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<widget class="QLineEdit" name="lineEdit_2">
<property name="geometry">
<rect>
<x>140</x>
<y>90</y>
<width>101</width>
<height>31</height>
</rect>
</property>
</widget>
<widget class="QPushButton" name="pushButton_33">
<property name="geometry">
<rect>
<x>140</x>
<y>140</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>设置</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_11">
<property name="geometry">
<rect>
<x>20</x>
<y>40</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>对比度+</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_12">
<property name="geometry">
<rect>
<x>20</x>
<y>90</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>对比度-</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_13">
<property name="geometry">
<rect>
<x>20</x>
<y>140</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>自动对比度</string>
</property>
</widget>
</widget>
<widget class="QPushButton" name="pushButton_43">
<property name="geometry">
<rect>
<x>990</x>
<y>150</y>
<width>100</width>
<height>30</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>恢复默认</string>
</property>
</widget>
<widget class="QGroupBox" name="groupBox_3">
<property name="geometry">
<rect>
<x>1220</x>
<y>10</y>
<width>120</width>
<height>201</height>
</rect>
</property>
<property name="title">
<string>透雾模式设置</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<widget class="QComboBox" name="comboBox_3">
<property name="geometry">
<rect>
<x>11</x>
<y>70</y>
<width>101</width>
<height>23</height>
</rect>
</property>
</widget>
<widget class="QPushButton" name="pushButton_25">
<property name="geometry">
<rect>
<x>900</x>
<y>110</y>
<x>10</x>
<y>150</y>
<width>100</width>
<height>30</height>
</rect>
@ -502,11 +973,27 @@
<string>透雾模式</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_42">
</widget>
<widget class="QGroupBox" name="groupBox_4">
<property name="geometry">
<rect>
<x>1030</x>
<y>110</y>
<x>1360</x>
<y>10</y>
<width>120</width>
<height>201</height>
</rect>
</property>
<property name="title">
<string>焦距设置</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<widget class="QPushButton" name="pushButton_35">
<property name="geometry">
<rect>
<x>10</x>
<y>150</y>
<width>100</width>
<height>30</height>
</rect>
@ -515,9 +1002,20 @@
<string notr="true"/>
</property>
<property name="text">
<string>对比度设置</string>
<string>焦距设置</string>
</property>
</widget>
<widget class="QLineEdit" name="lineEdit_3">
<property name="geometry">
<rect>
<x>10</x>
<y>70</y>
<width>101</width>
<height>23</height>
</rect>
</property>
</widget>
</widget>
</widget>
<widget class="QWidget" name="tab_4">
<attribute name="title">

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>839</width>
<height>682</height>
<width>942</width>
<height>470</height>
</rect>
</property>
<property name="windowTitle">
@ -35,7 +35,7 @@
<property name="title">
<string>GroupBox</string>
</property>
<widget class="QWidget" name="">
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>50</x>

@ -21,10 +21,6 @@ MainWindow::MainWindow(QWidget *parent)
// initMenuBar();
initToolBar();
m_GDDCdlg = new GDDCdlg(this);
m_HomePagedlg = new HomePageDlg(this);
mWeb = new CWebEngineView();
mWeb->setPage(new CustomWebEnginePage());
// mWeb = new QWebEngineView(this);
@ -33,7 +29,6 @@ MainWindow::MainWindow(QWidget *parent)
ui->webView->addWidget(m_HomePagedlg);
// connect(ui->toolbar_action1,&QAction::triggered,this,[this](){
// qDebug("1111");
// //m_GDDCdlg->setWindowModality(Qt::ApplicationModal); //设置模态窗口,即窗口没关闭不允许其他操作
@ -87,6 +82,9 @@ void MainWindow::initWindow()
this->setPalette(palette);
this->setWindowTitle("载荷应用软件");
this->resize(1920,1080);
m_GDDCdlg = new GDDCdlg(this);
m_HomePagedlg = new HomePageDlg(this);
}
void MainWindow::initButton()
{
@ -213,9 +211,11 @@ void MainWindow::on_pushButton_clicked()
{
m_HomePagedlg->move(130,80);
m_HomePagedlg->show(); //显示窗口
//m_HomePagedlg->showFullScreen();
//m_HomePagedlg->showMaximized();
m_GDDCdlg->hide();
m_HomePagedlg->setWindowFlags(Qt::CustomizeWindowHint|Qt::FramelessWindowHint);
//m_HomePagedlg->setWindowFlags(Qt::CustomizeWindowHint|Qt::FramelessWindowHint);
}
//光电吊舱
void MainWindow::on_pushButton_2_clicked()

@ -42,10 +42,130 @@
<enum>Qt::NoContextMenu</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="5" column="1">
<item row="0" column="1">
<layout class="QVBoxLayout" name="verticalLayout_2"/>
</item>
<item row="0" column="4">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_9">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="contextMenuPolicy">
<enum>Qt::DefaultContextMenu</enum>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="mainwindow.qrc">
<normaloff>:/res/Help.png</normaloff>:/res/Help.png</iconset>
</property>
<property name="iconSize">
<size>
<width>25</width>
<height>25</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_10">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="contextMenuPolicy">
<enum>Qt::DefaultContextMenu</enum>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="mainwindow.qrc">
<normaloff>:/res/setting.png</normaloff>:/res/setting.png</iconset>
</property>
<property name="iconSize">
<size>
<width>25</width>
<height>25</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_11">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="contextMenuPolicy">
<enum>Qt::DefaultContextMenu</enum>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="mainwindow.qrc">
<normaloff>:/res/Sign.png</normaloff>:/res/Sign.png</iconset>
</property>
<property name="iconSize">
<size>
<width>25</width>
<height>25</height>
</size>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="4">
<widget class="QWidget" name="widget" native="true">
<property name="styleSheet">
<string notr="true">background-color: rgb(85, 170, 255);</string>
</property>
</widget>
</item>
<item row="1" column="1">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<spacer name="verticalSpacer_2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
@ -290,7 +410,7 @@
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>

@ -15,9 +15,12 @@ QPushButton{
font: 12pt "Microsoft YaHei UI";
}
QGroupBox{
color:rgb(255,255,255);
color:rgb(153,255,153);
font-family:Consolas;
font-size:12pt;
}
/*设置TabWidget中tab_1的样式*/
#tab_1.QWidget{
background-color: rgb(0, 0, 0);
@ -80,3 +83,10 @@ QTabBar QToolButton:hover {
}
/*QLabel设置*/
QLabel{
color: rgb(255, 255, 255);
font-family:Consolas;
font-size:11pt;
}

Loading…
Cancel
Save