forked from qt-creator/qt-creator
QmlDesigner: Inline TransitionContext
Change-Id: I2f6d101a7d7ae06f11b780ea754e1b4ce6028b4c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -316,13 +316,9 @@ ModelNode TransitionEditorView::addNewTransition()
|
||||
|
||||
TransitionEditorWidget *TransitionEditorView::createWidget()
|
||||
{
|
||||
if (!m_transitionEditorWidget) {
|
||||
if (!m_transitionEditorWidget)
|
||||
m_transitionEditorWidget = new TransitionEditorWidget(this);
|
||||
|
||||
auto *transitionContext = new TransitionContext(m_transitionEditorWidget);
|
||||
Core::ICore::addContextObject(transitionContext);
|
||||
}
|
||||
|
||||
return m_transitionEditorWidget;
|
||||
}
|
||||
|
||||
|
@@ -45,18 +45,9 @@
|
||||
|
||||
#include <cmath>
|
||||
|
||||
namespace QmlDesigner {
|
||||
using namespace Core;
|
||||
|
||||
TransitionContext::TransitionContext(QWidget *widget)
|
||||
: IContext(widget)
|
||||
{
|
||||
setWidget(widget);
|
||||
setContext(Core::Context(TransitionEditorConstants::C_QMLTRANSITIONS));
|
||||
setContextHelpProvider([this](const Core::IContext::HelpCallback &callback) {
|
||||
if (auto *widget = qobject_cast<TransitionEditorWidget *>(m_widget))
|
||||
widget->contextHelp(callback);
|
||||
});
|
||||
}
|
||||
namespace QmlDesigner {
|
||||
|
||||
class Eventfilter : public QObject
|
||||
{
|
||||
@@ -221,6 +212,9 @@ TransitionEditorWidget::TransitionEditorWidget(TransitionEditorView *view)
|
||||
m_toolbar->setScaleFactor(scaleFactor);
|
||||
});
|
||||
m_graphicsView->viewport()->installEventFilter(filter);
|
||||
|
||||
IContext::attach(this, Context(TransitionEditorConstants::C_QMLTRANSITIONS),
|
||||
[this](const IContext::HelpCallback &callback) { contextHelp(callback); });
|
||||
}
|
||||
|
||||
void TransitionEditorWidget::setTransitionActive(bool b)
|
||||
|
@@ -11,8 +11,6 @@
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
#include <functional>
|
||||
|
||||
QT_FORWARD_DECLARE_CLASS(QComboBox)
|
||||
QT_FORWARD_DECLARE_CLASS(QGraphicsView)
|
||||
QT_FORWARD_DECLARE_CLASS(QLabel)
|
||||
@@ -29,14 +27,6 @@ class TransitionEditorToolBar;
|
||||
class TransitionEditorGraphicsScene;
|
||||
class ModelNode;
|
||||
|
||||
class TransitionContext : public Core::IContext
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit TransitionContext(QWidget *widget);
|
||||
};
|
||||
|
||||
class TransitionEditorWidget : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
Reference in New Issue
Block a user