Add an option to set the amiibo directory

This commit is contained in:
Abandoned Cart 2023-06-15 08:27:38 -04:00
commit 2b15a33955
4 changed files with 46 additions and 0 deletions

View file

@ -19,6 +19,8 @@ ConfigureFilesystem::ConfigureFilesystem(QWidget* parent)
[this] { SetDirectory(DirectoryTarget::NAND, ui->nand_directory_edit); }); [this] { SetDirectory(DirectoryTarget::NAND, ui->nand_directory_edit); });
connect(ui->sdmc_directory_button, &QToolButton::pressed, this, connect(ui->sdmc_directory_button, &QToolButton::pressed, this,
[this] { SetDirectory(DirectoryTarget::SD, ui->sdmc_directory_edit); }); [this] { SetDirectory(DirectoryTarget::SD, ui->sdmc_directory_edit); });
connect(ui->amiibo_directory_button, &QToolButton::pressed, this,
[this] { SetDirectory(DirectoryTarget::Amiibo, ui->amiibo_directory_edit); });
connect(ui->gamecard_path_button, &QToolButton::pressed, this, connect(ui->gamecard_path_button, &QToolButton::pressed, this,
[this] { SetDirectory(DirectoryTarget::Gamecard, ui->gamecard_path_edit); }); [this] { SetDirectory(DirectoryTarget::Gamecard, ui->gamecard_path_edit); });
connect(ui->dump_path_button, &QToolButton::pressed, this, connect(ui->dump_path_button, &QToolButton::pressed, this,
@ -50,6 +52,8 @@ void ConfigureFilesystem::SetConfiguration() {
QString::fromStdString(Common::FS::GetYuzuPathString(Common::FS::YuzuPath::NANDDir))); QString::fromStdString(Common::FS::GetYuzuPathString(Common::FS::YuzuPath::NANDDir)));
ui->sdmc_directory_edit->setText( ui->sdmc_directory_edit->setText(
QString::fromStdString(Common::FS::GetYuzuPathString(Common::FS::YuzuPath::SDMCDir))); QString::fromStdString(Common::FS::GetYuzuPathString(Common::FS::YuzuPath::SDMCDir)));
ui->amiibo_directory_edit->setText(
QString::fromStdString(Common::FS::GetYuzuPathString(Common::FS::YuzuPath::AmiiboDir)));
ui->gamecard_path_edit->setText( ui->gamecard_path_edit->setText(
QString::fromStdString(Settings::values.gamecard_path.GetValue())); QString::fromStdString(Settings::values.gamecard_path.GetValue()));
ui->dump_path_edit->setText( ui->dump_path_edit->setText(
@ -72,6 +76,8 @@ void ConfigureFilesystem::ApplyConfiguration() {
ui->nand_directory_edit->text().toStdString()); ui->nand_directory_edit->text().toStdString());
Common::FS::SetYuzuPath(Common::FS::YuzuPath::SDMCDir, Common::FS::SetYuzuPath(Common::FS::YuzuPath::SDMCDir,
ui->sdmc_directory_edit->text().toStdString()); ui->sdmc_directory_edit->text().toStdString());
Common::FS::SetYuzuPath(Common::FS::YuzuPath::AmiiboDir,
ui->amiibo_directory_edit->text().toStdString());
Common::FS::SetYuzuPath(Common::FS::YuzuPath::DumpDir, Common::FS::SetYuzuPath(Common::FS::YuzuPath::DumpDir,
ui->dump_path_edit->text().toStdString()); ui->dump_path_edit->text().toStdString());
Common::FS::SetYuzuPath(Common::FS::YuzuPath::LoadDir, Common::FS::SetYuzuPath(Common::FS::YuzuPath::LoadDir,
@ -95,6 +101,9 @@ void ConfigureFilesystem::SetDirectory(DirectoryTarget target, QLineEdit* edit)
case DirectoryTarget::SD: case DirectoryTarget::SD:
caption = tr("Select Emulated SD Directory..."); caption = tr("Select Emulated SD Directory...");
break; break;
case DirectoryTarget::Amiibo:
caption = tr("Select Emulated Amiibo Directory...");
break;
case DirectoryTarget::Gamecard: case DirectoryTarget::Gamecard:
caption = tr("Select Gamecard Path..."); caption = tr("Select Gamecard Path...");
break; break;

View file

@ -30,6 +30,7 @@ private:
enum class DirectoryTarget { enum class DirectoryTarget {
NAND, NAND,
SD, SD,
Amiibo,
Gamecard, Gamecard,
Dump, Dump,
Load, Load,

View file

@ -75,6 +75,39 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="2" column="2">
<widget class="QLineEdit" name="amiibo_directory_edit"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Amiibo</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QToolButton" name="amiibo_directory_button">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Maximum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>60</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>

View file

@ -227,6 +227,9 @@ void Config::ReadValues() {
FS::SetYuzuPath(FS::YuzuPath::SDMCDir, FS::SetYuzuPath(FS::YuzuPath::SDMCDir,
sdl2_config->Get("Data Storage", "sdmc_directory", sdl2_config->Get("Data Storage", "sdmc_directory",
FS::GetYuzuPathString(FS::YuzuPath::SDMCDir))); FS::GetYuzuPathString(FS::YuzuPath::SDMCDir)));
FS::SetYuzuPath(FS::YuzuPath::AmiiboDir,
sdl2_config->Get("Data Storage", "amiibo_directory",
FS::GetYuzuPathString(FS::YuzuPath::AmiiboDir)));
FS::SetYuzuPath(FS::YuzuPath::LoadDir, FS::SetYuzuPath(FS::YuzuPath::LoadDir,
sdl2_config->Get("Data Storage", "load_directory", sdl2_config->Get("Data Storage", "load_directory",
FS::GetYuzuPathString(FS::YuzuPath::LoadDir))); FS::GetYuzuPathString(FS::YuzuPath::LoadDir)));