From 5c7a599cad0aa805fa0e7e7a7e4bb6983468e932 Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Sun, 13 Jul 2025 19:50:12 +1000
Subject: [PATCH] Qt: Couple of consistency fixes

---
 .../audiostretchsettingsdialog.ui             | 194 ++++++++++--------
 src/duckstation-qt/settingswindow.cpp         |  23 +--
 2 files changed, 117 insertions(+), 100 deletions(-)

diff --git a/src/duckstation-qt/audiostretchsettingsdialog.ui b/src/duckstation-qt/audiostretchsettingsdialog.ui
index f169f57f0..1a49c17da 100644
--- a/src/duckstation-qt/audiostretchsettingsdialog.ui
+++ b/src/duckstation-qt/audiostretchsettingsdialog.ui
@@ -7,65 +7,37 @@
     <x>0</x>
     <y>0</y>
     <width>500</width>
-    <height>287</height>
+    <height>267</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Audio Stretch Settings</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="3">
-    <layout class="QHBoxLayout" name="horizontalLayout_5">
-     <property name="bottomMargin">
-      <number>10</number>
+   <item row="6" column="0" colspan="2">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Orientation::Vertical</enum>
      </property>
-     <item>
-      <widget class="QLabel" name="icon">
-       <property name="minimumSize">
-        <size>
-         <width>32</width>
-         <height>32</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>32</width>
-         <height>32</height>
-        </size>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_4">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:700;&quot;&gt;Audio Stretch Settings&lt;/span&gt;&lt;br/&gt;These settings fine-tune the behavior of the SoundTouch audio time stretcher when running outside of 100% speed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::TextFormat::RichText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
    </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="label_6">
+   <item row="2" column="2">
+    <widget class="QLabel" name="seekWindowSizeLabel">
      <property name="text">
-      <string>Sequence Length:</string>
+      <string>20</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_8">
+     <property name="text">
+      <string>Overlap:</string>
      </property>
     </widget>
    </item>
@@ -91,20 +63,6 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="2">
-    <widget class="QLabel" name="sequenceLengthLabel">
-     <property name="text">
-      <string>30</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label_7">
-     <property name="text">
-      <string>Seekwindow Size:</string>
-     </property>
-    </widget>
-   </item>
    <item row="2" column="1">
     <widget class="QSlider" name="seekWindowSize">
      <property name="minimum">
@@ -127,17 +85,24 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="2">
-    <widget class="QLabel" name="seekWindowSizeLabel">
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_7">
      <property name="text">
-      <string>20</string>
+      <string>Seekwindow Size:</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="label_8">
+   <item row="1" column="2">
+    <widget class="QLabel" name="sequenceLengthLabel">
      <property name="text">
-      <string>Overlap:</string>
+      <string>30</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_6">
+     <property name="text">
+      <string>Sequence Length:</string>
      </property>
     </widget>
    </item>
@@ -163,10 +128,10 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="2">
-    <widget class="QLabel" name="overlapLabel">
-     <property name="text">
-      <string>10</string>
+   <item row="7" column="0" colspan="3">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::StandardButton::Close|QDialogButtonBox::StandardButton::RestoreDefaults</set>
      </property>
     </widget>
    </item>
@@ -177,6 +142,13 @@
      </property>
     </widget>
    </item>
+   <item row="3" column="2">
+    <widget class="QLabel" name="overlapLabel">
+     <property name="text">
+      <string>10</string>
+     </property>
+    </widget>
+   </item>
    <item row="5" column="0" colspan="3">
     <widget class="QCheckBox" name="useAAFilter">
      <property name="text">
@@ -184,19 +156,69 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Orientation::Vertical</enum>
+   <item row="0" column="0" colspan="3">
+    <layout class="QHBoxLayout" name="horizontalLayout_5">
+     <property name="bottomMargin">
+      <number>10</number>
      </property>
-    </spacer>
-   </item>
-   <item row="7" column="0" colspan="3">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::StandardButton::Close|QDialogButtonBox::StandardButton::RestoreDefaults</set>
-     </property>
-    </widget>
+     <item>
+      <widget class="QLabel" name="icon">
+       <property name="minimumSize">
+        <size>
+         <width>32</width>
+         <height>32</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>32</width>
+         <height>32</height>
+        </size>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QLabel" name="label_4">
+         <property name="font">
+          <font>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Audio Stretch Settings</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_5">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>These settings fine-tune the behavior of the SoundTouch audio time stretcher when running outside of 100% speed.</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
diff --git a/src/duckstation-qt/settingswindow.cpp b/src/duckstation-qt/settingswindow.cpp
index befcecbdc..34d55c1c6 100644
--- a/src/duckstation-qt/settingswindow.cpp
+++ b/src/duckstation-qt/settingswindow.cpp
@@ -151,20 +151,15 @@ void SettingsWindow::addPages()
     QStringLiteral("volume-up-line"),
     tr("<strong>Audio Settings</strong><hr>These options control the audio output of the console. Mouse over an option "
        "for additional information."));
-  {
-    QString title(tr("Achievements"));
-    QString icon_text(QStringLiteral("trophy-line"));
-    QString help_text(
-      tr("<strong>Achievement Settings</strong><hr>DuckStation uses RetroAchievements as an achievement database and "
-         "for tracking progress. To use achievements, please sign up for an account at <a href=\"%1\">%1</a>. To view "
-         "the achievement list in-game, press the hotkey for <strong>Open Pause Menu</strong> and select "
-         "<strong>Achievements</strong> from the menu. Mouse over an option for additional information, and "
-         "Shift+Wheel to scroll this panel.")
-        .arg("https://retroachievements.org/"));
-
-    addWidget(m_achievement_settings = new AchievementSettingsWidget(this, m_ui.settingsContainer), std::move(title),
-              std::move(icon_text), std::move(help_text));
-  }
+  addWidget(
+    m_achievement_settings = new AchievementSettingsWidget(this, m_ui.settingsContainer), tr("Achievements"),
+    QStringLiteral("trophy-line"),
+    tr("<strong>Achievement Settings</strong><hr>DuckStation uses RetroAchievements as an achievement database and "
+       "for tracking progress. To use achievements, please sign up for an account at <a href=\"%1\">%1</a>. To view "
+       "the achievement list in-game, press the hotkey for <strong>Open Pause Menu</strong> and select "
+       "<strong>Achievements</strong> from the menu. Mouse over an option for additional information, and "
+       "Shift+Wheel to scroll this panel.")
+      .arg("https://retroachievements.org/"));
 
   if (!isPerGameSettings())
   {