New undo/redo implementation

app/src/actioncommands.h

@@ -51,6 +51,8 @@ class ActionCommands : public QObject
     // view
     void ZoomIn();
     void ZoomOut();
+    void zoomTo(const float value);
+    void resetView();
     void rotateClockwise();
     void rotateCounterClockwise();
     void toggleMirror();
@@ -63,18 +65,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();
     QString nameSuggest(QString s);
 
     // 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);
 }

app/src/mainwindow2.cpp

@@ -26,9 +26,12 @@ GNU General Public License for more details.
 #include <QList>
 #include <QMenu>
 #include <QFile>
+#include <QDir>
 #include <QMessageBox>
 #include <QProgressDialog>
 #include <QTabletEvent>
+#include <QStandardPaths>
+#include <QDateTime>
 
 // core_lib headers
 #include "pencildef.h"
@@ -39,6 +42,11 @@ GNU General Public License for more details.
 #include "filemanager.h"
 #include "colormanager.h"
 #include "layermanager.h"
+
+#include "backupmanager.h"
+#include "historyviewerwidget.h"
+#include "layercamera.h"
+
 #include "toolmanager.h"
 #include "playbackmanager.h"
 #include "soundmanager.h"
@@ -112,6 +120,23 @@ MainWindow2::MainWindow2(QWidget *parent) :
     mCommands = new ActionCommands(this);
     mCommands->setCore(mEditor);
 
+    ui->menuEdit->removeAction(ui->actionUndo);
+    ui->menuEdit->removeAction(ui->actionRedo);
+
+    QIcon undoIcon;
+    undoIcon.addFile(QStringLiteral(":/icons/undo.png"), QSize(), QIcon::Normal, QIcon::Off);
+    ui->actionUndo = mEditor->backups()->undoStack()->createUndoAction(this, tr("&Undo"));
+    ui->actionUndo->setIcon(undoIcon);
+
+    QIcon redoIcon;
+    redoIcon.addFile(QStringLiteral(":/icons/redo.png"), QSize(), QIcon::Normal, QIcon::Off);
+    ui->actionRedo = mEditor->backups()->undoStack()->createRedoAction(this, tr("&Redo"));
+    ui->actionRedo->setIcon(redoIcon);
+
+    ui->menuEdit->insertAction(ui->actionCut, ui->actionUndo);
+    ui->menuEdit->insertAction(ui->actionCut, ui->actionRedo);
+    ui->menuEdit->insertSeparator(ui->actionCut);
+
     createDockWidgets();
     createMenus();
     setupKeyboardShortcuts();
@@ -159,6 +184,9 @@ void MainWindow2::createDockWidgets()
     mToolBox = new ToolBoxWidget(this);
     mToolBox->setObjectName("ToolBox");
 
+    mHistoryView = new HistoryViewerWidget(this);
+    mHistoryView->setObjectName("History");
+
     /*
     mTimeline2 = new Timeline2;
     mTimeline2->setObjectName( "Timeline2" );
@@ -172,7 +200,8 @@ void MainWindow2::createDockWidgets()
         << mColorPalette
         << mDisplayOptionWidget
         << mToolOptions
-        << mToolBox;
+        << mToolBox
+        << mHistoryView;
 
     mStartIcon = QIcon(":icons/controls/play.png");
     mStopIcon = QIcon(":icons/controls/stop.png");
@@ -196,6 +225,7 @@ void MainWindow2::createDockWidgets()
     addDockWidget(Qt::LeftDockWidgetArea, mToolOptions);
     addDockWidget(Qt::LeftDockWidgetArea, mDisplayOptionWidget);
     addDockWidget(Qt::BottomDockWidgetArea, mTimeLine);
+    addDockWidget(Qt::RightDockWidgetArea, mHistoryView);
     setDockNestingEnabled(true);
 
     /*
@@ -249,9 +279,7 @@ void MainWindow2::createMenus()
     connect(ui->actionImport_Sound, &QAction::triggered, mCommands, &ActionCommands::importSound);
     connect(ui->actionImport_Palette, &QAction::triggered, this, &MainWindow2::importPalette);
 
-    //--- Edit Menu ---
-    connect(ui->actionUndo, &QAction::triggered, mEditor, &Editor::undo);
-    connect(ui->actionRedo, &QAction::triggered, mEditor, &Editor::redo);
+    /// --- Edit Menu ---
     connect(ui->actionCut, &QAction::triggered, mEditor, &Editor::cut);
     connect(ui->actionCopy, &QAction::triggered, mEditor, &Editor::copy);
     connect(ui->actionPaste, &QAction::triggered, mEditor, &Editor::paste);
@@ -275,14 +303,14 @@ void MainWindow2::createMenus()
     connect(ui->actionZoom_Out, &QAction::triggered, mCommands, &ActionCommands::ZoomOut);
     connect(ui->actionRotate_Clockwise, &QAction::triggered, mCommands, &ActionCommands::rotateClockwise);
     connect(ui->actionRotate_Anticlockwise, &QAction::triggered, mCommands, &ActionCommands::rotateCounterClockwise);
-    connect(ui->actionReset_View, &QAction::triggered, mEditor->view(), &ViewManager::resetView);
-    connect(ui->actionZoom400, &QAction::triggered, mEditor->view(), &ViewManager::scale400);
-    connect(ui->actionZoom300, &QAction::triggered, mEditor->view(), &ViewManager::scale300);
-    connect(ui->actionZoom200, &QAction::triggered, mEditor->view(), &ViewManager::scale200);
-    connect(ui->actionZoom100, &QAction::triggered, mEditor->view(), &ViewManager::scale100);
-    connect(ui->actionZoom50, &QAction::triggered, mEditor->view(), &ViewManager::scale50);
-    connect(ui->actionZoom33, &QAction::triggered, mEditor->view(), &ViewManager::scale33);
-    connect(ui->actionZoom25, &QAction::triggered, mEditor->view(), &ViewManager::scale25);
+    connect(ui->actionReset_View, &QAction::triggered, mCommands, &ActionCommands::resetView);
+    connect(ui->actionZoom400,  &QAction::triggered, this, [this]{ mCommands->zoomTo(4); });
+    connect(ui->actionZoom300,  &QAction::triggered, this, [this]{ mCommands->zoomTo(3); });
+    connect(ui->actionZoom200,  &QAction::triggered, this, [this]{ mCommands->zoomTo(2); });
+    connect(ui->actionZoom100,  &QAction::triggered, this, [this]{ mCommands->zoomTo(1); });
+    connect(ui->actionZoom50,  &QAction::triggered, this, [this]{ mCommands->zoomTo(0.5f); });
+    connect(ui->actionZoom33,  &QAction::triggered, this, [this]{ mCommands->zoomTo(0.33f); });
+    connect(ui->actionZoom25,  &QAction::triggered, this, [this]{ mCommands->zoomTo(0.25f); });
     connect(ui->actionHorizontal_Flip, &QAction::triggered, mCommands, &ActionCommands::toggleMirror);
     connect(ui->actionVertical_Flip, &QAction::triggered, mCommands, &ActionCommands::toggleMirrorV);
 
@@ -346,7 +374,8 @@ void MainWindow2::createMenus()
         mColorPalette->toggleViewAction(),
         mTimeLine->toggleViewAction(),
         mDisplayOptionWidget->toggleViewAction(),
-        mColorInspector->toggleViewAction()
+        mColorInspector->toggleViewAction(),
+        mHistoryView->toggleViewAction()
     };
 
     for (QAction* action : actions)
@@ -382,7 +411,6 @@ void MainWindow2::createMenus()
 
     connect(mRecentFileMenu, &RecentFileMenu::loadRecentFile, this, &MainWindow2::openFile);
 
-    connect(ui->menuEdit, &QMenu::aboutToShow, this, &MainWindow2::undoActSetText);
     connect(ui->menuEdit, &QMenu::aboutToHide, this, &MainWindow2::undoActSetEnabled);
 }
 
@@ -400,7 +428,9 @@ void MainWindow2::setOpacity(int opacity)
 
 void MainWindow2::updateSaveState()
 {
-    setWindowModified(mEditor->currentBackup() != mBackupAtSave);
+    bool hasBeenModified = mEditor->backups()->currentBackup() != mBackupAtSave;
+
+    setWindowModified(hasBeenModified);
 }
 
 void MainWindow2::clearRecentFilesList()
@@ -483,6 +513,9 @@ void MainWindow2::newDocument(bool force)
         mColorPalette->refreshColorList();
         mEditor->color()->setColorNumber(0);
 
+        // clear backup stack
+        mEditor->backups()->undoStack()->clear();
+
         setWindowTitle(PENCIL_WINDOW_TITLE);
         updateSaveState();
     }
@@ -640,6 +673,9 @@ bool MainWindow2::openObject(QString strFilePath, bool checkForChanges)
     mColorPalette->refreshColorList();
     mEditor->layers()->notifyAnimationLengthChanged();
 
+    // clear backup stack
+    mEditor->backups()->undoStack()->clear();
+
     progress.setValue(progress.maximum());
 
     updateSaveState();
@@ -706,13 +742,11 @@ bool MainWindow2::saveObject(QString strSavedFileName)
     mTimeLine->updateContent();
 
     setWindowTitle(strSavedFileName.prepend("[*]"));
-    mBackupAtSave = mEditor->currentBackup();
+    mBackupAtSave = mEditor->backups()->currentBackup();
     updateSaveState();
 
     progress.setValue(progress.maximum());
 
-    mEditor->resetAutoSaveCounter();
-
     return true;
 }
 
@@ -726,7 +760,7 @@ bool MainWindow2::saveDocument()
 
 bool MainWindow2::maybeSave()
 {
-    if (mEditor->currentBackup() != mBackupAtSave)
+    if (mEditor->backups()->currentBackup() != mBackupAtSave)
     {
         int ret = QMessageBox::warning(this, tr("Warning"),
                                        tr("This animation has been modified.\n Do you want to save your changes?"),
@@ -783,7 +817,8 @@ void MainWindow2::importImage()
     if (strFilePath.isEmpty()) { return; }
     if (!QFile::exists(strFilePath)) { return; }
 
-    bool ok = mEditor->importImage(strFilePath);
+    bool isSequence = false;
+    bool ok = mEditor->importImage(strFilePath, isSequence);
     if (!ok)
     {
         QMessageBox::warning(this,
@@ -838,7 +873,7 @@ void MainWindow2::importImageSequence()
             strImgFileLower.endsWith(".tif") ||
             strImgFileLower.endsWith(".tiff"))
         {
-            mEditor->importImage(strImgFile);
+            mEditor->importImage(strImgFile, mIsImportingImageSequence);
 
             imagesImportedSoFar++;
             progress.setValue(imagesImportedSoFar);
@@ -961,10 +996,11 @@ void MainWindow2::addLayerByFilename(QString strFilePath)
     Q_ASSERT(layer != nullptr);
     LayerManager* lMgr = mEditor->layers();
     lMgr->setCurrentLayer(layer);
+    bool isSequence = true;
     for (int i = 0; i < finalList.size(); i++)
     {
         mEditor->scrubTo(finalList[i].mid(dot - digits, digits).toInt());
-        bool ok = mEditor->importImage(path + finalList[i]);
+        bool ok = mEditor->importImage(path + finalList[i], isSequence);
         if (!ok) { return;}
         layer->addNewKeyFrameAt(finalList[i].mid(dot - digits, digits).toInt());
     }
@@ -1238,35 +1274,6 @@ void MainWindow2::clearKeyboardShortcuts()
     }
 }
 
-void MainWindow2::undoActSetText()
-{
-    if (mEditor->mBackupIndex < 0)
-    {
-        ui->actionUndo->setText(tr("Undo", "Menu item text"));
-        ui->actionUndo->setEnabled(false);
-    }
-    else
-    {
-        ui->actionUndo->setText(QString("%1   %2 %3").arg(tr("Undo", "Menu item text"))
-                                .arg(QString::number(mEditor->mBackupIndex + 1))
-                                .arg(mEditor->mBackupList.at(mEditor->mBackupIndex)->undoText));
-        ui->actionUndo->setEnabled(true);
-    }
-
-    if (mEditor->mBackupIndex + 2 < mEditor->mBackupList.size())
-    {
-        ui->actionRedo->setText(QString("%1   %2 %3").arg(tr("Redo", "Menu item text"))
-                                .arg(QString::number(mEditor->mBackupIndex + 2))
-                                .arg(mEditor->mBackupList.at(mEditor->mBackupIndex + 1)->undoText));
-        ui->actionRedo->setEnabled(true);
-    }
-    else
-    {
-        ui->actionRedo->setText(tr("Redo", "Menu item text"));
-        ui->actionRedo->setEnabled(false);
-    }
-}
-
 void MainWindow2::undoActSetEnabled()
 {
     ui->actionUndo->setEnabled(true);
@@ -1297,7 +1304,7 @@ void MainWindow2::importPalette()
 
 void MainWindow2::makeConnections(Editor* editor)
 {
-    connect(editor, &Editor::updateBackup, this, &MainWindow2::updateSaveState);
+    connect(editor->backups(), &BackupManager::updateBackup, this, &MainWindow2::updateSaveState);
     connect(editor, &Editor::needDisplayInfo, this, &MainWindow2::displayMessageBox);
     connect(editor, &Editor::needDisplayInfoNoTitle, this, &MainWindow2::displayMessageBoxNoTitle);
 }
@@ -1322,6 +1329,8 @@ void MainWindow2::makeConnections(Editor* editor, ScribbleArea* scribbleArea)
     connect(editor->layers(), &LayerManager::layerDeleted, scribbleArea, &ScribbleArea::updateAllFrames);
 
     connect(editor, &Editor::currentFrameChanged, scribbleArea, &ScribbleArea::updateFrame);
+//    connect(editor, &Editor::deselectAll, scribbleArea, &ScribbleArea::deselectAll);
+//    connect(editor, &Editor::selectAll, scribbleArea, &ScribbleArea::selectAll);
 
     connect(editor->view(), &ViewManager::viewChanged, scribbleArea, &ScribbleArea::updateAllFrames);
     //connect( editor->preference(), &PreferenceManager::preferenceChanged, scribbleArea, &ScribbleArea::onPreferencedChanged );
@@ -1342,6 +1351,8 @@ void MainWindow2::makeConnections(Editor* pEditor, TimeLine* pTimeline)
     connect(pTimeline, &TimeLine::newVectorLayer, mCommands, &ActionCommands::addNewVectorLayer);
     connect(pTimeline, &TimeLine::newSoundLayer, mCommands, &ActionCommands::addNewSoundLayer);
     connect(pTimeline, &TimeLine::newCameraLayer, mCommands, &ActionCommands::addNewCameraLayer);
+    connect(pTimeline, &TimeLine::deleteCurrentLayer, mCommands, &ActionCommands::deleteCurrentLayer);
+    connect(pTimeline, &TimeLine::modifiedCamera, mCommands, &ActionCommands::editCameraProperties);
 
     connect(mTimeLine, &TimeLine::playButtonTriggered, mCommands, &ActionCommands::PlayStop);