From 9959acb0e827eeb1b9872cdc79be2db5bb65d8e5 Mon Sep 17 00:00:00 2001
From: tt2468 <tt2468@gmail.com>
Date: Fri, 18 Nov 2022 02:09:03 -0800
Subject: [PATCH] forms: Various UI improvements

---
 src/forms/ConnectInfo.cpp   |  2 +-
 src/forms/ConnectInfo.ui    | 71 +++++++++++++++++++++++++++++++++----
 src/forms/SettingsDialog.ui |  8 ++++-
 3 files changed, 72 insertions(+), 9 deletions(-)

diff --git a/src/forms/ConnectInfo.cpp b/src/forms/ConnectInfo.cpp
index b3b77ede..ddb979d2 100644
--- a/src/forms/ConnectInfo.cpp
+++ b/src/forms/ConnectInfo.cpp
@@ -105,7 +105,7 @@ void ConnectInfo::SetClipboardText(QString text)
 
 void ConnectInfo::DrawQr(QString qrText)
 {
-	QPixmap map(230, 230);
+	QPixmap map(236, 236);
 	map.fill(Qt::white);
 	QPainter painter(&map);
 
diff --git a/src/forms/ConnectInfo.ui b/src/forms/ConnectInfo.ui
index 32b6b771..3e41c82f 100644
--- a/src/forms/ConnectInfo.ui
+++ b/src/forms/ConnectInfo.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>451</width>
-    <height>412</height>
+    <height>432</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -19,7 +19,7 @@
   <property name="maximumSize">
    <size>
     <width>451</width>
-    <height>412</height>
+    <height>432</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -31,12 +31,21 @@
      <x>10</x>
      <y>10</y>
      <width>431</width>
-     <height>101</height>
+     <height>121</height>
     </rect>
    </property>
    <layout class="QFormLayout" name="formLayout">
+    <property name="formAlignment">
+     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+    </property>
     <item row="0" column="0">
      <widget class="QLabel" name="serverIpLabel">
+      <property name="maximumSize">
+       <size>
+        <width>200</width>
+        <height>16777215</height>
+       </size>
+      </property>
       <property name="text">
        <string>OBSWebSocket.ConnectInfo.ServerIp</string>
       </property>
@@ -46,6 +55,12 @@
      <layout class="QHBoxLayout" name="horizontalLayout">
       <item>
        <widget class="QLineEdit" name="serverIpLineEdit">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+        </property>
         <property name="readOnly">
          <bool>true</bool>
         </property>
@@ -53,6 +68,12 @@
       </item>
       <item>
        <widget class="QPushButton" name="copyServerIpButton">
+        <property name="maximumSize">
+         <size>
+          <width>75</width>
+          <height>16777215</height>
+         </size>
+        </property>
         <property name="text">
          <string>OBSWebSocket.ConnectInfo.CopyText</string>
         </property>
@@ -62,6 +83,12 @@
     </item>
     <item row="1" column="0">
      <widget class="QLabel" name="serverPortLabel">
+      <property name="maximumSize">
+       <size>
+        <width>200</width>
+        <height>16777215</height>
+       </size>
+      </property>
       <property name="text">
        <string>OBSWebSocket.ConnectInfo.ServerPort</string>
       </property>
@@ -71,6 +98,12 @@
      <layout class="QHBoxLayout" name="horizontalLayout_2">
       <item>
        <widget class="QLineEdit" name="serverPortLineEdit">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+        </property>
         <property name="readOnly">
          <bool>true</bool>
         </property>
@@ -78,6 +111,12 @@
       </item>
       <item>
        <widget class="QPushButton" name="copyServerPortButton">
+        <property name="maximumSize">
+         <size>
+          <width>75</width>
+          <height>16777215</height>
+         </size>
+        </property>
         <property name="text">
          <string>OBSWebSocket.ConnectInfo.CopyText</string>
         </property>
@@ -87,6 +126,12 @@
     </item>
     <item row="2" column="0">
      <widget class="QLabel" name="serverPasswordLabel">
+      <property name="maximumSize">
+       <size>
+        <width>200</width>
+        <height>16777215</height>
+       </size>
+      </property>
       <property name="text">
        <string>OBSWebSocket.ConnectInfo.ServerPassword</string>
       </property>
@@ -96,9 +141,15 @@
      <layout class="QHBoxLayout" name="horizontalLayout_3">
       <item>
        <widget class="QLineEdit" name="serverPasswordLineEdit">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
         <property name="text">
          <string>OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText</string>
         </property>
+        <property name="alignment">
+         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+        </property>
         <property name="readOnly">
          <bool>true</bool>
         </property>
@@ -106,6 +157,12 @@
       </item>
       <item>
        <widget class="QPushButton" name="copyServerPasswordButton">
+        <property name="maximumSize">
+         <size>
+          <width>75</width>
+          <height>16777215</height>
+         </size>
+        </property>
         <property name="text">
          <string>OBSWebSocket.ConnectInfo.CopyText</string>
         </property>
@@ -119,7 +176,7 @@
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>120</y>
+     <y>140</y>
      <width>431</width>
      <height>281</height>
     </rect>
@@ -131,9 +188,9 @@
     <property name="geometry">
      <rect>
       <x>100</x>
-      <y>40</y>
-      <width>230</width>
-      <height>230</height>
+      <y>30</y>
+      <width>236</width>
+      <height>236</height>
      </rect>
     </property>
     <property name="text">
diff --git a/src/forms/SettingsDialog.ui b/src/forms/SettingsDialog.ui
index 567b3a53..6eb40824 100644
--- a/src/forms/SettingsDialog.ui
+++ b/src/forms/SettingsDialog.ui
@@ -80,7 +80,7 @@
       <item row="3" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <property name="spacing">
-         <number>0</number>
+         <number>2</number>
         </property>
         <item>
          <widget class="QCheckBox" name="enableDebugLoggingCheckBox">
@@ -97,6 +97,12 @@
           <property name="toolTip">
            <string>OBSWebSocket.Settings.DebugEnableHoverText</string>
           </property>
+          <property name="scaledContents">
+           <bool>true</bool>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
          </widget>
         </item>
         <item>