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

QmlDesigner: Inline TimeLineContext

Browse Source 
Change-Id: Ifa002d1c9100c28ac9a382c8fced3b834122ef85
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2024-07-05 15:36:21 +02:00
parent 20e1335922
commit e0ae91a775
5 changed files with 6 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmldesigner/CMakeLists.txt
View File

@@ -1049,7 +1049,6 @@ extend_qtc_plugin(QmlDesigner
timelineactions.cpp timelineactions.h
timelineanimationform.cpp timelineanimationform.h
timelineconstants.h
timelinecontext.cpp timelinecontext.h
timelinecontrols.cpp timelinecontrols.h
timelineform.cpp timelineform.h
timelinegraphicslayout.cpp timelinegraphicslayout.h

21
src/plugins/qmldesigner/components/timelineeditor/timelinecontext.cpp
View File

@@ -1,21 +0,0 @@
// Copyright (C) 2018 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "timelinecontext.h"
#include "timelineconstants.h"
#include "timelinewidget.h"
namespace QmlDesigner {
TimelineContext::TimelineContext(QWidget *widget)
: IContext(widget)
{
setWidget(widget);
setContext(Core::Context(TimelineConstants::C_QMLTIMELINE));
setContextHelpProvider([this](const Core::IContext::HelpCallback &callback) {
if (auto *widget = qobject_cast<TimelineWidget *>(m_widget))
widget->contextHelp(callback);
});
}
} // namespace QmlDesigner

20
src/plugins/qmldesigner/components/timelineeditor/timelinecontext.h
View File

@@ -1,20 +0,0 @@
// Copyright (C) 2018 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#pragma once
#include <coreplugin/icontext.h>
#include <QWidget>
namespace QmlDesigner {
class TimelineContext : public Core::IContext
{
Q_OBJECT
public:
explicit TimelineContext(QWidget *widget);
};
} // namespace QmlDesigner

7
src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp
View File

@@ -7,7 +7,6 @@
#include "easingcurve.h"
#include "timelineactions.h"
#include "timelineconstants.h"
#include "timelinecontext.h"
#include "timelinewidget.h"
#include "timelinegraphicsscene.h"
@@ -640,13 +639,9 @@ void TimelineView::registerActions()
TimelineWidget *TimelineView::createWidget()
{
if (!m_timelineWidget) {
if (!m_timelineWidget)
m_timelineWidget = new TimelineWidget(this);
auto *timelineContext = new TimelineContext(m_timelineWidget);
Core::ICore::addContextObject(timelineContext);
}
return m_timelineWidget;
}

7
src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp
View File

@@ -2,9 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "timelinewidget.h"
#include "bindingproperty.h"
#include "curvesegment.h"
#include "easingcurve.h"
#include "easingcurvedialog.h"
#include "timelineconstants.h"
#include "timelinegraphicsscene.h"
@@ -45,6 +43,8 @@
#include <cmath>
using namespace Core;
namespace QmlDesigner {
class Eventfilter : public QObject
@@ -281,6 +281,9 @@ TimelineWidget::TimelineWidget(TimelineView *view)
connect(m_playbackAnimation, &QVariantAnimation::finished, onFinish);
TimeLineNS::TimelineScrollAreaSupport::support(m_graphicsView, m_scrollbar);
IContext::attach(this, Context(TimelineConstants::C_QMLTIMELINE),
[this](const IContext::HelpCallback &callback) { contextHelp(callback); });
}
void TimelineWidget::connectToolbar()