oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

various: encapsulate all code in the olive namespace to avoid name collisions

Browse Source 
Large-scale code cleanup. Also adds a license to the top of all files that were
missing it.
This commit is contained in:
itsmattkc
2020-04-06 15:29:53 +10:00
parent 82b6ddccc8
commit 1aa87cbda6
519 changed files with 7939 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/timelinewidget/timelineandtrackview.cpp
+24
View File
@@ -1,8 +1,30 @@
/***
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 "timelineandtrackview.h"
#include <QHBoxLayout>
#include <QScrollBar>
OLIVE_NAMESPACE_ENTER
TimelineAndTrackView::TimelineAndTrackView(Qt::Alignment vertical_alignment, QWidget *parent) :
QWidget(parent)
{
@@ -50,3 +72,5 @@ void TimelineAndTrackView::TracksValueChanged(int v)
{
view_->verticalScrollBar()->setValue(view_->verticalScrollBar()->minimum() + v);
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/timelineandtrackview.h
+24
View File
@@ -1,3 +1,23 @@
/***
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 TIMELINEANDTRACKVIEW_H
#define TIMELINEANDTRACKVIEW_H
@@ -7,6 +27,8 @@
#include "view/timelineview.h"
#include "trackview/trackview.h"
OLIVE_NAMESPACE_ENTER
class TimelineAndTrackView : public QWidget
{
public:
@@ -33,4 +55,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // TIMELINEANDTRACKVIEW_H
app/widget/timelinewidget/timelinescaledobject.cpp
+24
View File
@@ -1,3 +1,23 @@
/***
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 "timelinescaledobject.h"
#include <cfloat>
@@ -5,6 +25,8 @@
#include "common/clamp.h"
OLIVE_NAMESPACE_ENTER
TimelineScaledObject::TimelineScaledObject() :
scale_(1.0),
min_scale_(0),
@@ -94,3 +116,5 @@ TimelineScaledWidget::TimelineScaledWidget(QWidget *parent) :
QWidget(parent)
{
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/timelinescaledobject.h
+24
View File
@@ -1,3 +1,23 @@
/***
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 TIMELINESCALEDOBJECT_H
#define TIMELINESCALEDOBJECT_H
@@ -5,6 +25,8 @@
#include "common/rational.h"
OLIVE_NAMESPACE_ENTER
class TimelineScaledObject
{
public:
@@ -54,4 +76,6 @@ public:
TimelineScaledWidget(QWidget* parent = nullptr);
};
OLIVE_NAMESPACE_EXIT
#endif // TIMELINESCALEDOBJECT_H
app/widget/timelinewidget/timelinewidget.cpp
+36 -12
View File
@@ -1,3 +1,23 @@
/***
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 "timelinewidget.h"
#include <QSplitter>
@@ -14,6 +34,8 @@
#include "widget/menu/menu.h"
#include "widget/nodeview/nodeviewundo.h"
OLIVE_NAMESPACE_ENTER
TimelineWidget::TimelineWidget(QWidget *parent) :
TimeBasedWidget(true, true, parent),
rubberband_(QRubberBand::Rectangle, this),
@@ -48,20 +70,20 @@ TimelineWidget::TimelineWidget(QWidget *parent) :
views_.append(new TimelineAndTrackView(Qt::AlignTop));
// Create tools
tools_.resize(::Tool::kCount);
tools_.resize(OLIVE_NAMESPACE::Tool::kCount);
tools_.fill(nullptr);
tools_.replace(::Tool::kPointer, new PointerTool(this));
tools_.replace(::Tool::kEdit, new EditTool(this));
tools_.replace(::Tool::kRipple, new RippleTool(this));
tools_.replace(::Tool::kRolling, new RollingTool(this));
tools_.replace(::Tool::kRazor, new RazorTool(this));
tools_.replace(::Tool::kSlip, new SlipTool(this));
tools_.replace(::Tool::kSlide, new SlideTool(this));
tools_.replace(::Tool::kZoom, new ZoomTool(this));
tools_.replace(::Tool::kTransition, new TransitionTool(this));
//tools_.replace(::Tool::kRecord, new PointerTool(this)); FIXME: Implement
tools_.replace(::Tool::kAdd, new AddTool(this));
tools_.replace(OLIVE_NAMESPACE::Tool::kPointer, new PointerTool(this));
tools_.replace(OLIVE_NAMESPACE::Tool::kEdit, new EditTool(this));
tools_.replace(OLIVE_NAMESPACE::Tool::kRipple, new RippleTool(this));
tools_.replace(OLIVE_NAMESPACE::Tool::kRolling, new RollingTool(this));
tools_.replace(OLIVE_NAMESPACE::Tool::kRazor, new RazorTool(this));
tools_.replace(OLIVE_NAMESPACE::Tool::kSlip, new SlipTool(this));
tools_.replace(OLIVE_NAMESPACE::Tool::kSlide, new SlideTool(this));
tools_.replace(OLIVE_NAMESPACE::Tool::kZoom, new ZoomTool(this));
tools_.replace(OLIVE_NAMESPACE::Tool::kTransition, new TransitionTool(this));
//tools_.replace(OLIVE_NAMESPACE::Tool::kRecord, new PointerTool(this)); FIXME: Implement
tools_.replace(OLIVE_NAMESPACE::Tool::kAdd, new AddTool(this));
import_tool_ = new ImportTool(this);
@@ -1250,3 +1272,5 @@ void TimelineWidget::EndRubberBandSelect(bool enable_selecting, bool select_link
ViewSelectionChanged();
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/timelinewidget.h
+24
View File
@@ -1,3 +1,23 @@
/***
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 TIMELINEWIDGET_H
#define TIMELINEWIDGET_H
@@ -12,6 +32,8 @@
#include "widget/slider/timeslider.h"
#include "widget/timebased/timebased.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief Full widget for working with TimelineOutput nodes
*
@@ -497,4 +519,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // TIMELINEWIDGET_H
app/widget/timelinewidget/tool/add.cpp
+37 -13
View File
@@ -1,9 +1,31 @@
/***
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 "widget/timelinewidget/timelinewidget.h"
#include "core.h"
#include "node/factory.h"
#include "widget/nodeview/nodeviewundo.h"
OLIVE_NAMESPACE_ENTER
TimelineWidget::AddTool::AddTool(TimelineWidget *parent) :
Tool(parent),
ghost_(nullptr)
@@ -22,18 +44,18 @@ void TimelineWidget::AddTool::MousePress(TimelineViewMouseEvent *event)
Timeline::TrackType add_type = Timeline::kTrackTypeNone;
switch (Core::instance()->selected_addable_object()) {
case ::Tool::kAddableBars:
case ::Tool::kAddableSolid:
case ::Tool::kAddableTitle:
case OLIVE_NAMESPACE::Tool::kAddableBars:
case OLIVE_NAMESPACE::Tool::kAddableSolid:
case OLIVE_NAMESPACE::Tool::kAddableTitle:
add_type = Timeline::kTrackTypeVideo;
break;
case ::Tool::kAddableTone:
case OLIVE_NAMESPACE::Tool::kAddableTone:
add_type = Timeline::kTrackTypeAudio;
break;
case ::Tool::kAddableEmpty:
case OLIVE_NAMESPACE::Tool::kAddableEmpty:
// Leave as "none", which means this block can be placed on any track
break;
case ::Tool::kAddableCount:
case OLIVE_NAMESPACE::Tool::kAddableCount:
return;
}
@@ -73,7 +95,7 @@ void TimelineWidget::AddTool::MouseRelease(TimelineViewMouseEvent *event)
ClipBlock* clip = new ClipBlock();
clip->set_length_and_media_out(ghost_->AdjustedLength());
clip->set_block_name(::Tool::GetAddableObjectName(Core::instance()->selected_addable_object()));
clip->set_block_name(OLIVE_NAMESPACE::Tool::GetAddableObjectName(Core::instance()->selected_addable_object()));
NodeGraph* graph = static_cast<NodeGraph*>(parent()->GetConnectedNode()->parent());
@@ -88,10 +110,10 @@ void TimelineWidget::AddTool::MouseRelease(TimelineViewMouseEvent *event)
command);
switch (Core::instance()->selected_addable_object()) {
case ::Tool::kAddableEmpty:
case OLIVE_NAMESPACE::Tool::kAddableEmpty:
// Empty, nothing to be done
break;
case ::Tool::kAddableSolid:
case OLIVE_NAMESPACE::Tool::kAddableSolid:
{
Node* solid = NodeFactory::CreateFromID(QStringLiteral("org.olivevideoeditor.Olive.solidgenerator"));
@@ -102,13 +124,13 @@ void TimelineWidget::AddTool::MouseRelease(TimelineViewMouseEvent *event)
new NodeEdgeAddCommand(solid->output(), clip->texture_input(), command);
break;
}
case ::Tool::kAddableBars:
case ::Tool::kAddableTitle:
case ::Tool::kAddableTone:
case OLIVE_NAMESPACE::Tool::kAddableBars:
case OLIVE_NAMESPACE::Tool::kAddableTitle:
case OLIVE_NAMESPACE::Tool::kAddableTone:
// Not implemented yet
qWarning() << "Unimplemented add object:" << Core::instance()->selected_addable_object();
break;
case ::Tool::kAddableCount:
case OLIVE_NAMESPACE::Tool::kAddableCount:
// Invalid value, do nothing
break;
}
@@ -155,3 +177,5 @@ void TimelineWidget::AddTool::MouseMoveInternal(const rational &cursor_frame, bo
ghost_->SetOutAdjustment(outwards ? -movement : 0);
}
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/tool/edit.cpp
+24
View File
@@ -1,5 +1,27 @@
/***
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 "widget/timelinewidget/timelinewidget.h"
OLIVE_NAMESPACE_ENTER
TimelineWidget::EditTool::EditTool(TimelineWidget* parent) :
Tool(parent)
{
@@ -19,3 +41,5 @@ void TimelineWidget::EditTool::MouseRelease(TimelineViewMouseEvent *event)
{
Q_UNUSED(event)
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/tool/import.cpp
+4
View File
@@ -37,6 +37,8 @@
#include "widget/nodeview/nodeviewundo.h"
#include "window/mainwindow/mainwindow.h"
OLIVE_NAMESPACE_ENTER
Timeline::TrackType TrackTypeFromStreamType(Stream::Type stream_type)
{
switch (stream_type) {
@@ -451,3 +453,5 @@ void TimelineWidget::ImportTool::DropGhosts(bool insert)
Core::instance()->main_window()->OpenSequence(open_sequence);
}
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/tool/pointer.cpp
+4
View File
@@ -34,6 +34,8 @@
#include "node/block/transition/transition.h"
#include "widget/nodeview/nodeviewundo.h"
OLIVE_NAMESPACE_ENTER
TimelineWidget::PointerTool::PointerTool(TimelineWidget *parent) :
Tool(parent),
movement_allowed_(true),
@@ -714,3 +716,5 @@ rational TimelineWidget::PointerTool::ValidateOutTrimming(rational movement,
return movement;
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/tool/razor.cpp
+4
View File
@@ -20,6 +20,8 @@
#include "widget/timelinewidget/timelinewidget.h"
OLIVE_NAMESPACE_ENTER
TimelineWidget::RazorTool::RazorTool(TimelineWidget* parent) :
Tool(parent)
{
@@ -90,3 +92,5 @@ void TimelineWidget::RazorTool::MouseRelease(TimelineViewMouseEvent *event)
dragging_ = false;
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/tool/ripple.cpp
+4
View File
@@ -23,6 +23,8 @@
#include "node/block/gap/gap.h"
#include "widget/nodeview/nodeviewundo.h"
OLIVE_NAMESPACE_ENTER
TimelineWidget::RippleTool::RippleTool(TimelineWidget* parent) :
PointerTool(parent)
{
@@ -152,3 +154,5 @@ void TimelineWidget::RippleTool::InitiateGhosts(TimelineViewBlockItem *clicked_i
}
}
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/tool/rolling.cpp
+4
View File
@@ -23,6 +23,8 @@
#include "node/block/gap/gap.h"
#include "widget/nodeview/nodeviewundo.h"
OLIVE_NAMESPACE_ENTER
TimelineWidget::RollingTool::RollingTool(TimelineWidget* parent) :
PointerTool(parent)
{
@@ -99,3 +101,5 @@ void TimelineWidget::RollingTool::InitiateGhosts(TimelineViewBlockItem *clicked_
}
}
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/tool/slide.cpp
+3
View File
@@ -23,6 +23,8 @@
#include "node/block/gap/gap.h"
#include "widget/nodeview/nodeviewundo.h"
OLIVE_NAMESPACE_ENTER
TimelineWidget::SlideTool::SlideTool(TimelineWidget* parent) :
PointerTool(parent)
{
@@ -89,3 +91,4 @@ void TimelineWidget::SlideTool::InitiateGhosts(TimelineViewBlockItem *clicked_it
}
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/tool/slip.cpp
+3
View File
@@ -25,6 +25,8 @@
#include "common/timecodefunctions.h"
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
TimelineWidget::SlipTool::SlipTool(TimelineWidget *parent) :
PointerTool(parent)
{
@@ -80,3 +82,4 @@ void TimelineWidget::SlipTool::MouseReleaseInternal(TimelineViewMouseEvent *even
Core::instance()->undo_stack()->pushIfHasChildren(command);
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/tool/tool.cpp
+4
View File
@@ -26,6 +26,8 @@
#include "node/block/transition/transition.h"
#include "widget/nodeview/nodeviewundo.h"
OLIVE_NAMESPACE_ENTER
TimelineWidget::Tool::Tool(TimelineWidget *parent) :
dragging_(false),
parent_(parent)
@@ -224,3 +226,5 @@ void TimelineWidget::Tool::InsertGapsAtGhostDestination(const QVector<TimelineVi
parent()->InsertGapsAt(earliest_point, latest_point - earliest_point, command);
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/tool/transition.cpp
+24
View File
@@ -1,9 +1,31 @@
/***
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 "widget/timelinewidget/timelinewidget.h"
#include "node/block/transition/transition.h"
#include "node/factory.h"
#include "widget/nodeview/nodeviewundo.h"
OLIVE_NAMESPACE_ENTER
TimelineWidget::TransitionTool::TransitionTool(TimelineWidget *parent) :
AddTool(parent)
{
@@ -152,3 +174,5 @@ void TimelineWidget::TransitionTool::MouseRelease(TimelineViewMouseEvent *event)
ghost_ = nullptr;
}
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/tool/zoom.cpp
+4
View File
@@ -20,6 +20,8 @@
#include "widget/timelinewidget/timelinewidget.h"
OLIVE_NAMESPACE_ENTER
TimelineWidget::ZoomTool::ZoomTool(TimelineWidget *parent) :
Tool(parent)
{
@@ -90,3 +92,5 @@ void TimelineWidget::ZoomTool::MouseRelease(TimelineViewMouseEvent *event)
// (using a hacky singleShot so the scroll occurs after the scene and its scrollbars have updated)
QTimer::singleShot(0, parent(), &TimelineWidget::DeferredScrollAction);
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/trackview/trackview.cpp
+24
View File
@@ -1,3 +1,23 @@
/***
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 "trackview.h"
#include <QDebug>
@@ -8,6 +28,8 @@
#include "trackviewitem.h"
OLIVE_NAMESPACE_ENTER
TrackView::TrackView(Qt::Alignment vertical_alignment, QWidget *parent) :
QScrollArea(parent),
list_(nullptr),
@@ -110,3 +132,5 @@ void TrackView::RemoveTrack(TrackOutput *track)
{
splitter_->Remove(track->Index());
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/trackview/trackview.h
+24
View File
@@ -1,3 +1,23 @@
/***
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 TRACKVIEW_H
#define TRACKVIEW_H
@@ -8,6 +28,8 @@
#include "trackviewitem.h"
#include "trackviewsplitter.h"
OLIVE_NAMESPACE_ENTER
class TrackView : public QScrollArea
{
Q_OBJECT
@@ -43,4 +65,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // TRACKVIEW_H
app/widget/timelinewidget/trackview/trackviewitem.cpp
+24
View File
@@ -1,3 +1,23 @@
/***
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 "trackviewitem.h"
#include <QDebug>
@@ -6,6 +26,8 @@
#include <QPainter>
#include <QtMath>
OLIVE_NAMESPACE_ENTER
TrackViewItem::TrackViewItem(TrackOutput* track, QWidget *parent) :
QWidget(parent),
track_(track)
@@ -84,3 +106,5 @@ void TrackViewItem::LineEditCancelled()
line_edit_->blockSignals(false);
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/trackview/trackviewitem.h
+24
View File
@@ -1,3 +1,23 @@
/***
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 TRACKVIEWITEM_H
#define TRACKVIEWITEM_H
@@ -9,6 +29,8 @@
#include "widget/clickablelabel/clickablelabel.h"
#include "widget/focusablelineedit/focusablelineedit.h"
OLIVE_NAMESPACE_ENTER
class TrackViewItem : public QWidget
{
Q_OBJECT
@@ -39,4 +61,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // TRACKVIEWITEM_H
app/widget/timelinewidget/trackview/trackviewsplitter.cpp
+24
View File
@@ -1,3 +1,23 @@
/***
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 "trackviewsplitter.h"
#include <QDebug>
@@ -5,6 +25,8 @@
#include "node/output/track/track.h"
OLIVE_NAMESPACE_ENTER
TrackViewSplitter::TrackViewSplitter(Qt::Alignment vertical_alignment, QWidget* parent) :
QSplitter(Qt::Vertical, parent),
alignment_(vertical_alignment),
@@ -169,3 +191,5 @@ void TrackViewSplitterHandle::paintEvent(QPaintEvent *)
QPainter p(this);
p.fillRect(rect(), palette().base());
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/trackview/trackviewsplitter.h
+26
View File
@@ -1,8 +1,32 @@
/***
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 TRACKVIEWSPLITTER_H
#define TRACKVIEWSPLITTER_H
#include <QSplitter>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
class TrackViewSplitterHandle : public QSplitterHandle
{
Q_OBJECT
@@ -53,4 +77,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // TRACKVIEWSPLITTER_H
app/widget/timelinewidget/undo/undo.cpp
+4
View File
@@ -25,6 +25,8 @@
#include "node/block/transition/transition.h"
#include "widget/nodeview/nodeviewundo.h"
OLIVE_NAMESPACE_ENTER
Node* TakeNodeFromParentGraph(Node* n, QObject* new_parent = nullptr)
{
static_cast<NodeGraph*>(n->parent())->TakeNode(n, new_parent);
@@ -796,3 +798,5 @@ BlockLinkManyCommand::BlockLinkManyCommand(const QList<Block *> blocks, bool lin
}
}
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/undo/undo.h
+4
View File
@@ -30,6 +30,8 @@
#include "timeline/timelinepoints.h"
#include "undo/undocommand.h"
OLIVE_NAMESPACE_ENTER
class BlockResizeCommand : public UndoCommand {
public:
BlockResizeCommand(Block* block, rational new_length, QUndoCommand* parent = nullptr);
@@ -373,4 +375,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // TIMELINEUNDOABLE_H
app/widget/timelinewidget/view/timelineview.cpp
+4
View File
@@ -33,6 +33,8 @@
#include "node/input/media/media.h"
#include "project/item/footage/footage.h"
OLIVE_NAMESPACE_ENTER
TimelineView::TimelineView(Qt::Alignment vertical_alignment, QWidget *parent) :
TimelineViewBase(parent),
connected_track_list_(nullptr)
@@ -354,3 +356,5 @@ void TimelineView::UserSetTime(const int64_t &time)
SetTime(time);
emit TimeChanged(time);
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/view/timelineview.h
+4
View File
@@ -35,6 +35,8 @@
#include "widget/timelinewidget/undo/undo.h"
#include "undo/undostack.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief A widget for viewing and interacting Sequences
*
@@ -108,4 +110,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // TIMELINEVIEW_H
app/widget/timelinewidget/view/timelineviewbase.cpp
+24
View File
@@ -1,3 +1,23 @@
/***
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 "timelineviewbase.h"
#include <QGraphicsRectItem>
@@ -9,6 +29,8 @@
#include "common/timecodefunctions.h"
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
const double TimelineViewBase::kMaximumScale = 8192;
TimelineViewBase::TimelineViewBase(QWidget *parent) :
@@ -322,3 +344,5 @@ void TimelineViewBase::ApplicationToolChanged(Tool::Item tool)
ToolChangedEvent(tool);
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/view/timelineviewbase.h
+24
View File
@@ -1,3 +1,23 @@
/***
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 TIMELINEVIEWBASE_H
#define TIMELINEVIEWBASE_H
@@ -8,6 +28,8 @@
#include "timelineviewenditem.h"
#include "widget/timelinewidget/timelinescaledobject.h"
OLIVE_NAMESPACE_ENTER
class TimelineViewBase : public QGraphicsView, public TimelineScaledObject
{
Q_OBJECT
@@ -99,4 +121,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // TIMELINEVIEWBASE_H
app/widget/timelinewidget/view/timelineviewblockitem.cpp
+4
View File
@@ -35,6 +35,8 @@
#include "node/block/transition/transition.h"
#include "widget/viewer/audiowaveformview.h"
OLIVE_NAMESPACE_ENTER
TimelineViewBlockItem::TimelineViewBlockItem(Block *block, QGraphicsItem* parent) :
TimelineViewRect(parent),
block_(block)
@@ -196,3 +198,5 @@ void TimelineViewBlockItem::paint(QPainter *painter, const QStyleOptionGraphicsI
}
}
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/view/timelineviewblockitem.h
+4
View File
@@ -24,6 +24,8 @@
#include "timelineviewrect.h"
#include "node/block/clip/clip.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief A graphical representation of a ClipBlock
*/
@@ -44,4 +46,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // TIMELINEVIEWCLIPITEM_H
app/widget/timelinewidget/view/timelineviewenditem.cpp
+24
View File
@@ -1,5 +1,27 @@
/***
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 "timelineviewenditem.h"
OLIVE_NAMESPACE_ENTER
TimelineViewEndItem::TimelineViewEndItem(QGraphicsItem *parent) :
TimelineViewRect(parent),
end_padding_(0)
@@ -35,3 +57,5 @@ void TimelineViewEndItem::paint(QPainter *painter, const QStyleOptionGraphicsIte
Q_UNUSED(option)
Q_UNUSED(widget)
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/view/timelineviewenditem.h
+24
View File
@@ -1,8 +1,30 @@
/***
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 TIMELINEVIEWENDITEM_H
#define TIMELINEVIEWENDITEM_H
#include "timelineviewrect.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief An item placed at the end point of the Timeline to ensure the correct scene size
*/
@@ -26,4 +48,6 @@ private:
int end_padding_;
};
OLIVE_NAMESPACE_EXIT
#endif // TIMELINEVIEWENDITEM_H
app/widget/timelinewidget/view/timelineviewghostitem.cpp
+4
View File
@@ -22,6 +22,8 @@
#include <QPainter>
OLIVE_NAMESPACE_ENTER
TimelineViewGhostItem::TimelineViewGhostItem(QGraphicsItem *parent) :
TimelineViewRect(parent),
track_adj_(0),
@@ -211,3 +213,5 @@ void TimelineViewGhostItem::UpdateRect()
setPos(TimeToScene(GetAdjustedIn()), 0);
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/view/timelineviewghostitem.h
+3
View File
@@ -28,6 +28,7 @@
#include "timelineviewblockitem.h"
#include "timelineviewrect.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief A graphical representation of changes the user is making before they apply it
*/
@@ -105,4 +106,6 @@ private:
bool can_move_tracks_;
};
OLIVE_NAMESPACE_EXIT
#endif // TIMELINEVIEWGHOSTITEM_H
app/widget/timelinewidget/view/timelineviewmouseevent.cpp
+4
View File
@@ -24,6 +24,8 @@
#include "widget/timelinewidget/timelinescaledobject.h"
OLIVE_NAMESPACE_ENTER
TimelineViewMouseEvent::TimelineViewMouseEvent(const qreal &scene_x,
const double &scale_x,
const rational &timebase,
@@ -90,3 +92,5 @@ void TimelineViewMouseEvent::ignore()
if (source_event_ != nullptr)
source_event_->ignore();
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/view/timelineviewmouseevent.h
+4
View File
@@ -27,6 +27,8 @@
#include "timeline/timelinecoordinate.h"
OLIVE_NAMESPACE_ENTER
class TimelineViewMouseEvent
{
public:
@@ -77,4 +79,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // TIMELINEVIEWMOUSEEVENT_H
app/widget/timelinewidget/view/timelineviewrect.cpp
+4
View File
@@ -20,6 +20,8 @@
#include "timelineviewrect.h"
OLIVE_NAMESPACE_ENTER
TimelineViewRect::TimelineViewRect(QGraphicsItem* parent) :
QGraphicsRectItem(parent),
y_(0),
@@ -59,3 +61,5 @@ void TimelineViewRect::TimebaseChangedEvent(const rational &tb)
UpdateRect();
}
OLIVE_NAMESPACE_EXIT
app/widget/timelinewidget/view/timelineviewrect.h
+4
View File
@@ -26,6 +26,8 @@
#include "timeline/timelinecoordinate.h"
#include "../timelinescaledobject.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief A base class for graphical representations of Block nodes
*/
@@ -53,4 +55,6 @@ protected:
TrackReference track_;
};
OLIVE_NAMESPACE_EXIT
#endif // TIMELINEVIEWRECT_H