mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-07-19 03:17:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add warning/error about overwritting the original file on Save Copy As

Browse Source
This commit is contained in:
David Capello 2017-09-08 16:54:42 -03:00
parent e78f4c79c8
commit 82e1377a41
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/app/commands/cmd_save_file.cpp
View File

@ -172,9 +172,11 @@ bool SaveFileBaseCommand::onEnabled(Context* context)
return context->checkFlags(ContextFlags::ActiveDocumentIsWritable);
}
bool SaveFileBaseCommand::saveAsDialog(Context* context,
const char* dlgTitle,
FileSelectorDelegate* delegate)
bool SaveFileBaseCommand::saveAsDialog(
Context* context,
const std::string& dlgTitle,
const std::string& forbiddenFilename,
FileSelectorDelegate* delegate)
{
const Document* document = context->activeDocument();
std::string filename;
@ -193,6 +195,7 @@ bool SaveFileBaseCommand::saveAsDialog(Context* context,
std::string exts = get_writable_extensions();
filename = document->filename();
again:;
FileSelectorFiles newfilename;
if (!app::show_file_selector(
dlgTitle, filename, exts,
@ -201,6 +204,15 @@ bool SaveFileBaseCommand::saveAsDialog(Context* context,
return false;
filename = newfilename.front();
if (base::normalize_path(forbiddenFilename) ==
base::normalize_path(filename)) {
ui::Alert::show("Overwrite Warning"
"<<You cannot save a copy with the same name (overwrite the original file)."
"<<Use File > Save menu option in that case."
"||&OK");
goto again;
}
if (delegate &&
delegate->hasResizeCombobox()) {
xscale = yscale = delegate->getResizeScale();
@ -431,7 +443,8 @@ void SaveFileCopyAsCommand::onExecute(Context* context)
docPref.saveCopy.filename());
}
if (saveAsDialog(context, "Save Copy As", delegate)) {
if (saveAsDialog(context, "Save Copy As",
oldFilename, delegate)) {
docPref.saveCopy.filename(document->filename());
if (delegate) {
docPref.saveCopy.resizeScale(delegate->getResizeScale());

4
src/app/commands/cmd_save_file.h
View File

@ -29,7 +29,9 @@ namespace app {
void onLoadParams(const Params& params) override;
bool onEnabled(Context* context) override;
bool saveAsDialog(Context* context, const char* dlgTitle,
bool saveAsDialog(Context* context,
const std::string& dlgTitle,
const std::string& forbiddenFilename = std::string(),
FileSelectorDelegate* delegate = nullptr);
void saveDocumentInBackground(const Context* context,
const app::Document* document,