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

some fixes after cherry-picking

Browse Source 
Signed-off-by: GetAway <get-away@t-online.de>
This commit is contained in:
TangoCash
2019-01-06 13:24:47 +01:00
committed by GetAway
parent 4b9740623e
commit 0277009f72
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/lcd4l_setup.cpp
View File

@@ -108,7 +108,7 @@ CLCD4lSetup* CLCD4lSetup::getInstance()
return me;
}
int CLCD4lSetup::exec(CMenuTarget* parent, const std::string &actionkey)
int CLCD4lSetup::exec(CMenuTarget *parent, const std::string &actionkey)
{
printf("CLCD4lSetup::exec: actionkey %s\n", actionkey.c_str());
int res = menu_return::RETURN_REPAINT;
@@ -116,7 +116,8 @@ int CLCD4lSetup::exec(CMenuTarget* parent, const std::string &actionkey)
if (parent)
parent->hide();
if (actionkey == "lcd4l_logodir") {
if (actionkey == "lcd4l_logodir")
{
const char *action_str = "lcd4l_logodir";
chooserDir(g_settings.lcd4l_logodir, false, action_str);
return menu_return::RETURN_REPAINT;
@@ -194,7 +195,7 @@ int CLCD4lSetup::show()
const char *flag_lcd4l_clock_a = FLAGDIR "/.lcd-clock_a";
int fake_lcd4l_clock_a = file_exists(flag_lcd4l_clock_a);
CTouchFileNotifier * lcd_clock_a = new CTouchFileNotifier(flag_lcd4l_clock_a);
CTouchFileNotifier *lcd_clock_a = new CTouchFileNotifier(flag_lcd4l_clock_a);
mc = new CMenuOptionChooser(LOCALE_LCD4L_CLOCK_A, &fake_lcd4l_clock_a, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, ((file_exists(LCD4L_ICONSDIR "/clock/analog")) || (file_exists(LCD4L_ICONSDIR_VAR "/clock/analog"))), lcd_clock_a, CRCInput::convertDigitToKey(shortcut++));
mc->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_CLOCK_A);
lcd4lSetup->addItem(mc);
@@ -233,7 +234,7 @@ int CLCD4lSetup::show()
if (g_settings.lcd4l_brightness != temp_lcd4l_brightness)
{
g_settings.lcd4l_brightness = temp_lcd4l_brightness;
initlcd4l = true;
initlcd4l = true;
}
if (initlcd4l)