From 461db8650acfa1177b759372700ea28c8f3ca753 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Thu, 6 Jan 2022 08:28:23 +0100
Subject: [PATCH] PICARD-2390: Fixed display of "default listening port" label

With some localization and with UI scaling the label was only partially visible
---
 picard/ui/ui_options_network.py | 23 +++-------
 ui/options_network.ui           | 79 ++++++++++++---------------------
 2 files changed, 35 insertions(+), 67 deletions(-)

diff --git a/picard/ui/ui_options_network.py b/picard/ui/ui_options_network.py
index 565b0621a..07a91b463 100644
--- a/picard/ui/ui_options_network.py
+++ b/picard/ui/ui_options_network.py
@@ -85,32 +85,23 @@ class Ui_NetworkOptionsPage(object):
         self.browser_integration.setObjectName("browser_integration")
         self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.browser_integration)
         self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.widget = QtWidgets.QWidget(self.browser_integration)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.widget.sizePolicy().hasHeightForWidth())
-        self.widget.setSizePolicy(sizePolicy)
-        self.widget.setObjectName("widget")
-        self.horizontalLayout = QtWidgets.QHBoxLayout(self.widget)
-        self.horizontalLayout.setContentsMargins(6, 0, 0, 0)
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.label_2 = QtWidgets.QLabel(self.widget)
+        self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_4.setObjectName("horizontalLayout_4")
+        self.label_2 = QtWidgets.QLabel(self.browser_integration)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label_2.sizePolicy().hasHeightForWidth())
         self.label_2.setSizePolicy(sizePolicy)
-        self.label_2.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.label_2.setObjectName("label_2")
-        self.horizontalLayout.addWidget(self.label_2)
-        self.browser_integration_port = QtWidgets.QSpinBox(self.widget)
+        self.horizontalLayout_4.addWidget(self.label_2)
+        self.browser_integration_port = QtWidgets.QSpinBox(self.browser_integration)
         self.browser_integration_port.setMinimum(1)
         self.browser_integration_port.setMaximum(65535)
         self.browser_integration_port.setProperty("value", 8000)
         self.browser_integration_port.setObjectName("browser_integration_port")
-        self.horizontalLayout.addWidget(self.browser_integration_port)
-        self.verticalLayout_2.addWidget(self.widget)
+        self.horizontalLayout_4.addWidget(self.browser_integration_port)
+        self.verticalLayout_2.addLayout(self.horizontalLayout_4)
         self.browser_integration_localhost_only = QtWidgets.QCheckBox(self.browser_integration)
         self.browser_integration_localhost_only.setChecked(False)
         self.browser_integration_localhost_only.setObjectName("browser_integration_localhost_only")
diff --git a/ui/options_network.ui b/ui/options_network.ui
index 71c639d8f..77b09f30c 100644
--- a/ui/options_network.ui
+++ b/ui/options_network.ui
@@ -190,57 +190,34 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
-       <widget class="QWidget" name="widget" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <property name="leftMargin">
-          <number>6</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="label_2">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Default listening port:</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QSpinBox" name="browser_integration_port">
-           <property name="minimum">
-            <number>1</number>
-           </property>
-           <property name="maximum">
-            <number>65535</number>
-           </property>
-           <property name="value">
-            <number>8000</number>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
+       <layout class="QHBoxLayout" name="horizontalLayout_4">
+        <item>
+         <widget class="QLabel" name="label_2">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Default listening port:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="browser_integration_port">
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="maximum">
+           <number>65535</number>
+          </property>
+          <property name="value">
+           <number>8000</number>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
       <item>
        <widget class="QCheckBox" name="browser_integration_localhost_only">