TimeControls in Timeline titlebar area

app/app.pro

@@ -93,6 +93,7 @@ HEADERS += \
     src/generalpage.h \
     src/shortcutspage.h \
     src/strokeoptionswidget.h \
+    src/timecodecontrolwidget.h \
     src/timelinepage.h \
     src/toolboxwidget.h \
     src/toolspage.h \
@@ -151,6 +152,7 @@ SOURCES += \
     src/generalpage.cpp \
     src/shortcutspage.cpp \
     src/strokeoptionswidget.cpp \
+    src/timecodecontrolwidget.cpp \
     src/timelinepage.cpp \
     src/toolboxwidget.cpp \
     src/toolspage.cpp \

app/data/app.qrc

@@ -100,6 +100,7 @@
         <file>icons/themes/playful/window/window-float-button-normal-darkm.svg</file>
         <file>icons/themes/playful/window/window-float-button-normal.svg</file>
         <file>icons/themes/playful/window/window-close-button-normal.svg</file>
+        <file>icons/themes/playful/controls/control-timecode.svg</file>
     </qresource>
     <qresource prefix="/app">
         <file>pencil2d_quick_guide.pdf</file>

app/src/basedockwidget.cpp

@@ -63,9 +63,14 @@ void BaseDockWidget::lock(bool locked)
     // nullptr means removing the custom title bar and restoring the default one
 
     if (locked) {
-        setTitleBarWidget(mNoTitleBarWidget);
+        if (mTitleBarWidget->hasChildWidget()) {
+            mTitleBarWidget->lock(locked);
+        } else {
+            setTitleBarWidget(mNoTitleBarWidget);
+        }
     } else {
         setTitleBarWidget(mTitleBarWidget);
+        mTitleBarWidget->lock(locked);
     }
 
     mLocked = locked;
@@ -77,6 +82,13 @@ void BaseDockWidget::setTitle(const QString& title)
     mTitleBarWidget->setTitle(title);
 }
 
+void BaseDockWidget::setWidgetInTitleBarArea(QWidget* widget)
+{
+    if (mTitleBarWidget) {
+        mTitleBarWidget->setChildWidget(widget);
+    }
+}
+
 void BaseDockWidget::resizeEvent(QResizeEvent *event)
 {
     QDockWidget::resizeEvent(event);

app/src/basedockwidget.h

@@ -42,6 +42,10 @@ class BaseDockWidget : public QDockWidget
     Editor* editor() const { return mEditor; }
     void setEditor( Editor* e ) { mEditor = e; }
 
+    /// Sets a widget in addition to the normal titlebar buttons.
+    /// If the titlebar already has one widget, the previous one will be deleted.
+    void setWidgetInTitleBarArea(QWidget* widget);
+
 protected:
     void resizeEvent(QResizeEvent* event) override;
 

app/src/timecodecontrolwidget.cpp

@@ -0,0 +1,118 @@
+/*
+
+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 "timecodecontrolwidget.h"
+
+#include "preferencemanager.h"
+#include "pencildef.h"
+#include "pencilsettings.h"
+
+#include <QLabel>
+#include <QToolButton>
+#include <QHBoxLayout>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QGroupBox>
+
+TimeCodeControlWidget::TimeCodeControlWidget(TimeCodeControls* controls, QWidget* parent)
+    : QWidget(parent, Qt::Popup), mControls(controls)
+{
+    auto vboxLayout = new QVBoxLayout();
+    vboxLayout->setContentsMargins(4,4,4,4);
+    setLayout(vboxLayout);
+
+    auto titlelabel = new QLabel(tr("Timecode controls"));
+
+    vboxLayout->addWidget(titlelabel);
+
+    auto showTimeCodeCheckBox = new QCheckBox(this);
+    showTimeCodeCheckBox->setText(tr("Show"));
+    showTimeCodeCheckBox->setChecked(controls->enabled);
+
+    auto optionsGroupBox = new QGroupBox(this);
+    optionsGroupBox->setTitle(tr("Options"));
+    optionsGroupBox->setEnabled(controls->enabled);
+
+    auto showFramesCheckBox = new QCheckBox(this);
+    showFramesCheckBox->setText(tr("Frames"));
+    showFramesCheckBox->setChecked(controls->showFrames);
+
+    auto timecodeComboBox = new QComboBox(this);
+
+    auto groupBoxVBoxLayout = new QVBoxLayout();
+    groupBoxVBoxLayout->setContentsMargins(4,4,4,4);
+    optionsGroupBox->setLayout(groupBoxVBoxLayout);
+
+    groupBoxVBoxLayout->addWidget(showFramesCheckBox);
+    groupBoxVBoxLayout->addWidget(timecodeComboBox);
+
+    timecodeComboBox->addItem(tr("No Timecode"),  timecodeKindToInt(TimecodeKind::NONE));
+    timecodeComboBox->addItem(tr("SMPTE Timecode"), timecodeKindToInt(TimecodeKind::SMPTE));
+    timecodeComboBox->addItem(tr("SFF Timecode"), timecodeKindToInt(TimecodeKind::SFF));
+    timecodeComboBox->setCurrentIndex(timecodeKindToInt(controls->kind));
+
+    vboxLayout->addWidget(showTimeCodeCheckBox);
+    vboxLayout->addWidget(optionsGroupBox);
+
+    connect(showTimeCodeCheckBox, &QCheckBox::toggled, this, [this, optionsGroupBox](bool toggled) {
+        showTimecode(toggled);
+        optionsGroupBox->setEnabled(toggled);
+    });
+
+    connect(showFramesCheckBox, &QCheckBox::toggled, this, [this](bool toggled) {
+        showFrames(toggled);
+    });
+
+    auto comboBoxValueChanged = static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged);
+    connect(timecodeComboBox, comboBoxValueChanged, this, [this, controls](int index) {
+        auto timecodeKind = controls->timecodeKindFromInt(index);
+
+        setTimecodeTimerKind(timecodeKind);
+    });
+}
+
+void TimeCodeControlWidget::showFrames(bool shown)
+{
+    QSettings settings(PENCIL2D, PENCIL2D);
+    settings.setValue(SETTING_TIMECODE_FRAMES_ON, shown);
+
+    mControls->showFrames = shown;
+    emit timecodeUpdated();
+}
+
+int TimeCodeControlWidget::timecodeKindToInt(TimecodeKind kind) const
+{
+    return static_cast<int>(kind);
+}
+
+void TimeCodeControlWidget::showTimecode(bool shown)
+{
+    QSettings settings(PENCIL2D, PENCIL2D);
+    settings.setValue(SETTING_TIMECODE_ON, shown);
+
+    mControls->enabled = shown;
+    emit timecodeUpdated();
+}
+
+void TimeCodeControlWidget::setTimecodeTimerKind(TimecodeKind kind)
+{
+    QSettings settings(PENCIL2D, PENCIL2D);
+    settings.setValue(SETTING_TIMECODE_KIND, timecodeKindToInt(kind));
+    settings.remove(SETTING_TIMECODE_TEXT);
+    mControls->kind = kind;
+
+    emit timecodeUpdated();
+}

app/src/timecodecontrolwidget.h

@@ -0,0 +1,66 @@
+/*
+
+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 TIMECODECONTROLWIDGET_H
+#define TIMECODECONTROLWIDGET_H
+
+#include <QWidget>
+#include "pencildef.h"
+
+struct TimeCodeControls {
+    bool enabled = false;
+    bool showFrames = false;
+
+    TimecodeKind kind = TimecodeKind::NONE;
+
+    TimecodeKind timecodeKindFromInt(int value) const
+    {
+        switch (value)
+        {
+            case 0:
+                return TimecodeKind::NONE;
+            case 1:
+                return TimecodeKind::SMPTE;
+            case 2:
+                return TimecodeKind::SFF;
+            default:
+                return TimecodeKind::NONE;
+        }
+    }
+};
+
+class TimeCodeControlWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit TimeCodeControlWidget(TimeCodeControls* controls, QWidget* parent = nullptr);
+
+signals:
+    void timecodeUpdated();
+
+private:
+
+    int timecodeKindToInt(TimecodeKind kind) const;
+
+    void setTimecodeTimerKind(TimecodeKind kind);
+    void showFrames(bool shown);
+    void showTimecode(bool shown);
+
+    TimeCodeControls* mControls = nullptr;
+};
+
+#endif // TIMECODECONTROLWIDGET_H