pencil2d · davidlamhauge · Sep 17, 2018 · Sep 21, 2018 · Sep 21, 2018 · Sep 22, 2018
diff --git a/app/app.pro b/app/app.pro
@@ -68,6 +68,7 @@ HEADERS += \
     src/spinslider.h \
     src/doubleprogressdialog.h \
     src/colorslider.h \
+    src/copymultiplekeyframesdialog.h \
     src/checkupdatesdialog.h \
     src/presetdialog.h
 
@@ -102,6 +103,7 @@ SOURCES += \
     src/spinslider.cpp \
     src/doubleprogressdialog.cpp \
     src/colorslider.cpp \
+    src/copymultiplekeyframesdialog.cpp \
     src/checkupdatesdialog.cpp \
     src/presetdialog.cpp
 
@@ -130,6 +132,7 @@ FORMS += \
     ui/filespage.ui \
     ui/toolspage.ui \
     ui/toolboxwidget.ui \
+    ui/copymultiplekeyframesdialog.ui \
     ui/presetdialog.ui
 
 

diff --git a/app/data/app.qrc b/app/data/app.qrc
@@ -56,6 +56,8 @@
         <file>icons/new/arrow-horizontal.png</file>
         <file>icons/new/arrow-selectmove.png</file>
         <file>icons/new/arrow-vertical.png</file>
+        <file>icons/manipulate_range.png</file>
+        <file>icons/copy_many.png</file>
     </qresource>
     <qresource prefix="/app">
         <file>icons/onion-blue.png</file>

diff --git a/app/data/icons/copy_many.png b/app/data/icons/copy_many.png
diff --git a/app/data/icons/manipulate_range.png b/app/data/icons/manipulate_range.png
diff --git a/app/src/actioncommands.cpp b/app/src/actioncommands.cpp
@@ -52,9 +52,9 @@ GNU General Public License for more details.
 #include "exportimagedialog.h"
 #include "aboutdialog.h"
 #include "doubleprogressdialog.h"
+#include "copymultiplekeyframesdialog.h"
 #include "checkupdatesdialog.h"
 
-
 ActionCommands::ActionCommands(QWidget* parent) : QObject(parent)
 {
     mParent = parent;
@@ -579,6 +579,74 @@ void ActionCommands::duplicateKey()
     mEditor->layers()->notifyAnimationLengthChanged();
 }
 
+void ActionCommands::manipulateFrames()
+{
+    int startLoop = 1, stopLoop = 2;          // default values
+    if (mEditor->playback()->isRangedPlaybackOn())
+    {                                   // defined range values if available
+        startLoop = mEditor->playback()->getRangedStartFrame();
+        stopLoop = mEditor->playback()->getRangedEndFrame();
+    }
+    LayerManager* layerMgr = mEditor->layers();
+    Layer::LAYER_TYPE layerType = layerMgr->currentLayer()->type();
+    if (layerType != Layer::BITMAP && layerType != Layer::VECTOR)
+    {
+        Q_UNUSED(QMessageBox::information(nullptr, tr("Action not available"),
+                                          tr("Can only be used on Bitmap and Vector layers."),
+                                          QMessageBox::Ok));
+        return;
+    }
+    CopyMultiplekeyframesDialog* cd = new CopyMultiplekeyframesDialog(layerMgr, startLoop, stopLoop, nullptr);
+    cd->exec();
+
+    if (cd->result() != QDialog::Accepted) { return; }
+
+    if (!cd->getValidity())
+    {
+        Q_UNUSED(QMessageBox::critical(nullptr, tr("Action not valid!"),
+                                       tr("Failed validation check:\n- Exceeds 9999 Frames OR\n- Range not valid"),
+                                       QMessageBox::Ok));
+        return;
+    }
+
+    // If Validation is OK
+    startLoop = cd->getFirstFrame();
+    stopLoop = cd->getLastFrame();
+    Layer *fromLayer = layerMgr->findLayerByName(cd->getFromLayer());
+    Q_ASSERT(fromLayer != nullptr);
+    Layer *toLayer = nullptr;
+    int scrubOrg = mEditor->currentFrame();
+    int numLoops, startFrame;
+    switch (cd->getCurrentTab()) {
+    case 0: // Copy
+        startFrame = cd->getCopyStartFrame();
+        toLayer = layerMgr->findLayerByName(cd->getCopyToLayer());
+        Q_ASSERT(toLayer != nullptr);
+        numLoops = cd->getNumLoops();
+        fromLayer->copyFrames(startLoop, stopLoop, numLoops, startFrame, fromLayer, toLayer);
+        break;
+    case 1: // Move
+        startFrame = cd->getMoveStartFrame();
+        toLayer = layerMgr->findLayerByName(cd->getMoveToLayer());
+        Q_ASSERT(toLayer != nullptr);
+        fromLayer->moveFrames(startLoop, stopLoop,startFrame, fromLayer, toLayer);
+        break;
+    case 2: // Reverse
+        startFrame = cd->getReverseStartFrame();
+        fromLayer->reverseFrames(startLoop, stopLoop, startFrame, fromLayer);
+        break;
+    case 3: // Delete
+        fromLayer->deleteFrames(startLoop, stopLoop, fromLayer);
+        break;
+    default:
+        Q_ASSERT(false);
+        break;
+    }
+    mEditor->scrubTo(scrubOrg);
+    mEditor->layers()->notifyLayerChanged(toLayer);
+    mEditor->layers()->notifyAnimationLengthChanged();
+}
+
 void ActionCommands::moveFrameForward()
 {
     Layer* layer = mEditor->layers()->currentLayer();

diff --git a/app/src/actioncommands.h b/app/src/actioncommands.h
@@ -19,17 +19,20 @@ GNU General Public License for more details.
 
 #include <QObject>
 #include "pencilerror.h"
+class Layer;
 
 class Editor;
 class QWidget;
 class ExportMovieDialog;
 
 
+
 class ActionCommands : public QObject
 {
     Q_OBJECT
 
 public:
+
     explicit ActionCommands(QWidget* parent = nullptr);
     virtual ~ActionCommands();
 
@@ -66,6 +69,7 @@ class ActionCommands : public QObject
     Status addNewKey();
     void removeKey();
     void duplicateKey();
+    void manipulateFrames();
     void moveFrameForward();
     void moveFrameBackward();