More intuitive work with camera movements. Camera rewrite (2)

app/app.pro

@@ -111,7 +111,8 @@ HEADERS += \
     src/commandlineparser.h \
     src/commandlineexporter.h \
     src/statusbar.h \
-    src/elidedlabel.h
+    src/elidedlabel.h \
+    src/cameraoptionswidget.h
 
 SOURCES += \
     src/importlayersdialog.cpp \
@@ -158,9 +159,11 @@ SOURCES += \
     src/commandlineparser.cpp \
     src/commandlineexporter.cpp \
     src/statusbar.cpp \
-    src/elidedlabel.cpp
+    src/elidedlabel.cpp \
+    src/cameraoptionswidget.cpp
 
 FORMS += \
+    ui/cameraoptionswidget.ui \
     ui/importimageseqpreview.ui \
     ui/importlayersdialog.ui \
     ui/importpositiondialog.ui \

app/data/app.qrc

@@ -69,6 +69,10 @@
         <file>icons/overlayAngle.png</file>
         <file>icons/controls/soundscrub.png</file>
         <file>icons/controls/soundscrub-disabled.png</file>
+        <file>icons/new/arrow-rotate.png</file>
+        <file>icons/new/svg/transform-rotate.svg</file>
+        <file>icons/new/svg/transform-scale.svg</file>
+        <file>icons/new/svg/transform-translate.svg</file>
     </qresource>
     <qresource prefix="/app">
         <file>icons/onion-blue.png</file>

app/src/actioncommands.cpp

@@ -696,13 +696,6 @@ void ActionCommands::reverseSelectedFrames()
 void ActionCommands::removeKey()
 {
     mEditor->removeKey();
-
-    // Add a new keyframe at the beginning if there are none, unless it is a sound layer which can't have empty keyframes but can be an empty layer
-    Layer* layer = mEditor->layers()->currentLayer();
-    if (layer->keyFrameCount() == 0 && layer->type() != Layer::SOUND)
-    {
-        layer->addNewKeyFrameAt(1);
-    }
 }
 
 void ActionCommands::duplicateLayer()
@@ -851,6 +844,10 @@ Status ActionCommands::deleteCurrentLayer()
     LayerManager* layerMgr = mEditor->layers();
     QString strLayerName = layerMgr->currentLayer()->name();
 
+    if (!layerMgr->canDeleteLayer(mEditor->currentLayerIndex())) {
+        return Status::CANCELED;
+    }
+
     int ret = QMessageBox::warning(mParent,
                                    tr("Delete Layer", "Windows title of Delete current layer pop-up."),
                                    tr("Are you sure you want to delete layer: %1? This cannot be undone.").arg(strLayerName),

app/src/cameraoptionswidget.cpp

@@ -0,0 +1,96 @@
+/*
+
+Pencil2D - Traditional Animation Software
+Copyright (C) 2005-2007 Patrick Corrieri & Pascal Naidon
+Copyright (C) 2012-2020 Matthew Chiawen Chang
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+*/
+#include "cameraoptionswidget.h"
+#include "ui_cameraoptionswidget.h"
+
+#include "editor.h"
+#include "toolmanager.h"
+#include "layermanager.h"
+
+#include "cameratool.h"
+
+CameraOptionsWidget::CameraOptionsWidget(Editor* editor, QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::CameraOptionsWidget), mEditor(editor)
+{
+    ui->setupUi(this);
+
+    auto toolMan = mEditor->tools();
+    connect(ui->showCameraPathCheckBox, &QCheckBox::clicked, toolMan, &ToolManager::setShowCameraPath);
+    connect(ui->pathColorComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), toolMan, &ToolManager::setCameraPathDotColor);
+    connect(ui->btnResetPath, &QPushButton::clicked, toolMan, &ToolManager::resetCameraPath);
+
+    connect(ui->resetAllButton, &QPushButton::clicked, toolMan, [=] {
+        toolMan->resetCameraTransform(CameraFieldOption::RESET_FIELD);
+    });
+    connect(ui->resetTranslationButton, &QPushButton::clicked, toolMan, [=] {
+        toolMan->resetCameraTransform(CameraFieldOption::RESET_TRANSLATION);
+    });
+    connect(ui->resetRotationButton, &QPushButton::clicked, toolMan, [=] {
+        toolMan->resetCameraTransform(CameraFieldOption::RESET_ROTATION);
+    });
+    connect(ui->resetScaleButton, &QPushButton::clicked, toolMan, [=] {
+        toolMan->resetCameraTransform(CameraFieldOption::RESET_SCALING);
+    });
+
+    connect(toolMan, &ToolManager::toolPropertyChanged, this, &CameraOptionsWidget::onToolPropertyChanged);
+
+    connect(mEditor->layers(), &LayerManager::currentLayerChanged, this, &CameraOptionsWidget::updateUI);
+    connect(mEditor->tools(), &ToolManager::toolChanged, this, &CameraOptionsWidget::updateUI);
+
+    mCameraTool = static_cast<CameraTool*>(mEditor->tools()->getTool(CAMERA));
+}
+
+CameraOptionsWidget::~CameraOptionsWidget()
+{
+    delete ui;
+}
+
+void CameraOptionsWidget::updateUI()
+{
+
+    Q_ASSERT(mCameraTool->type() == CAMERA);
+
+    Properties p = mCameraTool->properties;
+
+    setShowCameraPath(p.cameraShowPath);
+    setPathDotColorType(p.cameraPathDotColorType);
+}
+
+void CameraOptionsWidget::onToolPropertyChanged(ToolType, ToolPropertyType ePropertyType)
+{
+    const Properties& p = mCameraTool->properties;
+
+    switch (ePropertyType)
+    {
+    case CAMERAPATH: { setShowCameraPath(p.cameraShowPath); break; }
+    default:
+        break;
+    }
+}
+
+void CameraOptionsWidget::setShowCameraPath(bool showCameraPath)
+{
+    QSignalBlocker b(ui->showCameraPathCheckBox);
+    ui->showCameraPathCheckBox->setChecked(showCameraPath);
+}
+
+void CameraOptionsWidget::setPathDotColorType(DotColorType index)
+{
+    QSignalBlocker b(ui->pathColorComboBox);
+    ui->pathColorComboBox->setCurrentIndex(static_cast<int>(index));
+}

app/src/cameraoptionswidget.h

@@ -0,0 +1,52 @@
+/*
+
+Pencil2D - Traditional Animation Software
+Copyright (C) 2005-2007 Patrick Corrieri & Pascal Naidon
+Copyright (C) 2012-2020 Matthew Chiawen Chang
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+*/
+#ifndef CAMERAOPTIONSWIDGET_H
+#define CAMERAOPTIONSWIDGET_H
+
+#include <QWidget>
+
+#include "pencildef.h"
+#include "camera.h"
+
+class Editor;
+class CameraTool;
+
+namespace Ui {
+class CameraOptionsWidget;
+}
+
+class CameraOptionsWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit CameraOptionsWidget(Editor* editor, QWidget *parent = nullptr);
+    ~CameraOptionsWidget();
+
+    void updateUI();
+
+    void setShowCameraPath(bool showCameraPath);
+    void setPathDotColorType(DotColorType index);
+    void onToolPropertyChanged(ToolType, ToolPropertyType ePropertyType);
+
+private:
+    Ui::CameraOptionsWidget *ui;
+    Editor* mEditor = nullptr;
+
+    CameraTool* mCameraTool = nullptr;
+};
+
+#endif // CAMERAOPTIONSWIDGET_H

app/src/displayoptionwidget.cpp

@@ -25,7 +25,6 @@ GNU General Public License for more details.
 #include "viewmanager.h"
 #include "overlaymanager.h"
 #include "layermanager.h"
-#include "scribblearea.h"
 #include "editor.h"
 #include "util.h"
 #include "movemode.h"
@@ -103,42 +102,30 @@ void DisplayOptionWidget::makeConnections()
     connect(ui->overlayPerspective1Button, &QToolButton::clicked, this, &DisplayOptionWidget::toggleOverlayPerspective1);
     connect(ui->overlayPerspective2Button, &QToolButton::clicked, this, &DisplayOptionWidget::toggleOverlayPerspective2);
     connect(ui->overlayPerspective3Button, &QToolButton::clicked, this, &DisplayOptionWidget::toggleOverlayPerspective3);
+    connect(ui->thinLinesButton, &QToolButton::clicked, this, &DisplayOptionWidget::toggleThinLines);
+    connect(ui->outLinesButton, &QToolButton::clicked, this, &DisplayOptionWidget::toggleOutlines);
 
-    PreferenceManager* prefs = editor()->preference();
-    ScribbleArea* pScriArea = editor()->getScribbleArea();
-
-    connect(ui->thinLinesButton, &QToolButton::clicked, pScriArea, &ScribbleArea::toggleThinLines);
-    connect(ui->outLinesButton, &QToolButton::clicked, pScriArea, &ScribbleArea::toggleOutlines);
-    connect(prefs, &PreferenceManager::optionChanged, this, &DisplayOptionWidget::updateUI);
-
-    ViewManager* view = editor()->view();
-    connect(view, &ViewManager::viewFlipped, this, &DisplayOptionWidget::updateUI);
+    connect(editor()->preference(), &PreferenceManager::optionChanged, this, &DisplayOptionWidget::updateUI);
+    connect(editor()->view(), &ViewManager::viewFlipped, this, &DisplayOptionWidget::updateUI);
 }
 
 void DisplayOptionWidget::prepareOverlayManager()
 {
-    editor()->overlays()->initPerspOverlay();
-    editor()->getScribbleArea()->prepOverlays();
-
     if (ui->overlayPerspective1Button->isChecked())
     {
-        editor()->overlays()->setOverlayPerspective1(true);
-        editor()->overlays()->updatePerspOverlay(1);
-        editor()->overlays()->setMoveMode(MoveMode::PERSP_SINGLE);
+        editor()->overlays()->setOnePointPerspectiveEnabled(true);
+        editor()->overlays()->updatePerspective(1);
     }
     if (ui->overlayPerspective2Button->isChecked())
     {
-        editor()->overlays()->setOverlayPerspective2(true);
-        editor()->overlays()->updatePerspOverlay(2);
-        editor()->overlays()->setMoveMode(MoveMode::PERSP_LEFT);
+        editor()->overlays()->setTwoPointPerspectiveEnabled(true);
+        editor()->overlays()->updatePerspective(2);
     }
     if (ui->overlayPerspective3Button->isChecked())
     {
-        editor()->overlays()->setOverlayPerspective3(true);
-        editor()->overlays()->updatePerspOverlay(3);
-        editor()->overlays()->setMoveMode(MoveMode::PERSP_LEFT);
+        editor()->overlays()->setThreePointPerspectiveEnabled(true);
+        editor()->overlays()->updatePerspective(3);
     }
-    editor()->overlays()->updatePerspOverlayActiveList();
 }
 
 void DisplayOptionWidget::clearPreviousAngle(int angle)
@@ -161,8 +148,7 @@ void DisplayOptionWidget::changeAngle(int angle)
 {
     clearPreviousAngle(mOverlayAngle);
     mOverlayAngle = angle;
-    QSettings settings(PENCIL2D, PENCIL2D);
-    settings.setValue("OverlayAngle", angle);
+    editor()->preference()->set(SETTING::OVERLAY_ANGLE, angle);
     emit editor()->view()->viewChanged();
 }
 
@@ -218,6 +204,16 @@ int DisplayOptionWidget::getMinHeightForWidth(int width)
     return ui->innerWidget->layout()->heightForWidth(width);
 }
 
+void DisplayOptionWidget::toggleThinLines(bool isOn)
+{
+    editor()->preference()->set(SETTING::INVISIBLE_LINES, isOn);
+}
+
+void DisplayOptionWidget::toggleOutlines(bool isOn)
+{
+    editor()->preference()->set(SETTING::OUTLINES, isOn);
+}
+
 void DisplayOptionWidget::toggleMirror(bool isOn)
 {
     editor()->view()->flipHorizontal(isOn);
@@ -230,49 +226,49 @@ void DisplayOptionWidget::toggleMirrorV(bool isOn)
 
 void DisplayOptionWidget::toggleOverlayCenter(bool isOn)
 {
-    editor()->overlays()->setOverlayCenter(isOn);
+    editor()->overlays()->setCenterEnabled(isOn);
     editor()->preference()->set(SETTING::OVERLAY_CENTER, isOn);
     emit editor()->view()->viewChanged();
 }
 
 void DisplayOptionWidget::toggleOverlayThirds(bool isOn)
 {
-    editor()->overlays()->setOverlayThirds(isOn);
+    editor()->overlays()->setThirdsEnabled(isOn);
     editor()->preference()->set(SETTING::OVERLAY_THIRDS, isOn);
     emit editor()->view()->viewChanged();
 }
 
 void DisplayOptionWidget::toggleOverlayGoldenRatio(bool isOn)
 {
-    editor()->overlays()->setOverlayGoldenRatio(isOn);
+    editor()->overlays()->setGoldenRatioEnabled(isOn);
     editor()->preference()->set(SETTING::OVERLAY_GOLDEN, isOn);
     emit editor()->view()->viewChanged();
 }
 
 void DisplayOptionWidget::toggleOverlaySafeAreas(bool isOn)
 {
-    editor()->overlays()->setOverlaySafeAreas(isOn);
+    editor()->overlays()->setSafeAreasEnabled(isOn);
     editor()->preference()->set(SETTING::OVERLAY_SAFE, isOn);
     emit editor()->view()->viewChanged();
 }
 
 void DisplayOptionWidget::toggleOverlayPerspective1(bool isOn)
 {
-    editor()->overlays()->setOverlayPerspective1(isOn);
+    editor()->overlays()->setOnePointPerspectiveEnabled(isOn);
     editor()->preference()->set(SETTING::OVERLAY_PERSPECTIVE1, isOn);
     emit editor()->view()->viewChanged();
 }
 
 void DisplayOptionWidget::toggleOverlayPerspective2(bool isOn)
 {
-    editor()->overlays()->setOverlayPerspective2(isOn);
+    editor()->overlays()->setTwoPointPerspectiveEnabled(isOn);
     editor()->preference()->set(SETTING::OVERLAY_PERSPECTIVE2, isOn);
     emit editor()->view()->viewChanged();
 }
 
 void DisplayOptionWidget::toggleOverlayPerspective3(bool isOn)
 {
-    editor()->overlays()->setOverlayPerspective3(isOn);
+    editor()->overlays()->setThreePointPerspectiveEnabled(isOn);
     editor()->preference()->set(SETTING::OVERLAY_PERSPECTIVE3, isOn);
     emit editor()->view()->viewChanged();
 }
@@ -312,10 +308,10 @@ void DisplayOptionWidget::anglePreferences()
     default: ui->action15_degrees->setChecked(true);
     }
 
-    connect( ui->action2_degrees, &QAction::triggered, this,  &DisplayOptionWidget::angle2degrees);
-    connect( ui->action3_degrees, &QAction::triggered, this,  &DisplayOptionWidget::angle3degrees);
-    connect( ui->action5_degrees, &QAction::triggered, this,  &DisplayOptionWidget::angle5degrees);
-    connect( ui->action7_5_degrees, &QAction::triggered, this,  &DisplayOptionWidget::angle7_5degrees);
+    connect(ui->action2_degrees, &QAction::triggered, this,  &DisplayOptionWidget::angle2degrees);
+    connect(ui->action3_degrees, &QAction::triggered, this,  &DisplayOptionWidget::angle3degrees);
+    connect(ui->action5_degrees, &QAction::triggered, this,  &DisplayOptionWidget::angle5degrees);
+    connect(ui->action7_5_degrees, &QAction::triggered, this,  &DisplayOptionWidget::angle7_5degrees);
     connect(ui->action10_degrees, &QAction::triggered, this, &DisplayOptionWidget::angle10degrees);
     connect(ui->action15_degrees, &QAction::triggered, this, &DisplayOptionWidget::angle15degrees);
     connect(ui->action20_degrees, &QAction::triggered, this, &DisplayOptionWidget::angle20degrees);

app/src/displayoptionwidget.h

@@ -45,6 +45,8 @@ public slots:
     int getMinHeightForWidth(int width) override;
 
 private slots:
+    void toggleThinLines(bool);
+    void toggleOutlines(bool);
     void toggleMirror(bool);
     void toggleMirrorV(bool);
     void toggleOverlayCenter(bool isOn);