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

- move lcd4l-setup to vfd-setup

Browse Source 
Conflicts:
	src/gui/miscsettings_menu.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-02-01 00:25:18 +01:00
committed by Thilo Graf
parent 85764fa36a
commit 96975c1d25
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/miscsettings_menu.cpp
View File

@@ -40,11 +40,10 @@
#include <gui/weather_norway_locations.h> #include <gui/weather_norway_locations.h>
#include <gui/cec_setup.h> #include <gui/cec_setup.h>
#include <gui/filebrowser.h> #include <gui/filebrowser.h>
#include <gui/keybind_setup.h> #include <gui/keybind_setup.h>
#ifdef ENABLE_LCD4LINUX
#include <gui/lcd4l_setup.h>
#endif
#include <gui/plugins.h> #include <gui/plugins.h>
#include <gui/sleeptimer.h> #include <gui/sleeptimer.h>
#include <gui/zapit_setup.h> #include <gui/zapit_setup.h>
@@ -330,13 +329,6 @@ int CMiscMenue::showMiscSettingsMenu()
mf->setHint("", LOCALE_MENU_HINT_MISC_ZAPIT); mf->setHint("", LOCALE_MENU_HINT_MISC_ZAPIT);
misc_menue.addItem(mf); misc_menue.addItem(mf);
#ifdef ENABLE_LCD4LINUX
// LCD4Linux Setup
CLCD4lSetup lcd4lSetup;
mf = new CMenuForwarder(LOCALE_LCD4L_SUPPORT, !find_executable("lcd4linux").empty(), NULL, &lcd4lSetup, NULL, CRCInput::convertDigitToKey(shortcut++));
mf->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_SUPPORT);
misc_menue.addItem(mf);
#endif
// onlineservices // onlineservices
mf = new CMenuForwarder(LOCALE_MISCSETTINGS_ONLINESERVICES, true, NULL, this, "onlineservices", CRCInput::convertDigitToKey(shortcut++)); mf = new CMenuForwarder(LOCALE_MISCSETTINGS_ONLINESERVICES, true, NULL, this, "onlineservices", CRCInput::convertDigitToKey(shortcut++));

21
src/gui/vfd_setup.cpp
View File

@@ -33,10 +33,6 @@
#include <config.h> #include <config.h>
#endif #endif
#ifdef ENABLE_GRAPHLCD
#include <gui/glcdsetup.h>
#endif
#include "vfd_setup.h" #include "vfd_setup.h"
#include <global.h> #include <global.h>
@@ -46,9 +42,16 @@
#include <gui/widget/icons.h> #include <gui/widget/icons.h>
#ifdef ENABLE_GRAPHLCD
#include <gui/glcdsetup.h>
#endif
#ifdef ENABLE_LCD4LINUX
#include "gui/lcd4l_setup.h"
#endif
#include <driver/display.h> #include <driver/display.h>
#include <driver/screen_max.h> #include <driver/screen_max.h>
#include <driver/display.h>
#include <system/debug.h> #include <system/debug.h>
#include <system/helpers.h> #include <system/helpers.h>
@@ -205,10 +208,16 @@ int CVfdSetup::showSetup()
vfds->addItem(led_num); vfds->addItem(led_num);
} }
#ifdef ENABLE_LCD4LINUX
mf = new CMenuForwarder(LOCALE_LCD4L_SUPPORT, !find_executable("lcd4linux").empty(), NULL, CLCD4lSetup::getInstance(), NULL, CRCInput::RC_blue);
mf->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_SUPPORT);
vfds->addItem(mf);
#endif
CMenuItem* glcd_setup = NULL; CMenuItem* glcd_setup = NULL;
#ifdef ENABLE_GRAPHLCD #ifdef ENABLE_GRAPHLCD
GLCD_Menu glcdMenu; GLCD_Menu glcdMenu;
glcd_setup = new CMenuForwarder(LOCALE_GLCD_HEAD, true, NULL, &glcdMenu, NULL, CRCInput::RC_blue); glcd_setup = new CMenuForwarder(LOCALE_GLCD_HEAD, true, NULL, &glcdMenu, NULL);
vfds->addItem(glcd_setup); vfds->addItem(glcd_setup);
#endif #endif