From 234ed9512d5d4310cdc5d7288acfd6e357172a54 Mon Sep 17 00:00:00 2001 From: Shaolin Date: Sat, 3 Mar 2018 02:54:12 -0300 Subject: [PATCH] UI: Clean up delete Source/Scene shortcut 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 --- UI/window-basic-main.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 490a42b15..034d2c029 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -129,8 +129,6 @@ static void AddExtraModulePaths() #endif } -static QList DeleteKeys; - OBSBasic::OBSBasic(QWidget *parent) : OBSMainWindow (parent), ui (new Ui::OBSBasic) @@ -212,15 +210,9 @@ OBSBasic::OBSBasic(QWidget *parent) ui->statusbar, SLOT(UpdateCPUUsage())); cpuUsageTimer->start(3000); - DeleteKeys = #ifdef __APPLE__ - QList{{Qt::Key_Backspace}} << -#endif - QKeySequence::keyBindings(QKeySequence::Delete); - -#ifdef __APPLE__ - ui->actionRemoveSource->setShortcuts(DeleteKeys); - ui->actionRemoveScene->setShortcuts(DeleteKeys); + ui->actionRemoveSource->setShortcuts({Qt::Key_Backspace}); + ui->actionRemoveScene->setShortcuts({Qt::Key_Backspace}); ui->action_Settings->setMenuRole(QAction::PreferencesRole); ui->actionE_xit->setMenuRole(QAction::QuitRole); @@ -3496,8 +3488,7 @@ void OBSBasic::on_scenes_customContextMenuRequested(const QPoint &pos) popup.addAction(QTStr("Rename"), this, SLOT(EditSceneName())); popup.addAction(QTStr("Remove"), - this, SLOT(RemoveSelectedScene()), - DeleteKeys.front()); + this, SLOT(RemoveSelectedScene())); popup.addSeparator(); order.addAction(QTStr("Basic.MainMenu.Edit.Order.MoveUp"), @@ -3866,8 +3857,7 @@ void OBSBasic::CreateSourcePopupMenu(QListWidgetItem *item, bool preview) popup.addAction(QTStr("Rename"), this, SLOT(EditSceneItemName())); popup.addAction(QTStr("Remove"), this, - SLOT(on_actionRemoveSource_triggered()), - DeleteKeys.front()); + SLOT(on_actionRemoveSource_triggered())); popup.addSeparator(); popup.addMenu(ui->orderMenu); popup.addMenu(ui->transformMenu);