diff options
author | Knud Dollereder <knud.dollereder@qt.io> | 2019-10-24 17:09:22 +0200 |
---|---|---|
committer | Knud Dollereder <knud.dollereder@qt.io> | 2019-10-31 11:08:58 +0000 |
commit | a4bff368fd05fe609a1f1ec146b73fa8b167b817 (patch) | |
tree | 86d3112252cc1ecf5ad1c1a6720ae4b9c6a8f7bb /src/plugins/qmldesigner/components/timelineeditor | |
parent | 3c3f7afcbcadeb7e42a8a43e74cc14d921140efe (diff) |
Display the current frame in a dedicated control
Enable immediate dragging of the playhead after clicking into the time-scale
Rename "Curve Picker" to "Easing Curve Editor" and "Curve Editor" to
"Animation Curve Editor"
Change-Id: I0085a26d0ea510286586d89c6cddb9bbe720e49e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/components/timelineeditor')
-rw-r--r-- | src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp index 8ad8499d17..a233e19aad 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp @@ -272,7 +272,7 @@ void TimelineToolBar::createLeftControls() auto *curveEditorAction = createAction(TimelineConstants::C_CURVE_EDITOR, TimelineIcons::CURVE_EDITORDIALOG.icon(), - tr("Curve Editor"), + tr("Animation Curve Editor"), QKeySequence(Qt::Key_C)); connect(curveEditorAction, @@ -396,10 +396,10 @@ void TimelineToolBar::createCenterControls() auto *curvePicker = createAction(TimelineConstants::C_CURVE_PICKER, TimelineIcons::CURVE_EDITOR.icon(), - tr("Curve Picker"), + tr("Easing Curve Editor"), QKeySequence(Qt::Key_C)); - curvePicker->setObjectName("Curve Picker"); + curvePicker->setObjectName("Easing Curve Editor"); connect(curvePicker, &QAction::triggered, this, &TimelineToolBar::openEasingCurveEditor); addAction(curvePicker); |