piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13341 from jordan-woyak/sd-convert-buttons-rename

Browse Source 
DolphinQt: Rename the pack/unpack SD Card buttons.
This commit is contained in:
JMC47
2025-02-15 00:31:40 -05:00
committed by GitHub
parent f9accfd4d6 adc5b81c31
commit 0fc36bbfa9
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Common/FatFsUtil.h
View File

@ -9,6 +9,9 @@
namespace Common
{
static constexpr auto SD_PACK_TEXT = "Pack SD Card Now";
static constexpr auto SD_UNPACK_TEXT = "Unpack SD Card Now";
bool SyncSDFolderToSDImage(const std::function<bool()>& cancelled, bool deterministic);
bool SyncSDImageToSDFolder(const std::function<bool()>& cancelled);

3
Source/Core/Core/Core.cpp
View File

@ -537,7 +537,8 @@ static void EmuThread(Core::System& system, std::unique_ptr<BootParameters> boot
PanicAlertFmtT(
"Failed to sync SD card with folder. All changes made this session will be "
"discarded on next boot if you do not manually re-issue a resync in Config > "
"Wii > SD Card Settings > Convert File to Folder Now!");
"Wii > SD Card Settings > {0}!",
Common::GetStringT(Common::SD_UNPACK_TEXT));
}
}
}};

16
Source/Core/DolphinQt/Settings/WiiPane.cpp
View File

@ -265,12 +265,12 @@ void WiiPane::CreateSDCard()
sd_settings_group_layout->addWidget(m_sd_card_size_combo, row, 1);
++row;
m_sd_pack_button = new NonDefaultQPushButton(tr("Convert Folder to File Now"));
m_sd_unpack_button = new NonDefaultQPushButton(tr("Convert File to Folder Now"));
m_sd_pack_button = new NonDefaultQPushButton(tr(Common::SD_PACK_TEXT));
m_sd_unpack_button = new NonDefaultQPushButton(tr(Common::SD_UNPACK_TEXT));
connect(m_sd_pack_button, &QPushButton::clicked, [this] {
auto result = ModalMessageBox::warning(
this, tr("Convert Folder to File Now"),
tr("You are about to convert the content of the folder at %1 into the file at %2. All "
this, tr(Common::SD_PACK_TEXT),
tr("You are about to pack the content of the folder at %1 into the file at %2. All "
"current content of the file will be deleted. Are you sure you want to continue?")
.arg(QString::fromStdString(File::GetUserPath(D_WIISDCARDSYNCFOLDER_IDX)))
.arg(QString::fromStdString(File::GetUserPath(F_WIISDCARDIMAGE_IDX))),
@ -289,13 +289,13 @@ void WiiPane::CreateSDCard()
SetQWidgetWindowDecorations(progress_dialog.GetRaw());
progress_dialog.GetRaw()->exec();
if (!success.get())
ModalMessageBox::warning(this, tr("Convert Folder to File Now"), tr("Conversion failed."));
ModalMessageBox::warning(this, tr(Common::SD_PACK_TEXT), tr("Conversion failed."));
}
});
connect(m_sd_unpack_button, &QPushButton::clicked, [this] {
auto result = ModalMessageBox::warning(
this, tr("Convert File to Folder Now"),
tr("You are about to convert the content of the file at %2 into the folder at %1. All "
this, tr(Common::SD_UNPACK_TEXT),
tr("You are about to unpack the content of the file at %2 into the folder at %1. All "
"current content of the folder will be deleted. Are you sure you want to continue?")
.arg(QString::fromStdString(File::GetUserPath(D_WIISDCARDSYNCFOLDER_IDX)))
.arg(QString::fromStdString(File::GetUserPath(F_WIISDCARDIMAGE_IDX))),
@ -314,7 +314,7 @@ void WiiPane::CreateSDCard()
SetQWidgetWindowDecorations(progress_dialog.GetRaw());
progress_dialog.GetRaw()->exec();
if (!success.get())
ModalMessageBox::warning(this, tr("Convert File to Folder Now"), tr("Conversion failed."));
ModalMessageBox::warning(this, tr(Common::SD_UNPACK_TEXT), tr("Conversion failed."));
}
});
sd_settings_group_layout->addWidget(m_sd_pack_button, row, 0, 1, 1);