rewrite nearly complete

This commit is contained in:
itsmattkc
2019-04-03 01:38:01 +11:00
parent 8989333e99
commit 2d4714547b
102 changed files with 3213 additions and 2892 deletions
+20 -9
View File
@@ -25,6 +25,7 @@
#include "effects/transition.h"
#include "global/config.h"
#include "global/debug.h"
#include "global/math.h"
#include <QScrollBar>
#include <QCoreApplication>
@@ -33,7 +34,7 @@ QVector<Project*> panel_project;
EffectControls* panel_effect_controls = nullptr;
Viewer* panel_sequence_viewer = nullptr;
Viewer* panel_footage_viewer = nullptr;
Timeline* panel_timeline = nullptr;
QVector<Timeline*> panel_timeline;
GraphEditor* panel_graph_editor = nullptr;
void update_ui(bool modified) {
@@ -41,14 +42,16 @@ void update_ui(bool modified) {
panel_effect_controls->SetClips();
}
panel_effect_controls->update_keyframes();
panel_timeline->repaint_timeline();
for (int i=0;i<panel_timeline.size();i++) {
panel_timeline.at(i)->repaint_timeline();
}
panel_sequence_viewer->update_viewer();
panel_graph_editor->update_panel();
}
QDockWidget *get_focused_panel(bool force_hover) {
QDockWidget* w = nullptr;
if (olive::CurrentConfig.hover_focus || force_hover) {
if (olive::config.hover_focus || force_hover) {
for (int i=0;i<olive::panels.size();i++) {
if (olive::panels.at(i)->underMouse()) {
w = olive::panels.at(i);
@@ -78,8 +81,9 @@ void alloc_panels(QWidget* parent) {
panel_project.append(first_project_panel);
panel_effect_controls = new EffectControls(parent);
panel_effect_controls->setObjectName("fx_controls");
panel_timeline = new Timeline(parent);
panel_timeline->setObjectName("timeline");
Timeline* first_timeline_panel = new Timeline(parent);
first_timeline_panel->setObjectName("timeline");
panel_timeline.append(first_timeline_panel);
panel_graph_editor = new GraphEditor(parent);
panel_graph_editor->setObjectName("graph_editor");
}
@@ -89,12 +93,19 @@ void free_panels() {
panel_sequence_viewer = nullptr;
delete panel_footage_viewer;
panel_footage_viewer = nullptr;
delete panel_project;
panel_project = nullptr;
for (int i=0;i<panel_project.size();i++) {
delete panel_project.at(i);
}
panel_project.clear();
delete panel_effect_controls;
panel_effect_controls = nullptr;
delete panel_timeline;
panel_timeline = nullptr;
for (int i=0;i<panel_timeline.size();i++) {
delete panel_timeline.at(i);
}
panel_timeline.clear();
}
void scroll_to_frame_internal(QScrollBar* bar, long frame, double zoom, int area_width) {