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 plugin-hide-menu from ni-menu to miscsettings-menu

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d7203f9241
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move plugin-hide-menu 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 fc30d473e8
commit 98ef1d767b
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/miscsettings_menu.cpp
View File

@@ -43,6 +43,7 @@
#include <gui/keybind_setup.h> #include <gui/keybind_setup.h>
#include <gui/lcd4l_setup.h> #include <gui/lcd4l_setup.h>
#include <gui/plugins.h> #include <gui/plugins.h>
#include <gui/plugins_hide.h>
#include <gui/sleeptimer.h> #include <gui/sleeptimer.h>
#include <gui/zapit_setup.h> #include <gui/zapit_setup.h>
@@ -637,6 +638,11 @@ int CMiscMenue::showMiscSettingsMenuPlugins()
ms_plugins->addItem(GenericMenuSeparatorLine); ms_plugins->addItem(GenericMenuSeparatorLine);
CPluginsHideMenu pluginsHideMenu;
mf = new CMenuForwarder(LOCALE_PLUGINS_HIDE, true, NULL, &pluginsHideMenu, NULL, CRCInput::RC_red);
mf->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_PLUGINS_HIDE);
ms_plugins->addItem(mf);
int res = ms_plugins->exec(NULL, ""); int res = ms_plugins->exec(NULL, "");
delete ms_plugins; delete ms_plugins;
return res; return res;

16
src/gui/ni_menu.cpp
View File

@@ -37,7 +37,6 @@
#include <neutrino_menue.h> #include <neutrino_menue.h>
#include <gui/netfs_setup.h> #include <gui/netfs_setup.h>
#include <gui/plugins_hide.h>
#include <gui/widget/hintbox.h> #include <gui/widget/hintbox.h>
#include <gui/widget/icons.h> #include <gui/widget/icons.h>
@@ -246,26 +245,11 @@ int CNIMenu::show()
mf->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_NETFS_MENU_MAIN_HEAD); mf->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_NETFS_MENU_MAIN_HEAD);
ni_menu->addItem(mf); ni_menu->addItem(mf);
// Plugin Menu
CMenuWidget* pluginMenu = new CMenuWidget(LOCALE_PLUGINS_CONTROL, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_PLUGINS_CONTROL);
pluginMenu->addIntroItems();
// Plugins for usermenu
CPluginsHideMenu pluginsHideMenu;
mf = new CMenuForwarder(LOCALE_PLUGINS_HIDE, true, NULL, &pluginsHideMenu, NULL, CRCInput::RC_blue);
mf->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_PLUGINS_HIDE);
pluginMenu->addItem(mf);
mf = new CMenuForwarder(LOCALE_PLUGINS_CONTROL, true, NULL, pluginMenu, "", CRCInput::convertDigitToKey(shortcut++));
mf->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_PLUGINS_CONTROL);
ni_menu->addItem(mf);
int res = ni_menu->exec(NULL, ""); int res = ni_menu->exec(NULL, "");
ni_menu->hide(); ni_menu->hide();
delete ni_menu; delete ni_menu;
delete emuMenu; delete emuMenu;
delete pluginMenu;
return res; return res;
} }