feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner Connection Delete Shortcut replacement

Browse Source 
Task: QDS-1320
Change-Id: I1a94d30710d58dfbd8e90a45133700af20fc2980
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Aleksei German
2019-12-10 11:31:57 +01:00
parent 116451ba1b
commit f26d770322
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp
View File

@@ -45,6 +45,7 @@
#include <QToolButton> #include <QToolButton>
#include <QStyleFactory> #include <QStyleFactory>
#include <QMenu> #include <QMenu>
#include <QShortcut>
#include <bindingeditor/actioneditor.h> #include <bindingeditor/actioneditor.h>
@@ -57,6 +58,7 @@ ConnectionViewWidget::ConnectionViewWidget(QWidget *parent) :
ui(new Ui::ConnectionViewWidget) ui(new Ui::ConnectionViewWidget)
{ {
m_actionEditor = new QmlDesigner::ActionEditor(this); m_actionEditor = new QmlDesigner::ActionEditor(this);
m_deleteShortcut = new QShortcut(this);
QObject::connect(m_actionEditor, &QmlDesigner::ActionEditor::accepted, QObject::connect(m_actionEditor, &QmlDesigner::ActionEditor::accepted,
[&]() { [&]() {
if (m_actionEditor->hasModelIndex()) { if (m_actionEditor->hasModelIndex()) {
@@ -123,6 +125,7 @@ ConnectionViewWidget::~ConnectionViewWidget()
{ {
delete m_actionEditor; delete m_actionEditor;
delete ui; delete ui;
delete m_deleteShortcut;
} }
void ConnectionViewWidget::setBindingModel(BindingModel *model) void ConnectionViewWidget::setBindingModel(BindingModel *model)
@@ -212,6 +215,10 @@ QList<QToolButton *> ConnectionViewWidget::createToolBarWidgets()
connect(buttons.constLast(), &QAbstractButton::clicked, this, &ConnectionViewWidget::removeButtonClicked); connect(buttons.constLast(), &QAbstractButton::clicked, this, &ConnectionViewWidget::removeButtonClicked);
connect(this, &ConnectionViewWidget::setEnabledRemoveButton, buttons.constLast(), &QWidget::setEnabled); 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; return buttons;
} }

1
src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.h
View File

@@ -101,6 +101,7 @@ private:
private: private:
Ui::ConnectionViewWidget *ui; Ui::ConnectionViewWidget *ui;
QmlDesigner::ActionEditor *m_actionEditor; QmlDesigner::ActionEditor *m_actionEditor;
QShortcut *m_deleteShortcut;
}; };
} // namespace Internal } // namespace Internal