From 6893c77389034a4f472fb6b8acb1a31cbe386f25 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 7 Oct 2017 10:50:30 +0200 Subject: [PATCH] channelist: fix lcd4l-handling; ... - lcd4l-setup: re-add missing item to control g_settings.lcd4l_skin_radio Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/689986b459a505fc2b92a5149007e0d98c5af4dd Author: vanhofen Date: 2017-10-07 (Sat, 07 Oct 2017) Origin message was: ------------------ - channelist: fix lcd4l-handling; ... - lcd4l-setup: re-add missing item to control g_settings.lcd4l_skin_radio ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 7 ++++--- src/gui/lcd4l_setup.cpp | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index e8bef504f..fb8c01475 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2103,9 +2103,6 @@ void CChannelList::paintItem(int pos, const bool firstpaint) } if (!firstpaint && curr == selected) updateVfd(); - //NI lcd4l-support - if(g_settings.lcd4l_support) - LCD4l->CreateFile("/tmp/lcd/menu", chan->getName().c_str(), g_settings.lcd4l_convert); } } @@ -2129,6 +2126,10 @@ void CChannelList::updateVfd() CVFD::getInstance()->showMenuText(0, nameAndDescription, -1, true); // UTF-8 } else CVFD::getInstance()->showMenuText(0, chan->getName().c_str(), -1, true); // UTF-8 + + //NI lcd4l-support + if (g_settings.lcd4l_support) + LCD4l->CreateFile("/tmp/lcd/menu", chan->getName().c_str(), g_settings.lcd4l_convert); } void CChannelList::paint() diff --git a/src/gui/lcd4l_setup.cpp b/src/gui/lcd4l_setup.cpp index 1b465696b..51927b76a 100644 --- a/src/gui/lcd4l_setup.cpp +++ b/src/gui/lcd4l_setup.cpp @@ -143,6 +143,10 @@ int CLCD4lSetup::show() mc->setHint(NEUTRINO_ICON_HINT_LCD4L, LOCALE_MENU_HINT_LCD4L_SKIN); lcd4lSetup->addItem(mc); + mc = new CMenuOptionChooser(LOCALE_LCD4L_SKIN_RADIO, &g_settings.lcd4l_skin_radio, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++)); + mc->setHint(NEUTRINO_ICON_HINT_LCD4L, LOCALE_MENU_HINT_LCD4L_SKIN_RADIO); + lcd4lSetup->addItem(mc); + const char *flag_lcd4l_weather = FLAGDIR "/.lcd-weather"; int fake_lcd4l_weather = file_exists(flag_lcd4l_weather); CTouchFileNotifier * lcd_weather = new CTouchFileNotifier(flag_lcd4l_weather);