Plugin: modify parameter ui to remove sizepolicy

Author: KangLin

Plugins/FreeRDP/Client/DlgSetFreeRDP.ui

@@ -101,14 +101,7 @@
         </layout>
        </item>
        <item row="2" column="0">
-        <widget class="CParameterNetUI" name="wNet" native="true">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-        </widget>
+        <widget class="CParameterNetUI" name="wNet" native="true"/>
        </item>
        <item row="3" column="0">
         <layout class="QHBoxLayout" name="horizontalLayout_7">
@@ -132,12 +125,6 @@
         <layout class="QHBoxLayout" name="horizontalLayout_8">
          <item>
           <widget class="QLabel" name="label_8">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
            <property name="text">
             <string>Reconnect count:</string>
            </property>
@@ -238,12 +225,6 @@
        </item>
        <item row="6" column="0">
         <widget class="QGroupBox" name="groupBox_4">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
          <property name="title">
           <string>Tls version</string>
          </property>
@@ -377,12 +358,6 @@
             </item>
             <item>
              <widget class="QPushButton" name="pbSizeEdit">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
               <property name="text">
                <string>...</string>
               </property>
@@ -626,12 +601,6 @@
                <layout class="QHBoxLayout" name="horizontalLayout_12">
                 <item>
                  <widget class="QLabel" name="lbDriveSelected">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
                   <property name="text">
                    <string>Selected:</string>
                   </property>

Src/FrmManagePlugins.ui

@@ -14,24 +14,7 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="3" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>The settings will take effect after the application is restarted.</string>
-     </property>
-    </widget>
-   </item>
    <item row="1" column="0">
-    <widget class="QTableView" name="tvFilter">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>2</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
     <widget class="QGroupBox" name="gbPluginsPath">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -86,6 +69,23 @@
      </layout>
     </widget>
    </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>The settings will take effect after the application is restarted.</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QTableView" name="tvFilter">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>2</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
    <item row="2" column="0">
     <widget class="QCheckBox" name="cbOnlyLoadInWhitelist">
      <property name="text">

Src/ParameterCompone/ParameterNetUI.ui

@@ -10,12 +10,6 @@
     <height>78</height>
    </rect>
   </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
@@ -60,12 +54,6 @@
    </item>
    <item row="1" column="0">
     <widget class="CParameterUserUI" name="wUser" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
     </widget>
    </item>
   </layout>

Src/ParameterCompone/ParameterPluginUI.cpp

@@ -33,7 +33,7 @@ int CParameterPluginUI::Accept()
 {
     if(!m_pPara)
         return -1;
-    m_pPara->SetCaptureAllKeyboard(ui->cbCaptureAllKeyboard->isChecked());
+    m_pPara->SetCaptureAllKeyboard(ui->gbCaptureAllKeyboard->isChecked());
     m_pPara->SetDesktopShortcutsScript(ui->gpDesktopShortcutsSctipt->isChecked());
     m_pPara->SetDisableDesktopShortcutsScript(ui->leDesktopShortcutsDisableScript->text());
     m_pPara->SetRestoreDesktopShortcutsScript(ui->leDesktopShortcutsRestoreScript->text());
@@ -84,8 +84,8 @@ int CParameterPluginUI::SetParameter(CParameter *pParameter)
     m_pPara = qobject_cast<CParameterPlugin*>(pParameter);
     if(!m_pPara)
         return -1;
-    ui->cbCaptureAllKeyboard->setChecked(m_pPara->GetCaptureAllKeyboard());
-    ui->gpDesktopShortcutsSctipt->setEnabled(ui->cbCaptureAllKeyboard->isChecked());
+    ui->gbCaptureAllKeyboard->setChecked(m_pPara->GetCaptureAllKeyboard());
+    ui->gpDesktopShortcutsSctipt->setEnabled(ui->gbCaptureAllKeyboard->isChecked());
     ui->gpDesktopShortcutsSctipt->setChecked(m_pPara->GetDesktopShortcutsScript());
     ui->leDesktopShortcutsDisableScript->setText(m_pPara->GetDisableDesktopShortcutsScript());
     ui->leDesktopShortcutsRestoreScript->setText(m_pPara->GetRestoreDesktopShortcutsScript());