Merge pull request #12781 from deReeperJosh/skylanderfiletypes

IOS/USB: Change Skylander File Type Filter
This commit is contained in:
Admiral H. Curtiss 2024-05-18 14:12:55 +02:00 committed by GitHub
commit f3c0a5626d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -554,7 +554,7 @@ void SkylanderPortalWindow::LoadFromFile()
const u8 slot = GetCurrentSlot(); const u8 slot = GetCurrentSlot();
const QString file_path = const QString file_path =
DolphinFileDialog::getOpenFileName(this, tr("Select Skylander File"), m_last_skylander_path, DolphinFileDialog::getOpenFileName(this, tr("Select Skylander File"), m_last_skylander_path,
tr("Skylander (*.sky);;All Files (*)")); tr("Skylander (*.sky *.bin *.dmp *.dump);;All Files (*)"));
; ;
if (file_path.isEmpty()) if (file_path.isEmpty())
{ {
@ -708,7 +708,9 @@ void SkylanderPortalWindow::RefreshList()
{ {
const QDir collection = QDir(m_collection_path); const QDir collection = QDir(m_collection_path);
auto& system = Core::System::GetInstance(); auto& system = Core::System::GetInstance();
for (const auto& file : collection.entryInfoList(QStringList(QStringLiteral("*.sky")))) for (const auto& file : collection.entryInfoList(
QStringList() << QStringLiteral("*.sky") << QStringLiteral("*.bin")
<< QStringLiteral("*.dmp") << QStringLiteral("*.dump")))
{ {
File::IOFile sky_file(file.filePath().toStdString(), "r+b"); File::IOFile sky_file(file.filePath().toStdString(), "r+b");
if (!sky_file) if (!sky_file)
@ -910,7 +912,9 @@ QString SkylanderPortalWindow::GetFilePath(u16 id, u16 var) const
{ {
const QDir collection = QDir(m_collection_path); const QDir collection = QDir(m_collection_path);
auto& system = Core::System::GetInstance(); auto& system = Core::System::GetInstance();
for (const auto& file : collection.entryInfoList(QStringList(QStringLiteral("*.sky")))) for (const auto& file : collection.entryInfoList(
QStringList() << QStringLiteral("*.sky") << QStringLiteral("*.bin")
<< QStringLiteral("*.dmp") << QStringLiteral("*.dump")))
{ {
File::IOFile sky_file(file.filePath().toStdString(), "r+b"); File::IOFile sky_file(file.filePath().toStdString(), "r+b");
if (!sky_file) if (!sky_file)