Implement TransformTool and TransformOptionsWidget

Which would be used for both settings related to selection tool and move tool.

Author: MrStevns

app/app.pro

@@ -124,7 +124,8 @@ HEADERS += \
     src/commandlineexporter.h \
     src/statusbar.h \
     src/elidedlabel.h \
-    src/cameraoptionswidget.h
+    src/cameraoptionswidget.h \
+    src/transformoptionswidget.h
 
 SOURCES += \
     src/addtransparencytopaperdialog.cpp \
@@ -177,9 +178,11 @@ SOURCES += \
     src/commandlineexporter.cpp \
     src/statusbar.cpp \
     src/elidedlabel.cpp \
-    src/cameraoptionswidget.cpp
+    src/cameraoptionswidget.cpp \
+    src/transformoptionswidget.cpp
 
 FORMS += \
+    src/transformoptionswidget.ui \
     ui/strokeoptionswidget.ui \
     ui/addtransparencytopaperdialog.ui \
     ui/cameraoptionswidget.ui \

app/src/strokeoptionswidget.cpp

@@ -31,8 +31,6 @@ StrokeOptionsWidget::~StrokeOptionsWidget()
 
 void StrokeOptionsWidget::initUI()
 {
-    QSettings settings(PENCIL2D, PENCIL2D);
-
     ui->sizeSlider->init(tr("Width"), SpinSlider::EXPONENT, SpinSlider::INTEGER, StrokeTool::WIDTH_MIN, StrokeTool::WIDTH_MAX);
     ui->featherSlider->init(tr("Feather"), SpinSlider::LOG, SpinSlider::INTEGER, StrokeTool::FEATHER_MIN, StrokeTool::FEATHER_MAX);
 
@@ -286,6 +284,7 @@ void StrokeOptionsWidget::setAA(int x)
 
 void StrokeOptionsWidget::setStabilizerLevel(int x)
 {
+    QSignalBlocker b(ui->inpolLevelsCombo);
     ui->inpolLevelsCombo->setCurrentIndex(qBound(0, x, ui->inpolLevelsCombo->count() - 1));
 }
 

app/src/tooloptionwidget.cpp

@@ -23,6 +23,7 @@ GNU General Public License for more details.
 #include "cameraoptionswidget.h"
 #include "bucketoptionswidget.h"
 #include "strokeoptionswidget.h"
+#include "transformoptionswidget.h"
 #include "spinslider.h"
 #include "editor.h"
 #include "util.h"
@@ -52,9 +53,11 @@ void ToolOptionWidget::initUI()
     mBucketOptionsWidget = new BucketOptionsWidget(editor(), this);
     mCameraOptionsWidget = new CameraOptionsWidget(editor(), this);
     mStrokeOptionsWidget = new StrokeOptionsWidget(editor(), this);
+    mTransformOptionsWidget = new TransformOptionsWidget(editor(), this);
     ui->scrollAreaWidgetContents->layout()->addWidget(mBucketOptionsWidget);
     ui->scrollAreaWidgetContents->layout()->addWidget(mCameraOptionsWidget);
     ui->scrollAreaWidgetContents->layout()->addWidget(mStrokeOptionsWidget);
+    ui->scrollAreaWidgetContents->layout()->addWidget(mTransformOptionsWidget);
     ui->scrollAreaWidgetContents->layout()->addItem(new QSpacerItem(0, 0, QSizePolicy::MinimumExpanding, QSizePolicy::Expanding));
 
     makeConnectionToEditor(editor());
@@ -86,6 +89,8 @@ void ToolOptionWidget::setWidgetVisibility(BaseTool* tool)
     mCameraOptionsWidget->updateUI();
     mStrokeOptionsWidget->setVisible(tool->category() == STROKETOOL);
     mStrokeOptionsWidget->updateUI();
+    mTransformOptionsWidget->setVisible(tool->category() == TRANSFORMTOOL);
+    mTransformOptionsWidget->updateUI();
 }
 
 void ToolOptionWidget::onLayerChanged(int layerIndex)

app/src/tooloptionwidget.h

@@ -30,6 +30,7 @@ class BaseTool;
 class BucketOptionsWidget;
 class CameraOptionsWidget;
 class StrokeOptionsWidget;
+class TransformOptionsWidget;
 
 class ToolOptionWidget : public BaseDockWidget
 {
@@ -56,6 +57,7 @@ public slots:
     BucketOptionsWidget* mBucketOptionsWidget = nullptr;
     CameraOptionsWidget* mCameraOptionsWidget = nullptr;
     StrokeOptionsWidget* mStrokeOptionsWidget = nullptr;
+    TransformOptionsWidget* mTransformOptionsWidget = nullptr;
 };
 
 #endif // TOOLOPTIONDOCKWIDGET_H

app/src/transformoptionswidget.cpp

@@ -0,0 +1,86 @@
+/*
+
+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 "transformoptionswidget.h"
+#include "ui_transformoptionswidget.h"
+
+#include "editor.h"
+#include "toolmanager.h"
+#include "transformtool.h""
+
+TransformOptionsWidget::TransformOptionsWidget(Editor* editor, QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::TransformOptionsWidget), mEditor(editor)
+{
+    ui->setupUi(this);
+    initUI();
+}
+
+TransformOptionsWidget::~TransformOptionsWidget()
+{
+    delete ui;
+}
+
+void TransformOptionsWidget::initUI()
+{
+    makeConnectionsFromUIToModel();
+}
+
+void TransformOptionsWidget::updateUI()
+{
+    if (!isVisible()) {
+        return;
+    }
+
+    BaseTool* currentTool = mEditor->tools()->currentTool();
+    if (currentTool->category() != TRANSFORMTOOL) { return; }
+
+    updateToolConnections(currentTool);
+    const TransformSettings* selectP = static_cast<const TransformSettings*>(currentTool->settings());
+
+    if (currentTool->isPropertyEnabled(TransformSettings::SHOWSELECTIONINFO_ON)) {
+        setShowSelectionInfo(selectP->showSelectionInfo());
+    }
+}
+
+void TransformOptionsWidget::updateToolConnections(BaseTool* tool)
+{
+    if (mTransformTool) {
+        disconnect(mTransformTool, nullptr, this, nullptr);
+    }
+
+    mTransformTool = static_cast<TransformTool*>(tool);
+
+    makeConnectionFromModelToUI(mTransformTool);
+}
+
+void TransformOptionsWidget::makeConnectionsFromUIToModel()
+{
+    connect(ui->showSelectionInfoCheckBox, &QCheckBox::clicked, this, [=](bool isOn) {
+       mTransformTool->setShowSelectionInfo(isOn);
+    });
+}
+
+void TransformOptionsWidget::makeConnectionFromModelToUI(TransformTool* transformTool)
+{
+    connect(transformTool, &TransformTool::showSelectionInfoChanged, this, &TransformOptionsWidget::setShowSelectionInfo);
+}
+
+void TransformOptionsWidget::setShowSelectionInfo(bool isOn)
+{
+    QSignalBlocker b(ui->showSelectionInfoCheckBox);
+    ui->showSelectionInfoCheckBox->setChecked(isOn);
+}

app/src/transformoptionswidget.h

@@ -0,0 +1,54 @@
+/*
+
+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 TRANSFORMOPTIONSWIDGET_H
+#define TRANSFORMOPTIONSWIDGET_H
+
+#include <QWidget>
+
+#include "toolsettings.h"
+
+class TransformTool;
+class Editor;
+namespace Ui {
+class TransformOptionsWidget;
+}
+
+class TransformOptionsWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit TransformOptionsWidget(Editor* editor, QWidget *parent = nullptr);
+    ~TransformOptionsWidget();
+
+    void initUI();
+    void updateUI();
+    void makeConnectionsFromUIToModel();
+    void makeConnectionFromModelToUI(TransformTool* transformTool);
+
+private:
+
+    void updateToolConnections(BaseTool* tool);
+    void setShowSelectionInfo(bool isOn);
+
+    Ui::TransformOptionsWidget *ui;
+
+    TransformTool* mTransformTool = nullptr;
+    Editor* mEditor = nullptr;
+};
+
+#endif // TRANSFORMOPTIONSWIDGET_H

app/src/transformoptionswidget.ui

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TransformOptionsWidget</class>
+ <widget class="QWidget" name="TransformOptionsWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout_2">
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QCheckBox" name="showSelectionInfoCheckBox">
+       <property name="toolTip">
+        <string>Enable or disable feathering</string>
+       </property>
+       <property name="text">
+        <string>Show Size and Diff.</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

core_lib/core_lib.pro

@@ -89,6 +89,7 @@ HEADERS +=  \
     src/tool/strokeinterpolator.h \
     src/tool/stroketool.h \
     src/tool/toolsettings.h \
+    src/tool/transformtool.h \
     src/util/blitrect.h \
     src/util/cameraeasingtype.h \
     src/util/camerafieldoption.h \
@@ -176,6 +177,7 @@ SOURCES +=  src/graphics/bitmap/bitmapimage.cpp \
     src/tool/smudgetool.cpp \
     src/tool/strokeinterpolator.cpp \
     src/tool/stroketool.cpp \
+    src/tool/transformtool.cpp \
     src/util/blitrect.cpp \
     src/util/cameraeasingtype.cpp \
     src/util/fileformat.cpp \

core_lib/src/interface/scribblearea.cpp

@@ -1033,12 +1033,10 @@ void ScribbleArea::paintSelectionVisuals(QPainter &painter)
 
     TransformParameters params = { currentSelectionRect, editor()->view()->getView(), selectMan->selectionTransform() };
 
-    // TODO: this should not use SELECT tool specifically.. we need to fetch this from SELECT or move tool respectively
-    // consider creating a TRANSFORM tool category.
     mSelectionPainter.paint(painter,
                             object,
                             mEditor->currentLayerIndex(),
-                            static_cast<const SelectionSettings*>(editor()->tools()->getTool(SELECT)->settings()),
+                            static_cast<const TransformSettings*>(editor()->tools()->getTool(TRANSFORMTOOL)->settings()),
                             params);
     emit selectionUpdated();
 }

core_lib/src/managers/toolmanager.cpp

@@ -102,6 +102,7 @@ BaseTool* ToolManager::getTool(ToolType eToolType)
 BaseTool* ToolManager::getTool(ToolCategory eToolCategory)
 {
     switch (eToolCategory) {
+        case ToolCategory::TRANSFORMTOOL:
         case ToolCategory::STROKETOOL: {
             if (currentTool()->category() == eToolCategory) {
                 return currentTool();

core_lib/src/selectionpainter.cpp

@@ -26,7 +26,7 @@ SelectionPainter::SelectionPainter()
 void SelectionPainter::paint(QPainter& painter,
                              const Object* object,
                              int layerIndex,
-                             const SelectionSettings* toolProperties,
+                             const TransformSettings* toolProperties,
                              TransformParameters& tParams)
 {
     Layer* layer = object->getLayer(layerIndex);

core_lib/src/selectionpainter.h

@@ -39,7 +39,7 @@ class SelectionPainter
 public:
     SelectionPainter();
 
-    void paint(QPainter& painter, const Object* object, int layerIndex, const SelectionSettings* toolProperties, TransformParameters& transformParameters);
+    void paint(QPainter& painter, const Object* object, int layerIndex, const TransformSettings* toolProperties, TransformParameters& transformParameters);
 
 private:
     void paintSelectionInfo(QPainter& painter, const QTransform& mergedTransform, const QTransform& viewTransform, const QRectF& selectionRect, const QPolygonF& projectedPolygonF);

core_lib/src/tool/movetool.cpp

@@ -35,7 +35,7 @@ GNU General Public License for more details.
 #include "mathutils.h"
 #include "vectorimage.h"
 
-MoveTool::MoveTool(QObject* parent) : BaseTool(parent)
+MoveTool::MoveTool(QObject* parent) : TransformTool(parent)
 {
 }
 
@@ -44,21 +44,15 @@ ToolType MoveTool::type() const
     return MOVE;
 }
 
-void MoveTool::createSettings(ToolSettings*)
-{
-    mSettings = new SelectionSettings();
-    BaseTool::createSettings(mSettings);
-}
-
 void MoveTool::loadSettings()
 {
     mRotationIncrement = mEditor->preference()->getInt(SETTING::ROTATION_INCREMENT);
     QSettings settings(PENCIL2D, PENCIL2D);
 
-    mPropertyUsed[SelectionSettings::SHOWSELECTIONINFO_ON] = { Layer::BITMAP, Layer::VECTOR };
+    mPropertyUsed[TransformSettings::SHOWSELECTIONINFO_ON] = { Layer::BITMAP, Layer::VECTOR };
     QHash<int, PropertyInfo> info;
 
-    info[SelectionSettings::SHOWSELECTIONINFO_ON] = false;
+    info[TransformSettings::SHOWSELECTIONINFO_ON] = false;
     mSettings->load(typeName(), settings, info);
 
     connect(mEditor->preference(), &PreferenceManager::optionChanged, this, &MoveTool::updateSettings);
@@ -328,7 +322,7 @@ void MoveTool::applyTransformation()
 
 bool MoveTool::leavingThisTool()
 {
-    BaseTool::leavingThisTool();
+    TransformTool::leavingThisTool();
 
     if (currentPaintableLayer())
     {
@@ -342,11 +336,6 @@ bool MoveTool::isActive() const {
            (mEditor->select()->somethingSelected() || mEditor->overlays()->getMoveMode() != MoveMode::NONE);
 }
 
-void MoveTool::setShowSelectionInfo(bool b)
-{
-    mSettings->setBaseValue(SelectionSettings::SHOWSELECTIONINFO_ON, b);
-}
-
 Layer* MoveTool::currentPaintableLayer()
 {
     Layer* layer = mEditor->layers()->currentLayer();