diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2019-03-06 17:11:59 +0100 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2019-03-07 07:43:22 +0000 |
| commit | 016eb4872f469ec25b144a9fb83b76650d56eabc (patch) | |
| tree | 0c5b5b2f7b3d84828828d92a4744f2a8866f730e /src/plugins/qmldesigner/settingspage.cpp | |
| parent | 1f3f15f01df64bea5b1e0217ebea456e9c84d311 (diff) | |
QmlDesigner: Add a setting to enable the QtQuick.Timeline editor
A setting with a checkbox is better than an environment variable. This
patch therefore also reverts
41d19e99e04de6115887e68cb9109461774e17ba
Change-Id: I35cd7134c538c64679771a44291399f6b537f2ba
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/settingspage.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/settingspage.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp index e9bd2d1cb46..a7d6bc2bb09 100644 --- a/src/plugins/qmldesigner/settingspage.cpp +++ b/src/plugins/qmldesigner/settingspage.cpp @@ -159,6 +159,8 @@ DesignerSettings SettingsPageWidget::settings() const m_ui.showPropertyEditorWarningsCheckBox->isChecked()); settings.insert(DesignerSettingsKey::ENABLE_MODEL_EXCEPTION_OUTPUT, m_ui.showWarnExceptionsCheckBox->isChecked()); + settings.insert(DesignerSettingsKey::ENABLE_TIMELINEVIEW, + m_ui.featureTimelineEditorCheckBox->isChecked()); return settings; } @@ -224,9 +226,13 @@ void SettingsPageWidget::setSettings(const DesignerSettings &settings) m_ui.controls2StyleComboBox->setCurrentText(m_ui.styleLineEdit->text()); + m_ui.featureTimelineEditorCheckBox->setChecked(settings.value( + DesignerSettingsKey::ENABLE_TIMELINEVIEW).toBool()); + if (settings.value(DesignerSettingsKey::STANDALONE_MODE).toBool()) { m_ui.emulationGroupBox->hide(); m_ui.debugGroupBox->hide(); + m_ui.featuresGroupBox->hide(); } } @@ -262,7 +268,8 @@ void SettingsPage::apply() << DesignerSettingsKey::PUPPET_KILL_TIMEOUT << DesignerSettingsKey::FORWARD_PUPPET_OUTPUT << DesignerSettingsKey::DEBUG_PUPPET - << DesignerSettingsKey::ENABLE_MODEL_EXCEPTION_OUTPUT; + << DesignerSettingsKey::ENABLE_MODEL_EXCEPTION_OUTPUT + << DesignerSettingsKey::ENABLE_TIMELINEVIEW; foreach (const QByteArray &key, restartNecessaryKeys) { if (currentSettings.value(key) != newSettings.value(key)) { |