Qt: Move some options around

src/duckstation-qt/displaysettingswidget.cpp

@@ -48,8 +48,8 @@ DisplaySettingsWidget::DisplaySettingsWidget(QtHostInterface* host_interface, QW
   SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.gpuThread, "GPU", "UseThread", true);
   SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.threadedPresentation, "GPU",
                                                "ThreadedPresentation", true);
-  SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.useSoftwareRendererForReadbacks, "GPU",
+  SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.syncToHostRefreshRate, "Main",
-                                               "UseSoftwareRendererForReadbacks", false);
+                                               "SyncToHostRefreshRate", false);
   SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.showOSDMessages, "Display", "ShowOSDMessages",
                                                true);
   SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.showFPS, "Display", "ShowFPS", false);
@@ -133,9 +133,12 @@ DisplaySettingsWidget::DisplaySettingsWidget(QtHostInterface* host_interface, QW
                              tr("Uses a second thread for drawing graphics. Currently only available for the software "
                                 "renderer, but can provide a significant speed improvement, and is safe to use."));
   dialog->registerWidgetHelp(
-    m_ui.useSoftwareRendererForReadbacks, tr("Use Software Renderer For Readbacks"), tr("Unchecked"),
+    m_ui.syncToHostRefreshRate, tr("Sync To Host Refresh Rate"), tr("Unchecked"),
-    tr("Runs the software renderer in parallel for VRAM readbacks. On some systems, this may result in greater "
+    tr("Adjusts the emulation speed so the console's refresh rate matches the host's refresh rate when both VSync and "
-       "performance when using graphical enhancements with the hardware renderer."));
+       "Audio Resampling settings are enabled. This results in the smoothest animations possible, at the cost of "
+       "potentially increasing the emulation speed by less than 1%. Sync To Host Refresh Rate will not take effect if "
+       "the console's refresh rate is too far from the host's refresh rate. Users with variable refresh rate displays "
+       "should disable this option."));
   dialog->registerWidgetHelp(m_ui.showOSDMessages, tr("Show OSD Messages"), tr("Checked"),
                              tr("Shows on-screen-display messages when events occur such as save states being "
                                 "created/loaded, screenshots being taken, etc."));

src/duckstation-qt/displaysettingswidget.ui

@@ -72,30 +72,30 @@
          </widget>
         </item>
         <item row="0" column="1">
-         <widget class="QCheckBox" name="vsync">
-          <property name="text">
-           <string>VSync</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
          <widget class="QCheckBox" name="threadedPresentation">
           <property name="text">
            <string>Threaded Presentation</string>
           </property>
          </widget>
         </item>
-        <item row="1" column="1">
+        <item row="1" column="0">
-         <widget class="QCheckBox" name="displayAllFrames">
+         <widget class="QCheckBox" name="vsync">
           <property name="text">
-           <string>Optimal Frame Pacing</string>
+           <string>VSync</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QCheckBox" name="syncToHostRefreshRate">
+          <property name="text">
+           <string>Sync To Host Refresh Rate</string>
           </property>
          </widget>
         </item>
         <item row="2" column="0">
-         <widget class="QCheckBox" name="useSoftwareRendererForReadbacks">
+         <widget class="QCheckBox" name="displayAllFrames">
           <property name="text">
-           <string>Use Software Renderer For Readbacks</string>
+           <string>Optimal Frame Pacing</string>
           </property>
          </widget>
         </item>

src/duckstation-qt/emulationsettingswidget.cpp

@@ -12,8 +12,6 @@ EmulationSettingsWidget::EmulationSettingsWidget(QtHostInterface* host_interface
 {
   m_ui.setupUi(this);
 
-  SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.syncToHostRefreshRate, "Main",
-                                               "SyncToHostRefreshRate", false);
   SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.rewindEnable, "Main", "RewindEnable", false);
   SettingWidgetBinder::BindWidgetToFloatSetting(m_host_interface, m_ui.rewindSaveFrequency, "Main", "RewindFrequency",
                                                 10.0f);
@@ -61,13 +59,6 @@ EmulationSettingsWidget::EmulationSettingsWidget(QtHostInterface* host_interface
     m_ui.turboSpeed, tr("Turbo Speed"), tr("User Preference"),
     tr("Sets the turbo speed. This speed will be used when the turbo hotkey is pressed/toggled. Turboing will take "
        "priority over fast forwarding if both hotkeys are pressed/toggled."));
-  dialog->registerWidgetHelp(
-    m_ui.syncToHostRefreshRate, tr("Sync To Host Refresh Rate"), tr("Unchecked"),
-    tr("Adjusts the emulation speed so the console's refresh rate matches the host's refresh rate when both VSync and "
-       "Audio Resampling settings are enabled. This results in the smoothest animations possible, at the cost of "
-       "potentially increasing the emulation speed by less than 1%. Sync To Host Refresh Rate will not take effect if "
-       "the console's refresh rate is too far from the host's refresh rate. Users with variable refresh rate displays "
-       "should disable this option."));
   dialog->registerWidgetHelp(
     m_ui.rewindEnable, tr("Rewinding"), tr("Unchecked"),
     tr("<b>Enable Rewinding:</b> Saves state periodically so you can rewind any mistakes while playing.<br> "

src/duckstation-qt/emulationsettingswidget.ui

@@ -62,13 +62,6 @@
       <item row="2" column="1">
        <widget class="QComboBox" name="turboSpeed"/>
       </item>
-      <item row="3" column="0" colspan="2">
-       <widget class="QCheckBox" name="syncToHostRefreshRate">
-        <property name="text">
-         <string>Sync To Host Refresh Rate</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>

src/duckstation-qt/enhancementsettingswidget.cpp

@@ -27,6 +27,8 @@ EnhancementSettingsWidget::EnhancementSettingsWidget(QtHostInterface* host_inter
                                                &Settings::ParseTextureFilterName, &Settings::GetTextureFilterName,
                                                Settings::DEFAULT_GPU_TEXTURE_FILTER);
   SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.widescreenHack, "GPU", "WidescreenHack", false);
+  SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.useSoftwareRendererForReadbacks, "GPU",
+                                               "UseSoftwareRendererForReadbacks", false);
 
   SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.pgxpEnable, "GPU", "PGXPEnable", false);
   SettingWidgetBinder::BindWidgetToBoolSetting(m_host_interface, m_ui.pgxpCulling, "GPU", "PGXPCulling", true);
@@ -98,6 +100,10 @@ EnhancementSettingsWidget::EnhancementSettingsWidget(QtHostInterface* host_inter
        "increasing the field of view from 4:3 to the chosen display aspect ratio in 3D games. <br>For 2D games, or "
        "games which use pre-rendered backgrounds, this enhancement will not work as expected. <br><b><u>May not be "
        "compatible with all games.</u></b>"));
+  dialog->registerWidgetHelp(
+    m_ui.useSoftwareRendererForReadbacks, tr("Use Software Renderer For Readbacks"), tr("Unchecked"),
+    tr("Runs the software renderer in parallel for VRAM readbacks. On some systems, this may result in greater "
+       "performance when using graphical enhancements with the hardware renderer."));
   dialog->registerWidgetHelp(
     m_ui.pgxpEnable, tr("Geometry Correction"), tr("Unchecked"),
     tr("Reduces \"wobbly\" polygons and \"warping\" textures that are common in PS1 games. <br>Only "

src/duckstation-qt/enhancementsettingswidget.ui

@@ -73,6 +73,13 @@
         </property>
        </widget>
       </item>
+      <item row="6" column="0" colspan="2">
+       <widget class="QCheckBox" name="useSoftwareRendererForReadbacks">
+        <property name="text">
+          <string>Software Renderer Readbacks (run in parallel for VRAM->CPU transfers)</string>
+        </property>
+       </widget>
+      </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label">
         <property name="text">