Merge branch 'bezierkeys' of https://github.com/olive-editor/olive into bezierkeys

panels/grapheditor.cpp

@@ -0,0 +1,48 @@
+#include "grapheditor.h"
+
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QPushButton>
+
+#include "ui/graphview.h"
+#include "ui/keyframenavigator.h"
+
+GraphEditor::GraphEditor(QWidget* parent) : QDockWidget(parent) {
+    setWindowTitle("Graph Editor");
+    resize(720, 480);
+
+    QWidget* central_widget = new QWidget();
+    setWidget(central_widget);
+
+    QVBoxLayout* layout = new QVBoxLayout();
+    central_widget->setLayout(layout);
+
+    QWidget* tool_widget = new QWidget();
+    tool_widget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
+    QHBoxLayout* tools = new QHBoxLayout();
+    tool_widget->setLayout(tools);
+
+    KeyframeNavigator* keyframe_nav = new KeyframeNavigator();
+    tools->addWidget(keyframe_nav);
+    tools->addStretch();
+
+    tools->addWidget(new QPushButton("HECK!"));
+    tools->addStretch();
+
+    tools->addWidget(new QPushButton("Hand"));
+
+    layout->addWidget(tool_widget);
+
+    view = new GraphView();
+    layout->addWidget(view);
+
+    QWidget* value_widget = new QWidget();
+    value_widget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
+    QHBoxLayout* values = new QHBoxLayout();
+    value_widget->setLayout(values);
+    values->addStretch();
+    values->addWidget(new QLabel("1920.0"));
+    values->addWidget(new QLabel("1080.0"));
+    values->addStretch();
+    layout->addWidget(value_widget);
+}

panels/grapheditor.h

@@ -0,0 +1,16 @@
+#ifndef GRAPHEDITOR_H
+#define GRAPHEDITOR_H
+
+#include <QDockWidget>
+
+class GraphView;
+
+class GraphEditor : public QDockWidget {
+    Q_OBJECT
+public:
+    GraphEditor(QWidget* parent = 0);
+private:
+    GraphView* view;
+};
+
+#endif // GRAPHEDITOR_H

panels/panels.cpp

@@ -8,6 +8,7 @@
 #include "project/clip.h"
 #include "project/transition.h"
 #include "io/config.h"
+#include "grapheditor.h"
 #include "debug.h"
 
 Project* panel_project = 0;
@@ -15,6 +16,7 @@ EffectControls* panel_effect_controls = 0;
 Viewer* panel_sequence_viewer = 0;
 Viewer* panel_footage_viewer = 0;
 Timeline* panel_timeline = 0;
+GraphEditor* panel_graph_editor = 0;
 
 void update_effect_controls() {
 	// SEND CLIPS TO EFFECT CONTROLS
@@ -110,15 +112,15 @@ void update_ui(bool modified) {
 QDockWidget *get_focused_panel() {
     QDockWidget* w = NULL;
     if (config.hover_focus) {
-        if (panel_project->rect().contains(panel_project->mapFromGlobal(QCursor::pos()))) {
+        if (panel_project->underMouse()) {
             w = panel_project;
-        } else if (panel_effect_controls->rect().contains(panel_effect_controls->mapFromGlobal(QCursor::pos()))) {
+        } else if (panel_effect_controls->underMouse()) {
             w = panel_effect_controls;
-        } else if (panel_sequence_viewer->rect().contains(panel_sequence_viewer->mapFromGlobal(QCursor::pos()))) {
+        } else if (panel_sequence_viewer->underMouse()) {
             w = panel_sequence_viewer;
-        } else if (panel_footage_viewer->rect().contains(panel_footage_viewer->mapFromGlobal(QCursor::pos()))) {
+        } else if (panel_footage_viewer->underMouse()) {
             w = panel_footage_viewer;
-        } else if (panel_timeline->rect().contains(panel_timeline->mapFromGlobal(QCursor::pos()))) {
+        } else if (panel_timeline->underMouse()) {
             w = panel_timeline;
         }
     }
@@ -137,3 +139,32 @@ QDockWidget *get_focused_panel() {
     }
     return w;
 }
+
+void alloc_panels(QWidget* parent) {
+    // TODO maybe replace these with non-pointers later on?
+    panel_sequence_viewer = new Viewer(parent);
+    panel_sequence_viewer->setObjectName("seq_viewer");
+    panel_footage_viewer = new Viewer(parent);
+    panel_footage_viewer->setObjectName("footage_viewer");
+    panel_project = new Project(parent);
+    panel_project->setObjectName("proj_root");
+    panel_effect_controls = new EffectControls(parent);
+    panel_effect_controls->setObjectName("fx_controls");
+    panel_timeline = new Timeline(parent);
+    panel_timeline->setObjectName("timeline");
+    panel_graph_editor = new GraphEditor(parent);
+    panel_graph_editor->setObjectName("graph_editor");
+}
+
+void free_panels() {
+    delete panel_sequence_viewer;
+    panel_sequence_viewer = NULL;
+    delete panel_footage_viewer;
+    panel_footage_viewer = NULL;
+    delete panel_project;
+    panel_project = NULL;
+    delete panel_effect_controls;
+    panel_effect_controls = NULL;
+    delete panel_timeline;
+    panel_timeline = NULL;
+}

panels/panels.h

@@ -5,6 +5,9 @@ class Project;
 class EffectControls;
 class Viewer;
 class Timeline;
+class GraphEditor;
+
+class QWidget;
 class QDockWidget;
 
 extern Project* panel_project;
@@ -12,8 +15,11 @@ extern EffectControls* panel_effect_controls;
 extern Viewer* panel_sequence_viewer;
 extern Viewer* panel_footage_viewer;
 extern Timeline* panel_timeline;
+extern GraphEditor* panel_graph_editor;
 
 void update_ui(bool modified);
 QDockWidget* get_focused_panel();
+void alloc_panels(QWidget *parent);
+void free_panels();
 
 #endif // PANELS_H