diff options
author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2019-03-21 12:43:03 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2019-03-26 11:31:55 +0000 |
commit | cc2c27f625c2c7f6c0f4a0951833ddd9a7bb9d76 (patch) | |
tree | 63464206015ca489caa332ffb3784fae8ee78726 /src/Authoring/Studio/MainFrm.cpp | |
parent | ff0dba0dbfde3b9f34db4d89a7f94a531bbe547d (diff) |
Revert "Remove legacy viewer"
This reverts commit 4193fc4f00c2e687ca82de589603c7fa133bff50.
Also made the legacy viewer button show up by default.
The viewer doesn't currently show materials correctly, that will be
fixed in a separate patch.
Task-number: QT3DS-3198
Change-Id: I079eb31d9240abde496d91edc9f5611c3fbbe6a7
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/MainFrm.cpp')
-rw-r--r-- | src/Authoring/Studio/MainFrm.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/Authoring/Studio/MainFrm.cpp b/src/Authoring/Studio/MainFrm.cpp index 6cd7b681..da2a5fca 100644 --- a/src/Authoring/Studio/MainFrm.cpp +++ b/src/Authoring/Studio/MainFrm.cpp @@ -210,6 +210,16 @@ CMainFrame::CMainFrame() connect(m_ui->actionRemote_Preview, &QAction::triggered, this, &CMainFrame::OnPlaybackPreviewRemote); + // Only show runtime1 preview if we have appropriate viewer and it's enabled + if (CStudioPreferences::IsLegacyViewerActive() + && QFileInfo(CPreviewHelper::getViewerFilePath(QStringLiteral("Qt3DViewer"))).exists()) { + connect(m_ui->actionPreviewRuntime1, &QAction::triggered, + this, &CMainFrame::OnPlaybackPreviewRuntime1); + m_ui->actionPreviewRuntime1->setVisible(true); + } else { + m_ui->actionPreviewRuntime1->setVisible(false); + } + // Tool mode toolbar connect(m_ui->actionPosition_Tool, &QAction::triggered, this, std::bind(&CMainFrame::onTransformToolChanged, this, STUDIO_TOOLMODE_MOVE)); @@ -839,6 +849,7 @@ void CMainFrame::EditPreferences(short inPageIndex) CStudioPreferences::SetBigTimeAdvanceAmount(CStudioPreferences::DEFAULT_BIG_TIME_ADVANCE); CStudioPreferences::SetTimelineSnappingGridActive(true); CStudioPreferences::SetTimelineSnappingGridResolution(SNAPGRID_SECONDS); + CStudioPreferences::SetLegacyViewerActive(true); CStudioPreferences::SetEditViewFillMode(true); CStudioPreferences::SetPreferredStartupView( CStudioPreferences::PREFERREDSTARTUP_DEFAULTINDEX); |