Преглед на файлове

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.
jp9000 преди 11 години
родител
ревизия
0b52828086
променени са 3 файла, в които са добавени 6 реда и са изтрити 9 реда
  1. 3 0
      obs/forms/OBSBasic.ui
  2. 3 7
      obs/window-basic-main.cpp
  3. 0 2
      obs/window-basic-main.hpp

+ 3 - 0
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">

+ 3 - 7
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,

+ 0 - 2
obs/window-basic-main.hpp

@@ -61,8 +61,6 @@ private:
 
 	QNetworkAccessManager networkManager;
 
-	QPointer<QAction> removeItemAction;
-
 	QBuffer       logUploadPostData;
 	QNetworkReply *logUploadReply = nullptr;
 	QByteArray    logUploadReturnData;