mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-18 11:42:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

UI: Tweak the NAND check popup message

Browse Source 
Inform the user that re-launching titles can also fix the issues.
This commit is contained in:
Léo Lam 2017-11-02 11:37:51 +01:00
parent 1cd4be1d0f
commit 71d4c47eb5
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Core/DolphinQt2/MenuBar.cpp
View File

@ -4,6 +4,8 @@
#include "DolphinQt2/MenuBar.h" #include "DolphinQt2/MenuBar.h"
#include <cinttypes>
#include <QAction> #include <QAction>
#include <QDesktopServices> #include <QDesktopServices>
#include <QFileDialog> #include <QFileDialog>
@ -13,6 +15,7 @@
#include "Common/CommonPaths.h" #include "Common/CommonPaths.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/StringUtil.h"
#include "Core/CommonTitles.h" #include "Core/CommonTitles.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
@ -550,20 +553,23 @@ void MenuBar::CheckNAND()
"Do you want to try to repair the NAND?"); "Do you want to try to repair the NAND?");
if (!result.titles_to_remove.empty()) if (!result.titles_to_remove.empty())
{ {
message += tr("\n\nWARNING: Fixing this NAND requires the deletion of titles that have " std::string title_listings;
"incomplete data on the NAND, including all associated save data. "
"By continuing, the following title(s) will be removed:\n\n");
Core::TitleDatabase title_db; Core::TitleDatabase title_db;
for (const u64 title_id : result.titles_to_remove) for (const u64 title_id : result.titles_to_remove)
{ {
const std::string name = title_db.GetTitleName(title_id); const std::string name = title_db.GetTitleName(title_id);
message += !name.empty() ? title_listings += !name.empty() ?
QStringLiteral("%1 (%2)") StringFromFormat("%s (%016" PRIx64 ")", name.c_str(), title_id) :
.arg(QString::fromStdString(name)) StringFromFormat("%016" PRIx64, title_id);
.arg(title_id, 16, 16, QLatin1Char('0')) : title_listings += "\n";
QStringLiteral("%1").arg(title_id, 16, 16, QLatin1Char('0'));
message += QStringLiteral("\n");
} }
message += tr("\n\nWARNING: Fixing this NAND requires the deletion of titles that have "
"incomplete data on the NAND, including all associated save data. "
"By continuing, the following title(s) will be removed:\n\n"
"%1"
"\nLaunching these titles may also fix the issues.")
.arg(QString::fromStdString(title_listings));
} }
if (QMessageBox::question(this, tr("NAND Check"), message) != QMessageBox::Yes) if (QMessageBox::question(this, tr("NAND Check"), message) != QMessageBox::Yes)

19
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -1327,17 +1327,24 @@ void CFrame::OnCheckNAND(wxCommandEvent&)
"Do you want to try to repair the NAND?"); "Do you want to try to repair the NAND?");
if (!result.titles_to_remove.empty()) if (!result.titles_to_remove.empty())
{ {
message += _("\n\nWARNING: Fixing this NAND requires the deletion of titles that have " std::string title_listings;
"incomplete data on the NAND, including all associated save data. "
"By continuing, the following title(s) will be removed:\n\n");
Core::TitleDatabase title_db; Core::TitleDatabase title_db;
for (const u64 title_id : result.titles_to_remove) for (const u64 title_id : result.titles_to_remove)
{ {
const std::string name = title_db.GetTitleName(title_id); const std::string name = title_db.GetTitleName(title_id);
message += !name.empty() ? StringFromFormat("%s (%016" PRIx64 ")", name.c_str(), title_id) : title_listings += !name.empty() ?
StringFromFormat("%016" PRIx64, title_id); StringFromFormat("%s (%016" PRIx64 ")", name.c_str(), title_id) :
message += "\n"; StringFromFormat("%016" PRIx64, title_id);
title_listings += "\n";
} }
message += wxString::Format(
_("\n\nWARNING: Fixing this NAND requires the deletion of titles that have "
"incomplete data on the NAND, including all associated save data. "
"By continuing, the following title(s) will be removed:\n\n"
"%s"
"\nLaunching these titles may also fix the issues."),
title_listings.c_str());
} }
if (wxMessageBox(message, _("NAND Check"), wxYES_NO) != wxYES) if (wxMessageBox(message, _("NAND Check"), wxYES_NO) != wxYES)