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

QmlDesigner: Rename activateTimeline() to setCurrentTimeline()

Browse Source 
Change-Id: Ie6932e79eb99b318629557b9f419ae2da1500833
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-21 17:08:36 +02:00
parent 0f2af19780
commit 11dcdb74ef
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -378,7 +378,7 @@ void TimelineView::addNewTimelineDialog()
{ {
auto timeline = addNewTimeline(); auto timeline = addNewTimeline();
addAnimation(timeline); addAnimation(timeline);
activateTimeline(timeline); setCurrentTimeline(timeline);
openSettingsDialog(); openSettingsDialog();
} }
@@ -411,7 +411,7 @@ void TimelineView::setTimelineRecording(bool value)
activateTimelineRecording(node); activateTimelineRecording(node);
} else { } else {
deactivateTimelineRecording(); deactivateTimelineRecording();
activateTimeline(node); setCurrentTimeline(node);
} }
} }

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

@@ -391,7 +391,7 @@ void TimelineWidget::setTimelineRecording(bool value)
timelineView()->activateTimelineRecording(node); timelineView()->activateTimelineRecording(node);
} else { } else {
timelineView()->deactivateTimelineRecording(); timelineView()->deactivateTimelineRecording();
timelineView()->activateTimeline(node); timelineView()->setCurrentTimeline(node);
} }
graphicsScene()->invalidateRecordButtonsStatus(); graphicsScene()->invalidateRecordButtonsStatus();

2
src/plugins/qmldesigner/designercore/include/abstractview.h
View File

@@ -280,7 +280,7 @@ public:
virtual void contextHelp(const Core::IContext::HelpCallback &callback) const; virtual void contextHelp(const Core::IContext::HelpCallback &callback) const;
void activateTimeline(const ModelNode &timeline); void setCurrentTimeline(const ModelNode &timeline);
void activateTimelineRecording(const ModelNode &timeline); void activateTimelineRecording(const ModelNode &timeline);
void deactivateTimelineRecording(); void deactivateTimelineRecording();

2
src/plugins/qmldesigner/designercore/model/abstractview.cpp
View File

@@ -639,7 +639,7 @@ void AbstractView::contextHelp(const Core::IContext::HelpCallback &callback) con
#endif #endif
} }
void AbstractView::activateTimeline(const ModelNode &timeline) void AbstractView::setCurrentTimeline(const ModelNode &timeline)
{ {
if (currentTimeline().isValid()) if (currentTimeline().isValid())
currentTimeline().toogleRecording(false); currentTimeline().toogleRecording(false);