refactor: workspace layout — crates/, app at root, legacy C++ removed
Single mechanical restructure commit: - root Cargo.toml = oakapp bin + workspace; one cargo build produces oakapp, oak-cli, oak-worker, liboakengine.dylib - app/rust/src -> src/ (app at repo root, no rust/ nesting) - src/<mod>/rust -> crates/oak<mod>; src/oakcore-rs -> crates/oakcore; src/bindings/oakotio -> crates/oakotio; src/engine/rust -> crates/oakengine (keeps cdylib+staticlib+rlib) - public C headers include/<mod>/ -> crates/oakengine/include/<mod>/ - OFX SDK headers vendored into crates/oakplugin/ofx/ (HostSupport gone) - legacy deleted: old src/ C++ modules, engine/, core/, ffmpeg_bridge/, app/ (Qt), cli/worker C++, root CMakeLists, third_party/KDDockWidgets submodule, otio-install, all build-* output (~40GB) - oakstorage kept but excluded from the workspace (skeleton w/ todos); gpui excluded (own workspace) - verified: cargo build green, cargo test --workspace 1845/0 (with the documented OCIO_RS_* env override for the homebrew OCIO)
This commit is contained in:
@@ -1,22 +0,0 @@
|
||||
# Olive - Non-Linear Video Editor
|
||||
# Copyright (C) 2022 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}
|
||||
panel/node/node.h
|
||||
panel/node/node.cpp
|
||||
PARENT_SCOPE
|
||||
)
|
||||
@@ -1,54 +0,0 @@
|
||||
/***
|
||||
|
||||
Olive - Non-Linear Video Editor
|
||||
Copyright (C) 2022 Olive Team
|
||||
Modifications Copyright (C) 2025 mikesolar
|
||||
|
||||
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 "node.h"
|
||||
|
||||
namespace olive
|
||||
{
|
||||
|
||||
NodePanel::NodePanel()
|
||||
: PanelWidget(QStringLiteral("NodePanel"))
|
||||
{
|
||||
node_widget_ = new NodeWidget(this);
|
||||
connect(this, &NodePanel::shown, node_widget_->view(),
|
||||
&NodeView::center_on_items_bounding_rect);
|
||||
|
||||
connect(node_widget_->view(), &NodeView::nodes_selected, this,
|
||||
&NodePanel::nodes_selected);
|
||||
connect(node_widget_->view(), &NodeView::nodes_deselected, this,
|
||||
&NodePanel::nodes_deselected);
|
||||
connect(node_widget_->view(), &NodeView::node_selection_changed, this,
|
||||
&NodePanel::node_selection_changed);
|
||||
connect(node_widget_->view(), &NodeView::node_selection_changed_with_contexts,
|
||||
this, &NodePanel::node_selection_changed_with_contexts);
|
||||
connect(node_widget_->view(), &NodeView::node_group_opened, this,
|
||||
&NodePanel::node_group_opened);
|
||||
connect(node_widget_->view(), &NodeView::node_group_closed, this,
|
||||
&NodePanel::node_group_closed);
|
||||
|
||||
// Set it as the main widget of this panel
|
||||
set_widget_with_padding(node_widget_);
|
||||
|
||||
// Set strings
|
||||
retranslate();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,152 +0,0 @@
|
||||
/***
|
||||
|
||||
Olive - Non-Linear Video Editor
|
||||
Copyright (C) 2022 Olive Team
|
||||
Modifications Copyright (C) 2025 mikesolar
|
||||
|
||||
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 OAK_NODEPANEL_H
|
||||
#define OAK_NODEPANEL_H
|
||||
|
||||
#include "panel/panel.h"
|
||||
#include "widget/nodeview/nodewidget.h"
|
||||
|
||||
struct OakEngineNode;
|
||||
|
||||
namespace olive
|
||||
{
|
||||
|
||||
/**
|
||||
* @brief A PanelWidget wrapper around a NodeView
|
||||
*/
|
||||
class NodePanel : public PanelWidget {
|
||||
Q_OBJECT
|
||||
public:
|
||||
NodePanel();
|
||||
|
||||
NodeWidget *get_node_widget() const
|
||||
{
|
||||
return node_widget_;
|
||||
}
|
||||
|
||||
const QVector<oak::Node> &get_contexts() const
|
||||
{
|
||||
return node_widget_->view()->get_contexts();
|
||||
}
|
||||
|
||||
bool is_group_overlay() const
|
||||
{
|
||||
return node_widget_->view()->is_group_overlay();
|
||||
}
|
||||
|
||||
void set_contexts(const QVector<oak::Node> &nodes)
|
||||
{
|
||||
node_widget_->set_contexts(nodes);
|
||||
}
|
||||
|
||||
void close_contexts_belonging_to_project(oak::Project project)
|
||||
{
|
||||
node_widget_->view()->close_contexts_belonging_to_project(project);
|
||||
}
|
||||
|
||||
virtual void select_all() override
|
||||
{
|
||||
node_widget_->view()->select_all();
|
||||
}
|
||||
|
||||
virtual void deselect_all() override
|
||||
{
|
||||
node_widget_->view()->deselect_all();
|
||||
}
|
||||
|
||||
virtual void delete_selected() override
|
||||
{
|
||||
node_widget_->view()->delete_selected();
|
||||
}
|
||||
|
||||
virtual void cut_selected() override
|
||||
{
|
||||
node_widget_->view()->copy_selected(true);
|
||||
}
|
||||
|
||||
virtual void copy_selected() override
|
||||
{
|
||||
node_widget_->view()->copy_selected(false);
|
||||
}
|
||||
|
||||
virtual void paste() override
|
||||
{
|
||||
node_widget_->view()->paste();
|
||||
}
|
||||
|
||||
virtual void duplicate() override
|
||||
{
|
||||
node_widget_->view()->duplicate();
|
||||
}
|
||||
|
||||
virtual void set_color_label(int index) override
|
||||
{
|
||||
node_widget_->view()->set_color_label(index);
|
||||
}
|
||||
|
||||
virtual void zoom_in() override
|
||||
{
|
||||
node_widget_->view()->zoom_in();
|
||||
}
|
||||
|
||||
virtual void zoom_out() override
|
||||
{
|
||||
node_widget_->view()->zoom_out();
|
||||
}
|
||||
|
||||
virtual void rename_selected() override
|
||||
{
|
||||
node_widget_->view()->label_selected_nodes();
|
||||
}
|
||||
|
||||
public slots:
|
||||
void select(
|
||||
const QVector<QPair<OakEngineNode *, OakEngineNode *>> &p)
|
||||
{
|
||||
node_widget_->view()->select(p, true);
|
||||
}
|
||||
|
||||
signals:
|
||||
void nodes_selected(const QVector<OakEngineNode *> &nodes);
|
||||
|
||||
void nodes_deselected(const QVector<OakEngineNode *> &nodes);
|
||||
|
||||
void node_selection_changed(const QVector<OakEngineNode *> &nodes);
|
||||
void node_selection_changed_with_contexts(
|
||||
const QVector<QPair<OakEngineNode *, OakEngineNode *>> &nodes);
|
||||
|
||||
void node_group_opened(OakEngineNode *group);
|
||||
|
||||
void node_group_closed();
|
||||
|
||||
private:
|
||||
virtual void retranslate() override
|
||||
{
|
||||
set_title(tr("Node Editor"));
|
||||
}
|
||||
|
||||
NodeWidget *node_widget_;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // OAK_NODEPANEL_H
|
||||
Reference in New Issue
Block a user