move miscsettings to sub menu

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@180 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: bf4f606651 Author: Jacek Jendrzej <overx300@gmail.com> Date: 2010-01-18 (Mon, 18 Jan 2010) ------------------ This commit was generated by Migit
2025-08-27 15:32:52 +02:00 · 2010-01-18 11:29:22 +00:00
parent bdeaa96cf2
commit 8786b75297
2 changed files with 908 additions and 883 deletions
--- a/src/neutrino.h
+++ b/src/neutrino.h
@@ -85,7 +85,7 @@ typedef struct font_sizes_groups

 class CNeutrinoApp : public CMenuTarget, CChangeObserver
 {
- public:
+public:
 	enum
 	{
 		RECORDING_OFF    = 0,
@@ -94,7 +94,7 @@ class CNeutrinoApp : public CMenuTarget, CChangeObserver
 		RECORDING_FILE   = 3
 	};

- private:
+private:
 	CFrameBuffer * frameBuffer;

 	enum
@@ -201,6 +201,7 @@ class CNeutrinoApp : public CMenuTarget, CChangeObserver
 			  CMenuWidget &colorSettings, CMenuWidget &lcdSettings, CMenuWidget &keySettings,
 			  CMenuWidget &languageSettings, CMenuWidget &miscSettings, CMenuWidget &service, CMenuWidget &fontSettings,
 			  CMenuWidget &audioplPicSettings, CMenuWidget &streamingSettings, CMenuWidget &moviePlayer);
+	void addMenueIntroItems(CMenuWidget &item);
 	void SetupFrameBuffer();
 	void SelectAPID();
 	void SelectNVOD();
@@ -213,7 +214,7 @@ class CNeutrinoApp : public CMenuTarget, CChangeObserver
 	void saveKeys(const char * fname);
 	CNeutrinoApp();

-	public:
+public:
 	void saveSetup(const char * fname);
 	int loadSetup(const char * fname);
 	void loadColors(const char * fname);
@@ -222,7 +223,9 @@ class CNeutrinoApp : public CMenuTarget, CChangeObserver

 	void setVolume(const neutrino_msg_t key, const bool bDoPaint = true, bool nowait = false);
 	~CNeutrinoApp();
-		CScanSettings& getScanSettings(){ return scanSettings;};
+	CScanSettings& getScanSettings() {
+		return scanSettings;
+	};

 	CChannelList			*TVchannelList;
 	CChannelList			*RADIOchannelList;
@@ -242,13 +245,21 @@ class CNeutrinoApp : public CMenuTarget, CChangeObserver

 	int handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data);

-		int getMode() { return mode; }
-		int getLastMode() { return lastMode; }
-		bool isMuted() { return current_muted; }
+	int getMode() {
+		return mode;
+	}
+	int getLastMode() {
+		return lastMode;
+	}
+	bool isMuted() {
+		return current_muted;
+	}
 	int recordingstatus;
 	int recording_id;
 	void SendSectionsdConfig(void);
-		int GetChannelMode(void) { return g_settings.channel_mode; };
+	int GetChannelMode(void) {
+		return g_settings.channel_mode;
+	};
 	void SetChannelMode(int mode);
 	void quickZap(int msg);
 };
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -286,7 +286,7 @@ CVideoSettings::CVideoSettings() : CMenuWidget(LOCALE_VIDEOMENU_HEAD, "video.raw
 	addItem(new CMenuOptionChooser(LOCALE_VIDEOMENU_DBDR, &g_settings.video_dbdr, VIDEOMENU_DBDR_OPTIONS, VIDEOMENU_DBDR_OPTION_COUNT, true, this));

 	CMenuWidget* menu = new CMenuWidget(LOCALE_VIDEOMENU_ENABLED_MODES, NEUTRINO_ICON_SETTINGS);
-	for(int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++)
+	for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++)
 		menu->addItem(new CMenuOptionChooser(VIDEOMENU_VIDEOMODE_OPTIONS[i].valname, &g_settings.enabled_video_modes[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));

 	addItem(new CMenuForwarder(LOCALE_VIDEOMENU_ENABLED_MODES, true, NULL, menu));
@@ -311,22 +311,22 @@ void CVideoSettings::nextMode(void)
 	int curmode = 0;
 	int i;

-	for(i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) {
-		if(VIDEOMENU_VIDEOMODE_OPTIONS[i].key == g_settings.video_Mode) {
+	for (i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) {
+		if (VIDEOMENU_VIDEOMODE_OPTIONS[i].key == g_settings.video_Mode) {
 			curmode = i;
 			break;
 		}
 	}

 	i = 0;
-	while(true) {
+	while (true) {
 		curmode++;
-		if(curmode >= VIDEOMENU_VIDEOMODE_OPTION_COUNT)
+		if (curmode >= VIDEOMENU_VIDEOMODE_OPTION_COUNT)
 			curmode = 0;
-		if(g_settings.enabled_video_modes[curmode])
+		if (g_settings.enabled_video_modes[curmode])
 			break;
 		i++;
-		if(i >= VIDEOMENU_VIDEOMODE_OPTION_COUNT)
+		if (i >= VIDEOMENU_VIDEOMODE_OPTION_COUNT)
 			return;
 	}

@@ -343,14 +343,14 @@ void CVideoSettings::next43Mode(void)
 	neutrino_locale_t text;
 	int curmode = 0;

-	for(int i = 0; i < VIDEOMENU_43MODE_OPTION_COUNT; i++) {
-		if(VIDEOMENU_43MODE_OPTIONS[i].key == g_settings.video_43mode) {
+	for (int i = 0; i < VIDEOMENU_43MODE_OPTION_COUNT; i++) {
+		if (VIDEOMENU_43MODE_OPTIONS[i].key == g_settings.video_43mode) {
 			curmode = i;
 			break;
 		}
 	}
 	curmode++;
-	if(curmode >= VIDEOMENU_43MODE_OPTION_COUNT)
+	if (curmode >= VIDEOMENU_43MODE_OPTION_COUNT)
 		curmode = 0;

 	text =  VIDEOMENU_43MODE_OPTIONS[curmode].value;
@@ -364,14 +364,14 @@ void CVideoSettings::SwitchFormat(void)
 	neutrino_locale_t text;
 	int curmode = 0;

-	for(int i = 0; i < VIDEOMENU_VIDEOFORMAT_OPTION_COUNT; i++) {
-		if(VIDEOMENU_VIDEOFORMAT_OPTIONS[i].key == g_settings.video_Format) {
+	for (int i = 0; i < VIDEOMENU_VIDEOFORMAT_OPTION_COUNT; i++) {
+		if (VIDEOMENU_VIDEOFORMAT_OPTIONS[i].key == g_settings.video_Format) {
 			curmode = i;
 			break;
 		}
 	}
 	curmode++;
-	if(curmode >= VIDEOMENU_VIDEOFORMAT_OPTION_COUNT)
+	if (curmode >= VIDEOMENU_VIDEOFORMAT_OPTION_COUNT)
 		curmode = 0;

 	text =  VIDEOMENU_VIDEOFORMAT_OPTIONS[curmode].value;
@@ -406,7 +406,7 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void *)
 			ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_43MODE))
 	{
 		//if(g_settings.video_Format != 1 && g_settings.video_Format != 3)
-		if(g_settings.video_Format != 1 && g_settings.video_Format != 3 && g_settings.video_Format != 2)
+		if (g_settings.video_Format != 1 && g_settings.video_Format != 3 && g_settings.video_Format != 2)
 			g_settings.video_Format = 3;
 		videoDecoder->setAspectRatio(g_settings.video_Format, g_settings.video_43mode);
 	}
@@ -414,9 +414,9 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void *)
 	{
 		videoDecoder->SetVideoSystem(g_settings.video_Mode);
 		//videoDecoder->SetVideoMode((analog_mode_t) g_settings.analog_mode);//FIXME
-		if(prev_video_mode != g_settings.video_Mode) {
+		if (prev_video_mode != g_settings.video_Mode) {
 			frameBuffer->paintBackground();
-			if(ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_VIDEOMODE_OK), CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo, "info.raw") != CMessageBox::mbrYes) {
+			if (ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_VIDEOMODE_OK), CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo, "info.raw") != CMessageBox::mbrYes) {
 				g_settings.video_Mode = prev_video_mode;
 				videoDecoder->SetVideoSystem(g_settings.video_Mode);
 				//videoDecoder->SetVideoMode((analog_mode_t) g_settings.analog_mode);//FIXME
@@ -436,7 +436,7 @@ void CVideoSettings::paint()
 #ifdef TEST_MENU
 class CTestMenu : public CMenuTarget
 {
-        public:
+public:
 	int exec(CMenuTarget* parent,  const std::string &actionkey);
 };

@@ -446,18 +446,18 @@ class CTestMenu : public CMenuTarget

 int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 {
-	if(parent)
+	if (parent)
 		parent->hide();

 	printf("CTestMenu::exec: %s\n", actionKey.c_str());
-	if(actionKey == "vfd") {
+	if (actionKey == "vfd") {
 		CVFD::getInstance()->Clear();
 		int icon = 0x00040000;
-		while(icon > 0x2) {
+		while (icon > 0x2) {
 			CVFD::getInstance()->ShowIcon((vfd_icon) icon, true);
 			icon /= 2;
 		}
-		for(int i = 0x01000001; i <= 0x0C000001; i+= 0x01000000) {
+		for (int i = 0x01000001; i <= 0x0C000001; i+= 0x01000000) {
 			CVFD::getInstance()->ShowIcon((vfd_icon) i, true);
 		}
 		CVFD::getInstance()->ShowIcon((vfd_icon) 0x09000002, true);
@@ -467,7 +467,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		int ch = 0x2588;
 		int len = XmlUtf8Encode(ch, buf);

-		for(int i = 0; i < 12; i++) {
+		for (int i = 0; i < 12; i++) {
 			memcpy(&text[i*len], buf, len);
 		}
 		text[12*len] = 0;
@@ -476,7 +476,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, "VFD test, Press OK to return", CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw");
 		CVFD::getInstance()->Clear();
 	}
-	else if(actionKey == "network") {
+	else if (actionKey == "network") {
 		int fd, ret;
 		struct ifreq ifr;
 		char * ip = NULL, str[255];
@@ -488,11 +488,11 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		strncpy(ifr.ifr_name, "eth0", IFNAMSIZ-1);

 		ret = ioctl(fd, SIOCGIFHWADDR, &ifr);
-		if(ret < 0)
+		if (ret < 0)
 			perror("SIOCGIFHWADDR");

 		ret = ioctl(fd, SIOCGIFADDR, &ifr );
-		if(ret < 0)
+		if (ret < 0)
 			perror("SIOCGIFADDR");
 		else {
 			addrp = (struct sockaddr_in *)&(ifr.ifr_addr);
@@ -510,15 +510,15 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		close(fd);
 		ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, str, CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw");
 	}
-	else if(actionKey == "card") {
+	else if (actionKey == "card") {
 	}
-	else if(actionKey == "hdd") {
+	else if (actionKey == "hdd") {
 		char buffer[255];
 		FILE *f = fopen("/proc/mounts", "r");
 		bool mounted = false;
-		if(f != NULL) {
+		if (f != NULL) {
 			while (fgets (buffer, 255, f) != NULL) {
-				if(strstr(buffer, "/dev/sda1")) {
+				if (strstr(buffer, "/dev/sda1")) {
 					mounted = true;
 					break;
 				}
@@ -529,21 +529,21 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		printf("%s\n", buffer);
 		ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, buffer, CMessageBox::mbrBack, CMessageBox::mbBack, "info.raw");
 	}
-	else if(actionKey == "buttons") {
+	else if (actionKey == "buttons") {
 		neutrino_msg_t      msg;
 		neutrino_msg_data_t data;
 		CHintBox * khintBox = NULL;
 		CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, "Press button, or press EXIT to return");
 		hintBox->paint();
-		while(1) {
+		while (1) {
 			g_RCInput->getMsg(&msg, &data, 100);
-			if(msg == CRCInput::RC_home)
+			if (msg == CRCInput::RC_home)
 				break;

 			if (msg != CRCInput::RC_timeout && msg <= CRCInput::RC_MaxRC) {
 				char keyname[50];
 				sprintf(keyname, "Button [%s] pressed (EXIT to return)", g_RCInput->getKeyName(msg).c_str());
-				if(khintBox) {
+				if (khintBox) {
 					delete khintBox;
 				}
 				khintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, keyname);
@@ -551,18 +551,18 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 				khintBox->paint();
 			}
 		}
-		if(khintBox)
+		if (khintBox)
 			delete khintBox;
 		delete hintBox;
 	}
-	else if(actionKey == "22kon" || actionKey == "22koff") {
+	else if (actionKey == "22kon" || actionKey == "22koff") {
 		CScanTs * scanTs = new CScanTs();

 		int freq = (actionKey == "22kon") ? 12000*1000: 11000*1000;

 		sprintf(get_set.TP_freq, "%d", freq);
 #if 0 // not needed ?
-                switch(frontend->getInfo()->type) {
+		switch (frontend->getInfo()->type) {
 		case FE_QPSK:
 			sprintf(get_set.TP_rate, "%d", tmpI->second.feparams.u.qpsk.symbol_rate);
 			get_set.TP_fec = tmpI->second.feparams.u.qpsk.fec_inner;
@@ -578,12 +578,12 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		scanTs->exec(NULL, "test");
 		delete scanTs;
 	}
-        else if(actionKey == "scan") {
+	else if (actionKey == "scan") {
 		CScanTs * scanTs = new CScanTs();

 		int freq = 12538000;
 		sprintf(get_set.TP_freq, "%d", freq);
-                switch(frontend->getInfo()->type) {
+		switch (frontend->getInfo()->type) {
 		case FE_QPSK:
 			sprintf(get_set.TP_rate, "%d", 41250*1000);
 			get_set.TP_fec = 1;
@@ -720,7 +720,7 @@ void CNeutrinoApp::InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings
 	mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_AUDIO     , true, NULL, &audioSettings    , NULL, CRCInput::RC_2));
 	mainSettings.addItem(new CLockedMenuForwarder(LOCALE_PARENTALLOCK_PARENTALLOCK, g_settings.parentallock_pincode, true, true, NULL, &parentallockSettings, NULL, CRCInput::RC_3));
 #if 0
-	if(g_settings.parentallock_prompt)
+	if (g_settings.parentallock_prompt)
 		mainSettings.addItem(new CLockedMenuForwarder(LOCALE_PARENTALLOCK_PARENTALLOCK, g_settings.parentallock_pincode, true, true, NULL, &parentallockSettings, NULL, CRCInput::RC_3));
 	else
 		mainSettings.addItem(new CMenuForwarder(LOCALE_PARENTALLOCK_PARENTALLOCK, true, NULL, &parentallockSettings, NULL, CRCInput::RC_3));
@@ -747,7 +747,7 @@ void CNeutrinoApp::InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings
 			}
 			search = search->xmlNextNode;
 		}
-		if(found)
+		if (found)
 			mainSettings.addItem(tzSelect);
 		else {
 			delete tzSelect;
@@ -757,7 +757,7 @@ void CNeutrinoApp::InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings
 	}
 	mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_OSD    , true, NULL, &colorSettings    , NULL, CRCInput::RC_8));

-	if(CVFD::getInstance()->has_lcd)
+	if (CVFD::getInstance()->has_lcd)
 		mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_LCD       , true, NULL, &lcdSettings      , NULL, CRCInput::RC_9));

 	mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_KEYBINDING, true, NULL, &keySettings      , NULL, CRCInput::RC_blue  , NEUTRINO_ICON_BUTTON_BLUE  ));
@@ -772,7 +772,7 @@ void CNeutrinoApp::InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings
 #endif
 #if 0
 	g_RFmod = new RFmod();
-	if(g_RFmod->rfmodfd >=0) {
+	if (g_RFmod->rfmodfd >=0) {
 		g_RFmod->init();
 		CMenuWidget * rfmenu  = new CMenuWidget(LOCALE_RFMOD, "settings.raw");
 		CRfNotifier * rfnot = new CRfNotifier();
@@ -902,7 +902,7 @@ const CMenuOptionChooser::keyval DISEQC_ORDER_OPTIONS[DISEQC_ORDER_OPTION_COUNT]

 class CTPSelectHandler : public CMenuTarget
 {
-	public:
+public:
 	int exec(CMenuTarget* parent,  const std::string &actionkey);
 };

@@ -923,13 +923,13 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/
 	if (parent)
 		parent->hide();

-	for(sit = satellitePositions.begin(); sit != satellitePositions.end(); sit++) {
-		if(!strcmp(sit->second.name.c_str(), CNeutrinoApp::getInstance()->getScanSettings().satNameNoDiseqc)) {
+	for (sit = satellitePositions.begin(); sit != satellitePositions.end(); sit++) {
+		if (!strcmp(sit->second.name.c_str(), CNeutrinoApp::getInstance()->getScanSettings().satNameNoDiseqc)) {
 			position = sit->first;
 			break;
 		}
 	}
-	if(old_position != position) {
+	if (old_position != position) {
 		old_selected = 0;
 		old_position = position;
 	}
@@ -937,17 +937,17 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/
 	CMenuWidget* menu = new CMenuWidget(LOCALE_SCANTS_SELECT_TP, NEUTRINO_ICON_SETTINGS);
 	CMenuSelectorTarget * selector = new CMenuSelectorTarget(&select);
 	i = 0;
-	for(tI = select_transponders.begin(); tI != select_transponders.end(); tI++) {
+	for (tI = select_transponders.begin(); tI != select_transponders.end(); tI++) {
 		t_satellite_position satpos = GET_SATELLITEPOSITION_FROM_TRANSPONDER_ID(tI->first) & 0xFFF;
-		if(GET_SATELLITEPOSITION_FROM_TRANSPONDER_ID(tI->first) & 0xF000)
+		if (GET_SATELLITEPOSITION_FROM_TRANSPONDER_ID(tI->first) & 0xF000)
 			satpos = -satpos;
-		if(satpos != position)
+		if (satpos != position)
 			continue;

 		char buf[128];
 		sprintf(cnt, "%d", i);
 		char * f, *s, *m;
-		switch(frontend->getInfo()->type) {
+		switch (frontend->getInfo()->type) {
 		case FE_QPSK:
 			frontend->getDelSys(tI->second.feparams.u.qpsk.fec_inner, dvbs_get_modulation(tI->second.feparams.u.qpsk.fec_inner),  f, s, m);
 			snprintf(buf, sizeof(buf), "%d %c %d %s %s %s ", tI->second.feparams.frequency/1000, tI->second.polarization ? 'V' : 'H', tI->second.feparams.u.qpsk.symbol_rate/1000, f, s, m);
@@ -964,7 +964,7 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/
 		tmplist.insert(std::pair <int, transponder>(i, tI->second));
 		i++;
 	}
-	if(i == 0) {
+	if (i == 0) {
 		char text[255];
 		sprintf(text, "No transponders found for %s\n", CNeutrinoApp::getInstance()->getScanSettings().satNameNoDiseqc);
 		ShowHintUTF(LOCALE_MESSAGEBOX_ERROR, text, 450, 2);
@@ -973,14 +973,14 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/
 	int retval = menu->exec(NULL, "");
 	delete menu;
 	delete selector;
-	if(select >= 0) {
+	if (select >= 0) {
 		old_selected = select;

 		tmpI = tmplist.find(select);
 		printf("CTPSelectHandler::exec: selected TP: freq %d pol %d SR %d\n", tmpI->second.feparams.frequency,
 		       tmpI->second.polarization, tmpI->second.feparams.u.qpsk.symbol_rate);
 		sprintf(get_set.TP_freq, "%d", tmpI->second.feparams.frequency);
-		switch(frontend->getInfo()->type) {
+		switch (frontend->getInfo()->type) {
 		case FE_QPSK:
 			sprintf(get_set.TP_rate, "%d", tmpI->second.feparams.u.qpsk.symbol_rate);
 			get_set.TP_fec = tmpI->second.feparams.u.qpsk.fec_inner;
@@ -997,7 +997,7 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/
 		}

 	}
-	if(retval == menu_return::RETURN_EXIT_ALL)
+	if (retval == menu_return::RETURN_EXIT_ALL)
 		return menu_return::RETURN_EXIT_ALL;

 	return menu_return::RETURN_REPAINT;
@@ -1037,14 +1037,14 @@ void CNeutrinoApp::InitScanSettings(CMenuWidget &settings)
 	sat_iterator_t sit;

 	t_satellite_position currentSatellitePosition = frontend->getCurrentSatellitePosition();
-	if(g_info.delivery_system == DVB_S) {
+	if (g_info.delivery_system == DVB_S) {
 		satSelect = new CMenuOptionStringChooser(LOCALE_SATSETUP_SATELLITE, scanSettings.satNameNoDiseqc, true, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED, true);
 		satOnOff = new CMenuWidget(LOCALE_SATSETUP_SATELLITE, NEUTRINO_ICON_SETTINGS);
 		satOnOff->addItem(GenericMenuSeparator);
 		satOnOff->addItem(GenericMenuBack);
 		satOnOff->addItem(GenericMenuSeparatorLine);

-		for(sit = satellitePositions.begin(); sit != satellitePositions.end(); sit++) {
+		for (sit = satellitePositions.begin(); sit != satellitePositions.end(); sit++) {
 			printf("Adding sat menu for %s position %d\n", sit->second.name.c_str(), sit->first);

 			satSelect->addOption(sit->second.name.c_str());
@@ -1089,10 +1089,10 @@ void CNeutrinoApp::InitScanSettings(CMenuWidget &settings)
 		}
 	} else if (g_info.delivery_system == DVB_C) {
 		satSelect = new CMenuOptionStringChooser(LOCALE_CABLESETUP_PROVIDER, (char*)scanSettings.satNameNoDiseqc, true);
-		for(sit = satellitePositions.begin(); sit != satellitePositions.end(); sit++) {
+		for (sit = satellitePositions.begin(); sit != satellitePositions.end(); sit++) {
 			printf("Adding cable menu for %s position %d\n", sit->second.name.c_str(), sit->first);
 			satSelect->addOption(sit->second.name.c_str());
-			if(currentSatellitePosition == sit->first) {
+			if (currentSatellitePosition == sit->first) {
 				strcpy(scanSettings.satNameNoDiseqc, sit->second.name.c_str());
 				sfound = 1;
 			}
@@ -1115,7 +1115,7 @@ void CNeutrinoApp::InitScanSettings(CMenuWidget &settings)

 	if (g_info.delivery_system == DVB_S)
 		mod_pol = new CMenuOptionChooser(LOCALE_EXTRA_POL, (int *)&scanSettings.TP_pol, SATSETUP_SCANTP_POL, SATSETUP_SCANTP_POL_COUNT, true, NULL, CRCInput::convertDigitToKey(4));
-	else if(g_info.delivery_system == DVB_C)
+	else if (g_info.delivery_system == DVB_C)
 		mod_pol = new CMenuOptionChooser(LOCALE_EXTRA_MOD, (int *)&scanSettings.TP_mod, SATSETUP_SCANTP_MOD, SATSETUP_SCANTP_MOD_COUNT, true, NULL, CRCInput::convertDigitToKey(4));

 	satfindMenu->addItem(Freq);
@@ -1152,7 +1152,7 @@ void CNeutrinoApp::InitScanSettings(CMenuWidget &settings)
 		motorMenu->addItem(new CMenuOptionNumberChooser(LOCALE_SATSETUP_USALS_REPEAT, (int *)&zapitCfg.repeatUsals, true, 0, 10, NULL, 0, 0, LOCALE_OPTIONS_OFF) );
 	}

-	if(!sfound && satellitePositions.size()) {
+	if (!sfound && satellitePositions.size()) {
 		sit = satellitePositions.begin();
 		strcpy(scanSettings.satNameNoDiseqc, sit->second.name.c_str());
 	}
@@ -1224,7 +1224,7 @@ void CNeutrinoApp::InitScanSettings(CMenuWidget &settings)
 	settings.addItem(ojScantype);
 	settings.addItem(ojBouquets);

-	if(g_info.delivery_system == DVB_S) {
+	if (g_info.delivery_system == DVB_S) {
 		settings.addItem(ojDiseqc);
 		settings.addItem(ojDiseqcRepeats);
 		settings.addItem(fsatSetup);
@@ -1234,7 +1234,7 @@ void CNeutrinoApp::InitScanSettings(CMenuWidget &settings)
 	settings.addItem(new CMenuForwarder(LOCALE_SATSETUP_MANUAL_SCAN, true, NULL, manualScan, "", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
 	settings.addItem(new CMenuForwarder(LOCALE_SATSETUP_AUTO_SCAN, true, NULL, autoScan, "", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));

-	if(g_info.delivery_system == DVB_S) {
+	if (g_info.delivery_system == DVB_S) {
 		settings.addItem(fautoScanAll);
 	}
 }
@@ -1318,7 +1318,7 @@ void CNeutrinoApp::InitServiceSettings(CMenuWidget &service, CMenuWidget &scanSe
 		//	mtdexpert->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_WRITEFLASH   , true, NULL, fe, "writeflash"   ));
 		mtdexpert->addItem(GenericMenuSeparatorLine);
 		mtdexpert->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_READFLASHMTD , true, NULL, fe, "readflashmtd" ));
-		if(softupdate)
+		if (softupdate)
 			mtdexpert->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_WRITEFLASHMTD, true, NULL, fe, "writeflashmtd"));
 		mtdexpert->addItem(GenericMenuSeparatorLine);

@@ -1413,7 +1413,7 @@ void CNeutrinoApp::InitAudioplPicSettings(CMenuWidget &audioplPicSettings)

 	audioplPicSettings.addItem(new CMenuOptionChooser(LOCALE_AUDIOPLAYER_HIGHPRIO     , &g_settings.audioplayer_highprio    , MESSAGEBOX_NO_YES_OPTIONS      , MESSAGEBOX_NO_YES_OPTION_COUNT      , true ));

-	if(CVFD::getInstance()->has_lcd) //FIXME
+	if (CVFD::getInstance()->has_lcd) //FIXME
 		audioplPicSettings.addItem(new CMenuOptionChooser(LOCALE_AUDIOPLAYER_SPECTRUM     , &g_settings.spectrum    , MESSAGEBOX_NO_YES_OPTIONS      , MESSAGEBOX_NO_YES_OPTION_COUNT      , true ));
 	audioplPicSettings.addItem(new CMenuForwarder(LOCALE_AUDIOPLAYER_DEFDIR, true, g_settings.network_nfs_audioplayerdir, this, "audioplayerdir"));
 	audioplPicSettings.addItem(new CMenuOptionChooser(LOCALE_AUDIOPLAYER_ENABLE_SC_METADATA, &g_settings.audioplayer_enable_sc_metadata, MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true ));
@@ -1472,56 +1472,57 @@ const CMenuOptionChooser::keyval_ext CPU_FREQ_OPTIONS[CPU_FREQ_OPTION_COUNT] =
 void CNeutrinoApp::InitMiscSettings(CMenuWidget &miscSettings)
 {
 	dprintf(DEBUG_DEBUG, "init miscsettings\n");
-	miscSettings.addItem(GenericMenuSeparator);
-	miscSettings.addItem(GenericMenuBack);
-	miscSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_SAVESETTINGSNOW, true, NULL, this, "savesettings", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));
-	miscSettings.addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_GENERAL));
-
+	addMenueIntroItems(miscSettings);
+//	miscSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_SAVESETTINGSNOW, true, NULL, this, "savesettings", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));
+	CMenuWidget *miscSettingsGeneral = new CMenuWidget(LOCALE_MISCSETTINGS_GENERAL, NEUTRINO_ICON_SETTINGS);
+	addMenueIntroItems(*miscSettingsGeneral);
 #if 0
 	CMenuOptionChooser *m1 = new CMenuOptionChooser(LOCALE_MISCSETTINGS_SHUTDOWN_REAL_RCDELAY, &g_settings.shutdown_real_rcdelay, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, !g_settings.shutdown_real);
-
 	CMiscNotifier* miscNotifier = new CMiscNotifier( m1 );
-
 	miscSettings.addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_SHUTDOWN_REAL, &g_settings.shutdown_real, OPTIONS_OFF1_ON0_OPTIONS, OPTIONS_OFF1_ON0_OPTION_COUNT, true, miscNotifier));
 #endif
 	CStringInput * miscSettings_shutdown_count = new CStringInput(LOCALE_MISCSETTINGS_SHUTDOWN_COUNT, g_settings.shutdown_count, 3, LOCALE_MISCSETTINGS_SHUTDOWN_COUNT_HINT1, LOCALE_MISCSETTINGS_SHUTDOWN_COUNT_HINT2, "0123456789 ");

-	miscSettings.addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_SHUTDOWN_COUNT, true, g_settings.shutdown_count, miscSettings_shutdown_count));
-	miscSettings.addItem(new CMenuOptionChooser(LOCALE_EXTRA_STARTSTANDBY, &g_settings.power_standby, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
+	miscSettingsGeneral->addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_SHUTDOWN_COUNT, true, g_settings.shutdown_count, miscSettings_shutdown_count));
+	miscSettingsGeneral->addItem(new CMenuOptionChooser(LOCALE_EXTRA_STARTSTANDBY, &g_settings.power_standby, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));

 	//miscSettings.addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY, &g_settings.infobar_sat_display, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
-	miscSettings.addItem(new CMenuOptionChooser(LOCALE_EXTRA_ROTORSWAP, &g_settings.rotor_swap, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
+	miscSettingsGeneral->addItem(new CMenuOptionChooser(LOCALE_EXTRA_ROTORSWAP, &g_settings.rotor_swap, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));

-	miscSettings.addItem(new CMenuOptionChooser(LOCALE_INFOVIEWER_SUBCHAN_DISP_POS, &g_settings.infobar_subchan_disp_pos, INFOBAR_SUBCHAN_DISP_POS_OPTIONS, INFOBAR_SUBCHAN_DISP_POS_OPTIONS_COUNT, true));
-	miscSettings.addItem(new CMenuOptionChooser(LOCALE_EXTRA_CACHE_TXT,  (int *)&g_settings.cacheTXT, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
-	miscSettings.addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_VIRTUAL_ZAP_MODE, &g_settings.virtual_zap_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
+	miscSettingsGeneral->addItem(new CMenuOptionChooser(LOCALE_INFOVIEWER_SUBCHAN_DISP_POS, &g_settings.infobar_subchan_disp_pos, INFOBAR_SUBCHAN_DISP_POS_OPTIONS, INFOBAR_SUBCHAN_DISP_POS_OPTIONS_COUNT, true));
+	miscSettingsGeneral->addItem(new CMenuOptionChooser(LOCALE_EXTRA_CACHE_TXT,  (int *)&g_settings.cacheTXT, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
+	miscSettingsGeneral->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_VIRTUAL_ZAP_MODE, &g_settings.virtual_zap_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
+	miscSettings.addItem( new CMenuForwarder(LOCALE_MISCSETTINGS_GENERAL, true, NULL, miscSettingsGeneral, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED) );

 	//channellist
-	miscSettings.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_CHANNELLIST));
-	miscSettings.addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_CHANNELLIST_EPGTEXT_ALIGN, &g_settings.channellist_epgtext_align_right, CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS, CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS_COUNT, true));
-	miscSettings.addItem(new CMenuOptionChooser(LOCALE_CHANNELLIST_EXTENDED, &g_settings.channellist_extended, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
-	miscSettings.addItem(new CMenuOptionChooser(LOCALE_CHANNELLIST_MAKE_HDLIST, &g_settings.make_hd_list, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
-	miscSettings.addItem(new CMenuOptionChooser(LOCALE_EXTRA_ZAP_CYCLE, &g_settings.zap_cycle, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
-
-        miscSettings.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_EPG_HEAD));
+	CMenuWidget *miscSettingsChannellist = new CMenuWidget(LOCALE_MISCSETTINGS_CHANNELLIST, NEUTRINO_ICON_SETTINGS);
+	addMenueIntroItems(*miscSettingsChannellist);
+	miscSettingsChannellist->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_CHANNELLIST_EPGTEXT_ALIGN, &g_settings.channellist_epgtext_align_right, CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS, CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS_COUNT, true));
+	miscSettingsChannellist->addItem(new CMenuOptionChooser(LOCALE_CHANNELLIST_EXTENDED, &g_settings.channellist_extended, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
+	miscSettingsChannellist->addItem(new CMenuOptionChooser(LOCALE_CHANNELLIST_MAKE_HDLIST, &g_settings.make_hd_list, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
+	miscSettingsChannellist->addItem(new CMenuOptionChooser(LOCALE_EXTRA_ZAP_CYCLE, &g_settings.zap_cycle, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
+	miscSettings.addItem( new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLIST, true, NULL, miscSettingsChannellist, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW) );

+	//EPGSettings
+	CMenuWidget *miscSettingsEPGSettings = new CMenuWidget(LOCALE_MISCSETTINGS_EPG_HEAD, NEUTRINO_ICON_SETTINGS);
+	addMenueIntroItems(*miscSettingsEPGSettings);
 	CSectionsdConfigNotifier* sectionsdConfigNotifier = new CSectionsdConfigNotifier;
-	miscSettings.addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SAVE, &g_settings.epg_save, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
+	miscSettingsEPGSettings->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SAVE, &g_settings.epg_save, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
 	CStringInput * miscSettings_epg_cache = new CStringInput(LOCALE_MISCSETTINGS_EPG_CACHE, &g_settings.epg_cache, 2,LOCALE_MISCSETTINGS_EPG_CACHE_HINT1, LOCALE_MISCSETTINGS_EPG_CACHE_HINT2 , "0123456789 ", sectionsdConfigNotifier);
-        miscSettings.addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_CACHE, true, g_settings.epg_cache, miscSettings_epg_cache));
+	miscSettingsEPGSettings->addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_CACHE, true, g_settings.epg_cache, miscSettings_epg_cache));
 	CStringInput * miscSettings_epg_cache_e = new CStringInput(LOCALE_MISCSETTINGS_EPG_EXTENDEDCACHE, &g_settings.epg_extendedcache, 3,LOCALE_MISCSETTINGS_EPG_EXTENDEDCACHE_HINT1, LOCALE_MISCSETTINGS_EPG_EXTENDEDCACHE_HINT2 , "0123456789 ", sectionsdConfigNotifier);
-
-        miscSettings.addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_EXTENDEDCACHE, true, g_settings.epg_extendedcache, miscSettings_epg_cache_e));
-
+	miscSettingsEPGSettings->addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_EXTENDEDCACHE, true, g_settings.epg_extendedcache, miscSettings_epg_cache_e));
 	CStringInput * miscSettings_epg_old_events = new CStringInput(LOCALE_MISCSETTINGS_EPG_OLD_EVENTS, &g_settings.epg_old_events, 2,LOCALE_MISCSETTINGS_EPG_OLD_EVENTS_HINT1, LOCALE_MISCSETTINGS_EPG_OLD_EVENTS_HINT2 , "0123456789 ", sectionsdConfigNotifier);
-        miscSettings.addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_OLD_EVENTS, true, g_settings.epg_old_events, miscSettings_epg_old_events));
+	miscSettingsEPGSettings->addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_OLD_EVENTS, true, g_settings.epg_old_events, miscSettings_epg_old_events));
 	CStringInput * miscSettings_epg_max_events = new CStringInput(LOCALE_MISCSETTINGS_EPG_MAX_EVENTS, &g_settings.epg_max_events, 5,LOCALE_MISCSETTINGS_EPG_MAX_EVENTS_HINT1, LOCALE_MISCSETTINGS_EPG_MAX_EVENTS_HINT2 , "0123456789 ", sectionsdConfigNotifier);
-        miscSettings.addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_MAX_EVENTS, true, g_settings.epg_max_events, miscSettings_epg_max_events));
-        miscSettings.addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_DIR, true, g_settings.epg_dir, this, "epgdir"));
+	miscSettingsEPGSettings->addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_MAX_EVENTS, true, g_settings.epg_max_events, miscSettings_epg_max_events));
+	miscSettingsEPGSettings->addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_DIR, true, g_settings.epg_dir, this, "epgdir"));
+	miscSettings.addItem( new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_HEAD, true, NULL, miscSettingsEPGSettings, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN) );
+	//end of EPGSettings

 #if 0
 	miscSettings.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_DRIVER_BOOT));
-	if(access("/var/tuxbox/emlog", F_OK) == 0)
+	if (access("/var/tuxbox/emlog", F_OK) == 0)
 		g_settings.emlog = 1;
 	miscSettings.addItem(new CMenuOptionChooser(LOCALE_EXTRA_USELOG, &g_settings.emlog, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, new CLogChangeNotifier));
 #endif
@@ -1537,11 +1538,14 @@ void CNeutrinoApp::InitMiscSettings(CMenuWidget &miscSettings)
 	miscSettings.addItem(new CMenuForwarder(LOCALE_KEYBINDINGMENU_REPEATBLOCKGENERIC, true, g_settings.repeat_genericblocker, keySettings_repeat_genericblocker));
 	miscSettings.addItem(m1);
 #endif
+	//filebrowsersettings
+	CMenuWidget *miscSettingsFilebrowser = new CMenuWidget(LOCALE_FILEBROWSER_HEAD, NEUTRINO_ICON_SETTINGS);
+	addMenueIntroItems(*miscSettingsFilebrowser);
+	miscSettingsFilebrowser->addItem(new CMenuOptionChooser(LOCALE_FILESYSTEM_IS_UTF8            , &g_settings.filesystem_is_utf8            , MISCSETTINGS_FILESYSTEM_IS_UTF8_OPTIONS, MISCSETTINGS_FILESYSTEM_IS_UTF8_OPTION_COUNT, true ));
+	miscSettingsFilebrowser->addItem(new CMenuOptionChooser(LOCALE_FILEBROWSER_SHOWRIGHTS        , &g_settings.filebrowser_showrights        , MESSAGEBOX_NO_YES_OPTIONS              , MESSAGEBOX_NO_YES_OPTION_COUNT              , true ));
+	miscSettingsFilebrowser->addItem(new CMenuOptionChooser(LOCALE_FILEBROWSER_DENYDIRECTORYLEAVE, &g_settings.filebrowser_denydirectoryleave, MESSAGEBOX_NO_YES_OPTIONS              , MESSAGEBOX_NO_YES_OPTION_COUNT              , true ));
+	miscSettings.addItem( new CMenuForwarder(LOCALE_FILEBROWSER_HEAD, true, NULL, miscSettingsFilebrowser, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE) );

-	miscSettings.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_FILEBROWSER_HEAD));
-	miscSettings.addItem(new CMenuOptionChooser(LOCALE_FILESYSTEM_IS_UTF8            , &g_settings.filesystem_is_utf8            , MISCSETTINGS_FILESYSTEM_IS_UTF8_OPTIONS, MISCSETTINGS_FILESYSTEM_IS_UTF8_OPTION_COUNT, true ));
-	miscSettings.addItem(new CMenuOptionChooser(LOCALE_FILEBROWSER_SHOWRIGHTS        , &g_settings.filebrowser_showrights        , MESSAGEBOX_NO_YES_OPTIONS              , MESSAGEBOX_NO_YES_OPTION_COUNT              , true ));
-	miscSettings.addItem(new CMenuOptionChooser(LOCALE_FILEBROWSER_DENYDIRECTORYLEAVE, &g_settings.filebrowser_denydirectoryleave, MESSAGEBOX_NO_YES_OPTIONS              , MESSAGEBOX_NO_YES_OPTION_COUNT              , true ));
 	// miscSettings.addItem(new CMenuForwarder(LOCALE_EXTRA_KEY_PLUGIN, true, g_settings.onekey_plugin,this,"onekeyplugin"));
 	funNotifier = new CFanControlNotifier();
 	//miscSettings.addItem(new CMenuOptionNumberChooser(LOCALE_FAN_SPEED, &g_settings.fan_speed, true, 0, 14, funNotifier, 0, 0, LOCALE_OPTIONS_OFF) );
@@ -1568,15 +1572,15 @@ void CNeutrinoApp::InitLanguageSettings(CMenuWidget &languageSettings)

 	char *pfad[] = {(char *) DATADIR "/neutrino/locale",(char *) "/var/tuxbox/config/locale"};

-	for(int p = 0;p < 2;p++) {
+	for (int p = 0; p < 2; p++) {
 		n = scandir(pfad[p], &namelist, 0, alphasort);
-		if(n < 0) {
+		if (n < 0) {
 			perror("loading locales: scandir");
 		} else {
-			for(int count=0;count<n;count++) {
+			for (int count=0; count<n; count++) {
 				char * locale = strdup(namelist[count]->d_name);
 				char * pos = strstr(locale, ".locale");
-				if(pos != NULL) {
+				if (pos != NULL) {
 					char iname[50];
 					*pos = '\0';
 					sprintf(iname, "%s.raw", locale);
@@ -1848,7 +1852,7 @@ void CNeutrinoApp::InitRecordingSettings(CMenuWidget &recordingSettings)
 	recordingSettings.addItem(fRecDir);
 	recordingSettings.addItem(fTsDir);
 	recordingSettings.addItem(new CMenuOptionNumberChooser(LOCALE_EXTRA_RECORD_TIME, &g_settings.record_hours, true, 1, 24, NULL) );
-	if(1) { //has_hdd) {
+	if (1) { //has_hdd) {
 		recordingSettings.addItem(new CMenuOptionChooser(LOCALE_EXTRA_TIMESHIFT_PAUSE, &g_settings.timeshift_pause, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
 		recordingSettings.addItem(new CMenuOptionNumberChooser(LOCALE_EXTRA_AUTO_TIMESHIFT, &g_settings.auto_timeshift, true, 0, 300, NULL));
 		recordingSettings.addItem(new CMenuOptionChooser(LOCALE_EXTRA_AUTO_DELETE, &g_settings.auto_delete, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
@@ -1924,7 +1928,7 @@ void CNeutrinoApp::InitRecordingSettings(CMenuWidget &recordingSettings)
 	directRecordingSettings->addItem(oj11);
 	directRecordingSettings->addItem(oj13);
 	recordingstatus = 0;
-	if(has_hdd) {
+	if (has_hdd) {
 		directRecordingSettings->addItem(new CMenuOptionChooser(LOCALE_EXTRA_TIMESHIFT_PAUSE, &g_settings.timeshift_pause, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
 		directRecordingSettings->addItem(new CMenuOptionNumberChooser(LOCALE_EXTRA_AUTO_TIMESHIFT, &g_settings.auto_timeshift, true, 0, 300));
 		directRecordingSettings->addItem(new CMenuOptionChooser(LOCALE_EXTRA_AUTO_DELETE, &g_settings.auto_delete, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
@@ -2569,14 +2573,14 @@ void CNeutrinoApp::SelectNVOD()
 	{
 		// NVOD/SubService- Kanal!
 		CMenuWidget NVODSelector(g_RemoteControl->are_subchannels ? LOCALE_NVODSELECTOR_SUBSERVICE : LOCALE_NVODSELECTOR_HEAD, "video.raw", 350);
-                if(getNVODMenu(&NVODSelector))
+		if (getNVODMenu(&NVODSelector))
 			NVODSelector.exec(NULL, "");
 	}
 }

 bool CNeutrinoApp::getNVODMenu(CMenuWidget* menu)
 {
-        if(menu == NULL)
+	if (menu == NULL)
 		return false;
 	if (g_RemoteControl->subChannels.empty())
 		return false;
@@ -2586,11 +2590,11 @@ bool CNeutrinoApp::getNVODMenu(CMenuWidget* menu)
 	int count = 0;
 	char nvod_id[5];

-        for( CSubServiceListSorted::iterator e=g_RemoteControl->subChannels.begin(); e!=g_RemoteControl->subChannels.end(); ++e)
+	for ( CSubServiceListSorted::iterator e=g_RemoteControl->subChannels.begin(); e!=g_RemoteControl->subChannels.end(); ++e)
 	{
 		sprintf(nvod_id, "%d", count);

-                if( !g_RemoteControl->are_subchannels ) {
+		if ( !g_RemoteControl->are_subchannels ) {
 			char nvod_time_a[50], nvod_time_e[50], nvod_time_x[50];
 			char nvod_s[100];
 			struct  tm *tmZeit;
@@ -2603,11 +2607,11 @@ bool CNeutrinoApp::getNVODMenu(CMenuWidget* menu)
 			sprintf(nvod_time_e, "%02d:%02d", tmZeit->tm_hour, tmZeit->tm_min);

 			time_t jetzt=time(NULL);
-                        if(e->startzeit > jetzt) {
+			if (e->startzeit > jetzt) {
 				int mins=(e->startzeit- jetzt)/ 60;
 				sprintf(nvod_time_x, g_Locale->getText(LOCALE_NVOD_STARTING), mins);
 			}
-                        else if( (e->startzeit<= jetzt) && (jetzt < endtime) ) {
+			else if ( (e->startzeit<= jetzt) && (jetzt < endtime) ) {
 				int proz=(jetzt- e->startzeit)*100/ e->dauer;
 				sprintf(nvod_time_x, g_Locale->getText(LOCALE_NVOD_PERCENTAGE), proz);
 			}
@@ -2623,7 +2627,7 @@ bool CNeutrinoApp::getNVODMenu(CMenuWidget* menu)
 		count++;
 	}

-        if( g_RemoteControl->are_subchannels ) {
+	if ( g_RemoteControl->are_subchannels ) {
 		menu->addItem(GenericMenuSeparatorLine);
 		CMenuOptionChooser* oj = new CMenuOptionChooser(LOCALE_NVODSELECTOR_DIRECTORMODE, &g_RemoteControl->director_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
 		menu->addItem(oj);
@@ -2634,14 +2638,14 @@ bool CNeutrinoApp::getNVODMenu(CMenuWidget* menu)
 void CNeutrinoApp::SelectAPID()
 {
 #if 0
-	if( g_RemoteControl->current_PIDs.APIDs.size()> 1 )
+	if ( g_RemoteControl->current_PIDs.APIDs.size()> 1 )
 	{
 		// wir haben APIDs f<>r diesen Kanal!

 		CMenuWidget APIDSelector(LOCALE_APIDSELECTOR_HEAD, "audio.raw", 300);
 		APIDSelector.addItem(GenericMenuSeparator);

-		for( unsigned int count=0; count<g_RemoteControl->current_PIDs.APIDs.size(); count++ )
+		for ( unsigned int count=0; count<g_RemoteControl->current_PIDs.APIDs.size(); count++ )
 		{
 			char apid[5];
 			sprintf(apid, "%d", count);
@@ -2666,15 +2670,17 @@ const neutrino_msg_t key_helper_msg_def[BUTTONMAX]={CRCInput::RC_red,CRCInput::R
 const char * key_helper_icon_def[BUTTONMAX]={NEUTRINO_ICON_BUTTON_RED,NEUTRINO_ICON_BUTTON_GREEN,NEUTRINO_ICON_BUTTON_YELLOW,NEUTRINO_ICON_BUTTON_BLUE};
 class CKeyHelper
 {
-        private:
+private:
 	int number_key;
 	bool color_key_used[BUTTONMAX];
-        public:
-                CKeyHelper(){reset();};
+public:
+	CKeyHelper() {
+		reset();
+	};
 	void reset(void)
 	{
 		number_key = 1;
-                        for(int i= 0; i < BUTTONMAX; i++ )
+		for (int i= 0; i < BUTTONMAX; i++ )
 			color_key_used[i] = false;
 	};

@@ -2687,20 +2693,20 @@ class CKeyHelper
 	{
 		bool result = false;
 		int button = -1;
-                        if(prefered_key == CRCInput::RC_red)
+		if (prefered_key == CRCInput::RC_red)
 			button = 0;
-                        if(prefered_key == CRCInput::RC_green)
+		if (prefered_key == CRCInput::RC_green)
 			button = 1;
-                        if(prefered_key == CRCInput::RC_yellow)
+		if (prefered_key == CRCInput::RC_yellow)
 			button = 2;
-                        if(prefered_key == CRCInput::RC_blue)
+		if (prefered_key == CRCInput::RC_blue)
 			button = 3;

 		*msg = CRCInput::RC_nokey;
 		*icon = "";
-                        if(button >= 0 && button < BUTTONMAX)
+		if (button >= 0 && button < BUTTONMAX)
 		{ // try to get color button
-                                if( color_key_used[button] == false)
+			if ( color_key_used[button] == false)
 			{
 				color_key_used[button] = true;
 				*msg = key_helper_msg_def[button];
@@ -2709,14 +2715,14 @@ class CKeyHelper
 			}
 		}

-                        if( result == false && number_key < 10) // no key defined yet, at least try to get a numbered key
+		if ( result == false && number_key < 10) // no key defined yet, at least try to get a numbered key
 		{
 			// there is still a available number_key
 			*msg = CRCInput::convertDigitToKey(number_key);
 			*icon = "";
-                                if(number_key == 9)
+			if (number_key == 9)
 				number_key = 0;
-                                else if(number_key == 0)
+			else if (number_key == 0)
 				number_key = 10;
 			else
 				number_key++;
@@ -2729,7 +2735,7 @@ class CKeyHelper
 // USERMENU
 bool CNeutrinoApp::showUserMenu(int button)
 {
-        if(button < 0 || button >= SNeutrinoSettings::BUTTON_MAX)
+	if (button < 0 || button >= SNeutrinoSettings::BUTTON_MAX)
 		return false;

 	CMenuItem* menu_item = NULL;
@@ -2754,20 +2760,20 @@ bool CNeutrinoApp::showUserMenu(int button)

 	std::string txt = g_settings.usermenu_text[button];
 	if (button == SNeutrinoSettings::BUTTON_RED) {
-                if( txt.empty() )
+		if ( txt.empty() )
 			txt = g_Locale->getText(LOCALE_INFOVIEWER_EVENTLIST);
 	}
-        else if( button == SNeutrinoSettings::BUTTON_GREEN) {
-                if( txt.empty() )
+	else if ( button == SNeutrinoSettings::BUTTON_GREEN) {
+		if ( txt.empty() )
 			txt = g_Locale->getText(LOCALE_INFOVIEWER_LANGUAGES);
 	}
-        else if( button == SNeutrinoSettings::BUTTON_YELLOW) {
-                if( txt.empty() )
+	else if ( button == SNeutrinoSettings::BUTTON_YELLOW) {
+		if ( txt.empty() )
 			txt = g_Locale->getText((g_RemoteControl->are_subchannels) ? LOCALE_INFOVIEWER_SUBSERVICE : LOCALE_INFOVIEWER_SELECTTIME);
 		//txt = g_Locale->getText(LOCALE_NVODSELECTOR_DIRECTORMODE);
 	}
-        else if( button == SNeutrinoSettings::BUTTON_BLUE) {
-                if( txt.empty() )
+	else if ( button == SNeutrinoSettings::BUTTON_BLUE) {
+		if ( txt.empty() )
 			txt = g_Locale->getText(LOCALE_INFOVIEWER_STREAMINFO);
 	}
 	CMenuWidget *menu = new CMenuWidget(txt.c_str() , "features.raw", 350);
@@ -2776,15 +2782,15 @@ bool CNeutrinoApp::showUserMenu(int button)
 	menu->addItem(GenericMenuSeparator);

 	// go through any postition number
-        for(int pos = 0; pos < SNeutrinoSettings::ITEM_MAX ; pos++) {
+	for (int pos = 0; pos < SNeutrinoSettings::ITEM_MAX ; pos++) {
 		// now compare pos with the position of any item. Add this item if position is the same
-                switch(g_settings.usermenu[button][pos]) {
+		switch (g_settings.usermenu[button][pos]) {
 		case SNeutrinoSettings::ITEM_NONE:
 			// do nothing
 			break;

 		case SNeutrinoSettings::ITEM_BAR:
-                                if(menu_prev == -1 || menu_prev == SNeutrinoSettings::ITEM_BAR )
+			if (menu_prev == -1 || menu_prev == SNeutrinoSettings::ITEM_BAR )
 				break;

 			menu->addItem(GenericMenuSeparatorLine);
@@ -2801,7 +2807,7 @@ bool CNeutrinoApp::showUserMenu(int button)
 			break;

 		case SNeutrinoSettings::ITEM_RECORD:
-                                if(g_settings.recording_type == RECORDING_OFF)
+			if (g_settings.recording_type == RECORDING_OFF)
 				break;

 			menu_items++;
@@ -2895,7 +2901,7 @@ bool CNeutrinoApp::showUserMenu(int button)
 			if (!(g_RemoteControl->subChannels.empty())) {
 				// NVOD/SubService- Kanal!
 				tmpNVODSelector = new CMenuWidget(g_RemoteControl->are_subchannels ? LOCALE_NVODSELECTOR_SUBSERVICE : LOCALE_NVODSELECTOR_HEAD, "video.raw", 350);
-                                        if(getNVODMenu(tmpNVODSelector)) {
+				if (getNVODMenu(tmpNVODSelector)) {
 					menu_items++;
 					menu_prev = SNeutrinoSettings::ITEM_SUBCHANNEL;
 					keyhelper.get(&key,&icon);
@@ -2917,7 +2923,7 @@ bool CNeutrinoApp::showUserMenu(int button)
 		{
 			char id[5];
 			int cnt = 0;
-                                for(unsigned int count = 0; count < (unsigned int) g_PluginList->getNumberOfPlugins(); count++)
+			for (unsigned int count = 0; count < (unsigned int) g_PluginList->getNumberOfPlugins(); count++)
 			{
 				std::string tmp = g_PluginList->getName(count);
 				if (g_PluginList->getType(count)== CPlugins::P_TYPE_TOOL && !g_PluginList->isHidden(count) && tmp.find("Teletext") == std::string::npos)
@@ -2954,7 +2960,7 @@ bool CNeutrinoApp::showUserMenu(int button)
 			break;

 		case SNeutrinoSettings::ITEM_VTXT:
-                                for(unsigned int count = 0; count < (unsigned int) g_PluginList->getNumberOfPlugins(); count++)
+			for (unsigned int count = 0; count < (unsigned int) g_PluginList->getNumberOfPlugins(); count++)
 			{
 				std::string tmp = g_PluginList->getName(count);
 				if (g_PluginList->getType(count)== CPlugins::P_TYPE_TOOL && !g_PluginList->isHidden(count) && tmp.find("Teletext") != std::string::npos)
@@ -2980,14 +2986,14 @@ bool CNeutrinoApp::showUserMenu(int button)
 	// Allow some tailoring for privat image bakers ;)
 	if (button == SNeutrinoSettings::BUTTON_RED) {
 	}
-        else if( button == SNeutrinoSettings::BUTTON_GREEN) {
+	else if ( button == SNeutrinoSettings::BUTTON_GREEN) {
 	}
-        else if( button == SNeutrinoSettings::BUTTON_YELLOW) {
+	else if ( button == SNeutrinoSettings::BUTTON_YELLOW) {
 	}
-        else if( button == SNeutrinoSettings::BUTTON_BLUE) {
+	else if ( button == SNeutrinoSettings::BUTTON_BLUE) {
 #ifdef _EXPERIMENTAL_SETTINGS_
 		//Experimental Settings
-                if(menu_prev != -1)
+		if (menu_prev != -1)
 			menu->addItem(GenericMenuSeparatorLine);
 		menu_items ++;
 		menu_key++;
@@ -2999,7 +3005,7 @@ bool CNeutrinoApp::showUserMenu(int button)

 	// show menu if there are more than 2 items only
 	// otherwise, we start the item directly (must be the last one)
-        if(menu_items > 1 ) {
+	if (menu_items > 1 ) {
 		menu->setSelected(selected[button]);
 		menu->exec(NULL,"");
 		selected[button] = menu->getSelected();
@@ -3011,18 +3017,26 @@ bool CNeutrinoApp::showUserMenu(int button)
 	//AudioMute(current_muted, true);

 	// clear the heap
-        if(tmpFavorites)                delete tmpFavorites;
-        if(tmpPauseSectionsdNotifier)   delete tmpPauseSectionsdNotifier;
-        if(tmpAudioSelectMenuHandler)   delete tmpAudioSelectMenuHandler;
-        if(tmpNVODSelector)             delete tmpNVODSelector;
-        if(tmpStreamInfo2Handler)       delete tmpStreamInfo2Handler;
-        if(tmpEventListHandler)         delete tmpEventListHandler;
-        if(tmpEPGplusHandler)           delete tmpEPGplusHandler;
-        if(tmpEPGDataHandler)           delete tmpEPGDataHandler;
-        if(menu)                        delete menu;
+	if (tmpFavorites)                delete tmpFavorites;
+	if (tmpPauseSectionsdNotifier)   delete tmpPauseSectionsdNotifier;
+	if (tmpAudioSelectMenuHandler)   delete tmpAudioSelectMenuHandler;
+	if (tmpNVODSelector)             delete tmpNVODSelector;
+	if (tmpStreamInfo2Handler)       delete tmpStreamInfo2Handler;
+	if (tmpEventListHandler)         delete tmpEventListHandler;
+	if (tmpEPGplusHandler)           delete tmpEPGplusHandler;
+	if (tmpEPGDataHandler)           delete tmpEPGDataHandler;
+	if (menu)                        delete menu;
 	return 0;
 }

 void CNeutrinoApp::ShowStreamFeatures()
 {
 }
+
+/*adds the typical menu intro with separator, back button and separatorline to menu*/
+void CNeutrinoApp::addMenueIntroItems(CMenuWidget &item)
+{
+	item.addItem(GenericMenuSeparator);
+	item.addItem(GenericMenuBack);
+	item.addItem(GenericMenuSeparatorLine);
+}