Merge pull request #2623 from SasView/convert-ui-error-fix

Fix errors while running convertUI
SasView · Sep 20, 2023 · 32ed24d · 32ed24d
2 parents 26bc71e + 397bc85
commit 32ed24d
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 8 deletions.
diff --git a/src/sas/qtgui/Calculators/UI/GenericScatteringCalculator.ui b/src/sas/qtgui/Calculators/UI/GenericScatteringCalculator.ui
@@ -57,7 +57,7 @@
     </widget>
    </item>
    <item row="0" column="9" rowspan="2" colspan="2">
-    <widget class="Line" name="line">
+    <widget class="Line" name="line1">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
@@ -1791,7 +1791,7 @@ Number of Qbins &amp;isin; [2, 1000].</string>
        </widget>
       </item>
       <item row="1" column="0" colspan="4">
-       <widget class="QGroupBox" name="groupBox_7">
+       <widget class="QGroupBox" name="groupBox_8">
         <property name="font">
          <font>
           <bold>false</bold>
@@ -1800,7 +1800,7 @@ Number of Qbins &amp;isin; [2, 1000].</string>
         <property name="title">
          <string>Sample Coordinates (xyz)</string>
         </property>
-        <layout class="QGridLayout" name="gridLayout_14">
+        <layout class="QGridLayout" name="gridLayout_15">
          <item row="0" column="0">
           <widget class="QLabel" name="lblSampleYaw">
            <property name="font">

diff --git a/src/sas/qtgui/Calculators/UI/ResolutionCalculatorPanelUI.ui b/src/sas/qtgui/Calculators/UI/ResolutionCalculatorPanelUI.ui
@@ -1244,7 +1244,6 @@
   <zorder>groupBox_3</zorder>
   <zorder>graphicsView</zorder>
   <zorder>line_4</zorder>
-  <zorder>verticalSpacer_2</zorder>
   <zorder>line</zorder>
   <zorder>line_2</zorder>
  </widget>

diff --git a/src/sas/qtgui/MainWindow/UI/ChangeCategoryUI.ui b/src/sas/qtgui/MainWindow/UI/ChangeCategoryUI.ui
@@ -81,7 +81,6 @@
      <zorder>cbCategories</zorder>
      <zorder>txtNewCategory</zorder>
      <zorder>cmdAdd</zorder>
-     <zorder>horizontalSpacer_2</zorder>
      <zorder>rbNew</zorder>
      <zorder>rbExisting</zorder>
     </widget>

diff --git a/src/sas/qtgui/Plotting/UI/ColorMapUI.ui b/src/sas/qtgui/Plotting/UI/ColorMapUI.ui
@@ -231,7 +231,6 @@
   <zorder>groupBox</zorder>
   <zorder>widget</zorder>
   <zorder>groupBox_2</zorder>
-  <zorder>verticalSpacer</zorder>
  </widget>
  <tabstops>
   <tabstop>cbColorMap</tabstop>

diff --git a/src/sas/qtgui/Plotting/UI/LinearFitUI.ui b/src/sas/qtgui/Plotting/UI/LinearFitUI.ui
@@ -451,7 +451,6 @@
   <zorder>groupBox_2</zorder>
   <zorder>groupBox</zorder>
   <zorder>label_2</zorder>
-  <zorder>verticalSpacer</zorder>
  </widget>
  <resources/>
  <connections>

diff --git a/src/sas/qtgui/Utilities/UI/ImageViewerOptionsUI.ui b/src/sas/qtgui/Utilities/UI/ImageViewerOptionsUI.ui
@@ -154,7 +154,6 @@ p, li { white-space: pre-wrap; }
   <zorder>groupBox</zorder>
   <zorder>buttonBox</zorder>
   <zorder>textBrowser</zorder>
-  <zorder>horizontalSpacer</zorder>
  </widget>
  <resources/>
  <connections>