ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GCMemcardManager: Rewrite file deleting logic to provide a better user experience.

This commit is contained in:
Admiral H. Curtiss 2020-08-01 01:27:15 +02:00
parent 6e96f95432
commit e8b99d3afd
1 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Source/Core/DolphinQt/GCMemcardManager.cpp
View File

@ -598,46 +598,33 @@ void GCMemcardManager::CopyFiles()
void GCMemcardManager::DeleteFiles() void GCMemcardManager::DeleteFiles()
{ {
auto selection = m_slot_table[m_active_slot]->selectedItems(); auto& card = m_slot_memcard[m_active_slot];
auto& memcard = m_slot_memcard[m_active_slot]; if (!card)
auto count = selection.count() / m_slot_table[m_active_slot]->columnCount();
// Ask for confirmation if we are to delete multiple files
if (count > 1)
{
QString text = count == 1 ? tr("Do you want to delete the selected save file?") :
tr("Do you want to delete the %1 selected save files?").arg(count);
auto response = ModalMessageBox::question(this, tr("Question"), text);
;
if (response == QMessageBox::Abort)
return; return;
}
std::vector<int> file_indices; const auto selected_indices = GetSelectedFileIndices();
for (int i = 0; i < count; i++) if (selected_indices.empty())
{ return;
auto sel = selection[i * m_slot_table[m_active_slot]->columnCount()];
file_indices.push_back(memcard->GetFileIndex(m_slot_table[m_active_slot]->row(sel)));
}
for (int file_index : file_indices) const QString text = tr("Do you want to delete the %n selected save file(s)?", "",
static_cast<int>(selected_indices.size()));
const auto response = ModalMessageBox::question(this, tr("Question"), text);
if (response != QMessageBox::Yes)
return;
for (const u8 index : selected_indices)
{ {
if (memcard->RemoveFile(file_index) != Memcard::GCMemcardRemoveFileRetVal::SUCCESS) if (card->RemoveFile(index) != Memcard::GCMemcardRemoveFileRetVal::SUCCESS)
{ {
ModalMessageBox::warning(this, tr("Remove failed"), tr("Failed to remove file")); ModalMessageBox::warning(this, tr("Remove Failed"), tr("Failed to remove file."));
break;
} }
} }
if (!memcard->Save()) if (!card->Save())
{ {
PanicAlertFmtT("File write failed"); ModalMessageBox::warning(this, tr("Remove Failed"),
} tr("Failed to write modified memory card to disk."));
else
{
ModalMessageBox::information(this, tr("Success"), tr("Successfully deleted files."));
} }
UpdateSlotTable(m_active_slot); UpdateSlotTable(m_active_slot);