ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix BIOS list

This commit is contained in:
Stenzek 2024-04-04 16:42:44 +10:00 committed by Connor McLaughlin
parent efa8f058d4
commit 7066369887
4 changed files with 46 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
pcsx2-qt/Settings/BIOSSettingsWidget.cpp
View File

@ -1,19 +1,21 @@
// SPDX-FileCopyrightText: 2002-2023 PCSX2 Dev Team
// SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team
// SPDX-License-Identifier: LGPL-3.0+
#include <QtGui/QIcon>
#include <QtWidgets/QFileDialog>
#include <algorithm>
#include "pcsx2/Host.h"
#include "pcsx2/ps2/BiosTools.h"
#include "BIOSSettingsWidget.h"
#include "QtHost.h"
#include "QtUtils.h"
#include "SettingWidgetBinder.h"
#include "SettingsWindow.h"
#include "pcsx2/Host.h"
#include "pcsx2/ps2/BiosTools.h"
#include "common/FileSystem.h"
#include <QtGui/QIcon>
#include <QtWidgets/QFileDialog>
#include <algorithm>
BIOSSettingsWidget::BIOSSettingsWidget(SettingsWindow* dialog, QWidget* parent)
: QWidget(parent)
, m_dialog(dialog)
@ -41,48 +43,42 @@ BIOSSettingsWidget::BIOSSettingsWidget(SettingsWindow* dialog, QWidget* parent)
connect(m_ui.fastBoot, &QCheckBox::stateChanged, this, &BIOSSettingsWidget::fastBootChanged);
}
BIOSSettingsWidget::~BIOSSettingsWidget()
{
if (m_refresh_thread)
m_refresh_thread->wait();
}
BIOSSettingsWidget::~BIOSSettingsWidget() = default;
void BIOSSettingsWidget::refreshList()
{
if (m_refresh_thread)
{
m_refresh_thread->requestInterruption();
m_refresh_thread->wait();
delete m_refresh_thread;
}
QSignalBlocker blocker(m_ui.fileList);
m_ui.fileList->clear();
m_ui.fileList->setEnabled(false);
m_refresh_thread = new RefreshThread(this, m_ui.searchDirectory->text());
m_refresh_thread->start();
const std::string search_dir = m_ui.searchDirectory->text().toStdString();
populateList(m_ui.fileList, search_dir);
}
void BIOSSettingsWidget::listRefreshed(const QVector<BIOSInfo>& items)
void BIOSSettingsWidget::populateList(QTreeWidget* list, const std::string& directory)
{
QSignalBlocker sb(m_ui.fileList);
populateList(m_ui.fileList, items);
m_ui.fileList->setEnabled(true);
}
const std::string selected_bios = Host::GetBaseStringSettingValue("Filenames", "BIOS");
const QString res_path = QtHost::GetResourcesBasePath();
void BIOSSettingsWidget::populateList(QTreeWidget* list, const QVector<BIOSInfo>& items)
{
const std::string selected_bios(Host::GetBaseStringSettingValue("Filenames", "BIOS"));
const QString res_path(QtHost::GetResourcesBasePath());
QSignalBlocker blocker(list);
list->clear();
list->setEnabled(false);
qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
for (const BIOSInfo& bi : items)
FileSystem::FindResultsArray files;
FileSystem::FindFiles(directory.c_str(), "*", FILESYSTEM_FIND_FILES | FILESYSTEM_FIND_HIDDEN_FILES, &files);
u32 bios_version, bios_region;
std::string bios_description, bios_zone;
for (const FILESYSTEM_FIND_DATA& fd : files)
{
if (!IsBIOS(fd.FileName.c_str(), bios_version, bios_description, bios_region, bios_zone))
continue;
const std::string_view bios_name = Path::GetFileName(fd.FileName);
QTreeWidgetItem* item = new QTreeWidgetItem();
item->setText(0, QString::fromStdString(bi.filename));
item->setText(1, QString::fromStdString(bi.description));
item->setText(0, QtUtils::StringViewToQString(bios_name));
item->setText(1, QString::fromStdString(bios_description));
switch (bi.region)
switch (bios_region)
{
case 0: // Japan
item->setIcon(0, QIcon(QStringLiteral("%1/icons/flags/NTSC-J.png").arg(res_path)));
@ -124,12 +120,14 @@ void BIOSSettingsWidget::populateList(QTreeWidget* list, const QVector<BIOSInfo>
list->addTopLevelItem(item);
if (bi.filename == selected_bios)
if (selected_bios == bios_name)
{
list->selectionModel()->setCurrentIndex(list->indexFromItem(item), QItemSelectionModel::Select);
item->setSelected(true);
}
}
list->setEnabled(true);
}
void BIOSSettingsWidget::listItemChanged(const QTreeWidgetItem* current, const QTreeWidgetItem* previous)
@ -145,36 +143,3 @@ void BIOSSettingsWidget::fastBootChanged()
const bool enabled = m_dialog->getEffectiveBoolValue("EmuCore", "EnableFastBoot", true);
m_ui.fastBootFastForward->setEnabled(enabled);
}
BIOSSettingsWidget::RefreshThread::RefreshThread(QWidget* parent, const QString& directory)
: QThread(parent)
, m_directory(directory)
{
}
BIOSSettingsWidget::RefreshThread::~RefreshThread() = default;
void BIOSSettingsWidget::RefreshThread::run()
{
QVector<BIOSInfo> items;
QDir dir(m_directory);
if (dir.exists())
{
for (const QFileInfo& info : dir.entryInfoList(QDir::Files))
{
if (isInterruptionRequested())
break;
BIOSInfo bi;
QString full_path(info.absoluteFilePath());
if (!IsBIOS(full_path.toUtf8().constData(), bi.version, bi.description, bi.region, bi.zone))
continue;
bi.filename = info.fileName().toStdString();
items.push_back(std::move(bi));
}
}
QMetaObject::invokeMethod(parent(), "listRefreshed", Qt::QueuedConnection, Q_ARG(const QVector<BIOSInfo>&, items));
}

32
pcsx2-qt/Settings/BIOSSettingsWidget.h
View File

@ -1,7 +1,8 @@
// SPDX-FileCopyrightText: 2002-2023 PCSX2 Dev Team
// SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team
// SPDX-License-Identifier: LGPL-3.0+
#pragma once
#include <QtCore/QDir>
#include <QtCore/QPair>
#include <QtCore/QString>
@ -15,17 +16,6 @@
class SettingsWindow;
class QThread;
// TODO: Move to core.
struct BIOSInfo
{
std::string filename;
std::string description;
std::string zone;
u32 version;
u32 region;
};
Q_DECLARE_METATYPE(BIOSInfo);
class BIOSSettingsWidget : public QWidget
{
Q_OBJECT
@ -34,32 +24,16 @@ public:
BIOSSettingsWidget(SettingsWindow* dialog, QWidget* parent);
~BIOSSettingsWidget();
class RefreshThread final : public QThread
{
public:
RefreshThread(QWidget* parent, const QString& directory);
~RefreshThread();
protected:
void run() override;
private:
QString m_directory;
};
static void populateList(QTreeWidget* list, const QVector<BIOSInfo>& items);
static void populateList(QTreeWidget* list, const std::string& directory);
private Q_SLOTS:
void refreshList();
void listItemChanged(const QTreeWidgetItem* current, const QTreeWidgetItem* previous);
void listRefreshed(const QVector<BIOSInfo>& items);
void fastBootChanged();
private:
Ui::BIOSSettingsWidget m_ui;
SettingsWindow* m_dialog;
RefreshThread* m_refresh_thread = nullptr;
};

32
pcsx2-qt/SetupWizardDialog.cpp
View File

@ -1,10 +1,11 @@
// SPDX-FileCopyrightText: 2002-2023 PCSX2 Dev Team
// SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team
// SPDX-License-Identifier: LGPL-3.0+
#include "pcsx2/SIO/Pad/Pad.h"
#include "QtHost.h"
#include "QtUtils.h"
#include "SettingWidgetBinder.h"
#include "Settings/BIOSSettingsWidget.h"
#include "Settings/ControllerSettingWidgetBinder.h"
#include "Settings/InterfaceSettingsWidget.h"
#include "SetupWizardDialog.h"
@ -18,14 +19,7 @@ SetupWizardDialog::SetupWizardDialog()
updatePageButtons();
}
SetupWizardDialog::~SetupWizardDialog()
{
if (m_bios_refresh_thread)
{
m_bios_refresh_thread->wait();
delete m_bios_refresh_thread;
}
}
SetupWizardDialog::~SetupWizardDialog() = default;
void SetupWizardDialog::resizeEvent(QResizeEvent* event)
{
@ -222,18 +216,7 @@ void SetupWizardDialog::setupBIOSPage()
void SetupWizardDialog::refreshBiosList()
{
if (m_bios_refresh_thread)
{
m_bios_refresh_thread->wait();
delete m_bios_refresh_thread;
}
QSignalBlocker blocker(m_ui.biosList);
m_ui.biosList->clear();
m_ui.biosList->setEnabled(false);
m_bios_refresh_thread = new BIOSSettingsWidget::RefreshThread(this, m_ui.biosSearchDirectory->text());
m_bios_refresh_thread->start();
BIOSSettingsWidget::populateList(m_ui.biosList, m_ui.biosSearchDirectory->text().toStdString());
}
void SetupWizardDialog::biosListItemChanged(const QTreeWidgetItem* current, const QTreeWidgetItem* previous)
@ -243,13 +226,6 @@ void SetupWizardDialog::biosListItemChanged(const QTreeWidgetItem* current, cons
g_emu_thread->applySettings();
}
void SetupWizardDialog::listRefreshed(const QVector<BIOSInfo>& items)
{
QSignalBlocker sb(m_ui.biosList);
BIOSSettingsWidget::populateList(m_ui.biosList, items);
m_ui.biosList->setEnabled(true);
}
void SetupWizardDialog::setupGameListPage()
{
m_ui.searchDirectoryList->setSelectionMode(QAbstractItemView::SingleSelection);

7
pcsx2-qt/SetupWizardDialog.h
View File

@ -1,10 +1,8 @@
// SPDX-FileCopyrightText: 2002-2023 PCSX2 Dev Team
// SPDX-FileCopyrightText: 2002-2024 PCSX2 Dev Team
// SPDX-License-Identifier: LGPL-3.0+
#pragma once
#include "Settings/BIOSSettingsWidget.h"
#include "ui_SetupWizardDialog.h"
#include <QtCore/QList>
@ -33,7 +31,6 @@ private Q_SLOTS:
void refreshBiosList();
void biosListItemChanged(const QTreeWidgetItem* current, const QTreeWidgetItem* previous);
void listRefreshed(const QVector<BIOSInfo>& items);
void onDirectoryListContextMenuRequested(const QPoint& point);
void onAddSearchDirectoryButtonClicked();
@ -78,7 +75,5 @@ private:
std::array<QLabel*, Page_Count> m_page_labels;
BIOSSettingsWidget::RefreshThread* m_bios_refresh_thread = nullptr;
QList<QPair<QString, QString>> m_device_list;
};