mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 01:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

screensaver settings: add option to enable/disable additional text info

Browse Source
This commit is contained in:
Thilo Graf
2020-02-05 22:03:12 +01:00
parent 7d70b8c823
commit 44debf7a73
9 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/osd_setup.cpp
View File

@@ -43,6 +43,7 @@
#include "osd_helpers.h"
#include "themes.h"
#include "screensetup.h"
#include "screensaver.h"
#include "osdlang_setup.h"
#include "filebrowser.h"
#include "osd_progressbar_setup.h"
@@ -1531,11 +1532,11 @@ bool COsdSetup::changeNotify(const neutrino_locale_t OptionName, void * data)
}
else if(ARE_LOCALES_EQUAL(OptionName, LOCALE_SCREENSAVER_DELAY)) {
screensaverActivate.Activate(g_settings.screensaver_delay != 0);
screensaverOptActivate.Activate(g_settings.screensaver_delay != 0 && g_settings.screensaver_mode == 0);
screensaverOptActivate.Activate(g_settings.screensaver_delay != 0 && g_settings.screensaver_mode == CScreenSaver::SCR_MODE_IMAGE);
return false;
}
else if(ARE_LOCALES_EQUAL(OptionName, LOCALE_SCREENSAVER_MODE)) {
screensaverOptActivate.Activate(g_settings.screensaver_mode == 0);
screensaverOptActivate.Activate(g_settings.screensaver_mode == CScreenSaver::SCR_MODE_IMAGE);
return false;
}
else if(ARE_LOCALES_EQUAL(OptionName, LOCALE_COLORMENU_OSD_PRESET)) {
@@ -1746,13 +1747,14 @@ void COsdSetup::showOsdScreenShotSetup(CMenuWidget *menu_screenshot)
}
#endif
#define SCREENSAVER_MODE_OPTION_COUNT 3
const CMenuOptionChooser::keyval SCREENSAVER_MODE_OPTIONS[SCREENSAVER_MODE_OPTION_COUNT] =
const CMenuOptionChooser::keyval SCREENSAVER_MODE_OPTIONS[] =
{
{ 0, LOCALE_SCREENSAVER_MODE_IMAGE },
{ 1, LOCALE_SCREENSAVER_MODE_CLOCK },
{ 2, LOCALE_SCREENSAVER_MODE_CLOCK_COLOR }
};
size_t screensaver_mode_options_size = sizeof(SCREENSAVER_MODE_OPTIONS)/sizeof(SCREENSAVER_MODE_OPTIONS[0]);
void COsdSetup::showOsdScreensaverSetup(CMenuWidget *menu_screensaver)
{
@@ -1768,7 +1770,7 @@ void COsdSetup::showOsdScreensaverSetup(CMenuWidget *menu_screensaver)
menu_screensaver->addItem(nc);
// screensaver mode
CMenuOptionChooser* oc = new CMenuOptionChooser(LOCALE_SCREENSAVER_MODE, &g_settings.screensaver_mode, SCREENSAVER_MODE_OPTIONS, SCREENSAVER_MODE_OPTION_COUNT, (g_settings.screensaver_delay != 0), this);
CMenuOptionChooser* oc = new CMenuOptionChooser(LOCALE_SCREENSAVER_MODE, &g_settings.screensaver_mode, SCREENSAVER_MODE_OPTIONS, screensaver_mode_options_size, (g_settings.screensaver_delay != 0), this);
oc->setHint("", LOCALE_MENU_HINT_SCREENSAVER_MODE);
menu_screensaver->addItem(oc);
screensaverActivate.Add(oc);
@@ -1791,6 +1793,12 @@ void COsdSetup::showOsdScreensaverSetup(CMenuWidget *menu_screensaver)
oc->setHint("", LOCALE_MENU_HINT_SCREENSAVER_RANDOM);
menu_screensaver->addItem(oc);
screensaverOptActivate.Add(oc);
// 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);
}
void COsdSetup::paintWindowSize(int w, int h)