2 files changed, 4 insertions(+), 6 deletions(-)

M module-apps/application-settings-new/windows/DisplayLightWindow.cpp
M module-services/service-evtmgr/screen-light-control/ScreenLightControl.hpp

@@ 13,14 13,13 @@
 
 namespace gui
 {
-
     DisplayLightWindow::DisplayLightWindow(app::Application *app, app::settingsInterface::ScreenLightSettings *settings)
         : BaseSettingsWindow(app, window::name::display_light), screenLightSettings(settings)
     {
         auto values = screenLightSettings->getCurrentValues();
 
         isDisplayLightSwitchOn = values.lightOn;
-        isAutoLightSwitchOn    = values.mode;
+        isAutoLightSwitchOn    = values.mode == screen_light_control::ScreenLightMode::Automatic;
         brightnessValue        = values.parameters.manualModeBrightness;
 
         setTitle(utils::localize.get("app_settings_display_display_light"));


@@ 85,7 84,7 @@ namespace gui
         };
 
         auto spinner = std::make_unique<gui::SpinBoxOptionSettings>(
-            utils::translateI18("app_settings_display_light_brightness") + " " + std::to_string(brightnessStep),
+            utils::translateI18("app_settings_display_light_brightness") + " " + utils::to_string(brightnessStep),
             brightnessValue * brightnessStep,
             std::ceil(screen_light_control::Parameters::MAX_BRIGHTNESS / brightnessStep),
             setBrightness,

@@ 5,8 5,7 @@
 
 #include <service-db/service-db/Settings.hpp>
 #include "ControlFunctions.hpp"
-
-#include <sstream>
+#include <Utils.hpp>
 
 namespace sys
 {


@@ 85,7 84,7 @@ namespace screen_light_control
 
         template <class T> void setScreenLightSettings(const std::string &varName, T value)
         {
-            settings->setValue(varName, std::to_string(value));
+            settings->setValue(varName, utils::to_string(value));
         }
         void initFromSettings();