Merge pull request #3067 from shun-iwasawa/reset_undo_on_saving_level…

…s_option Reset Undo when Saving Levels Preference Option
opentoonz · Feb 5, 2020 · 2d54639 · 2d54639
2 parents b9ef6ac + d2bb273
commit 2d54639
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/toonz/sources/include/toonz/preferencesitemids.h b/toonz/sources/include/toonz/preferencesitemids.h
@@ -65,6 +65,7 @@ enum PreferencesItemId {
   //----------
   // Saving
   rasterBackgroundColor,
+  resetUndoOnSavingLevel,
 
   //----------
   // Import / Export

diff --git a/toonz/sources/toonz/filebrowserpopup.cpp b/toonz/sources/toonz/filebrowserpopup.cpp
@@ -1651,7 +1651,8 @@ bool SaveLevelAsPopup::execute() {
     DvDirModel::instance()->refreshFolder(fp.getParentDir());
 
     // reset undo memory!!
-    TUndoManager::manager()->reset();
+    if (Preferences::instance()->getBoolValue(resetUndoOnSavingLevel))
+      TUndoManager::manager()->reset();
   }
 
   if (ret)

diff --git a/toonz/sources/toonz/iocommand.cpp b/toonz/sources/toonz/iocommand.cpp
@@ -2786,8 +2786,8 @@ class SaveLevelCommandHandler final : public MenuItemHandler {
     }
 
     // reset the undo before save level
-    // TODO: この仕様、Preferencesでオプション化する
-    TUndoManager::manager()->reset();
+    if (Preferences::instance()->getBoolValue(resetUndoOnSavingLevel))
+      TUndoManager::manager()->reset();
 
     if (!IoCmd::saveLevel()) error(QObject::tr("Save level Failed"));
   }
@@ -2983,8 +2983,8 @@ class OverwritePaletteCommandHandler final : public MenuItemHandler {
     else if (pl)
       pl->getPalette()->setDirtyFlag(false);
 
-    /*- Undoをリセット。 TODO:この挙動、Preferencesでオプション化 -*/
-    TUndoManager::manager()->reset();
+    if (Preferences::instance()->getBoolValue(resetUndoOnSavingLevel))
+      TUndoManager::manager()->reset();
 
     TApp::instance()
         ->getPaletteController()

diff --git a/toonz/sources/toonz/preferencespopup.cpp b/toonz/sources/toonz/preferencespopup.cpp
@@ -990,6 +990,7 @@ QString PreferencesPopup::getUIString(PreferencesItemId id) {
 
       // Saving
       {rasterBackgroundColor, tr("Matte color: ")},
+      {resetUndoOnSavingLevel, tr("Clear Undo History when Saving Levels")},
 
       // Import / Export
       {ffmpegPath, tr("FFmpeg Path: ")},
@@ -1532,6 +1533,7 @@ QWidget* PreferencesPopup::createSavingPage() {
                  this);
   lay->addWidget(matteColorLabel, 0, 0, 1, 3, Qt::AlignLeft);
   insertUI(rasterBackgroundColor, lay);
+  insertUI(resetUndoOnSavingLevel, lay);
 
   lay->setRowStretch(lay->rowCount(), 1);
   widget->setLayout(lay);

diff --git a/toonz/sources/toonzlib/preferences.cpp b/toonz/sources/toonzlib/preferences.cpp
@@ -432,6 +432,8 @@ void Preferences::definePreferenceItems() {
   // Saving
   define(rasterBackgroundColor, "rasterBackgroundColor", QMetaType::QColor,
          QColor(Qt::white));
+  define(resetUndoOnSavingLevel, "resetUndoOnSavingLevel", QMetaType::Bool,
+         true);
 
   setCallBack(rasterBackgroundColor, &Preferences::setRasterBackgroundColor);