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

- vfd_setup: execute glcd-setup directly if it's the only item

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2020-06-21 23:21:20 +02:00
committed by Thilo Graf
parent e57afb48dd
commit 93706fc851
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/vfd_setup.cpp
View File

@@ -119,6 +119,8 @@ int CVfdSetup::showSetup()
CMenuWidget *vfds = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_LCD, width, MN_WIDGET_ID_VFDSETUP); CMenuWidget *vfds = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_LCD, width, MN_WIDGET_ID_VFDSETUP);
vfds->addIntroItems(LOCALE_LCDMENU_HEAD); vfds->addIntroItems(LOCALE_LCDMENU_HEAD);
int initial_count = vfds->getItemsCount();
CMenuForwarder * mf; CMenuForwarder * mf;
//led menu //led menu
@@ -190,12 +192,21 @@ int CVfdSetup::showSetup()
vfds->addItem(oj); vfds->addItem(oj);
} }
CMenuItem* glcd_setup = NULL;
#ifdef ENABLE_GRAPHLCD #ifdef ENABLE_GRAPHLCD
GLCD_Menu glcdMenu; GLCD_Menu glcdMenu;
vfds->addItem(new CMenuForwarder(LOCALE_GLCD_HEAD, true, NULL, &glcdMenu, NULL, CRCInput::RC_blue)); glcd_setup = new CMenuForwarder(LOCALE_GLCD_HEAD, true, NULL, &glcdMenu, NULL, CRCInput::RC_blue);
vfds->addItem(glcd_setup);
#endif #endif
int res = vfds->exec(NULL, ""); int res;
if (glcd_setup && (vfds->getItemsCount() == initial_count + 1))
{
// glcd-setup is the only item; execute directly
res = glcd_setup->exec(NULL);
}
else
res = vfds->exec(NULL, "");
delete vfds; delete vfds;
return res; return res;