diff options
| author | Marianne Yrjänä <marianne.yrjana@qt.io> | 2018-05-11 13:53:24 +0300 |
|---|---|---|
| committer | Marianne Yrjänä <marianne.yrjana@qt.io> | 2018-05-14 06:33:10 +0000 |
| commit | 21afa8306e681836f63377fc07d51637a90358c6 (patch) | |
| tree | bbaca8b1adc6932f71a51af5a488f324bc5bc944 /src/Authoring/Studio/UI | |
| parent | 40cc2fef118219f2ea57faa3265b4771f419c4cf (diff) | |
Make runtime2 viewer as default viewer
Make runtime2 viewer as default and hide runtime1 preview option.
Runtime1 viewer can still be enabled from studio preferences.
Task-number: QT3DS-1583
Change-Id: I70bc8403ad9db776c609d251846da6f9b8fc4485
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/UI')
| -rw-r--r-- | src/Authoring/Studio/UI/StudioAppPrefsPage.cpp | 9 | ||||
| -rw-r--r-- | src/Authoring/Studio/UI/StudioAppPrefsPage.ui | 7 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/Authoring/Studio/UI/StudioAppPrefsPage.cpp b/src/Authoring/Studio/UI/StudioAppPrefsPage.cpp index 5eb859e4..4e3cab0e 100644 --- a/src/Authoring/Studio/UI/StudioAppPrefsPage.cpp +++ b/src/Authoring/Studio/UI/StudioAppPrefsPage.cpp @@ -90,6 +90,7 @@ void CStudioAppPrefsPage::onInitDialog() // Add tool tips for controls m_ui->m_DefaultInterpolation->setToolTip(tr("Set default keyframe interpolation type")); m_ui->m_checkTimelineAbsoluteSnapping->setToolTip(tr("Enable timeline snapping grid")); + m_ui->m_checkLegacyViewer->setToolTip(tr("Enable legacy viewer preview")); m_ui->m_SnapRangeCombo->setToolTip(tr("Set resolution of timeline snapping grid")); m_ui->m_buttonRestoreDefaults->setToolTip(tr("Click to restore default Studio settings")); m_ui->m_EditViewBGColor->setAutoFillBackground(true); @@ -119,6 +120,8 @@ void CStudioAppPrefsPage::onInitDialog() connect(m_ui->m_SnapRangeCombo, activated, this, [=](){ setModified(true); }); connect(m_ui->m_checkTimelineAbsoluteSnapping, &QCheckBox::clicked, this, [=](){ setModified(true); enableOptions(); }); + connect(m_ui->m_checkLegacyViewer, &QCheckBox::clicked, + this, [=](){ setModified(true); m_restartNeeded = true; }); connect(m_ui->m_EditViewBGColor, &QPushButton::clicked, this, &CStudioAppPrefsPage::onBgColorButtonClicked); connect(m_ui->m_EditViewStartupView, activated, this, [=](){ setModified(true); }); @@ -164,6 +167,9 @@ void CStudioAppPrefsPage::loadSettings() m_ui->m_checkTimelineAbsoluteSnapping->setChecked( CStudioPreferences::IsTimelineSnappingGridActive()); + // Legacy viewer + m_ui->m_checkLegacyViewer->setChecked(CStudioPreferences::IsLegacyViewerActive()); + // Tool handles m_ui->selectorWidth->setValue(CStudioPreferences::getSelectorLineWidth()); m_ui->selectorLength->setValue(CStudioPreferences::getSelectorLineLength()); @@ -217,6 +223,9 @@ void CStudioAppPrefsPage::saveSettings() long theCurrentSelection = m_ui->m_SnapRangeCombo->currentIndex(); CStudioPreferences::SetTimelineSnappingGridResolution((ESnapGridResolution)theCurrentSelection); + // Legacy viewer + CStudioPreferences::SetLegacyViewerActive(m_ui->m_checkLegacyViewer->isChecked()); + // Edit View Background Color CStudioPreferences::SetEditViewBackgroundColor(m_bgColor); diff --git a/src/Authoring/Studio/UI/StudioAppPrefsPage.ui b/src/Authoring/Studio/UI/StudioAppPrefsPage.ui index 6d24979d..30ca4487 100644 --- a/src/Authoring/Studio/UI/StudioAppPrefsPage.ui +++ b/src/Authoring/Studio/UI/StudioAppPrefsPage.ui @@ -43,6 +43,13 @@ </property> </widget> </item> + <item row="2" column="0"> + <widget class="QCheckBox" name="m_checkLegacyViewer"> + <property name="text"> + <string>Legacy Viewer</string> + </property> + </widget> + </item> </layout> </widget> </item> |