Merge pull request #1304 from Jose-Moreno/onion-skin-panel

Migrate onion skin features to new panel

app/app.pro

@@ -41,6 +41,7 @@ HEADERS += \
     src/importlayersdialog.h \
     src/importpositiondialog.h \
     src/mainwindow2.h \
+    src/onionskinwidget.h \
     src/predefinedsetmodel.h \
     src/pegbaralignmentdialog.h \
     src/shortcutfilter.h \
@@ -69,13 +70,14 @@ HEADERS += \
     src/doubleprogressdialog.h \
     src/colorslider.h \
     src/checkupdatesdialog.h \
-    src/presetdialog.h
+    src/presetdialog.h    
 
 SOURCES += \
     src/importlayersdialog.cpp \
     src/importpositiondialog.cpp \
     src/main.cpp \
     src/mainwindow2.cpp \
+    src/onionskinwidget.cpp \
     src/predefinedsetmodel.cpp \
     src/pegbaralignmentdialog.cpp \
     src/shortcutfilter.cpp \
@@ -110,6 +112,7 @@ FORMS += \
     ui/importlayersdialog.ui \
     ui/importpositiondialog.ui \
     ui/mainwindow2.ui \
+    ui/onionskin.ui \
     ui/pegbaralignmentdialog.ui \
     ui/timeline2.ui \
     ui/shortcutspage.ui \

app/src/displayoptionwidget.cpp

@@ -55,11 +55,7 @@ void DisplayOptionWidget::initUI()
 }
 
 void DisplayOptionWidget::makeConnections()
-{
-    connect(ui->onionPrevButton, &QToolButton::clicked, this, &DisplayOptionWidget::onionPrevButtonClicked);
-    connect(ui->onionNextButton, &QToolButton::clicked, this, &DisplayOptionWidget::onionNextButtonClicked);
-    connect(ui->onionBlueButton, &QToolButton::clicked, this, &DisplayOptionWidget::onionBlueButtonClicked);
-    connect(ui->onionRedButton, &QToolButton::clicked, this, &DisplayOptionWidget::onionRedButtonClicked);
+{    
     connect(ui->mirrorButton, &QToolButton::clicked, this, &DisplayOptionWidget::toggleMirror);
     connect(ui->mirrorVButton, &QToolButton::clicked, this, &DisplayOptionWidget::toggleMirrorV);
 
@@ -78,58 +74,21 @@ void DisplayOptionWidget::updateUI()
 {
     PreferenceManager* prefs = editor()->preference();
 
-    SignalBlocker b(ui->thinLinesButton);
+    SignalBlocker b1(ui->thinLinesButton);
     ui->thinLinesButton->setChecked(prefs->isOn(SETTING::INVISIBLE_LINES));
 
     SignalBlocker b2(ui->outLinesButton);
     ui->outLinesButton->setChecked(prefs->isOn(SETTING::OUTLINES));
 
-    SignalBlocker b3(ui->onionPrevButton);
-    ui->onionPrevButton->setChecked(prefs->isOn(SETTING::PREV_ONION));
-
-    SignalBlocker b4(ui->onionNextButton);
-    ui->onionNextButton->setChecked(prefs->isOn(SETTING::NEXT_ONION));
-
-    SignalBlocker b5(ui->onionBlueButton);
-    ui->onionBlueButton->setChecked(prefs->isOn(SETTING::ONION_BLUE));
-
-    SignalBlocker b6(ui->onionRedButton);
-    ui->onionRedButton->setChecked(prefs->isOn(SETTING::ONION_RED));
-
     ViewManager* view = editor()->view();
 
-    SignalBlocker b7(ui->mirrorButton);
+    SignalBlocker b3(ui->mirrorButton);
     ui->mirrorButton->setChecked(view->isFlipHorizontal());
 
-    SignalBlocker b8(ui->mirrorVButton);
+    SignalBlocker b4(ui->mirrorVButton);
     ui->mirrorVButton->setChecked(view->isFlipVertical());
 }
 
-
-void DisplayOptionWidget::onionPrevButtonClicked(bool isOn)
-{
-    PreferenceManager* prefs = editor()->preference();
-    prefs->set(SETTING::PREV_ONION, isOn);
-}
-
-void DisplayOptionWidget::onionNextButtonClicked(bool isOn)
-{
-    PreferenceManager* prefs = editor()->preference();
-    prefs->set(SETTING::NEXT_ONION, isOn);
-}
-
-void DisplayOptionWidget::onionBlueButtonClicked(bool isOn)
-{
-    PreferenceManager* prefs = editor()->preference();
-    prefs->set(SETTING::ONION_BLUE, isOn);
-}
-
-void DisplayOptionWidget::onionRedButtonClicked(bool isOn)
-{
-    PreferenceManager* prefs = editor()->preference();
-    prefs->set(SETTING::ONION_RED, isOn);
-}
-
 void DisplayOptionWidget::toggleMirror(bool isOn)
 {
     editor()->view()->flipHorizontal(isOn);

app/src/displayoptionwidget.h

@@ -38,10 +38,6 @@ class DisplayOptionWidget : public BaseDockWidget
     void updateUI() override;
 
 private slots:
-    void onionPrevButtonClicked(bool);
-    void onionNextButtonClicked(bool);
-    void onionBlueButtonClicked(bool);
-    void onionRedButtonClicked(bool);
     void toggleMirror(bool);
     void toggleMirrorV(bool);
 

app/src/mainwindow2.cpp

@@ -58,6 +58,7 @@ GNU General Public License for more details.
 #include "preferencesdialog.h"
 #include "timeline.h"
 #include "toolbox.h"
+#include "onionskinwidget.h"
 
 //#include "preview.h"
 #include "timeline2.h"
@@ -156,6 +157,9 @@ void MainWindow2::createDockWidgets()
     mDisplayOptionWidget = new DisplayOptionWidget(this);
     mDisplayOptionWidget->setObjectName("DisplayOption");
 
+    mOnionSkinWidget = new OnionSkinWidget(this);
+    mOnionSkinWidget->setObjectName("Onion Skin");
+
     mToolOptions = new ToolOptionWidget(this);
     mToolOptions->setObjectName("ToolOption");
 
@@ -174,6 +178,7 @@ void MainWindow2::createDockWidgets()
         << mColorInspector
         << mColorPalette
         << mDisplayOptionWidget
+        << mOnionSkinWidget
         << mToolOptions
         << mToolBox;
 
@@ -198,6 +203,7 @@ void MainWindow2::createDockWidgets()
     addDockWidget(Qt::LeftDockWidgetArea, mToolBox);
     addDockWidget(Qt::LeftDockWidgetArea, mToolOptions);
     addDockWidget(Qt::LeftDockWidgetArea, mDisplayOptionWidget);
+    addDockWidget(Qt::LeftDockWidgetArea, mOnionSkinWidget);
     addDockWidget(Qt::BottomDockWidgetArea, mTimeLine);
     setDockNestingEnabled(true);
 
@@ -352,8 +358,9 @@ void MainWindow2::createMenus()
         mColorBox->toggleViewAction(),
         mColorPalette->toggleViewAction(),
         mTimeLine->toggleViewAction(),
-        mDisplayOptionWidget->toggleViewAction(),
-        mColorInspector->toggleViewAction()
+        mDisplayOptionWidget->toggleViewAction(),        
+        mColorInspector->toggleViewAction(),
+        mOnionSkinWidget->toggleViewAction()
     };
 
     for (QAction* action : actions)
@@ -976,9 +983,10 @@ void MainWindow2::lockWidgets(bool shouldLock)
     mColorInspector->setFeatures(feat);
     mColorPalette->setFeatures(feat);
     mDisplayOptionWidget->setFeatures(feat);
+    mOnionSkinWidget->setFeatures(feat);
     mToolOptions->setFeatures(feat);
     mToolBox->setFeatures(feat);
-    mTimeLine->setFeatures(feat);
+    mTimeLine->setFeatures(feat);    
 }
 
 void MainWindow2::preferences()
@@ -1200,8 +1208,9 @@ void MainWindow2::setupKeyboardShortcuts()
     mColorBox->toggleViewAction()->setShortcut(cmdKeySeq(CMD_TOGGLE_COLOR_WHEEL));
     mColorPalette->toggleViewAction()->setShortcut(cmdKeySeq(CMD_TOGGLE_COLOR_LIBRARY));
     mTimeLine->toggleViewAction()->setShortcut(cmdKeySeq(CMD_TOGGLE_TIMELINE));
-    mDisplayOptionWidget->toggleViewAction()->setShortcut(cmdKeySeq(CMD_TOGGLE_DISPLAY_OPTIONS));
+    mDisplayOptionWidget->toggleViewAction()->setShortcut(cmdKeySeq(CMD_TOGGLE_DISPLAY_OPTIONS));    
     mColorInspector->toggleViewAction()->setShortcut(cmdKeySeq(CMD_TOGGLE_COLOR_INSPECTOR));
+    mOnionSkinWidget->toggleViewAction()->setShortcut(cmdKeySeq(CMD_TOGGLE_ONION_SKIN));
 
     ui->actionHelp->setShortcut(cmdKeySeq(CMD_HELP));
     ui->actionExit->setShortcut(cmdKeySeq(CMD_EXIT));
@@ -1377,6 +1386,10 @@ void MainWindow2::makeConnections(Editor*, DisplayOptionWidget*)
 {
 }
 
+void MainWindow2::makeConnections(Editor*, OnionSkinWidget*)
+{
+}
+
 void MainWindow2::makeConnections(Editor* editor, ToolOptionWidget* toolOptions)
 {
     toolOptions->makeConnectionToEditor(editor);

app/src/mainwindow2.h

@@ -31,6 +31,7 @@ class ScribbleArea;
 class BaseDockWidget;
 class ColorPaletteWidget;
 class DisplayOptionWidget;
+class OnionSkinWidget;
 class ToolOptionWidget;
 class TimeLine;
 class ToolBoxWidget;
@@ -139,11 +140,12 @@ private slots:
     void makeConnections(Editor*, TimeLine*);
     void makeConnections(Editor*, DisplayOptionWidget*);
     void makeConnections(Editor*, ToolOptionWidget*);
+    void makeConnections(Editor*, OnionSkinWidget*);
 
     void bindActionWithSetting(QAction*, SETTING);
 
     // UI: Dock widgets
-    ColorBox*           mColorBox = nullptr;
+    ColorBox*             mColorBox = nullptr;
     ColorPaletteWidget*   mColorPalette = nullptr;
     DisplayOptionWidget*  mDisplayOptionWidget = nullptr;
     ToolOptionWidget*     mToolOptions = nullptr;
@@ -154,6 +156,7 @@ private slots:
     //PreviewWidget*      mPreview = nullptr;
     TimeLine*             mTimeLine = nullptr; // be public temporary
     ColorInspector*       mColorInspector = nullptr;
+    OnionSkinWidget*      mOnionSkinWidget = nullptr;
 
     // backup
     BackupElement* mBackupAtSave = nullptr;