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

move lcd4linux-setup from ni-menu to miscsettings-menu

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: c090a7d253
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
This commit is contained in:
vanhofen
2017-09-12 22:30:35 +02:00
parent c69e624170
commit b318904f89
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/miscsettings_menu.cpp
View File

@@ -41,6 +41,7 @@
#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/sleeptimer.h> #include <gui/sleeptimer.h>
#include <gui/zapit_setup.h> #include <gui/zapit_setup.h>
@@ -303,6 +304,12 @@ 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, 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, ""); int res = misc_menue.exec(NULL, "");
delete fanNotifier; delete fanNotifier;

6
src/gui/ni_menu.cpp
View File

@@ -36,7 +36,6 @@
#include <mymenu.h> #include <mymenu.h>
#include <neutrino_menue.h> #include <neutrino_menue.h>
#include <gui/lcd4l_setup.h>
#include <gui/netfs_setup.h> #include <gui/netfs_setup.h>
#include <gui/plugins_hide.h> #include <gui/plugins_hide.h>
#include <gui/widget/hintbox.h> #include <gui/widget/hintbox.h>
@@ -277,11 +276,6 @@ int CNIMenu::show()
mf->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_PLUGINS_CONTROL); mf->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_PLUGINS_CONTROL);
ni_menu->addItem(mf); 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 //add PLUGIN_INTEGRATION_NI_MENU plugins
ni_menu->integratePlugins(PLUGIN_INTEGRATION_NI_MENU, shortcut); ni_menu->integratePlugins(PLUGIN_INTEGRATION_NI_MENU, shortcut);