moved some files around for better organization

app/node/CMakeLists.txt

@@ -41,6 +41,8 @@ set(OLIVE_SOURCES
   node/keyframe.cpp
   node/node.h
   node/node.cpp
+  node/nodecopypaste.h
+  node/nodecopypaste.cpp
   node/output.h
   node/output.cpp
   node/param.h

app/node/nodecopypaste.cpp

@@ -29,7 +29,7 @@
 
 namespace olive {
 
-void NodeCopyPasteWidget::CopyNodesToClipboard(const QVector<Node *> &nodes, void *userdata)
+void NodeCopyPasteService::CopyNodesToClipboard(const QVector<Node *> &nodes, void *userdata)
 {
   QString copy_str;
 
@@ -56,7 +56,7 @@ void NodeCopyPasteWidget::CopyNodesToClipboard(const QVector<Node *> &nodes, voi
   Core::CopyStringToClipboard(copy_str);
 }
 
-QVector<Node *> NodeCopyPasteWidget::PasteNodesFromClipboard(Sequence *graph, QUndoCommand* command, void *userdata)
+QVector<Node *> NodeCopyPasteService::PasteNodesFromClipboard(Sequence *graph, QUndoCommand* command, void *userdata)
 {
   QString clipboard = Core::PasteStringFromClipboard();
 
@@ -166,11 +166,11 @@ QVector<Node *> NodeCopyPasteWidget::PasteNodesFromClipboard(Sequence *graph, QU
   return pasted_nodes;
 }
 
-void NodeCopyPasteWidget::CopyNodesToClipboardInternal(QXmlStreamWriter*, void*)
+void NodeCopyPasteService::CopyNodesToClipboardInternal(QXmlStreamWriter*, void*)
 {
 }
 
-void NodeCopyPasteWidget::PasteNodesFromClipboardInternal(QXmlStreamReader* reader, XMLNodeData &xml_node_data, void*)
+void NodeCopyPasteService::PasteNodesFromClipboardInternal(QXmlStreamReader* reader, XMLNodeData &xml_node_data, void*)
 {
   reader->skipCurrentElement();
 }

app/node/nodecopypaste.h

@@ -29,10 +29,10 @@
 
 namespace olive {
 
-class NodeCopyPasteWidget
+class NodeCopyPasteService
 {
 public:
-  NodeCopyPasteWidget() = default;
+  NodeCopyPasteService() = default;
 
 protected:
   void CopyNodesToClipboard(const QVector<Node *> &nodes, void* userdata = nullptr);

app/panel/timebased/timebased.h

@@ -22,7 +22,7 @@
 #define TIMEBASEDPANEL_H
 
 #include "widget/panel/panel.h"
-#include "widget/timebased/timebased.h"
+#include "widget/timebased/timebasedwidget.h"
 
 namespace olive {
 

app/widget/CMakeLists.txt

@@ -24,11 +24,11 @@ add_subdirectory(curvewidget)
 add_subdirectory(flowlayout)
 add_subdirectory(focusablelineedit)
 add_subdirectory(footagecombobox)
+add_subdirectory(handmovableview)
 add_subdirectory(keyframeview)
 add_subdirectory(manageddisplay)
 add_subdirectory(menu)
 add_subdirectory(nodecombobox)
-add_subdirectory(nodecopypaste)
 add_subdirectory(nodetableview)
 add_subdirectory(nodetreeview)
 add_subdirectory(nodeparamview)

app/widget/curvewidget/curvewidget.h

@@ -31,7 +31,7 @@
 #include "widget/nodeparamview/nodeparamviewkeyframecontrol.h"
 #include "widget/nodeparamview/nodeparamviewwidgetbridge.h"
 #include "widget/nodetreeview/nodetreeview.h"
-#include "widget/timebased/timebased.h"
+#include "widget/timebased/timebasedwidget.h"
 
 namespace olive {
 

app/widget/handmovableview/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Olive - Non-Linear Video Editor
+# Copyright (C) 2020 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}
+  widget/handmovableview/handmovableview.h
+  widget/handmovableview/handmovableview.cpp
+  PARENT_SCOPE
+)

app/widget/keyframeview/keyframeviewbase.cpp

@@ -33,7 +33,7 @@
 namespace olive {
 
 KeyframeViewBase::KeyframeViewBase(QWidget *parent) :
-  TimelineViewBase(parent),
+  TimeBasedView(parent),
   dragging_bezier_point_(nullptr),
   currently_autoselecting_(false)
 {
@@ -275,7 +275,7 @@ void KeyframeViewBase::mouseReleaseEvent(QMouseEvent *event)
 
 void KeyframeViewBase::ScaleChangedEvent(const double &scale)
 {
-  TimelineViewBase::ScaleChangedEvent(scale);
+  TimeBasedView::ScaleChangedEvent(scale);
 
   QMap<NodeKeyframe*, KeyframeViewItem*>::const_iterator iterator;
 

app/widget/keyframeview/keyframeviewbase.h

@@ -25,12 +25,12 @@
 #include "node/keyframe.h"
 #include "widget/curvewidget/beziercontrolpointitem.h"
 #include "widget/menu/menu.h"
-#include "widget/timelinewidget/view/timelineviewbase.h"
+#include "widget/timebased/timebasedview.h"
 #include "widget/timetarget/timetarget.h"
 
 namespace olive {
 
-class KeyframeViewBase : public TimelineViewBase, public TimeTargetObject
+class KeyframeViewBase : public TimeBasedView, public TimeTargetObject
 {
   Q_OBJECT
 public:

app/widget/nodeparamview/nodeparamview.cpp

@@ -125,7 +125,7 @@ NodeParamView::NodeParamView(QWidget *parent) :
   // Set a default scale - FIXME: Hardcoded
   SetScale(120);
 
-  SetMaximumScale(TimelineViewBase::kMaximumScale);
+  SetMaximumScale(TimeBasedView::kMaximumScale);
 
   // Pickup on widget focus changes
   connect(qApp,

app/widget/nodeparamview/nodeparamview.h

@@ -28,7 +28,7 @@
 #include "node/node.h"
 #include "nodeparamviewitem.h"
 #include "widget/keyframeview/keyframeview.h"
-#include "widget/timebased/timebased.h"
+#include "widget/timebased/timebasedwidget.h"
 
 namespace olive {
 

app/widget/nodetableview/nodetablewidget.h

@@ -22,7 +22,7 @@
 #define NODETABLEWIDGET_H
 
 #include "nodetableview.h"
-#include "widget/timebased/timebased.h"
+#include "widget/timebased/timebasedwidget.h"
 
 namespace olive {
 

app/widget/nodeview/nodeview.h

@@ -25,9 +25,9 @@
 #include <QTimer>
 
 #include "node/graph.h"
+#include "node/nodecopypaste.h"
 #include "nodeviewscene.h"
-#include "widget/timelinewidget/view/handmovableview.h"
+#include "widget/handmovableview/handmovableview.h"
-#include "widget/nodecopypaste/nodecopypaste.h"
 
 namespace olive {
 
@@ -37,7 +37,7 @@ namespace olive {
  * This widget takes a NodeGraph object and constructs a QGraphicsScene representing its data, viewing and allowing
  * the user to make modifications to it.
  */
-class NodeView : public HandMovableView, public NodeCopyPasteWidget
+class NodeView : public HandMovableView, public NodeCopyPasteService
 {
   Q_OBJECT
 public:

app/widget/resizablescrollbar/resizabletimelinescrollbar.h

@@ -23,11 +23,11 @@
 
 #include "resizablescrollbar.h"
 #include "timeline/timelinepoints.h"
-#include "widget/timelinewidget/timelinescaledobject.h"
+#include "widget/timebased/timescaledobject.h"
 
 namespace olive {
 
-class ResizableTimelineScrollBar : public ResizableScrollBar, public TimelineScaledObject
+class ResizableTimelineScrollBar : public ResizableScrollBar, public TimeScaledObject
 {
   Q_OBJECT
 public:

app/widget/snapservice/CMakeLists.txt

@@ -16,7 +16,7 @@
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
-  widget/nodecopypaste/nodecopypaste.h
+  widget/snapservice/snapservice.cpp
-  widget/nodecopypaste/nodecopypaste.cpp
+  widget/snapservice/snapservice.h
   PARENT_SCOPE
 )

app/widget/timebased/CMakeLists.txt

@@ -16,7 +16,11 @@
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
-  widget/timebased/timebased.h
+  widget/timebased/timebasedview.cpp
-  widget/timebased/timebased.cpp
+  widget/timebased/timebasedview.h
+  widget/timebased/timebasedwidget.cpp
+  widget/timebased/timebasedwidget.h
+  widget/timebased/timescaledobject.cpp
+  widget/timebased/timescaledobject.h
   PARENT_SCOPE
 )

app/widget/timebased/timebasedview.cpp

@@ -18,7 +18,7 @@
 
 ***/
 
-#include "timelineviewbase.h"
+#include "timebasedview.h"
 
 #include <QGraphicsRectItem>
 #include <QMouseEvent>
@@ -30,9 +30,9 @@
 
 namespace olive {
 
-const double TimelineViewBase::kMaximumScale = 8192;
+const double TimeBasedView::kMaximumScale = 8192;
 
-TimelineViewBase::TimelineViewBase(QWidget *parent) :
+TimeBasedView::TimeBasedView(QWidget *parent) :
   HandMovableView(parent),
   playhead_(0),
   playhead_scene_left_(-1),
@@ -53,7 +53,7 @@ TimelineViewBase::TimelineViewBase(QWidget *parent) :
   SetDefaultDragMode(NoDrag);
 
   // Signal to update bounding rect when the scene changes
-  connect(&scene_, &QGraphicsScene::changed, this, &TimelineViewBase::UpdateSceneRect);
+  connect(&scene_, &QGraphicsScene::changed, this, &TimeBasedView::UpdateSceneRect);
 
   // Always enforce maximum scale
   SetMaximumScale(kMaximumScale);
@@ -64,13 +64,13 @@ TimelineViewBase::TimelineViewBase(QWidget *parent) :
   setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
 }
 
-void TimelineViewBase::TimebaseChangedEvent(const rational &)
+void TimeBasedView::TimebaseChangedEvent(const rational &)
 {
   // Timebase influences position/visibility of playhead
   viewport()->update();
 }
 
-void TimelineViewBase::EnableSnap(const QList<rational> &points)
+void TimeBasedView::EnableSnap(const QList<rational> &points)
 {
   snapped_ = true;
   snap_time_ = points;
@@ -78,28 +78,28 @@ void TimelineViewBase::EnableSnap(const QList<rational> &points)
   viewport()->update();
 }
 
-void TimelineViewBase::DisableSnap()
+void TimeBasedView::DisableSnap()
 {
   snapped_ = false;
 
   viewport()->update();
 }
 
-void TimelineViewBase::SetSnapService(SnapService *service)
+void TimeBasedView::SetSnapService(SnapService *service)
 {
   snap_service_ = service;
 }
 
-const double &TimelineViewBase::GetYScale() const
+const double &TimeBasedView::GetYScale() const
 {
   return y_scale_;
 }
 
-void TimelineViewBase::VerticalScaleChangedEvent(double)
+void TimeBasedView::VerticalScaleChangedEvent(double)
 {
 }
 
-void TimelineViewBase::SetYScale(const double &y_scale)
+void TimeBasedView::SetYScale(const double &y_scale)
 {
   y_scale_ = y_scale;
 
@@ -110,7 +110,7 @@ void TimelineViewBase::SetYScale(const double &y_scale)
   }
 }
 
-void TimelineViewBase::SetTime(const int64_t time)
+void TimeBasedView::SetTime(const int64_t time)
 {
   playhead_ = time;
 
@@ -118,7 +118,7 @@ void TimelineViewBase::SetTime(const int64_t time)
   viewport()->update();
 }
 
-void TimelineViewBase::drawForeground(QPainter *painter, const QRectF &rect)
+void TimeBasedView::drawForeground(QPainter *painter, const QRectF &rect)
 {
   QGraphicsView::drawForeground(painter, rect);
 
@@ -154,12 +154,12 @@ void TimelineViewBase::drawForeground(QPainter *painter, const QRectF &rect)
   }
 }
 
-rational TimelineViewBase::GetPlayheadTime() const
+rational TimeBasedView::GetPlayheadTime() const
 {
   return Timecode::timestamp_to_time(playhead_, timebase());
 }
 
-bool TimelineViewBase::PlayheadPress(QMouseEvent *event)
+bool TimeBasedView::PlayheadPress(QMouseEvent *event)
 {
   QPointF scene_pos = mapToScene(event->pos());
 
@@ -170,7 +170,7 @@ bool TimelineViewBase::PlayheadPress(QMouseEvent *event)
   return dragging_playhead_;
 }
 
-bool TimelineViewBase::PlayheadMove(QMouseEvent *event)
+bool TimeBasedView::PlayheadMove(QMouseEvent *event)
 {
   if (!dragging_playhead_) {
     return false;
@@ -198,7 +198,7 @@ bool TimelineViewBase::PlayheadMove(QMouseEvent *event)
   return true;
 }
 
-bool TimelineViewBase::PlayheadRelease(QMouseEvent*)
+bool TimeBasedView::PlayheadRelease(QMouseEvent*)
 {
   if (dragging_playhead_) {
     dragging_playhead_ = false;
@@ -213,19 +213,19 @@ bool TimelineViewBase::PlayheadRelease(QMouseEvent*)
   return false;
 }
 
-qreal TimelineViewBase::GetPlayheadX()
+qreal TimeBasedView::GetPlayheadX()
 {
   return TimeToScene(Timecode::timestamp_to_time(playhead_, timebase()));
 }
 
-void TimelineViewBase::SetEndTime(const rational &length)
+void TimeBasedView::SetEndTime(const rational &length)
 {
   end_time_ = length;
 
   UpdateSceneRect();
 }
 
-void TimelineViewBase::UpdateSceneRect()
+void TimeBasedView::UpdateSceneRect()
 {
   QRectF bounding_rect = scene_.itemsBoundingRect();
 
@@ -244,16 +244,16 @@ void TimelineViewBase::UpdateSceneRect()
   }
 }
 
-void TimelineViewBase::resizeEvent(QResizeEvent *event)
+void TimeBasedView::resizeEvent(QResizeEvent *event)
 {
   QGraphicsView::resizeEvent(event);
 
   UpdateSceneRect();
 }
 
-void TimelineViewBase::ScaleChangedEvent(const double &scale)
+void TimeBasedView::ScaleChangedEvent(const double &scale)
 {
-  TimelineScaledObject::ScaleChangedEvent(scale);
+  TimeScaledObject::ScaleChangedEvent(scale);
 
   // Update scene rect
   UpdateSceneRect();
@@ -262,7 +262,7 @@ void TimelineViewBase::ScaleChangedEvent(const double &scale)
   viewport()->update();
 }
 
-bool TimelineViewBase::HandleZoomFromScroll(QWheelEvent *event)
+bool TimeBasedView::HandleZoomFromScroll(QWheelEvent *event)
 {
   if (WheelEventIsAZoomEvent(event)) {
     // If CTRL is held (or a preference is set to swap CTRL behavior), we zoom instead of scrolling
@@ -326,7 +326,7 @@ bool TimelineViewBase::HandleZoomFromScroll(QWheelEvent *event)
   return false;
 }
 
-bool TimelineViewBase::WheelEventIsAZoomEvent(QWheelEvent *event)
+bool TimeBasedView::WheelEventIsAZoomEvent(QWheelEvent *event)
 {
   return (static_cast<bool>(event->modifiers() & Qt::ControlModifier) == !Config::Current()["ScrollZooms"].toBool());
 }

app/widget/timebased/timebasedview.h

@@ -24,17 +24,17 @@
 #include <QGraphicsView>
 
 #include "core.h"
-#include "handmovableview.h"
+#include "timescaledobject.h"
-#include "widget/timelinewidget/snapservice.h"
+#include "widget/handmovableview/handmovableview.h"
-#include "widget/timelinewidget/timelinescaledobject.h"
+#include "widget/snapservice/snapservice.h"
 
 namespace olive {
 
-class TimelineViewBase : public HandMovableView, public TimelineScaledObject
+class TimeBasedView : public HandMovableView, public TimeScaledObject
 {
   Q_OBJECT
 public:
-  TimelineViewBase(QWidget* parent = nullptr);
+  TimeBasedView(QWidget* parent = nullptr);
 
   static const double kMaximumScale;
 

app/widget/timebased/timebasedwidget.cpp

@@ -18,7 +18,7 @@
 
 ***/
 
-#include "timebased.h"
+#include "timebasedwidget.h"
 
 #include <QInputDialog>
 #include <QUndoCommand>
@@ -132,7 +132,7 @@ void TimeBasedWidget::UpdateMaximumScroll()
     scrollbar_->setMaximum(qMax(0, qCeil(TimeToScene(length)) - width()));
   }
 
-  foreach (TimelineViewBase* base, timeline_views_) {
+  foreach (TimeBasedView* base, timeline_views_) {
     base->SetEndTime(length);
   }
 }
@@ -238,7 +238,7 @@ TimelinePoints *TimeBasedWidget::GetConnectedTimelinePoints() const
   return points_;
 }
 
-void TimeBasedWidget::ConnectTimelineView(TimelineViewBase *base)
+void TimeBasedWidget::ConnectTimelineView(TimeBasedView *base)
 {
   timeline_views_.append(base);
 }

app/widget/timebased/timebasedwidget.h

@@ -26,7 +26,7 @@
 #include "node/output/viewer/viewer.h"
 #include "timeline/timelinecommon.h"
 #include "widget/resizablescrollbar/resizabletimelinescrollbar.h"
-#include "widget/timelinewidget/timelinescaledobject.h"
+#include "widget/timebased/timescaledobject.h"
 #include "widget/timelinewidget/view/timelineview.h"
 #include "widget/timeruler/timeruler.h"
 
@@ -121,7 +121,7 @@ protected:
 
   TimelinePoints* GetConnectedTimelinePoints() const;
 
-  void ConnectTimelineView(TimelineViewBase* base);
+  void ConnectTimelineView(TimeBasedView* base);
 
   void PassWheelEventsToScrollBar(QObject* object);
 
@@ -194,7 +194,7 @@ private:
 
   TimelinePoints* points_;
 
-  QList<TimelineViewBase*> timeline_views_;
+  QList<TimeBasedView*> timeline_views_;
 
   bool toggle_show_all_;
 

app/widget/timebased/timescaledobject.cpp

@@ -18,7 +18,7 @@
 
 ***/
 
-#include "timelinescaledobject.h"
+#include "timescaledobject.h"
 
 #include <cfloat>
 #include <QtMath>
@@ -27,9 +27,9 @@
 
 namespace olive {
 
-const int TimelineScaledObject::kCalculateDimensionsPadding = 10;
+const int TimeScaledObject::kCalculateDimensionsPadding = 10;
 
-TimelineScaledObject::TimelineScaledObject() :
+TimeScaledObject::TimeScaledObject() :
   scale_(1.0),
   min_scale_(0),
   max_scale_(DBL_MAX)
@@ -37,7 +37,7 @@ TimelineScaledObject::TimelineScaledObject() :
 
 }
 
-void TimelineScaledObject::SetTimebase(const rational &timebase)
+void TimeScaledObject::SetTimebase(const rational &timebase)
 {
   timebase_ = timebase;
   timebase_dbl_ = timebase_.toDouble();
@@ -45,17 +45,17 @@ void TimelineScaledObject::SetTimebase(const rational &timebase)
   TimebaseChangedEvent(timebase);
 }
 
-const rational &TimelineScaledObject::timebase() const
+const rational &TimeScaledObject::timebase() const
 {
   return timebase_;
 }
 
-const double &TimelineScaledObject::timebase_dbl() const
+const double &TimeScaledObject::timebase_dbl() const
 {
   return timebase_dbl_;
 }
 
-rational TimelineScaledObject::SceneToTime(const double &x, const double &x_scale, const rational &timebase, bool round)
+rational TimeScaledObject::SceneToTime(const double &x, const double &x_scale, const rational &timebase, bool round)
 {
   double unscaled_time = x / x_scale / timebase.toDouble();
 
@@ -72,17 +72,17 @@ rational TimelineScaledObject::SceneToTime(const double &x, const double &x_scal
   return rational(rounded_x_mvmt * timebase.numerator(), timebase.denominator());
 }
 
-double TimelineScaledObject::TimeToScene(const rational &time)
+double TimeScaledObject::TimeToScene(const rational &time)
 {
   return time.toDouble() * scale_;
 }
 
-rational TimelineScaledObject::SceneToTime(const double &x, bool round)
+rational TimeScaledObject::SceneToTime(const double &x, bool round)
 {
   return SceneToTime(x, scale_, timebase_, round);
 }
 
-void TimelineScaledObject::SetMaximumScale(const double &max)
+void TimeScaledObject::SetMaximumScale(const double &max)
 {
   max_scale_ = max;
 
@@ -91,7 +91,7 @@ void TimelineScaledObject::SetMaximumScale(const double &max)
   }
 }
 
-void TimelineScaledObject::SetMinimumScale(const double &min)
+void TimeScaledObject::SetMinimumScale(const double &min)
 {
   min_scale_ = min;
 
@@ -100,12 +100,12 @@ void TimelineScaledObject::SetMinimumScale(const double &min)
   }
 }
 
-const double& TimelineScaledObject::GetScale() const
+const double& TimeScaledObject::GetScale() const
 {
   return scale_;
 }
 
-void TimelineScaledObject::SetScale(const double& scale)
+void TimeScaledObject::SetScale(const double& scale)
 {
   Q_ASSERT(scale > 0);
 
@@ -114,17 +114,17 @@ void TimelineScaledObject::SetScale(const double& scale)
   ScaleChangedEvent(scale_);
 }
 
-void TimelineScaledObject::SetScaleFromDimensions(double viewport_width, double content_width)
+void TimeScaledObject::SetScaleFromDimensions(double viewport_width, double content_width)
 {
   SetScale(CalculateScaleFromDimensions(viewport_width, content_width));
 }
 
-double TimelineScaledObject::CalculateScaleFromDimensions(double viewport_sz, double content_sz)
+double TimeScaledObject::CalculateScaleFromDimensions(double viewport_sz, double content_sz)
 {
   return static_cast<double>(viewport_sz / kCalculateDimensionsPadding * (kCalculateDimensionsPadding-1)) / static_cast<double>(content_sz);
 }
 
-double TimelineScaledObject::CalculatePaddingFromDimensionScale(double viewport_sz)
+double TimeScaledObject::CalculatePaddingFromDimensionScale(double viewport_sz)
 {
   return (viewport_sz / (kCalculateDimensionsPadding * 2));
 }

app/widget/timebased/timescaledobject.h

@@ -27,11 +27,14 @@
 
 namespace olive {
 
-class TimelineScaledObject
+/**
+ * @brief Provides base functionality for any object that uses time and scale
+ */
+class TimeScaledObject
 {
 public:
-  TimelineScaledObject();
+  TimeScaledObject();
-  virtual ~TimelineScaledObject() = default;
+  virtual ~TimeScaledObject() = default;
 
   void SetTimebase(const rational &timebase);
 
@@ -75,7 +78,7 @@ private:
 
 };
 
-class TimelineScaledWidget : public QWidget, public TimelineScaledObject
+class TimelineScaledWidget : public QWidget, public TimeScaledObject
 {
   Q_OBJECT
 public:

app/widget/timelinewidget/CMakeLists.txt

@@ -21,12 +21,8 @@ add_subdirectory(view)
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
-  widget/timelinewidget/snapservice.h
-  widget/timelinewidget/snapservice.cpp
   widget/timelinewidget/timelineandtrackview.h
   widget/timelinewidget/timelineandtrackview.cpp
-  widget/timelinewidget/timelinescaledobject.h
-  widget/timelinewidget/timelinescaledobject.cpp
   widget/timelinewidget/timelinewidget.h
   widget/timelinewidget/timelinewidget.cpp
   widget/timelinewidget/timelinewidgetselections.h

app/widget/timelinewidget/timelinewidget.cpp

@@ -160,7 +160,7 @@ TimelineWidget::TimelineWidget(QWidget *parent) :
   // FIXME: Magic number
   SetScale(90.0);
 
-  SetMaximumScale(TimelineViewBase::kMaximumScale);
+  SetMaximumScale(TimeBasedView::kMaximumScale);
   SetAutoSetTimebase(false);
 
   connect(Core::instance(), &Core::ToolChanged, this, &TimelineWidget::ToolChanged);

app/widget/timelinewidget/timelinewidget.h

@@ -27,13 +27,13 @@
 
 #include "core.h"
 #include "node/block/transition/transition.h"
+#include "node/nodecopypaste.h"
 #include "node/output/viewer/viewer.h"
-#include "snapservice.h"
 #include "timeline/timelinecommon.h"
 #include "timelineandtrackview.h"
-#include "widget/nodecopypaste/nodecopypaste.h"
 #include "widget/slider/timeslider.h"
-#include "widget/timebased/timebased.h"
+#include "widget/snapservice/snapservice.h"
+#include "widget/timebased/timebasedwidget.h"
 #include "widget/timelinewidget/timelinewidgetselections.h"
 #include "widget/timelinewidget/tool/import.h"
 #include "widget/timelinewidget/tool/tool.h"
@@ -45,7 +45,7 @@ namespace olive {
  *
  * Encapsulates TimelineViews, TimeRulers, and scrollbars for a complete widget to manipulate Timelines
  */
-class TimelineWidget : public TimeBasedWidget, public NodeCopyPasteWidget, public SnapService
+class TimelineWidget : public TimeBasedWidget, public NodeCopyPasteService, public SnapService
 {
   Q_OBJECT
 public:

app/widget/timelinewidget/tool/zoom.cpp

@@ -68,7 +68,7 @@ void ZoomTool::MouseRelease(TimelineViewMouseEvent *event)
     // Normalize scale to 1.0 scale
     double scene_width = (scene_right - scene_left) / parent()->GetScale();
 
-    double new_scale = qMin(TimelineViewBase::kMaximumScale, static_cast<double>(reference_view->viewport()->width()) / scene_width);
+    double new_scale = qMin(TimeBasedView::kMaximumScale, static_cast<double>(reference_view->viewport()->width()) / scene_width);
 
     parent()->SetScale(new_scale);
 

app/widget/timelinewidget/view/CMakeLists.txt

@@ -16,19 +16,15 @@
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
-  widget/timelinewidget/view/handmovableview.h
-  widget/timelinewidget/view/handmovableview.cpp
-  widget/timelinewidget/view/timelineview.h
   widget/timelinewidget/view/timelineview.cpp
-  widget/timelinewidget/view/timelineviewmouseevent.h
+  widget/timelinewidget/view/timelineview.h
   widget/timelinewidget/view/timelineviewmouseevent.cpp
-  widget/timelinewidget/view/timelineviewrect.h
+  widget/timelinewidget/view/timelineviewmouseevent.h
   widget/timelinewidget/view/timelineviewrect.cpp
-  widget/timelinewidget/view/timelineviewbase.h
+  widget/timelinewidget/view/timelineviewrect.h
-  widget/timelinewidget/view/timelineviewbase.cpp
-  widget/timelinewidget/view/timelineviewblockitem.h
   widget/timelinewidget/view/timelineviewblockitem.cpp
-  widget/timelinewidget/view/timelineviewghostitem.h
+  widget/timelinewidget/view/timelineviewblockitem.h
   widget/timelinewidget/view/timelineviewghostitem.cpp
+  widget/timelinewidget/view/timelineviewghostitem.h
   PARENT_SCOPE
 )

app/widget/timelinewidget/view/timelineview.cpp

@@ -36,7 +36,7 @@
 namespace olive {
 
 TimelineView::TimelineView(Qt::Alignment vertical_alignment, QWidget *parent) :
-  TimelineViewBase(parent),
+  TimeBasedView(parent),
   selections_(nullptr),
   ghosts_(nullptr),
   show_beam_cursor_(false),
@@ -59,7 +59,7 @@ void TimelineView::mousePressEvent(QMouseEvent *event)
   }
 
   if (dragMode() != GetDefaultDragMode()) {
-    TimelineViewBase::mousePressEvent(event);
+    TimeBasedView::mousePressEvent(event);
     return;
   }
 
@@ -76,7 +76,7 @@ void TimelineView::mouseMoveEvent(QMouseEvent *event)
   }
 
   if (dragMode() != GetDefaultDragMode()) {
-    TimelineViewBase::mouseMoveEvent(event);
+    TimeBasedView::mouseMoveEvent(event);
     return;
   }
 
@@ -93,7 +93,7 @@ void TimelineView::mouseReleaseEvent(QMouseEvent *event)
   }
 
   if (dragMode() != GetDefaultDragMode()) {
-    TimelineViewBase::mouseReleaseEvent(event);
+    TimeBasedView::mouseReleaseEvent(event);
     return;
   }
 
@@ -283,7 +283,7 @@ void TimelineView::drawForeground(QPainter *painter, const QRectF &rect)
   }
 
   // Draw standard TimelineViewBase things (such as playhead)
-  TimelineViewBase::drawForeground(painter, rect);
+  TimeBasedView::drawForeground(painter, rect);
 }
 
 void TimelineView::ToolChangedEvent(Tool::Item tool)

app/widget/timelinewidget/view/timelineview.h

@@ -28,10 +28,10 @@
 #include <QDropEvent>
 
 #include "node/block/clip/clip.h"
-#include "timelineviewbase.h"
 #include "timelineviewblockitem.h"
 #include "timelineviewmouseevent.h"
 #include "timelineviewghostitem.h"
+#include "widget/timebased/timebasedview.h"
 #include "widget/timelinewidget/undo/undo.h"
 #include "undo/undostack.h"
 
@@ -42,7 +42,7 @@ namespace olive {
  *
  * This widget primarily exposes users to viewing and modifying Block nodes, usually through a TimelineOutput node.
  */
-class TimelineView : public TimelineViewBase
+class TimelineView : public TimeBasedView
 {
   Q_OBJECT
 public:

app/widget/timelinewidget/view/timelineviewmouseevent.cpp

@@ -22,7 +22,7 @@
 
 #include <QEvent>
 
-#include "widget/timelinewidget/timelinescaledobject.h"
+#include "widget/timebased/timescaledobject.h"
 
 namespace olive {
 
@@ -48,14 +48,14 @@ TimelineCoordinate TimelineViewMouseEvent::GetCoordinates(bool round_time) const
   return TimelineCoordinate(GetFrame(round_time), track_);
 }
 
-const Qt::KeyboardModifiers TimelineViewMouseEvent::GetModifiers() const
+const Qt::KeyboardModifiers &TimelineViewMouseEvent::GetModifiers() const
 {
   return modifiers_;
 }
 
 rational TimelineViewMouseEvent::GetFrame(bool round) const
 {
-  return TimelineScaledObject::SceneToTime(scene_x_, scale_x_, timebase_, round);
+  return TimeScaledObject::SceneToTime(scene_x_, scale_x_, timebase_, round);
 }
 
 const TrackReference &TimelineViewMouseEvent::GetTrack() const

app/widget/timelinewidget/view/timelineviewmouseevent.h

@@ -40,7 +40,7 @@ public:
                          const Qt::KeyboardModifiers& modifiers = Qt::NoModifier);
 
   TimelineCoordinate GetCoordinates(bool round_time = false) const;
-  const Qt::KeyboardModifiers GetModifiers() const;
+  const Qt::KeyboardModifiers& GetModifiers() const;
 
   /**
    * @brief Gets the time at this cursor point

app/widget/timelinewidget/view/timelineviewrect.cpp

@@ -50,14 +50,14 @@ void TimelineViewRect::SetTrack(const TrackReference &track)
 
 void TimelineViewRect::ScaleChangedEvent(const double &scale)
 {
-  TimelineScaledObject::ScaleChangedEvent(scale);
+  TimeScaledObject::ScaleChangedEvent(scale);
 
   UpdateRect();
 }
 
 void TimelineViewRect::TimebaseChangedEvent(const rational &tb)
 {
-  TimelineScaledObject::TimebaseChangedEvent(tb);
+  TimeScaledObject::TimebaseChangedEvent(tb);
 
   UpdateRect();
 }

app/widget/timelinewidget/view/timelineviewrect.h

@@ -24,14 +24,14 @@
 #include <QGraphicsRectItem>
 
 #include "timeline/timelinecoordinate.h"
-#include "../timelinescaledobject.h"
+#include "widget/timebased/timescaledobject.h"
 
 namespace olive {
 
 /**
  * @brief A base class for graphical representations of Block nodes
  */
-class TimelineViewRect : public QGraphicsRectItem, public TimelineScaledObject
+class TimelineViewRect : public QGraphicsRectItem, public TimeScaledObject
 {
 public:
   TimelineViewRect(QGraphicsItem* parent = nullptr);

app/widget/timeruler/seekablewidget.h

@@ -23,8 +23,8 @@
 
 #include "common/rational.h"
 #include "timeline/timelinepoints.h"
-#include "widget/timelinewidget/snapservice.h"
+#include "widget/snapservice/snapservice.h"
-#include "widget/timelinewidget/timelinescaledobject.h"
+#include "widget/timebased/timescaledobject.h"
 
 namespace olive {
 

app/widget/viewer/viewer.h

@@ -40,7 +40,7 @@
 #include "viewersizer.h"
 #include "viewerwindow.h"
 #include "widget/playbackcontrols/playbackcontrols.h"
-#include "widget/timebased/timebased.h"
+#include "widget/timebased/timebasedwidget.h"
 
 namespace olive {