From f26d770322ca6b6b4575a7e2751243f9e2c09af6 Mon Sep 17 00:00:00 2001 From: Aleksei German Date: Tue, 10 Dec 2019 11:31:57 +0100 Subject: [PATCH] QmlDesigner Connection Delete Shortcut replacement Task: QDS-1320 Change-Id: I1a94d30710d58dfbd8e90a45133700af20fc2980 Reviewed-by: Tim Jenssen --- .../components/connectioneditor/connectionviewwidget.cpp | 7 +++++++ .../components/connectioneditor/connectionviewwidget.h | 1 + 2 files changed, 8 insertions(+) diff --git a/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp b/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp index 60476903baa..d0aa6bbbc7a 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp @@ -45,6 +45,7 @@ #include #include #include +#include #include @@ -57,6 +58,7 @@ ConnectionViewWidget::ConnectionViewWidget(QWidget *parent) : ui(new Ui::ConnectionViewWidget) { m_actionEditor = new QmlDesigner::ActionEditor(this); + m_deleteShortcut = new QShortcut(this); QObject::connect(m_actionEditor, &QmlDesigner::ActionEditor::accepted, [&]() { if (m_actionEditor->hasModelIndex()) { @@ -123,6 +125,7 @@ ConnectionViewWidget::~ConnectionViewWidget() { delete m_actionEditor; delete ui; + delete m_deleteShortcut; } void ConnectionViewWidget::setBindingModel(BindingModel *model) @@ -212,6 +215,10 @@ QList ConnectionViewWidget::createToolBarWidgets() connect(buttons.constLast(), &QAbstractButton::clicked, this, &ConnectionViewWidget::removeButtonClicked); connect(this, &ConnectionViewWidget::setEnabledRemoveButton, buttons.constLast(), &QWidget::setEnabled); + m_deleteShortcut->setKey(Qt::Key_Delete); + m_deleteShortcut->setContext(Qt::WidgetWithChildrenShortcut); + connect(m_deleteShortcut, &QShortcut::activated, this, &ConnectionViewWidget::removeButtonClicked); + return buttons; } diff --git a/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.h b/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.h index 09cc4f6c53f..4e4967bbf88 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.h +++ b/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.h @@ -101,6 +101,7 @@ private: private: Ui::ConnectionViewWidget *ui; QmlDesigner::ActionEditor *m_actionEditor; + QShortcut *m_deleteShortcut; }; } // namespace Internal