diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineform.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineform.cpp index eb63ad48838..db9e8a8ef64 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelineform.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelineform.cpp @@ -47,8 +47,6 @@ TimelineForm::TimelineForm(QWidget *parent) { ui->setupUi(this); - ui->duration->setVisible(false); - connect(ui->expressionBindingLineEdit, &QLineEdit::editingFinished, [this]() { QTC_ASSERT(m_timeline.isValid(), return ); @@ -135,13 +133,10 @@ void TimelineForm::setTimeline(const QmlTimeline &timeline) if (m_timeline.isValid()) { ui->idLineEdit->setText(m_timeline.modelNode().displayName()); - ui->duration->setValue(qRound(m_timeline.duration())); ui->startFrame->setValue( m_timeline.modelNode().variantProperty("startFrame").value().toInt()); ui->endFrame->setValue(m_timeline.modelNode().variantProperty("endFrame").value().toInt()); - ui->duration->setValue(qRound(m_timeline.duration())); - if (m_timeline.modelNode().hasBindingProperty("currentFrame")) { ui->expressionBindingLineEdit->setText( m_timeline.modelNode().bindingProperty("currentFrame").expression()); @@ -173,7 +168,6 @@ void TimelineForm::setProperty(const PropertyName &propertyName, const QVariant } catch (const Exception &e) { e.showException(); } - ui->duration->setValue(qRound(m_timeline.duration())); } void TimelineForm::connectSpinBox(QSpinBox *spinBox, const PropertyName &propertyName) diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineform.ui b/src/plugins/qmldesigner/components/timelineeditor/timelineform.ui index d962608b11e..370a6f8154c 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelineform.ui +++ b/src/plugins/qmldesigner/components/timelineeditor/timelineform.ui @@ -11,7 +11,23 @@ - + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 49 + 20 + + + + + Qt::Horizontal @@ -24,25 +40,23 @@ - - - - - 80 - 0 - + + + + End frame: - - - 80 - 16777215 - + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - -100000 + + + + + + Start frame: - - 100000 + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -68,129 +82,6 @@ - - - - Duration - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Expression binding: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Qt::Horizontal - - - - 49 - 20 - - - - - - - - End frame: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - false - - - Animation - - - true - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 49 - 20 - - - - - - - - true - - - - 240 - 0 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 49 - 20 - - - - - - - - - 80 - 0 - - - - - 80 - 16777215 - - - - true - - - 200000 - - - @@ -201,13 +92,6 @@ - - - - - - - @@ -237,16 +121,100 @@ - - + + + + false + - Start frame: + Animation + + + true + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 49 + 20 + + + + + + + + Expression binding: Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + 80 + 0 + + + + + 80 + 16777215 + + + + -100000 + + + 100000 + + + + + + + + + + + + + + true + + + + 240 + 0 + + + + + + + + Qt::Horizontal + + + + 49 + 20 + + + +