mirror of
https://github.com/aseprite/aseprite.git
synced 2025-04-16 05:42:32 +00:00
Add option to ignore a warning overwriting files on Export Sprite Sheet (related to #917)
This commit is contained in:
parent
478c4c3296
commit
9f96ccbd39
@ -257,6 +257,9 @@
|
|||||||
<option id="show_export_animation_in_sequence_alert" type="bool" default="true" />
|
<option id="show_export_animation_in_sequence_alert" type="bool" default="true" />
|
||||||
<option id="default_extension" type="std::string" default=""aseprite"" />
|
<option id="default_extension" type="std::string" default=""aseprite"" />
|
||||||
</section>
|
</section>
|
||||||
|
<section id="sprite_sheet">
|
||||||
|
<option id="show_overwrite_files_alert" type="bool" default="true" />
|
||||||
|
</section>
|
||||||
<section id="gif">
|
<section id="gif">
|
||||||
<option id="show_alert" type="bool" default="true" />
|
<option id="show_alert" type="bool" default="true" />
|
||||||
<option id="interlaced" type="bool" default="false" migrate="GIF.Interlaced" />
|
<option id="interlaced" type="bool" default="false" migrate="GIF.Interlaced" />
|
||||||
|
@ -951,6 +951,7 @@ END
|
|||||||
undo_allow_nonlinear_history = Allow non-linear history
|
undo_allow_nonlinear_history = Allow non-linear history
|
||||||
file_format_doesnt_support_alert = Show warning when saving a file with unsupported features
|
file_format_doesnt_support_alert = Show warning when saving a file with unsupported features
|
||||||
export_animation_in_sequence_alert = Show warning when saving an animation as a sequence of static images
|
export_animation_in_sequence_alert = Show warning when saving an animation as a sequence of static images
|
||||||
|
overwrite_files_on_export_sprite_sheet_alert = Show warning when overwriting files on Export Sprite Sheet
|
||||||
gif_options_alert = Show GIF options when saving .gif files
|
gif_options_alert = Show GIF options when saving .gif files
|
||||||
jpeg_options_alert = Show JPEG options when saving .jpeg files
|
jpeg_options_alert = Show JPEG options when saving .jpeg files
|
||||||
advanced_mode_alert = Show alert when we enter to Advanced Mode
|
advanced_mode_alert = Show alert when we enter to Advanced Mode
|
||||||
|
@ -276,6 +276,7 @@
|
|||||||
<separator text="@.section_alerts" horizontal="true" />
|
<separator text="@.section_alerts" horizontal="true" />
|
||||||
<check id="file_format_doesnt_support_alert" text="@.file_format_doesnt_support_alert" />
|
<check id="file_format_doesnt_support_alert" text="@.file_format_doesnt_support_alert" />
|
||||||
<check id="export_animation_in_sequence_alert" text="@.export_animation_in_sequence_alert" />
|
<check id="export_animation_in_sequence_alert" text="@.export_animation_in_sequence_alert" />
|
||||||
|
<check id="overwrite_files_on_export_sprite_sheet_alert" text="@.overwrite_files_on_export_sprite_sheet_alert" />
|
||||||
<check id="gif_options_alert" text="@.gif_options_alert" />
|
<check id="gif_options_alert" text="@.gif_options_alert" />
|
||||||
<check id="jpeg_options_alert" text="@.jpeg_options_alert" />
|
<check id="jpeg_options_alert" text="@.jpeg_options_alert" />
|
||||||
<check id="advanced_mode_alert" text="@.advanced_mode_alert" />
|
<check id="advanced_mode_alert" text="@.advanced_mode_alert" />
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#include "app/restore_visible_layers.h"
|
#include "app/restore_visible_layers.h"
|
||||||
#include "app/ui/editor/editor.h"
|
#include "app/ui/editor/editor.h"
|
||||||
#include "app/ui/layer_frame_comboboxes.h"
|
#include "app/ui/layer_frame_comboboxes.h"
|
||||||
|
#include "app/ui/optional_alert.h"
|
||||||
#include "app/ui/status_bar.h"
|
#include "app/ui/status_bar.h"
|
||||||
#include "app/ui/timeline/timeline.h"
|
#include "app/ui/timeline/timeline.h"
|
||||||
#include "base/bind.h"
|
#include "base/bind.h"
|
||||||
@ -147,9 +148,12 @@ namespace {
|
|||||||
if (base::is_file(dataname))
|
if (base::is_file(dataname))
|
||||||
text << "<<" << base::get_file_name(dataname).c_str();
|
text << "<<" << base::get_file_name(dataname).c_str();
|
||||||
|
|
||||||
if (ui::Alert::show(
|
int ret = OptionalAlert::show(
|
||||||
fmt::format(Strings::alerts_overwrite_files_on_export_sprite_sheet(),
|
Preferences::instance().spriteSheet.showOverwriteFilesAlert,
|
||||||
text.str())) != 1)
|
1, // Yes is the default option when the alert dialog is disabled
|
||||||
|
fmt::format(Strings::alerts_overwrite_files_on_export_sprite_sheet(),
|
||||||
|
text.str()));
|
||||||
|
if (ret != 1)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
@ -155,6 +155,7 @@ public:
|
|||||||
// Alerts
|
// Alerts
|
||||||
fileFormatDoesntSupportAlert()->setSelected(m_pref.saveFile.showFileFormatDoesntSupportAlert());
|
fileFormatDoesntSupportAlert()->setSelected(m_pref.saveFile.showFileFormatDoesntSupportAlert());
|
||||||
exportAnimationInSequenceAlert()->setSelected(m_pref.saveFile.showExportAnimationInSequenceAlert());
|
exportAnimationInSequenceAlert()->setSelected(m_pref.saveFile.showExportAnimationInSequenceAlert());
|
||||||
|
overwriteFilesOnExportSpriteSheetAlert()->setSelected(m_pref.spriteSheet.showOverwriteFilesAlert());
|
||||||
gifOptionsAlert()->setSelected(m_pref.gif.showAlert());
|
gifOptionsAlert()->setSelected(m_pref.gif.showAlert());
|
||||||
jpegOptionsAlert()->setSelected(m_pref.jpeg.showAlert());
|
jpegOptionsAlert()->setSelected(m_pref.jpeg.showAlert());
|
||||||
advancedModeAlert()->setSelected(m_pref.advancedMode.showAlert());
|
advancedModeAlert()->setSelected(m_pref.advancedMode.showAlert());
|
||||||
@ -410,6 +411,7 @@ public:
|
|||||||
|
|
||||||
m_pref.saveFile.showFileFormatDoesntSupportAlert(fileFormatDoesntSupportAlert()->isSelected());
|
m_pref.saveFile.showFileFormatDoesntSupportAlert(fileFormatDoesntSupportAlert()->isSelected());
|
||||||
m_pref.saveFile.showExportAnimationInSequenceAlert(exportAnimationInSequenceAlert()->isSelected());
|
m_pref.saveFile.showExportAnimationInSequenceAlert(exportAnimationInSequenceAlert()->isSelected());
|
||||||
|
m_pref.spriteSheet.showOverwriteFilesAlert(overwriteFilesOnExportSpriteSheetAlert()->isSelected());
|
||||||
m_pref.gif.showAlert(gifOptionsAlert()->isSelected());
|
m_pref.gif.showAlert(gifOptionsAlert()->isSelected());
|
||||||
m_pref.jpeg.showAlert(jpegOptionsAlert()->isSelected());
|
m_pref.jpeg.showAlert(jpegOptionsAlert()->isSelected());
|
||||||
m_pref.advancedMode.showAlert(advancedModeAlert()->isSelected());
|
m_pref.advancedMode.showAlert(advancedModeAlert()->isSelected());
|
||||||
@ -593,6 +595,7 @@ private:
|
|||||||
void onResetAlerts() {
|
void onResetAlerts() {
|
||||||
fileFormatDoesntSupportAlert()->setSelected(m_pref.saveFile.showFileFormatDoesntSupportAlert.defaultValue());
|
fileFormatDoesntSupportAlert()->setSelected(m_pref.saveFile.showFileFormatDoesntSupportAlert.defaultValue());
|
||||||
exportAnimationInSequenceAlert()->setSelected(m_pref.saveFile.showExportAnimationInSequenceAlert.defaultValue());
|
exportAnimationInSequenceAlert()->setSelected(m_pref.saveFile.showExportAnimationInSequenceAlert.defaultValue());
|
||||||
|
overwriteFilesOnExportSpriteSheetAlert()->setSelected(m_pref.spriteSheet.showOverwriteFilesAlert.defaultValue());
|
||||||
gifOptionsAlert()->setSelected(m_pref.gif.showAlert.defaultValue());
|
gifOptionsAlert()->setSelected(m_pref.gif.showAlert.defaultValue());
|
||||||
jpegOptionsAlert()->setSelected(m_pref.jpeg.showAlert.defaultValue());
|
jpegOptionsAlert()->setSelected(m_pref.jpeg.showAlert.defaultValue());
|
||||||
advancedModeAlert()->setSelected(m_pref.advancedMode.showAlert.defaultValue());
|
advancedModeAlert()->setSelected(m_pref.advancedMode.showAlert.defaultValue());
|
||||||
|
Loading…
x
Reference in New Issue
Block a user