1 files changed, 31 insertions, 10 deletions
diff --git a/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp b/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp
index bde1da0c..3fe5f377 100644
--- a/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp
+++ b/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp
@@ -84,6 +84,7 @@ static QColor s_timelineFilterButtonSelectedColor;
 static QColor s_timelineFilterButtonHoveredColor;
 static QColor s_timelineRowCommentBgColor;
 static QColor s_timelinePressedKeyframeColor; // pressed keyframe from multiple selection
+static QColor s_timelineActionColor;
 static QColor s_invalidDataIndicatorColor;
 
 static int s_fontSize;
@@ -158,6 +159,7 @@ void CStudioPreferences::loadPreferences()
     s_timelineRowSubpDescendantColor = QColor("#a263ff");
     s_timelineRowCommentBgColor = QColor("#d0000000");
     s_timelinePressedKeyframeColor = QColor("#ffff00");
+    s_timelineActionColor = QColor("#f4be04");
 
     s_invalidDataIndicatorColor = QColor("#ff2121");
 
@@ -230,16 +232,6 @@ void CStudioPreferences::resetWindowState(int version)
 
 // Viewing settings
 //
-bool CStudioPreferences::isLegacyViewerActive()
-{
-    return s_preferences.value(QStringLiteral("Viewing/LegacyViewerActive"), false).toBool();
-}
-
-void CStudioPreferences::setLegacyViewerActive(bool inActive)
-{
-    s_preferences.setValue(QStringLiteral("Viewing/LegacyViewerActive"), inActive);
-}
-
 bool CStudioPreferences::isEditViewFillMode()
 {
     return s_preferences.value(QStringLiteral("Viewing/EditViewFillMode"), true).toBool();
@@ -460,6 +452,16 @@ void CStudioPreferences::setHelperGridOn(bool showGrid)
     s_preferences.setValue(QStringLiteral("VisualAids/ShowHelperGrid"), showGrid);
 }
 
+bool CStudioPreferences::isAxisHelperOn()
+{
+    return s_preferences.value(QStringLiteral("VisualAids/ShowAxisHelper"), true).toBool();
+}
+
+void CStudioPreferences::setAxisHelperOn(bool showAxisHelper)
+{
+    s_preferences.setValue(QStringLiteral("VisualAids/ShowAxisHelper"), showAxisHelper);
+}
+
 int CStudioPreferences::helperGridLines()
 {
     return s_preferences.value(QStringLiteral("VisualAids/HelperGridLines"), 10).toInt();
@@ -594,6 +596,20 @@ void CStudioPreferences::setRecentItem(int index, const QString &path)
 }
 
 //
+// Pop-up warning settings
+//
+void CStudioPreferences::setDoNotShowImportWarnings(bool inDoNotShowImportWarnings)
+{
+    s_preferences.setValue(QStringLiteral("PopUps/DoNotShowImportWarnings"),
+                           inDoNotShowImportWarnings);
+}
+
+bool CStudioPreferences::doNotShowImportWarnings()
+{
+    return s_preferences.value(QStringLiteral("PopUps/DoNotShowImportWarnings")).toBool();
+}
+
+//
 // Other settings
 //
 void CStudioPreferences::setQmlContextProperties(QQmlContext *qml)
@@ -912,6 +928,11 @@ QColor CStudioPreferences::timelinePressedKeyframeColor()
     return s_timelinePressedKeyframeColor;
 }
 
+QColor CStudioPreferences::timelineActionColor()
+{
+    return s_timelineActionColor;
+}
+
 QColor CStudioPreferences::invalidDataIndicatorColor()
 {
     return s_invalidDataIndicatorColor;