From 5bf6f23e501410835741501203ea48a2c305c83c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 6 Feb 2020 00:16:06 +0100 Subject: [PATCH] screensaver: disable g_settings.screensaver_mode_text Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/88bb2fb20805addb0ac85c20d2d4bfc7d0d09495 Author: vanhofen Date: 2020-02-06 (Thu, 06 Feb 2020) Origin message was: ------------------ - screensaver: disable g_settings.screensaver_mode_text --- src/gui/osd_setup.cpp | 2 ++ src/neutrino.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 560185736..9d8e22330 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -1836,11 +1836,13 @@ void COsdSetup::showOsdScreensaverSetup(CMenuWidget *menu_screensaver) menu_screensaver->addItem(oc); screensaverOptActivate.Add(oc); +#if 0 // screensaver text mode oc = new CMenuOptionChooser(LOCALE_SCREENSAVER_ENABLE_TEXT_INFO, &g_settings.screensaver_mode_text, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, (g_settings.screensaver_delay != 0), this); oc->setHint("", LOCALE_MENU_HINT_SCREENSAVER_ENABLE_TEXT_INFO); menu_screensaver->addItem(oc); screensaverActivate.Add(oc); +#endif } void COsdSetup::paintWindowSize(int w, int h) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 67a630c91..d1f506515 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -636,7 +636,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.screensaver_timeout = configfile.getInt32("screensaver_timeout", 10); g_settings.screensaver_random = configfile.getInt32("screensaver_random", 0); g_settings.screensaver_mode = configfile.getInt32("screensaver_mode", CScreenSaver::SCR_MODE_CLOCK); //NI - g_settings.screensaver_mode_text = configfile.getInt32("screensaver_mode_text", CScreenSaver::SCR_MODE_TEXT_ON); + g_settings.screensaver_mode_text = configfile.getInt32("screensaver_mode_text", CScreenSaver::SCR_MODE_TEXT_OFF); //vcr g_settings.vcr_AutoSwitch = configfile.getBool("vcr_AutoSwitch" , true );