From ffe11cbb81fb5e2ca8d88fcec7d7e3548dbb1506 Mon Sep 17 00:00:00 2001
From: Bill Somerville <bill@classdesign.com>
Date: Sat, 23 Oct 2021 00:01:50 +0100
Subject: [PATCH] Repair excess main window width regression

---
 widgets/mainwindow.ui | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/widgets/mainwindow.ui b/widgets/mainwindow.ui
index ef9c32bd9..6ba2a455b 100644
--- a/widgets/mainwindow.ui
+++ b/widgets/mainwindow.ui
@@ -1276,7 +1276,7 @@ When not checked you can view the calibration results.</string>
                       <item>
                        <widget class="QPushButton" name="pbR2T">
                         <property name="sizePolicy">
-                         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+                         <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
                           <horstretch>0</horstretch>
                           <verstretch>0</verstretch>
                          </sizepolicy>
@@ -1329,7 +1329,7 @@ When not checked you can view the calibration results.</string>
                       <item>
                        <widget class="QPushButton" name="pbT2R">
                         <property name="sizePolicy">
-                         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+                         <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
                           <horstretch>0</horstretch>
                           <verstretch>0</verstretch>
                          </sizepolicy>
@@ -1980,12 +1980,6 @@ Double click to toggle the use of the Tx1 message to start a QSO with a station
                       </item>
                       <item row="5" column="0">
                        <widget class="QComboBox" name="tx5">
-                        <property name="sizePolicy">
-                         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                          <horstretch>0</horstretch>
-                          <verstretch>0</verstretch>
-                         </sizepolicy>
-                        </property>
                         <property name="toolTip">
                          <string>Enter a free text message (maximum 13 characters)
 or select a predefined macro from the dropdown list.
@@ -1998,6 +1992,9 @@ list. The list can be maintained in Settings (F2).</string>
                         <property name="insertPolicy">
                          <enum>QComboBox::InsertAtBottom</enum>
                         </property>
+                        <property name="sizeAdjustPolicy">
+                         <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+                        </property>
                        </widget>
                       </item>
                       <item row="5" column="1">
@@ -2028,7 +2025,7 @@ Double-click to reset to the standard 73 message</string>
                    <attribute name="title">
                     <string>2</string>
                    </attribute>
-                   <layout class="QGridLayout" name="gridLayout_11">
+                   <layout class="QGridLayout" name="gridLayout_11" columnstretch="1,0">
                     <item row="0" column="1" rowspan="2">
                      <layout class="QGridLayout" name="gridLayout_10">
                       <item row="2" column="0">
@@ -2308,6 +2305,9 @@ Double-click to reset to the standard 73 message</string>
                         <height>16777215</height>
                        </size>
                       </property>
+                      <property name="sizeAdjustPolicy">
+                       <enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum>
+                      </property>
                      </widget>
                     </item>
                    </layout>
@@ -2875,14 +2875,6 @@ Yellow when too low</string>
    </layout>
   </widget>
   <widget class="QMenuBar" name="menuBar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>968</width>
-     <height>21</height>
-    </rect>
-   </property>
    <widget class="QMenu" name="menuFile">
     <property name="title">
      <string>File</string>