pencil2d · MrStevns · Jan 8, 2023 · Oct 31, 2022 · Jan 4, 2023 · Jan 8, 2023
diff --git a/app/app.pro b/app/app.pro
@@ -75,7 +75,6 @@ HEADERS += \
     src/predefinedsetmodel.h \
     src/pegbaralignmentdialog.h \
     src/shortcutfilter.h \
-    src/timeline2.h \
     src/actioncommands.h \
     src/preferencesdialog.h \
     src/filespage.h \
@@ -84,10 +83,16 @@ HEADERS += \
     src/timelinepage.h \
     src/toolspage.h \
     src/preview.h \
+    src/basedockwidget.h \
     src/colorbox.h \
     src/colorinspector.h \
     src/colorpalettewidget.h \
     src/colorwheel.h \
+    src/timeline.h \
+    src/timelinecells.h \
+    src/timecontrols.h \
+    src/cameracontextmenu.h \
+    src/camerapropertiesdialog.h \
     src/filedialog.h \
     src/pencil2d.h \
     src/exportmoviedialog.h \
@@ -123,7 +128,6 @@ SOURCES += \
     src/predefinedsetmodel.cpp \
     src/pegbaralignmentdialog.cpp \
     src/shortcutfilter.cpp \
-    src/timeline2.cpp \
     src/actioncommands.cpp \
     src/preferencesdialog.cpp \
     src/filespage.cpp \
@@ -132,10 +136,16 @@ SOURCES += \
     src/timelinepage.cpp \
     src/toolspage.cpp \
     src/preview.cpp \
+    src/basedockwidget.cpp \
     src/colorbox.cpp \
     src/colorinspector.cpp \
     src/colorpalettewidget.cpp \
     src/colorwheel.cpp \
+    src/timeline.cpp \
+    src/timelinecells.cpp \
+    src/timecontrols.cpp \
+    src/cameracontextmenu.cpp \
+    src/camerapropertiesdialog.cpp \
     src/filedialog.cpp \
     src/pencil2d.cpp \
     src/exportmoviedialog.cpp \
@@ -162,6 +172,7 @@ SOURCES += \
 
 FORMS += \
     ui/cameraoptionswidget.ui \
+    ui/camerapropertiesdialog.ui \
     ui/importimageseqpreview.ui \
     ui/importlayersdialog.ui \
     ui/importpositiondialog.ui \
@@ -170,7 +181,6 @@ FORMS += \
     ui/onionskin.ui \
     ui/pegbaralignmentdialog.ui \
     ui/repositionframesdialog.ui \
-    ui/timeline2.ui \
     ui/shortcutspage.ui \
     ui/colorinspector.ui \
     ui/colorpalette.ui \

diff --git a/app/src/actioncommands.cpp b/app/src/actioncommands.cpp
@@ -742,6 +742,7 @@ void ActionCommands::duplicateKey()
 
     layer->addKeyFrame(nextEmptyFrame, dupKey);
     mEditor->scrubTo(nextEmptyFrame);
+    emit mEditor->frameModified(nextEmptyFrame);
 
     if (layer->type() == Layer::SOUND)
     {

diff --git a/core_lib/src/interface/basedockwidget.cpp → app/src/basedockwidget.cpp b/core_lib/src/interface/basedockwidget.cpp → app/src/basedockwidget.cpp
diff --git a/core_lib/src/interface/basedockwidget.h → app/src/basedockwidget.h b/core_lib/src/interface/basedockwidget.h → app/src/basedockwidget.h
diff --git a/core_lib/src/interface/cameracontextmenu.cpp → app/src/cameracontextmenu.cpp b/core_lib/src/interface/cameracontextmenu.cpp → app/src/cameracontextmenu.cpp
diff --git a/core_lib/src/interface/cameracontextmenu.h → app/src/cameracontextmenu.h b/core_lib/src/interface/cameracontextmenu.h → app/src/cameracontextmenu.h
diff --git a/.../src/interface/camerapropertiesdialog.cpp → app/src/camerapropertiesdialog.cpp b/.../src/interface/camerapropertiesdialog.cpp → app/src/camerapropertiesdialog.cpp
diff --git a/...ib/src/interface/camerapropertiesdialog.h → app/src/camerapropertiesdialog.h b/...ib/src/interface/camerapropertiesdialog.h → app/src/camerapropertiesdialog.h
diff --git a/app/src/mainwindow2.cpp b/app/src/mainwindow2.cpp
@@ -68,7 +68,6 @@ GNU General Public License for more details.
 #include "repositionframesdialog.h"
 
 //#include "preview.h"
-//#include "timeline2.h"
 #include "errordialog.h"
 #include "filedialog.h"
 #include "importimageseqdialog.h"
@@ -171,12 +170,6 @@ void MainWindow2::createDockWidgets()
     mToolBox = new ToolBoxWidget(this);
     mToolBox->setObjectName("ToolBox");
 
-    /*
-    mTimeline2 = new Timeline2;
-    mTimeline2->setObjectName( "Timeline2" );
-    mDockWidgets.append( mTimeline2 );
-    */
-
     mDockWidgets
         << mTimeLine
         << mColorBox
@@ -197,7 +190,6 @@ void MainWindow2::createDockWidgets()
 
         pWidget->setEditor(mEditor);
         pWidget->initUI();
-        pWidget->show();
         qDebug() << "Init Dock widget: " << pWidget->objectName();
     }
 
@@ -229,8 +221,9 @@ void MainWindow2::createDockWidgets()
 
     for (BaseDockWidget* w : mDockWidgets)
     {
-        w->updateUI();
         w->setFloating(false);
+        w->show();
+        w->updateUI();
     }
 }
 
@@ -1495,7 +1488,6 @@ void MainWindow2::makeConnections(Editor* pEditor, TimeLine* pTimeline)
     connect(mEditor->select(), &SelectionManager::selectionChanged, this, &MainWindow2::updateCopyCutPasteEnabled);
 
     connect(pEditor->layers(), &LayerManager::currentLayerChanged, pTimeline, &TimeLine::updateUI);
-    connect(pEditor->layers(), &LayerManager::layerCountChanged, pTimeline, &TimeLine::updateUI);
     connect(pEditor->layers(), &LayerManager::animationLengthChanged, pTimeline, &TimeLine::extendLength);
     connect(pEditor->sound(), &SoundManager::soundClipDurationChanged, pTimeline, &TimeLine::updateUI);
 
@@ -1504,6 +1496,7 @@ void MainWindow2::makeConnections(Editor* pEditor, TimeLine* pTimeline)
 
     connect(pEditor, &Editor::objectLoaded, pTimeline, &TimeLine::onObjectLoaded);
     connect(pEditor, &Editor::updateTimeLine, pTimeline, &TimeLine::updateUI);
+    connect(pEditor, &Editor::updateTimeLineCached, pTimeline, &TimeLine::updateUICached);
 
     connect(pEditor->layers(), &LayerManager::currentLayerChanged, this, &MainWindow2::updateLayerMenu);
     connect(pEditor->layers(), &LayerManager::currentLayerChanged, mToolOptions, &ToolOptionWidget::updateUI);

diff --git a/app/src/mainwindow2.h b/app/src/mainwindow2.h
@@ -39,7 +39,6 @@ class PreviewWidget;
 class ColorBox;
 class ColorInspector;
 class RecentFileMenu;
-class Timeline2;
 class ActionCommands;
 class ImportImageSeqDialog;
 class BackupElement;
@@ -158,7 +157,6 @@ private slots:
     ColorPaletteWidget*   mColorPalette = nullptr;
     ToolOptionWidget*     mToolOptions = nullptr;
     ToolBoxWidget*        mToolBox = nullptr;
-    //Timeline2*          mTimeline2 = nullptr;
     RecentFileMenu*       mRecentFileMenu = nullptr;
     PreferencesDialog*    mPrefDialog = nullptr;
     //PreviewWidget*      mPreview = nullptr;

diff --git a/core_lib/src/interface/timecontrols.cpp → app/src/timecontrols.cpp b/core_lib/src/interface/timecontrols.cpp → app/src/timecontrols.cpp
@@ -308,16 +308,8 @@ void TimeControls::loopEndValueChanged(int i)
 
 void TimeControls::updateSoundScrubIcon(bool soundScrubEnabled)
 {
-    if (soundScrubEnabled)
-    {
-        mEditor->playback()->setSoundScrubActive(true);
-        mEditor->preference()->set(SETTING::SOUND_SCRUB_ACTIVE, true);
-    }
-    else
-    {
-        mEditor->playback()->setSoundScrubActive(false);
-        mEditor->preference()->set(SETTING::SOUND_SCRUB_ACTIVE, false);
-    }
+    mEditor->playback()->setSoundScrubActive(soundScrubEnabled);
+    mEditor->preference()->set(SETTING::SOUND_SCRUB_ACTIVE, soundScrubEnabled);
 }
 
 void TimeControls::noTimecodeText()

diff --git a/core_lib/src/interface/timecontrols.h → app/src/timecontrols.h b/core_lib/src/interface/timecontrols.h → app/src/timecontrols.h
diff --git a/core_lib/src/interface/timeline.cpp → app/src/timeline.cpp b/core_lib/src/interface/timeline.cpp → app/src/timeline.cpp
@@ -28,7 +28,6 @@ GNU General Public License for more details.
 #include <QWheelEvent>
 #include <QSlider>
 
-#include "layer.h"
 #include "editor.h"
 #include "layermanager.h"
 #include "timecontrols.h"
@@ -246,15 +245,10 @@ void TimeLine::updateUI()
     updateContent();
 }
 
-int TimeLine::getLength()
+void TimeLine::updateUICached()
 {
-    return mTracks->getFrameLength();
-}
-
-void TimeLine::setLength(int frame)
-{
-    mTracks->setFrameLength(frame);
-    updateLength();
+    mLayerList->update();
+    mTracks->update();
 }
 
 /** Extends the timeline frame length if necessary
@@ -310,7 +304,6 @@ void TimeLine::updateLayerView()
 
     mVScrollbar->setMinimum(0);
     mVScrollbar->setMaximum(qMax(0, mNumLayers - pageDisplay));
-    update();
     updateContent();
 }
 
@@ -322,7 +315,7 @@ void TimeLine::updateLayerNumber(int numberOfLayers)
 
 void TimeLine::updateLength()
 {
-    int frameLength = getLength();
+    int frameLength = mTracks->getFrameLength();
     mHScrollbar->setMaximum(qMax(0, frameLength - mTracks->width() / mTracks->getFrameSize()));
     mTimeControls->updateLength(frameLength);
     updateContent();

diff --git a/core_lib/src/interface/timeline.h → app/src/timeline.h b/core_lib/src/interface/timeline.h → app/src/timeline.h
@@ -36,6 +36,7 @@ class TimeLine : public BaseDockWidget
 
     void initUI() override;
     void updateUI() override;
+    void updateUICached();
 
     void updateFrame( int frameNumber );
     void updateLayerNumber( int number );
@@ -46,8 +47,6 @@ class TimeLine : public BaseDockWidget
     void setRangeState( bool range );
     void setPlaying( bool isPlaying );
 
-    int  getLength();
-    void setLength(int frame);
     void extendLength(int frame);
 
     int getRangeLower();

diff --git a/app/src/timeline2.cpp b/app/src/timeline2.cpp
diff --git a/app/src/timeline2.h b/app/src/timeline2.h