ported seekablewidget to timebasedview

Cuts down on a lot of code duplication and opens up usage of the new TimelineViewSelectionManager framework

app/widget/timelinewidget/timelinewidget.cpp

@@ -398,15 +398,6 @@ void TimelineWidget::DeselectAll()
   SignalDeselectedAllBlocks();
 }
 
-bool TimelineWidget::MarkersActive()
-{
-  if (ruler()->GetActiveTimelineMarkers().size() > 0) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
 void TimelineWidget::RippleToIn()
 {
   RippleTo(Timeline::kTrimIn);
@@ -505,10 +496,11 @@ void TimelineWidget::ReplaceBlocksWithGaps(const QVector<Block *> &blocks,
 
 void TimelineWidget::DeleteSelected(bool ripple)
 {
-  if (MarkersActive()) {
+  if (ruler()->hasFocus()) {
     ruler()->DeleteSelected();
     return;
   }
+
   QVector<Block*> selected_list = GetSelectedBlocks();
   QVector<Block*> blocks_to_delete;
 
@@ -641,11 +633,10 @@ void TimelineWidget::CopySelected(bool cut)
     return;
   }
 
-  if (MarkersActive()) {
+  if (ruler()->hasFocus()) {
     ruler()->CopySelected(cut);
     return;
   }
-    
 
   QVector<Block*> selected = GetSelectedBlocks();
 

app/widget/timelinewidget/timelinewidget.h

@@ -59,8 +59,6 @@ public:
 
   void DeselectAll();
 
-  bool MarkersActive();
-
   void RippleToIn();
 
   void RippleToOut();

app/widget/timelinewidget/view/timelineview.cpp

@@ -530,19 +530,19 @@ void TimelineView::DrawBlock(QPainter *painter, bool foreground, Block *block, q
         }
 
         // Draw markers
-        if (clip->connected_viewer() && !clip->connected_viewer()->GetLength().isNull()) {
+        qDebug() << "MARKERS ON CLIP STUB";
+        /*if (clip->connected_viewer() && !clip->connected_viewer()->GetLength().isNull()) {
           if (clip->connected_viewer()->GetTimelinePoints()->markers()->list().size() > 0) {
-            QList<TimelineMarker *> marker_list = clip->connected_viewer()->GetTimelinePoints()->markers()->list();
-            
+            std::vector<TimelineMarker *> marker_list = clip->connected_viewer()->GetTimelinePoints()->markers()->list();
+
             int marker_width = QtUtils::QFontMetricsWidth(fm, "H");
             clip_marker_positions_.clear();
 
             // Only draw markers if the block UI is large enough to draw all the markers
-            if (marker_list.length() * marker_width < block_right - block_left) {
+            if (marker_list.size() * marker_width < block_right - block_left) {
 
-              QListIterator<TimelineMarker*> iterator(marker_list);
-              while(iterator.hasNext()) {
-                TimelineMarker *marker = iterator.next();
+              for (auto it=marker_list.cbegin(); it!=marker_list.cend(); it++) {
+                TimelineMarker *marker = *it;
                 // Make sure marker is within In/Out points of the clip
                 if (marker->time().in() >= clip->media_in() && marker->time().out() <= clip->media_in() + clip->length()) {
                   // Only draw names that we have room for
@@ -561,7 +561,7 @@ void TimelineView::DrawBlock(QPainter *painter, bool foreground, Block *block, q
               }
             }
           }
-        }
+        }*/
       }
 
       // For transitions, show lines representing a transition