Convert m_brightnessEnabled to new settings API

This commit is contained in:
Vasily
2019-12-10 08:28:41 +01:00
committed by username223
parent 39ec5267f6
commit 287a6139be
2 changed files with 9 additions and 10 deletions
+9 -8
View File
@@ -222,8 +222,7 @@ void VideoTabController::reloadVideoConfig()
{
auto settings = OverlayController::appSettings();
settings->beginGroup( getSettingsName() );
setBrightnessEnabled(
settings->value( "brightnessEnabled", false ).toBool(), true );
setBrightnessEnabled( brightnessEnabled(), true );
setColorOverlayEnabled(
settings->value( "colorOverlayEnabled", false ).toBool(), true );
setIsOverlayMethodActive(
@@ -242,7 +241,6 @@ void VideoTabController::saveVideoConfig()
{
auto settings = OverlayController::appSettings();
settings->beginGroup( getSettingsName() );
settings->setValue( "brightnessEnabled", brightnessEnabled() );
settings->setValue( "colorOverlayEnabled", colorOverlayEnabled() );
settings->setValue( "colorRedNew", colorRed() );
settings->setValue( "colorGreenNew", colorGreen() );
@@ -267,19 +265,22 @@ float VideoTabController::brightnessValue() const
bool VideoTabController::brightnessEnabled() const
{
return m_brightnessEnabled;
return settings::getSetting(
settings::BoolSetting::VIDEO_brightnessEnabled );
}
void VideoTabController::setBrightnessEnabled( bool value,
bool notify,
bool keepValue )
{
if ( value != m_brightnessEnabled || keepValue )
if ( value != brightnessEnabled() || keepValue )
{
if ( !keepValue )
{
m_brightnessEnabled = value;
settings::setSetting(
settings::BoolSetting::VIDEO_brightnessEnabled, value );
}
auto overlayHandle = getBrightnessOverlayHandle();
if ( value )
{
@@ -297,7 +298,7 @@ void VideoTabController::setBrightnessEnabled( bool value,
LOG( INFO ) << "Brightness Overlay toggled off";
}
}
saveVideoConfig();
if ( notify )
{
emit brightnessEnabledChanged( value );
@@ -872,7 +873,7 @@ void VideoTabController::addVideoProfile( const QString name )
profile->colorRed = m_colorRed;
profile->colorGreen = m_colorGreen;
profile->colorBlue = m_colorBlue;
profile->brightnessToggle = m_brightnessEnabled;
profile->brightnessToggle = brightnessEnabled();
profile->brightnessValue = brightnessValue();
profile->opacity = colorOverlayOpacity();
profile->overlayMethodState = m_isOverlayMethodActive;
-2
View File
@@ -82,8 +82,6 @@ private:
vr::VROverlayHandle_t m_colorOverlayHandle = vr::k_ulOverlayHandleInvalid;
bool m_brightnessEnabled = false;
float m_colorRed = 0.0f;
float m_colorBlue = 0.0f;
float m_colorGreen = 0.0f;