From 3f41cf58da4b203a72861a41b9c0f0e394ed4d0e Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 1 Jul 2024 11:53:53 +0200 Subject: [PATCH] Gui: Fix Delete key in parameter editor --- src/Gui/DlgParameterImp.cpp | 30 ++++++++++++------------------ src/Gui/DownloadItem.cpp | 4 ++-- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/Gui/DlgParameterImp.cpp b/src/Gui/DlgParameterImp.cpp index 5070176d67..c444e8c04e 100644 --- a/src/Gui/DlgParameterImp.cpp +++ b/src/Gui/DlgParameterImp.cpp @@ -500,15 +500,12 @@ void ParameterGroup::contextMenuEvent ( QContextMenuEvent* event ) void ParameterGroup::keyPressEvent (QKeyEvent* event) { - switch ( tolower(event->key()) ) - { - case Qt::Key_Delete: - { - onDeleteSelectedItem(); - } break; - default: - QTreeWidget::keyPressEvent(event); - } + if (event->matches(QKeySequence::Delete)) { + onDeleteSelectedItem(); + } + else { + QTreeWidget::keyPressEvent(event); + } } void ParameterGroup::onDeleteSelectedItem() @@ -715,15 +712,12 @@ void ParameterValue::contextMenuEvent ( QContextMenuEvent* event ) void ParameterValue::keyPressEvent (QKeyEvent* event) { - switch ( tolower(event->key()) ) - { - case Qt::Key_Delete: - { - onDeleteSelectedItem(); - } break; - default: - QTreeWidget::keyPressEvent(event); - } + if (event->matches(QKeySequence::Delete)) { + onDeleteSelectedItem(); + } + else { + QTreeWidget::keyPressEvent(event); + } } void ParameterValue::resizeEvent(QResizeEvent* event) diff --git a/src/Gui/DownloadItem.cpp b/src/Gui/DownloadItem.cpp index 2d8f747752..486c7972e8 100644 --- a/src/Gui/DownloadItem.cpp +++ b/src/Gui/DownloadItem.cpp @@ -60,8 +60,8 @@ EditTableView::EditTableView(QWidget *parent) void EditTableView::keyPressEvent(QKeyEvent *event) { - if ((event->key() == Qt::Key_Delete - || event->key() == Qt::Key_Backspace) + if ((event->matches(QKeySequence::Delete) + || event->matches(QKeySequence::Backspace)) && model()) { removeOne(); } else {