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

move lcd4l-setup to vfd-setup

Browse Source 
Origin commit data
------------------
Commit: f16ff11d70
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-02-01 (Mon, 01 Feb 2021)

Origin message was:
------------------
- move lcd4l-setup to vfd-setup
This commit is contained in:
vanhofen
2021-02-01 00:25:18 +01:00
parent 167ea7a2f6
commit 6b9369f9f6
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/miscsettings_menu.cpp
View File

@@ -42,7 +42,6 @@
#include <gui/filebrowser.h> #include <gui/filebrowser.h>
#include <gui/infoicons_setup.h> #include <gui/infoicons_setup.h>
#include <gui/keybind_setup.h> #include <gui/keybind_setup.h>
#include <gui/lcd4l_setup.h>
#include <gui/plugins.h> #include <gui/plugins.h>
#include <gui/plugins_hide.h> #include <gui/plugins_hide.h>
#include <gui/sleeptimer.h> #include <gui/sleeptimer.h>
@@ -349,12 +348,6 @@ int CMiscMenue::showMiscSettingsMenu()
mf->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_INFOICONS_HEAD); mf->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_INFOICONS_HEAD);
misc_menue.addItem(mf); misc_menue.addItem(mf);
// 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);
// plugins // plugins
mf = new CMenuForwarder(LOCALE_PLUGINS_CONTROL, true, NULL, this, "plugins", CRCInput::convertDigitToKey(shortcut++)); mf = new CMenuForwarder(LOCALE_PLUGINS_CONTROL, true, NULL, this, "plugins", CRCInput::convertDigitToKey(shortcut++));
mf->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_PLUGINS_CONTROL); mf->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_PLUGINS_CONTROL);

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>
@@ -208,10 +211,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