TimeLineCells rewrite part 1

app/app.pro

@@ -78,6 +78,8 @@ HEADERS += \
     src/importlayersdialog.h \
     src/importpositiondialog.h \
     src/layeropacitydialog.h \
+    src/layervisibilitybutton.h \
+    src/lineeditwidget.h \
     src/mainwindow2.h \
     src/onionskinwidget.h \
     src/predefinedsetmodel.h \
@@ -88,15 +90,22 @@ HEADERS += \
     src/filespage.h \
     src/generalpage.h \
     src/shortcutspage.h \
+    src/timelinebasecell.h \
+    src/timelinelayercell.h \
+    src/timelinelayercelleditorwidget.h \
+    src/timelinelayercellgutterwidget.h \
+    src/timelinelayerheaderwidget.h \
+    src/timelinelayerlist.h \
     src/timelinepage.h \
+    src/timelinetrackheaderwidget.h \
+    src/timelinetracklist.h \
     src/toolspage.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 \
@@ -128,6 +137,8 @@ SOURCES += \
     src/importlayersdialog.cpp \
     src/importpositiondialog.cpp \
     src/layeropacitydialog.cpp \
+    src/layervisibilitybutton.cpp \
+    src/lineeditwidget.cpp \
     src/main.cpp \
     src/mainwindow2.cpp \
     src/onionskinwidget.cpp \
@@ -139,15 +150,22 @@ SOURCES += \
     src/filespage.cpp \
     src/generalpage.cpp \
     src/shortcutspage.cpp \
+    src/timelinebasecell.cpp \
+    src/timelinelayercell.cpp \
+    src/timelinelayercelleditorwidget.cpp \
+    src/timelinelayercellgutterwidget.cpp \
+    src/timelinelayerheaderwidget.cpp \
+    src/timelinelayerlist.cpp \
     src/timelinepage.cpp \
+    src/timelinetrackheaderwidget.cpp \
+    src/timelinetracklist.cpp \
     src/toolspage.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 \

app/src/actioncommands.cpp

@@ -842,54 +842,25 @@ void ActionCommands::moveFrameBackward()
 
 Status ActionCommands::addNewBitmapLayer()
 {
-    bool ok;
-    QString text = QInputDialog::getText(nullptr, tr("Layer Properties"),
-                                         tr("Layer name:"), QLineEdit::Normal,
-                                         mEditor->layers()->nameSuggestLayer(tr("Bitmap Layer")), &ok);
-    if (ok && !text.isEmpty())
-    {
-        mEditor->layers()->createBitmapLayer(text);
-    }
+    mEditor->layers()->createBitmapLayer(mEditor->layers()->nameSuggestLayer(tr("Bitmap Layer")));
     return Status::OK;
 }
 
 Status ActionCommands::addNewVectorLayer()
 {
-    bool ok;
-    QString text = QInputDialog::getText(nullptr, tr("Layer Properties"),
-                                         tr("Layer name:"), QLineEdit::Normal,
-                                         mEditor->layers()->nameSuggestLayer(tr("Vector Layer")), &ok);
-    if (ok && !text.isEmpty())
-    {
-        mEditor->layers()->createVectorLayer(text);
-    }
+    mEditor->layers()->createVectorLayer(mEditor->layers()->nameSuggestLayer(tr("Vector Layer")));
     return Status::OK;
 }
 
 Status ActionCommands::addNewCameraLayer()
 {
-    bool ok;
-    QString text = QInputDialog::getText(nullptr, tr("Layer Properties", "A popup when creating a new layer"),
-                                         tr("Layer name:"), QLineEdit::Normal,
-                                         mEditor->layers()->nameSuggestLayer(tr("Camera Layer")), &ok);
-    if (ok && !text.isEmpty())
-    {
-        mEditor->layers()->createCameraLayer(text);
-    }
+    mEditor->layers()->createCameraLayer(mEditor->layers()->nameSuggestLayer(tr("Camera Layer")));
     return Status::OK;
 }
 
 Status ActionCommands::addNewSoundLayer()
 {
-    bool ok = false;
-    QString strLayerName = QInputDialog::getText(nullptr, tr("Layer Properties"),
-                                                 tr("Layer name:"), QLineEdit::Normal,
-                                                 mEditor->layers()->nameSuggestLayer(tr("Sound Layer")), &ok);
-    if (ok && !strLayerName.isEmpty())
-    {
-        Layer* layer = mEditor->layers()->createSoundLayer(strLayerName);
-        mEditor->layers()->setCurrentLayer(layer);
-   }
+    mEditor->layers()->createSoundLayer(mEditor->layers()->nameSuggestLayer(tr("Sound Layer")));
     return Status::OK;
 }
 

app/src/layervisibilitybutton.cpp

@@ -0,0 +1,149 @@
+/*
+Pencil2D - Traditional Animation Software
+Copyright (C) 2005-2007 Patrick Corrieri & Pascal Naidon
+Copyright (C) 2008-2009 Mj Mendoza IV
+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 "layervisibilitybutton.h"
+
+#include "layer.h"
+#include "editor.h"
+#include "layermanager.h"
+
+#include <QIcon>
+#include <QPainter>
+#include <QApplication>
+#include <QDebug>
+#include <QMouseEvent>
+
+LayerVisibilityButton::LayerVisibilityButton(QWidget* parent,
+                                             const LayerVisibilityContext& visibilityContext,
+                                             Layer* layer,
+                                             Editor* editor)
+    : QWidget(parent),
+      mLayer(layer),
+      mEditor(editor),
+      mVisibilityContext(visibilityContext)
+{
+}
+
+QSize LayerVisibilityButton::sizeHint() const
+{
+    return QSize(22,22);
+}
+
+void LayerVisibilityButton::paintEvent(QPaintEvent* event)
+{
+    QPainter painter(this);
+
+    const QPalette& palette = QApplication::palette();
+
+    switch (mVisibilityContext) {
+    case LayerVisibilityContext::LOCAL:
+        paintLocalVisibilityState(painter, palette);
+        break;
+    case LayerVisibilityContext::GLOBAL:
+        paintGlobalVisibilityState(painter, palette);
+        break;
+    }
+
+    painter.setRenderHint(QPainter::Antialiasing, true);
+    painter.drawEllipse(rect().center().x() - (mVisibilityCircleSize.width() * 0.5) + painter.pen().width(),
+                        rect().center().y() - (mVisibilityCircleSize.height() * 0.5) + painter.pen().width(),
+                        mVisibilityCircleSize.width(), mVisibilityCircleSize.height());
+    painter.setRenderHint(QPainter::Antialiasing, false);
+
+    mIconValid = true;
+}
+
+void LayerVisibilityButton::paintLocalVisibilityState(QPainter& painter, const QPalette& palette)
+{
+    int isSelected = mLayer->id() == mEditor->layers()->currentLayer()->id();
+
+    const LayerVisibility& visibility = mEditor->layerVisibility();
+    QColor penColor = painter.pen().color();
+
+    if (mEditor->layers()->currentLayer()->id() == mLayer->id())
+    {
+        penColor = palette.color(QPalette::HighlightedText);
+    }
+    else
+    {
+        penColor = palette.color(QPalette::Text);
+    }
+
+    if (!mLayer->visible())
+    {
+        if (visibility == LayerVisibility::CURRENTONLY && !isSelected) {
+            penColor.setAlphaF(0.5);
+        }
+        painter.setPen(penColor);
+        painter.setBrush(palette.color(QPalette::Base));
+    }
+    else
+    {
+        if ((visibility == LayerVisibility::ALL) || isSelected)
+        {
+            painter.setBrush(palette.color(QPalette::Text));
+        }
+        else if (visibility == LayerVisibility::CURRENTONLY)
+        {
+            painter.setBrush(palette.color(QPalette::Base));
+        }
+        else if (visibility == LayerVisibility::RELATED)
+        {
+            QColor color = palette.color(QPalette::Text);
+            color.setAlpha(128);
+            painter.setBrush(color);
+        }
+    }
+
+    painter.setPen(penColor);
+}
+
+void LayerVisibilityButton::paintGlobalVisibilityState(QPainter &painter, const QPalette& palette)
+{
+    // --- draw circle
+    painter.setPen(palette.color(QPalette::Text));
+    if (mEditor->layerVisibility() == LayerVisibility::CURRENTONLY)
+    {
+        painter.setBrush(palette.color(QPalette::Base));
+    }
+    else if (mEditor->layerVisibility() == LayerVisibility::RELATED)
+    {
+        QColor color = palette.color(QPalette::Text);
+        color.setAlpha(128);
+        painter.setBrush(color);
+    }
+    else if (mEditor->layerVisibility() == LayerVisibility::ALL)
+    {
+        painter.setBrush(palette.brush(QPalette::Text));
+    }
+}
+
+void LayerVisibilityButton::mousePressEvent(QMouseEvent* event)
+{
+    switch (mVisibilityContext) {
+        case LayerVisibilityContext::GLOBAL: {
+            if (event->buttons() & Qt::LeftButton) {
+                mEditor->increaseLayerVisibilityIndex();
+            } else if (event->buttons() & Qt::RightButton) {
+                mEditor->decreaseLayerVisibilityIndex();
+            }
+            break;
+        }
+        case LayerVisibilityContext::LOCAL:
+        {
+            mLayer->switchVisibility();
+        }
+    }
+
+    emit visibilityChanged();
+}

app/src/layervisibilitybutton.h

@@ -0,0 +1,65 @@
+/*
+Pencil2D - Traditional Animation Software
+Copyright (C) 2005-2007 Patrick Corrieri & Pascal Naidon
+Copyright (C) 2008-2009 Mj Mendoza IV
+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 LAYERVISIBILITYBUTTON_H
+#define LAYERVISIBILITYBUTTON_H
+
+#include <QObject>
+#include <QWidget>
+
+class Layer;
+class QIcon;
+class QToolButton;
+class Editor;
+class QPixmap;
+
+enum class LayerVisibilityContext
+{
+    LOCAL,
+    GLOBAL
+};
+
+class LayerVisibilityButton : public QWidget
+{
+    Q_OBJECT
+public:
+    LayerVisibilityButton(QWidget* parent,
+                          const LayerVisibilityContext& visibilityContext,
+                          Layer* layer,
+                          Editor* editor);
+
+    void paintEvent(QPaintEvent* event) override;
+
+    void paintLocalVisibilityState(QPainter& painter, const QPalette& palette);
+    void paintGlobalVisibilityState(QPainter& painter, const QPalette& palette);
+
+    void mousePressEvent(QMouseEvent* event) override;
+
+    QSize sizeHint() const override;
+
+signals:
+    void visibilityChanged();
+
+private:
+
+    Layer* mLayer = nullptr;
+    Editor* mEditor = nullptr;
+    QSize mVisibilityCircleSize = QSize(10,10);
+
+    bool mIconValid = false;
+
+    const LayerVisibilityContext mVisibilityContext;
+
+};
+
+#endif // LAYERVISIBILITYBUTTON_H