Qt: Replace table widget in Game List Settings

src/duckstation-qt/gamelistsettingswidget.cpp

@@ -28,24 +28,18 @@ GameListSettingsWidget::GameListSettingsWidget(SettingsWindow* dialog, QWidget*
 {
   m_ui.setupUi(this);
 
-  m_ui.searchDirectoryList->setSelectionMode(QAbstractItemView::SingleSelection);
-  m_ui.searchDirectoryList->setSelectionBehavior(QAbstractItemView::SelectRows);
-  m_ui.searchDirectoryList->setAlternatingRowColors(true);
-  m_ui.searchDirectoryList->setShowGrid(false);
-  m_ui.searchDirectoryList->horizontalHeader()->setHighlightSections(false);
-  m_ui.searchDirectoryList->verticalHeader()->hide();
-  m_ui.searchDirectoryList->setCurrentIndex({});
-  m_ui.searchDirectoryList->setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu);
-  QtUtils::SetColumnWidthsForTableView(m_ui.searchDirectoryList, {-1, 120});
+  QtUtils::SetColumnWidthsForTreeView(m_ui.searchDirectoryList, {-1, 120});
 
-  connect(m_ui.searchDirectoryList, &QTableWidget::customContextMenuRequested, this,
+  connect(m_ui.searchDirectoryList, &QTreeWidget::itemSelectionChanged, this,
+          &GameListSettingsWidget::onDirectoryListSelectionChanged);
+  connect(m_ui.searchDirectoryList, &QTreeWidget::itemChanged, this,
+          &GameListSettingsWidget::onDirectoryListItemChanged);
+  connect(m_ui.searchDirectoryList, &QTreeWidget::customContextMenuRequested, this,
           &GameListSettingsWidget::onDirectoryListContextMenuRequested);
   connect(m_ui.addSearchDirectoryButton, &QPushButton::clicked, this,
           &GameListSettingsWidget::onAddSearchDirectoryButtonClicked);
   connect(m_ui.removeSearchDirectoryButton, &QPushButton::clicked, this,
           &GameListSettingsWidget::onRemoveSearchDirectoryButtonClicked);
-  connect(m_ui.searchDirectoryList, &QTableWidget::itemSelectionChanged, this,
-          &GameListSettingsWidget::onSearchDirectoriesSelectionChanged);
   connect(m_ui.addExcludedFile, &QPushButton::clicked, this, &GameListSettingsWidget::onAddExcludedFileButtonClicked);
   connect(m_ui.addExcludedFolder, &QPushButton::clicked, this,
           &GameListSettingsWidget::onAddExcludedFolderButtonClicked);
@@ -86,40 +80,17 @@ void GameListSettingsWidget::refreshExclusionList()
 
 void GameListSettingsWidget::addPathToTable(const std::string& path, bool recursive)
 {
-  const int row = m_ui.searchDirectoryList->rowCount();
-  m_ui.searchDirectoryList->insertRow(row);
-
-  QTableWidgetItem* item = new QTableWidgetItem();
-  item->setText(QString::fromStdString(path));
-  item->setFlags(item->flags() & ~(Qt::ItemIsEditable));
-  m_ui.searchDirectoryList->setItem(row, 0, item);
-
-  QCheckBox* cb = new QCheckBox(m_ui.searchDirectoryList);
-  m_ui.searchDirectoryList->setCellWidget(row, 1, cb);
-  cb->setChecked(recursive);
-
-  connect(cb, &QCheckBox::checkStateChanged, this, [item](Qt::CheckState state) {
-    const std::string path(item->text().toStdString());
-    if (state == Qt::Checked)
-    {
-      Host::RemoveValueFromBaseStringListSetting("GameList", "Paths", path.c_str());
-      Host::AddValueToBaseStringListSetting("GameList", "RecursivePaths", path.c_str());
-    }
-    else
-    {
-      Host::RemoveValueFromBaseStringListSetting("GameList", "RecursivePaths", path.c_str());
-      Host::AddValueToBaseStringListSetting("GameList", "Paths", path.c_str());
-    }
-    Host::CommitBaseSettingChanges();
-    g_main_window->refreshGameList(false);
-  });
+  QTreeWidgetItem* const item = new QTreeWidgetItem();
+  item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
+  item->setText(0, QString::fromStdString(path));
+  item->setCheckState(1, recursive ? Qt::Checked : Qt::Unchecked);
+  m_ui.searchDirectoryList->addTopLevelItem(item);
 }
 
 void GameListSettingsWidget::refreshDirectoryList()
 {
   QSignalBlocker sb(m_ui.searchDirectoryList);
-  while (m_ui.searchDirectoryList->rowCount() > 0)
-    m_ui.searchDirectoryList->removeRow(0);
+  m_ui.searchDirectoryList->clear();
 
   std::vector<std::string> path_list = Host::GetBaseStringListSetting("GameList", "Paths");
   for (const std::string& entry : path_list)
@@ -157,6 +128,32 @@ void GameListSettingsWidget::removeSearchDirectory(const QString& path)
   g_main_window->refreshGameList(false);
 }
 
+void GameListSettingsWidget::onDirectoryListSelectionChanged()
+{
+  m_ui.removeSearchDirectoryButton->setEnabled(m_ui.searchDirectoryList->selectionModel()->hasSelection());
+}
+
+void GameListSettingsWidget::onDirectoryListItemChanged(QTreeWidgetItem* item, int column)
+{
+  if (column != 1)
+    return;
+
+  const std::string path = item->text(0).toStdString();
+
+  if (item->checkState(1) == Qt::Checked)
+  {
+    Host::RemoveValueFromBaseStringListSetting("GameList", "Paths", path.c_str());
+    Host::AddValueToBaseStringListSetting("GameList", "RecursivePaths", path.c_str());
+  }
+  else
+  {
+    Host::RemoveValueFromBaseStringListSetting("GameList", "RecursivePaths", path.c_str());
+    Host::AddValueToBaseStringListSetting("GameList", "Paths", path.c_str());
+  }
+  Host::CommitBaseSettingChanges();
+  g_main_window->refreshGameList(false);
+}
+
 void GameListSettingsWidget::onDirectoryListContextMenuRequested(const QPoint& point)
 {
   QModelIndexList selection = m_ui.searchDirectoryList->selectionModel()->selectedIndexes();
@@ -166,10 +163,13 @@ void GameListSettingsWidget::onDirectoryListContextMenuRequested(const QPoint& p
   const int row = selection[0].row();
 
   QMenu menu;
-  menu.addAction(tr("Remove"), [this]() { onRemoveSearchDirectoryButtonClicked(); });
+  menu.addAction(QIcon::fromTheme("folder-reduce-line"), tr("Remove"), this,
+                 &GameListSettingsWidget::onRemoveSearchDirectoryButtonClicked);
   menu.addSeparator();
-  menu.addAction(tr("Open Directory..."), [this, row]() {
-    QtUtils::OpenURL(this, QUrl::fromLocalFile(m_ui.searchDirectoryList->item(row, 0)->text()));
+  menu.addAction(QIcon::fromTheme("folder-open-line"), tr("Open Directory..."), [this, row]() {
+    const QTreeWidgetItem* const item = m_ui.searchDirectoryList->topLevelItem(row);
+    if (item)
+      QtUtils::OpenURL(this, QUrl::fromLocalFile(item->text(0)));
   });
   menu.exec(m_ui.searchDirectoryList->mapToGlobal(point));
 }
@@ -202,20 +202,15 @@ void GameListSettingsWidget::onAddSearchDirectoryButtonClicked()
 
 void GameListSettingsWidget::onRemoveSearchDirectoryButtonClicked()
 {
-  const int row = m_ui.searchDirectoryList->currentRow();
-  QTableWidgetItem* item = (row >= 0) ? m_ui.searchDirectoryList->takeItem(row, 0) : nullptr;
+  const QModelIndex index = m_ui.searchDirectoryList->currentIndex();
+  const QTreeWidgetItem* const item = m_ui.searchDirectoryList->takeTopLevelItem(index.row());
   if (!item)
     return;
 
-  removeSearchDirectory(item->text());
+  removeSearchDirectory(item->text(0));
   delete item;
 }
 
-void GameListSettingsWidget::onSearchDirectoriesSelectionChanged()
-{
-  m_ui.removeSearchDirectoryButton->setEnabled(m_ui.searchDirectoryList->selectionModel()->hasSelection());
-}
-
 void GameListSettingsWidget::onAddExcludedFileButtonClicked()
 {
   QString path =

src/duckstation-qt/gamelistsettingswidget.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
+// SPDX-FileCopyrightText: 2019-2025 Connor McLaughlin <stenzek@gmail.com>
 // SPDX-License-Identifier: CC-BY-NC-ND-4.0
 
 #pragma once
@@ -28,10 +28,11 @@ private:
   void addSearchDirectory(const QString& path, bool recursive);
   void removeSearchDirectory(const QString& path);
 
+  void onDirectoryListSelectionChanged();
+  void onDirectoryListItemChanged(QTreeWidgetItem* item, int column);
   void onDirectoryListContextMenuRequested(const QPoint& point);
   void onAddSearchDirectoryButtonClicked();
   void onRemoveSearchDirectoryButtonClicked();
-  void onSearchDirectoriesSelectionChanged();
   void onAddExcludedFileButtonClicked();
   void onAddExcludedFolderButtonClicked();
   void onRemoveExcludedPathButtonClicked();

src/duckstation-qt/gamelistsettingswidget.ui

@@ -10,7 +10,7 @@
     <height>376</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,2,0,1,0">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -35,7 +35,7 @@
      <item>
       <spacer name="horizontalSpacer_2">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -80,7 +80,19 @@
     </layout>
    </item>
    <item>
-    <widget class="QTableWidget" name="searchDirectoryList">
+    <widget class="QTreeWidget" name="searchDirectoryList">
+     <property name="contextMenuPolicy">
+      <enum>Qt::ContextMenuPolicy::CustomContextMenu</enum>
+     </property>
+     <property name="alternatingRowColors">
+      <bool>true</bool>
+     </property>
+     <property name="rootIsDecorated">
+      <bool>false</bool>
+     </property>
+     <property name="uniformRowHeights">
+      <bool>true</bool>
+     </property>
      <column>
       <property name="text">
        <string>Search Directory</string>
@@ -105,7 +117,7 @@
      <item>
       <spacer name="horizontalSpacer_3">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -173,7 +185,7 @@
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>