diff --git a/src/plugins/qmldesigner/components/easingpane/easingcontextpane.cpp b/src/plugins/qmldesigner/components/easingpane/easingcontextpane.cpp index 8022131530f46a5c0bb79d363697e018451d9325..ff33ef5c9c508a4233e57692fb599840c4b19cfe 100644 --- a/src/plugins/qmldesigner/components/easingpane/easingcontextpane.cpp +++ b/src/plugins/qmldesigner/components/easingpane/easingcontextpane.cpp @@ -94,7 +94,6 @@ EasingContextPane::EasingContextPane(QWidget *parent) : ui->setupUi(this); m_simulation = new EasingSimulation(this,ui->graphicsView); -// ui->graphicsView->setScene(m_simulation->scene()); m_easingGraph = new EasingGraph(this); m_easingGraph->raise(); @@ -196,13 +195,11 @@ void EasingContextPane::setGraphDisplayMode(GraphDisplayMode newMode) m_displayMode = newMode; switch (newMode) { case GraphMode: { -// ui->graphSelectButton->setIcon(QIcon(":/simulicon.png")); m_simulation->hide(); m_easingGraph->show(); break; } case SimulationMode: { -// ui->graphSelectButton->setIcon(QIcon(":/graphicon.png")); m_simulation->show(); m_easingGraph->hide(); break; @@ -236,15 +233,6 @@ void EasingContextPane::setOthers() ui->overshootSpinBox->setEnabled(false); ui->overshootSpinBox->setEnabled(false); ui->periodSpinBox->setEnabled(false); - -// ui->durationSpinBox->setSuffix(" ms"); -// ui->durationSpinBox->setGeometry(0,65,90,23); -// ui->easingExtremesComboBox->setGeometry(90,64,75,25); -// ui->easingShapeComboBox->setGeometry(165,64,115,25); -// ui->easingExtremesComboBox->show(); -// ui->amplitudeSpinBox->hide(); -// ui->periodSpinBox->hide(); -// ui->overshootSpinBox->hide(); } void EasingContextPane::setLinear() @@ -307,7 +295,7 @@ void QmlDesigner::EasingContextPane::on_easingShapeComboBox_currentIndexChanged( m_easingGraph->setPeriod(ui->periodSpinBox->value()); m_easingGraph->setOvershoot(ui->overshootSpinBox->value()); m_simulation->updateCurve(m_easingGraph->easingCurve(),ui->durationSpinBox->value()); - emit propertyChanged(QLatin1String("easing.type"), QVariant(QLatin1String("Easing.")+m_easingGraph->easingName())); + emit propertyChanged(QLatin1String("easing.type"), QVariant("\""+m_easingGraph->easingName()+"\"")); } } @@ -319,7 +307,7 @@ void QmlDesigner::EasingContextPane::on_easingExtremesComboBox_currentIndexChang m_easingGraph->setPeriod(ui->periodSpinBox->value()); m_easingGraph->setOvershoot(ui->overshootSpinBox->value()); m_simulation->updateCurve(m_easingGraph->easingCurve(),ui->durationSpinBox->value()); - emit propertyChanged(QLatin1String("easing.type"), QVariant(QLatin1String("Easing.")+m_easingGraph->easingName())); + emit propertyChanged(QLatin1String("easing.type"), QVariant("\""+m_easingGraph->easingName()+"\"")); } } diff --git a/src/plugins/qmldesigner/components/easingpane/easingcontextpane.ui b/src/plugins/qmldesigner/components/easingpane/easingcontextpane.ui index d1912109b2f1f0b7c17053f873e2cd610021eed2..96e3668cb4a88299eb58a8ca59ca4fbcd67d50db 100644 --- a/src/plugins/qmldesigner/components/easingpane/easingcontextpane.ui +++ b/src/plugins/qmldesigner/components/easingpane/easingcontextpane.ui @@ -212,6 +212,9 @@ <property name="specialValueText"> <string>INVALID</string> </property> + <property name="keyboardTracking"> + <bool>false</bool> + </property> <property name="suffix"> <string> ms</string> </property> @@ -253,6 +256,9 @@ <property name="specialValueText"> <string>INVALID</string> </property> + <property name="keyboardTracking"> + <bool>false</bool> + </property> <property name="decimals"> <number>3</number> </property> @@ -291,6 +297,9 @@ <property name="specialValueText"> <string>INVALID</string> </property> + <property name="keyboardTracking"> + <bool>false</bool> + </property> <property name="decimals"> <number>3</number> </property> @@ -329,6 +338,9 @@ <property name="specialValueText"> <string>INVALID</string> </property> + <property name="keyboardTracking"> + <bool>false</bool> + </property> <property name="decimals"> <number>3</number> </property>