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

Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/gui/Makefile.am
	src/neutrino.h


Origin commit data
------------------
Commit: 0d42384f0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-01 (Fri, 01 Jul 2016)
This commit is contained in:
vanhofen
2016-07-01 15:28:37 +02:00
parent a72a23b109 f1e25395ca
commit 21b7299720
17 changed files with 338 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/neutrino_menue.cpp
View File

@@ -91,16 +91,6 @@ extern CCAMMenuHandler * g_CamHandler;
// extern char current_timezone[50];
// extern bool autoshift;
enum
{
MENU_MAIN,
MENU_SETTINGS,
MENU_SERVICE,
MENU_SHUTDOWN,
MENU_MAX //3
};
#define MENU_WIDTH 35
const mn_widget_struct_t menu_widgets[MENU_MAX] =
@@ -152,7 +142,7 @@ void CNeutrinoApp::InitMenuMain()
// Dynamic renumbering
personalize.setShortcut();
CMenuWidget &menu = personalize.getWidget(MENU_MAIN)/**main**/;
CMenuWidget &menu = personalize.getWidget(MENU_MAIN);
menu.addKey(CRCInput::RC_stop, this, "easyswitch");
//top
@@ -244,7 +234,7 @@ void CNeutrinoApp::InitMenuMain()
//2nd section***************************************************************************************************
// settings, also as pin protected option in personalize menu, as a result of parameter value CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION
mf = new CMenuForwarder(LOCALE_MAINMENU_SETTINGS, true, NULL, &personalize.getWidget(MENU_SETTINGS)/**settings**/);
mf = new CMenuForwarder(LOCALE_MAINMENU_SETTINGS, true, NULL, &personalize.getWidget(MENU_SETTINGS));
mf->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_SETTINGS);
personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SETTINGS], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION);
@@ -350,7 +340,7 @@ void CNeutrinoApp::InitMenuSettings()
{
dprintf(DEBUG_DEBUG, "init settings menue...\n");
//CMenuWidget &menu = personalize.getWidget(MENU_SETTINGS)/**settings**/;
//CMenuWidget &menu = personalize.getWidget(MENU_SETTINGS);
// Dynamic renumbering
personalize.setShortcut();
@@ -494,7 +484,7 @@ void CNeutrinoApp::InitMenuService()
{
dprintf(DEBUG_DEBUG, "init service menu...\n");
//CMenuWidget &menu = personalize.getWidget(MENU_SERVICE)/**service**/;
//CMenuWidget &menu = personalize.getWidget(MENU_SERVICE);
// Dynamic renumbering
personalize.setShortcut();