Convert m_vrcDebug to new settings API

This commit is contained in:
Vasily
2019-12-10 08:28:41 +01:00
committed by username223
parent a272decd73
commit 3375ee4b1a
4 changed files with 9 additions and 15 deletions
+1
View File
@@ -34,6 +34,7 @@ enum class BoolSetting
UTILITY_alarmEnabled, UTILITY_alarmEnabled,
UTILITY_alarmIsModal, UTILITY_alarmIsModal,
UTILITY_vrcDebug,
VIDEO_brightnessEnabled, VIDEO_brightnessEnabled,
VIDEO_isOverlayMethodActive, VIDEO_isOverlayMethodActive,
+4
View File
@@ -257,6 +257,10 @@ private:
SettingCategory::Utility, SettingCategory::Utility,
QtInfo{ "alarmIsModal" }, QtInfo{ "alarmIsModal" },
true }, true },
BoolSettingValue{ BoolSetting::UTILITY_vrcDebug,
SettingCategory::Utility,
QtInfo{ "vrcDebug" },
false },
BoolSettingValue{ BoolSetting::VIDEO_brightnessEnabled, BoolSettingValue{ BoolSetting::VIDEO_brightnessEnabled,
SettingCategory::Video, SettingCategory::Video,
+4 -14
View File
@@ -14,11 +14,9 @@ void UtilitiesTabController::initStage1()
{ {
auto settings = OverlayController::appSettings(); auto settings = OverlayController::appSettings();
settings->beginGroup( "utilitiesSettings" ); settings->beginGroup( "utilitiesSettings" );
auto qVrcDebug = settings->value( "vrcDebug", m_vrcDebug );
auto qAlarmHour = settings->value( "alarmHour", 0 ); auto qAlarmHour = settings->value( "alarmHour", 0 );
auto qAlarmMinute = settings->value( "alarmMinute", 0 ); auto qAlarmMinute = settings->value( "alarmMinute", 0 );
settings->endGroup(); settings->endGroup();
m_vrcDebug = qVrcDebug.toBool();
m_alarmTime = QTime( qAlarmHour.toInt(), qAlarmMinute.toInt() ); m_alarmTime = QTime( qAlarmHour.toInt(), qAlarmMinute.toInt() );
m_k_utilitiesSettingsUpdateCounter m_k_utilitiesSettingsUpdateCounter
@@ -228,7 +226,7 @@ bool UtilitiesTabController::alarmIsModal() const
bool UtilitiesTabController::vrcDebug() const bool UtilitiesTabController::vrcDebug() const
{ {
return m_vrcDebug; return settings::getSetting( settings::BoolSetting::UTILITY_vrcDebug );
} }
int UtilitiesTabController::alarmTimeHour() const int UtilitiesTabController::alarmTimeHour() const
@@ -265,18 +263,10 @@ void UtilitiesTabController::setAlarmIsModal( bool modal, bool notify )
void UtilitiesTabController::setVrcDebug( bool value, bool notify ) void UtilitiesTabController::setVrcDebug( bool value, bool notify )
{ {
if ( m_vrcDebug != value ) settings::setSetting( settings::BoolSetting::UTILITY_vrcDebug, value );
if ( notify )
{ {
m_vrcDebug = value; emit vrcDebugChanged( value );
auto settings = OverlayController::appSettings();
settings->beginGroup( "utilitiesSettings" );
settings->setValue( "vrcDebug", m_vrcDebug );
settings->endGroup();
settings->sync();
if ( notify )
{
emit vrcDebugChanged( m_vrcDebug );
}
} }
} }
@@ -35,7 +35,6 @@ private:
unsigned settingsUpdateCounter = 0; unsigned settingsUpdateCounter = 0;
bool m_vrcDebug = false;
QTime m_alarmTime; QTime m_alarmTime;
QTime m_alarmLastCheckTime; QTime m_alarmLastCheckTime;