pencil2d · scribblemaniac · Sep 5, 2020 · Sep 6, 2020 · Sep 6, 2020 · Sep 6, 2020
diff --git a/app/app.pro b/app/app.pro
@@ -73,7 +73,8 @@ HEADERS += \
     src/doubleprogressdialog.h \
     src/colorslider.h \
     src/checkupdatesdialog.h \
-    src/presetdialog.h    
+    src/presetdialog.h \
+    src/retimedialog.h
 
 SOURCES += \
     src/importlayersdialog.cpp \
@@ -109,7 +110,8 @@ SOURCES += \
     src/colorslider.cpp \
     src/checkupdatesdialog.cpp \
     src/presetdialog.cpp \
-    src/app_util.cpp
+    src/app_util.cpp \
+    src/retimedialog.cpp
 
 FORMS += \
     ui/importimageseqpreview.ui \
@@ -137,7 +139,8 @@ FORMS += \
     ui/filespage.ui \
     ui/toolspage.ui \
     ui/toolboxwidget.ui \
-    ui/presetdialog.ui
+    ui/presetdialog.ui \
+    ui/retimedialog.ui
 
 
 

diff --git a/app/src/actioncommands.cpp b/app/src/actioncommands.cpp
@@ -56,6 +56,7 @@ GNU General Public License for more details.
 #include "doubleprogressdialog.h"
 #include "checkupdatesdialog.h"
 #include "errordialog.h"
+#include "retimedialog.h"
 
 
 ActionCommands::ActionCommands(QWidget* parent) : QObject(parent)
@@ -760,6 +761,18 @@ void ActionCommands::moveFrameBackward()
     }
 }
 
+void ActionCommands::retime()
+{
+    auto dialog = new RetimeDialog(mParent);
+    dialog->setOrigFps(mEditor->fps());
+    dialog->exec();
+
+    if (dialog->result() == QDialog::Accepted)
+    {
+        mEditor->retime(dialog->getNewFps(), dialog->getNewSpeed());
+    }
+}
+
 Status ActionCommands::addNewBitmapLayer()
 {
     bool ok;

diff --git a/app/src/actioncommands.h b/app/src/actioncommands.h
@@ -70,6 +70,7 @@ class ActionCommands : public QObject
     void duplicateKey();
     void moveFrameForward();
     void moveFrameBackward();
+    void retime();
 
     // Layer
     Status addNewBitmapLayer();

diff --git a/app/src/mainwindow2.cpp b/app/src/mainwindow2.cpp
@@ -352,6 +352,7 @@ void MainWindow2::createMenus()
     connect(ui->actionDuplicate_Frame, &QAction::triggered, mCommands, &ActionCommands::duplicateKey);
     connect(ui->actionMove_Frame_Forward, &QAction::triggered, mCommands, &ActionCommands::moveFrameForward);
     connect(ui->actionMove_Frame_Backward, &QAction::triggered, mCommands, &ActionCommands::moveFrameBackward);
+    connect(ui->actionRetime, &QAction::triggered, mCommands, &ActionCommands::retime);
 
     //--- Tool Menu ---
     connect(ui->actionMove, &QAction::triggered, mToolBox, &ToolBoxWidget::moveOn);
@@ -1243,6 +1244,7 @@ void MainWindow2::setupKeyboardShortcuts()
     ui->actionRemove_Frame->setShortcut(cmdKeySeq(CMD_REMOVE_FRAME));
     ui->actionMove_Frame_Backward->setShortcut(cmdKeySeq(CMD_MOVE_FRAME_BACKWARD));
     ui->actionMove_Frame_Forward->setShortcut(cmdKeySeq(CMD_MOVE_FRAME_FORWARD));
+    ui->actionRetime->setShortcut(cmdKeySeq(CMD_RETIME));
     ui->actionFlip_inbetween->setShortcut(cmdKeySeq(CMD_FLIP_INBETWEEN));
     ui->actionFlip_rolling->setShortcut(cmdKeySeq(CMD_FLIP_ROLLING));
 
@@ -1452,6 +1454,7 @@ void MainWindow2::makeConnections(Editor* pEditor, TimeLine* pTimeline)
     connect(pTimeline, &TimeLine::newCameraLayer, mCommands, &ActionCommands::addNewCameraLayer);
 
     connect(mTimeLine, &TimeLine::playButtonTriggered, mCommands, &ActionCommands::PlayStop);
+    connect(mTimeLine, &TimeLine::retimeTriggered, mCommands, &ActionCommands::retime);
 
     connect(pEditor->layers(), &LayerManager::currentLayerChanged, pTimeline, &TimeLine::updateUI);
     connect(pEditor->layers(), &LayerManager::layerCountChanged, pTimeline, &TimeLine::updateUI);
@@ -1461,6 +1464,8 @@ void MainWindow2::makeConnections(Editor* pEditor, TimeLine* pTimeline)
     connect(pEditor, &Editor::objectLoaded, pTimeline, &TimeLine::onObjectLoaded);
     connect(pEditor, &Editor::updateTimeLine, pTimeline, &TimeLine::updateUI);
 
+    connect(pEditor, &Editor::retimed, pTimeline, &TimeLine::updateFps);
+
     connect(pEditor->layers(), &LayerManager::currentLayerChanged, mToolOptions, &ToolOptionWidget::updateUI);
 }
 

diff --git a/app/src/retimedialog.cpp b/app/src/retimedialog.cpp
@@ -0,0 +1,30 @@
+#include "retimedialog.h"
+#include "ui_retimedialog.h"
+
+RetimeDialog::RetimeDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::RetimeDialog)
+{
+    ui->setupUi(this);
+}
+
+RetimeDialog::~RetimeDialog()
+{
+    delete ui;
+}
+
+void RetimeDialog::setOrigFps(int origFps)
+{
+    ui->origFps->setText(QString("<span style=' font-weight:600;'>%1 %2</span>").arg(origFps).arg(tr("fps")));
+    ui->newFpsBox->setValue(origFps);
+}
+
+int RetimeDialog::getNewFps()
+{
+    return ui->newFpsBox->value();
+}
+
+qreal RetimeDialog::getNewSpeed()
+{
+    return ui->newSpeedBox->value();
+}
diff --git a/app/src/retimedialog.h b/app/src/retimedialog.h
@@ -0,0 +1,27 @@
+#ifndef RETIMEDIALOG_H
+#define RETIMEDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+class RetimeDialog;
+}
+
+class RetimeDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit RetimeDialog(QWidget *parent = nullptr);
+    ~RetimeDialog();
+
+    void setOrigFps(int origFps);
+    int getNewFps();
+
+    qreal getNewSpeed();
+
+private:
+    Ui::RetimeDialog *ui;
+};
+
+#endif // RETIMEDIALOG_H
diff --git a/app/src/shortcutspage.cpp b/app/src/shortcutspage.cpp
@@ -330,6 +330,7 @@ static QString getHumanReadableShortcutName(const QString& cmdName)
         {CMD_LOOP, QObject::tr("Toggle Loop", "Shortcut")},
         {CMD_MOVE_FRAME_BACKWARD, QObject::tr("Move Frame Backward", "Shortcut")},
         {CMD_MOVE_FRAME_FORWARD, QObject::tr("Move Frame Forward", "Shortcut")},
+        {CMD_RETIME, QObject::tr("Retime Animation", "Shortcut")},
         {CMD_NEW_BITMAP_LAYER, QObject::tr("New Bitmap Layer", "Shortcut")},
         {CMD_NEW_CAMERA_LAYER, QObject::tr("New Camera Layer", "Shortcut")},
         {CMD_NEW_FILE, QObject::tr("New File", "Shortcut")},

diff --git a/app/ui/mainwindow2.ui b/app/ui/mainwindow2.ui
@@ -49,7 +49,7 @@
      <x>0</x>
      <y>0</y>
      <width>831</width>
-     <height>30</height>
+     <height>24</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -197,6 +197,7 @@
     <addaction name="separator"/>
     <addaction name="actionMove_Frame_Forward"/>
     <addaction name="actionMove_Frame_Backward"/>
+    <addaction name="actionRetime"/>
     <addaction name="separator"/>
     <addaction name="actionFlip_inbetween"/>
     <addaction name="actionFlip_rolling"/>
@@ -1089,6 +1090,11 @@
     <string>Open Temporary Directory</string>
    </property>
   </action>
+  <action name="actionRetime">
+   <property name="text">
+    <string>Retime Animation</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

diff --git a/app/ui/retimedialog.ui b/app/ui/retimedialog.ui
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>RetimeDialog</class>
+ <widget class="QDialog" name="RetimeDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>456</width>
+    <height>335</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Retime Animation</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="titleLabel">
+     <property name="text">
+      <string>&lt;h1&gt;Retime Animation&lt;/h1&gt;</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="descLabel">
+     <property name="text">
+      <string>Retiming allows you to adjust the FPS and playback speed of your project independently. It accomplishes this by moving the frames closer together or further apart to reach the desired speed and frame rate.</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="frameRateLabel">
+     <property name="text">
+      <string>&lt;span style=&quot; text-decoration: underline;&quot;&gt;Frame Rate&lt;/span&gt;</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="fpsGroup">
+     <item>
+      <widget class="QLabel" name="origFpsLabel">
+       <property name="text">
+        <string>Original:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="origFps">
+       <property name="text">
+        <string>&lt;span style=&quot; font-weight:600;&quot;&gt;12 fps&lt;/span&gt;</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="newFpsLabel">
+       <property name="text">
+        <string>New:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QSpinBox" name="newFpsBox">
+       <property name="suffix">
+        <string> fps</string>
+       </property>
+       <property name="minimum">
+        <number>1</number>
+       </property>
+       <property name="maximum">
+        <number>90</number>
+       </property>
+       <property name="value">
+        <number>12</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="speedTitle">
+     <property name="text">
+      <string>&lt;span style=&quot; text-decoration: underline;&quot;&gt;Speed&lt;/span&gt;</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="speedGroup">
+     <item>
+      <widget class="QLabel" name="origSpeedLabel">
+       <property name="text">
+        <string>Original:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="origSpeed">
+       <property name="text">
+        <string>&lt;span style=&quot; font-weight:600;&quot;&gt;1.00x&lt;/span&gt;</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="newSpeedLabel">
+       <property name="text">
+        <string>New:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDoubleSpinBox" name="newSpeedBox">
+       <property name="suffix">
+        <string>x</string>
+       </property>
+       <property name="minimum">
+        <double>0.010000000000000</double>
+       </property>
+       <property name="maximum">
+        <double>90.000000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>0.100000000000000</double>
+       </property>
+       <property name="value">
+        <double>1.000000000000000</double>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="warningLabel">
+     <property name="text">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:red;&quot;&gt;Warning: Retiming to a lower fps or higher speed may result in the loss of frames. This action cannot be undone.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>RetimeDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>RetimeDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/core_lib/data/resources/kb.ini b/core_lib/data/resources/kb.ini
@@ -50,6 +50,7 @@ CmdGotoNextKeyFrame=Alt+.
 CmdGotoPreviousKeyFrame=Alt+","
 CmdMoveFrameForward=Ctrl+.
 CmdMoveFrameBackward=ctrl+","
+CmdRetime=
 CmdAddFrame=F7
 CmdDuplicateFrame=F6
 CmdRemoveFrame=Shift+F5