From be6a21d321c74f3d3ca731de0a73372710cc1bbf Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Mon, 2 Dec 2019 14:24:33 +0100
Subject: [PATCH] Convert m_enableChaperoneShowDashboard to new settings API

---
 src/settings/settings.h                       |  1 +
 src/settings/settings_controller.h            |  4 +++
 src/tabcontrollers/ChaperoneTabController.cpp | 27 +++++++++----------
 src/tabcontrollers/ChaperoneTabController.h   |  1 -
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/settings/settings.h b/src/settings/settings.h
index 46046e7..00e03d7 100644
--- a/src/settings/settings.h
+++ b/src/settings/settings.h
@@ -45,6 +45,7 @@ enum class BoolSetting
     CHAPERONE_chaperoneAlarmSoundEnabled,
     CHAPERONE_chaperoneAlarmSoundLooping,
     CHAPERONE_chaperoneAlarmSoundAdjustVolume,
+    CHAPERONE_chaperoneShowDashboardEnabled,
     CHAPERONE_disableChaperone,
     // LAST_ENUMERATOR must always be set to the last value
     LAST_ENUMERATOR = CHAPERONE_disableChaperone,
diff --git a/src/settings/settings_controller.h b/src/settings/settings_controller.h
index 35bb968..d2b4eb6 100644
--- a/src/settings/settings_controller.h
+++ b/src/settings/settings_controller.h
@@ -297,6 +297,10 @@ private:
             SettingCategory::Chaperone,
             QtInfo{ "chaperoneAlarmSoundAdjustVolume" },
             false },
+        BoolSettingValue{ BoolSetting::CHAPERONE_chaperoneShowDashboardEnabled,
+                          SettingCategory::Chaperone,
+                          QtInfo{ "chaperoneShowDashboardEnabled" },
+                          false },
         BoolSettingValue{ BoolSetting::CHAPERONE_disableChaperone,
                           SettingCategory::Chaperone,
                           QtInfo{ "disableChaperone" },
diff --git a/src/tabcontrollers/ChaperoneTabController.cpp b/src/tabcontrollers/ChaperoneTabController.cpp
index 67a7135..c59d1d7 100644
--- a/src/tabcontrollers/ChaperoneTabController.cpp
+++ b/src/tabcontrollers/ChaperoneTabController.cpp
@@ -18,8 +18,6 @@ void ChaperoneTabController::initStage1()
         = settings->value( "chaperoneHapticFeedbackDistance", 0.5f ).toFloat();
     m_chaperoneAlarmSoundDistance
         = settings->value( "chaperoneAlarmSoundDistance", 0.5f ).toFloat();
-    m_enableChaperoneShowDashboard
-        = settings->value( "chaperoneShowDashboardEnabled", false ).toBool();
     m_chaperoneShowDashboardDistance
         = settings->value( "chaperoneShowDashboardDistance", 0.5f ).toFloat();
     m_disableChaperone = settings->value( "disableChaperone", false ).toBool();
@@ -523,7 +521,7 @@ void ChaperoneTabController::handleChaperoneWarnings( float distance )
     }
 
     // Show Dashboard
-    if ( m_enableChaperoneShowDashboard )
+    if ( isChaperoneShowDashboardEnabled() )
     {
         float activationDistance = m_chaperoneShowDashboardDistance;
         if ( distance <= activationDistance && !m_chaperoneShowDashboardActive )
@@ -885,7 +883,8 @@ float ChaperoneTabController::chaperoneAlarmSoundDistance() const
 
 bool ChaperoneTabController::isChaperoneShowDashboardEnabled() const
 {
-    return m_enableChaperoneShowDashboard;
+    return settings::getSetting(
+        settings::BoolSetting::CHAPERONE_chaperoneShowDashboardEnabled );
 }
 
 float ChaperoneTabController::chaperoneShowDashboardDistance() const
@@ -1118,20 +1117,17 @@ void ChaperoneTabController::setChaperoneAlarmSoundDistance( float value,
 void ChaperoneTabController::setChaperoneShowDashboardEnabled( bool value,
                                                                bool notify )
 {
-    if ( m_enableChaperoneShowDashboard != value )
+    if ( isChaperoneShowDashboardEnabled() != value )
     {
-        m_enableChaperoneShowDashboard = value;
         m_chaperoneShowDashboardActive = false;
-        auto settings = OverlayController::appSettings();
-        settings->beginGroup( "chaperoneSettings" );
-        settings->setValue( "chaperoneShowDashboardEnabled",
-                            m_enableChaperoneShowDashboard );
-        settings->endGroup();
-        settings->sync();
+
+        settings::setSetting(
+            settings::BoolSetting::CHAPERONE_chaperoneShowDashboardEnabled,
+            value );
+
         if ( notify )
         {
-            emit chaperoneShowDashboardEnabledChanged(
-                m_enableChaperoneShowDashboard );
+            emit chaperoneShowDashboardEnabledChanged( value );
         }
     }
 }
@@ -1365,7 +1361,8 @@ void ChaperoneTabController::addChaperoneProfile(
         profile->chaperoneAlarmSoundAdjustVolume
             = isChaperoneAlarmSoundAdjustVolume();
         profile->chaperoneAlarmSoundDistance = m_chaperoneAlarmSoundDistance;
-        profile->enableChaperoneShowDashboard = m_enableChaperoneShowDashboard;
+        profile->enableChaperoneShowDashboard
+            = isChaperoneShowDashboardEnabled();
         profile->chaperoneShowDashboardDistance
             = m_chaperoneShowDashboardDistance;
     }
diff --git a/src/tabcontrollers/ChaperoneTabController.h b/src/tabcontrollers/ChaperoneTabController.h
index f1472ac..6b37453 100644
--- a/src/tabcontrollers/ChaperoneTabController.h
+++ b/src/tabcontrollers/ChaperoneTabController.h
@@ -148,7 +148,6 @@ private:
     float m_chaperoneAlarmSoundDistance = 0.5f;
     bool m_chaperoneAlarmSoundActive = false;
 
-    bool m_enableChaperoneShowDashboard = false;
     float m_chaperoneShowDashboardDistance = 0.5f;
     bool m_chaperoneShowDashboardActive = false;