started new timeline paradigm

This commit is contained in:
itsmattkc
2019-03-30 19:43:22 +11:00
parent 7f92774dc9
commit 8e95210b22
19 changed files with 272 additions and 72 deletions
+3 -3
View File
@@ -37,7 +37,7 @@
#include "global/global.h"
#include "panels/panels.h"
#include "project/projectelements.h"
#include "ui/timelinewidget.h"
#include "ui/timelineview.h"
#include "ui/icons.h"
#include "ui/viewerwidget.h"
#include "rendering/audio.h"
@@ -2058,7 +2058,7 @@ void Timeline::setup_ui() {
videoContainerLayout->setSpacing(0);
videoContainerLayout->setContentsMargins(0, 0, 0, 0);
video_area = new TimelineWidget();
video_area = new TimelineView();
video_area->setFocusPolicy(Qt::ClickFocus);
videoContainerLayout->addWidget(video_area);
@@ -2075,7 +2075,7 @@ void Timeline::setup_ui() {
audioContainerLayout->setSpacing(0);
audioContainerLayout->setContentsMargins(0, 0, 0, 0);
audio_area = new TimelineWidget();
audio_area = new TimelineView();
audio_area->setFocusPolicy(Qt::ClickFocus);
audioContainerLayout->addWidget(audio_area);
+3 -6
View File
@@ -25,7 +25,7 @@
#include <QTime>
#include <QPushButton>
#include "ui/timelinewidget.h"
#include "ui/timelinearea.h"
#include "ui/timelinetools.h"
#include "timeline/selection.h"
#include "timeline/clip.h"
@@ -94,9 +94,6 @@ public:
bool showing_all;
double old_zoom;
int GetTrackHeight(int track);
void SetTrackHeight(int track, int height);
// snapping
bool snapping;
bool snapped;
@@ -233,8 +230,8 @@ private:
long rc_ripple_max;
QWidget* timeline_area;
TimelineWidget* video_area;
TimelineWidget* audio_area;
TimelineArea* video_area;
TimelineArea* audio_area;
QWidget* editAreas;
QScrollBar* videoScrollbar;
QScrollBar* audioScrollbar;
+1 -1
View File
@@ -32,7 +32,7 @@
#include "ui/panel.h"
#include "ui/viewerwidget.h"
#include "ui/timelinewidget.h"
#include "ui/timelineview.h"
#include "ui/timelineheader.h"
#include "ui/labelslider.h"
#include "ui/resizablescrollbar.h"