yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #7833 from lioncash/file-sys 

configure_filesystem: Add missing changeEvent() override
This commit is contained in:
Morph 2022-02-01 22:15:37 -05:00 committed by GitHub
parent 404a94a199 40d31b8b8a
commit 79e8f4abe8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/yuzu/configuration/configure_dialog.cpp
View File

@ -109,7 +109,7 @@ void ConfigureDialog::ApplyConfiguration() {
ui_tab->ApplyConfiguration(); ui_tab->ApplyConfiguration();
system_tab->ApplyConfiguration(); system_tab->ApplyConfiguration();
profile_tab->ApplyConfiguration(); profile_tab->ApplyConfiguration();
filesystem_tab->applyConfiguration(); filesystem_tab->ApplyConfiguration();
input_tab->ApplyConfiguration(); input_tab->ApplyConfiguration();
hotkeys_tab->ApplyConfiguration(registry); hotkeys_tab->ApplyConfiguration(registry);
cpu_tab->ApplyConfiguration(); cpu_tab->ApplyConfiguration();

16
src/yuzu/configuration/configure_filesystem.cpp
View File

@ -14,7 +14,7 @@
ConfigureFilesystem::ConfigureFilesystem(QWidget* parent) ConfigureFilesystem::ConfigureFilesystem(QWidget* parent)
: QWidget(parent), ui(std::make_unique<Ui::ConfigureFilesystem>()) { : QWidget(parent), ui(std::make_unique<Ui::ConfigureFilesystem>()) {
ui->setupUi(this); ui->setupUi(this);
this->setConfiguration(); SetConfiguration();
connect(ui->nand_directory_button, &QToolButton::pressed, this, connect(ui->nand_directory_button, &QToolButton::pressed, this,
[this] { SetDirectory(DirectoryTarget::NAND, ui->nand_directory_edit); }); [this] { SetDirectory(DirectoryTarget::NAND, ui->nand_directory_edit); });
@ -38,7 +38,15 @@ ConfigureFilesystem::ConfigureFilesystem(QWidget* parent)
ConfigureFilesystem::~ConfigureFilesystem() = default; ConfigureFilesystem::~ConfigureFilesystem() = default;
void ConfigureFilesystem::setConfiguration() { void ConfigureFilesystem::changeEvent(QEvent* event) {
if (event->type() == QEvent::LanguageChange) {
RetranslateUI();
}
QWidget::changeEvent(event);
}
void ConfigureFilesystem::SetConfiguration() {
ui->nand_directory_edit->setText( ui->nand_directory_edit->setText(
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(
@ -60,7 +68,7 @@ void ConfigureFilesystem::setConfiguration() {
UpdateEnabledControls(); UpdateEnabledControls();
} }
void ConfigureFilesystem::applyConfiguration() { void ConfigureFilesystem::ApplyConfiguration() {
Common::FS::SetYuzuPath(Common::FS::YuzuPath::NANDDir, Common::FS::SetYuzuPath(Common::FS::YuzuPath::NANDDir,
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,
@ -143,6 +151,6 @@ void ConfigureFilesystem::UpdateEnabledControls() {
!ui->gamecard_current_game->isChecked()); !ui->gamecard_current_game->isChecked());
} }
void ConfigureFilesystem::retranslateUi() { void ConfigureFilesystem::RetranslateUI() {
ui->retranslateUi(this); ui->retranslateUi(this);
} }

8
src/yuzu/configuration/configure_filesystem.h
View File

@ -20,11 +20,13 @@ public:
explicit ConfigureFilesystem(QWidget* parent = nullptr); explicit ConfigureFilesystem(QWidget* parent = nullptr);
~ConfigureFilesystem() override; ~ConfigureFilesystem() override;
void applyConfiguration(); void ApplyConfiguration();
void retranslateUi();
private: private:
void setConfiguration(); void changeEvent(QEvent* event) override;
void RetranslateUI();
void SetConfiguration();
enum class DirectoryTarget { enum class DirectoryTarget {
NAND, NAND,