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

QmlDesigner: Remove the custom notification "INSERT_KEYFRAME"

Browse Source 
Adding a keyframe can be done directly in the PropertyEditor.

Change-Id: I38fa87a8bcf4f551890c4ada748301cdeea9f165
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Thomas Hartmann
2021-04-20 16:23:42 +02:00
parent 8ae81f5a40
commit 638db3c35b
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
View File

@@ -28,10 +28,11 @@
#include <abstractview.h> #include <abstractview.h>
#include <nodemetainfo.h> #include <nodemetainfo.h>
#include <qmldesignerplugin.h>
#include <qmlobjectnode.h>
#include <qmlmodelnodeproxy.h>
#include <rewritingexception.h> #include <rewritingexception.h>
#include <qmldesignerplugin.h>
#include <qmlmodelnodeproxy.h>
#include <qmlobjectnode.h>
#include <qmltimeline.h>
#include <coreplugin/messagebox.h> #include <coreplugin/messagebox.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
@@ -310,9 +311,12 @@ void PropertyEditorContextObject::insertKeyframe(const QString &propertyName)
ModelNode selectedNode = rewriterView->selectedModelNodes().constFirst(); ModelNode selectedNode = rewriterView->selectedModelNodes().constFirst();
rewriterView->emitCustomNotification("INSERT_KEYFRAME", QmlTimeline timeline = rewriterView->currentTimeline();
{ selectedNode },
{ propertyName }); QTC_ASSERT(timeline.isValid(), return );
QTC_ASSERT(selectedNode.isValid(), return );
timeline.insertKeyframe(selectedNode, propertyName.toUtf8());
} }
int PropertyEditorContextObject::majorVersion() const int PropertyEditorContextObject::majorVersion() const

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

@@ -423,8 +423,6 @@ void TimelineView::customNotification(const AbstractView * /*view*/,
QmlTimeline timeline = widget()->graphicsScene()->currentTimeline(); QmlTimeline timeline = widget()->graphicsScene()->currentTimeline();
if (timeline.isValid()) if (timeline.isValid())
timeline.modelNode().removeAuxiliaryData("currentFrame@NodeInstance"); timeline.modelNode().removeAuxiliaryData("currentFrame@NodeInstance");
} else if (identifier == "INSERT_KEYFRAME" && !nodeList.isEmpty() && !data.isEmpty()) {
insertKeyframe(nodeList.constFirst(), data.constFirst().toString().toUtf8());
} }
} }