ticket:4743 Delete the result with Del key.

OpenModelica · Feb 5, 2018 · 090db0e · 090db0e
1 parent 0d8b4b0
commit 090db0e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/OMEdit/OMEditGUI/Plotting/VariablesWidget.cpp b/OMEdit/OMEditGUI/Plotting/VariablesWidget.cpp
@@ -962,6 +962,26 @@ void VariablesTreeView::mouseReleaseEvent(QMouseEvent *event)
   QTreeView::mouseReleaseEvent(event);
 }
 
+/*!
+ * \brief VariablesTreeView::keyPressEvent
+ * Reimplementation of keypressevent.
+ * \param event
+ */
+void VariablesTreeView::keyPressEvent(QKeyEvent *event)
+{
+  QModelIndexList indexes = selectionModel()->selectedIndexes();
+  if (!indexes.isEmpty()) {
+    QModelIndex index = indexes.at(0);
+    index = mpVariablesWidget->getVariableTreeProxyModel()->mapToSource(index);
+    VariablesTreeItem *pVariablesTreeItem = static_cast<VariablesTreeItem*>(index.internalPointer());
+    if (event->key() == Qt::Key_Delete && pVariablesTreeItem->isRootItem()) {
+      mpVariablesWidget->getVariablesTreeModel()->removeVariableTreeItem(pVariablesTreeItem->getVariableName());
+      return;
+    }
+  }
+  QTreeView::keyPressEvent(event);
+}
+
 VariablesWidget::VariablesWidget(QWidget *pParent)
   : QWidget(pParent)
 {
@@ -1901,6 +1921,7 @@ void VariablesWidget::showContextMenu(QPoint point)
     /* delete result action */
     QAction *pDeleteResultAction = new QAction(QIcon(":/Resources/icons/delete.svg"), tr("Delete Result"), this);
     pDeleteResultAction->setData(pVariablesTreeItem->getVariableName());
+    pDeleteResultAction->setShortcut(QKeySequence::Delete);
     pDeleteResultAction->setStatusTip(tr("Delete the result"));
     connect(pDeleteResultAction, SIGNAL(triggered()), mpVariablesTreeModel, SLOT(removeVariableTreeItem()));
 

diff --git a/OMEdit/OMEditGUI/Plotting/VariablesWidget.h b/OMEdit/OMEditGUI/Plotting/VariablesWidget.h
@@ -166,6 +166,7 @@ class VariablesTreeView : public QTreeView
   VariablesWidget *mpVariablesWidget;
 protected:
   virtual void mouseReleaseEvent(QMouseEvent *event);
+  virtual void keyPressEvent(QKeyEvent *event);
 };
 
 class VariablesWidget : public QWidget