OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-15 07:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Clean up delete Source/Scene shortcut

Browse source 
The "Delete" shortcut is already set in the UI/forms so the old code
would only change shortcuts in macOS.

Closes obsproject/obs-studio#1212
This commit is contained in:
Shaolin 2018-03-03 02:54:12 -03:00 committed by jp9000
parent 273f5e2bfe
commit 234ed9512d
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
UI/window-basic-main.cpp
View file

@ -129,8 +129,6 @@ static void AddExtraModulePaths()
#endif #endif
} }
static QList<QKeySequence> DeleteKeys;
OBSBasic::OBSBasic(QWidget *parent) OBSBasic::OBSBasic(QWidget *parent)
: OBSMainWindow (parent), : OBSMainWindow (parent),
ui (new Ui::OBSBasic) ui (new Ui::OBSBasic)
@ -212,15 +210,9 @@ OBSBasic::OBSBasic(QWidget *parent)
ui->statusbar, SLOT(UpdateCPUUsage())); ui->statusbar, SLOT(UpdateCPUUsage()));
cpuUsageTimer->start(3000); cpuUsageTimer->start(3000);
DeleteKeys =
#ifdef __APPLE__ #ifdef __APPLE__
QList<QKeySequence>{{Qt::Key_Backspace}} << ui->actionRemoveSource->setShortcuts({Qt::Key_Backspace});
#endif ui->actionRemoveScene->setShortcuts({Qt::Key_Backspace});
QKeySequence::keyBindings(QKeySequence::Delete);
#ifdef __APPLE__
ui->actionRemoveSource->setShortcuts(DeleteKeys);
ui->actionRemoveScene->setShortcuts(DeleteKeys);
ui->action_Settings->setMenuRole(QAction::PreferencesRole); ui->action_Settings->setMenuRole(QAction::PreferencesRole);
ui->actionE_xit->setMenuRole(QAction::QuitRole); ui->actionE_xit->setMenuRole(QAction::QuitRole);
@ -3496,8 +3488,7 @@ void OBSBasic::on_scenes_customContextMenuRequested(const QPoint &pos)
popup.addAction(QTStr("Rename"), popup.addAction(QTStr("Rename"),
this, SLOT(EditSceneName())); this, SLOT(EditSceneName()));
popup.addAction(QTStr("Remove"), popup.addAction(QTStr("Remove"),
this, SLOT(RemoveSelectedScene()), this, SLOT(RemoveSelectedScene()));
DeleteKeys.front());
popup.addSeparator(); popup.addSeparator();
order.addAction(QTStr("Basic.MainMenu.Edit.Order.MoveUp"), order.addAction(QTStr("Basic.MainMenu.Edit.Order.MoveUp"),
@ -3866,8 +3857,7 @@ void OBSBasic::CreateSourcePopupMenu(QListWidgetItem *item, bool preview)
popup.addAction(QTStr("Rename"), this, popup.addAction(QTStr("Rename"), this,
SLOT(EditSceneItemName())); SLOT(EditSceneItemName()));
popup.addAction(QTStr("Remove"), this, popup.addAction(QTStr("Remove"), this,
SLOT(on_actionRemoveSource_triggered()), SLOT(on_actionRemoveSource_triggered()));
DeleteKeys.front());
popup.addSeparator(); popup.addSeparator();
popup.addMenu(ui->orderMenu); popup.addMenu(ui->orderMenu);
popup.addMenu(ui->transformMenu); popup.addMenu(ui->transformMenu);