From f2e604c2cb8c1cfb015c914f8264a42597de7b7b Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Fri, 22 Jul 2022 13:25:46 -0700
Subject: [PATCH] ui: add rename shortcut

---
 app/panel/node/node.h                        | 5 +++++
 app/panel/project/project.cpp                | 5 +++++
 app/panel/project/project.h                  | 2 ++
 app/panel/timeline/timeline.cpp              | 5 +++++
 app/panel/timeline/timeline.h                | 2 ++
 app/widget/menu/menushared.cpp               | 8 ++++++++
 app/widget/menu/menushared.h                 | 3 +++
 app/widget/nodeview/nodeview.cpp             | 4 ----
 app/widget/nodeview/nodeview.h               | 4 ++--
 app/widget/panel/panel.h                     | 2 ++
 app/widget/projectexplorer/projectexplorer.h | 4 ++--
 app/widget/timelinewidget/timelinewidget.cpp | 3 ---
 app/widget/timelinewidget/timelinewidget.h   | 4 ++--
 13 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/app/panel/node/node.h b/app/panel/node/node.h
index a572989c4..3fc07b49d 100644
--- a/app/panel/node/node.h
+++ b/app/panel/node/node.h
@@ -104,6 +104,11 @@ public:
     node_widget_->view()->ZoomOut();
   }
 
+  virtual void RenameSelected() override
+  {
+    node_widget_->view()->LabelSelectedNodes();
+  }
+
 public slots:
   void Select(const QVector<Node::ContextPair> &p)
   {
diff --git a/app/panel/project/project.cpp b/app/panel/project/project.cpp
index d6c353330..b1ecf1f59 100644
--- a/app/panel/project/project.cpp
+++ b/app/panel/project/project.cpp
@@ -146,6 +146,11 @@ void ProjectPanel::DeleteSelected()
   explorer_->DeleteSelected();
 }
 
+void ProjectPanel::RenameSelected()
+{
+  explorer_->RenameSelectedItem();
+}
+
 void ProjectPanel::Edit(Node* item)
 {
   explorer_->Edit(item);
diff --git a/app/panel/project/project.h b/app/panel/project/project.h
index c4720fe22..39f6299ee 100644
--- a/app/panel/project/project.h
+++ b/app/panel/project/project.h
@@ -62,6 +62,8 @@ public:
 
   virtual void DeleteSelected() override;
 
+  virtual void RenameSelected() override;
+
 public slots:
   void Edit(Node *item);
 
diff --git a/app/panel/timeline/timeline.cpp b/app/panel/timeline/timeline.cpp
index 686aec085..24e14320f 100644
--- a/app/panel/timeline/timeline.cpp
+++ b/app/panel/timeline/timeline.cpp
@@ -154,6 +154,11 @@ void TimelinePanel::MoveOutToPlayhead()
   timeline_widget()->MoveOutToPlayhead();
 }
 
+void TimelinePanel::RenameSelected()
+{
+  timeline_widget()->RenameSelectedBlocks();
+}
+
 void TimelinePanel::InsertFootageAtPlayhead(const QVector<ViewerOutput *> &footage)
 {
   timeline_widget()->InsertFootageAtPlayhead(footage);
diff --git a/app/panel/timeline/timeline.h b/app/panel/timeline/timeline.h
index da0418e46..611fd275c 100644
--- a/app/panel/timeline/timeline.h
+++ b/app/panel/timeline/timeline.h
@@ -86,6 +86,8 @@ public:
 
   virtual void MoveOutToPlayhead() override;
 
+  virtual void RenameSelected() override;
+
   void AddDefaultTransitionsToSelected()
   {
     timeline_widget()->AddDefaultTransitionsToSelected();
diff --git a/app/widget/menu/menushared.cpp b/app/widget/menu/menushared.cpp
index 431e72f72..6332046ba 100644
--- a/app/widget/menu/menushared.cpp
+++ b/app/widget/menu/menushared.cpp
@@ -43,6 +43,7 @@ MenuShared::MenuShared()
   edit_paste_item_ = Menu::CreateItem(this, "paste", this, &MenuShared::PasteTriggered, tr("Ctrl+V"));
   edit_paste_insert_item_ = Menu::CreateItem(this, "pasteinsert", this, &MenuShared::PasteInsertTriggered, tr("Ctrl+Shift+V"));
   edit_duplicate_item_ = Menu::CreateItem(this, "duplicate", this, &MenuShared::DuplicateTriggered, tr("Ctrl+D"));
+  edit_rename_item_ = Menu::CreateItem(this, "rename", this, &MenuShared::RenameSelectedTriggered, tr("F2"));
   edit_delete_item_ = Menu::CreateItem(this, "delete", this, &MenuShared::DeleteSelectedTriggered, tr("Del"));
   edit_ripple_delete_item_ = Menu::CreateItem(this, "rippledelete", this, &MenuShared::RippleDeleteTriggered, tr("Shift+Del"));
   edit_split_item_ = Menu::CreateItem(this, "split", this, &MenuShared::SplitAtPlayheadTriggered, tr("Ctrl+K"));
@@ -131,6 +132,7 @@ void MenuShared::AddItemsForEditMenu(Menu *m, bool for_clips)
   m->addAction(edit_paste_item_);
   m->addAction(edit_paste_insert_item_);
   m->addAction(edit_duplicate_item_);
+  m->addAction(edit_rename_item_);
   m->addAction(edit_delete_item_);
 
   if (for_clips) {
@@ -279,6 +281,11 @@ void MenuShared::DuplicateTriggered()
   PanelManager::instance()->CurrentlyFocused()->Duplicate();
 }
 
+void MenuShared::RenameSelectedTriggered()
+{
+  PanelManager::instance()->CurrentlyFocused()->RenameSelected();
+}
+
 void MenuShared::EnableDisableTriggered()
 {
   PanelManager::instance()->CurrentlyFocused()->ToggleSelectedEnabled();
@@ -333,6 +340,7 @@ void MenuShared::Retranslate()
   edit_paste_item_->setText(tr("&Paste"));
   edit_paste_insert_item_->setText(tr("Paste Insert"));
   edit_duplicate_item_->setText(tr("Duplicate"));
+  edit_rename_item_->setText(tr("Rename"));
   edit_delete_item_->setText(tr("Delete"));
   edit_ripple_delete_item_->setText(tr("Ripple Delete"));
   edit_split_item_->setText(tr("Split"));
diff --git a/app/widget/menu/menushared.h b/app/widget/menu/menushared.h
index 8935457ca..61a544e53 100644
--- a/app/widget/menu/menushared.h
+++ b/app/widget/menu/menushared.h
@@ -72,6 +72,7 @@ private:
   QAction* edit_paste_item_;
   QAction* edit_paste_insert_item_;
   QAction* edit_duplicate_item_;
+  QAction* edit_rename_item_;
   QAction* edit_delete_item_;
   QAction* edit_ripple_delete_item_;
   QAction* edit_split_item_;
@@ -130,6 +131,8 @@ private slots:
 
   void DuplicateTriggered();
 
+  void RenameSelectedTriggered();
+
   void EnableDisableTriggered();
 
   void NestTriggered();
diff --git a/app/widget/nodeview/nodeview.cpp b/app/widget/nodeview/nodeview.cpp
index 7e3f9e138..e757e6031 100644
--- a/app/widget/nodeview/nodeview.cpp
+++ b/app/widget/nodeview/nodeview.cpp
@@ -779,10 +779,6 @@ void NodeView::ShowContextMenu(const QPoint &pos)
 
   if (itemAt(pos) && !selected.isEmpty()) {
 
-    // Label node action
-    QAction* label_action = m.addAction(tr("Label"));
-    connect(label_action, &QAction::triggered, this, &NodeView::LabelSelectedNodes);
-
     // Grouping
     if (selected.size() == 1 && dynamic_cast<NodeGroup*>(selected.first()->GetNode())) {
       QAction *ungroup_action = m.addAction(tr("Ungroup"));
diff --git a/app/widget/nodeview/nodeview.h b/app/widget/nodeview/nodeview.h
index 15a5ddc28..bf2d0ee0d 100644
--- a/app/widget/nodeview/nodeview.h
+++ b/app/widget/nodeview/nodeview.h
@@ -112,6 +112,8 @@ public slots:
 
   void CenterOnNode(olive::Node *n);
 
+  void LabelSelectedNodes();
+
 signals:
   void NodesSelected(const QVector<Node*>& nodes);
 
@@ -275,8 +277,6 @@ private slots:
 
   void ShowNodeProperties();
 
-  void LabelSelectedNodes();
-
   void ItemAboutToBeDeleted(NodeViewItem *item);
 
   void CloseOverlay();
diff --git a/app/widget/panel/panel.h b/app/widget/panel/panel.h
index 608c0ba5f..54df750c6 100644
--- a/app/widget/panel/panel.h
+++ b/app/widget/panel/panel.h
@@ -122,6 +122,8 @@ public:
 
   virtual void GoToNextCut(){}
 
+  virtual void RenameSelected(){}
+
   virtual void DeleteSelected(){}
 
   virtual void RippleDelete(){}
diff --git a/app/widget/projectexplorer/projectexplorer.h b/app/widget/projectexplorer/projectexplorer.h
index 1074e1a4f..086c2eab3 100644
--- a/app/widget/projectexplorer/projectexplorer.h
+++ b/app/widget/projectexplorer/projectexplorer.h
@@ -92,6 +92,8 @@ public slots:
 
   void Edit(Node* item);
 
+  void RenameSelectedItem();
+
 signals:
   /**
    * @brief Emitted when an Item is double clicked
@@ -171,8 +173,6 @@ private slots:
 
   void DirUpSlot();
 
-  void RenameSelectedItem();
-
   void ShowContextMenu();
 
   void ShowItemPropertiesDialog();
diff --git a/app/widget/timelinewidget/timelinewidget.cpp b/app/widget/timelinewidget/timelinewidget.cpp
index 08adbbf23..a293545fb 100644
--- a/app/widget/timelinewidget/timelinewidget.cpp
+++ b/app/widget/timelinewidget/timelinewidget.cpp
@@ -1107,9 +1107,6 @@ void TimelineWidget::ShowContextMenu()
       }
     }
 
-    QAction* rename_action = menu.addAction(tr("Rename"));
-    connect(rename_action, &QAction::triggered, this, &TimelineWidget::RenameSelectedBlocks);
-
     menu.addSeparator();
 
     QAction* properties_action = menu.addAction(tr("Properties"));
diff --git a/app/widget/timelinewidget/timelinewidget.h b/app/widget/timelinewidget/timelinewidget.h
index 58846f53a..870d7065b 100644
--- a/app/widget/timelinewidget/timelinewidget.h
+++ b/app/widget/timelinewidget/timelinewidget.h
@@ -274,6 +274,8 @@ public:
 public slots:
   void ClearTentativeSubtitleTrack();
 
+  void RenameSelectedBlocks();
+
 signals:
   void BlockSelectionChanged(const QVector<Block*>& selected_blocks);
 
@@ -431,8 +433,6 @@ private slots:
   void RevealInFootageViewer();
   void RevealInProject();
 
-  void RenameSelectedBlocks();
-
   void TrackAboutToBeDeleted(Track *track);
 
 };