summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Client/Code/Core
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2019-03-21 12:43:03 +0200
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2019-03-26 11:31:55 +0000
commitcc2c27f625c2c7f6c0f4a0951833ddd9a7bb9d76 (patch)
tree63464206015ca489caa332ffb3784fae8ee78726 /src/Authoring/Client/Code/Core
parentff0dba0dbfde3b9f34db4d89a7f94a531bbe547d (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/Client/Code/Core')
-rw-r--r--src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp20
-rw-r--r--src/Authoring/Client/Code/Core/Utility/StudioPreferences.h3
2 files changed, 23 insertions, 0 deletions
diff --git a/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp b/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp
index 2096bb1d..d9ed32c4 100644
--- a/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp
@@ -205,6 +205,26 @@ void CStudioPreferences::savePreferences()
//==============================================================================
/**
+ * Returns the state of the legacy viewer
+ * @return true if the legacy viewer is active
+ */
+bool CStudioPreferences::IsLegacyViewerActive()
+{
+ return m_preferences->GetValue("LegacyViewerActive", true);
+}
+
+//==============================================================================
+/**
+ * Sets the state of the legacy viewer
+ * @param inActiveFlag true if the legacy viewer is active
+ */
+void CStudioPreferences::SetLegacyViewerActive(bool inActive)
+{
+ m_preferences->SetValue("LegacyViewerActive", inActive);
+}
+
+//==============================================================================
+/**
* Returns the state of the timeline snapping grid
* @return true if the snapping grid is active
*/
diff --git a/src/Authoring/Client/Code/Core/Utility/StudioPreferences.h b/src/Authoring/Client/Code/Core/Utility/StudioPreferences.h
index 4ef185ed..99e2d02f 100644
--- a/src/Authoring/Client/Code/Core/Utility/StudioPreferences.h
+++ b/src/Authoring/Client/Code/Core/Utility/StudioPreferences.h
@@ -53,6 +53,9 @@ public:
static bool IsTimelineSnappingGridActive();
static void SetTimelineSnappingGridActive(bool inActive);
+ static bool IsLegacyViewerActive();
+ static void SetLegacyViewerActive(bool inActive);
+
static ESnapGridResolution GetTimelineSnappingGridResolution();
static void SetTimelineSnappingGridResolution(ESnapGridResolution inResolution);