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

QmlDesigner: Inline EffectComposerContext

Browse Source 
Change-Id: Id4b32bde5b1b12b023cffb4bc3f134627dec508b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2024-07-05 15:40:52 +02:00
parent e0ae91a775
commit 63bb621694
3 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/effectcomposer/effectcomposerview.cpp
View File

@@ -18,18 +18,6 @@
namespace EffectComposer { namespace EffectComposer {
EffectComposerContext::EffectComposerContext(QWidget *widget)
: IContext(widget)
{
setWidget(widget);
setContext(Core::Context(QmlDesigner::Constants::C_QMLEFFECTCOMPOSER,
QmlDesigner::Constants::C_QT_QUICK_TOOLS_MENU));
setContextHelpProvider([this](const HelpCallback &callback) {
qobject_cast<EffectComposerWidget *>(m_widget)->contextHelp(callback);
});
}
EffectComposerView::EffectComposerView(QmlDesigner::ExternalDependenciesInterface &externalDependencies) EffectComposerView::EffectComposerView(QmlDesigner::ExternalDependenciesInterface &externalDependencies)
: AbstractView{externalDependencies} : AbstractView{externalDependencies}
, m_componentUtils(externalDependencies) , m_componentUtils(externalDependencies)
@@ -116,9 +104,6 @@ QmlDesigner::WidgetInfo EffectComposerView::widgetInfo()
document->clearUndoRedoStacks(); document->clearUndoRedoStacks();
} }
}); });
auto context = new EffectComposerContext(m_widget.data());
Core::ICore::addContextObject(context);
} }
return createWidgetInfo(m_widget.data(), "EffectComposer", return createWidgetInfo(m_widget.data(), "EffectComposer",

9
src/plugins/effectcomposer/effectcomposerview.h
View File

@@ -7,7 +7,6 @@
#include "modelnode.h" #include "modelnode.h"
#include <generatedcomponentutils.h> #include <generatedcomponentutils.h>
#include <coreplugin/icontext.h>
#include <QPointer> #include <QPointer>
@@ -15,14 +14,6 @@ namespace EffectComposer {
class EffectComposerWidget; class EffectComposerWidget;
class EffectComposerContext : public Core::IContext
{
Q_OBJECT
public:
EffectComposerContext(QWidget *widget);
};
class EffectComposerView : public QmlDesigner::AbstractView class EffectComposerView : public QmlDesigner::AbstractView
{ {
Q_DECLARE_TR_FUNCTIONS(EffectComposer::EffectComposerView) Q_DECLARE_TR_FUNCTIONS(EffectComposer::EffectComposerView)

8
src/plugins/effectcomposer/effectcomposerwidget.cpp
View File

@@ -34,6 +34,8 @@
#include <QQuickItem> #include <QQuickItem>
#include <QTimer> #include <QTimer>
using namespace Core;
namespace EffectComposer { namespace EffectComposer {
static QString propertyEditorResourcesPath() static QString propertyEditorResourcesPath()
@@ -128,8 +130,12 @@ EffectComposerWidget::EffectComposerWidget(EffectComposerView *view)
m_effectComposerModel->saveComposition(compName); m_effectComposerModel->saveComposition(compName);
} }
}); });
}
IContext::attach(this,
Context(QmlDesigner::Constants::C_QMLEFFECTCOMPOSER,
QmlDesigner::Constants::C_QT_QUICK_TOOLS_MENU),
[this](const IContext::HelpCallback &callback) { contextHelp(callback); });
}
bool EffectComposerWidget::eventFilter(QObject *obj, QEvent *event) bool EffectComposerWidget::eventFilter(QObject *obj, QEvent *event)
{ {