edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add "Delete" button to editor file browser

Browse source 
To delete files and empty folders from the user's save directory.

Only files and folders from the user's save directory can be deleted. Only empty folders can be deleted.

Error message popups are shown when the deletion fails.

Closes #6272.
This commit is contained in:
Robert Müller 2023-03-25 16:52:08 +01:00
parent 6f1533ee18
commit fda8507d03
1 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/game/editor/editor.cpp
View file

@ -4980,9 +4980,10 @@ void CEditor::RenderFileDialog()
static int s_OkButton = 0; static int s_OkButton = 0;
static int s_CancelButton = 0; static int s_CancelButton = 0;
static int s_RefreshButton = 0; static int s_RefreshButton = 0;
static int s_ShowDirectoryButton = 0;
static int s_DeleteButton = 0;
static int s_NewFolderButton = 0; static int s_NewFolderButton = 0;
static int s_MapInfoButton = 0; static int s_MapInfoButton = 0;
static int s_ShowDirectoryButton = 0;
CUIRect Button; CUIRect Button;
ButtonBar.VSplitRight(50.0f, &ButtonBar, &Button); ButtonBar.VSplitRight(50.0f, &ButtonBar, &Button);
@ -5058,6 +5059,42 @@ void CEditor::RenderFileDialog()
} }
} }
ButtonBar.VSplitRight(40.0f, &ButtonBar, &Button);
ButtonBar.VSplitRight(50.0f, &ButtonBar, &Button);
static SConfirmPopupContext s_ConfirmDeletePopupContext;
if(m_FilesSelectedIndex >= 0 && m_vpFilteredFileList[m_FilesSelectedIndex]->m_StorageType == IStorage::TYPE_SAVE && !m_vpFilteredFileList[m_FilesSelectedIndex]->m_IsLink && str_comp(m_vpFilteredFileList[m_FilesSelectedIndex]->m_aFilename, "..") != 0)
{
if(DoButton_Editor(&s_DeleteButton, "Delete", 0, &Button, 0, nullptr) || (s_ListBoxUsed && UI()->ConsumeHotkey(CUI::HOTKEY_DELETE)))
{
s_ConfirmDeletePopupContext.Reset();
str_format(s_ConfirmDeletePopupContext.m_aMessage, sizeof(s_ConfirmDeletePopupContext.m_aMessage), "Are you sure that you want to delete the %s '%s/%s'?", IsDir ? "folder" : "file", m_pFileDialogPath, m_vpFilteredFileList[m_FilesSelectedIndex]->m_aFilename);
ShowPopupConfirm(UI()->MouseX(), UI()->MouseY(), &s_ConfirmDeletePopupContext);
}
if(s_ConfirmDeletePopupContext.m_Result == SConfirmPopupContext::CONFIRMED)
{
char aDeleteFilePath[IO_MAX_PATH_LENGTH];
str_format(aDeleteFilePath, sizeof(aDeleteFilePath), "%s/%s", m_pFileDialogPath, m_vpFilteredFileList[m_FilesSelectedIndex]->m_aFilename);
if(IsDir)
{
if(Storage()->RemoveFolder(aDeleteFilePath, IStorage::TYPE_SAVE))
FilelistPopulate(m_FileDialogLastPopulatedStorageType, true);
else
ShowFileDialogError("Failed to delete folder '%s'. Make sure it's empty first.", aDeleteFilePath);
}
else
{
if(Storage()->RemoveFile(aDeleteFilePath, IStorage::TYPE_SAVE))
FilelistPopulate(m_FileDialogLastPopulatedStorageType, true);
else
ShowFileDialogError("Failed to delete file '%s'.", aDeleteFilePath);
}
}
if(s_ConfirmDeletePopupContext.m_Result != SConfirmPopupContext::UNSET)
s_ConfirmDeletePopupContext.Reset();
}
else
s_ConfirmDeletePopupContext.Reset();
if(m_FileDialogStorageType == IStorage::TYPE_SAVE) if(m_FileDialogStorageType == IStorage::TYPE_SAVE)
{ {
ButtonBar.VSplitLeft(70.0f, &Button, &ButtonBar); ButtonBar.VSplitLeft(70.0f, &Button, &ButtonBar);