jprdonnelly/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-05-13 16:01:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve NAND import progress dialog

Browse Source 
Now with cancel button and an actual progress bar. For simplicity, we do
two passes on the progress bar, one for loading the NAND into memory and
one for extracting it. The user directory is likely on an SSD, making
the extraction pass invisibly fast.
This commit is contained in:
Tillmann Karras
2026-04-03 23:50:59 +01:00
parent 2b6ca92146
commit f06aef4f83
4 changed files with 56 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Core/DolphinQt/MainWindow.cpp
View File

@@ -1881,20 +1881,24 @@ void MainWindow::OnImportNANDBackup()
return;
ParallelProgressDialog dialog(this);
dialog.GetRaw()->setMinimum(0);
dialog.GetRaw()->setMaximum(0);
dialog.GetRaw()->setLabelText(tr("Importing NAND backup"));
dialog.GetRaw()->setCancelButton(nullptr);
auto beginning = QDateTime::currentDateTime().toMSecsSinceEpoch();
dialog.GetRaw()->setWindowTitle(tr("Importing NAND backup"));
std::future<void> result = std::async(std::launch::async, [&] {
DiscIO::NANDImporter().ImportNANDBin(
file.toStdString(),
[&dialog, beginning] {
dialog.SetLabelText(
tr("Importing NAND backup\n Time elapsed: %1s")
.arg((QDateTime::currentDateTime().toMSecsSinceEpoch() - beginning) / 1000));
[&dialog](DiscIO::NANDImporter::Step step, u32 cur, u32 max) {
switch (step)
{
case DiscIO::NANDImporter::Step::Loading:
dialog.SetLabelText(tr("Loading NAND..."));
break;
case DiscIO::NANDImporter::Step::Extracting:
dialog.SetLabelText(tr("Extracting NAND..."));
break;
}
dialog.SetValue(cur);
dialog.SetMaximum(max);
return dialog.WasCanceled();
},
[this] {
std::optional<std::string> keys_file = RunOnObject(this, [this] {