began UI for keyframing

Largely extending the existing NodeParamView with functionality from the
previous release.
This commit is contained in:
itsmattkc
2019-12-25 01:20:46 +11:00
parent aac8c5ec17
commit dc6d498da8
19 changed files with 454 additions and 2 deletions
+4
View File
@@ -20,6 +20,10 @@ set(OLIVE_SOURCES
widget/nodeparamview/nodeparamview.cpp
widget/nodeparamview/nodeparamviewitem.h
widget/nodeparamview/nodeparamviewitem.cpp
widget/nodeparamview/nodeparamviewkeyframecontrol.h
widget/nodeparamview/nodeparamviewkeyframecontrol.cpp
widget/nodeparamview/nodeparamviewundo.h
widget/nodeparamview/nodeparamviewundo.cpp
widget/nodeparamview/nodeparamviewwidgetbridge.h
widget/nodeparamview/nodeparamviewwidgetbridge.cpp
PARENT_SCOPE
+12 -1
View File
@@ -21,6 +21,7 @@
#include "nodeparamview.h"
#include <QScrollArea>
#include <QSplitter>
NodeParamView::NodeParamView(QWidget *parent) :
QWidget(parent)
@@ -30,10 +31,13 @@ NodeParamView::NodeParamView(QWidget *parent) :
widget_layout->setSpacing(0);
widget_layout->setMargin(0);
QSplitter* splitter = new QSplitter(Qt::Horizontal);
widget_layout->addWidget(splitter);
// Set up scroll area for params
QScrollArea* scroll_area = new QScrollArea();
scroll_area->setWidgetResizable(true);
widget_layout->addWidget(scroll_area);
splitter->addWidget(scroll_area);
// Param widget
QWidget* param_widget_area = new QWidget();
@@ -46,6 +50,13 @@ NodeParamView::NodeParamView(QWidget *parent) :
// Add a stretch to allow empty space at the bottom of the layout
param_layout_->addStretch();
// Set up keyframe view
keyframe_view_ = new KeyframeView();
splitter->addWidget(keyframe_view_);
// Disable collapsing param view (but collapsing keyframe view is permitted)
splitter->setCollapsible(0, false);
}
void NodeParamView::SetNodes(QList<Node *> nodes)
+3
View File
@@ -26,6 +26,7 @@
#include "node/node.h"
#include "nodeparamviewitem.h"
#include "widget/keyframeview/keyframeview.h"
class NodeParamView : public QWidget
{
@@ -38,6 +39,8 @@ public:
private:
QVBoxLayout* param_layout_;
KeyframeView* keyframe_view_;
QList<Node*> nodes_;
QList<NodeParamViewItem*> items_;
+58 -1
View File
@@ -23,10 +23,14 @@
#include <QCheckBox>
#include <QDebug>
#include <QEvent>
#include <QMessageBox>
#include <QPainter>
#include "nodeparamviewkeyframecontrol.h"
#include "nodeparamviewundo.h"
#include "project/item/sequence/sequence.h"
#include "ui/icons/icons.h"
#include "undo/undostack.h"
NodeParamViewItem::NodeParamViewItem(QWidget *parent) :
QWidget(parent)
@@ -110,6 +114,7 @@ void NodeParamViewItem::SetupUI()
foreach (NodeParam* param, first_node->parameters()) {
// This widget only needs to show input parameters
if (param->type() == NodeParam::kInput) {
NodeInput* input = static_cast<NodeInput*>(param);
// Add descriptor label
QLabel* param_label = new QLabel();
@@ -119,7 +124,7 @@ void NodeParamViewItem::SetupUI()
// Create a widget/input bridge for this input
NodeParamViewWidgetBridge* bridge = new NodeParamViewWidgetBridge(this);
bridge->AddInput(static_cast<NodeInput*>(param));
bridge->AddInput(input);
bridges_.append(bridge);
// Add widgets for this parameter ot the layout
@@ -128,6 +133,15 @@ void NodeParamViewItem::SetupUI()
content_layout_->addWidget(widgets_for_param.at(i), row_count, i + 1);
}
// Add keyframe control to this layout if parameter is keyframable
if (input->is_keyframable()) {
// Hacky but effective way to make sure this widget is always as far right as possible
int control_column = 10;
NodeParamViewKeyframeControl* key_control = new NodeParamViewKeyframeControl(input);
content_layout_->addWidget(key_control, row_count, control_column);
}
row_count++;
}
}
@@ -181,6 +195,49 @@ void NodeParamViewItem::SetExpanded(bool e)
}
}
void NodeParamViewItem::KeyframeEnableChanged(bool e)
{
NodeParamViewKeyframeControl* control = static_cast<NodeParamViewKeyframeControl*>(sender());
NodeInput* input = control->GetConnectedInput();
if (e == input->is_keyframing()) {
// No-op
return;
}
if (e) {
QUndoCommand* command = new QUndoCommand();
// Enable keyframing
new NodeParamSetKeyframing(input, true, command);
// FIXME: Create a keyframe at this time
olive::undo_stack.push(command);
} else {
// Confirm the user wants to clear all keyframes
if (QMessageBox::warning(this,
tr("Warning"),
tr("Are you sure you want to disable keyframing on this value? This will clear all existing keyframes."),
QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
// Disable keyframing
QUndoCommand* command = new QUndoCommand();
// FIXME: Delete all keyframes
// Disable keyframing
new NodeParamSetKeyframing(input, false, command);
olive::undo_stack.push(command);
} else {
// Disable action has effectively been ignored
control->SetKeyframeEnabled(true);
}
}
}
NodeParamViewItemTitleBar::NodeParamViewItemTitleBar(QWidget *parent) :
QWidget(parent)
{
@@ -78,6 +78,8 @@ private:
private slots:
void SetExpanded(bool e);
void KeyframeEnableChanged(bool e);
};
#endif // NODEPARAMVIEWITEM_H
@@ -0,0 +1,72 @@
#include "nodeparamviewkeyframecontrol.h"
#include <QHBoxLayout>
#include "ui/icons/icons.h"
NodeParamViewKeyframeControl::NodeParamViewKeyframeControl(NodeInput* input, QWidget *parent) :
QWidget(parent),
input_(input)
{
QHBoxLayout* layout = new QHBoxLayout(this);
layout->setMargin(0);
layout->setSpacing(0);
// Automatically right aligns all buttons
layout->addStretch();
prev_key_btn_ = CreateNewToolButton(olive::icon::TriLeft);
prev_key_btn_->setIconSize(prev_key_btn_->iconSize() / 2);
layout->addWidget(prev_key_btn_);
toggle_key_btn_ = CreateNewToolButton(olive::icon::Diamond);
toggle_key_btn_->setCheckable(true);
toggle_key_btn_->setIconSize(toggle_key_btn_->iconSize() / 2);
layout->addWidget(toggle_key_btn_);
next_key_btn_ = CreateNewToolButton(olive::icon::TriRight);
next_key_btn_->setIconSize(next_key_btn_->iconSize() / 2);
layout->addWidget(next_key_btn_);
enable_key_btn_ = CreateNewToolButton(olive::icon::Clock);
enable_key_btn_->setCheckable(true);
enable_key_btn_->setIconSize(enable_key_btn_->iconSize() / 4 * 3);
layout->addWidget(enable_key_btn_);
connect(enable_key_btn_, SIGNAL(toggled(bool)), this, SLOT(ShowButtonsFromKeyframeEnable(bool)));
connect(enable_key_btn_, SIGNAL(toggled(bool)), this, SIGNAL(KeyframeEnableChanged(bool)));
// Pick up keyframing value
ShowButtonsFromKeyframeEnable(input_->is_keyframing());
}
NodeInput *NodeParamViewKeyframeControl::GetConnectedInput() const
{
return input_;
}
void NodeParamViewKeyframeControl::SetKeyframeEnabled(bool e)
{
// Suppress KeyframeEnableChanged() signal from this object
blockSignals(true);
enable_key_btn_->setChecked(e);
blockSignals(false);
}
QPushButton *NodeParamViewKeyframeControl::CreateNewToolButton(const QIcon& icon) const
{
QPushButton* btn = new QPushButton();
btn->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
btn->setIcon(icon);
return btn;
}
void NodeParamViewKeyframeControl::ShowButtonsFromKeyframeEnable(bool e)
{
prev_key_btn_->setVisible(e);
toggle_key_btn_->setVisible(e);
next_key_btn_->setVisible(e);
}
@@ -0,0 +1,37 @@
#ifndef NODEPARAMVIEWKEYFRAMECONTROL_H
#define NODEPARAMVIEWKEYFRAMECONTROL_H
#include <QPushButton>
#include <QWidget>
#include "node/input.h"
class NodeParamViewKeyframeControl : public QWidget
{
Q_OBJECT
public:
NodeParamViewKeyframeControl(NodeInput* input, QWidget* parent = nullptr);
NodeInput* GetConnectedInput() const;
public slots:
void SetKeyframeEnabled(bool e);
signals:
void KeyframeEnableChanged(bool);
private:
QPushButton* CreateNewToolButton(const QIcon &icon) const;
QPushButton* prev_key_btn_;
QPushButton* toggle_key_btn_;
QPushButton* next_key_btn_;
QPushButton* enable_key_btn_;
NodeInput* input_;
private slots:
void ShowButtonsFromKeyframeEnable(bool e);
};
#endif // NODEPARAMVIEWKEYFRAMECONTROL_H
@@ -0,0 +1,19 @@
#include "nodeparamviewundo.h"
NodeParamSetKeyframing::NodeParamSetKeyframing(NodeInput *input, bool setting, QUndoCommand *parent) :
QUndoCommand(parent),
input_(input),
setting_(setting)
{
Q_ASSERT(setting != input_->is_keyframing());
}
void NodeParamSetKeyframing::redo()
{
input_->set_is_keyframing(setting_);
}
void NodeParamSetKeyframing::undo()
{
input_->set_is_keyframing(!setting_);
}
@@ -0,0 +1,20 @@
#ifndef NODEPARAMVIEWUNDO_H
#define NODEPARAMVIEWUNDO_H
#include <QUndoCommand>
#include "node/input.h"
class NodeParamSetKeyframing : public QUndoCommand {
public:
NodeParamSetKeyframing(NodeInput* input, bool setting, QUndoCommand* parent = nullptr);
virtual void redo() override;
virtual void undo() override;
private:
NodeInput* input_;
bool setting_;
};
#endif // NODEPARAMVIEWUNDO_H