From 0b528280869e32231960d38bf7f529770a48fd2e Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Mon, 30 Jun 2014 18:21:40 -0700
Subject: [PATCH] Remove 'remove item' action, clean up code

The removeItemAction just for a keyboard shortcut was unnecessary.
Instead, use the toolbar button to associate a shortcut with, and remove
the removeItemAction object.
---
 obs/forms/OBSBasic.ui     |  3 +++
 obs/window-basic-main.cpp | 10 +++-------
 obs/window-basic-main.hpp |  2 --
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/obs/forms/OBSBasic.ui b/obs/forms/OBSBasic.ui
index 9af2f065a..fbda14f7b 100644
--- a/obs/forms/OBSBasic.ui
+++ b/obs/forms/OBSBasic.ui
@@ -536,6 +536,9 @@
    <property name="text">
     <string>Remove</string>
    </property>
+   <property name="shortcut">
+    <string>Del</string>
+   </property>
   </action>
   <action name="actionSceneProperties">
    <property name="enabled">
diff --git a/obs/window-basic-main.cpp b/obs/window-basic-main.cpp
index 02537c1d4..5b3821edf 100644
--- a/obs/window-basic-main.cpp
+++ b/obs/window-basic-main.cpp
@@ -88,12 +88,6 @@ OBSBasic::OBSBasic(QWidget *parent)
 			this,
 			SLOT(SceneItemNameEdited(QWidget*,
 					QAbstractItemDelegate::EndEditHint)));
-
-	removeItemAction = new QAction(QTStr("Remove"), this);
-	removeItemAction->setShortcut(QKeySequence(Qt::Key_Delete));
-	connect(removeItemAction, SIGNAL(triggered()),
-			this, SLOT(RemoveSelectedSceneItem()));
-	addAction(removeItemAction);
 }
 
 static void SaveAudioDevice(const char *name, int channel, obs_data_t parent)
@@ -1386,7 +1380,9 @@ void OBSBasic::on_sources_customContextMenuRequested(const QPoint &pos)
 
 		popup.addAction(QTStr("Rename"), this,
 				SLOT(EditSceneItemName()));
-		popup.addAction(removeItemAction);
+		popup.addAction(QTStr("Remove"), this,
+				SLOT(on_actionRemoveSource_triggered()),
+				QKeySequence::Delete);
 		popup.addMenu(ui->transformMenu);
 		popup.addSeparator();
 		popup.addAction(QTStr("Properties"), this,
diff --git a/obs/window-basic-main.hpp b/obs/window-basic-main.hpp
index 9a247e537..7a92b9c7f 100644
--- a/obs/window-basic-main.hpp
+++ b/obs/window-basic-main.hpp
@@ -61,8 +61,6 @@ private:
 
 	QNetworkAccessManager networkManager;
 
-	QPointer<QAction> removeItemAction;
-
 	QBuffer       logUploadPostData;
 	QNetworkReply *logUploadReply = nullptr;
 	QByteArray    logUploadReturnData;