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.
This commit is contained in:
jp9000 2014-06-30 18:21:40 -07:00
parent c48ec48765
commit 0b52828086
3 changed files with 6 additions and 9 deletions

View File

@ -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">

View File

@ -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,

View File

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