From a272decd7387bb0bef2ff0f9ba9fd6791bb5444e Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Sun, 1 Dec 2019 17:58:16 +0100
Subject: [PATCH] Convert m_alarmIsModal to new settings API

---
 src/settings/settings.h                       |  1 +
 src/settings/settings_controller.h            |  4 ++++
 src/tabcontrollers/UtilitiesTabController.cpp | 20 +++++--------------
 src/tabcontrollers/UtilitiesTabController.h   |  1 -
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/settings/settings.h b/src/settings/settings.h
index 832c0b3..10f47b5 100644
--- a/src/settings/settings.h
+++ b/src/settings/settings.h
@@ -33,6 +33,7 @@ enum class BoolSetting
     AUDIO_micReversePtt,
 
     UTILITY_alarmEnabled,
+    UTILITY_alarmIsModal,
 
     VIDEO_brightnessEnabled,
     VIDEO_isOverlayMethodActive,
diff --git a/src/settings/settings_controller.h b/src/settings/settings_controller.h
index c0c1483..810989c 100644
--- a/src/settings/settings_controller.h
+++ b/src/settings/settings_controller.h
@@ -253,6 +253,10 @@ private:
                           SettingCategory::Utility,
                           QtInfo{ "alarmEnabled" },
                           false },
+        BoolSettingValue{ BoolSetting::UTILITY_alarmIsModal,
+                          SettingCategory::Utility,
+                          QtInfo{ "alarmIsModal" },
+                          true },
 
         BoolSettingValue{ BoolSetting::VIDEO_brightnessEnabled,
                           SettingCategory::Video,
diff --git a/src/tabcontrollers/UtilitiesTabController.cpp b/src/tabcontrollers/UtilitiesTabController.cpp
index 8e05a53..f2ed24d 100644
--- a/src/tabcontrollers/UtilitiesTabController.cpp
+++ b/src/tabcontrollers/UtilitiesTabController.cpp
@@ -14,12 +14,10 @@ void UtilitiesTabController::initStage1()
 {
     auto settings = OverlayController::appSettings();
     settings->beginGroup( "utilitiesSettings" );
-    auto qAlarmIsModal = settings->value( "alarmIsModal", m_alarmIsModal );
     auto qVrcDebug = settings->value( "vrcDebug", m_vrcDebug );
     auto qAlarmHour = settings->value( "alarmHour", 0 );
     auto qAlarmMinute = settings->value( "alarmMinute", 0 );
     settings->endGroup();
-    m_alarmIsModal = qAlarmIsModal.toBool();
     m_vrcDebug = qVrcDebug.toBool();
     m_alarmTime = QTime( qAlarmHour.toInt(), qAlarmMinute.toInt() );
 
@@ -225,7 +223,7 @@ bool UtilitiesTabController::alarmEnabled() const
 
 bool UtilitiesTabController::alarmIsModal() const
 {
-    return m_alarmIsModal;
+    return settings::getSetting( settings::BoolSetting::UTILITY_alarmIsModal );
 }
 
 bool UtilitiesTabController::vrcDebug() const
@@ -258,18 +256,10 @@ void UtilitiesTabController::setAlarmEnabled( bool enabled, bool notify )
 
 void UtilitiesTabController::setAlarmIsModal( bool modal, bool notify )
 {
-    if ( m_alarmIsModal != modal )
+    settings::setSetting( settings::BoolSetting::UTILITY_alarmIsModal, modal );
+    if ( notify )
     {
-        m_alarmIsModal = modal;
-        auto settings = OverlayController::appSettings();
-        settings->beginGroup( "utilitiesSettings" );
-        settings->setValue( "alarmIsModal", m_alarmIsModal );
-        settings->endGroup();
-        settings->sync();
-        if ( notify )
-        {
-            emit alarmIsModalChanged( m_alarmIsModal );
-        }
+        emit alarmIsModalChanged( modal );
     }
 }
 
@@ -473,7 +463,7 @@ void UtilitiesTabController::eventLoopTick()
                                "The alarm at %02i:%02i went off.",
                                alarmTimeHour(),
                                alarmTimeMinute() );
-                if ( m_alarmIsModal )
+                if ( alarmIsModal() )
                 {
                     std::thread messageThread(
                         []( UtilitiesTabController* parent,
diff --git a/src/tabcontrollers/UtilitiesTabController.h b/src/tabcontrollers/UtilitiesTabController.h
index ecb650d..8c09b24 100644
--- a/src/tabcontrollers/UtilitiesTabController.h
+++ b/src/tabcontrollers/UtilitiesTabController.h
@@ -35,7 +35,6 @@ private:
 
     unsigned settingsUpdateCounter = 0;
 
-    bool m_alarmIsModal = true;
     bool m_vrcDebug = false;
     QTime m_alarmTime;
     QTime m_alarmLastCheckTime;