From 5b7255b8bb437738391376ea9652b08b6c01b9dd Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sat, 28 Aug 2021 13:40:07 -0700
Subject: [PATCH] improved insert/overwrite functions

---
 app/panel/project/project.cpp      | 18 ------------------
 app/panel/project/project.h        |  3 ---
 app/panel/timeline/timeline.cpp    | 18 ------------------
 app/panel/timeline/timeline.h      |  4 ----
 app/widget/panel/panel.h           |  4 ----
 app/window/mainwindow/mainmenu.cpp | 14 ++++++++++++--
 6 files changed, 12 insertions(+), 49 deletions(-)

diff --git a/app/panel/project/project.cpp b/app/panel/project/project.cpp
index dd0b2ced9..ec22e0124 100644
--- a/app/panel/project/project.cpp
+++ b/app/panel/project/project.cpp
@@ -141,24 +141,6 @@ void ProjectPanel::DeselectAll()
   explorer_->DeselectAll();
 }
 
-void ProjectPanel::Insert()
-{
-  TimelinePanel* timeline = PanelManager::instance()->MostRecentlyFocused<TimelinePanel>();
-
-  if (timeline) {
-    timeline->InsertFootageAtPlayhead(GetSelectedFootage());
-  }
-}
-
-void ProjectPanel::Overwrite()
-{
-  TimelinePanel* timeline = PanelManager::instance()->MostRecentlyFocused<TimelinePanel>();
-
-  if (timeline) {
-    timeline->OverwriteFootageAtPlayhead(GetSelectedFootage());
-  }
-}
-
 void ProjectPanel::DeleteSelected()
 {
   explorer_->DeleteSelected();
diff --git a/app/panel/project/project.h b/app/panel/project/project.h
index bfa23c455..82715aaf4 100644
--- a/app/panel/project/project.h
+++ b/app/panel/project/project.h
@@ -55,9 +55,6 @@ public:
   virtual void SelectAll() override;
   virtual void DeselectAll() override;
 
-  virtual void Insert() override;
-  virtual void Overwrite() override;
-
   virtual void DeleteSelected() override;
 
 public slots:
diff --git a/app/panel/timeline/timeline.cpp b/app/panel/timeline/timeline.cpp
index 50b6c7508..461d94f16 100644
--- a/app/panel/timeline/timeline.cpp
+++ b/app/panel/timeline/timeline.cpp
@@ -101,24 +101,6 @@ void TimelinePanel::DecreaseTrackHeight()
   timeline_widget()->DecreaseTrackHeight();
 }
 
-void TimelinePanel::Insert()
-{
-  FootageManagementPanel* project_panel = PanelManager::instance()->MostRecentlyFocused<FootageManagementPanel>();
-
-  if (project_panel) {
-    InsertFootageAtPlayhead(project_panel->GetSelectedFootage());
-  }
-}
-
-void TimelinePanel::Overwrite()
-{
-  FootageManagementPanel* project_panel = PanelManager::instance()->MostRecentlyFocused<FootageManagementPanel>();
-
-  if (project_panel) {
-    OverwriteFootageAtPlayhead(project_panel->GetSelectedFootage());
-  }
-}
-
 void TimelinePanel::ToggleLinks()
 {
   timeline_widget()->ToggleLinksOnSelected();
diff --git a/app/panel/timeline/timeline.h b/app/panel/timeline/timeline.h
index f27726d65..360187b0a 100644
--- a/app/panel/timeline/timeline.h
+++ b/app/panel/timeline/timeline.h
@@ -66,10 +66,6 @@ public:
 
   virtual void DecreaseTrackHeight() override;
 
-  virtual void Insert() override;
-
-  virtual void Overwrite() override;
-
   virtual void ToggleLinks() override;
 
   virtual void CutSelected() override;
diff --git a/app/widget/panel/panel.h b/app/widget/panel/panel.h
index 95c0743ae..87690bf0d 100644
--- a/app/widget/panel/panel.h
+++ b/app/widget/panel/panel.h
@@ -124,10 +124,6 @@ public:
 
   virtual void RippleDelete(){}
 
-  virtual void Insert(){}
-
-  virtual void Overwrite(){}
-
   virtual void IncreaseTrackHeight(){}
 
   virtual void DecreaseTrackHeight(){}
diff --git a/app/window/mainwindow/mainmenu.cpp b/app/window/mainwindow/mainmenu.cpp
index 8dfc0bcd4..9729c273b 100644
--- a/app/window/mainwindow/mainmenu.cpp
+++ b/app/window/mainwindow/mainmenu.cpp
@@ -526,12 +526,22 @@ void MainMenu::DeselectAllTriggered()
 
 void MainMenu::InsertTriggered()
 {
-  PanelManager::instance()->CurrentlyFocused()->Insert();
+  FootageManagementPanel* project_panel = PanelManager::instance()->MostRecentlyFocused<FootageManagementPanel>();
+  TimelinePanel *timeline_panel = PanelManager::instance()->MostRecentlyFocused<TimelinePanel>();
+
+  if (project_panel && timeline_panel) {
+    timeline_panel->InsertFootageAtPlayhead(project_panel->GetSelectedFootage());
+  }
 }
 
 void MainMenu::OverwriteTriggered()
 {
-  PanelManager::instance()->CurrentlyFocused()->Overwrite();
+  FootageManagementPanel* project_panel = PanelManager::instance()->MostRecentlyFocused<FootageManagementPanel>();
+  TimelinePanel *timeline_panel = PanelManager::instance()->MostRecentlyFocused<TimelinePanel>();
+
+  if (project_panel && timeline_panel) {
+    timeline_panel->OverwriteFootageAtPlayhead(project_panel->GetSelectedFootage());
+  }
 }
 
 void MainMenu::RippleToInTriggered()