From 2938602d75f1b92ee52ee0d12f2b16f528f3f122 Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Sun, 21 Jul 2024 16:20:53 +1000
Subject: [PATCH] Qt: Remove BIOS search directory from per-game settings

Rather than just disabling it and confusing the user.
---
 src/duckstation-qt/biossettingswidget.cpp     | 31 ++++++++++++-------
 src/duckstation-qt/biossettingswidget.h       |  1 -
 src/duckstation-qt/biossettingswidget.ui      | 10 +++---
 .../interfacesettingswidget.cpp               |  2 +-
 src/duckstation-qt/setupwizarddialog.cpp      |  2 +-
 5 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/duckstation-qt/biossettingswidget.cpp b/src/duckstation-qt/biossettingswidget.cpp
index 2352aa03a..938dee46b 100644
--- a/src/duckstation-qt/biossettingswidget.cpp
+++ b/src/duckstation-qt/biossettingswidget.cpp
@@ -64,24 +64,33 @@ BIOSSettingsWidget::BIOSSettingsWidget(SettingsWindow* dialog, QWidget* parent)
 
   connect(m_ui.refresh, &QPushButton::clicked, this, &BIOSSettingsWidget::refreshList);
 
-  m_ui.searchDirectory->setText(QString::fromStdString(EmuFolders::Bios));
-  SettingWidgetBinder::BindWidgetToFolderSetting(sif, m_ui.searchDirectory, m_ui.browseSearchDirectory,
-                                                 m_ui.openSearchDirectory, nullptr, "BIOS", "SearchDirectory",
-                                                 Path::Combine(EmuFolders::DataRoot, "bios"));
-  connect(m_ui.searchDirectory, &QLineEdit::textChanged, this, &BIOSSettingsWidget::refreshList);
+  if (!m_dialog->isPerGameSettings())
+  {
+    SettingWidgetBinder::BindWidgetToFolderSetting(sif, m_ui.searchDirectory, m_ui.browseSearchDirectory,
+                                                   m_ui.openSearchDirectory, nullptr, "BIOS", "SearchDirectory",
+                                                   Path::Combine(EmuFolders::DataRoot, "bios"));
+    connect(m_ui.searchDirectory, &QLineEdit::textChanged, this, &BIOSSettingsWidget::refreshList);
+  }
+  else
+  {
+    m_ui.mainLayout->removeWidget(m_ui.directoryGroupBox);
+    delete m_ui.directoryGroupBox;
+    m_ui.directoryGroupBox = nullptr;
+    m_ui.directoryGroupBoxLabel = nullptr;
+    m_ui.directoryGroupBoxLayout = nullptr;
+    m_ui.directoryGroupBoxHorizontalLayout = nullptr;
+    m_ui.searchDirectory = nullptr;
+    m_ui.browseSearchDirectory = nullptr;
+  }
+
   refreshList();
 }
 
 BIOSSettingsWidget::~BIOSSettingsWidget() = default;
 
-std::vector<std::pair<std::string, const BIOS::ImageInfo*>> BIOSSettingsWidget::getList(const char* directory)
-{
-  return BIOS::FindBIOSImagesInDirectory(directory);
-}
-
 void BIOSSettingsWidget::refreshList()
 {
-  auto images = getList(m_ui.searchDirectory->text().toUtf8().constData());
+  auto images = BIOS::FindBIOSImagesInDirectory(EmuFolders::Bios.c_str());
   populateDropDownForRegion(ConsoleRegion::NTSC_J, m_ui.imageNTSCJ, images, m_dialog->isPerGameSettings());
   populateDropDownForRegion(ConsoleRegion::NTSC_U, m_ui.imageNTSCU, images, m_dialog->isPerGameSettings());
   populateDropDownForRegion(ConsoleRegion::PAL, m_ui.imagePAL, images, m_dialog->isPerGameSettings());
diff --git a/src/duckstation-qt/biossettingswidget.h b/src/duckstation-qt/biossettingswidget.h
index 43908f760..66c7d1814 100644
--- a/src/duckstation-qt/biossettingswidget.h
+++ b/src/duckstation-qt/biossettingswidget.h
@@ -26,7 +26,6 @@ public:
                                         std::vector<std::pair<std::string, const BIOS::ImageInfo*>>& images,
                                         bool per_game);
   static void setDropDownValue(QComboBox* cb, const std::optional<std::string>& name, bool per_game);
-  static std::vector<std::pair<std::string, const BIOS::ImageInfo*>> getList(const char* directory);
 
 private Q_SLOTS:
   void refreshList();
diff --git a/src/duckstation-qt/biossettingswidget.ui b/src/duckstation-qt/biossettingswidget.ui
index 34870f200..c87b7fa5a 100644
--- a/src/duckstation-qt/biossettingswidget.ui
+++ b/src/duckstation-qt/biossettingswidget.ui
@@ -10,7 +10,7 @@
     <height>330</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QVBoxLayout" name="mainLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -115,13 +115,13 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox_3">
+    <widget class="QGroupBox" name="directoryGroupBox">
      <property name="title">
       <string>BIOS Directory</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2">
+     <layout class="QGridLayout" name="directoryGroupBoxLayout">
       <item row="0" column="0" colspan="2">
-       <widget class="QLabel" name="label_3">
+       <widget class="QLabel" name="directoryGroupBoxLabel">
         <property name="text">
          <string>DuckStation will search for BIOS images in this directory.</string>
         </property>
@@ -131,7 +131,7 @@
        </widget>
       </item>
       <item row="1" column="0" colspan="2">
-       <layout class="QHBoxLayout" name="horizontalLayout">
+       <layout class="QHBoxLayout" name="directoryGroupBoxHorizontalLayout">
         <item>
          <widget class="QLineEdit" name="searchDirectory"/>
         </item>
diff --git a/src/duckstation-qt/interfacesettingswidget.cpp b/src/duckstation-qt/interfacesettingswidget.cpp
index 3f6f96c8a..35eeef50c 100644
--- a/src/duckstation-qt/interfacesettingswidget.cpp
+++ b/src/duckstation-qt/interfacesettingswidget.cpp
@@ -61,7 +61,7 @@ InterfaceSettingsWidget::InterfaceSettingsWidget(SettingsWindow* dialog, QWidget
   if (!m_dialog->isPerGameSettings())
     SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.startFullscreen, "Main", "StartFullscreen", false);
   else
-    m_ui.startFullscreen->setEnabled(false);
+    SettingWidgetBinder::SetAvailability(m_ui.startFullscreen, false);
 
   SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.doubleClickTogglesFullscreen, "Main",
                                                "DoubleClickTogglesFullscreen", true);
diff --git a/src/duckstation-qt/setupwizarddialog.cpp b/src/duckstation-qt/setupwizarddialog.cpp
index 4015fd590..25d2d6790 100644
--- a/src/duckstation-qt/setupwizarddialog.cpp
+++ b/src/duckstation-qt/setupwizarddialog.cpp
@@ -223,7 +223,7 @@ void SetupWizardDialog::setupBIOSPage()
 
 void SetupWizardDialog::refreshBiosList()
 {
-  auto list = BIOSSettingsWidget::getList(m_ui.biosSearchDirectory->text().toUtf8().constData());
+  auto list = BIOS::FindBIOSImagesInDirectory(m_ui.biosSearchDirectory->text().toUtf8().constData());
   BIOSSettingsWidget::populateDropDownForRegion(ConsoleRegion::NTSC_U, m_ui.imageNTSCU, list, false);
   BIOSSettingsWidget::populateDropDownForRegion(ConsoleRegion::NTSC_J, m_ui.imageNTSCJ, list, false);
   BIOSSettingsWidget::populateDropDownForRegion(ConsoleRegion::PAL, m_ui.imagePAL, list, false);