From b6ada507a7764cbf07cc0e0ef3c71c3bbb75d05e Mon Sep 17 00:00:00 2001
From: cbwu <504-wuchengbo@htsdfp.com>
Date: Wed, 28 Aug 2024 11:13:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=B8=89=E7=BB=B4=E5=BB=BA=E6=A8=A1?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2ui=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Src/ModelCamera/modelcameradlg.ui | 54 ++++++++++++++++++++++++++++---
 res/Qss/qss.qss                   |  1 +
 2 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/Src/ModelCamera/modelcameradlg.ui b/Src/ModelCamera/modelcameradlg.ui
index d866874..2eb4f4f 100644
--- a/Src/ModelCamera/modelcameradlg.ui
+++ b/Src/ModelCamera/modelcameradlg.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1071</width>
-    <height>633</height>
+    <height>720</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -25,9 +25,9 @@
      <property name="frameShape">
       <enum>QFrame::Shape::NoFrame</enum>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="2,2,5">
+     <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="2,2,2,4,2">
       <property name="spacing">
-       <number>8</number>
+       <number>12</number>
       </property>
       <property name="leftMargin">
        <number>2</number>
@@ -41,6 +41,19 @@
       <property name="bottomMargin">
        <number>2</number>
       </property>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Orientation::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
       <item>
        <widget class="QGroupBox" name="groupBox">
         <property name="title">
@@ -578,7 +591,7 @@
             <number>5</number>
            </property>
            <property name="horizontalSpacing">
-            <number>10</number>
+            <number>8</number>
            </property>
            <property name="verticalSpacing">
             <number>5</number>
@@ -1163,6 +1176,19 @@
         </layout>
        </widget>
       </item>
+      <item>
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Orientation::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
@@ -1174,10 +1200,28 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="styleSheet">
+      <string notr="true">#frame{
+    border: 1px solid white;
+    border-radius:6px;
+}</string>
+     </property>
      <property name="frameShape">
-      <enum>QFrame::Shape::NoFrame</enum>
+      <enum>QFrame::Shape::Box</enum>
      </property>
      <layout class="QGridLayout" name="gridLayout_5">
+      <property name="leftMargin">
+       <number>7</number>
+      </property>
+      <property name="topMargin">
+       <number>7</number>
+      </property>
+      <property name="rightMargin">
+       <number>7</number>
+      </property>
+      <property name="bottomMargin">
+       <number>7</number>
+      </property>
       <item row="0" column="0">
        <widget class="ffmpegvideoDlg" name="cameraVideoWidget" native="true">
         <property name="sizePolicy">
diff --git a/res/Qss/qss.qss b/res/Qss/qss.qss
index b1a10a7..575c8ae 100644
--- a/res/Qss/qss.qss
+++ b/res/Qss/qss.qss
@@ -247,3 +247,4 @@ QDoubleSpinBox
 {
     color:white;
 }
+

From c12eb1d8c457dc89b665c5ae044137e7b17d8b57 Mon Sep 17 00:00:00 2001
From: cbwu <504-wuchengbo@htsdfp.com>
Date: Wed, 28 Aug 2024 13:24:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=B8=89=E7=BB=B4=E7=9B=B8=E6=9C=BA?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=A0=8F=E8=AE=BE=E4=B8=BA=E5=8F=AA=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Src/ModelCamera/modelcameradlg.ui | 42 +++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/Src/ModelCamera/modelcameradlg.ui b/Src/ModelCamera/modelcameradlg.ui
index 2eb4f4f..7162b23 100644
--- a/Src/ModelCamera/modelcameradlg.ui
+++ b/Src/ModelCamera/modelcameradlg.ui
@@ -637,6 +637,9 @@
                <height>21</height>
               </size>
              </property>
+             <property name="readOnly">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="0" column="2">
@@ -677,6 +680,9 @@
                <height>21</height>
               </size>
              </property>
+             <property name="readOnly">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="1" column="0">
@@ -717,6 +723,9 @@
                <height>21</height>
               </size>
              </property>
+             <property name="readOnly">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="1" column="2">
@@ -757,6 +766,9 @@
                <height>21</height>
               </size>
              </property>
+             <property name="readOnly">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="2" column="0">
@@ -797,6 +809,9 @@
                <height>21</height>
               </size>
              </property>
+             <property name="readOnly">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="2" column="2">
@@ -837,6 +852,9 @@
                <height>21</height>
               </size>
              </property>
+             <property name="readOnly">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="3" column="0">
@@ -889,6 +907,9 @@
                <height>21</height>
               </size>
              </property>
+             <property name="readOnly">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="3" column="2">
@@ -929,6 +950,9 @@
                <height>21</height>
               </size>
              </property>
+             <property name="readOnly">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="4" column="0">
@@ -969,6 +993,9 @@
                <height>21</height>
               </size>
              </property>
+             <property name="readOnly">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="4" column="2">
@@ -1009,6 +1036,9 @@
                <height>21</height>
               </size>
              </property>
+             <property name="readOnly">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="5" column="0">
@@ -1049,6 +1079,9 @@
                <height>21</height>
               </size>
              </property>
+             <property name="readOnly">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="5" column="2">
@@ -1089,6 +1122,9 @@
                <height>21</height>
               </size>
              </property>
+             <property name="readOnly">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="6" column="0">
@@ -1129,6 +1165,9 @@
                <height>21</height>
               </size>
              </property>
+             <property name="readOnly">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="6" column="2">
@@ -1169,6 +1208,9 @@
                <height>21</height>
               </size>
              </property>
+             <property name="readOnly">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
           </layout>