From df3ef2bb7b0f32f90cee575a08ee99eaa9afb53b Mon Sep 17 00:00:00 2001
From: cbwu <504-wuchengbo@htsdfp.com>
Date: Mon, 19 Aug 2024 14:55:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8B=8D=E7=85=A7=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E9=97=B4=E9=9A=94=E6=9C=80=E5=A4=A7=E8=AE=BE=E7=BD=AE=E4=B8=BA?=
 =?UTF-8?q?25s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Src/ModelCamera/modelcameradlg.ui | 11 +++++++----
 mainwindow.ui                     | 16 +++++++++++-----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Src/ModelCamera/modelcameradlg.ui b/Src/ModelCamera/modelcameradlg.ui
index e3f69ff..fd5a5c1 100644
--- a/Src/ModelCamera/modelcameradlg.ui
+++ b/Src/ModelCamera/modelcameradlg.ui
@@ -39,16 +39,16 @@
        <number>2</number>
       </property>
       <property name="leftMargin">
-       <number>0</number>
+       <number>2</number>
       </property>
       <property name="topMargin">
-       <number>0</number>
+       <number>2</number>
       </property>
       <property name="rightMargin">
-       <number>0</number>
+       <number>2</number>
       </property>
       <property name="bottomMargin">
-       <number>0</number>
+       <number>2</number>
       </property>
       <item>
        <widget class="ffmpegvideoDlg" name="cameraVideoWidget" native="true">
@@ -154,6 +154,9 @@
              <property name="minimum">
               <double>0.800000000000000</double>
              </property>
+             <property name="maximum">
+              <double>25.000000000000000</double>
+             </property>
              <property name="stepType">
               <enum>QAbstractSpinBox::StepType::DefaultStepType</enum>
              </property>
diff --git a/mainwindow.ui b/mainwindow.ui
index 1b90dd1..c99f911 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1113</width>
-    <height>572</height>
+    <height>416</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -196,7 +196,11 @@
     <item row="0" column="1">
      <widget class="QStackedWidget" name="stackedWidget">
       <widget class="QWidget" name="Page1">
-       <layout class="QVBoxLayout" name="SubPage"/>
+       <layout class="QVBoxLayout" name="SubPage">
+        <property name="bottomMargin">
+         <number>2</number>
+        </property>
+       </layout>
       </widget>
      </widget>
     </item>
@@ -257,7 +261,7 @@
   </action>
   <action name="toolbar_action2">
    <property name="icon">
-    <iconset>
+    <iconset resource="mainwindow.qrc">
      <normaloff>:/res/GDDC.png</normaloff>:/res/GDDC.png</iconset>
    </property>
    <property name="text">
@@ -269,7 +273,7 @@
   </action>
   <action name="toolbar_action3">
    <property name="icon">
-    <iconset>
+    <iconset resource="mainwindow.qrc">
      <normaloff>:/res/LChain.png</normaloff>:/res/LChain.png</iconset>
    </property>
    <property name="text">
@@ -343,6 +347,8 @@
    </property>
   </action>
  </widget>
- <resources/>
+ <resources>
+  <include location="mainwindow.qrc"/>
+ </resources>
  <connections/>
 </ui>