From e07deec7f370bb9c3364cda152b77a0eaf614ffe Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 1 Jul 2024 12:33:46 +0200 Subject: [PATCH] Material: Fix Delete key in material editor --- src/Mod/Material/Gui/Array2D.cpp | 2 +- src/Mod/Material/Gui/Array3D.cpp | 2 -- src/Mod/Material/Gui/MaterialSave.cpp | 10 ++-------- src/Mod/Material/Gui/MaterialsEditor.cpp | 2 -- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/Mod/Material/Gui/Array2D.cpp b/src/Mod/Material/Gui/Array2D.cpp index fd383ecf44..86804981d5 100644 --- a/src/Mod/Material/Gui/Array2D.cpp +++ b/src/Mod/Material/Gui/Array2D.cpp @@ -74,7 +74,7 @@ Array2D::Array2D(const QString& propertyName, connect(ui->tableView, &QWidget::customContextMenuRequested, this, &Array2D::onContextMenu); _deleteAction.setText(tr("Delete row")); - _deleteAction.setShortcut(Qt::Key_Delete); + _deleteAction.setShortcut(QKeySequence::Delete); connect(&_deleteAction, &QAction::triggered, this, &Array2D::onDelete); ui->tableView->addAction(&_deleteAction); diff --git a/src/Mod/Material/Gui/Array3D.cpp b/src/Mod/Material/Gui/Array3D.cpp index 16cebf5931..450ca682cc 100644 --- a/src/Mod/Material/Gui/Array3D.cpp +++ b/src/Mod/Material/Gui/Array3D.cpp @@ -75,12 +75,10 @@ Array3D::Array3D(const QString& propertyName, connect(ui->table2D, &QWidget::customContextMenuRequested, this, &Array3D::on2DContextMenu); _deleteDepthAction.setText(tr("Delete row")); - // _deleteDepthAction.setShortcut(Qt::Key_Delete); connect(&_deleteDepthAction, &QAction::triggered, this, &Array3D::onDepthDelete); ui->table3D->addAction(&_deleteDepthAction); _delete2DAction.setText(tr("Delete row")); - // _delete2DAction.setShortcut(Qt::Key_Delete); connect(&_delete2DAction, &QAction::triggered, this, &Array3D::on2DDelete); ui->table2D->addAction(&_delete2DAction); diff --git a/src/Mod/Material/Gui/MaterialSave.cpp b/src/Mod/Material/Gui/MaterialSave.cpp index 1f82b7c39e..3bf75d9d46 100644 --- a/src/Mod/Material/Gui/MaterialSave.cpp +++ b/src/Mod/Material/Gui/MaterialSave.cpp @@ -87,7 +87,7 @@ MaterialSave::MaterialSave(const std::shared_ptr& material, &MaterialSave::onContextMenu); _deleteAction.setText(tr("Delete")); - _deleteAction.setShortcut(Qt::Key_Delete); + _deleteAction.setShortcut(QKeySequence::Delete); connect(&_deleteAction, &QAction::triggered, this, &MaterialSave::onDelete); ui->treeMaterials->addAction(&_deleteAction); @@ -525,9 +525,6 @@ void MaterialSave::onContextMenu(const QPoint& pos) { QMenu contextMenu(tr("Context menu"), this); - // QAction action1(tr("Delete"), this); - // action1.setShortcut(Qt::Key_Delete); - // connect(&action1, &QAction::triggered, this, &MaterialSave::onDelete); contextMenu.addAction(&_deleteAction); contextMenu.exec(ui->treeMaterials->mapToGlobal(pos)); @@ -542,10 +539,7 @@ void MaterialSave::onDelete(bool checked) return; } - int res = confirmDelete(this); - if (res == QMessageBox::Cancel) { - return; - } + confirmDelete(this); } int MaterialSave::confirmDelete(QWidget* parent) diff --git a/src/Mod/Material/Gui/MaterialsEditor.cpp b/src/Mod/Material/Gui/MaterialsEditor.cpp index 1a4c223186..dd0d3da8c5 100644 --- a/src/Mod/Material/Gui/MaterialsEditor.cpp +++ b/src/Mod/Material/Gui/MaterialsEditor.cpp @@ -1283,12 +1283,10 @@ void MaterialsEditor::onContextMenu(const QPoint& pos) QMenu contextMenu(tr("Context menu"), this); QAction action1(tr("Inherit from"), this); - // action1.setShortcut(Qt::Key_Delete); connect(&action1, &QAction::triggered, this, &MaterialsEditor::onInherit); contextMenu.addAction(&action1); QAction action2(tr("Inherit new material"), this); - // action1.setShortcut(Qt::Key_Delete); connect(&action2, &QAction::triggered, this, &MaterialsEditor::onInheritNew); contextMenu.addAction(&action2);