[LyX/master] Fix Ui layouts.

[Juergen Spitzmueller]

commit a05b3228bc08f091bb89ef55d05e36ee65628a9e
Author: Juergen Spitzmueller <spitz at lyx.org>
Date:   Fri May 1 10:10:27 2020 +0200

    Fix Ui layouts.
---
 src/frontends/qt/ui/CounterUi.ui |  170 +++++++++++++++++++++++++-------------
 1 files changed, 112 insertions(+), 58 deletions(-)

diff --git a/src/frontends/qt/ui/CounterUi.ui b/src/frontends/qt/ui/CounterUi.ui
index 93298e4..c4b8aeb 100644
--- a/src/frontends/qt/ui/CounterUi.ui
+++ b/src/frontends/qt/ui/CounterUi.ui
@@ -6,70 +6,124 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>290</width>
-    <height>197</height>
+    <width>289</width>
+    <height>235</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="3" column="0">
-    <widget class="QLabel" name="vtypeLA">
-     <property name="text">
-      <string>Value Type</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="valueLA">
-     <property name="text">
-      <string>Value</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QComboBox" name="actionCB"/>
-   </item>
+  <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">
-    <widget class="QLabel" name="counterLA">
-     <property name="text">
-      <string>Counter</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QComboBox" name="counterCB"/>
-   </item>
-   <item row="2" column="1">
-    <widget class="QSpinBox" name="valueSB">
-     <property name="maximum">
-      <number>10000</number>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="actionLA">
-     <property name="text">
-      <string>Action</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QComboBox" name="vtypeCB"/>
-   </item>
-   <item row="4" column="0" colspan="2">
-    <widget class="QCheckBox" name="lyxonlyXB">
-     <property name="toolTip">
-      <string>Affect counters only in LyX, not in output</string>
-     </property>
-     <property name="layoutDirection">
-      <enum>Qt::RightToLeft</enum>
-     </property>
-     <property name="text">
-      <string>LyX Only</string>
-     </property>
-    </widget>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="counterLA">
+       <property name="text">
+        <string>C&ounter:</string>
+       </property>
+       <property name="buddy">
+        <cstring>counterCB</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QComboBox" name="counterCB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="actionLA">
+       <property name="text">
+        <string>&Action:</string>
+       </property>
+       <property name="buddy">
+        <cstring>actionCB</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QComboBox" name="actionCB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="valueLA">
+       <property name="text">
+        <string>&Value:</string>
+       </property>
+       <property name="buddy">
+        <cstring>valueSB</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <widget class="QSpinBox" name="valueSB">
+         <property name="maximum">
+          <number>10000</number>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>13</width>
+           <height>39</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="vtypeLA">
+       <property name="text">
+        <string>Value &Type:</string>
+       </property>
+       <property name="buddy">
+        <cstring>vtypeCB</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QComboBox" name="vtypeCB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QCheckBox" name="lyxonlyXB">
+       <property name="toolTip">
+        <string>Affect counters only in LyX, not in output</string>
+       </property>
+       <property name="layoutDirection">
+        <enum>Qt::LeftToRight</enum>
+       </property>
+       <property name="text">
+        <string>&LyX Only</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>