From b318904f8937e21ee44fa7065dead8e64f31be65 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Tue, 12 Sep 2017 22:30:35 +0200
Subject: [PATCH] move lcd4linux-setup from ni-menu to miscsettings-menu

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/c090a7d253b58f5e1e2b73acf07773e21e91e361
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move lcd4linux-setup from ni-menu to miscsettings-menu

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 src/gui/miscsettings_menu.cpp | 7 +++++++
 src/gui/ni_menu.cpp           | 6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp
index d08d29f14..7142a44d7 100644
--- a/src/gui/miscsettings_menu.cpp
+++ b/src/gui/miscsettings_menu.cpp
@@ -41,6 +41,7 @@
 #include <gui/filebrowser.h>
 #include <gui/infoicons_setup.h>
 #include <gui/keybind_setup.h>
+#include <gui/lcd4l_setup.h>
 #include <gui/plugins.h>
 #include <gui/sleeptimer.h>
 #include <gui/zapit_setup.h>
@@ -303,6 +304,12 @@ int CMiscMenue::showMiscSettingsMenu()
 	mf->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_INFOICONS_HEAD);
 	misc_menue.addItem(mf);
 
+	// LCD4Linux Setup
+	CLCD4lSetup lcd4lSetup;
+	mf = new CMenuForwarder(LOCALE_LCD4L_SUPPORT, true, NULL, &lcd4lSetup, NULL, CRCInput::RC_7);
+	mf->setHint(NEUTRINO_ICON_HINT_LCD4L, LOCALE_MENU_HINT_LCD4L_SUPPORT);
+	misc_menue.addItem(mf);
+
 	int res = misc_menue.exec(NULL, "");
 
 	delete fanNotifier;
diff --git a/src/gui/ni_menu.cpp b/src/gui/ni_menu.cpp
index 5ea17d98c..8d9f60910 100644
--- a/src/gui/ni_menu.cpp
+++ b/src/gui/ni_menu.cpp
@@ -36,7 +36,6 @@
 #include <mymenu.h>
 #include <neutrino_menue.h>
 
-#include <gui/lcd4l_setup.h>
 #include <gui/netfs_setup.h>
 #include <gui/plugins_hide.h>
 #include <gui/widget/hintbox.h>
@@ -277,11 +276,6 @@ int CNIMenu::show()
 	mf->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_PLUGINS_CONTROL);
 	ni_menu->addItem(mf);
 
-	CLCD4lSetup lcd4lSetup;
-	mf = new CMenuForwarder(LOCALE_LCD4L_SUPPORT, true, NULL, &lcd4lSetup, "", CRCInput::convertDigitToKey(shortcut++));
-	mf->setHint(NEUTRINO_ICON_HINT_LCD4L, LOCALE_MENU_HINT_LCD4L_SUPPORT);
-	ni_menu->addItem(mf);
-
 	//add PLUGIN_INTEGRATION_NI_MENU plugins
 	ni_menu->integratePlugins(PLUGIN_INTEGRATION_NI_MENU, shortcut);