nodecombobox: implemented node combobox widget

This commit is contained in:
itsmattkc
2020-05-09 03:22:09 +10:00
parent 3d0f11c6ef
commit 218c63f933
9 changed files with 320 additions and 18 deletions
+1
View File
@@ -27,6 +27,7 @@ add_subdirectory(footagecombobox)
add_subdirectory(keyframeview)
add_subdirectory(manageddisplay)
add_subdirectory(menu)
add_subdirectory(nodecombobox)
add_subdirectory(nodecopypaste)
add_subdirectory(nodeview)
add_subdirectory(nodeparamview)
+22
View File
@@ -0,0 +1,22 @@
# Olive - Non-Linear Video Editor
# Copyright (C) 2019 Olive Team
#
# 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, either version 3 of the License, or
# (at your option) any later version.
#
# 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.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
set(OLIVE_SOURCES
${OLIVE_SOURCES}
widget/nodecombobox/nodecombobox.h
widget/nodecombobox/nodecombobox.cpp
PARENT_SCOPE
)
+93
View File
@@ -0,0 +1,93 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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, either version 3 of the License, or
(at your option) any later version.
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.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#include "nodecombobox.h"
#include <QAction>
#include <QDebug>
#include "node/factory.h"
#include "ui/icons/icons.h"
#include "widget/menu/menu.h"
OLIVE_NAMESPACE_ENTER
NodeComboBox::NodeComboBox(QWidget *parent) :
QComboBox(parent)
{
}
void NodeComboBox::showPopup()
{
Menu* m = NodeFactory::CreateMenu(this, true);
QAction* selected = m->exec(parentWidget()->mapToGlobal(pos()));
if (selected) {
QString new_id = NodeFactory::GetIDFromMenuAction(selected);
SetNodeInternal(new_id, true);
}
delete m;
}
const QString &NodeComboBox::GetSelectedNode() const
{
return selected_id_;
}
void NodeComboBox::SetNode(const QString &id)
{
SetNodeInternal(id, false);
}
void NodeComboBox::changeEvent(QEvent *e)
{
if (e->type() == QEvent::LanguageChange) {
UpdateText();
}
QComboBox::changeEvent(e);
}
void NodeComboBox::UpdateText()
{
clear();
if (!selected_id_.isEmpty()) {
addItem(NodeFactory::GetNameFromID(selected_id_));
}
}
void NodeComboBox::SetNodeInternal(const QString &id, bool emit_signal)
{
if (selected_id_ != id) {
selected_id_ = id;
UpdateText();
if (emit_signal) {
emit NodeChanged(selected_id_);
}
}
}
OLIVE_NAMESPACE_EXIT
+60
View File
@@ -0,0 +1,60 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
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, either version 3 of the License, or
(at your option) any later version.
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.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef NODECOMBOBOX_H
#define NODECOMBOBOX_H
#include <QComboBox>
#include "node/node.h"
OLIVE_NAMESPACE_ENTER
class NodeComboBox : public QComboBox
{
Q_OBJECT
public:
NodeComboBox(QWidget* parent = nullptr);
virtual void showPopup() override;
const QString& GetSelectedNode() const;
public slots:
void SetNode(const QString& id);
protected:
virtual void changeEvent(QEvent *e) override;
signals:
void NodeChanged(const QString& id);
private:
void UpdateText();
void SetNodeInternal(const QString& id, bool emit_signal);
QString selected_id_;
};
OLIVE_NAMESPACE_EXIT
#endif // FOOTAGECOMBOBOX_H
+1 -1
View File
@@ -467,7 +467,7 @@ void NodeViewItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
if (cached_drop_item_->GetInputRect(i).contains(cached_drop_item_->mapFromScene(event->scenePos()))) { // See if we're dragging inside the hitbox
// Attempt to prevent circular dependency - ensure the receiving node doesn't output to the outputting node
if (!cached_drop_item_->GetNode()->OutputsTo(node_)) {
if (!cached_drop_item_->GetNode()->OutputsTo(node_, true)) {
drag_dest_param_ = comp_param;
highlight_their_index = i;