[Commits] [Tuxbox-GIT] Tuxbox-GIT: apps branch master updated. CVS-Final-26-gaeec2ae

[Thilo G. <tux...@ne...>]

Project "Tuxbox-GIT: apps":

The branch, master has been updated
       via  aeec2aea76430499e40c9c8a98e1b32d0df15379 (commit)
       via  351fe6d6a0c8c8715887d02e07c9b80e0677f1f2 (commit)
       via  c663a48ec1c6d2a7969fa9a8c5d024c4d026e27b (commit)
       via  498641dff82f450284ca9f5582819f786fcb1d22 (commit)
       via  5586a6af552f2375953157fcf7e7d9cc90a7fd9a (commit)
       via  2d58153e492108f094ba12b9a46d45e00265fd87 (commit)
       via  60c7b6f76b8aa0481e9f15da00231cad79777deb (commit)
       via  f737b571bd8136a94ce62f69883f2f488d253e6d (commit)
       via  8ea6e2018875e6d9e58b83843db0acc14243f804 (commit)
       via  3c891e5df0021a7f57cb3400ecb2752c69ec25d4 (commit)
       via  4c502095df0dadaeba0bcb6188ade38d2c538670 (commit)
       via  16b5095c16dd1546274df02ea3bc04790178d0cd (commit)
       via  4150b22fdf5045a9b2148011b94f4e5f902414c7 (commit)
       via  77ce5765bedac2eb21564f5d70693250c641a8d4 (commit)
       via  6083e4247a44c6be12848659e2954ebfb7c201aa (commit)
       via  6c6ca237bd52ed267b83625f612fa0295bfaf240 (commit)
       via  963122180bb56ef5dac9ceaef3be2a197405757b (commit)
       via  42fe1e8052ff522647558b896a40ba7c519a2716 (commit)
       via  590a1cc04629fd022ebdd16fddb10c881e597eb0 (commit)
       via  4719e3de369e74e42923e3119029307a2da09018 (commit)
       via  d55167546097b02a1644f744464ac1209914bc43 (commit)
       via  70be40cc91517c5936881d880372fe5569b5df02 (commit)
       via  44eddc2ae98f0d4be0d9dd2210183a364a0cadc8 (commit)
       via  e1d6f210e46d330429f1470f465deced70dd6fcd (commit)
       via  cc93e6d3a54bbf18b9472c88311397bbd324f5ef (commit)
       via  d5c485e9704d890f9f1ef3b3fd794198ea93bf67 (commit)
      from  26e9965a087d64ca79cff16edd50a6a382c4ce98 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit aeec2aea76430499e40c9c8a98e1b32d0df15379
Author: Gaucho316 <Gau...@ho...>
Date:   Wed Dec 19 19:22:46 2012 +0100

    yWeb: close td tag in timer list
    
    Signed-off-by: Gaucho316 <Gau...@ho...>

diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Timer_List.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Timer_List.yhtm
index 0c86b68..fe51083 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Timer_List.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Timer_List.yhtm
@@ -24,7 +24,7 @@
 	<td>%s</td>
 	<td>%s</td>
 	<td>%s</td>
-	<td>%s<br/>
+	<td>%s</td>
 	<td>
 		<a href="/fb/timer.dbox2?action=remove&amp;id=%d">
 		<img src="/images/remove.png" alt="Timer l&ouml;schen"/></a>

commit 351fe6d6a0c8c8715887d02e07c9b80e0677f1f2
Author: Gaucho316 <Gau...@ho...>
Date:   Wed Dec 19 19:22:34 2012 +0100

    nhttpd: fix segfault if logging is on, ported from Coolstream Git
    
    Signed-off-by: Gaucho316 <Gau...@ho...>

diff --git a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/ylogging.cpp b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/ylogging.cpp
index 1c5859a..9a98d65 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/ylogging.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/ylogging.cpp
@@ -85,7 +85,9 @@ void CLogging::printf ( const char *fmt, ... )
 	va_end(arglist);
 
 	pthread_mutex_lock( &Log_mutex );
-	::printf(buffer);
+	buffer[bufferlen - 1] = '\0';
+	::printf("%s", buffer);
+	fflush(stdout);
 	if(LogToFile)
 	{
 		;	//FIXME Logging to File

commit c663a48ec1c6d2a7969fa9a8c5d024c4d026e27b
Author: Gaucho316 <Gau...@ho...>
Date:   Wed Dec 19 19:22:22 2012 +0100

    Neutrino bouquet list: show selected list entry on LCD
    
    Signed-off-by: Gaucho316 <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/bouquetlist.cpp b/tuxbox/neutrino/src/gui/bouquetlist.cpp
index b8b60f8..3f36106 100644
--- a/tuxbox/neutrino/src/gui/bouquetlist.cpp
+++ b/tuxbox/neutrino/src/gui/bouquetlist.cpp
@@ -181,6 +181,7 @@ int CBouquetList::show()
 	{
 		return res;
 	}
+	CLCD::getInstance()->setMode(CLCD::MODE_MENU_UTF8, g_Locale->getText(LOCALE_BOUQUETLIST_HEAD));
 
 	int digits = 1;
 	int i= Bouquets.size();
@@ -319,6 +320,9 @@ int CBouquetList::show()
 		};
 	}
 	hide();
+
+	CLCD::getInstance()->setMode(CLCD::MODE_TVRADIO);
+
 	if(zapOnExit)
 	{
 		return (selected);
@@ -363,6 +367,9 @@ void CBouquetList::paintItem(int pos)
 		char tmp[10];
 		sprintf((char*) tmp, "%d", liststart+pos+ 1);
 
+		if (liststart + pos == selected)
+			CLCD::getInstance()->showMenuText(0, bouq->channelList->getName(), -1, true); // UTF-8
+
 		int numpos = x+5+numwidth- g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->getRenderWidth(tmp);
 		g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->RenderString(numpos,ypos+fheight, numwidth+5, tmp, color, fheight);
 

commit 498641dff82f450284ca9f5582819f786fcb1d22
Author: Gaucho316 <Gau...@ho...>
Date:   Wed Dec 19 19:22:10 2012 +0100

    Neutrino plugin list: show selected list entry on LCD
    
    Signed-off-by: Gaucho316 <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/pluginlist.cpp b/tuxbox/neutrino/src/gui/pluginlist.cpp
index dde2fb1..b4a6469 100644
--- a/tuxbox/neutrino/src/gui/pluginlist.cpp
+++ b/tuxbox/neutrino/src/gui/pluginlist.cpp
@@ -292,6 +292,12 @@ void CPluginList::paintItem(int pos)
 		pluginitem* actplugin = pluginlist[liststart+pos];
 		g_Font[SNeutrinoSettings::FONT_TYPE_GAMELIST_ITEMLARGE]->RenderString(x+10, ypos+fheight1+3, width-20, actplugin->name, color, 0, true); // UTF-8
 		g_Font[SNeutrinoSettings::FONT_TYPE_GAMELIST_ITEMSMALL]->RenderString(x+20, ypos+fheight,    width-20, actplugin->desc, color, 0, true); // UTF-8
+
+		if(liststart+pos==selected)
+		{
+			CLCD::getInstance()->showMenuText(0, actplugin->name.c_str(), -1, true); // UTF-8
+			CLCD::getInstance()->showMenuText(1, actplugin->desc.c_str(), -1, true); // UTF-8
+		}
 	}
 }
 
@@ -340,6 +346,8 @@ void CPluginList::paint()
 	
    liststart = (selected/listmaxshow)*listmaxshow;
 
+	CLCD::getInstance()->setMode(CLCD::MODE_MENU_UTF8, g_Locale->getText(name));
+
 	paintHead();
 	paintItems();
 }

commit 5586a6af552f2375953157fcf7e7d9cc90a7fd9a
Author: Gaucho316 <Gau...@ho...>
Date:   Wed Dec 19 19:21:55 2012 +0100

    Neutrino moviebrowser: show message when deleting files, ported from Coolstream Git
    
    Signed-off-by: Gaucho316 <Gau...@ho...>

diff --git a/tuxbox/neutrino/data/locale/deutsch.locale b/tuxbox/neutrino/data/locale/deutsch.locale
index 1132905..e6e7f9e 100644
--- a/tuxbox/neutrino/data/locale/deutsch.locale
+++ b/tuxbox/neutrino/data/locale/deutsch.locale
@@ -802,6 +802,7 @@ moviebrowser.browser_row_item Spalteninfo
 moviebrowser.browser_row_nr Anzahl Spalten
 moviebrowser.browser_row_width Spaltenbreite [Punkte]
 moviebrowser.change_view Ansicht wechseln
+moviebrowser.delete_info Lösche Dateien, bitte warten...
 moviebrowser.dir Pfad
 moviebrowser.dir_head Zusätzliche Verzeichnisse
 moviebrowser.edit_book Bookmark ändern
diff --git a/tuxbox/neutrino/data/locale/english.locale b/tuxbox/neutrino/data/locale/english.locale
index c4f7424..f634001 100644
--- a/tuxbox/neutrino/data/locale/english.locale
+++ b/tuxbox/neutrino/data/locale/english.locale
@@ -802,6 +802,7 @@ moviebrowser.browser_row_item Row item
 moviebrowser.browser_row_nr Number of rows
 moviebrowser.browser_row_width Row width
 moviebrowser.change_view Change view
+moviebrowser.delete_info Delete files, please wait...
 moviebrowser.dir Path
 moviebrowser.dir_head Additional paths
 moviebrowser.edit_book Bookmark change
diff --git a/tuxbox/neutrino/src/gui/moviebrowser.cpp b/tuxbox/neutrino/src/gui/moviebrowser.cpp
index 346a8ba..42a8510 100644
--- a/tuxbox/neutrino/src/gui/moviebrowser.cpp
+++ b/tuxbox/neutrino/src/gui/moviebrowser.cpp
@@ -2169,6 +2169,9 @@ void CMovieBrowser::onDeleteFile(MI_MOVIE_INFO& movieSelectionHandler)
 		msg += g_Locale->getText(LOCALE_FILEBROWSER_DODELETE2);
 		if (ShowMsgUTF(LOCALE_FILEBROWSER_DELETE, msg, CMessageBox::mbrNo, CMessageBox::mbYes|CMessageBox::mbNo)==CMessageBox::mbrYes)
 		{
+			CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_MOVIEBROWSER_DELETE_INFO));
+			hintBox.paint();
+
 			CFile file_xml  = movieSelectionHandler.file; 
 			if(m_movieInfo.convertTs2XmlName(&file_xml.Name) == true)  
 			{
@@ -2177,6 +2180,9 @@ void CMovieBrowser::onDeleteFile(MI_MOVIE_INFO& movieSelectionHandler)
 
 			delFile(movieSelectionHandler.file);
 
+			hintBox.hide();
+			g_RCInput->clearRCMsg();
+
 			m_vMovieInfo.erase( (std::vector<MI_MOVIE_INFO>::iterator)&movieSelectionHandler);
 			updateSerienames();
 			refreshBrowserList();
diff --git a/tuxbox/neutrino/src/system/locals.h b/tuxbox/neutrino/src/system/locals.h
index bda245e..82672b9 100644
--- a/tuxbox/neutrino/src/system/locals.h
+++ b/tuxbox/neutrino/src/system/locals.h
@@ -829,6 +829,7 @@ typedef enum
 	LOCALE_MOVIEBROWSER_BROWSER_ROW_NR,
 	LOCALE_MOVIEBROWSER_BROWSER_ROW_WIDTH,
 	LOCALE_MOVIEBROWSER_CHANGE_VIEW,
+	LOCALE_MOVIEBROWSER_DELETE_INFO,
 	LOCALE_MOVIEBROWSER_DIR,
 	LOCALE_MOVIEBROWSER_DIR_HEAD,
 	LOCALE_MOVIEBROWSER_EDIT_BOOK,
diff --git a/tuxbox/neutrino/src/system/locals_intern.h b/tuxbox/neutrino/src/system/locals_intern.h
index 297d537..c982b1f 100644
--- a/tuxbox/neutrino/src/system/locals_intern.h
+++ b/tuxbox/neutrino/src/system/locals_intern.h
@@ -829,6 +829,7 @@ const char * locale_real_names[] =
 	"moviebrowser.browser_row_nr",
 	"moviebrowser.browser_row_width",
 	"moviebrowser.change_view",
+	"moviebrowser.delete_info",
 	"moviebrowser.dir",
 	"moviebrowser.dir_head",
 	"moviebrowser.edit_book",

commit 2d58153e492108f094ba12b9a46d45e00265fd87
Author: Gaucho316 <Gau...@ho...>
Date:   Wed Dec 19 19:21:39 2012 +0100

    Neutrino: add some special chars to CStringInputSMS
    
    Signed-off-by: Gaucho316 <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/bedit/bouqueteditor_bouquets.cpp b/tuxbox/neutrino/src/gui/bedit/bouqueteditor_bouquets.cpp
index 575672a..1ec7a6e 100644
--- a/tuxbox/neutrino/src/gui/bedit/bouqueteditor_bouquets.cpp
+++ b/tuxbox/neutrino/src/gui/bedit/bouqueteditor_bouquets.cpp
@@ -514,7 +514,7 @@ std::string CBEBouquetWidget::inputName(const char * const defaultName, const ne
 
 	strncpy(Name, defaultName, 30);
 
-	CStringInputSMS * nameInput = new CStringInputSMS(caption, Name, 29, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-.,:|!?/ ");
+	CStringInputSMS * nameInput = new CStringInputSMS(caption, Name, 29, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-_/()<>=.,:!?\\'\"& ");
 	nameInput->exec(this, "");
 	delete nameInput;
 
diff --git a/tuxbox/neutrino/src/gui/eventlist.cpp b/tuxbox/neutrino/src/gui/eventlist.cpp
index bae5e23..f4ea133 100644
--- a/tuxbox/neutrino/src/gui/eventlist.cpp
+++ b/tuxbox/neutrino/src/gui/eventlist.cpp
@@ -1166,7 +1166,7 @@ int CEventFinderMenu::showMenu(void)
 		m_search_channelname = "";
 	}
 	
-	CStringInputSMS stringInput(LOCALE_EVENTFINDER_KEYWORD, m_search_keyword, 20, false, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-.: ");
+	CStringInputSMS stringInput(LOCALE_EVENTFINDER_KEYWORD, m_search_keyword, 20, false, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-_/()<>=.,:!?\\'\"& ");
 	
 	CMenuForwarder* mf0 		= new CMenuForwarder(LOCALE_EVENTFINDER_KEYWORD, true, *m_search_keyword, &stringInput, NULL, CRCInput::RC_1, NEUTRINO_ICON_BUTTON_1);
 	CMenuOptionChooser* mo0 	= new CMenuOptionChooser(LOCALE_EVENTFINDER_SEARCH_WITHIN_LIST, m_search_list, SEARCH_LIST_OPTIONS, SEARCH_LIST_OPTION_COUNT, true, this, CRCInput::RC_2, NEUTRINO_ICON_BUTTON_2);
diff --git a/tuxbox/neutrino/src/gui/moviebrowser.cpp b/tuxbox/neutrino/src/gui/moviebrowser.cpp
index 0c492f8..346a8ba 100644
--- a/tuxbox/neutrino/src/gui/moviebrowser.cpp
+++ b/tuxbox/neutrino/src/gui/moviebrowser.cpp
@@ -2978,7 +2978,7 @@ int CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
 	{
 		pBookItemMenuForwarderNotifier[i] = new CBookItemMenuForwarderNotifier();
 
-		pBookNameInput[i] =    new CStringInputSMS (LOCALE_MOVIEBROWSER_EDIT_BOOK, &movie_info->bookmarks.user[i].name, 20, true, LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO2, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-.: ", pBookItemMenuForwarderNotifier[i]);
+		pBookNameInput[i] =    new CStringInputSMS (LOCALE_MOVIEBROWSER_EDIT_BOOK, &movie_info->bookmarks.user[i].name, 20, true, LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO2, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-_/()<>=.,:!?\\'\"& ", pBookItemMenuForwarderNotifier[i]);
 		pBookPosIntInput[i] =  new CIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (long&) movie_info->bookmarks.user[i].pos, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_POS_INFO2);
 		pBookTypeIntInput[i] = new CIntInput (LOCALE_MOVIEBROWSER_EDIT_BOOK, (long&) movie_info->bookmarks.user[i].length, 20, LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO2);
 
@@ -2996,7 +2996,7 @@ int CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
 
 /********************************************************************/
 /**  serie******************************************************/
-	CStringInputSMS serieUserInput(LOCALE_MOVIEBROWSER_EDIT_SERIE, &movie_info->serieName, 20, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-.: ");
+	CStringInputSMS serieUserInput(LOCALE_MOVIEBROWSER_EDIT_SERIE, &movie_info->serieName, 20, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-_/()<>=.,:!?\\'\"& ");
 
 	CMenuWidget serieMenu(LOCALE_MOVIEBROWSER_INFO_HEAD, NEUTRINO_ICON_STREAMING);
 	serieMenu.addIntroItems(LOCALE_MOVIEBROWSER_SERIE_HEAD);
@@ -3040,13 +3040,13 @@ int CMovieBrowser::showMovieInfoMenu(MI_MOVIE_INFO* movie_info)
 		snprintf(size,BUFFER_SIZE,"%5llu",movie_info->file.Size>>20);
 	}
 
-	CStringInputSMS titelUserInput(LOCALE_MOVIEBROWSER_INFO_TITLE,            &movie_info->epgTitle, MAX_STRING, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-.: ");
-	CStringInputSMS channelUserInput(LOCALE_MOVIEBROWSER_INFO_CHANNEL,        &movie_info->epgChannel, MAX_STRING, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-.: ");
-	CStringInputSMS epgUserInput(LOCALE_MOVIEBROWSER_INFO_INFO1,              &movie_info->epgInfo1, MAX_STRING, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-.: ");
+	CStringInputSMS titelUserInput(LOCALE_MOVIEBROWSER_INFO_TITLE,            &movie_info->epgTitle, MAX_STRING, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-_/()<>=.,:!?\\'\"& ");
+	CStringInputSMS channelUserInput(LOCALE_MOVIEBROWSER_INFO_CHANNEL,        &movie_info->epgChannel, MAX_STRING, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-_/()<>=.,:!?\\'\"& ");
+	CStringInputSMS epgUserInput(LOCALE_MOVIEBROWSER_INFO_INFO1,              &movie_info->epgInfo1, MAX_STRING, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-_/()<>=.,:!?\\'\"& ");
 	CDateInput   dateUserDateInput(LOCALE_MOVIEBROWSER_INFO_LENGTH,        &movie_info->dateOfLastPlay, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY);
 	CDateInput   recUserDateInput(LOCALE_MOVIEBROWSER_INFO_LENGTH,         &movie_info->file.Time, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY);
 	CIntInput    lengthUserIntInput(LOCALE_MOVIEBROWSER_INFO_LENGTH,       (long&)movie_info->length, 3, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY);
-	CStringInputSMS countryUserInput(LOCALE_MOVIEBROWSER_INFO_PRODCOUNTRY,    &movie_info->productionCountry, 11, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-.: ");
+	CStringInputSMS countryUserInput(LOCALE_MOVIEBROWSER_INFO_PRODCOUNTRY,    &movie_info->productionCountry, 11, true, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY, "abcdefghijklmnopqrstuvwxyz\xE4\xF6\xFC\xDF""0123456789-_/()<>=.,:!?\\'\"& ");
 	CIntInput    yearUserIntInput(LOCALE_MOVIEBROWSER_INFO_PRODYEAR,       (long&)movie_info->productionDate, 4, LOCALE_GENERIC_EMPTY, LOCALE_GENERIC_EMPTY);
 
 	CMenuWidget movieInfoMenu(LOCALE_MOVIEBROWSER_MENU_MAIN_HEAD, NEUTRINO_ICON_STREAMING, m_cBoxFrame.iWidth);
diff --git a/tuxbox/neutrino/src/gui/widget/stringinput.cpp b/tuxbox/neutrino/src/gui/widget/stringinput.cpp
index 02a84de..b6a28dc 100644
--- a/tuxbox/neutrino/src/gui/widget/stringinput.cpp
+++ b/tuxbox/neutrino/src/gui/widget/stringinput.cpp
@@ -540,7 +540,7 @@ void CStringInputSMS::initSMS(const char * const Valid_Chars)
 {
 	last_digit = -1;				// no key pressed yet
 	const char CharList[10][11] = { "0 -_/()<>=",	// 10 characters
-					"1.,:!?\\",
+					"1.,:!?\\'\"&",
 					"abc2\xE4",   // 0xE4 == ä
 					"def3",
 					"ghi4",
diff --git a/tuxbox/neutrino/src/gui/widget/stringinput.h b/tuxbox/neutrino/src/gui/widget/stringinput.h
index def8dc7..403cab4 100644
--- a/tuxbox/neutrino/src/gui/widget/stringinput.h
+++ b/tuxbox/neutrino/src/gui/widget/stringinput.h
@@ -100,7 +100,7 @@ class CStringInputSMS : public CStringInput
 {
 		bool	capsMode;
 		int 	arraySizes[10];
-		char	Chars[10][9];					// maximal 9 character in one CharList entry!
+		char	Chars[10][10];					// maximal 10 characters in one CharList entry!
 
 		int keyCounter;
 		int last_digit;

commit 60c7b6f76b8aa0481e9f15da00231cad79777deb
Author: Gaucho316 <Gau...@ho...>
Date:   Wed Dec 19 19:21:25 2012 +0100

    Neutrino string input: avoid uninitialized access
    
    Signed-off-by: Gaucho316 <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/widget/stringinput.cpp b/tuxbox/neutrino/src/gui/widget/stringinput.cpp
index 56bbdce..02a84de 100644
--- a/tuxbox/neutrino/src/gui/widget/stringinput.cpp
+++ b/tuxbox/neutrino/src/gui/widget/stringinput.cpp
@@ -298,6 +298,7 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & )
 	for(int count=strlen(value)-1;count<size-1;count++)
 		strcat(value, " ");
 	strncpy(oldval, value, size);
+	dispval[0] = 0;
 
 	paint();
 
diff --git a/tuxbox/neutrino/src/gui/widget/stringinput_ext.cpp b/tuxbox/neutrino/src/gui/widget/stringinput_ext.cpp
index 279f13b..8394197 100644
--- a/tuxbox/neutrino/src/gui/widget/stringinput_ext.cpp
+++ b/tuxbox/neutrino/src/gui/widget/stringinput_ext.cpp
@@ -135,6 +135,8 @@ int CExtendedInput::exec( CMenuTarget* parent, const std::string & )
 	}
 
 	strcpy(oldval, value);
+	dispval[0] = 0;
+
 	paint();
 
 	unsigned long long timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);

commit f737b571bd8136a94ce62f69883f2f488d253e6d
Author: Gaucho316 <Gau...@ho...>
Date:   Wed Dec 19 19:21:10 2012 +0100

    Neutrino: use appropriate icons in some menus
    
    Signed-off-by: Gaucho316 <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/audio_setup.cpp b/tuxbox/neutrino/src/gui/audio_setup.cpp
index 49ce2b6..c58b978 100644
--- a/tuxbox/neutrino/src/gui/audio_setup.cpp
+++ b/tuxbox/neutrino/src/gui/audio_setup.cpp
@@ -126,7 +126,7 @@ int CAudioSetup::showAudioSetup()
 	CAudioSetupNotifier audioSetupNotifier;
 
 	//menue init
-	CMenuWidget* audioSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width);
+	CMenuWidget* audioSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_AUDIO, width);
 	audioSettings->setPreselected(selected);
 
 	// intros
diff --git a/tuxbox/neutrino/src/gui/audioplayer_setup.cpp b/tuxbox/neutrino/src/gui/audioplayer_setup.cpp
index e3152ab..fd59d97 100644
--- a/tuxbox/neutrino/src/gui/audioplayer_setup.cpp
+++ b/tuxbox/neutrino/src/gui/audioplayer_setup.cpp
@@ -105,7 +105,7 @@ const CMenuOptionChooser::keyval AUDIOPLAYER_DISPLAY_ORDER_OPTIONS[AUDIOPLAYER_D
 int CAudioPlayerSetup::showAudioPlayerSetup()
 /*shows the audio setup menue*/
 {
-	CMenuWidget* audioplayerSetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
+	CMenuWidget* audioplayerSetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_AUDIO, width);
 	audioplayerSetup->setPreselected(selected);
 
 	// intros
diff --git a/tuxbox/neutrino/src/gui/epgplus.cpp b/tuxbox/neutrino/src/gui/epgplus.cpp
index 49a8fd6..f0f59f2 100644
--- a/tuxbox/neutrino/src/gui/epgplus.cpp
+++ b/tuxbox/neutrino/src/gui/epgplus.cpp
@@ -1712,7 +1712,7 @@ int EpgPlus::MenuTargetAddRecordTimer::exec(CMenuTarget*, const std::string&)
 			std::string recDir = g_settings.recording_dir[0];
 			if (g_settings.recording_choose_direct_rec_dir && g_settings.recording_type == RECORDING_FILE)
 			{
-				CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR, NEUTRINO_ICON_SETTINGS, NULL, &recDir);
+				CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR, NEUTRINO_ICON_TIMER, NULL, &recDir);
 				epgPlus->hide();
 				recDirs.exec(NULL,"");
 				epgPlus->paint();
diff --git a/tuxbox/neutrino/src/gui/epgview.cpp b/tuxbox/neutrino/src/gui/epgview.cpp
index 1d9e550..2ce0600 100644
--- a/tuxbox/neutrino/src/gui/epgview.cpp
+++ b/tuxbox/neutrino/src/gui/epgview.cpp
@@ -695,7 +695,7 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
 							std::string recDir = g_settings.recording_dir[0];
 							if (g_settings.recording_choose_direct_rec_dir && g_settings.recording_type == RECORDING_FILE)
 							{
-								CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR,NEUTRINO_ICON_SETTINGS,NULL,&recDir);
+								CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR, NEUTRINO_ICON_TIMER, NULL, &recDir);
 								hide();
 								recDirs.exec(NULL,"");
 								show(channel_id,epgData.eventID,&epgData.epg_times.startzeit,false);
diff --git a/tuxbox/neutrino/src/gui/esd_setup.cpp b/tuxbox/neutrino/src/gui/esd_setup.cpp
index 8266705..fd3d6c9 100644
--- a/tuxbox/neutrino/src/gui/esd_setup.cpp
+++ b/tuxbox/neutrino/src/gui/esd_setup.cpp
@@ -79,7 +79,7 @@ int CEsdSetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
 int CEsdSetup::showEsdSetup()
 /*shows the esd setup menue*/
 {
-	CMenuWidget* esdSetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
+	CMenuWidget* esdSetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_AUDIO, width);
 	esdSetup->setPreselected(selected);
 
 	// intros
diff --git a/tuxbox/neutrino/src/gui/eventlist.cpp b/tuxbox/neutrino/src/gui/eventlist.cpp
index 48a4363..bae5e23 100644
--- a/tuxbox/neutrino/src/gui/eventlist.cpp
+++ b/tuxbox/neutrino/src/gui/eventlist.cpp
@@ -426,7 +426,7 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
 					std::string recDir = g_settings.recording_dir[0];
 					if (g_settings.recording_choose_direct_rec_dir && g_settings.recording_type == RECORDING_FILE)
 					{
-						CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR,NEUTRINO_ICON_SETTINGS,NULL,&recDir);
+						CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR, NEUTRINO_ICON_TIMER, NULL, &recDir);
 						hide();
 						recDirs.exec(NULL,"");
 						paint();
diff --git a/tuxbox/neutrino/src/gui/keybind_setup.cpp b/tuxbox/neutrino/src/gui/keybind_setup.cpp
index 71049e2..deead84 100644
--- a/tuxbox/neutrino/src/gui/keybind_setup.cpp
+++ b/tuxbox/neutrino/src/gui/keybind_setup.cpp
@@ -172,7 +172,7 @@ int CKeybindSetup::showSetup()
 
 	CKeyChooser * keychooser[MAX_NUM_KEYNAMES];
 	for (int i = 0; i < MAX_NUM_KEYNAMES; i++)
-		keychooser[i] = new CKeyChooser(keyvalue_p[i], keydescription_head[i], NEUTRINO_ICON_SETTINGS);
+		keychooser[i] = new CKeyChooser(keyvalue_p[i], keydescription_head[i], NEUTRINO_ICON_KEYBINDING);
 
 
 	//remote control
diff --git a/tuxbox/neutrino/src/gui/movieplayer_setup.cpp b/tuxbox/neutrino/src/gui/movieplayer_setup.cpp
index a0c899a..eeac047 100644
--- a/tuxbox/neutrino/src/gui/movieplayer_setup.cpp
+++ b/tuxbox/neutrino/src/gui/movieplayer_setup.cpp
@@ -138,10 +138,10 @@ const CMenuOptionChooser::keyval STREAMINGMENU_STOPSECTIONSD_OPTIONS[STREAMINGME
 
 int CMoviePlayerSetup::showMoviePlayerSetup()
 {
-	CMenuWidget* mp_setup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
+	CMenuWidget* mp_setup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_STREAMING, width);
 	mp_setup->setPreselected(selected);
 
-	CMenuWidget* mp_streaming_setup = new CMenuWidget(LOCALE_MAINSETTINGS_STREAMING, NEUTRINO_ICON_SETTINGS, width);
+	CMenuWidget* mp_streaming_setup = new CMenuWidget(LOCALE_MAINSETTINGS_STREAMING, NEUTRINO_ICON_STREAMING, width);
 	CMenuForwarder* mp_streaming_setup_mf = new CMenuForwarder(LOCALE_STREAMINGMENU_STREAMING_SETTINGS, true, NULL, mp_streaming_setup, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
 
 	// intros
diff --git a/tuxbox/neutrino/src/gui/pictureviewer_setup.cpp b/tuxbox/neutrino/src/gui/pictureviewer_setup.cpp
index 00ddc13..9cf98e1 100644
--- a/tuxbox/neutrino/src/gui/pictureviewer_setup.cpp
+++ b/tuxbox/neutrino/src/gui/pictureviewer_setup.cpp
@@ -107,7 +107,7 @@ const CMenuOptionChooser::keyval PICTUREVIEWER_SCALING_OPTIONS[PICTUREVIEWER_SCA
 int CPictureViewerSetup::showPictureViewerSetup()
 /*shows the setup menue*/
 {
-	CMenuWidget* picviewsetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
+	CMenuWidget* picviewsetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_VIDEO, width);
 	picviewsetup->setPreselected(selected);
 
 	// intros: back ande save
diff --git a/tuxbox/neutrino/src/gui/record_setup.cpp b/tuxbox/neutrino/src/gui/record_setup.cpp
index 3ece707..58a8a9c 100644
--- a/tuxbox/neutrino/src/gui/record_setup.cpp
+++ b/tuxbox/neutrino/src/gui/record_setup.cpp
@@ -135,7 +135,7 @@ int CRecordSetup::showRecordSetup()
 	std::vector<CMenuTarget*> toDelete;
 
 	//menue init
-	CMenuWidget* recordingSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width);
+	CMenuWidget* recordingSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_RECORDING, width);
 	recordingSettings->setPreselected(selected);
 
 	//prepare input record server ip
diff --git a/tuxbox/neutrino/src/gui/themes.cpp b/tuxbox/neutrino/src/gui/themes.cpp
index ee5f539..327f1fe 100644
--- a/tuxbox/neutrino/src/gui/themes.cpp
+++ b/tuxbox/neutrino/src/gui/themes.cpp
@@ -190,7 +190,7 @@ int CThemes::Show()
 	}
 
 	if (hasThemeChanged) {
-		if (ShowLocalizedMessage(LOCALE_MESSAGEBOX_INFO, LOCALE_COLORTHEMEMENU_QUESTION, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NEUTRINO_ICON_SETTINGS) != CMessageBox::mbrYes)
+		if (ShowLocalizedMessage(LOCALE_MESSAGEBOX_INFO, LOCALE_COLORTHEMEMENU_QUESTION, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, menue_icon.c_str()) != CMessageBox::mbrYes)
 			rememberOldTheme( false );
 		else
 			hasThemeChanged = false;
diff --git a/tuxbox/neutrino/src/gui/video_setup.cpp b/tuxbox/neutrino/src/gui/video_setup.cpp
index 3bc3c46..0a4f6b4 100644
--- a/tuxbox/neutrino/src/gui/video_setup.cpp
+++ b/tuxbox/neutrino/src/gui/video_setup.cpp
@@ -122,7 +122,7 @@ const CMenuOptionChooser::keyval VIDEOMENU_VIDEOFORMAT_OPTIONS[VIDEOMENU_VIDEOFO
 int CVideoSetup::showVideoSetup()
 {
 	//init
-	CMenuWidget * videosetup = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width);
+	CMenuWidget * videosetup = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_VIDEO, width);
 	videosetup->setPreselected(selected);
 
 	//video signal type
diff --git a/tuxbox/neutrino/src/neutrino.cpp b/tuxbox/neutrino/src/neutrino.cpp
index 6ad952b..218702f 100644
--- a/tuxbox/neutrino/src/neutrino.cpp
+++ b/tuxbox/neutrino/src/neutrino.cpp
@@ -1810,7 +1810,7 @@ bool CNeutrinoApp::doGuiRecord(char * preselectedDir, bool addTimer, char * file
 				std::string recDir = (preselectedDir != NULL) ? preselectedDir : g_settings.recording_dir[0];
 				if( preselectedDir == NULL && g_settings.recording_choose_direct_rec_dir)
 				{
-					CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR,NEUTRINO_ICON_SETTINGS,NULL,&recDir);
+					CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR, NEUTRINO_ICON_TIMER, NULL, &recDir);
 					recDirs.exec(NULL,"");
 					refreshGui = true;
 					recDir = recDirs.get_selected_dir();

commit 8ea6e2018875e6d9e58b83843db0acc14243f804
Author: Gaucho316 <Gau...@ho...>
Date:   Wed Dec 19 19:20:50 2012 +0100

    Neutrino timer list: use timer icon in menus
    
    Signed-off-by: Gaucho316 <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/timerlist.cpp b/tuxbox/neutrino/src/gui/timerlist.cpp
index 3b2a24e..15fdcbc 100644
--- a/tuxbox/neutrino/src/gui/timerlist.cpp
+++ b/tuxbox/neutrino/src/gui/timerlist.cpp
@@ -954,7 +954,7 @@ const CMenuOptionChooser::keyval MESSAGEBOX_NO_YES_OPTIONS[MESSAGEBOX_NO_YES_OPT
 int CTimerList::modifyTimer()
 {
 	CTimerd::responseGetTimer* timer=&timerlist[selected];
-	CMenuWidget timerSettings(LOCALE_TIMERLIST_MENUMODIFY, NEUTRINO_ICON_SETTINGS, width);
+	CMenuWidget timerSettings(LOCALE_TIMERLIST_MENUMODIFY, NEUTRINO_ICON_TIMER, width);
 	//main items
 	timerSettings.addIntroItems(NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, CMenuWidget::BTN_TYPE_CANCEL);
 	timerSettings.addItem(new CMenuForwarder(LOCALE_TIMERLIST_SAVE, true, NULL, this, "modifytimer", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));
@@ -987,7 +987,7 @@ int CTimerList::modifyTimer()
 	CTimerListRepeatNotifier notifier((int *)&timer->eventRepeat, m4, m5, m_weekdaysStr);
 	CMenuOptionChooser* m3 = new CMenuOptionChooser(LOCALE_TIMERLIST_REPEAT, (int *)&timer->eventRepeat, TIMERLIST_REPEAT_OPTIONS, TIMERLIST_REPEAT_OPTION_COUNT, true, &notifier);
 
-	CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR,NEUTRINO_ICON_SETTINGS,NULL,timer->recordingDir);
+	CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR, NEUTRINO_ICON_TIMER, NULL, timer->recordingDir);
 	bool recDirEnabled = (timer->eventType == CTimerd::TIMER_RECORD) && (g_settings.recording_type == RECORDING_FILE);
 	CMenuForwarder* m6 = new CMenuForwarder(LOCALE_TIMERLIST_RECORDING_DIR,recDirEnabled,recDirEnabled ? timer->recordingDir : "", &recDirs);
 
@@ -998,7 +998,7 @@ int CTimerList::modifyTimer()
 	timerSettings.addItem(GenericMenuSeparatorLine);
 	timerSettings.addItem(m6);
 
-	CMenuWidget timerSettings_apids(LOCALE_TIMERLIST_APIDS, NEUTRINO_ICON_SETTINGS, width);
+	CMenuWidget timerSettings_apids(LOCALE_TIMERLIST_APIDS, NEUTRINO_ICON_TIMER, width);
 	CTimerListApidNotifier apid_notifier(&timer_apids_dflt, &timer_apids_std, &timer_apids_ac3, &timer_apids_alt);
 	timer_apids_dflt = (timer->apids == 0) ? 1 : 0 ;
 	timer_apids_std = (timer->apids & TIMERD_APIDS_STD) ? 1 : 0 ;
@@ -1037,7 +1037,7 @@ int CTimerList::newTimer()
 	strncpy(timerNew.recordingDir,g_settings.recording_dir[0].c_str(),sizeof(timerNew.recordingDir));
 
 
-	CMenuWidget timerSettings(LOCALE_TIMERLIST_MENUNEW, NEUTRINO_ICON_SETTINGS, width);
+	CMenuWidget timerSettings(LOCALE_TIMERLIST_MENUNEW, NEUTRINO_ICON_TIMER, width);
 	timerSettings.addIntroItems(NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, CMenuWidget::BTN_TYPE_CANCEL);
 	timerSettings.addItem(new CMenuForwarder(LOCALE_TIMERLIST_SAVE, true, NULL, this, "newtimer", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));
 	timerSettings.addItem(GenericMenuSeparatorLine);
@@ -1065,18 +1065,18 @@ int CTimerList::newTimer()
 	CZapitClient::BouquetList::iterator bouquet = bouquetlist.begin();
 
 	//bouquet menues tv
-	CMenuWidget mctv(LOCALE_TIMERLIST_BOUQUETSELECT, NEUTRINO_ICON_SETTINGS, width); 
+	CMenuWidget mctv(LOCALE_TIMERLIST_BOUQUETSELECT, NEUTRINO_ICON_TIMER, width); 
 	mctv.addIntroItems();
 
 	//bouquet menues radio
- 	CMenuWidget mcradio(LOCALE_TIMERLIST_BOUQUETSELECT, NEUTRINO_ICON_SETTINGS, width);
+ 	CMenuWidget mcradio(LOCALE_TIMERLIST_BOUQUETSELECT, NEUTRINO_ICON_TIMER, width);
 	mcradio.addIntroItems();
 
 	for(; bouquet != bouquetlist.end();bouquet++)
 	{	
-		CMenuWidget* mwtv = new CMenuWidget(LOCALE_TIMERLIST_CHANNELSELECT, NEUTRINO_ICON_SETTINGS, width);
+		CMenuWidget* mwtv = new CMenuWidget(LOCALE_TIMERLIST_CHANNELSELECT, NEUTRINO_ICON_TIMER, width);
 		toDelete.push_back(mwtv);
-		CMenuWidget* mwradio = new CMenuWidget(LOCALE_TIMERLIST_CHANNELSELECT, NEUTRINO_ICON_SETTINGS, width);
+		CMenuWidget* mwradio = new CMenuWidget(LOCALE_TIMERLIST_CHANNELSELECT, NEUTRINO_ICON_TIMER, width);
 		toDelete.push_back(mwradio);
 
 		//tv
@@ -1120,7 +1120,7 @@ int CTimerList::newTimer()
 			mcradio.addItem(new CMenuForwarderNonLocalized(bouquet->name, true, NULL, mwradio));
 	}
 	//selct mode (tv/radio)
-	CMenuWidget mm(LOCALE_TIMERLIST_MODESELECT, NEUTRINO_ICON_SETTINGS, width);
+	CMenuWidget mm(LOCALE_TIMERLIST_MODESELECT, NEUTRINO_ICON_TIMER, width);
 	mm.addIntroItems();
 	mm.addItem(new CMenuForwarder(LOCALE_TIMERLIST_MODETV, true, NULL, &mctv));
 	mm.addItem(new CMenuForwarder(LOCALE_TIMERLIST_MODERADIO, true, NULL, &mcradio));
@@ -1128,7 +1128,7 @@ int CTimerList::newTimer()
 	strcpy(timerNew_channel_name,"---");
 	CMenuForwarder* m6 = new CMenuForwarder(LOCALE_TIMERLIST_CHANNEL, true, timerNew_channel_name, &mm);
 
-	CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR,NEUTRINO_ICON_SETTINGS,NULL,timerNew.recordingDir);
+	CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR, NEUTRINO_ICON_TIMER, NULL, timerNew.recordingDir);
 	CMenuForwarder* m7 = new CMenuForwarder(LOCALE_TIMERLIST_RECORDING_DIR,true,timerNew.recordingDir, &recDirs);
 
 	CMenuOptionChooser* m8 = new CMenuOptionChooser(LOCALE_TIMERLIST_STANDBY, &timerNew_standby_on, TIMERLIST_STANDBY_OPTIONS, TIMERLIST_STANDBY_OPTION_COUNT, false);

commit 3c891e5df0021a7f57cb3400ecb2752c69ec25d4
Author: Gaucho316 <Gau...@ho...>
Date:   Wed Dec 19 19:20:32 2012 +0100

    Neutrino scan setup: fix memleak
    
    Signed-off-by: Gaucho316 <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/scan_setup.cpp b/tuxbox/neutrino/src/gui/scan_setup.cpp
index d434ba8..b45cd63 100644
--- a/tuxbox/neutrino/src/gui/scan_setup.cpp
+++ b/tuxbox/neutrino/src/gui/scan_setup.cpp
@@ -235,6 +235,7 @@ int CScanSetup::showScanService()
 	CMenuWidget* extMotorSettings = NULL;
 	CStringInput* toff_lat = NULL;
 	CStringInput* toff_long = NULL;
+	CMotorControl* motorControl = NULL;
 	CSatDiseqcNotifier* satDiseqcNotifier = NULL;
 
 	//sat-lnb-settings
@@ -302,7 +303,8 @@ int CScanSetup::showScanService()
 		extMotorSettings->addItem(GenericMenuSeparatorLine);
 		
 		//manual motor control
-		extMotorSettings->addItem(new CMenuForwarder(LOCALE_SATSETUP_MOTORCONTROL, true, NULL, new CMotorControl(), NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
+		motorControl = new CMotorControl();
+		extMotorSettings->addItem(new CMenuForwarder(LOCALE_SATSETUP_MOTORCONTROL, true, NULL, motorControl, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
 		extMotorSettings->addItem(GenericMenuSeparatorLine);
 
 		//prepare motor control
@@ -388,6 +390,7 @@ int CScanSetup::showScanService()
 	delete extMotorSettings;
 	delete toff_lat;
 	delete toff_long;
+	delete motorControl;
 	delete satDiseqcNotifier;
 	delete scanTs;
 

commit 4c502095df0dadaeba0bcb6188ade38d2c538670
Author: Gaucho316 <Gau...@ho...>
Date:   Wed Dec 19 19:20:21 2012 +0100

    Neutrino EPG Plus: fix memleaks
    
    Signed-off-by: Gaucho316 <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/epgplus.cpp b/tuxbox/neutrino/src/gui/epgplus.cpp
index a2ca952..49a8fd6 100644
--- a/tuxbox/neutrino/src/gui/epgplus.cpp
+++ b/tuxbox/neutrino/src/gui/epgplus.cpp
@@ -1088,11 +1088,15 @@ int EpgPlus::exec(CChannelList* _channelList, int selectedChannelIndex, CBouquet
 				fb_pixel_t savedScreen[usableScreenWidth * usableScreenHeight * sizeof(fb_pixel_t)];
 				frameBuffer->SaveScreen(usableScreenX, usableScreenY, usableScreenWidth, usableScreenHeight, savedScreen);
 
+				MenuTargetAddRecordTimer menuTargetAddRecordTimer(this);
+				MenuTargetRefreshEpg menuTargetRefreshEpg(this);
+				MenuTargetAddReminder menuTargetAddReminder(this);
+
 				CMenuWidget menuWidgetActions(LOCALE_EPGPLUS_ACTIONS, NEUTRINO_ICON_FEATURES, 400);
 				menuWidgetActions.addIntroItems(NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, CMenuWidget::BTN_TYPE_CANCEL);
-				menuWidgetActions.addItem(new CMenuForwarder(LOCALE_EPGPLUS_RECORD     , true, NULL, new MenuTargetAddRecordTimer(this), NULL, CRCInput::RC_red   , NEUTRINO_ICON_BUTTON_RED   ), false);
-				menuWidgetActions.addItem(new CMenuForwarder(LOCALE_EPGPLUS_REFRESH_EPG, true, NULL, new MenuTargetRefreshEpg    (this), NULL, CRCInput::RC_green , NEUTRINO_ICON_BUTTON_GREEN ), false);
-				menuWidgetActions.addItem(new CMenuForwarder(LOCALE_EPGPLUS_REMIND     , true, NULL, new MenuTargetAddReminder   (this), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW), false);
+				menuWidgetActions.addItem(new CMenuForwarder(LOCALE_EPGPLUS_RECORD     , true, NULL, &menuTargetAddRecordTimer, NULL, CRCInput::RC_red   , NEUTRINO_ICON_BUTTON_RED   ), false);
+				menuWidgetActions.addItem(new CMenuForwarder(LOCALE_EPGPLUS_REFRESH_EPG, true, NULL, &menuTargetRefreshEpg    , NULL, CRCInput::RC_green , NEUTRINO_ICON_BUTTON_GREEN ), false);
+				menuWidgetActions.addItem(new CMenuForwarder(LOCALE_EPGPLUS_REMIND     , true, NULL, &menuTargetAddReminder   , NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW), false);
 
 				menuWidgetActions.exec(NULL, "");
 

commit 16b5095c16dd1546274df02ea3bc04790178d0cd
Author: Gaucho316 <Gau...@ho...>
Date:   Wed Dec 19 19:20:05 2012 +0100

    Neutrino CFlashUpdate: fix memleaks
    
    Signed-off-by: Gaucho316 <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/update.cpp b/tuxbox/neutrino/src/gui/update.cpp
index 8142f2d..e17764a 100644
--- a/tuxbox/neutrino/src/gui/update.cpp
+++ b/tuxbox/neutrino/src/gui/update.cpp
@@ -145,6 +145,7 @@ bool CFlashUpdate::selectHttpImage(void)
 	std::string name;
 	std::string version;
 	std::vector<std::string> updates_lists, urls, md5s, names, versions, descriptions;
+	std::vector<CUpdateMenuTarget*> update_menu_targets;
 	int selected = -1, listWidth = w_max (710, 50);
 
 	// get default update url from .version
@@ -213,7 +214,8 @@ bool CFlashUpdate::selectHttpImage(void)
 
 				descriptions.push_back(description); /* workaround since CMenuForwarder does not store the Option String itself */
 
-				CMenuForwarderNonLocalized* fw = new CMenuForwarderNonLocalized(names[i].c_str(), true, descriptions[i].c_str(), new CUpdateMenuTarget(i, &selected));
+				update_menu_targets.push_back(new CUpdateMenuTarget(i, &selected));
+				CMenuForwarderNonLocalized* fw = new CMenuForwarderNonLocalized(names[i].c_str(), true, descriptions[i].c_str(), update_menu_targets.back());
 				fw->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
 				SelectionWidget.addItem(fw);
 				i++;
@@ -231,6 +233,9 @@ bool CFlashUpdate::selectHttpImage(void)
 
 	SelectionWidget.exec(NULL, "");
 
+	for (std::vector<CUpdateMenuTarget*>::iterator it = update_menu_targets.begin(); it != update_menu_targets.end(); it++)
+		delete *it;
+
 	if (selected == -1)
 		return false;
 
@@ -256,7 +261,7 @@ bool CFlashUpdate::getUpdateImage(const std::string & version)
 bool CFlashUpdate::checkVersion4Update()
 {
 	char msg[400];
-	CFlashVersionInfo * versionInfo=0;
+	CFlashVersionInfo * versionInfo = NULL;
 	neutrino_locale_t msg_body;
 
 #ifndef DISABLE_INTERNET_UPDATE
@@ -361,6 +366,7 @@ bool CFlashUpdate::checkVersion4Update()
 		versionInfo = new CFlashVersionInfo();
 		if (!ft.GetVersionInfo(*versionInfo, filename))
 		{
+			delete versionInfo;
 			ShowHintUTF(LOCALE_MESSAGEBOX_ERROR, g_Locale->getText(LOCALE_FLASHUPDATE_CANTOPENFILE)); // UTF-8
 			return false;			
 		}

commit 4150b22fdf5045a9b2148011b94f4e5f902414c7
Author: Gaucho316 <Gau...@ho...>
Date:   Wed Dec 19 19:19:42 2012 +0100

    Neutrino EPG Viewer: don't show empty audio track names
    
    Signed-off-by: Gaucho316 <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/epgview.cpp b/tuxbox/neutrino/src/gui/epgview.cpp
index 991c1f1..1d9e550 100644
--- a/tuxbox/neutrino/src/gui/epgview.cpp
+++ b/tuxbox/neutrino/src/gui/epgview.cpp
@@ -541,7 +541,7 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
 	if (hasComponentTags)
 	{
 		for (unsigned int i = 0; i < tags.size(); i++)
-			if (tags[i].streamContent == 2)
+			if (tags[i].streamContent == 2 && !tags[i].component.empty())
 				audioInfo += tags[i].component + ", ";
 
 		if (!audioInfo.empty())

commit 77ce5765bedac2eb21564f5d70693250c641a8d4
Author: Gaucho316 <Gau...@ho...>
Date:   Wed Dec 19 19:19:28 2012 +0100

    Neutrino CRemoteControl: enable AC3 auto-switch even if EPG unavailable
    
    Signed-off-by: Gaucho316 <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/daemonc/remotecontrol.cpp b/tuxbox/neutrino/src/daemonc/remotecontrol.cpp
index 2253313..5376441 100644
--- a/tuxbox/neutrino/src/daemonc/remotecontrol.cpp
+++ b/tuxbox/neutrino/src/daemonc/remotecontrol.cpp
@@ -423,7 +423,6 @@ void CRemoteControl::processAPIDnames()
 			if ( g_Sectionsd->getComponentTagsUniqueKey( current_EPGid, tags ) )
 			{
 				has_unresolved_ctags = false;
-				has_ac3 = false;
 
 				for (unsigned int i=0; i< tags.size(); i++)
 				{
@@ -450,35 +449,24 @@ void CRemoteControl::processAPIDnames()
 						}
 					}
 				}
-
-				CZapitClient::APIDList::iterator e = current_PIDs.APIDs.begin();
-				while ( e != current_PIDs.APIDs.end() )
-				{
-					if ( e->is_ac3 )
-					{
-							has_ac3 = true;
-					}
-					e++;
-				}
-
-				if ( g_settings.audio_DolbyDigital == 1)
-				{
-					for (unsigned int j=0; j< current_PIDs.APIDs.size(); j++)
-						if ( current_PIDs.APIDs[j].is_ac3 )
-						{
-							setAPID( j );
-							break;
-						}
-				}
-
-				if ( current_PIDs.PIDs.selected_apid >= current_PIDs.APIDs.size() )
-				{
-                	setAPID( 0 );
-				}
 			}
 		}
 	}
 
+	if (has_ac3 && g_settings.audio_DolbyDigital == 1)
+	{
+		for (unsigned int j = 0; j < current_PIDs.APIDs.size(); j++)
+			if (current_PIDs.APIDs[j].is_ac3)
+			{
+				setAPID(j);
+				break;
+			}
+	}
+	else if (current_PIDs.PIDs.selected_apid >= current_PIDs.APIDs.size())
+	{
+		setAPID(0);
+	}
+
 	char *p = new char[sizeof(t_channel_id)];
 	memcpy(p, &current_channel_id, sizeof(t_channel_id));
 	g_RCInput->postMsg(NeutrinoMessages::EVT_ZAP_GOTAPIDS, (const neutrino_msg_data_t)p, false); // data is pointer to allocated memory

commit 6083e4247a44c6be12848659e2954ebfb7c201aa
Author: Gaucho316 <Gau...@ho...>
Date:   Wed Dec 19 19:19:08 2012 +0100

    Neutrino EPG Viewer: small rework of follow screenings code
    
    Signed-off-by: Gaucho316 <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/epgview.cpp b/tuxbox/neutrino/src/gui/epgview.cpp
index 4957b26..991c1f1 100644
--- a/tuxbox/neutrino/src/gui/epgview.cpp
+++ b/tuxbox/neutrino/src/gui/epgview.cpp
@@ -383,12 +383,12 @@ const neutrino_locale_t * genre_sub_classes_list[10] =
 	genre_travel_hobbies
 };
 
-bool CEpgData::hasFollowScreenings(const t_channel_id /*channel_id*/, const std::string & title)
+bool CEpgData::hasFollowScreenings(const t_channel_id /*channel_id*/, const std::string & title, const time_t startzeit)
 {
 	followlist.clear();
 	for (CChannelEventList::iterator e = evtlist.begin(); e != evtlist.end(); ++e )
 	{
-		if (e->startTime != epgData.epg_times.startzeit && e->eventID && e->description == title)
+		if (e->eventID != 0 && e->description == title && e->startTime != startzeit)
 			followlist.push_back(*e);
 	}
 	return !followlist.empty();
@@ -559,10 +559,10 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
 
 	// -- display more screenings on the same channel
 	// -- 2002-05-03 rasc
-	if (hasFollowScreenings(channel_id, epgData.title)) {
+	if (hasFollowScreenings(channel_id, epgData.title, epgData.epg_times.startzeit)) {
 		processTextToArray(""); // UTF-8
 		processTextToArray(std::string(g_Locale->getText(LOCALE_EPGVIEWER_MORE_SCREENINGS)) + ':'); // UTF-8
-		FollowScreenings(channel_id, epgData.title);
+		FollowScreenings();
 	}
 
 	//show the epg
@@ -766,7 +766,10 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
 						if (res == menu_return::RETURN_EXIT_ALL)
 							loop = false;
 						else
+						{
 							show(channel_id, id, &startzeit, false);
+							showPos = 0;
+						}
 					}
 					break;
 
@@ -905,20 +908,17 @@ void CEpgData::GetPrevNextEPGData( unsigned long long id, time_t* startzeit )
 // -- 2002-05-03 rasc
 //
 
-int CEpgData::FollowScreenings (const t_channel_id /*channel_id*/, const std::string & /*title*/)
+void CEpgData::FollowScreenings()
 {
   CChannelEventList::iterator e;
   struct  tm		*tmStartZeit;
   std::string		screening_dates,screening_nodual;
-  int				count;
   char			tmpstr[256];
 
-  	count = 0;
 	screening_dates = screening_nodual = "";
 
 	for (e = followlist.begin(); e != followlist.end(); ++e)
 	{
-		count++;
 		tmStartZeit = localtime(&(e->startTime));
 
 		screening_dates = "    ";
@@ -939,8 +939,6 @@ int CEpgData::FollowScreenings (const t_channel_id /*channel_id*/, const std::st
 			processTextToArray(screening_dates ); // UTF-8
 		}
 	}
-
-	return count;
 }
 
 
diff --git a/tuxbox/neutrino/src/gui/epgview.h b/tuxbox/neutrino/src/gui/epgview.h
index a8d6c79..619d5f3 100644
--- a/tuxbox/neutrino/src/gui/epgview.h
+++ b/tuxbox/neutrino/src/gui/epgview.h
@@ -81,8 +81,8 @@ class CEpgData
 		void addTextToArray( const std::string & text );
 		void processTextToArray(std::string text);
 		void showText( int startPos, int ypos );
-		bool hasFollowScreenings(const t_channel_id channel_id, const std::string & title);
-		int FollowScreenings(const t_channel_id channel_id, const std::string & title);
+		bool hasFollowScreenings(const t_channel_id channel_id, const std::string & title, const time_t startzeit);
+		void FollowScreenings();
 		void showTimerEventBar(bool show);
 
 	public:

commit 6c6ca237bd52ed267b83625f612fa0295bfaf240
Author: Gaucho316 <Gau...@ho...>
Date:   Wed Dec 19 19:18:48 2012 +0100

    Neutrino CTextBox: remove superfluous code
    
    Signed-off-by: Gaucho316 <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/widget/textbox.cpp b/tuxbox/neutrino/src/gui/widget/textbox.cpp
index 2983060..93c26e2 100644
--- a/tuxbox/neutrino/src/gui/widget/textbox.cpp
+++ b/tuxbox/neutrino/src/gui/widget/textbox.cpp
@@ -209,7 +209,6 @@ void CTextBox::initVar(void)
 	m_cText	= "";
 	m_nMode = SCROLL;
 
-	m_pcFontText = NULL;
 	m_pcFontText  =  g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1];
 	m_nFontTextHeight = m_pcFontText->getHeight();
 
@@ -267,7 +266,7 @@ void CTextBox::reSizeMainFrameWidth(int textWidth)
 //////////////////////////////////////////////////////////////////////
 void CTextBox::reSizeMainFrameHeight(int textHeight)
 {
-	TRACE("[CTextBox]->ReSizeMainFrameHeight: %d, current: %d\r\n",textHeight,m_cFrameTextRel.iHeight);
+	//TRACE("[CTextBox]->ReSizeMainFrameHeight: %d, current: %d\r\n",textHeight,m_cFrameTextRel.iHeight);
 
 	int iNewWindowHeight =	textHeight 
 							+ 2*TEXT_BORDER_WIDTH;
@@ -590,7 +589,7 @@ void CTextBox::scrollPageDown(const int pages)
 {
 	if( !(m_nMode & SCROLL)) return;
 	if( m_nNrOfLines <= 0) return;
-	TRACE("[CTextBox]->ScrollPageDown \r\n");
+	//TRACE("[CTextBox]->ScrollPageDown \r\n");
 
 
 	if(m_nCurrentPage + pages < m_nNrOfPages)
@@ -617,7 +616,7 @@ void CTextBox::scrollPageUp(const int pages)
 {
 	if( !(m_nMode & SCROLL)) return;
 	if( m_nNrOfLines <= 0) return;
-	TRACE("[CTextBox]->ScrollPageUp \r\n");
+	//TRACE("[CTextBox]->ScrollPageUp \r\n");
 
 
 	if(m_nCurrentPage - pages > 0)
diff --git a/tuxbox/neutrino/src/gui/widget/textbox.h b/tuxbox/neutrino/src/gui/widget/textbox.h
index b638f18..ef5513d 100644
--- a/tuxbox/neutrino/src/gui/widget/textbox.h
+++ b/tuxbox/neutrino/src/gui/widget/textbox.h
@@ -98,8 +98,6 @@ class CTextBox
 		std::string m_cText;
 		std::vector<std::string> m_cLineArray;
 
-		bool m_showTextFrame;
-
 		CBox m_cFrame;
 		CBox m_cFrameTextRel;
 		CBox m_cFrameScrollRel;
@@ -112,7 +110,6 @@ class CTextBox
 		int m_nNrOfPages;
 		int m_nNrOfLines;
 		int m_nNrOfNewLine;
-		int m_nMaxLineWidth;
 		int m_nLinesPerPage;
 		int m_nCurrentLine;
 		int m_nCurrentPage;
@@ -142,7 +139,6 @@ class CTextBox
 inline	bool 	isPainted(void){if( m_pcWindow == NULL) return (false); else return (true);};
 
 inline	CBox	getWindowsPos(void)			{return(m_cFrame);};
-inline	int		getMaxLineWidth(void)		{return(m_nMaxLineWidth);};
 inline  int     getLines(void)				{return(m_nNrOfLines);};
 inline  int     getPages(void)				{return(m_nNrOfPages);};
 inline	void	movePosition(int x, int y){m_cFrame.iX = x; m_cFrame.iY = y;};

commit 963122180bb56ef5dac9ceaef3be2a197405757b
Author: Gaucho316 <Gau...@ho...>
Date:   Wed Dec 19 19:18:33 2012 +0100

    Neutrino CListFrame: remove superfluous code
    
    Signed-off-by: Gaucho316 <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/widget/listframe.h b/tuxbox/neutrino/src/gui/widget/listframe.h
index 1cc20e0..f33c4a4 100644
--- a/tuxbox/neutrino/src/gui/widget/listframe.h
+++ b/tuxbox/neutrino/src/gui/widget/listframe.h
@@ -96,7 +96,6 @@ class CListFrame
 		int m_nNrOfPages;
 		int m_nNrOfLines;
 		int m_nNrOfRows;
-		int	m_nMaxLineWidth;
 		int m_nLinesPerPage;
 		int m_nCurrentLine;
 		int m_nCurrentPage;
@@ -142,7 +141,6 @@ class CListFrame
 		void	paint(void);
 
 inline	CBox	getWindowsPos(void)			{return(m_cFrame);};
-inline	int		getMaxLineWidth(void)		{return(m_nMaxLineWidth);};
 inline  int     getSelectedLine(void)		{return(m_nSelectedLine);};
 inline  int     getLines(void)				{return(m_nNrOfLines);};
 inline  int     getPages(void)				{return(m_nNrOfPages);};

commit 42fe1e8052ff522647558b896a40ba7c519a2716
Author: Gaucho316 <Gau...@ho...>
Date:   Wed Dec 19 19:18:12 2012 +0100

    Neutrino drive setup: use addIntroItems() in menus
    
    Signed-off-by: Gaucho316 <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/drive_setup.cpp b/tuxbox/neutrino/src/gui/drive_setup.cpp
index b0c61c3..aaa6b4d 100644
--- a/tuxbox/neutrino/src/gui/drive_setup.cpp
+++ b/tuxbox/neutrino/src/gui/drive_setup.cpp
@@ -691,9 +691,7 @@ void CDriveSetup::showHddSetupMain()
 	
 	/************add main menue entries***********/
 	// intro entries
-	m.addItem(GenericMenuSeparator);
-	m.addItem(GenericMenuBack);
-	m.addItem(GenericMenuSeparatorLine);
+	m.addIntroItems();
 	// show apply button/entry
 	m.addItem(m1);
 	m.addItem(GenericMenuSeparatorLine);
@@ -778,9 +776,6 @@ void CDriveSetup::showHddSetupMain()
 //init extended settings sub menu
 void CDriveSetup::showExtMenu(CMenuWidget *extsettings)
 {
-	CMenuSeparator * subhead_extsettings = new CMenuSeparator(CMenuSeparator::ALIGN_LEFT | CMenuSeparator::SUB_HEAD | CMenuSeparator::STRING, LOCALE_DRIVE_SETUP_ADVANCED_SETTINGS);
-	CMenuSeparator * sep_fstab = new CMenuSeparator(CMenuSeparator::ALIGN_CENTER | CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_DRIVE_SETUP_FSTAB);
-
 	//extended settings: fstab settings
 	CMenuOptionChooser *oj_auto_fs = new CMenuOptionChooser(LOCALE_DRIVE_SETUP_FSTAB_USE_AUTO_FS, &d_settings.drive_use_fstab_auto_fs, OPTIONS_ON_OFF_OPTIONS, OPTIONS_ON_OFF_OPTION_COUNT, d_settings.drive_use_fstab);
 	if (fstabNotifier == NULL)
@@ -822,11 +817,8 @@ void CDriveSetup::showExtMenu(CMenuWidget *extsettings)
 	}
 
 	//extended settings: add items
-	extsettings->addItem(subhead_extsettings);	//menue subhead
-	extsettings->addItem(GenericMenuSeparator);	//empty intro separator
-	extsettings->addItem(GenericMenuBack);		//back
+	extsettings->addIntroItems(LOCALE_DRIVE_SETUP_ADVANCED_SETTINGS, LOCALE_DRIVE_SETUP_FSTAB);	//intro items
 	// -----------------------------------------
-	extsettings->addItem (sep_fstab);		//separator fstab
 	extsettings->addItem (oj_fstab);		//option fstab on/off
 	extsettings->addItem (oj_auto_fs);		//option auto fs on/off
 	// -----------------------------------------
@@ -846,9 +838,6 @@ void CDriveSetup::showExtMenu(CMenuWidget *extsettings)
 
 void CDriveSetup::showMMCParameterMenu(CMenuWidget* w_mmc)
 {
-	//subhead_mmc_parameters
-	CMenuSeparator *subhead_mmc_parameters = new CMenuSeparator(CMenuSeparator::ALIGN_LEFT | CMenuSeparator::SUB_HEAD | CMenuSeparator::STRING, LOCALE_DRIVE_SETUP_MMC_MODUL_PARAMETERS);
-
 	//prepare mmc parameter input
 	std::vector<CMenuForwarderNonLocalized*> v_fw_mmc_load_parameters;
 	for (uint i=0; i < MAXCOUNT_MMC_MODULES; i++){
@@ -861,10 +850,7 @@ void CDriveSetup::showMMCParameterMenu(CMenuWidget* w_mmc)
 	}
 
 	//mmc:paint submenue mmc parameters
-	w_mmc->addItem(subhead_mmc_parameters);	//subhhaed mmc parameters
-	w_mmc->addItem(GenericMenuSeparator);		//empty intro separator
-	w_mmc->addItem(GenericMenuBack);		//back
-	w_mmc->addItem(GenericMenuSeparatorLine);	//separator
+	w_mmc->addIntroItems(LOCALE_DRIVE_SETUP_MMC_MODUL_PARAMETERS);	//intro items
 	// -----------------------------------------
 	for (size_t i=0; i < v_fw_mmc_load_parameters.size(); i++)
 		w_mmc->addItem(v_fw_mmc_load_parameters[i]); //show selectable mmc modules to edit
@@ -946,7 +932,6 @@ void CDriveSetup::showHddSetupSub()
 #if defined ENABLE_NFSSERVER || defined ENABLE_SAMBASERVER
 	//menue add shares
 	CMenuWidget 	sub_add_share(LOCALE_DRIVE_SETUP_HEAD, msg_icon, width);
-	CMenuSeparator 	*srv_share_subhead = new CMenuSeparator(CMenuSeparator::ALIGN_LEFT | CMenuSeparator::SUB_HEAD | CMenuSeparator::STRING, LOCALE_DRIVE_SETUP_PARTITION_SERVER_SHARE);
 
 #ifdef ENABLE_NFSSERVER
 	//nfs separator
@@ -984,7 +969,6 @@ void CDriveSetup::showHddSetupSub()
 
 	//menue sub: prepare sub head
 	string dev_name = g_Locale->getText(mn_data[current_device].entry_locale);
-	CMenuSeparator *subhead = new CMenuSeparator(CMenuSeparator::ALIGN_LEFT | CMenuSeparator::SUB_HEAD | CMenuSeparator::STRING, mn_data[current_device].entry_locale);
 
 	//menue sub: generate part items
 	CMenuForwarderNonLocalized *sub_part_entry[MAXCOUNT_PARTS];
@@ -1100,22 +1084,15 @@ void CDriveSetup::showHddSetupSub()
 	CMenuForwarder *partsize[MAXCOUNT_PARTS];
 
 	//sub menue main
-	sub->addItem(subhead);		//subhead 
-	//------------------------
-	sub->addItem(GenericMenuSeparator);
-	sub->addItem(GenericMenuBack);	//back
+	sub->addIntroItems(mn_data[current_device].entry_locale, (current_device != MMCARD) ? LOCALE_DRIVE_SETUP_HDD_PARAMETERS : LOCALE_DRIVE_SETUP_HDD_JOBS);	//intro items
 	//------------------------
 	CStringInput hdd_sleep(LOCALE_DRIVE_SETUP_HDD_SLEEP, d_settings.drive_spindown[current_device], 3, LOCALE_DRIVE_SETUP_HDD_SLEEP_STD, LOCALE_DRIVE_SETUP_HDD_SLEEP_HELP, "0123456789 ");
 	if (current_device != MMCARD) 	//not for mmc!
 	{
-		sub->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_DRIVE_SETUP_HDD_PARAMETERS));//separator
 		sub->addItem(new CMenuForwarder(LOCALE_DRIVE_SETUP_HDD_SLEEP, true, d_settings.drive_spindown[current_device], &hdd_sleep )); //spindown
-		
 		sub->addItem(new CMenuOptionChooser(LOCALE_DRIVE_SETUP_HDD_CACHE, &d_settings.drive_write_cache[current_device], OPTIONS_ON_OFF_OPTIONS, OPTIONS_ON_OFF_OPTION_COUNT, true )); //writecache
-		sub->addItem(sep_jobs); //separator jobs
+		sub->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_DRIVE_SETUP_HDD_JOBS)); //separator jobs
 	}
-	else
-		sub->addItem(sep_jobs); 	//separator jobs
 	//------------------------
 	sub->addItem(swap_add); 	//add swap
 	sub->addItem(part_add); 	//add partition
@@ -1130,9 +1107,6 @@ void CDriveSetup::showHddSetupSub()
 	// end cylinder
 	unsigned long long end_cyl[MAXCOUNT_PARTS];
 
-	//menue partitions: prepare separator: info
-	CMenuSeparator *sep_info = new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_DRIVE_SETUP_PARTITION_INFO);
-
 	// cylinders
 	CMenuForwarder *fw_cylinders[MAXCOUNT_PARTS];
 
@@ -1375,10 +1349,7 @@ void CDriveSetup::showHddSetupSub()
 		//edit partition
 		part[i]->addItem(p_subhead[i]);			//subhead
 		//------------------------
-		part[i]->addItem(GenericMenuSeparator); 	//separator
-		part[i]->addItem(GenericMenuBack);		//back
-		//------------------------
-		part[i]->addItem(sep_info);			//separator information
+		part[i]->addIntroItems(NONEXISTANT_LOCALE, LOCALE_DRIVE_SETUP_PARTITION_INFO);	//intro items
 		//------------------------
 //		part[i]->addItem(freesizeOfPart[i]);		//freesize of Part and / whole freesize, it is not very useful to show more, than size of partition in edit mode!
 		part[i]->addItem(partsize[i]);			//partsize
@@ -1401,11 +1372,7 @@ void CDriveSetup::showHddSetupSub()
 		part[i]->addItem(GenericMenuSeparatorLine);	//separator
 		part[i]->addItem(part_srv_fw[i]);		//sub menue server shares
 			//------------------------
-			part_srv_shares[i]->addItem(srv_share_subhead);	//subhead
-			//------------------------
-			part_srv_shares[i]->addItem(GenericMenuSeparator); 	//separator
-			part_srv_shares[i]->addItem(GenericMenuBack);		//back
-			part_srv_shares[i]->addItem(GenericMenuSeparatorLine);	//separator
+			part_srv_shares[i]->addIntroItems(LOCALE_DRIVE_SETUP_PARTITION_SERVER_SHARE);	//intro items
 			part_srv_shares[i]->addItem(srv_path_fw[i]);		//show shared mountpoint
 		#ifdef ENABLE_NFSSERVER
 			part_srv_shares[i]->addItem(srv_nfs_sep);		//nfs separator
@@ -1436,9 +1403,7 @@ void CDriveSetup::showHddSetupSub()
 	//add
 	sub_add->addItem(add_subhead); 	//add partition-subhead
 	//------------------------
-	sub_add->addItem(GenericMenuSeparator); 	//separator
-	sub_add->addItem(GenericMenuBack);		//back
-	sub_add->addItem(GenericMenuSeparatorLine);	//separator
+	sub_add->addIntroItems();	//intro items
 	//------------------------
 	sub_add->addItem(freesizeOfPart[next_part_number]); // freesize of Part
 	sub_add->addItem(fw_add_start_cyl);		//start_cylinder
@@ -1456,11 +1421,7 @@ void CDriveSetup::showHddSetupSub()
 	sub_add->addItem(GenericMenuSeparatorLine);	//separator
 	sub_add->addItem(part_srv_fw[next_part_number]);//sub menue server shares
 		//------------------------
-		sub_add_share.addItem(srv_share_subhead);	//subhead
-		//------------------------
-		sub_add_share.addItem(GenericMenuSeparator); 	//separator
-		sub_add_share.addItem(GenericMenuSeparatorLine);//separator
-		sub_add_share.addItem(GenericMenuBack);	//back
+		sub_add_share.addIntroItems(LOCALE_DRIVE_SETUP_PARTITION_SERVER_SHARE);	//intro items
 		sub_add_share.addItem(srv_path_fw[next_part_number]); 	//separator
 	#ifdef ENABLE_NFSSERVER
 		sub_add_share.addItem(srv_nfs_sep);				//nfs separator
@@ -1488,9 +1449,7 @@ void CDriveSetup::showHddSetupSub()
 	//add swap
 	sub_add_swap->addItem(add_swap_subhead); 		//add swap-subhead
 	//------------------------
-	sub_add_swap->addItem(GenericMenuSeparator); 		//separator
-	sub_add_swap->addItem(GenericMenuBack);			//back
-	sub_add_swap->addItem(GenericMenuSeparatorLine);	//separator
+	sub_add_swap->addIntroItems();	//intro items
 	//------------------------
 	sub_add_swap->addItem(freesizeOfPart[next_part_number]); // freesize of Part
 	sub_add_swap->addItem(fw_add_start_cyl);		//start_cylinder

commit 590a1cc04629fd022ebdd16fddb10c881e597eb0
Author: Gaucho316 <Gau...@ho...>
Date:   Wed Dec 19 19:17:56 2012 +0100

    Neutrino drive setup: use COnOffNotifier if possible
    
    Signed-off-by: Gaucho316 <Gau...@ho...>

diff --git a/tuxbox/neutrino/src/gui/drive_setup.cpp b/tuxbox/neutrino/src/gui/drive_setup.cpp
index da7997e..b0c61c3 100644
--- a/tuxbox/neutrino/src/gui/drive_setup.cpp
+++ b/tuxbox/neutrino/src/gui/drive_setup.cpp
@@ -721,7 +721,8 @@ void CDriveSetup::showHddSetupMain()
 		
 		//select mmc modules
 		if (mmc_notifier == NULL)
-			mmc_notifier = new CDriveSetupMmcNotifier(fw_mmc_parameter);
+			mmc_notifier = new COnOffNotifier(0x61757300 /*off*/); //modify mmc load options (off: 0x61757300, mmc: 0x6D6D6300, mmc2: 0x6D6D6332, mmccombo: 0x6D6D6363)
+		mmc_notifier->addItem(fw_mmc_parameter);
 		CMenuOptionStringChooser *oj_mmc_chooser = new CMenuOptionStringChooser(LOCALE_DRIVE_SETUP_MMC_USED_DRIVER, d_settings.drive_mmc_module_name, true, mmc_notifier);
 		for (size_t i=0; i < v_mmc_modules.size(); i++)
 			oj_mmc_chooser->addOption(v_mmc_modules[i].c_str());
@@ -767,6 +768,10 @@ void CDriveSetup::showHddSetupMain()
 	
 	exit_res = m.exec (NULL, "");
 	selected_main = m.getSelected();
+	if (fstabNotifier != NULL)
+		fstabNotifier->removeItems();
+	if (mmc_notifier !...
 
[truncated message content]