kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Material: Fix Delete key in material editor

Browse Source
This commit is contained in:
wmayer
2024-07-01 12:33:46 +02:00
parent eeaca2af88
commit e07deec7f3
4 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Material/Gui/Array2D.cpp
View File

@@ -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);

2
src/Mod/Material/Gui/Array3D.cpp
View File

@@ -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);

10
src/Mod/Material/Gui/MaterialSave.cpp
View File

@@ -87,7 +87,7 @@ MaterialSave::MaterialSave(const std::shared_ptr<Materials::Material>& 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)

2
src/Mod/Material/Gui/MaterialsEditor.cpp
View File

@@ -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);