mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

menue: simplifying lcd code

Browse Source 
Origin commit data
------------------
Commit: b7d9bf55eb
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-07-02 (Thu, 02 Jul 2020)

Origin message was:
------------------
- menue: simplifying lcd code
This commit is contained in:
vanhofen
2020-07-02 00:33:31 +02:00
parent 9857eeb332
commit cf94405ed3
2 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/gui/widget/menue.cpp
View File

@@ -92,10 +92,7 @@ CMenuItem::CMenuItem(bool Active, neutrino_msg_t DirectKey, const char * const I
actObserv = NULL; actObserv = NULL;
parent_widget = NULL; parent_widget = NULL;
#ifdef ENABLE_GRAPHLCD lcd_text = "";
graphlcd_text = "";
#endif
lcd4l_text = "";
} }
void CMenuItem::init(const int X, const int Y, const int DX, const int OFFX) void CMenuItem::init(const int X, const int Y, const int DX, const int OFFX)
@@ -242,30 +239,20 @@ void CMenuItem::paintItemCaption(const bool select_mode, const char * right_text
char str[len]; char str[len];
snprintf(str, len, "%s %s", left_text, right_text); snprintf(str, len, "%s %s", left_text, right_text);
CVFD::getInstance()->showMenuText(0, str, -1, true); CVFD::getInstance()->showMenuText(0, str, -1, true);
#ifdef ENABLE_GRAPHLCD lcd_text = str;
if (g_settings.glcd_enable)
graphlcd_text = str;
#endif
if (g_settings.lcd4l_support)
lcd4l_text = str;
} }
else else
{ {
CVFD::getInstance()->showMenuText(0, left_text, -1, true); CVFD::getInstance()->showMenuText(0, left_text, -1, true);
#ifdef ENABLE_GRAPHLCD lcd_text = left_text;
if (g_settings.glcd_enable)
graphlcd_text = left_text;
#endif
if (g_settings.lcd4l_support)
lcd4l_text = left_text;
} }
#ifdef ENABLE_GRAPHLCD #ifdef ENABLE_GRAPHLCD
if (g_settings.glcd_enable) if (g_settings.glcd_enable)
cGLCD::lockChannel(g_Locale->getText(LOCALE_MAINMENU_HEAD), graphlcd_text, 0); cGLCD::lockChannel(g_Locale->getText(LOCALE_MAINMENU_HEAD), lcd_text, 0);
#endif #endif
if (g_settings.lcd4l_support) if (g_settings.lcd4l_support)
LCD4l->CreateFile("/tmp/lcd/menu", lcd4l_text, g_settings.lcd4l_convert); LCD4l->CreateFile("/tmp/lcd/menu", lcd_text, g_settings.lcd4l_convert);
} }
//left text //left text
@@ -1055,10 +1042,10 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
#ifdef ENABLE_GRAPHLCD #ifdef ENABLE_GRAPHLCD
if (g_settings.glcd_enable) if (g_settings.glcd_enable)
cGLCD::lockChannel(g_Locale->getText(LOCALE_MAINMENU_HEAD), item->graphlcd_text, 0); cGLCD::lockChannel(g_Locale->getText(LOCALE_MAINMENU_HEAD), item->lcd_text, 0);
#endif #endif
if (g_settings.lcd4l_support) if (g_settings.lcd4l_support)
LCD4l->CreateFile("/tmp/lcd/menu", item->lcd4l_text, g_settings.lcd4l_convert); LCD4l->CreateFile("/tmp/lcd/menu", item->lcd_text, g_settings.lcd4l_convert);
switch ( rv ) { switch ( rv ) {
case menu_return::RETURN_EXIT_ALL: case menu_return::RETURN_EXIT_ALL:

5
src/gui/widget/menue.h
View File

@@ -209,10 +209,7 @@ class CMenuItem : public CComponentsSignals
void setInfoIconRight(const char * const IconName_Info_right); void setInfoIconRight(const char * const IconName_Info_right);
const char* getInfoIconRight(){return iconName_Info_right;} const char* getInfoIconRight(){return iconName_Info_right;}
#ifdef ENABLE_GRAPHLCD std::string lcd_text;
std::string graphlcd_text;
#endif
std::string lcd4l_text;
}; };
class CMenuSeparator : public CMenuItem class CMenuSeparator : public CMenuItem