Merge branch 'master' into pr/1717

app/widget/timelinewidget/tool/CMakeLists.txt

@@ -38,6 +38,8 @@ set(OLIVE_SOURCES
   widget/timelinewidget/tool/slide.h
   widget/timelinewidget/tool/slip.cpp
   widget/timelinewidget/tool/slip.h
+  widget/timelinewidget/tool/trackselect.cpp
+  widget/timelinewidget/tool/trackselect.h
   widget/timelinewidget/tool/transition.cpp
   widget/timelinewidget/tool/transition.h
   widget/timelinewidget/tool/tool.cpp

app/widget/timelinewidget/tool/add.cpp

@@ -24,7 +24,7 @@
 #include "node/factory.h"
 #include "node/generator/shape/shapenode.h"
 #include "node/generator/solid/solid.h"
-#include "node/generator/text/text.h"
+#include "node/generator/text/textv3.h"
 #include "widget/timelinewidget/timelinewidget.h"
 #include "widget/timelinewidget/undo/timelineundopointer.h"
 
@@ -138,7 +138,7 @@ void AddTool::MouseRelease(TimelineViewMouseEvent *event)
         break;
       case olive::Tool::kAddableTitle:
       {
-        node_to_add = new TextGenerator();
+        node_to_add = new TextGeneratorV3();
         break;
       }
       case olive::Tool::kAddableBars:

app/widget/timelinewidget/tool/pointer.cpp

@@ -44,6 +44,7 @@ PointerTool::PointerTool(TimelineWidget *parent) :
   trimming_allowed_(true),
   track_movement_allowed_(true),
   gap_trimming_allowed_(false),
+  can_rubberband_select_(false),
   rubberband_selecting_(false)
 {
 }
@@ -173,7 +174,7 @@ void PointerTool::MouseMove(TimelineViewMouseEvent *event)
 
       // If we're performing an action, we can initiate ghosts
       if (drag_movement_mode_ != Timeline::kNone) {
-        InitiateDrag(clicked_item_, drag_movement_mode_);
+        InitiateDrag(clicked_item_, drag_movement_mode_, event->GetModifiers());
       }
 
       // Set dragging to true here so no matter what, the drag isn't re-initiated until it's completed
@@ -246,6 +247,7 @@ void SetGhostToSlideMode(TimelineViewGhostItem* g)
 
 void PointerTool::InitiateDragInternal(Block *clicked_item,
                                        Timeline::MovementMode trim_mode,
+                                       Qt::KeyboardModifiers modifiers,
                                        bool dont_roll_trims,
                                        bool allow_nongap_rolling,
                                        bool slide_instead_of_moving)
@@ -409,30 +411,41 @@ void PointerTool::InitiateDragInternal(Block *clicked_item,
         }
 
         Timeline::MovementMode flipped_mode = FlipTrimMode(trim_mode);
-        TimelineViewGhostItem* adjacent_ghost;
+        QVector<TimelineViewGhostItem*> adjacent_ghosts;
 
         if (adjacent) {
-          adjacent_ghost = AddGhostFromBlock(adjacent, flipped_mode);
+          adjacent_ghosts.append(AddGhostFromBlock(adjacent, flipped_mode));
+
+          // Select adjacent's links if applicable
+          // FIXME: The check for `clips.size() == 1` may not be necessary, but I don't know yet.
+          //        I'm only including it to prevent any potentially unintended behavior.
+          if (clips.size() == 1 && !(modifiers & Qt::AltModifier)) {
+            if (ClipBlock *adjacent_clip = dynamic_cast<ClipBlock*>(adjacent)) {
+              foreach (Block *adjacent_link, adjacent_clip->block_links()) {
+                adjacent_ghosts.append(AddGhostFromBlock(adjacent_link, flipped_mode));
+              }
+            }
+          }
         } else if (trim_mode == Timeline::kTrimIn || block->next()) {
           rational null_ghost_pos = (trim_mode == Timeline::kTrimIn) ? block->in() : block->out();
 
-          adjacent_ghost = AddGhostFromNull(null_ghost_pos, null_ghost_pos, clip_item->track()->ToReference(), flipped_mode);
-        } else {
-          adjacent_ghost = nullptr;
+          adjacent_ghosts.append(AddGhostFromNull(null_ghost_pos, null_ghost_pos, clip_item->track()->ToReference(), flipped_mode));
         }
 
         // If we have an adjacent block (for any reason), this is a roll edit and the adjacent is
         // expected to fill the remaining space (no gap needs to be created)
         ghost->SetData(TimelineViewGhostItem::kTrimIsARollEdit, static_cast<bool>(adjacent));
 
-        if (adjacent_ghost) {
-          if (treat_trim_as_slide) {
-            // We're sliding a transition rather than a pure trim/roll
-            SetGhostToSlideMode(adjacent_ghost);
-          } else if (dynamic_cast<GapBlock*>(block)) {
-            ghost->SetData(TimelineViewGhostItem::kTrimShouldBeIgnored, true);
-          } else {
-            adjacent_ghost->SetData(TimelineViewGhostItem::kTrimShouldBeIgnored, true);
+        foreach (TimelineViewGhostItem *adjacent_ghost, adjacent_ghosts) {
+          if (adjacent_ghost) {
+            if (treat_trim_as_slide) {
+              // We're sliding a transition rather than a pure trim/roll
+              SetGhostToSlideMode(adjacent_ghost);
+            } else if (dynamic_cast<GapBlock*>(block)) {
+              ghost->SetData(TimelineViewGhostItem::kTrimShouldBeIgnored, true);
+            } else {
+              adjacent_ghost->SetData(TimelineViewGhostItem::kTrimShouldBeIgnored, true);
+            }
           }
         }
       }
@@ -560,6 +573,10 @@ void PointerTool::FinishDrag(TimelineViewMouseEvent *event)
                                                    ghost->GetAdjustedLength(),
                                                    ghost->GetMode());
 
+        if (event->GetModifiers() & Qt::ControlModifier) {
+
+        }
+
         c->SetTrimIsARollEdit(ghost->GetData(TimelineViewGhostItem::kTrimIsARollEdit).toBool());
 
         command->add_child(c);
@@ -575,7 +592,7 @@ void PointerTool::FinishDrag(TimelineViewMouseEvent *event)
       } else {
         new_sel.TrimOut(reference_ghost->GetOutAdjustment());
       }
-      command->add_child(new TimelineWidget::SetSelectionsCommand(parent(), new_sel, parent()->GetSelections(), true));
+      command->add_child(new TimelineWidget::SetSelectionsCommand(parent(), new_sel, parent()->GetSelections()));
     }
   }
 
@@ -624,7 +641,7 @@ void PointerTool::FinishDrag(TimelineViewMouseEvent *event)
     TimelineWidgetSelections new_sel = parent()->GetSelections();
     new_sel.ShiftTime(blocks_moving.first().ghost->GetInAdjustment());
     new_sel.ShiftTracks(drag_track_type_, blocks_moving.first().ghost->GetTrackAdjustment());
-    command->add_child(new TimelineWidget::SetSelectionsCommand(parent(), new_sel, parent()->GetSelections(), true));
+    command->add_child(new TimelineWidget::SetSelectionsCommand(parent(), new_sel, parent()->GetSelections()));
   }
 
   if (!blocks_sliding.isEmpty()) {
@@ -685,7 +702,7 @@ void PointerTool::FinishDrag(TimelineViewMouseEvent *event)
       // Adjust selections
       TimelineWidgetSelections new_sel = parent()->GetSelections();
       new_sel.ShiftTime(movement);
-      command->add_child(new TimelineWidget::SetSelectionsCommand(parent(), new_sel, parent()->GetSelections(), true));
+      command->add_child(new TimelineWidget::SetSelectionsCommand(parent(), new_sel, parent()->GetSelections()));
     }
   }
 
@@ -714,10 +731,9 @@ Timeline::MovementMode PointerTool::IsCursorInTrimHandle(Block *block, qreal cur
   }
 }
 
-void PointerTool::InitiateDrag(Block *clicked_item,
-                               Timeline::MovementMode trim_mode)
+void PointerTool::InitiateDrag(Block *clicked_item, Timeline::MovementMode trim_mode, Qt::KeyboardModifiers modifiers)
 {
-  InitiateDragInternal(clicked_item, trim_mode, false, false, false);
+  InitiateDragInternal(clicked_item, trim_mode, modifiers, false, false, false);
 }
 
 //#define HIDE_GAP_GHOSTS

app/widget/timelinewidget/tool/pointer.h

@@ -39,8 +39,7 @@ public:
 protected:
   virtual void FinishDrag(TimelineViewMouseEvent *event);
 
-  virtual void InitiateDrag(Block* clicked_item,
-                            Timeline::MovementMode trim_mode);
+  virtual void InitiateDrag(Block* clicked_item, Timeline::MovementMode trim_mode, Qt::KeyboardModifiers modifiers);
 
   TimelineViewGhostItem* AddGhostFromBlock(Block *block, Timeline::MovementMode mode, bool check_if_exists = false);
 
@@ -66,13 +65,12 @@ protected:
 
   void InitiateDragInternal(Block* clicked_item,
                             Timeline::MovementMode trim_mode,
+                            Qt::KeyboardModifiers modifiers,
                             bool dont_roll_trims,
                             bool allow_nongap_rolling, bool slide_instead_of_moving);
 
-  const Timeline::MovementMode& drag_movement_mode() const
-  {
-    return drag_movement_mode_;
-  }
+  const Timeline::MovementMode& drag_movement_mode() const { return drag_movement_mode_; }
+  void set_drag_movement_mode(const Timeline::MovementMode &d) { drag_movement_mode_ = d; }
 
   void SetMovementAllowed(bool e)
   {
@@ -94,6 +92,11 @@ protected:
     gap_trimming_allowed_ = e;
   }
 
+  void SetClickedItem(Block *b)
+  {
+    clicked_item_ = b;
+  }
+
 private:
   Timeline::MovementMode IsCursorInTrimHandle(Block* block, qreal cursor_x);
 

app/widget/timelinewidget/tool/ripple.cpp

@@ -34,10 +34,9 @@ RippleTool::RippleTool(TimelineWidget* parent) :
   SetGapTrimmingAllowed(true);
 }
 
-void RippleTool::InitiateDrag(Block *clicked_item,
-                              Timeline::MovementMode trim_mode)
+void RippleTool::InitiateDrag(Block *clicked_item, Timeline::MovementMode trim_mode, Qt::KeyboardModifiers modifiers)
 {
-  InitiateDragInternal(clicked_item, trim_mode, true, true, false);
+  InitiateDragInternal(clicked_item, trim_mode, modifiers, true, true, false);
 
   if (!parent()->HasGhosts()) {
     return;

app/widget/timelinewidget/tool/ripple.h

@@ -32,8 +32,7 @@ public:
 protected:
   virtual void FinishDrag(TimelineViewMouseEvent *event) override;
 
-  virtual void InitiateDrag(Block* clicked_item,
-                            Timeline::MovementMode trim_mode) override;
+  virtual void InitiateDrag(Block* clicked_item, Timeline::MovementMode trim_mode, Qt::KeyboardModifiers modifiers) override;
 };
 
 }

app/widget/timelinewidget/tool/rolling.cpp

@@ -33,10 +33,9 @@ RollingTool::RollingTool(TimelineWidget* parent) :
   SetGapTrimmingAllowed(true);
 }
 
-void RollingTool::InitiateDrag(Block *clicked_item,
-                                               Timeline::MovementMode trim_mode)
+void RollingTool::InitiateDrag(Block *clicked_item, Timeline::MovementMode trim_mode, Qt::KeyboardModifiers modifiers)
 {
-  InitiateDragInternal(clicked_item, trim_mode, false, true, false);
+  InitiateDragInternal(clicked_item, trim_mode, modifiers, false, true, false);
 }
 
 }

app/widget/timelinewidget/tool/rolling.h

@@ -31,8 +31,7 @@ public:
   RollingTool(TimelineWidget* parent);
 
 protected:
-  virtual void InitiateDrag(Block* clicked_item,
-                            Timeline::MovementMode trim_mode) override;
+  virtual void InitiateDrag(Block* clicked_item, Timeline::MovementMode trim_mode, Qt::KeyboardModifiers modifiers) override;
 };
 
 }

app/widget/timelinewidget/tool/slide.cpp

@@ -34,9 +34,9 @@ SlideTool::SlideTool(TimelineWidget* parent) :
   SetGapTrimmingAllowed(true);
 }
 
-void SlideTool::InitiateDrag(Block *clicked_item, Timeline::MovementMode trim_mode)
+void SlideTool::InitiateDrag(Block *clicked_item, Timeline::MovementMode trim_mode, Qt::KeyboardModifiers modifiers)
 {
-  InitiateDragInternal(clicked_item, trim_mode, false, true, true);
+  InitiateDragInternal(clicked_item, trim_mode, modifiers, false, true, true);
 }
 
 }

app/widget/timelinewidget/tool/slide.h

@@ -31,8 +31,7 @@ public:
   SlideTool(TimelineWidget* parent);
 
 protected:
-  virtual void InitiateDrag(Block* clicked_item,
-                            Timeline::MovementMode trim_mode) override;
+  virtual void InitiateDrag(Block* clicked_item, Timeline::MovementMode trim_mode, Qt::KeyboardModifiers modifiers) override;
 
 };
 

app/widget/timelinewidget/tool/trackselect.cpp

@@ -0,0 +1,96 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2021 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 "trackselect.h"
+
+#include "node/block/gap/gap.h"
+#include "node/output/track/track.h"
+#include "widget/timelinewidget/timelinewidget.h"
+
+namespace olive {
+
+TrackSelectTool::TrackSelectTool(TimelineWidget *parent) :
+  PointerTool(parent)
+{
+}
+
+void TrackSelectTool::MousePress(TimelineViewMouseEvent *event)
+{
+  QVector<Block*> blocks;
+  bool forward = !(event->GetModifiers() & Qt::ControlModifier);
+
+  parent()->DeselectAll();
+
+  if (event->GetModifiers() & Qt::ShiftModifier) {
+    // Track only
+    Track *track = parent()->GetTrackFromReference(event->GetTrack());
+    if (track) {
+      SelectBlocksOnTrack(track, event, &blocks, forward);
+    }
+  } else {
+    // All tracks
+    foreach (Track *track, parent()->sequence()->GetTracks()) {
+      SelectBlocksOnTrack(track, event, &blocks, forward);
+    }
+  }
+
+  if (!blocks.isEmpty()) {
+    parent()->SignalSelectedBlocks(blocks);
+    set_drag_movement_mode(Timeline::kMove);
+    SetClickedItem(blocks.first());
+    drag_start_ = event->GetCoordinates();
+  } else {
+    set_drag_movement_mode(Timeline::kNone);
+  }
+}
+
+void TrackSelectTool::SelectBlocksOnTrack(Track *track, TimelineViewMouseEvent *event, QVector<Block*> *blocks, bool forward)
+{
+  Block *b = track->NearestBlockBeforeOrAt(event->GetFrame());
+
+  if (!b && !track->Blocks().isEmpty() && !forward) {
+    // Fallback to first or last block in track
+    b = track->Blocks().last();
+  }
+
+  while (b) {
+    if (!dynamic_cast<GapBlock*>(b)) {
+      if (!blocks->contains(b)) {
+        parent()->AddSelection(b);
+        blocks->append(b);
+      }
+
+      if (!(event->GetModifiers() & Qt::AltModifier)) {
+        if (ClipBlock *clip = dynamic_cast<ClipBlock*>(b)) {
+          foreach (Block *link, clip->block_links()) {
+            if (!blocks->contains(link)) {
+              parent()->AddSelection(link);
+              blocks->append(link);
+            }
+          }
+        }
+      }
+    }
+
+    b = forward ? b->next() : b->previous();
+  }
+}
+
+}

app/widget/timelinewidget/tool/trackselect.h

@@ -0,0 +1,42 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2021 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 TRACKSELECTTOOL_H
+#define TRACKSELECTTOOL_H
+
+#include "pointer.h"
+
+namespace olive {
+
+class TrackSelectTool : public PointerTool
+{
+public:
+  TrackSelectTool(TimelineWidget *parent);
+
+  virtual void MousePress(TimelineViewMouseEvent *event) override;
+
+private:
+  void SelectBlocksOnTrack(Track *track, TimelineViewMouseEvent *event, QVector<Block *> *blocks, bool forward);
+
+};
+
+}
+
+#endif // TRACKSELECTTOOL_H