New undo/redo implementation

app/src/actioncommands.cpp

@@ -31,6 +31,7 @@ GNU General Public License for more details.
 #include "soundmanager.h"
 #include "playbackmanager.h"
 #include "preferencemanager.h"
+#include "backupmanager.h"
 #include "util.h"
 #include "app_util.h"
 
@@ -80,10 +81,12 @@ Status ActionCommands::importSound()
         QString strLayerName = QInputDialog::getText(mParent, tr("Layer Properties", "Dialog title on creating a sound layer"),
                                                      tr("Layer name:"), QLineEdit::Normal,
                                                      tr("Sound Layer", "Default name on creating a sound layer"), &ok);
+        mEditor->backups()->prepareBackup();
         if (ok && !strLayerName.isEmpty())
         {
             Layer* newLayer = mEditor->layers()->createSoundLayer(strLayerName);
             mEditor->layers()->setCurrentLayer(newLayer);
+            mEditor->backups()->layerAdded();
         }
         else
         {
@@ -115,6 +118,7 @@ Status ActionCommands::importSound()
         layer->addKeyFrame(currentFrame, key);
     }
 
+    mEditor->backups()->prepareBackup();
     FileDialog fileDialog(mParent);
     QString strSoundFile = fileDialog.openFile(FileType::SOUND);
 
@@ -124,6 +128,7 @@ Status ActionCommands::importSound()
     }
 
     Status st = mEditor->sound()->loadSound(key, strSoundFile);
+    mEditor->backups()->keyAdded();
 
     if (!st.ok())
     {
@@ -150,7 +155,7 @@ Status ActionCommands::exportMovie(bool isGif)
     OnScopeExit(dialog->deleteLater());
 
     dialog->init();
-    
+
     std::vector< std::pair<QString, QSize> > camerasInfo;
     auto cameraLayers = mEditor->object()->getLayersByType< LayerCamera >();
     for (LayerCamera* i : cameraLayers)
@@ -180,7 +185,7 @@ Status ActionCommands::exportMovie(bool isGif)
 
     dialog->setDefaultRange(1, length, lengthWithSounds);
     dialog->exec();
-    
+
     if (dialog->result() == QDialog::Rejected)
     {
         return Status::SAFE;
@@ -263,7 +268,7 @@ Status ActionCommands::exportImageSequence()
 {
     auto dialog = new ExportImageDialog(mParent, FileType::IMAGE_SEQUENCE);
     OnScopeExit(dialog->deleteLater());
-    
+
     dialog->init();
 
     std::vector< std::pair<QString, QSize> > camerasInfo;
@@ -435,14 +440,22 @@ void ActionCommands::rotateCounterClockwise()
 
 void ActionCommands::toggleMirror()
 {
-    bool flipX = mEditor->view()->isFlipHorizontal();
-    mEditor->view()->flipHorizontal(!flipX);
+    BackupManager* backup = mEditor->backups();
+
+    bool flipX = !mEditor->view()->isFlipHorizontal();
+    mEditor->view()->flipHorizontal(flipX);
+
+    backup->flipView(flipX, DIRECTION::HORIZONTAL);
 }
 
 void ActionCommands::toggleMirrorV()
 {
-    bool flipY = mEditor->view()->isFlipVertical();
-    mEditor->view()->flipVertical(!flipY);
+    BackupManager* backup = mEditor->backups();
+
+    bool flipY = !mEditor->view()->isFlipVertical();
+    mEditor->view()->flipVertical(flipY);
+
+    backup->flipView(flipY, DIRECTION::VERTICAL);
 }
 
 void ActionCommands::showGrid(bool bShow)
@@ -489,8 +502,11 @@ void ActionCommands::GotoPrevKeyFrame()
 
 Status ActionCommands::addNewKey()
 {
+    BackupManager* backups = mEditor->backups();
+
     KeyFrame* key = mEditor->addNewKey();
 
+    backups->prepareBackup();
     SoundClip* clip = dynamic_cast<SoundClip*>(key);
     if (clip)
     {
@@ -516,16 +532,23 @@ Status ActionCommands::addNewKey()
         mEditor->view()->updateViewTransforms();
     }
 
+    backups->keyAdded();
     mEditor->layers()->notifyAnimationLengthChanged();
 
     return Status::OK;
 }
 
 void ActionCommands::removeKey()
 {
-    mEditor->removeKey();
+    BackupManager* backups = mEditor->backups();
 
     Layer* layer = mEditor->layers()->currentLayer();
+
+    mEditor->backups()->prepareBackup();
+
+    mEditor->removeCurrentKey();
+
+    backups->keyRemoved();
     if (layer->keyFrameCount() == 0)
     {
         layer->addNewKeyFrameAt(1);
@@ -534,6 +557,8 @@ void ActionCommands::removeKey()
 
 void ActionCommands::duplicateKey()
 {
+    BackupManager* backups = mEditor->backups();
+
     Layer* layer = mEditor->layers()->currentLayer();
     if (layer == NULL) return;
 
@@ -542,6 +567,7 @@ void ActionCommands::duplicateKey()
 
     KeyFrame* dupKey = key->clone();
 
+    backups->prepareBackup();
     int nextEmptyFrame = mEditor->currentFrame() + 1;
     while (layer->keyExistsWhichCovers(nextEmptyFrame))
     {
@@ -559,6 +585,7 @@ void ActionCommands::duplicateKey()
     {
         key->setFileName(""); // don't share filename
     }
+    backups->keyAdded();
 
     mEditor->layers()->notifyAnimationLengthChanged();
 }
@@ -592,25 +619,35 @@ void ActionCommands::moveFrameBackward()
 Status ActionCommands::addNewBitmapLayer()
 {
     bool ok;
+
+    BackupManager* backups = mEditor->backups();
+    backups->prepareBackup();
+
     QString text = QInputDialog::getText(nullptr, tr("Layer Properties"),
                                          tr("Layer name:"), QLineEdit::Normal,
                                          tr("Bitmap Layer"), &ok);
     if (ok && !text.isEmpty())
     {
         mEditor->layers()->createBitmapLayer(text);
+        backups->layerAdded();
     }
+
     return Status::OK;
 }
 
 Status ActionCommands::addNewVectorLayer()
 {
     bool ok;
+    BackupManager* backups = mEditor->backups();
+    backups->prepareBackup();
+
     QString text = QInputDialog::getText(nullptr, tr("Layer Properties"),
                                          tr("Layer name:"), QLineEdit::Normal,
                                          tr("Vector Layer"), &ok);
     if (ok && !text.isEmpty())
     {
         mEditor->layers()->createVectorLayer(text);
+        backups->layerAdded();
     }
 
     return Status::OK;
@@ -619,12 +656,16 @@ Status ActionCommands::addNewVectorLayer()
 Status ActionCommands::addNewCameraLayer()
 {
     bool ok;
+    BackupManager* backups = mEditor->backups();
+    backups->prepareBackup();
+
     QString text = QInputDialog::getText(nullptr, tr("Layer Properties"),
                                          tr("Layer name:"), QLineEdit::Normal,
                                          tr("Camera Layer"), &ok);
     if (ok && !text.isEmpty())
     {
         mEditor->layers()->createCameraLayer(text);
+        backups->layerAdded();
     }
 
     return Status::OK;
@@ -633,6 +674,9 @@ Status ActionCommands::addNewCameraLayer()
 Status ActionCommands::addNewSoundLayer()
 {
     bool ok = false;
+    BackupManager* backups = mEditor->backups();
+    backups->prepareBackup();
+
     QString strLayerName = QInputDialog::getText(nullptr, tr("Layer Properties"),
                                                  tr("Layer name:"), QLineEdit::Normal,
                                                  tr("Sound Layer"), &ok);
@@ -641,6 +685,7 @@ Status ActionCommands::addNewSoundLayer()
         Layer* layer = mEditor->layers()->createSoundLayer(strLayerName);
         mEditor->layers()->setCurrentLayer(layer);
 
+        backups->layerAdded();
         return Status::OK;
     }
     return Status::FAIL;
@@ -649,25 +694,63 @@ Status ActionCommands::addNewSoundLayer()
 Status ActionCommands::deleteCurrentLayer()
 {
     LayerManager* layerMgr = mEditor->layers();
-    QString strLayerName = layerMgr->currentLayer()->name();
+    BackupManager* backups = mEditor->backups();
+    Layer* layer = mEditor->layers()->currentLayer();
+    QString layerName = layer->name();
+    int layerIndex = mEditor->currentLayerIndex();
+
+    backups->prepareBackup();
+    std::map<int, KeyFrame*, std::greater<int>> keyFrames;
+    for(auto map : layer->getKeysInLayer())
+    {
+        keyFrames.insert(std::make_pair(map.first, map.second->clone()));
+    }
 
     int ret = QMessageBox::warning(mParent,
                                    tr("Delete Layer", "Windows title of Delete current layer pop-up."),
-                                   tr("Are you sure you want to delete layer: ") + strLayerName + " ?",
+                                   tr("Are you sure you want to delete layer: ") + layerName + " ?",
                                    QMessageBox::Ok | QMessageBox::Cancel,
                                    QMessageBox::Ok);
     if (ret == QMessageBox::Ok)
     {
-        Status st = layerMgr->deleteLayer(mEditor->currentLayerIndex());
+        Status st = layerMgr->deleteLayer(layerIndex);
         if (st == Status::ERROR_NEED_AT_LEAST_ONE_CAMERA_LAYER)
         {
             QMessageBox::information(mParent, "",
                                      tr("Please keep at least one camera layer in project", "text when failed to delete camera layer"));
+            return Status::CANCELED;
         }
+        backups->layerDeleted(keyFrames);
     }
     return Status::OK;
 }
 
+void ActionCommands::editCameraProperties()
+{
+    CameraPropertiesDialog* dialog = nullptr;
+    LayerCamera* layer = static_cast<LayerCamera*>(mEditor->layers()->currentLayer());
+
+    QRect viewRect = layer->getViewRect();
+    mEditor->backups()->prepareBackup();
+
+    if ( dialog == NULL )
+    {
+        dialog = new CameraPropertiesDialog( layer->name(), viewRect.width(), viewRect.height() );
+    }
+    dialog->setName( layer->name() );
+    dialog->setWidth(viewRect.width());
+    dialog->setHeight(viewRect.height());
+    int result = dialog->exec();
+    if (result == QDialog::Accepted)
+    {
+        layer->setName( dialog->getName() );
+        layer->setViewRect(QRect(-dialog->getWidth()/2,
+                                -dialog->getHeight()/2,
+                                dialog->getWidth(),
+                                dialog->getHeight()));
+        mEditor->backups()->cameraProperties(viewRect);
+    }
+}
 
 void ActionCommands::help()
 {

app/src/actioncommands.h

@@ -60,18 +60,20 @@ class ActionCommands : public QObject
     void GotoPrevFrame();
     void GotoNextKeyFrame();
     void GotoPrevKeyFrame();
-    Status addNewKey();
     void removeKey();
     void duplicateKey();
     void moveFrameForward();
     void moveFrameBackward();
 
+    Status addNewKey();
+
     // Layer
     Status addNewBitmapLayer();
     Status addNewVectorLayer();
     Status addNewCameraLayer();
     Status addNewSoundLayer();
     Status deleteCurrentLayer();
+    void editCameraProperties();
 
     // Help
     void help();

app/src/displayoptionwidget.cpp

@@ -21,10 +21,13 @@ GNU General Public License for more details.
 #include <QGridLayout>
 
 #include "preferencemanager.h"
+#include "backupmanager.h"
 #include "viewmanager.h"
 #include "scribblearea.h"
+
 #include "editor.h"
 #include "util.h"
+#include "direction.h"
 
 
 DisplayOptionWidget::DisplayOptionWidget(QWidget *parent) :
@@ -108,34 +111,57 @@ void DisplayOptionWidget::updateUI()
 
 void DisplayOptionWidget::onionPrevButtonClicked(bool isOn)
 {
+//    BackupManager* backup = editor()->backups();
+
     PreferenceManager* prefs = editor()->preference();
     prefs->set(SETTING::PREV_ONION, isOn);
+
+//    backup->toggleSetting(isOn, SETTING::PREV_ONION);
+
 }
 
 void DisplayOptionWidget::onionNextButtonClicked(bool isOn)
 {
+//    BackupManager* backup = editor()->backups();
+
     PreferenceManager* prefs = editor()->preference();
     prefs->set(SETTING::NEXT_ONION, isOn);
+
+//    backup->toggleSetting(isOn, SETTING::NEXT_ONION);
 }
 
 void DisplayOptionWidget::onionBlueButtonClicked(bool isOn)
 {
+//    BackupManager* backup = editor()->backups();
+
     PreferenceManager* prefs = editor()->preference();
     prefs->set(SETTING::ONION_BLUE, isOn);
+
+//    backup->toggleSetting(isOn, SETTING::ONION_BLUE);
 }
 
 void DisplayOptionWidget::onionRedButtonClicked(bool isOn)
 {
+//    BackupManager* backup = editor()->backups();
+
     PreferenceManager* prefs = editor()->preference();
     prefs->set(SETTING::ONION_RED, isOn);
+
+//    backup->toggleSetting(isOn, SETTING::ONION_RED);
 }
 
 void DisplayOptionWidget::toggleMirror(bool isOn)
 {
+//    BackupManager* backup = editor()->backups();
     editor()->view()->flipHorizontal(isOn);
+
+//    backup->flipView(isOn, DIRECTION::HORIZONTAL);
 }
 
 void DisplayOptionWidget::toggleMirrorV(bool isOn)
 {
+//    BackupManager* backup = editor()->backups();
     editor()->view()->flipVertical(isOn);
+
+//    backup->flipView(isOn, DIRECTION::VERTICAL);
 }