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

---
 src/settings/settings.h                       |  2 ++
 src/settings/settings_controller.h            |  5 ++++
 src/tabcontrollers/UtilitiesTabController.cpp | 26 +++++++------------
 src/tabcontrollers/UtilitiesTabController.h   |  1 -
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/settings/settings.h b/src/settings/settings.h
index bd12c9d..832c0b3 100644
--- a/src/settings/settings.h
+++ b/src/settings/settings.h
@@ -32,6 +32,8 @@ enum class BoolSetting
     AUDIO_micProximitySensorCanMute,
     AUDIO_micReversePtt,
 
+    UTILITY_alarmEnabled,
+
     VIDEO_brightnessEnabled,
     VIDEO_isOverlayMethodActive,
     VIDEO_colorOverlayEnabled,
diff --git a/src/settings/settings_controller.h b/src/settings/settings_controller.h
index 4bf2c49..c0c1483 100644
--- a/src/settings/settings_controller.h
+++ b/src/settings/settings_controller.h
@@ -249,6 +249,11 @@ private:
                           QtInfo{ "micReversePtt" },
                           false },
 
+        BoolSettingValue{ BoolSetting::UTILITY_alarmEnabled,
+                          SettingCategory::Utility,
+                          QtInfo{ "alarmEnabled" },
+                          false },
+
         BoolSettingValue{ BoolSetting::VIDEO_brightnessEnabled,
                           SettingCategory::Video,
                           QtInfo{ "brightnessEnabled" },
diff --git a/src/tabcontrollers/UtilitiesTabController.cpp b/src/tabcontrollers/UtilitiesTabController.cpp
index ef47e04..8e05a53 100644
--- a/src/tabcontrollers/UtilitiesTabController.cpp
+++ b/src/tabcontrollers/UtilitiesTabController.cpp
@@ -3,6 +3,7 @@
 #include <QApplication>
 #include "../overlaycontroller.h"
 #include "../keyboard_input/input_sender.h"
+#include "../settings/settings.h"
 #include <chrono>
 #include <thread>
 
@@ -13,13 +14,11 @@ void UtilitiesTabController::initStage1()
 {
     auto settings = OverlayController::appSettings();
     settings->beginGroup( "utilitiesSettings" );
-    auto qAlarmEnabled = settings->value( "alarmEnabled", m_alarmEnabled );
     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_alarmEnabled = qAlarmEnabled.toBool();
     m_alarmIsModal = qAlarmIsModal.toBool();
     m_vrcDebug = qVrcDebug.toBool();
     m_alarmTime = QTime( qAlarmHour.toInt(), qAlarmMinute.toInt() );
@@ -221,7 +220,7 @@ void UtilitiesTabController::sendKeyboardThree()
 
 bool UtilitiesTabController::alarmEnabled() const
 {
-    return m_alarmEnabled;
+    return settings::getSetting( settings::BoolSetting::UTILITY_alarmEnabled );
 }
 
 bool UtilitiesTabController::alarmIsModal() const
@@ -246,19 +245,14 @@ int UtilitiesTabController::alarmTimeMinute() const
 
 void UtilitiesTabController::setAlarmEnabled( bool enabled, bool notify )
 {
-    if ( m_alarmEnabled != enabled )
+    settings::setSetting( settings::BoolSetting::UTILITY_alarmEnabled,
+                          enabled );
+
+    m_alarmLastCheckTime = QTime();
+
+    if ( notify )
     {
-        m_alarmEnabled = enabled;
-        auto settings = OverlayController::appSettings();
-        settings->beginGroup( "utilitiesSettings" );
-        settings->setValue( "alarmEnabled", m_alarmEnabled );
-        settings->endGroup();
-        settings->sync();
-        m_alarmLastCheckTime = QTime();
-        if ( notify )
-        {
-            emit alarmEnabledChanged( m_alarmEnabled );
-        }
+        emit alarmEnabledChanged( enabled );
     }
 }
 
@@ -466,7 +460,7 @@ void UtilitiesTabController::eventLoopTick()
 {
     if ( settingsUpdateCounter >= m_k_utilitiesSettingsUpdateCounter )
     {
-        if ( m_alarmEnabled && m_alarmTime.isValid() )
+        if ( alarmEnabled() && m_alarmTime.isValid() )
         {
             auto now = QTime::currentTime();
             if ( m_alarmLastCheckTime.isValid()
diff --git a/src/tabcontrollers/UtilitiesTabController.h b/src/tabcontrollers/UtilitiesTabController.h
index 563551f..ecb650d 100644
--- a/src/tabcontrollers/UtilitiesTabController.h
+++ b/src/tabcontrollers/UtilitiesTabController.h
@@ -35,7 +35,6 @@ private:
 
     unsigned settingsUpdateCounter = 0;
 
-    bool m_alarmEnabled = false;
     bool m_alarmIsModal = true;
     bool m_vrcDebug = false;
     QTime m_alarmTime;