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

QmlDesigner: Remove duration from TimelineForm

Browse Source 
The timeline has an end and start. There was an invisble
spinbox for duration that I removed.

Change-Id: I5ab8c888db650f97dbb3dac08b5b202fa681d291
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2020-02-13 13:38:27 +01:00
parent 0ffc029d70
commit 9af4b8694f
2 changed files with 118 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/components/timelineeditor/timelineform.cpp
View File

@@ -47,8 +47,6 @@ TimelineForm::TimelineForm(QWidget *parent)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->duration->setVisible(false);
connect(ui->expressionBindingLineEdit, &QLineEdit::editingFinished, [this]() { connect(ui->expressionBindingLineEdit, &QLineEdit::editingFinished, [this]() {
QTC_ASSERT(m_timeline.isValid(), return ); QTC_ASSERT(m_timeline.isValid(), return );
@@ -135,13 +133,10 @@ void TimelineForm::setTimeline(const QmlTimeline &timeline)
if (m_timeline.isValid()) { if (m_timeline.isValid()) {
ui->idLineEdit->setText(m_timeline.modelNode().displayName()); ui->idLineEdit->setText(m_timeline.modelNode().displayName());
ui->duration->setValue(qRound(m_timeline.duration()));
ui->startFrame->setValue( ui->startFrame->setValue(
m_timeline.modelNode().variantProperty("startFrame").value().toInt()); m_timeline.modelNode().variantProperty("startFrame").value().toInt());
ui->endFrame->setValue(m_timeline.modelNode().variantProperty("endFrame").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")) { if (m_timeline.modelNode().hasBindingProperty("currentFrame")) {
ui->expressionBindingLineEdit->setText( ui->expressionBindingLineEdit->setText(
m_timeline.modelNode().bindingProperty("currentFrame").expression()); m_timeline.modelNode().bindingProperty("currentFrame").expression());
@@ -173,7 +168,6 @@ void TimelineForm::setProperty(const PropertyName &propertyName, const QVariant
} catch (const Exception &e) { } catch (const Exception &e) {
e.showException(); e.showException();
} }
ui->duration->setValue(qRound(m_timeline.duration()));
} }
void TimelineForm::connectSpinBox(QSpinBox *spinBox, const PropertyName &propertyName) void TimelineForm::connectSpinBox(QSpinBox *spinBox, const PropertyName &propertyName)

268
src/plugins/qmldesigner/components/timelineeditor/timelineform.ui
View File

@@ -11,7 +11,23 @@
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="1" column="8" colspan="2"> <item row="3" column="6" colspan="2">
<spacer name="horizontalSpacer_12">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>49</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="6" colspan="2">
<spacer name="horizontalSpacer_11"> <spacer name="horizontalSpacer_11">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@@ -24,25 +40,23 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="2" column="5"> <item row="2" column="4">
<widget class="QSpinBox" name="endFrame"> <widget class="QLabel" name="label_7">
<property name="minimumSize"> <property name="text">
<size> <string>End frame:</string>
<width>80</width>
<height>0</height>
</size>
</property> </property>
<property name="maximumSize"> <property name="alignment">
<size> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<width>80</width>
<height>16777215</height>
</size>
</property> </property>
<property name="minimum"> </widget>
<number>-100000</number> </item>
<item row="2" column="1">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Start frame:</string>
</property> </property>
<property name="maximum"> <property name="alignment">
<number>100000</number> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
@@ -68,129 +82,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="6">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Duration</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Expression binding:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="8" colspan="2">
<spacer name="horizontalSpacer_10">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>49</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="4">
<widget class="QLabel" name="label_7">
<property name="text">
<string>End frame:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="3" column="3" colspan="2">
<widget class="QRadioButton" name="animation">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Animation</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="8" colspan="2">
<spacer name="horizontalSpacer_12">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>49</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="4" column="1" colspan="5">
<widget class="QLineEdit" name="expressionBindingLineEdit">
<property name="enabled">
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
<width>240</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="4" column="8" colspan="2">
<spacer name="horizontalSpacer_9">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>49</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="7">
<widget class="QSpinBox" name="duration">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>80</width>
<height>16777215</height>
</size>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
<property name="maximum">
<number>200000</number>
</property>
</widget>
</item>
<item row="3" column="1" colspan="2"> <item row="3" column="1" colspan="2">
<widget class="QRadioButton" name="expressionBinding"> <widget class="QRadioButton" name="expressionBinding">
<property name="enabled"> <property name="enabled">
@@ -201,13 +92,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" colspan="5">
<widget class="QLineEdit" name="idLineEdit">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
@@ -237,16 +121,100 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="3" column="3" colspan="2">
<widget class="QLabel" name="label_6"> <widget class="QRadioButton" name="animation">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text"> <property name="text">
<string>Start frame:</string> <string>Animation</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="6" colspan="2">
<spacer name="horizontalSpacer_9">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>49</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Expression binding:</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="5">
<widget class="QSpinBox" name="endFrame">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>80</width>
<height>16777215</height>
</size>
</property>
<property name="minimum">
<number>-100000</number>
</property>
<property name="maximum">
<number>100000</number>
</property>
</widget>
</item>
<item row="1" column="1" colspan="5">
<widget class="QLineEdit" name="idLineEdit">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="4" column="1" colspan="5">
<widget class="QLineEdit" name="expressionBindingLineEdit">
<property name="enabled">
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
<width>240</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="2" column="6" colspan="2">
<spacer name="horizontalSpacer_10">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>49</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>