From c239f7af953d6d4a793320199d0f11168ab1233c Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Wed, 23 Oct 2013 10:41:47 +0200
Subject: [PATCH 01/73] - locale: remove confusing string 'squashFS'

---
 data/locale/deutsch.locale    | 2 +-
 data/locale/english.locale    | 2 +-
 data/locale/nederlands.locale | 2 +-
 src/gui/update.cpp            | 2 +-
 src/system/locals.h           | 2 +-
 src/system/locals_intern.h    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 8efe3058c..449b71794 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -511,6 +511,7 @@ flashupdate.namemode2_default <Partition>+<Zeit>.img
 flashupdate.namemode2_hostname_time <Partition>+<Zeit>+<Hostname>.img
 flashupdate.new_found Updates verfügbar!
 flashupdate.new_notfound Keine Updates verfügbar!
+flashupdate.noversion Bei Updates werden Versionsüberprüfungen derzeit nur über Web-Updates unterstützt.\nWollen Sie das ausgewählte Image wirklich installieren?
 flashupdate.programmingflash programmiere Flash
 flashupdate.proxypassword Passwort
 flashupdate.proxypassword_hint1 Geben sie das Proxy-Passwort ein
@@ -532,7 +533,6 @@ flashupdate.reallyflashmtd Wollen Sie den Flashvorgang wirklich durchführen?\n\
 flashupdate.savesuccess Das Image wurde erfolgreich unter dem\nDateinamen %s gespeichert.
 flashupdate.selectimage Verfügbare Images/Files
 flashupdate.settings Update-Einstellungen
-flashupdate.squashfs.noversion Bei Updates werden Versionsüberprüfungen derzeit nur über Web-Updates unterstützt.\nWollen Sie das ausgewählte Image wirklich installieren?
 flashupdate.titlereadflash Flash auslesen
 flashupdate.titlewriteflash Flash schreiben
 flashupdate.update_with_settings_del_skipped Ordner [%s] kann nicht gelöscht werden. Eintrag wird übersprungen.
diff --git a/data/locale/english.locale b/data/locale/english.locale
index b45d31181..0daf5b0cf 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -511,6 +511,7 @@ flashupdate.namemode2_default <partition>+<time>.img
 flashupdate.namemode2_hostname_time <partition>+<time>+<hostname>.img
 flashupdate.new_found New image found !
 flashupdate.new_notfound No new images found
+flashupdate.noversion Version checks are currently only supported when updating over the web.\nAre you sure that you wish to install this image?
 flashupdate.programmingflash programming flash
 flashupdate.proxypassword Password
 flashupdate.proxypassword_hint1 enter the proxyserver password
@@ -532,7 +533,6 @@ flashupdate.reallyflashmtd Do you really want to flash?\n\nIf a error occurs or
 flashupdate.savesuccess The image was successfully saved \nunder %s.
 flashupdate.selectimage Available Images/Files
 flashupdate.settings Update settings
-flashupdate.squashfs.noversion SquashFS version checks are currently only supported when updating over the web.\nAre you sure that you wish to install this image?
 flashupdate.titlereadflash Reading Flash
 flashupdate.titlewriteflash Writing Flash
 flashupdate.update_with_settings_del_skipped Folder [%s] can not be deleted. Entry is skipped.
diff --git a/data/locale/nederlands.locale b/data/locale/nederlands.locale
index 4814996a1..d397e5019 100644
--- a/data/locale/nederlands.locale
+++ b/data/locale/nederlands.locale
@@ -495,6 +495,7 @@ flashupdate.msgbox_manual De volgende firmware is gevonden:\nDatum: %s, %s\nBase
 flashupdate.mtdselector Partitie-selector
 flashupdate.new_found Nieuwe firmware gevonden!
 flashupdate.new_notfound Geen nieuwe firmware gevonden
+flashupdate.noversion Versie controle is alleen ondersteund wanneer u update via het internet. \nWeet u zeker dat u deze firmware wilt installeren?
 flashupdate.programmingflash programming flash
 flashupdate.proxypassword Wachtwoord
 flashupdate.proxypassword_hint1 Wachtwoord van de proxyserver invoeren
@@ -513,7 +514,6 @@ flashupdate.reallyflashmtd Weet u zeker dat u wilt updaten?\nIndien er zich een
 flashupdate.savesuccess De Firmware is succesvol opgeslagen \n onder %s.
 flashupdate.selectimage Beschikbare firmware/bestanden
 flashupdate.settings Update instellingen
-flashupdate.squashfs.noversion SquashFS versie controle is alleen ondersteund wanneer u update via het internet. \nWeet u zeker dat u deze firmware wilt installeren?
 flashupdate.titlewriteflash Flash schrijven
 flashupdate.update_with_settings_del_skipped Folder [%s] kan niet worden verwijderd. Folder is overgeslagen.
 flashupdate.update_with_settings_error Foutmelding!\n \nNieuwe firmware heeft %ld KB (out of %ld KB) resterend.\n Onvoldoende \nruimte om opdracht af te ronden. Opdracht wordt geannuleerd.
diff --git a/src/gui/update.cpp b/src/gui/update.cpp
index 7a0c62ae0..225b13d64 100644
--- a/src/gui/update.cpp
+++ b/src/gui/update.cpp
@@ -394,7 +394,7 @@ printf("[update] mode is %d\n", softupdate_mode);
 #endif
 		}
 
-		strcpy(msg, g_Locale->getText(LOCALE_FLASHUPDATE_SQUASHFS_NOVERSION));
+		strcpy(msg, g_Locale->getText(LOCALE_FLASHUPDATE_NOVERSION));
 		msg_body = LOCALE_FLASHUPDATE_MSGBOX_MANUAL;
 	}
 	return (ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, msg, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NEUTRINO_ICON_UPDATE) == CMessageBox::mbrYes); // UTF-8
diff --git a/src/system/locals.h b/src/system/locals.h
index 31da56233..e39f70cad 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -538,6 +538,7 @@ typedef enum
 	LOCALE_FLASHUPDATE_NAMEMODE2_HOSTNAME_TIME,
 	LOCALE_FLASHUPDATE_NEW_FOUND,
 	LOCALE_FLASHUPDATE_NEW_NOTFOUND,
+	LOCALE_FLASHUPDATE_NOVERSION,
 	LOCALE_FLASHUPDATE_PROGRAMMINGFLASH,
 	LOCALE_FLASHUPDATE_PROXYPASSWORD,
 	LOCALE_FLASHUPDATE_PROXYPASSWORD_HINT1,
@@ -559,7 +560,6 @@ typedef enum
 	LOCALE_FLASHUPDATE_SAVESUCCESS,
 	LOCALE_FLASHUPDATE_SELECTIMAGE,
 	LOCALE_FLASHUPDATE_SETTINGS,
-	LOCALE_FLASHUPDATE_SQUASHFS_NOVERSION,
 	LOCALE_FLASHUPDATE_TITLEREADFLASH,
 	LOCALE_FLASHUPDATE_TITLEWRITEFLASH,
 	LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_DEL_SKIPPED,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 29a6981ab..9a4b964f8 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -538,6 +538,7 @@ const char * locale_real_names[] =
 	"flashupdate.namemode2_hostname_time",
 	"flashupdate.new_found",
 	"flashupdate.new_notfound",
+	"flashupdate.noversion",
 	"flashupdate.programmingflash",
 	"flashupdate.proxypassword",
 	"flashupdate.proxypassword_hint1",
@@ -559,7 +560,6 @@ const char * locale_real_names[] =
 	"flashupdate.savesuccess",
 	"flashupdate.selectimage",
 	"flashupdate.settings",
-	"flashupdate.squashfs.noversion",
 	"flashupdate.titlereadflash",
 	"flashupdate.titlewriteflash",
 	"flashupdate.update_with_settings_del_skipped",

From 1b0d4fdd05af8e07d7e470a4b54b1a0cc2a64a19 Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Mon, 21 Oct 2013 15:13:41 +0200
Subject: [PATCH 02/73] CComponentsHeader: add member to get header text

---
 src/gui/components/cc_frm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/components/cc_frm.h b/src/gui/components/cc_frm.h
index 181b4ec78..8e2203cf9 100644
--- a/src/gui/components/cc_frm.h
+++ b/src/gui/components/cc_frm.h
@@ -174,7 +174,7 @@ class CComponentsHeader : public CComponentsForm
 		virtual void setButtonsSpace(const int buttons_space){cch_buttons_space = buttons_space;};
 		virtual void initCCItems();
 		virtual void setSizeMode(const int& size_mode){cch_size_mode = size_mode;};
-
+		virtual CComponentsText* getTextObject(){return cch_text_obj;};
 		virtual void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
 };
 

From e613971c0d8182667f824d374afbbfff2c18f84f Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Mon, 21 Oct 2013 15:14:17 +0200
Subject: [PATCH 03/73] CComponentsText: add member to get text color

---
 src/gui/components/cc_item_text.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gui/components/cc_item_text.h b/src/gui/components/cc_item_text.h
index e6bf1365e..c20420d9a 100644
--- a/src/gui/components/cc_item_text.h
+++ b/src/gui/components/cc_item_text.h
@@ -100,6 +100,8 @@ class CComponentsText : public CComponentsItem, public CBox
 		virtual inline void setTextFont(Font* font_text){ct_font = font_text;};
 		///set text color
 		virtual inline void setTextColor(fb_pixel_t color_text){ ct_col_text = color_text;};
+		///get text color
+		virtual inline fb_pixel_t getTextColor(){return ct_col_text;};
 		///set text alignment, also see textbox.h for possible alignment modes
 		virtual inline void setTextMode(const int mode){ct_text_mode = mode;};
                 ///set text border width

From 9f150435a72f87c173442b602d0b36c0a1a38000 Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Mon, 21 Oct 2013 15:16:15 +0200
Subject: [PATCH 04/73] CChannelList: set some clock item properties in
 dependency from header

---
 src/gui/channellist.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 48a530985..6e9b8d611 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -2130,8 +2130,8 @@ void CChannelList::paintHead()
 		headerClock->setCorner(RADIUS_LARGE, CORNER_TOP_RIGHT);
 		headerClock->setYPos(y);
 		headerClock->setHeight(theight);
-		headerClock->setTextColor(COL_MENUHEAD_TEXT);
-		headerClock->setColorBody(COL_MENUHEAD_PLUS_0);
+		headerClock->setTextColor(header.getTextObject()->getTextColor());
+		headerClock->setColorBody(header.getColorBody());
 		headerClock->refresh();
 		headerClockWidth = headerClock->getWidth();
 		headerClock->setXPos(x + full_width - headerClockWidth - 10);

From adba310c1c64fbccd0ff4cbb9eabcebb9bea8620 Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Mon, 21 Oct 2013 17:54:51 +0200
Subject: [PATCH 05/73] CTextBox: ensure paint of text and background only if
 required

It's not new, but this involves also other properties,
like color or position...

It's possible that more properties are required, maybe needs to be watched
and evaluation of comparison might require further revisions.
---
 src/gui/widget/textbox.cpp | 82 +++++++++++++++++++++++++++++---------
 src/gui/widget/textbox.h   |  5 ++-
 2 files changed, 67 insertions(+), 20 deletions(-)

diff --git a/src/gui/widget/textbox.cpp b/src/gui/widget/textbox.cpp
index 556697723..759f5a7cf 100644
--- a/src/gui/widget/textbox.cpp
+++ b/src/gui/widget/textbox.cpp
@@ -77,7 +77,7 @@ CTextBox::CTextBox(const char * text, Font* font_text, const int pmode,
 	initVar();
 
 	if(text != NULL)
-		m_cText = text;
+		m_cText = m_old_cText = text;
 	
 	if(font_text != NULL)
 		m_pcFontText = font_text;
@@ -113,7 +113,7 @@ CTextBox::CTextBox(const char * text)
 	initVar();
 
 	if(text != NULL)
-		m_cText = *text;
+		m_cText = m_old_cText = *text;
 
 	//TRACE_1("[CTextBox] %s Line %d text: %s\r\n", __FUNCTION__, __LINE__, text);
 
@@ -149,7 +149,7 @@ void CTextBox::initVar(void)
 	m_nMaxLineWidth = 0;
 
 	m_cText	= "";
-	m_nMode = SCROLL;
+	m_nMode = m_old_nMode 	= SCROLL;
 
 	m_FontUseDigitHeight	= false;
 	m_pcFontText  		= g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1];
@@ -164,21 +164,21 @@ void CTextBox::initVar(void)
 	text_Hborder_width 	= 8; //border left and right
 	text_Vborder_width	= 8; //border top and buttom
 
-	m_cFrame.iX		= g_settings.screen_StartX + ((g_settings.screen_EndX - g_settings.screen_StartX - MIN_WINDOW_WIDTH) >>1);
-	m_cFrame.iWidth		= MIN_WINDOW_WIDTH;
-	m_cFrame.iY		= g_settings.screen_StartY + ((g_settings.screen_EndY - g_settings.screen_StartY - MIN_WINDOW_HEIGHT) >>1);
-	m_cFrame.iHeight	= MIN_WINDOW_HEIGHT;
+	m_cFrame.iX		= m_old_x = g_settings.screen_StartX + ((g_settings.screen_EndX - g_settings.screen_StartX - MIN_WINDOW_WIDTH) >>1);
+	m_cFrame.iWidth		= m_old_dx = MIN_WINDOW_WIDTH;
+	m_cFrame.iY		= m_old_y = g_settings.screen_StartY + ((g_settings.screen_EndY - g_settings.screen_StartY - MIN_WINDOW_HEIGHT) >>1);
+	m_cFrame.iHeight	= m_old_dy = MIN_WINDOW_HEIGHT;
 
 	m_nMaxHeight 		= MAX_WINDOW_HEIGHT;
 	m_nMaxWidth 		= MAX_WINDOW_WIDTH;
 	m_nMinHeight		= MIN_WINDOW_HEIGHT;
 	m_nMinWidth		= MIN_WINDOW_WIDTH;
 
-	m_textBackgroundColor 	= COL_MENUCONTENT_PLUS_0;
+	m_textBackgroundColor 	= m_old_textBackgroundColor = COL_MENUCONTENT_PLUS_0;
 	m_textColor		= COL_MENUCONTENT_TEXT;
 	m_nPaintBackground 	= true;
-	m_nBgRadius		= 0;
-	m_nBgRadiusType 	= CORNER_ALL;
+	m_nBgRadius		= m_old_nBgRadius = 0;
+	m_nBgRadiusType 	= m_old_nBgRadiusType = CORNER_ALL;
 
 	m_cLineArray.clear();
 
@@ -516,24 +516,67 @@ void CTextBox::refreshText(void)
 	int ay = /*m_cFrameTextRel.iY+*/m_cFrame.iY;
 	int dx = m_cFrameTextRel.iWidth;
 	int dy = m_cFrameTextRel.iHeight;
+	bool has_changed = false;
 
-	//save screen
-	if (m_bgpixbuf == NULL){
-		m_bgpixbuf= new fb_pixel_t[dx * dy];
-		frameBuffer->SaveScreen(ax, ay, dx, dy, m_bgpixbuf);
+	//evaluate comparsion properties
+	if (m_old_x != ax || m_old_y != ay || m_old_dx != dx || m_old_dy != dy ||
+		m_old_textBackgroundColor != m_textBackgroundColor ||
+		m_old_nBgRadius != m_nBgRadius ||m_old_nBgRadiusType != m_nBgRadiusType ||
+		m_nNrOfPages > 1 ||
+		m_old_nMode != m_nMode){
+			has_changed = true;
+	}
+
+	//destroy pixel buffer on changed property values
+	if (has_changed){
+		if (m_bgpixbuf){
+			//TRACE("[CTextBox] %s destroy ol pixel buffer, has changes%d\r\n", __FUNCTION__, __LINE__);
+			delete[] m_bgpixbuf;
+			m_bgpixbuf = NULL;
+		}
+	}
+
+	//save screen only if no paint of background required
+	if (!m_nPaintBackground){
+		if (m_bgpixbuf == NULL){
+			//TRACE("[CTextBox] %s save bg %d\r\n", __FUNCTION__, __LINE__);
+			m_bgpixbuf= new fb_pixel_t[dx * dy];
+			frameBuffer->SaveScreen(ax, ay, dx, dy, m_bgpixbuf);
+		}
 	}
 
 	//Paint Text Background
 	if (m_nPaintBackground){
 		if (m_bgpixbuf){
+			//TRACE("[CTextBox] %s destroy bg %d\r\n", __FUNCTION__, __LINE__);
 			delete[] m_bgpixbuf;
 			m_bgpixbuf = NULL;
 		}
-		frameBuffer->paintBoxRel(ax, ay, dx, dy,  m_textBackgroundColor, m_nBgRadius, m_nBgRadiusType);
+		if (has_changed){
+			//TRACE("[CTextBox] %s paint bg %d\r\n", __FUNCTION__, __LINE__);
+			frameBuffer->paintBoxRel(ax, ay, dx, dy,  m_textBackgroundColor, m_nBgRadius, m_nBgRadiusType);
+		}
 	}
 	else{
-		if (m_bgpixbuf)
-			frameBuffer->RestoreScreen(ax, ay, dx, dy, m_bgpixbuf);
+		if (m_bgpixbuf){
+			if (m_old_cText != m_cText || has_changed){
+				//TRACE("[CTextBox] %s restore bg %d\r\n", __FUNCTION__, __LINE__);
+				frameBuffer->RestoreScreen(ax, ay, dx, dy, m_bgpixbuf);
+			}
+		}
+	}
+
+	//save current comparsion properties
+	if (has_changed){
+		//TRACE("[CTextBox] %s set current values %d\r\n", __FUNCTION__, __LINE__);
+		m_old_x = ax;
+		m_old_y = ay;
+		m_old_dx = dx;
+		m_old_dy = dy;
+		m_old_textBackgroundColor = m_textBackgroundColor;
+		m_old_nBgRadius = m_nBgRadius;
+		m_old_nBgRadiusType = m_nBgRadiusType;
+		m_old_nMode = m_nMode;
 	}
 
 	if( m_nNrOfLines <= 0)
@@ -569,8 +612,9 @@ void CTextBox::refreshText(void)
 
 		//TRACE("[CTextBox] %s Line %d m_cFrame.iX %d m_cFrameTextRel.iX %d\r\n", __FUNCTION__, __LINE__, m_cFrame.iX, m_cFrameTextRel.iX);
 		m_pcFontText->RenderString(m_cFrame.iX + m_cFrameTextRel.iX + text_Hborder_width + x_center,
-				y+m_cFrame.iY, m_cFrameTextRel.iWidth, m_cLineArray[i].c_str(),
-				m_textColor, 0, true); // UTF-8
+					y+m_cFrame.iY, m_cFrameTextRel.iWidth, m_cLineArray[i].c_str(),
+					m_textColor, 0, true); // UTF-8
+		m_old_cText = m_cText;
 		y += m_nFontTextHeight;
 	}
 }
diff --git a/src/gui/widget/textbox.h b/src/gui/widget/textbox.h
index 39a1f9ff8..798dafd1b 100644
--- a/src/gui/widget/textbox.h
+++ b/src/gui/widget/textbox.h
@@ -116,9 +116,12 @@ class CTextBox
 		int  getFontTextHeight();
 
 		/* Variables */
-		std::string m_cText;
+		std::string m_cText, m_old_cText;
 		std::vector<std::string> m_cLineArray;
 
+		int m_old_x, m_old_y, m_old_dx, m_old_dy, m_old_nBgRadius, m_old_nBgRadiusType, m_old_nMode;
+		fb_pixel_t m_old_textBackgroundColor;
+
 		bool m_showTextFrame;
 
 		CBox m_cFrame;

From 5323e92a6f9744c83a3aa9d0d7f7ae520598cd8e Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Mon, 21 Oct 2013 21:57:16 +0200
Subject: [PATCH 06/73] CComponentsWindow: add member showHeader()

Provides show or hide window header
---
 src/gui/components/cc_frm.h          |  8 ++++++--
 src/gui/components/cc_frm_window.cpp | 28 ++++++++++++++++++++--------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/gui/components/cc_frm.h b/src/gui/components/cc_frm.h
index 8e2203cf9..107e05bf3 100644
--- a/src/gui/components/cc_frm.h
+++ b/src/gui/components/cc_frm.h
@@ -229,8 +229,10 @@ class CComponentsWindow : public CComponentsForm
 		const char* ccw_icon_name;
 		///property: assigned default icon buttons in header, see also getHeaderObject()
 		int ccw_buttons;
-		///property: value = true, let show footer
+		///property: value = true, let show footer, see showFooter()
 		bool ccw_show_footer;
+		///property: value = true, let show header, see showHeader()
+		bool ccw_show_header;
 
 		///initialze header object
 		void initHeader();
@@ -285,8 +287,10 @@ class CComponentsWindow : public CComponentsForm
 		///add item to body object, also usable is addCCItem() to add items to the windo object
 		void addWindowItem(CComponentsItem* cc_Item);
 		
-		///
+		///allow/disallow paint a footer, default true, see also ccw_show_footer, showHeader()
 		void showFooter(bool show = true){ccw_show_footer = show;};
+		///allow/disallow paint a header, default true, see also ccw_show_header, showFooter()
+		void showHeader(bool show = true){ccw_show_header = show;};
 
 		///set caption in header with string, see also getHeaderObject()
 		void setWindowCaption(const std::string& text){ccw_caption = text;};
diff --git a/src/gui/components/cc_frm_window.cpp b/src/gui/components/cc_frm_window.cpp
index 69997d755..1e81905b1 100644
--- a/src/gui/components/cc_frm_window.cpp
+++ b/src/gui/components/cc_frm_window.cpp
@@ -141,7 +141,8 @@ void CComponentsWindow::initVarWindow()
 	ccw_icon_name	= NULL;
 	ccw_buttons	= 0; //no header buttons
 	ccw_show_footer = true;
-	
+	ccw_show_header	= true;
+
 	setShadowOnOff(true);
 }
 
@@ -181,9 +182,11 @@ void CComponentsWindow::initBody()
 	if (ccw_body){
 		ccw_body->setCornerType(0);
 		int fh = 0;
+		int hh = 0;
 		if (ccw_footer)
 			fh = ccw_footer->getHeight();
-		int hh = ccw_head->getHeight();
+		if (ccw_head)
+			hh = ccw_head->getHeight();
 		int h_body = height - hh - fh - 2*fr_thickness;
 		ccw_body->setDimensionsAll(0, CC_APPEND, width-2*fr_thickness, h_body);
 		ccw_body->doPaintBg(false);
@@ -218,22 +221,31 @@ void CComponentsWindow::initCCWItems()
 #ifdef DEBUG_CC
 	printf("[CComponentsWindow]   [%s - %d] init items...\n", __FUNCTION__, __LINE__);
 #endif
-	initHeader();
-	
+	//add header if required
+	if (ccw_show_header){
+		initHeader();
+	}else{
+		if (ccw_head){
+			removeCCItem(ccw_head);
+			ccw_head = NULL;
+		}
+	}
+
 	//add footer if required
 	if (ccw_show_footer){
 		initFooter();
 	}else{
-		if (ccw_footer != NULL){
+		if (ccw_footer){
 			removeCCItem(ccw_footer);
 			ccw_footer = NULL;
 		}
 	}
 	initBody();
-	
+
 	//add header, body and footer items only one time
-	if (!ccw_head->isAdded())
-		addCCItem(ccw_head);
+	if (ccw_head)
+		if (!ccw_head->isAdded())
+			addCCItem(ccw_head);
 	if (!ccw_body->isAdded())
 		addCCItem(ccw_body);
 	if (ccw_footer)

From 3d404afc7f94d9196ff10a69add589d5681bdf38 Mon Sep 17 00:00:00 2001
From: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: Fri, 18 Oct 2013 10:47:16 +0200
Subject: [PATCH 07/73] CTextBox: Add function getLinesPerPage()

- Add AUTO_LINEBREAK_NO_BREAKCHARS to textbox_modes for
  auto linebreak without '-' and '.' char
---
 src/gui/widget/textbox.cpp |  6 ++++--
 src/gui/widget/textbox.h   | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/gui/widget/textbox.cpp b/src/gui/widget/textbox.cpp
index 759f5a7cf..63049953c 100644
--- a/src/gui/widget/textbox.cpp
+++ b/src/gui/widget/textbox.cpp
@@ -373,9 +373,11 @@ void CTextBox::refreshTextLineArray(void)
 		{
 			//manage auto linebreak,
 			if(m_nMode & NO_AUTO_LINEBREAK)
-				pos = m_cText.find_first_of("\n",pos_prev);
+				pos = m_cText.find_first_of("\n", pos_prev);
+			else if(m_nMode & AUTO_LINEBREAK_NO_BREAKCHARS)
+				pos = m_cText.find_first_of("\n/ ", pos_prev);
 			else
-				pos = m_cText.find_first_of("\n/-. ",pos_prev);
+				pos = m_cText.find_first_of("\n/-. ", pos_prev);
 
 			//TRACE_1("     pos: %d pos_prev: %d\r\n",pos,pos_prev);
 
diff --git a/src/gui/widget/textbox.h b/src/gui/widget/textbox.h
index 798dafd1b..fc3edb57e 100644
--- a/src/gui/widget/textbox.h
+++ b/src/gui/widget/textbox.h
@@ -93,14 +93,15 @@ class CTextBox
 		/* Variables */
 		enum textbox_modes
 		{
-			AUTO_WIDTH	= 0x01, 	//auto adapt frame width to max width or max text width, text is painted with auto linebreak
-			AUTO_HIGH	= 0x02, 	//auto adapt frame height to max height, text is painted with auto linebreak
-			SCROLL		= 0x04, 	//frame box contains scrollbars on long text
-			CENTER		= 0x40, 	//paint text centered
-			RIGHT		= 0x80, 	//paint text right
-			TOP		= 0x100,	//paint text on top of frame
-			BOTTOM		= 0x200,	//paint text on bottom of frame
-			NO_AUTO_LINEBREAK = 0x400  	//paint text without auto linebreak,  cutting text
+			AUTO_WIDTH			= 0x01, 	//auto adapt frame width to max width or max text width, text is painted with auto linebreak
+			AUTO_HIGH			= 0x02, 	//auto adapt frame height to max height, text is painted with auto linebreak
+			SCROLL				= 0x04, 	//frame box contains scrollbars on long text
+			CENTER				= 0x40, 	//paint text centered
+			RIGHT				= 0x80, 	//paint text right
+			TOP				= 0x100,	//paint text on top of frame
+			BOTTOM				= 0x200,	//paint text on bottom of frame
+			NO_AUTO_LINEBREAK 		= 0x400,  	//paint text without auto linebreak,  cutting text
+			AUTO_LINEBREAK_NO_BREAKCHARS	= 0x800		//no linbreak an char '-' and '.'
 		};
 		
 	private:
@@ -195,6 +196,7 @@ class CTextBox
 		inline	CBox	getWindowsPos(void)		{return(m_cFrame);};
 		inline	int	getMaxLineWidth(void)		{return(m_nMaxLineWidth);};
 		inline  int     getLines(void)			{return(m_nNrOfLines);};
+		inline  int     getLinesPerPage(void)		{return m_nLinesPerPage;};
 		inline  int     getPages(void)			{return(m_nNrOfPages);};
 		inline	void	movePosition(int x, int y)	{m_cFrame.iX = x; m_cFrame.iY = y;};
 

From ad102b69fdebdd3c4e54f28615ce79af7885138e Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Tue, 22 Oct 2013 19:57:03 +0200
Subject: [PATCH 08/73] CComponentsHeader: use isAdded() to avoid add multiple
 items

---
 src/gui/components/cc_frm_header.cpp | 30 ++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp
index 554601fb9..11bc47731 100644
--- a/src/gui/components/cc_frm_header.cpp
+++ b/src/gui/components/cc_frm_header.cpp
@@ -168,10 +168,12 @@ void CComponentsHeader::initIcon()
 	printf("    [CComponentsHeader]\n    [%s - %d] init header icon: %s\n", __FUNCTION__, __LINE__, cch_icon_name);
 #endif
 		cch_icon_obj = new CComponentsPicture(cch_icon_x, cch_items_y, 0, 0, cch_icon_name);
-		//add item only one time
-		addCCItem(cch_icon_obj); //icon
 	}
 
+	//add item only one time
+	if (!cch_icon_obj->isAdded())
+		addCCItem(cch_icon_obj); //icon
+
 	//get dimensions of header icon
 	int iw, ih;
 	frameBuffer->getIconSize(cch_icon_name, &iw, &ih);
@@ -242,6 +244,10 @@ void CComponentsHeader::initButtonFormSize()
 {
 	cch_buttons_w = 0;
 	cch_buttons_h = 0;
+
+	if (cch_btn_obj == NULL)
+		return;
+	
 	for(size_t i=0; i<v_cch_btn.size(); i++){
 		int bw, bh;
 		frameBuffer->getIconSize(v_cch_btn[i].c_str(), &bw, &bh);
@@ -254,9 +260,13 @@ void CComponentsHeader::initButtonFormSize()
 void CComponentsHeader::initButtons()
 {
 	//exit if no button defined
- 	if (v_cch_btn.empty())
+	if (v_cch_btn.empty()){
+		if (cch_btn_obj)
+			delete cch_btn_obj;
+			cch_btn_obj = NULL;
 		return;
-		
+	}
+	
 	initButtonFormSize();
 
 	if (cch_btn_obj == NULL){
@@ -264,10 +274,12 @@ void CComponentsHeader::initButtons()
 #ifdef DEBUG_CC
 	printf("    [CComponentsHeader]\n    [%s - %d] init header buttons...\n", __FUNCTION__, __LINE__);
 #endif
-		//add button form
-		addCCItem(cch_btn_obj); //buttons
 	}
 
+	//add button form only one time
+	if (!cch_btn_obj->isAdded())
+		addCCItem(cch_btn_obj); //buttons
+
 	//set button form properties
 	if (cch_btn_obj){
 		cch_btn_obj->setDimensionsAll(width-cch_offset-cch_buttons_w, cch_items_y, cch_buttons_w, cch_buttons_h);
@@ -315,10 +327,12 @@ void CComponentsHeader::initCaption()
 	printf("    [CComponentsHeader]\n    [%s - %d] init header text: %s [ x %d w %d ]\n", __FUNCTION__, __LINE__, cch_text.c_str(), cch_text_x, cc_text_w);
 #endif
 		cch_text_obj = new CComponentsText();
-		//add text item
-		addCCItem(cch_text_obj); //text
 	}
 
+	//add text item
+	if (!cch_text_obj->isAdded())
+		addCCItem(cch_text_obj); //text
+
 	//set header text properties
 	if (cch_text_obj){
 		cch_text_obj->setDimensionsAll(cch_text_x, cch_items_y, cc_text_w, height);

From 64c6eb59450827624e46107b34b1462eb8b8f770 Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Wed, 23 Oct 2013 15:46:11 +0200
Subject: [PATCH 09/73] CComponentsHeader: add possibility to modify text
 alignment

usable in header and its derived classes and in class CComponentsWindow
---
 src/gui/components/cc_frm.h          | 15 ++++++++++-----
 src/gui/components/cc_frm_header.cpp | 21 ++++++++++++++-------
 src/gui/components/cc_frm_window.cpp | 11 ++++++-----
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/gui/components/cc_frm.h b/src/gui/components/cc_frm.h
index 107e05bf3..d2f979d44 100644
--- a/src/gui/components/cc_frm.h
+++ b/src/gui/components/cc_frm.h
@@ -123,6 +123,7 @@ class CComponentsHeader : public CComponentsForm
 		int cch_items_y, cch_icon_x, cch_icon_w, cch_text_x, cch_buttons, cch_buttons_w, cch_buttons_h, cch_buttons_space, cch_offset;
 		std::vector<std::string> v_cch_btn;
 		int cch_size_mode;
+		int cch_caption_align;
 
 		void initIcon();
 		void initCaption();
@@ -162,8 +163,9 @@ class CComponentsHeader : public CComponentsForm
 		virtual ~CComponentsHeader();
 
 		
-		virtual void setCaption(const std::string& caption);
-		virtual void setCaption(neutrino_locale_t caption_locale);
+		virtual void setCaption(const std::string& caption, const int& align_mode = CTextBox::NO_AUTO_LINEBREAK);
+		virtual void setCaption(neutrino_locale_t caption_locale, const int& align_mode = CTextBox::NO_AUTO_LINEBREAK);
+		virtual void setCaptionAlignment(const int& align_mode){cch_caption_align = align_mode;};
 		virtual void setCaptionFont(Font* font_name);
 		virtual void setCaptionColor(fb_pixel_t text_color){cch_col_text = text_color;};
 		virtual void setOffset(const int offset){cch_offset = offset;};
@@ -225,6 +227,8 @@ class CComponentsWindow : public CComponentsForm
 		CComponentsFooter * ccw_footer;
 		///property: caption in header, see also getHeaderObject()
 		std::string ccw_caption;
+		///property: alignment mode for header caption
+		int ccw_align_mode;
 		///property: icon name in header, see also getHeaderObject()
 		const char* ccw_icon_name;
 		///property: assigned default icon buttons in header, see also getHeaderObject()
@@ -293,10 +297,12 @@ class CComponentsWindow : public CComponentsForm
 		void showHeader(bool show = true){ccw_show_header = show;};
 
 		///set caption in header with string, see also getHeaderObject()
-		void setWindowCaption(const std::string& text){ccw_caption = text;};
+		void setWindowCaption(const std::string& text, const int& align_mode = CTextBox::NO_AUTO_LINEBREAK){ccw_caption = text; ccw_align_mode = align_mode;};
 
 		///set caption in header from locales, see also getHeaderObject()
-		void setWindowCaption(neutrino_locale_t locale_text);
+		void setWindowCaption(neutrino_locale_t locale_text, const int& align_mode = CTextBox::NO_AUTO_LINEBREAK);
+		///set caption alignment
+		void setWindowCaptionAlignment(const int& align_mode){ccw_align_mode = align_mode;};
 
 		///set icon name in header, see also getHeaderObject()
 		void setWindowIcon(const char* iconname){ccw_icon_name = iconname;};
@@ -309,7 +315,6 @@ class CComponentsWindow : public CComponentsForm
 		
 		///returns a pointer to the internal body object, use this to get access to body properities
 		CComponentsForm* getBodyObject(){return ccw_body;};
-
 		///returns a pointer to the internal footer object, use this to get access to footer properities
 		CComponentsFooter* getFooterObject(){return ccw_footer;};
 
diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp
index 11bc47731..ea447f548 100644
--- a/src/gui/components/cc_frm_header.cpp
+++ b/src/gui/components/cc_frm_header.cpp
@@ -109,6 +109,7 @@ void CComponentsHeader::initVarHeader()
 	cch_btn_obj		= NULL;
 	cch_text		= "";
 	cch_col_text		= COL_MENUHEAD_TEXT;
+	cch_caption_align	= CTextBox::NO_AUTO_LINEBREAK;
 	cch_items_y 		= 0;
 	cch_offset		= 8;
 	cch_icon_x 		= cch_offset;
@@ -130,14 +131,16 @@ CComponentsHeader::~CComponentsHeader()
 	cleanCCForm();	
 }
 
-void CComponentsHeader::setCaption(const std::string& caption)
+void CComponentsHeader::setCaption(const std::string& caption, const int& align_mode)
 {
-	cch_text	= caption;
+	cch_text		= caption;
+	cch_caption_align 	= align_mode;
 }
 
-void CComponentsHeader::setCaption(neutrino_locale_t caption_locale)
+void CComponentsHeader::setCaption(neutrino_locale_t caption_locale, const int& align_mode)
 {
-	cch_text	= g_Locale->getText(caption_locale);
+	cch_text		= g_Locale->getText(caption_locale);
+	cch_caption_align 	= align_mode;
 }
 
 void CComponentsHeader::setCaptionFont(Font* font_name)
@@ -263,7 +266,7 @@ void CComponentsHeader::initButtons()
 	if (v_cch_btn.empty()){
 		if (cch_btn_obj)
 			delete cch_btn_obj;
-			cch_btn_obj = NULL;
+		cch_btn_obj = NULL;
 		return;
 	}
 	
@@ -312,12 +315,13 @@ void CComponentsHeader::initButtons()
 void CComponentsHeader::initCaption()
 {
 	//recalc header text position if header icon is defined
+	int cc_text_w = 0;
 	if (cch_icon_name != NULL){
 		cch_text_x = cch_icon_x+cch_icon_w+cch_offset;
 	}
 
 	//calc width of text object in header
-	int cc_text_w = width-cch_text_x-cch_offset;
+	cc_text_w = width-cch_text_x-cch_offset;
 	if (cch_buttons_w)
 		cc_text_w -= cch_buttons_w-cch_offset;
 
@@ -335,9 +339,12 @@ void CComponentsHeader::initCaption()
 
 	//set header text properties
 	if (cch_text_obj){
+			//set alignment of text item in dependency from text alignment
+		if (cch_caption_align == CTextBox::CENTER)
+			cch_text_x = CC_CENTERED;
 		cch_text_obj->setDimensionsAll(cch_text_x, cch_items_y, cc_text_w, height);
 		cch_text_obj->doPaintBg(false);
-		cch_text_obj->setText(cch_text, CTextBox::TOP | CTextBox::NO_AUTO_LINEBREAK, cch_font);
+		cch_text_obj->setText(cch_text, cch_caption_align, cch_font);
 		cch_text_obj->forceTextPaint(); //here required
 		cch_text_obj->setTextColor(cch_col_text);
 		cch_text_obj->setColorBody(col_body);
diff --git a/src/gui/components/cc_frm_window.cpp b/src/gui/components/cc_frm_window.cpp
index 1e81905b1..6b66f5827 100644
--- a/src/gui/components/cc_frm_window.cpp
+++ b/src/gui/components/cc_frm_window.cpp
@@ -142,13 +142,15 @@ void CComponentsWindow::initVarWindow()
 	ccw_buttons	= 0; //no header buttons
 	ccw_show_footer = true;
 	ccw_show_header	= true;
+	ccw_align_mode	= CTextBox::NO_AUTO_LINEBREAK;
 
 	setShadowOnOff(true);
 }
 
-void CComponentsWindow::setWindowCaption(neutrino_locale_t locale_text)
+void CComponentsWindow::setWindowCaption(neutrino_locale_t locale_text, const int& align_mode)
 {
 	ccw_caption = g_Locale->getText(locale_text);
+	ccw_align_mode = align_mode;
 }
 
 void CComponentsWindow::initHeader()
@@ -159,12 +161,12 @@ void CComponentsWindow::initHeader()
 		//add of header item happens initCCWItems()
 	}
 
-	//set header properties
+	//set header properties //TODO: assigned properties with internal header objekt have no effect!
 	if (ccw_head){
-		ccw_head->setPos(0, 0);
 		ccw_head->setWidth(width-2*fr_thickness);
+// 		ccw_head->setPos(0, 0);
 		ccw_head->setIcon(ccw_icon_name);
-		ccw_head->setCaption(ccw_caption);
+		ccw_head->setCaption(ccw_caption, ccw_align_mode);
 		ccw_head->initCCItems();
 		ccw_head->setDefaultButtons(ccw_buttons);
 	}
@@ -196,7 +198,6 @@ void CComponentsWindow::initBody()
 void CComponentsWindow::initFooter()
 {
 	if (ccw_footer== NULL){
-
 		ccw_footer= new CComponentsFooter();
 		initFooter();
 		//add of footer item happens initCCWItems()

From ad630c5acb59802cb6ce416f04fb594175049bf6 Mon Sep 17 00:00:00 2001
From: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: Wed, 23 Oct 2013 16:42:40 +0200
Subject: [PATCH 10/73] CComponentsText: Add function getTextLinesAutoHeight()

- Function is used for determine the number of lines
  in a text box in AUTO_HIGH mode.

Signed-off-by: Thilo Graf <dbt@novatux.de>
---
 src/gui/components/cc_item_text.cpp | 15 +++++++++++++++
 src/gui/components/cc_item_text.h   |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/src/gui/components/cc_item_text.cpp b/src/gui/components/cc_item_text.cpp
index 1b5aba9a1..dbd94b4c2 100644
--- a/src/gui/components/cc_item_text.cpp
+++ b/src/gui/components/cc_item_text.cpp
@@ -273,3 +273,18 @@ string CComponentsText::iToString(int int_val)
 	string i_string(i_str.str());
 	return i_string;
 }
+
+//helper, get lines per textbox page
+int CComponentsText::getTextLinesAutoHeight(const int& textMaxHeight, const int& textWidth, const int& mode)
+{
+	CComponentsText box;
+	box.iX      = 0;
+	box.iY      = 0;
+	box.iWidth  = textWidth;
+	box.iHeight = textMaxHeight;
+
+	CTextBox tb(ct_text.c_str(), ct_font, mode, &box);
+	int ret = tb.getLinesPerPage();
+
+	return ret;
+}
diff --git a/src/gui/components/cc_item_text.h b/src/gui/components/cc_item_text.h
index c20420d9a..8c87b8d5e 100644
--- a/src/gui/components/cc_item_text.h
+++ b/src/gui/components/cc_item_text.h
@@ -133,6 +133,9 @@ class CComponentsText : public CComponentsItem, public CBox
 
 		///gets the embedded CTextBox object, so it's possible to get access directly to its methods and properties
 		virtual CTextBox* getCTextBoxObject() { return ct_textbox; };
+
+		///returns count of lines from a text box page
+		virtual int getTextLinesAutoHeight(const int& textMaxHeight, const int& textWidth, const int& mode);
 };
 
 

From f7798affc63c5ba4be5f76816a30e962da664604 Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Thu, 24 Oct 2013 20:00:05 +0200
Subject: [PATCH 11/73] CComponents: add unfied header file for general include
 of cc classes

Provides a unified header file, so it is not required to select a
certain header file.
---
 src/gui/audiomute.h                       |   2 +-
 src/gui/audioplayer.cpp                   |   2 +-
 src/gui/bedit/bouqueteditor_bouquets.cpp  |   2 +-
 src/gui/bedit/bouqueteditor_channels.cpp  |   2 +-
 src/gui/bedit/bouqueteditor_channels.h    |   3 +-
 src/gui/bedit/bouqueteditor_chanselect.h  |   3 +-
 src/gui/bookmarkmanager.cpp               |   2 +-
 src/gui/bouquetlist.cpp                   |   2 +-
 src/gui/channellist.cpp                   |   3 -
 src/gui/channellist.h                     |   2 -
 src/gui/components/cc.h                   | 259 ++------------------
 src/gui/components/cc_base.cpp            |   2 +-
 src/gui/components/cc_base.h              | 278 ++++++++++++++++++++++
 src/gui/components/cc_detailsline.h       |   2 +-
 src/gui/components/cc_frm.h               |   2 +-
 src/gui/components/cc_frm_button.h        |   2 +-
 src/gui/components/cc_frm_clock.h         |   2 +-
 src/gui/components/cc_frm_signalbars.h    |   4 +-
 src/gui/components/cc_item.cpp            |   2 +-
 src/gui/components/cc_item_picture.h      |   2 +-
 src/gui/components/cc_item_progressbar.h  |   2 +-
 src/gui/components/cc_item_shapes.h       |   2 +-
 src/gui/components/cc_item_text.h         |   2 +-
 src/gui/components/cc_item_tvpic.h        |   2 +-
 src/gui/components/unmaintained/cc_misc.h |   2 +-
 src/gui/dboxinfo.cpp                      |   2 +-
 src/gui/epgview.cpp                       |   2 +-
 src/gui/eventlist.h                       |   2 +-
 src/gui/filebrowser.cpp                   |   2 +-
 src/gui/imageinfo.cpp                     |   1 -
 src/gui/imageinfo.h                       |   3 +-
 src/gui/infoviewer_bb.h                   |   2 +-
 src/gui/motorcontrol.cpp                  |   1 -
 src/gui/motorcontrol.h                    |   2 +-
 src/gui/moviebrowser.cpp                  |   2 +-
 src/gui/osd_setup.h                       |   2 +-
 src/gui/pictureviewer.cpp                 |   2 +-
 src/gui/pluginlist.cpp                    |   2 +-
 src/gui/scan.cpp                          |   3 +-
 src/gui/scan.h                            |   2 +-
 src/gui/streaminfo2.h                     |   3 +-
 src/gui/test_menu.h                       |   7 +-
 src/gui/timeosd.h                         |   2 +-
 src/gui/timerlist.cpp                     |   2 +-
 src/gui/upnpbrowser.cpp                   |   2 +-
 src/gui/volumebar.h                       |   4 +-
 src/gui/widget/menue.cpp                  |   9 +-
 src/gui/widget/menue.h                    |   4 +-
 48 files changed, 342 insertions(+), 309 deletions(-)
 create mode 100644 src/gui/components/cc_base.h

diff --git a/src/gui/audiomute.h b/src/gui/audiomute.h
index 2c2310c0e..406483f18 100644
--- a/src/gui/audiomute.h
+++ b/src/gui/audiomute.h
@@ -27,7 +27,7 @@
 #ifndef __CAUDIOMUTE__
 #define __CAUDIOMUTE__
 
-#include <gui/components/cc_item_picture.h>
+#include <gui/components/cc.h>
 
 class CAudioMute : public CComponentsPicture
 {
diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index f8df608cb..e202f6d88 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -57,7 +57,7 @@
 #include <gui/nfs.h>
 #endif
 
-#include <gui/components/cc_frm.h>
+#include <gui/components/cc.h>
 #include <gui/widget/buttons.h>
 #include <gui/widget/icons.h>
 #include <gui/widget/messagebox.h>
diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp
index ded93358f..91a9700e9 100644
--- a/src/gui/bedit/bouqueteditor_bouquets.cpp
+++ b/src/gui/bedit/bouqueteditor_bouquets.cpp
@@ -40,7 +40,7 @@
 
 #include <driver/fontrenderer.h>
 #include <driver/screen_max.h>
-#include <gui/components/cc_frm.h>
+#include <gui/components/cc.h>
 #include <gui/widget/buttons.h>
 #include <gui/widget/hintbox.h>
 #include <gui/widget/messagebox.h>
diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp
index 049eb9036..9b87c2a3b 100644
--- a/src/gui/bedit/bouqueteditor_channels.cpp
+++ b/src/gui/bedit/bouqueteditor_channels.cpp
@@ -44,7 +44,7 @@
 #include <driver/fontrenderer.h>
 #include <driver/screen_max.h>
 #include "bouqueteditor_chanselect.h"
-#include <gui/components/cc_frm.h>
+#include <gui/components/cc.h>
 #include <gui/widget/buttons.h>
 #include <gui/widget/icons.h>
 
diff --git a/src/gui/bedit/bouqueteditor_channels.h b/src/gui/bedit/bouqueteditor_channels.h
index afc74a4b1..90d4d03d4 100644
--- a/src/gui/bedit/bouqueteditor_channels.h
+++ b/src/gui/bedit/bouqueteditor_channels.h
@@ -35,8 +35,7 @@
 
 #include <driver/framebuffer.h>
 #include <gui/widget/menue.h>
-#include <gui/components/cc_item_infobox.h>
-#include <gui/components/cc_detailsline.h>
+#include <gui/components/cc.h>
 #include <zapit/client/zapitclient.h>
 
 #include <string>
diff --git a/src/gui/bedit/bouqueteditor_chanselect.h b/src/gui/bedit/bouqueteditor_chanselect.h
index 6ae293c87..729c3d7af 100644
--- a/src/gui/bedit/bouqueteditor_chanselect.h
+++ b/src/gui/bedit/bouqueteditor_chanselect.h
@@ -34,8 +34,7 @@
 
 #include <driver/framebuffer.h>
 #include <gui/widget/listbox.h>
-#include <gui/components/cc_item_infobox.h>
-#include <gui/components/cc_detailsline.h>
+#include <gui/components/cc.h>
 #include <zapit/client/zapitclient.h>
 
 #include <string>
diff --git a/src/gui/bookmarkmanager.cpp b/src/gui/bookmarkmanager.cpp
index 996d529b4..228b136fb 100644
--- a/src/gui/bookmarkmanager.cpp
+++ b/src/gui/bookmarkmanager.cpp
@@ -36,7 +36,7 @@
 
 #include <system/settings.h>
 #include <driver/screen_max.h>
-#include <gui/components/cc_frm.h>
+#include <gui/components/cc.h>
 #include <gui/widget/messagebox.h>
 #include <gui/widget/hintbox.h>
 #include <gui/widget/stringinput.h>
diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp
index 16353856a..594de4822 100644
--- a/src/gui/bouquetlist.cpp
+++ b/src/gui/bouquetlist.cpp
@@ -41,7 +41,7 @@
 #include <gui/eventlist.h>
 #include <gui/infoviewer.h>
 
-#include <gui/components/cc_frm.h>
+#include <gui/components/cc.h>
 #include <gui/widget/menue.h>
 #include <gui/widget/buttons.h>
 #include <gui/widget/icons.h>
diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 6e9b8d611..6864276e2 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -54,9 +54,6 @@
 #include <gui/widget/buttons.h>
 #include <gui/widget/icons.h>
 #include <gui/widget/messagebox.h>
-#include <gui/components/cc_item_progressbar.h>
-#include <gui/components/cc.h>
-#include <gui/components/cc_frm.h>
 
 #include <system/settings.h>
 #include <gui/customcolor.h>
diff --git a/src/gui/channellist.h b/src/gui/channellist.h
index da8600dfc..c6e3f310c 100644
--- a/src/gui/channellist.h
+++ b/src/gui/channellist.h
@@ -36,8 +36,6 @@
 #include <driver/framebuffer.h>
 #include <gui/widget/menue.h>
 #include <gui/components/cc.h>
-#include <gui/components/cc_frm_clock.h>
-#include <gui/components/cc_item_tvpic.h>
 #include <system/lastchannel.h>
 
 #include <sectionsdclient/sectionsdclient.h>
diff --git a/src/gui/components/cc.h b/src/gui/components/cc.h
index 6426285fe..9f13752e2 100644
--- a/src/gui/components/cc.h
+++ b/src/gui/components/cc.h
@@ -3,7 +3,7 @@
 	Copyright (C) 2001 by Steffen Hehn 'McClean'
 
 	Classes for generic GUI-related components.
-	Copyright (C) 2012, 2013, Thilo Graf 'dbt'
+	Copyright (C) 2013, Thilo Graf 'dbt'
 
 	License: GPL
 
@@ -23,255 +23,30 @@
 	Boston, MA  02110-1301, USA.
 */
 
-#ifndef __COMPONENTS__
-#define __COMPONENTS__
-
-#include "cc_types.h"
-#include <gui/widget/textbox.h>
-#include <vector>
-#include <string>
-#include <driver/pictureviewer/pictureviewer.h>
-
-//#define DEBUG_CC
-
-/// Basic component class.
+/// Basic CComponent class header.
 /*!
 Basic attributes and member functions for component sub classes
 */
 
-class CComponents
-{
-	private:
-		///pixel buffer handling, returns pixel buffer depends of given parameters
-		fb_pixel_t* getScreen(int ax, int ay, int dx, int dy);
-		
-	protected:
-		///object: framebuffer object, usable in all sub classes
-		CFrameBuffer * frameBuffer;
-		///container: for frambuffer properties and pixel buffer
-		std::vector<comp_fbdata_t> v_fbdata;
+#ifndef __N_COMPONENTS__
+#define __N_COMPONENTS__
 
-		///property: x-position on screen, to alter with setPos() or setDimensionsAll(), see also defines CC_APPEND, CC_CENTERED
-		int x;
-		///property: y-position on screen, to alter setPos() or setDimensionsAll(), see also defines CC_APPEND, CC_CENTERED
-		int y;
-		///property: contains real x-position on screen
-		int cc_xr;
-		///property: contains real y-position on screen
-		int cc_yr;
-		///property: height-dimension on screen, to alter with setHeight() or setDimensionsAll()
-		int height;
-		///property: width-dimension on screen, to alter with setWidth() or setDimensionsAll()
-		int width;
-		///property: has corners with definied type, types are defined in /driver/frambuffer.h, without effect, if corner_radius=0
-		int corner_type;
-		///property: defined radius of corner, without effect, if corner_type=0
-		int corner_rad;
-		
-		///property: color of body
-		fb_pixel_t col_body;
-		///property: color of shadow
-		fb_pixel_t col_shadow;
-		///property: color of frame
-		fb_pixel_t col_frame;
-		///property: color of frame if component is selected, Note: fr_thickness_sel must be set
-		fb_pixel_t col_frame_sel;
+#include "cc_base.h"
+#include "cc_types.h"
 
-		///property: true=component has shadow
-		bool shadow;
-		///property: width of shadow
-		int shadow_w;
+#include "cc_item_infobox.h"
+#include "cc_item_picture.h"
+#include "cc_item_progressbar.h"
+#include "cc_item_shapes.h"
+#include "cc_item_tvpic.h"
 
-		 ///property: frame thickness
-		int fr_thickness;
-		///property: frame thickness of selected component
-		int fr_thickness_sel;
+#include "cc_detailsline.h"
 
-		///status: true=component was painted for 1st time
-		bool firstPaint;
-		///status: true=component was rendered
-		bool is_painted;
-		///mode: true=activate rendering of basic elements (frame, shadow and body)
-		bool paint_bg;
+#include "cc_frm.h"
+#include "cc_frm_button.h"
+#include "cc_frm_clock.h"
+#include "cc_frm_signalbars.h"
 
-		///initialize of basic attributes, no parameters required
-		void initVarBasic();
-		///rendering of framebuffer elements at once,
-		///elements are contained in v_fbdata, presumes added frambuffer elements with paintInit(),
-		///parameter do_save_bg=true, saves background of element to pixel buffer, this can be restore with hide()
-		void paintFbItems(bool do_save_bg = true);
 
-		///clean up old screen buffer saved in v_fbdata
-		virtual void clear();
 
-		///container: contains saved pixel buffer with position and dimensions
-		comp_screen_data_t saved_screen; 	
-		///cleans saved pixel buffer
-		void clearSavedScreen();
-		
-	public:
-		///basic component class constructor.
-		CComponents();
-		virtual~CComponents();
-
-		///set screen x-position
-		inline virtual void setXPos(const int& xpos){x = xpos;};
-		///set screen y-position,
-		inline virtual void setYPos(const int& ypos){y = ypos;};
-		///set x and y position
-		///Note: position of bound components (items) means position related within parent form, not for screen!
-		///to set the real screen position, look at setRealPos()
-		inline virtual void setPos(const int& xpos, const int& ypos){x = xpos; y = ypos;};
-
-		///sets real x position on screen. Use this, if item is added to a parent form
-		virtual void setRealXPos(const int& xr){cc_xr = xr;};
-		///sets real y position on screen. Use this, if item is added to a parent form
-		virtual void setRealYPos(const int& yr){cc_yr = yr;};
-		///sets real x and y position on screen at once. Use this, if item is added to a parent form
-		virtual void setRealPos(const int& xr, const int& yr){cc_xr = xr; cc_yr = yr;};
-		///get real x-position on screen. Use this, if item contains own render methods and item is bound to a form
-		virtual int getRealXPos(){return cc_xr;};
-		///get real y-position on screen. Use this, if item contains own render methods and item is bound to a form
-		virtual int getRealYPos(){return cc_yr;};
-		
-		///set height of component on screen
-		inline virtual void setHeight(const int& h){height = h;};
-		///set width of component on screen
-		inline virtual void setWidth(const int& w){width = w;};
-		///set all positions and dimensions of component at once
-		inline virtual void setDimensionsAll(const int& xpos, const int& ypos, const int& w, const int& h){x = xpos; y = ypos; width = w; height = h;};
-
-		///return screen x-position of component
-		///Note: position of bound components (items) means position related within parent form, not for screen!
-		///to get the real screen position, use getRealXPos(), to find in CComponentsItem sub classes
-		inline virtual int getXPos(){return x;};
-		///return screen y-position of component
-		///Note: position of bound components (items) means position related within parent form, not for screen!
-		///to get the real screen position, use getRealYPos(), to find in CComponentsItem sub classes
-		inline virtual int getYPos(){return y;};
-		///return height of component
-		inline virtual int getHeight(){return height;};
-		///return width of component
-		inline virtual int getWidth(){return width;};
-		///return of frame thickness
-		inline virtual int getFrameThickness(){return fr_thickness;};
-
-		///return/set (pass through) width and height of component
-		inline virtual void getSize(int* w, int* h){*w=width; *h=height;};
-		///return/set (pass through) position and dimensions of component at once
-		inline virtual void getDimensions(int* xpos, int* ypos, int* w, int* h){*xpos=x; *ypos=y; *w=width; *h=height;};
-
-		///set frame color
-		inline virtual void setColorFrame(fb_pixel_t color){col_frame = color;};
-		///set body color
-		inline virtual void setColorBody(fb_pixel_t color){col_body = color;};
-		///set shadow color
-		inline virtual void setColorShadow(fb_pixel_t color){col_shadow = color;};
-		///set all basic framebuffer element colors at once
-		///Note: Possible color values are defined in "gui/color.h" and "gui/customcolor.h"
-		inline virtual void setColorAll(fb_pixel_t color_frame, fb_pixel_t color_body, fb_pixel_t color_shadow){col_frame = color_frame; col_body = color_body; col_shadow = color_shadow;};
-
-		///get frame color
-		inline virtual fb_pixel_t getColorFrame(){return col_frame;};
-		///get body color
-		inline virtual fb_pixel_t getColorBody(){return col_body;};
-		///get shadow color
-		inline virtual fb_pixel_t getColorShadow(){return col_shadow;};
-		
-		///set corner types
-		///Possible corner types are defined in CFrameBuffer (see: driver/framebuffer.h)
-		///Note: default values are given from settings
-		inline virtual void setCornerType(const int& type){corner_type = type;};
-		///set corner radius and type
-		inline virtual void setCorner(const int& radius, const int& type = CORNER_ALL){corner_rad = radius; corner_type = type;};
-		///get corner types
-		inline virtual int getCornerType(){return corner_type;};
-		///get corner radius
-		inline virtual int getCornerRadius(){return corner_rad;};
-
-		///set frame thickness
-		inline virtual void setFrameThickness(const int& thickness){fr_thickness = thickness;};
-		///switch shadow on/off
-		///Note: it's recommended to use #defines: CC_SHADOW_ON=true or CC_SHADOW_OFF=false as parameter, see also cc_types.h
-		inline virtual void setShadowOnOff(bool has_shadow){shadow = has_shadow;};
-
-		///hide current screen and restore background
-		virtual void hide();
-		///erase current screen without restore of background, it's similar to paintBackgroundBoxRel() from CFrameBuffer
-		virtual void kill();
-		///returns paint mode, true=item was painted
-		virtual bool isPainted(){return is_painted;}
-		///allows paint of elementary item parts (shadow, frame and body), similar as background, set it usually to false, if item used in a form
-		virtual void doPaintBg(bool do_paint){paint_bg = do_paint;};
-
-};
-
-class CComponentsItem : public CComponents
-{
-	protected:
-		///property: define of item type, see cc_types.h for possible types
-		int cc_item_type;
-		///property: define of item index, all bound items get an index,
-		///default: CC_NO_INDEX as identifer for not embedded item and default index=0 for form as main parent
-		///see also getIndex(), setIndex()
-		int cc_item_index;
-		///property: default enabled
-		bool cc_item_enabled;
-		///property: default not selected
-		bool cc_item_selected;
-
-		///Pointer to the form object in which this item is embedded.
-		///Is typically the type CComponentsForm or derived classes, default intialized with NULL
-		CComponentsItem *cc_parent;
-
-		///hides item, arg: no_restore=true causes no restore of background, but clean up pixel buffer if required
-		void hideCCItem(bool no_restore = false);
-		
-		///initialze of basic framebuffer elements with shadow, background and frame.
-		///must be called first in all paint() members before paint any item,
-		///If backround is not required, it's possible to override this with variable paint_bg=false, use doPaintBg(true/false) to set this!
-		///arg do_save_bg=false avoids using of unnecessary pixel memory, eg. if no hide with restore is provided. This is mostly the case  whenever
-		///an item will be hide or overpainted with other methods, or it's embedded  (bound)  in a parent form.
-		void paintInit(bool do_save_bg);
-
-		///initialize all required attributes
-		void initVarItem();
-
-	public:
-		CComponentsItem();
-
-		///sets pointer to the form object in which this item is embedded.
-		virtual void setParent(CComponentsItem *parent){cc_parent = parent;};
-		///returns pointer to the form object in which this item is embedded.
-		virtual CComponentsItem * getParent(){return cc_parent;};
-		///property: returns true if item is added to a form
-		virtual bool isAdded();
-
-		///abstract: paint item, arg: do_save_bg see paintInit() above
-		virtual void paint(bool do_save_bg = CC_SAVE_SCREEN_YES) = 0;
-		///hides item, arg: no_restore see hideCCItem() above
-		virtual void hide(bool no_restore = false);
-
-		///get the current item type, see attribute cc_item_type above
-		virtual int getItemType();
-		///syncronizes item colors with current color settings if required, NOTE: overwrites internal values!
-		virtual void syncSysColors();
-		
-		///set select mode, see also col_frame_sel
-		virtual void setSelected(bool selected){cc_item_selected = selected;};
-		///set enable mode, see also cc_item_enabled
-		virtual void setEnable(bool enabled){cc_item_enabled = enabled;};
-		
-		///get select mode, see also setSelected() above
-		virtual bool isSelected(){return cc_item_selected;};
-		///get enable mode, see also setEnable() above
-		virtual bool isEnabled(){return cc_item_enabled;};
-
-		///get current index of item, see also attribut cc_item_index
-		virtual int getIndex(){return cc_item_index;};
-		///set an index to item, see also attribut cc_item_index.
-		///To generate an index, use genIndex()
-		virtual void setIndex(const int& index){cc_item_index = index;};
-};
-
-#endif
+#endif /*__N_COMPONENTS__*/
diff --git a/src/gui/components/cc_base.cpp b/src/gui/components/cc_base.cpp
index bbebf1cd6..94693d13e 100644
--- a/src/gui/components/cc_base.cpp
+++ b/src/gui/components/cc_base.cpp
@@ -30,7 +30,7 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include "cc.h"
+#include "cc_base.h"
 
 using namespace std;
 
diff --git a/src/gui/components/cc_base.h b/src/gui/components/cc_base.h
new file mode 100644
index 000000000..32605b04d
--- /dev/null
+++ b/src/gui/components/cc_base.h
@@ -0,0 +1,278 @@
+/*
+	Based up Neutrino-GUI - Tuxbox-Project 
+	Copyright (C) 2001 by Steffen Hehn 'McClean'
+
+	Classes for generic GUI-related components.
+	Copyright (C) 2012, 2013, Thilo Graf 'dbt'
+
+	License: GPL
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public
+	License as published by the Free Software Foundation; either
+	version 2 of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+	General Public License for more details.
+
+	You should have received a copy of the GNU General Public
+	License along with this program; if not, write to the
+	Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+	Boston, MA  02110-1301, USA.
+*/
+
+#ifndef __COMPONENTS__
+#define __COMPONENTS__
+
+#include "cc_types.h"
+#include <gui/widget/textbox.h>
+#include <vector>
+#include <string>
+#include <driver/pictureviewer/pictureviewer.h>
+#include <gui/widget/icons.h>
+
+//#define DEBUG_CC
+
+/// Basic component class.
+/*!
+Basic attributes and member functions for component sub classes
+*/
+
+class CComponents
+{
+	private:
+		///pixel buffer handling, returns pixel buffer depends of given parameters
+		fb_pixel_t* getScreen(int ax, int ay, int dx, int dy);
+		
+	protected:
+		///object: framebuffer object, usable in all sub classes
+		CFrameBuffer * frameBuffer;
+		///container: for frambuffer properties and pixel buffer
+		std::vector<comp_fbdata_t> v_fbdata;
+
+		///property: x-position on screen, to alter with setPos() or setDimensionsAll(), see also defines CC_APPEND, CC_CENTERED
+		int x;
+		///property: y-position on screen, to alter setPos() or setDimensionsAll(), see also defines CC_APPEND, CC_CENTERED
+		int y;
+		///property: contains real x-position on screen
+		int cc_xr;
+		///property: contains real y-position on screen
+		int cc_yr;
+		///property: height-dimension on screen, to alter with setHeight() or setDimensionsAll()
+		int height;
+		///property: width-dimension on screen, to alter with setWidth() or setDimensionsAll()
+		int width;
+		///property: has corners with definied type, types are defined in /driver/frambuffer.h, without effect, if corner_radius=0
+		int corner_type;
+		///property: defined radius of corner, without effect, if corner_type=0
+		int corner_rad;
+		
+		///property: color of body
+		fb_pixel_t col_body;
+		///property: color of shadow
+		fb_pixel_t col_shadow;
+		///property: color of frame
+		fb_pixel_t col_frame;
+		///property: color of frame if component is selected, Note: fr_thickness_sel must be set
+		fb_pixel_t col_frame_sel;
+
+		///property: true=component has shadow
+		bool shadow;
+		///property: width of shadow
+		int shadow_w;
+
+		 ///property: frame thickness
+		int fr_thickness;
+		///property: frame thickness of selected component
+		int fr_thickness_sel;
+
+		///status: true=component was painted for 1st time
+		bool firstPaint;
+		///status: true=component was rendered
+		bool is_painted;
+		///mode: true=activate rendering of basic elements (frame, shadow and body)
+		bool paint_bg;
+
+		///initialize of basic attributes, no parameters required
+		void initVarBasic();
+		///rendering of framebuffer elements at once,
+		///elements are contained in v_fbdata, presumes added frambuffer elements with paintInit(),
+		///parameter do_save_bg=true, saves background of element to pixel buffer, this can be restore with hide()
+		void paintFbItems(bool do_save_bg = true);
+
+		///clean up old screen buffer saved in v_fbdata
+		virtual void clear();
+
+		///container: contains saved pixel buffer with position and dimensions
+		comp_screen_data_t saved_screen; 	
+		///cleans saved pixel buffer
+		void clearSavedScreen();
+		
+	public:
+		///basic component class constructor.
+		CComponents();
+		virtual~CComponents();
+
+		///set screen x-position
+		inline virtual void setXPos(const int& xpos){x = xpos;};
+		///set screen y-position,
+		inline virtual void setYPos(const int& ypos){y = ypos;};
+		///set x and y position
+		///Note: position of bound components (items) means position related within parent form, not for screen!
+		///to set the real screen position, look at setRealPos()
+		inline virtual void setPos(const int& xpos, const int& ypos){x = xpos; y = ypos;};
+
+		///sets real x position on screen. Use this, if item is added to a parent form
+		virtual void setRealXPos(const int& xr){cc_xr = xr;};
+		///sets real y position on screen. Use this, if item is added to a parent form
+		virtual void setRealYPos(const int& yr){cc_yr = yr;};
+		///sets real x and y position on screen at once. Use this, if item is added to a parent form
+		virtual void setRealPos(const int& xr, const int& yr){cc_xr = xr; cc_yr = yr;};
+		///get real x-position on screen. Use this, if item contains own render methods and item is bound to a form
+		virtual int getRealXPos(){return cc_xr;};
+		///get real y-position on screen. Use this, if item contains own render methods and item is bound to a form
+		virtual int getRealYPos(){return cc_yr;};
+		
+		///set height of component on screen
+		inline virtual void setHeight(const int& h){height = h;};
+		///set width of component on screen
+		inline virtual void setWidth(const int& w){width = w;};
+		///set all positions and dimensions of component at once
+		inline virtual void setDimensionsAll(const int& xpos, const int& ypos, const int& w, const int& h){x = xpos; y = ypos; width = w; height = h;};
+
+		///return screen x-position of component
+		///Note: position of bound components (items) means position related within parent form, not for screen!
+		///to get the real screen position, use getRealXPos(), to find in CComponentsItem sub classes
+		inline virtual int getXPos(){return x;};
+		///return screen y-position of component
+		///Note: position of bound components (items) means position related within parent form, not for screen!
+		///to get the real screen position, use getRealYPos(), to find in CComponentsItem sub classes
+		inline virtual int getYPos(){return y;};
+		///return height of component
+		inline virtual int getHeight(){return height;};
+		///return width of component
+		inline virtual int getWidth(){return width;};
+		///return of frame thickness
+		inline virtual int getFrameThickness(){return fr_thickness;};
+
+		///return/set (pass through) width and height of component
+		inline virtual void getSize(int* w, int* h){*w=width; *h=height;};
+		///return/set (pass through) position and dimensions of component at once
+		inline virtual void getDimensions(int* xpos, int* ypos, int* w, int* h){*xpos=x; *ypos=y; *w=width; *h=height;};
+
+		///set frame color
+		inline virtual void setColorFrame(fb_pixel_t color){col_frame = color;};
+		///set body color
+		inline virtual void setColorBody(fb_pixel_t color){col_body = color;};
+		///set shadow color
+		inline virtual void setColorShadow(fb_pixel_t color){col_shadow = color;};
+		///set all basic framebuffer element colors at once
+		///Note: Possible color values are defined in "gui/color.h" and "gui/customcolor.h"
+		inline virtual void setColorAll(fb_pixel_t color_frame, fb_pixel_t color_body, fb_pixel_t color_shadow){col_frame = color_frame; col_body = color_body; col_shadow = color_shadow;};
+
+		///get frame color
+		inline virtual fb_pixel_t getColorFrame(){return col_frame;};
+		///get body color
+		inline virtual fb_pixel_t getColorBody(){return col_body;};
+		///get shadow color
+		inline virtual fb_pixel_t getColorShadow(){return col_shadow;};
+		
+		///set corner types
+		///Possible corner types are defined in CFrameBuffer (see: driver/framebuffer.h)
+		///Note: default values are given from settings
+		inline virtual void setCornerType(const int& type){corner_type = type;};
+		///set corner radius and type
+		inline virtual void setCorner(const int& radius, const int& type = CORNER_ALL){corner_rad = radius; corner_type = type;};
+		///get corner types
+		inline virtual int getCornerType(){return corner_type;};
+		///get corner radius
+		inline virtual int getCornerRadius(){return corner_rad;};
+
+		///set frame thickness
+		inline virtual void setFrameThickness(const int& thickness){fr_thickness = thickness;};
+		///switch shadow on/off
+		///Note: it's recommended to use #defines: CC_SHADOW_ON=true or CC_SHADOW_OFF=false as parameter, see also cc_types.h
+		inline virtual void setShadowOnOff(bool has_shadow){shadow = has_shadow;};
+
+		///hide current screen and restore background
+		virtual void hide();
+		///erase current screen without restore of background, it's similar to paintBackgroundBoxRel() from CFrameBuffer
+		virtual void kill();
+		///returns paint mode, true=item was painted
+		virtual bool isPainted(){return is_painted;}
+		///allows paint of elementary item parts (shadow, frame and body), similar as background, set it usually to false, if item used in a form
+		virtual void doPaintBg(bool do_paint){paint_bg = do_paint;};
+
+};
+
+class CComponentsItem : public CComponents
+{
+	protected:
+		///property: define of item type, see cc_types.h for possible types
+		int cc_item_type;
+		///property: define of item index, all bound items get an index,
+		///default: CC_NO_INDEX as identifer for not embedded item and default index=0 for form as main parent
+		///see also getIndex(), setIndex()
+		int cc_item_index;
+		///property: default enabled
+		bool cc_item_enabled;
+		///property: default not selected
+		bool cc_item_selected;
+
+		///Pointer to the form object in which this item is embedded.
+		///Is typically the type CComponentsForm or derived classes, default intialized with NULL
+		CComponentsItem *cc_parent;
+
+		///hides item, arg: no_restore=true causes no restore of background, but clean up pixel buffer if required
+		void hideCCItem(bool no_restore = false);
+		
+		///initialze of basic framebuffer elements with shadow, background and frame.
+		///must be called first in all paint() members before paint any item,
+		///If backround is not required, it's possible to override this with variable paint_bg=false, use doPaintBg(true/false) to set this!
+		///arg do_save_bg=false avoids using of unnecessary pixel memory, eg. if no hide with restore is provided. This is mostly the case  whenever
+		///an item will be hide or overpainted with other methods, or it's embedded  (bound)  in a parent form.
+		void paintInit(bool do_save_bg);
+
+		///initialize all required attributes
+		void initVarItem();
+
+	public:
+		CComponentsItem();
+
+		///sets pointer to the form object in which this item is embedded.
+		virtual void setParent(CComponentsItem *parent){cc_parent = parent;};
+		///returns pointer to the form object in which this item is embedded.
+		virtual CComponentsItem * getParent(){return cc_parent;};
+		///property: returns true if item is added to a form
+		virtual bool isAdded();
+
+		///abstract: paint item, arg: do_save_bg see paintInit() above
+		virtual void paint(bool do_save_bg = CC_SAVE_SCREEN_YES) = 0;
+		///hides item, arg: no_restore see hideCCItem() above
+		virtual void hide(bool no_restore = false);
+
+		///get the current item type, see attribute cc_item_type above
+		virtual int getItemType();
+		///syncronizes item colors with current color settings if required, NOTE: overwrites internal values!
+		virtual void syncSysColors();
+		
+		///set select mode, see also col_frame_sel
+		virtual void setSelected(bool selected){cc_item_selected = selected;};
+		///set enable mode, see also cc_item_enabled
+		virtual void setEnable(bool enabled){cc_item_enabled = enabled;};
+		
+		///get select mode, see also setSelected() above
+		virtual bool isSelected(){return cc_item_selected;};
+		///get enable mode, see also setEnable() above
+		virtual bool isEnabled(){return cc_item_enabled;};
+
+		///get current index of item, see also attribut cc_item_index
+		virtual int getIndex(){return cc_item_index;};
+		///set an index to item, see also attribut cc_item_index.
+		///To generate an index, use genIndex()
+		virtual void setIndex(const int& index){cc_item_index = index;};
+};
+
+#endif
diff --git a/src/gui/components/cc_detailsline.h b/src/gui/components/cc_detailsline.h
index f35cbf745..5276cf75e 100644
--- a/src/gui/components/cc_detailsline.h
+++ b/src/gui/components/cc_detailsline.h
@@ -30,7 +30,7 @@
 #include <config.h>
 #endif
 
-#include "cc.h"
+#include "cc_base.h"
 
 //! Sub class of CComponents. Shows a connectline with given dimensions and color on screen.
 /*!
diff --git a/src/gui/components/cc_frm.h b/src/gui/components/cc_frm.h
index d2f979d44..e00ae07d0 100644
--- a/src/gui/components/cc_frm.h
+++ b/src/gui/components/cc_frm.h
@@ -28,7 +28,7 @@
 
 
 #include "config.h"
-#include <gui/components/cc.h>
+#include <gui/components/cc_base.h>
 #include <gui/components/cc_item_text.h>
 #include <gui/components/cc_item_picture.h>
 #include <vector>
diff --git a/src/gui/components/cc_frm_button.h b/src/gui/components/cc_frm_button.h
index 65cc918ee..f435c8e44 100644
--- a/src/gui/components/cc_frm_button.h
+++ b/src/gui/components/cc_frm_button.h
@@ -27,7 +27,7 @@
 #define __CC_BUTTONS_H__
 
 #include <config.h>
-#include "cc.h"
+#include "cc_base.h"
 #include "cc_frm.h"
 #include <string>
 #include <driver/neutrinofonts.h>
diff --git a/src/gui/components/cc_frm_clock.h b/src/gui/components/cc_frm_clock.h
index 1ca1a8fa5..1af9d2580 100644
--- a/src/gui/components/cc_frm_clock.h
+++ b/src/gui/components/cc_frm_clock.h
@@ -31,7 +31,7 @@
 #include <config.h>
 #endif
 
-#include "cc.h"
+#include "cc_base.h"
 #include "cc_frm.h"
 
 
diff --git a/src/gui/components/cc_frm_signalbars.h b/src/gui/components/cc_frm_signalbars.h
index 0e8268b6c..460270f12 100644
--- a/src/gui/components/cc_frm_signalbars.h
+++ b/src/gui/components/cc_frm_signalbars.h
@@ -31,8 +31,8 @@
 #include <config.h>
 #endif
 
-#include <global.h>
-#include <neutrino.h>
+// #include <global.h>
+// #include <neutrino.h>
 #include <gui/components/cc_frm.h>
 #include <gui/components/cc_item_progressbar.h>
 #include <gui/components/cc_item_text.h>
diff --git a/src/gui/components/cc_item.cpp b/src/gui/components/cc_item.cpp
index d8d4fbbf0..07d621e96 100644
--- a/src/gui/components/cc_item.cpp
+++ b/src/gui/components/cc_item.cpp
@@ -30,7 +30,7 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include "cc.h"
+#include "cc_base.h"
 
 using namespace std;
 
diff --git a/src/gui/components/cc_item_picture.h b/src/gui/components/cc_item_picture.h
index 2b74c1709..dd45ec449 100644
--- a/src/gui/components/cc_item_picture.h
+++ b/src/gui/components/cc_item_picture.h
@@ -31,7 +31,7 @@
 #include <config.h>
 #endif
 
-#include "cc.h"
+#include "cc_base.h"
 #include <string>
 #include <driver/pictureviewer/pictureviewer.h>
 
diff --git a/src/gui/components/cc_item_progressbar.h b/src/gui/components/cc_item_progressbar.h
index eb22f8bf7..90fb2a7a0 100644
--- a/src/gui/components/cc_item_progressbar.h
+++ b/src/gui/components/cc_item_progressbar.h
@@ -50,7 +50,7 @@
 #define __CC_PROGRESSBAR_H__
 
 #include "config.h"
-#include <gui/components/cc.h>
+#include <gui/components/cc_base.h>
 #include <string>
 
 class CProgressBar : public CComponentsItem
diff --git a/src/gui/components/cc_item_shapes.h b/src/gui/components/cc_item_shapes.h
index b6900c820..e9e879033 100644
--- a/src/gui/components/cc_item_shapes.h
+++ b/src/gui/components/cc_item_shapes.h
@@ -30,7 +30,7 @@
 #include <config.h>
 #endif
 
-#include "cc.h"
+#include "cc_base.h"
 
 //! Sub class of CComponentsItem. Shows a shape with given dimensions and color on screen.
 /*!
diff --git a/src/gui/components/cc_item_text.h b/src/gui/components/cc_item_text.h
index 8c87b8d5e..2661641eb 100644
--- a/src/gui/components/cc_item_text.h
+++ b/src/gui/components/cc_item_text.h
@@ -26,7 +26,7 @@
 #ifndef __CC_ITEM_TEXT_H__
 #define __CC_ITEM_TEXT_H__
 
-#include "cc.h"
+#include "cc_base.h"
 #include <gui/widget/textbox.h>
 #include <string>
 
diff --git a/src/gui/components/cc_item_tvpic.h b/src/gui/components/cc_item_tvpic.h
index 6634b15b2..fef5a23b8 100644
--- a/src/gui/components/cc_item_tvpic.h
+++ b/src/gui/components/cc_item_tvpic.h
@@ -30,7 +30,7 @@
 #include <config.h>
 #endif
 
-#include "cc.h"
+#include "cc_base.h"
 #include <string>
 
 //! Sub class of CComponentsItem. Shows a mini tv box, similar to a PIP-Feature with current tv-channel.
diff --git a/src/gui/components/unmaintained/cc_misc.h b/src/gui/components/unmaintained/cc_misc.h
index cda11f389..2c050859c 100644
--- a/src/gui/components/unmaintained/cc_misc.h
+++ b/src/gui/components/unmaintained/cc_misc.h
@@ -28,7 +28,7 @@
 #define __CC_MISC__
 
 #include "config.h"
-#include <gui/components/cc.h>
+#include <gui/components/cc_base.h>
 #include <vector>
 #include <string>
 
diff --git a/src/gui/dboxinfo.cpp b/src/gui/dboxinfo.cpp
index 45c2486e1..03ed078d3 100644
--- a/src/gui/dboxinfo.cpp
+++ b/src/gui/dboxinfo.cpp
@@ -40,7 +40,7 @@
 #include <mntent.h>
 
 #include <gui/dboxinfo.h>
-#include <gui/components/cc_item_progressbar.h>
+#include <gui/components/cc.h>
 
 #include <global.h>
 #include <neutrino.h>
diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp
index 1601220e2..747633e61 100644
--- a/src/gui/epgview.cpp
+++ b/src/gui/epgview.cpp
@@ -33,7 +33,7 @@
 #include <gui/widget/icons.h>
 #include <gui/widget/messagebox.h>
 #include <gui/widget/mountchooser.h>
-#include <gui/components/cc_item_progressbar.h>
+#include <gui/components/cc.h>
 #include <gui/timerlist.h>
 
 #include <global.h>
diff --git a/src/gui/eventlist.h b/src/gui/eventlist.h
index 621581fbc..8eff085db 100644
--- a/src/gui/eventlist.h
+++ b/src/gui/eventlist.h
@@ -34,7 +34,7 @@
 #include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 #include <system/settings.h>
-#include <gui/components/cc_item_text.h>
+#include <gui/components/cc.h>
 
 #include "color.h"
 #include "infoviewer.h"
diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp
index 23be35ce4..01614f2fc 100644
--- a/src/gui/filebrowser.cpp
+++ b/src/gui/filebrowser.cpp
@@ -28,7 +28,7 @@
 /* include <config.h> before <gui/filebrowser.h> to enable 64 bit file offsets */
 #include <gui/filebrowser.h>
 
-#include <gui/components/cc_frm.h>
+#include <gui/components/cc.h>
 #include <gui/widget/buttons.h>
 #include <gui/widget/icons.h>
 #include <gui/widget/messagebox.h>
diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp
index 3a75b43c2..7254860ca 100644
--- a/src/gui/imageinfo.cpp
+++ b/src/gui/imageinfo.cpp
@@ -38,7 +38,6 @@
 #include <string>
 #include <daemonc/remotecontrol.h>
 #include <system/flashtool.h>
-#include <gui/components/cc_item_text.h>
 #include "version.h"
 
 #define LICENSEDIR DATADIR "/neutrino/license/"
diff --git a/src/gui/imageinfo.h b/src/gui/imageinfo.h
index 367d7ee91..2a5b671da 100644
--- a/src/gui/imageinfo.h
+++ b/src/gui/imageinfo.h
@@ -32,8 +32,7 @@
 #endif
 
 #include <gui/widget/menue.h>
-#include <gui/components/cc_frm.h>
-#include <gui/components/cc_item_tvpic.h>
+#include <gui/components/cc.h>
 #include <configfile.h>
 
 typedef struct image_info_t
diff --git a/src/gui/infoviewer_bb.h b/src/gui/infoviewer_bb.h
index d47e64409..cdace0147 100644
--- a/src/gui/infoviewer_bb.h
+++ b/src/gui/infoviewer_bb.h
@@ -41,7 +41,7 @@
 #include <driver/fade.h>
 #include <system/settings.h>
 #include "widget/menue.h"
-#include <gui/components/cc_item_progressbar.h>
+#include <gui/components/cc.h>
 #include <string>
 
 class CInfoViewerBB
diff --git a/src/gui/motorcontrol.cpp b/src/gui/motorcontrol.cpp
index 43ff2038d..68ae0add9 100644
--- a/src/gui/motorcontrol.cpp
+++ b/src/gui/motorcontrol.cpp
@@ -38,7 +38,6 @@
 #include <gui/motorcontrol.h>
 #include <gui/scan_setup.h>
 #include <gui/color.h>
-#include <gui/components/cc_frm.h>
 #include <gui/widget/menue.h>
 #include <gui/widget/messagebox.h>
 #include <system/settings.h>
diff --git a/src/gui/motorcontrol.h b/src/gui/motorcontrol.h
index fb4b74dc4..c595308ee 100644
--- a/src/gui/motorcontrol.h
+++ b/src/gui/motorcontrol.h
@@ -34,7 +34,7 @@
 #define __motorcontrol__
 
 #include <gui/widget/menue.h>
-#include <gui/components/cc_item_progressbar.h>
+#include <gui/components/cc.h>
 #include <driver/framebuffer.h>
 #include <string>
 #include <zapit/femanager.h>
diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index 71db7906c..39c57743f 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -48,7 +48,7 @@
 #include <gui/widget/hintbox.h>
 #include <gui/widget/helpbox.h>
 #include <gui/widget/icons.h>
-#include <gui/components/cc_item_progressbar.h>
+#include <gui/components/cc.h>
 #include <gui/widget/messagebox.h>
 #include <gui/widget/stringinput.h>
 #include <gui/widget/stringinput_ext.h>
diff --git a/src/gui/osd_setup.h b/src/gui/osd_setup.h
index d392d4cd7..3b50a4593 100644
--- a/src/gui/osd_setup.h
+++ b/src/gui/osd_setup.h
@@ -31,7 +31,7 @@
 #ifndef __osd_setup__
 #define __osd_setup__
 
-#include <gui/components/cc_item_shapes.h>
+#include <gui/components/cc.h>
 #include <gui/widget/menue.h>
 
 #include <driver/framebuffer.h>
diff --git a/src/gui/pictureviewer.cpp b/src/gui/pictureviewer.cpp
index cc7ddafd4..742080811 100644
--- a/src/gui/pictureviewer.cpp
+++ b/src/gui/pictureviewer.cpp
@@ -50,7 +50,7 @@
 #include <gui/nfs.h>
 #endif
 
-#include <gui/components/cc_frm.h>
+#include <gui/components/cc.h>
 #include <gui/widget/buttons.h>
 #include <gui/widget/icons.h>
 #include <gui/widget/menue.h>
diff --git a/src/gui/pluginlist.cpp b/src/gui/pluginlist.cpp
index 470e40ab5..6d0c5f1c1 100644
--- a/src/gui/pluginlist.cpp
+++ b/src/gui/pluginlist.cpp
@@ -36,7 +36,7 @@
 #include <plugin.h>
 
 #include <gui/pluginlist.h>
-#include <gui/components/cc_frm.h>
+#include <gui/components/cc.h>
 #include <gui/widget/messagebox.h>
 #include <gui/widget/icons.h>
 
diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp
index 5d4b79902..a2f9c6654 100644
--- a/src/gui/scan.cpp
+++ b/src/gui/scan.cpp
@@ -49,8 +49,7 @@
 
 #include <gui/widget/menue.h>
 #include <gui/widget/messagebox.h>
-#include <gui/components/cc_frm.h>
-#include <gui/components/cc_item_progressbar.h>
+#include <gui/components/cc.h>
 
 #include <system/settings.h>
 #include <system/helpers.h>
diff --git a/src/gui/scan.h b/src/gui/scan.h
index 073ba4a4d..0a7288f5f 100644
--- a/src/gui/scan.h
+++ b/src/gui/scan.h
@@ -33,7 +33,7 @@
 #define __scants__
 
 #include <gui/widget/menue.h>
-#include <gui/components/cc_item_progressbar.h>
+#include <gui/components/cc.h>
 #include <driver/framebuffer.h>
 #include <system/localize.h>
 #include <string>
diff --git a/src/gui/streaminfo2.h b/src/gui/streaminfo2.h
index cbdded7f7..cbd0a45b0 100644
--- a/src/gui/streaminfo2.h
+++ b/src/gui/streaminfo2.h
@@ -27,8 +27,7 @@
 
 #include <driver/framebuffer.h>
 #include <gui/components/cc.h>
-#include <gui/components/cc_frm_signalbars.h>
-#include <gui/components/cc_item_tvpic.h>
+#include <gui/components/cc.h>
 #include <zapit/femanager.h>
 
 
diff --git a/src/gui/test_menu.h b/src/gui/test_menu.h
index e595794c6..38a69968d 100644
--- a/src/gui/test_menu.h
+++ b/src/gui/test_menu.h
@@ -32,11 +32,8 @@
 #include <gui/widget/menue.h>
 #include <gui/widget/icons.h>
 #include <gui/components/cc.h>
-#include <gui/components/cc_frm.h>
-#include <gui/components/cc_frm_button.h>
-#include <gui/components/cc_frm_clock.h>
-#include <gui/components/cc_item_shapes.h>
-// #define TEST_MENU
+
+#define TEST_MENU
 
 #include <string>
 
diff --git a/src/gui/timeosd.h b/src/gui/timeosd.h
index 078b723b7..e986fed2e 100644
--- a/src/gui/timeosd.h
+++ b/src/gui/timeosd.h
@@ -27,7 +27,7 @@
 
 #include <time.h>
 #include <driver/framebuffer.h>
-#include <gui/components/cc_item_progressbar.h>
+#include <gui/components/cc.h>
 
 class CTimeOSD
 {
diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp
index c5fa8e6f9..0aeeaed11 100644
--- a/src/gui/timerlist.cpp
+++ b/src/gui/timerlist.cpp
@@ -52,7 +52,7 @@
 #include <gui/filebrowser.h>
 #include <gui/infoviewer.h>
 
-#include <gui/components/cc_frm.h>
+#include <gui/components/cc.h>
 #include <gui/widget/buttons.h>
 #include <gui/widget/hintbox.h>
 #include <gui/widget/icons.h>
diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp
index a83460335..ef771c75b 100644
--- a/src/gui/upnpbrowser.cpp
+++ b/src/gui/upnpbrowser.cpp
@@ -53,7 +53,7 @@
 #include <gui/color.h>
 #include <gui/movieplayer.h>
 
-#include <gui/components/cc_frm.h>
+#include <gui/components/cc.h>
 #include <gui/widget/buttons.h>
 #include <gui/widget/icons.h>
 #include <gui/widget/messagebox.h>
diff --git a/src/gui/volumebar.h b/src/gui/volumebar.h
index 3903d4ac8..c19b04424 100644
--- a/src/gui/volumebar.h
+++ b/src/gui/volumebar.h
@@ -29,9 +29,7 @@
 
 #include <global.h>
 #include <system/settings.h>
-#include <gui/components/cc_frm.h>  //CComponentsForm
-#include <gui/components/cc_item_progressbar.h> //CProgressBar
-#include <gui/components/cc_item_text.h> //CComponentsLabel
+#include <gui/components/cc.h>
 
 class CVolumeBar : public CComponentsForm
 {
diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index cfa89de98..940c4a1fa 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -28,16 +28,15 @@
 #include <config.h>
 #endif
 
+
+#include <global.h>
+#include <neutrino.h>
 #include <gui/widget/menue.h>
 
 #include <driver/fontrenderer.h>
 #include <driver/screen_max.h>
-
-#include <gui/components/cc_frm.h>
 #include <gui/widget/stringinput.h>
-#include <gui/components/cc_item_shapes.h>
-#include <global.h>
-#include <neutrino.h>
+
 #include <neutrino_menue.h>
 #include <driver/fade.h>
 
diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h
index d23c03655..7ae164a20 100644
--- a/src/gui/widget/menue.h
+++ b/src/gui/widget/menue.h
@@ -41,9 +41,7 @@
 #include <system/localize.h>
 #include <gui/widget/icons.h>
 #include <gui/color.h>
-#include <gui/components/cc_item_infobox.h>
-#include <gui/components/cc_detailsline.h>
-
+#include <gui/components/cc.h>
 #include <string>
 #include <vector>
 

From 6ee7fac1a5cfb884fa72b36a8c10104bab6a5253 Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Thu, 24 Oct 2013 21:39:04 +0200
Subject: [PATCH 12/73] CComponents: rename hide() to hideCC()

There are too many name conflicts with hide-members in other classes.
---
 src/driver/framebuffer.cpp                    |  2 +-
 src/driver/volume.cpp                         |  2 +-
 src/gui/audiomute.cpp                         |  6 ++---
 src/gui/audioplayer.cpp                       |  8 +++---
 src/gui/bedit/bouqueteditor_channels.cpp      |  2 +-
 src/gui/channellist.cpp                       |  2 +-
 src/gui/components/cc_base.cpp                |  6 ++---
 src/gui/components/cc_base.h                  |  4 +--
 src/gui/components/cc_detailsline.cpp         |  2 +-
 src/gui/components/cc_frm.cpp                 |  6 ++---
 src/gui/components/cc_frm.h                   |  2 +-
 src/gui/components/cc_frm_signalbars.h        |  2 +-
 src/gui/components/cc_item.cpp                |  2 +-
 src/gui/components/cc_item_infobox.cpp        |  2 +-
 src/gui/components/cc_item_picture.cpp        |  2 +-
 src/gui/components/cc_item_picture.h          |  2 +-
 src/gui/components/cc_item_text.cpp           |  4 +--
 src/gui/components/cc_item_text.h             |  2 +-
 src/gui/components/cc_item_tvpic.cpp          |  4 +--
 src/gui/components/cc_item_tvpic.h            |  2 +-
 .../components/unmaintained/cc_item_box.cpp   |  8 +++---
 src/gui/imageinfo.cpp                         |  2 +-
 src/gui/infoviewer.cpp                        |  2 +-
 src/gui/streaminfo2.cpp                       |  2 +-
 src/gui/test_menu.cpp                         | 26 +++++++++----------
 src/gui/widget/menue.cpp                      | 12 ++++-----
 26 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp
index ca6649176..6fd4a23da 100644
--- a/src/driver/framebuffer.cpp
+++ b/src/driver/framebuffer.cpp
@@ -1924,7 +1924,7 @@ bool CFrameBuffer::_checkFbArea(int _x, int _y, int _dx, int _dy, bool prev)
 //					waitForIdle();
 					fb_no_check = true;
 					if (prev)
-						CAudioMute::getInstance()->hide(true);
+						CAudioMute::getInstance()->hideCC(true);
 					else
 						CAudioMute::getInstance()->paint();
 					fb_no_check = false;
diff --git a/src/driver/volume.cpp b/src/driver/volume.cpp
index 73167b4b6..7172a46bf 100644
--- a/src/driver/volume.cpp
+++ b/src/driver/volume.cpp
@@ -177,7 +177,7 @@ bool CVolume::hideVolscale()
 	bool ret = false;
 	if (volscale) {
 		if (volscale->isPainted()) {
-			volscale->hide();
+			volscale->hideCC();
 			ret = true;
 		}
 		delete volscale;
diff --git a/src/gui/audiomute.cpp b/src/gui/audiomute.cpp
index f5309230e..bf614b668 100644
--- a/src/gui/audiomute.cpp
+++ b/src/gui/audiomute.cpp
@@ -67,7 +67,7 @@ void CAudioMute::AudioMute(int newValue, bool isEvent)
 			if (do_paint_mute_icon)
 			{
 				frameBuffer->fbNoCheck(true);
-				this->hide(true);
+				hideCC(true);
 				frameBuffer->fbNoCheck(false);
 			}
 			frameBuffer->setFbArea(CFrameBuffer::FB_PAINTAREA_MUTEICON1);
@@ -84,7 +84,7 @@ void CAudioMute::AudioMute(int newValue, bool isEvent)
 		}
 		else {
 			if (do_paint_mute_icon)
-				this->hide(true);
+				hideCC(true);
 			frameBuffer->setFbArea(CFrameBuffer::FB_PAINTAREA_MUTEICON1);
 		}
 		frameBuffer->fbNoCheck(false);
@@ -112,7 +112,7 @@ void CAudioMute::enableMuteIcon(bool enable)
 	}
 	else {
 		if (neutrino->isMuted())
-			this->hide(true);
+			hideCC(true);
 		frameBuffer->doPaintMuteIcon(false);
 		do_paint_mute_icon = false;
 	}
diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index e202f6d88..5d5d80bb2 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -1904,11 +1904,11 @@ void CAudioPlayerGui::paintItemID3DetailsLine (int pos)
 
 	// clear details line
 	if (dline != NULL)
-		dline->hide();
+		dline->hideCC();
 
 	// clear infobox
 	if (ibox != NULL)
-		ibox->hide();
+		ibox->hideCC();
 
 	// paint Line if detail info (and not valid list pos) and info box
 	if (!m_playlist.empty() && (pos >= 0))
@@ -1956,9 +1956,9 @@ void CAudioPlayerGui::paintItemID3DetailsLine (int pos)
 	else
 	{
 		if (dline != NULL)
-			dline->hide();
+			dline->hideCC();
 		if (ibox != NULL)
-			ibox->hide();
+			ibox->hideCC();
 	}
 }
 //------------------------------------------------------------------------
diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp
index 9b87c2a3b..d6f4a45fe 100644
--- a/src/gui/bedit/bouqueteditor_channels.cpp
+++ b/src/gui/bedit/bouqueteditor_channels.cpp
@@ -242,7 +242,7 @@ void CBEChannelWidget::initItem2DetailsLine (int pos, int /*ch_index*/)
 			ibox = new CComponentsInfoBox();
 
 		if (ibox->isPainted())
-			ibox->hide(CC_SAVE_SCREEN_NO);
+			ibox->hideCC(CC_SAVE_SCREEN_NO);
 		
 		ibox->setDimensionsAll(x, ypos2, width, info_height);
 		ibox->setFrameThickness(2);
diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 6864276e2..2e310c8eb 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -132,7 +132,7 @@ CChannelList::~CChannelList()
 	if (headerClock) {
 		headerClock->Stop();
 		if (headerClock->isPainted())
-			headerClock->hide();
+			headerClock->hideCC();
 		if (headerClock->isClockRun())
 			headerClock->stopThread();
 		delete headerClock;
diff --git a/src/gui/components/cc_base.cpp b/src/gui/components/cc_base.cpp
index 94693d13e..d0f15b3ae 100644
--- a/src/gui/components/cc_base.cpp
+++ b/src/gui/components/cc_base.cpp
@@ -42,7 +42,7 @@ CComponents::CComponents()
 
 CComponents::~CComponents()
 {
- 	hide();
+ 	hideCC();
 	clearSavedScreen();
 	clear();
 }
@@ -172,11 +172,11 @@ inline fb_pixel_t* CComponents::getScreen(int ax, int ay, int dx, int dy)
 }
 
 //restore screen from buffer
-inline void CComponents::hide()
+inline void CComponents::hideCC()
 {
 	for(size_t i =0; i< v_fbdata.size() ;i++) {
 		if (v_fbdata[i].pixbuf != NULL){
-			frameBuffer->waitForIdle("CComponents::hide()");
+			frameBuffer->waitForIdle("CComponents::hideCC()");
 			frameBuffer->RestoreScreen(v_fbdata[i].x, v_fbdata[i].y, v_fbdata[i].dx, v_fbdata[i].dy, v_fbdata[i].pixbuf);
 			delete[] v_fbdata[i].pixbuf;
 			v_fbdata[i].pixbuf = NULL;
diff --git a/src/gui/components/cc_base.h b/src/gui/components/cc_base.h
index 32605b04d..9df3755ed 100644
--- a/src/gui/components/cc_base.h
+++ b/src/gui/components/cc_base.h
@@ -197,7 +197,7 @@ class CComponents
 		inline virtual void setShadowOnOff(bool has_shadow){shadow = has_shadow;};
 
 		///hide current screen and restore background
-		virtual void hide();
+		virtual void hideCC();
 		///erase current screen without restore of background, it's similar to paintBackgroundBoxRel() from CFrameBuffer
 		virtual void kill();
 		///returns paint mode, true=item was painted
@@ -251,7 +251,7 @@ class CComponentsItem : public CComponents
 		///abstract: paint item, arg: do_save_bg see paintInit() above
 		virtual void paint(bool do_save_bg = CC_SAVE_SCREEN_YES) = 0;
 		///hides item, arg: no_restore see hideCCItem() above
-		virtual void hide(bool no_restore = false);
+		virtual void hideCC(bool no_restore = false);
 
 		///get the current item type, see attribute cc_item_type above
 		virtual int getItemType();
diff --git a/src/gui/components/cc_detailsline.cpp b/src/gui/components/cc_detailsline.cpp
index 646b0292e..6aea94d5b 100644
--- a/src/gui/components/cc_detailsline.cpp
+++ b/src/gui/components/cc_detailsline.cpp
@@ -80,7 +80,7 @@ void CComponentsDetailLine::initVarDline()
 
 CComponentsDetailLine::~CComponentsDetailLine()
 {
-	hide(); //restore background
+	hideCC(); //restore background
 	clear();
 }
 
diff --git a/src/gui/components/cc_frm.cpp b/src/gui/components/cc_frm.cpp
index 1d2420a56..fc43b7256 100644
--- a/src/gui/components/cc_frm.cpp
+++ b/src/gui/components/cc_frm.cpp
@@ -366,14 +366,14 @@ void CComponentsForm::paintCCItems()
 	}
 }
 
-void CComponentsForm::hide(bool no_restore)
+void CComponentsForm::hideCC(bool no_restore)
 {
 	// hack: ensure hiding of minitv during hide of forms and inherited classes,
 	// because the handling of minitv items are different to other item types
-	// and need an explizit call of hide()
+	// and need an explizit call of hideCC()
 	for(size_t i=0; i<v_cc_items.size(); i++) {
 		if (v_cc_items[i]->getItemType() == CC_ITEMTYPE_PIP){
-			v_cc_items[i]->hide();
+			v_cc_items[i]->hideCC();
 			break;
 		}
 	}
diff --git a/src/gui/components/cc_frm.h b/src/gui/components/cc_frm.h
index e00ae07d0..e03bba024 100644
--- a/src/gui/components/cc_frm.h
+++ b/src/gui/components/cc_frm.h
@@ -54,7 +54,7 @@ class CComponentsForm : public CComponentsItem
 		virtual ~CComponentsForm();
 		
 		void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
-		void hide(bool no_restore = false);
+		void hideCC(bool no_restore = false);
 		virtual void addCCItem(CComponentsItem* cc_Item);
 		virtual void insertCCItem(const uint& cc_item_id, CComponentsItem* cc_Item);
 		virtual void removeCCItem(const uint& cc_item_id);
diff --git a/src/gui/components/cc_frm_signalbars.h b/src/gui/components/cc_frm_signalbars.h
index 460270f12..bb2dae298 100644
--- a/src/gui/components/cc_frm_signalbars.h
+++ b/src/gui/components/cc_frm_signalbars.h
@@ -225,7 +225,7 @@ void CSampleClass::hide ()
 	//other code;
 
 //Note: not required if signalbox is added to a CC-Container!
-	signalbox->hide(true);
+	signalbox->hideCC(true);
 	delete signalbox;
 	signalbox = NULL;
 
diff --git a/src/gui/components/cc_item.cpp b/src/gui/components/cc_item.cpp
index 07d621e96..6b970ba76 100644
--- a/src/gui/components/cc_item.cpp
+++ b/src/gui/components/cc_item.cpp
@@ -124,7 +124,7 @@ void CComponentsItem::hideCCItem(bool no_restore)
 	}
 }
 
-void CComponentsItem::hide(bool no_restore)
+void CComponentsItem::hideCC(bool no_restore)
 {
 	hideCCItem(no_restore);
 }
diff --git a/src/gui/components/cc_item_infobox.cpp b/src/gui/components/cc_item_infobox.cpp
index 0ea76cd27..7bc64f8c8 100644
--- a/src/gui/components/cc_item_infobox.cpp
+++ b/src/gui/components/cc_item_infobox.cpp
@@ -66,7 +66,7 @@ CComponentsInfoBox::CComponentsInfoBox(const int x_pos, const int y_pos, const i
 
 CComponentsInfoBox::~CComponentsInfoBox()
 {
-	hide();
+	hideCC();
 	clearSavedScreen();
 	clearCCText();
 	delete pic;
diff --git a/src/gui/components/cc_item_picture.cpp b/src/gui/components/cc_item_picture.cpp
index 6ccc94de6..700d60609 100644
--- a/src/gui/components/cc_item_picture.cpp
+++ b/src/gui/components/cc_item_picture.cpp
@@ -201,7 +201,7 @@ void CComponentsPicture::paint(bool do_save_bg)
 	paintPicture();
 }
 
-void CComponentsPicture::hide(bool no_restore)
+void CComponentsPicture::hideCC(bool no_restore)
 {
 	hideCCItem(no_restore);
 	pic_painted = false;
diff --git a/src/gui/components/cc_item_picture.h b/src/gui/components/cc_item_picture.h
index dd45ec449..a0958ebe9 100644
--- a/src/gui/components/cc_item_picture.h
+++ b/src/gui/components/cc_item_picture.h
@@ -83,7 +83,7 @@ class CComponentsPicture : public CComponentsItem
 		
 		virtual inline bool isPicPainted(){return pic_painted;};
 		virtual void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
-		virtual void hide(bool no_restore = false);
+		virtual void hideCC(bool no_restore = false);
 		virtual inline void getPictureSize(int *pwidth, int *pheight){*pwidth=pic_width; *pheight=pic_height;};
 		virtual void setMaxWidth(const int w_max){pic_max_w = w_max;};
 		virtual void setMaxHeight(const int h_max){pic_max_h = h_max;};
diff --git a/src/gui/components/cc_item_text.cpp b/src/gui/components/cc_item_text.cpp
index dbd94b4c2..845f25b02 100644
--- a/src/gui/components/cc_item_text.cpp
+++ b/src/gui/components/cc_item_text.cpp
@@ -77,7 +77,7 @@ CComponentsText::CComponentsText(	const int x_pos, const int y_pos, const int w,
 
 CComponentsText::~CComponentsText()
 {
-	hide();
+	hideCC();
 	clearSavedScreen();
 	clearCCText();
 	clear();
@@ -246,7 +246,7 @@ void CComponentsText::paint(bool do_save_bg)
 	paintText(do_save_bg);
 }
 
-void CComponentsText::hide(bool no_restore)
+void CComponentsText::hideCC(bool no_restore)
 {
 	if (ct_textbox)
 		ct_textbox->hide();
diff --git a/src/gui/components/cc_item_text.h b/src/gui/components/cc_item_text.h
index 2661641eb..4d56beb63 100644
--- a/src/gui/components/cc_item_text.h
+++ b/src/gui/components/cc_item_text.h
@@ -92,7 +92,7 @@ class CComponentsText : public CComponentsItem, public CBox
 
 		///default members to paint a text box and hide painted text
 		///hide textbox
-		void hide(bool no_restore = false);
+		void hideCC(bool no_restore = false);
 		///paint text box, parameter do_save_bg: default = true, causes fill of backckrond pixel buffer
 		void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
 
diff --git a/src/gui/components/cc_item_tvpic.cpp b/src/gui/components/cc_item_tvpic.cpp
index 9dc397c48..4d53815c0 100644
--- a/src/gui/components/cc_item_tvpic.cpp
+++ b/src/gui/components/cc_item_tvpic.cpp
@@ -66,7 +66,7 @@ CComponentsPIP::CComponentsPIP(	const int x_pos, const int y_pos, const int perc
 
 CComponentsPIP::~CComponentsPIP()
 {
- 	hide();
+ 	hideCC();
  	videoDecoder->Pig(-1, -1, -1, -1);
  	clearSavedScreen();
  	clear();
@@ -99,7 +99,7 @@ void CComponentsPIP::paint(bool do_save_bg)
 }
 
 
-void CComponentsPIP::hide(bool no_restore)
+void CComponentsPIP::hideCC(bool no_restore)
 {
 	videoDecoder->Pig(-1, -1, -1, -1);
 	hideCCItem(no_restore);
diff --git a/src/gui/components/cc_item_tvpic.h b/src/gui/components/cc_item_tvpic.h
index fef5a23b8..695bae27e 100644
--- a/src/gui/components/cc_item_tvpic.h
+++ b/src/gui/components/cc_item_tvpic.h
@@ -63,7 +63,7 @@ class CComponentsPIP : public CComponentsItem
 		///show tv box
 		void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
 		///remove tv box from screen
-		void hide(bool no_restore = false);
+		void hideCC(bool no_restore = false);
 };
 
 #endif
diff --git a/src/gui/components/unmaintained/cc_item_box.cpp b/src/gui/components/unmaintained/cc_item_box.cpp
index 29140ebc2..fe6f036ae 100644
--- a/src/gui/components/unmaintained/cc_item_box.cpp
+++ b/src/gui/components/unmaintained/cc_item_box.cpp
@@ -43,7 +43,7 @@ CComponentsItemBox::CComponentsItemBox()
 
 CComponentsItemBox::~CComponentsItemBox()
 {
-	hide();
+	hideCC();
 	clearElements();
 	clearSavedScreen();
 	clear();
@@ -213,7 +213,7 @@ void CComponentsItemBox::refreshElement(size_t index, const std::string& element
 		case CC_ITEMBOX_PICTURE:
 			pic = static_cast<CComponentsPicture*>(v_element_data[index].handler1);
 			if (pic != NULL) {
-				pic->hide();
+				pic->hideCC();
 				delete pic;
 			}
 			v_element_data[index].element	= element;
@@ -240,7 +240,7 @@ void CComponentsItemBox::paintImage(size_t index, bool newElement)
 
 	if ((newElement) || (pic == NULL)) {
 		if (pic != NULL) {
-			pic->hide();
+			pic->hideCC();
 			delete pic;
 			pic = NULL;
 		}
@@ -287,7 +287,7 @@ void CComponentsItemBox::paintText(size_t index, bool newElement)
 
 	if ((newElement) || (textbox == NULL)) {
 		if (textbox != NULL) {
-			textbox->hide();
+			textbox->hideCC();
 			delete textbox;
 			textbox = NULL;
 		}
diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp
index 7254860ca..93067dafc 100644
--- a/src/gui/imageinfo.cpp
+++ b/src/gui/imageinfo.cpp
@@ -355,7 +355,7 @@ void CImageInfo::hide()
 {
 	printf("[CImageInfo]   [%s - %d] hide...\n", __FUNCTION__, __LINE__);
 	if (cc_win){
-		cc_win->hide();
+		cc_win->hideCC();
 		Clean();
 	}
 }
diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index f0f91474c..18ac9fa6b 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -1824,7 +1824,7 @@ void CInfoViewer::killInfobarText()
 {
 	if (infobar_txt){
 		if (infobar_txt->isPainted())
-			infobar_txt->hide();
+			infobar_txt->hideCC();
 		delete infobar_txt;
 	}
 	infobar_txt = NULL;
diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp
index fe2df548d..0045970fe 100644
--- a/src/gui/streaminfo2.cpp
+++ b/src/gui/streaminfo2.cpp
@@ -246,7 +246,7 @@ int CStreamInfo2::doSignalStrengthLoop ()
 
 void CStreamInfo2::hide ()
 {
-	pip->hide(true);
+	pip->hideCC(true);
 	frameBuffer->paintBackgroundBoxRel (0, 0, max_width, max_height);
 }
 
diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp
index 106a8c5a4..2815c66a3 100644
--- a/src/gui/test_menu.cpp
+++ b/src/gui/test_menu.cpp
@@ -369,7 +369,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 				button->setSelected(true);
 			button->paint();
 		}else			
-			button->hide();
+			button->hideCC();
 		
 		return res;
 	}
@@ -380,7 +380,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		if (!circle->isPainted())	
 			circle->paint();
 		else
-			circle->hide();			
+			circle->hideCC();			
 		return res;
 	}
 	else if (actionKey == "square"){
@@ -390,7 +390,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		if (!sq->isPainted())
 			sq->paint();
 		else
-			sq->hide();
+			sq->hideCC();
 		return res;
 	}
 	else if (actionKey == "picture"){
@@ -400,7 +400,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		if (!pic->isPainted() && !pic->isPicPainted())
 			pic->paint();
 		else
-			pic->hide();
+			pic->hideCC();
 		return res;
 	}
 	else if (actionKey == "channellogo"){
@@ -410,7 +410,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		if (!chnl_pic->isPainted() && !chnl_pic->isPicPainted())
 			chnl_pic->paint();
 		else
-			chnl_pic->hide();
+			chnl_pic->hideCC();
 		return res;
 	}
 	else if (actionKey == "form"){
@@ -445,7 +445,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		
 		
 		if (form->isPainted()) {
-			form->hide();
+			form->hideCC();
 			delete form;
 			form = NULL;
 		}
@@ -460,7 +460,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
  		txt->setText("This is a text for testing textbox", CTextBox::NO_AUTO_LINEBREAK);
 
 		if (txt->isPainted())
-			txt->hide();
+			txt->hideCC();
 		else
 			txt->paint();
 		return res;
@@ -504,7 +504,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		if (!header->isPainted())
 			header->paint();
 		else
-			header->hide();
+			header->hideCC();
 		return res;
 	}
 	else if (actionKey == "footer"){
@@ -520,7 +520,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		if (!footer->isPainted())
 			footer->paint();
 		else
-			footer->hide();
+			footer->hideCC();
 		return res;
 	}
 	else if (actionKey == "iconform"){
@@ -553,7 +553,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 // 		iconform->setIconAlign(CComponentsIconForm::CC_ICONS_FRM_ALIGN_RIGHT);
 		
 		if (iconform->isPainted())
-			iconform->hide();
+			iconform->hideCC();
 		else{
 			iconform->paint();
 		}
@@ -591,7 +591,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		if (!window->isPainted())
 			window->paint();
 		else
-			window->hide();
+			window->hideCC();
 
 		return res;
 	}
@@ -609,7 +609,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		}
 		else {
 			if (clock_r->Stop()){
-				clock_r->hide();
+				clock_r->hideCC();
 				delete clock_r;
 				clock_r = NULL;
 				return menu_return::RETURN_EXIT_ALL;
@@ -625,7 +625,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		if (!clock->isPainted())
 			clock->paint();
 		else {
-			clock->hide();
+			clock->hideCC();
 			delete clock;
 			clock = NULL;
 		}
diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index 940c4a1fa..bb25d72bd 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -1083,7 +1083,7 @@ void CMenuWidget::paintHint(int pos)
 			if (savescreen)
 				details_line->restore();
 			else
-				details_line->hide();
+				details_line->hideCC();
 		}
 		/* clear info box */
 		if (info_box != NULL) {
@@ -1091,7 +1091,7 @@ void CMenuWidget::paintHint(int pos)
 				if (savescreen)
 					info_box->restore();
 				else
-					info_box->hide();
+					info_box->hideCC();
 			}
 		}
 		hint_painted = false;
@@ -1099,10 +1099,10 @@ void CMenuWidget::paintHint(int pos)
 	if (hint_painted) {
 		/* clear detailsline line */
 		if (details_line)
-			details_line->hide();
+			details_line->hideCC();
 		/* clear info box */
 		if ((info_box) && (pos == -1))
-			info_box->hide(true);
+			info_box->hideCC(true);
 		hint_painted = false;
 	}
 	if (pos < 0)
@@ -1116,11 +1116,11 @@ void CMenuWidget::paintHint(int pos)
 			if (savescreen)
 #endif
 		if (info_box)
-			info_box->hide(false);	
+			info_box->hideCC(false);	
 #if 0				
 				info_box->restore();
 			else
-				info_box->hide();
+				info_box->hideCC();
 		}
 #endif
 		return;

From c9e48064d60fe7b2fb85d9c2b5b5aad200e5425a Mon Sep 17 00:00:00 2001
From: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: Fri, 25 Oct 2013 06:19:45 +0200
Subject: [PATCH 13/73] mtdutils: Add missing include paths

---
 src/system/mtdutils/Makefile.am | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/system/mtdutils/Makefile.am b/src/system/mtdutils/Makefile.am
index 650005a38..c8486d75d 100644
--- a/src/system/mtdutils/Makefile.am
+++ b/src/system/mtdutils/Makefile.am
@@ -7,7 +7,15 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/zapit/include \
+	-I$(top_srcdir)/lib/connection \
+	-I$(top_srcdir)/lib/libeventserver \
+	-I$(top_srcdir)/lib/libnet \
+	-I$(top_srcdir)/lib/libconfigfile \
+	-I$(top_srcdir)/lib/libmd5sum \
+	-I$(top_srcdir)/lib/xmltree \
 	-I$(top_srcdir)/src/system/mtdutils/include
+	@FREETYPE_CFLAGS@
 
 if BOXMODEL_APOLLO
 AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2

From af49e54d228d9a3e3e367cc067d55369bcb6e5f3 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Mon, 21 Oct 2013 11:50:20 +0400
Subject: [PATCH 14/73] driver/rcinput.cpp: increase neutrino.sock listen
 backlog - try to avoid dead-lock on zap flood, when neutrino wait response
 for command, while zapit try to send event to neutrino

---
 src/driver/rcinput.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp
index f035c1881..a961282bc 100644
--- a/src/driver/rcinput.cpp
+++ b/src/driver/rcinput.cpp
@@ -123,7 +123,7 @@ CRCInput::CRCInput()
 	}
 
 
-	if (listen(fd_event, 15) !=0)
+	if (listen(fd_event, 25) !=0)
 	{
 		perror("[neutrino] listen failed...\n");
 		exit( -1 );

From 606bd0187837eb719b83d174e16bb7f2ccb12097 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 25 Oct 2013 13:01:07 +0400
Subject: [PATCH 15/73] as requested, implement 'easy' menu mode for novice
 users; default behavior should not be changed, easy mode forced by
 /var/etc/.easymenu file inside image; at the moment switch between modes is
 done by main menu -> 'stop' button -> enter pin code, restart needed after
 mode switch

---
 data/locale/english.locale     |  16 +-
 src/gui/audio_setup.cpp        |  31 ++--
 src/gui/cam_menu.cpp           |  12 +-
 src/gui/info_menue.cpp         |   9 +
 src/gui/mediaplayer.cpp        |  87 ++++++----
 src/gui/miscsettings_menu.cpp  |  72 ++++++--
 src/gui/miscsettings_menu.h    |  11 +-
 src/gui/network_setup.cpp      |  55 +++---
 src/gui/parentallock_setup.cpp |  30 +++-
 src/gui/parentallock_setup.h   |   3 +-
 src/gui/personalize.cpp        |  73 ++++++--
 src/gui/personalize.h          |   1 +
 src/gui/record_setup.cpp       |  92 ++++++----
 src/gui/settings_manager.cpp   |  46 +++--
 src/gui/start_wizard.cpp       |   2 +-
 src/gui/videosettings.cpp      |  60 ++++---
 src/neutrino.cpp               | 219 ++++++++++++++----------
 src/neutrino.h                 |   2 +
 src/neutrino_menue.cpp         | 302 ++++++++++++++++++++++-----------
 src/system/locals.h            |   8 +
 src/system/locals_intern.h     |   8 +
 src/system/settings.cpp        |   4 +-
 src/system/settings.h          |   1 +
 23 files changed, 769 insertions(+), 375 deletions(-)

diff --git a/data/locale/english.locale b/data/locale/english.locale
index 0daf5b0cf..edf6d0937 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -722,6 +722,7 @@ ledcontroler.on.all Led1 & Led2 on
 ledcontroler.on.led1 Led1 on
 ledcontroler.on.led2 Led2 on
 mainmenu.audioplayer Audioplayer
+mainmenu.channels Channels
 mainmenu.clearsectionsd Clear EPG Cache
 mainmenu.games Games
 mainmenu.head Main Menu
@@ -735,10 +736,12 @@ mainmenu.recording Recording
 mainmenu.recording_start start
 mainmenu.recording_stop stop
 mainmenu.scripts Scripts
-mainmenu.service Service
-mainmenu.settings Settings
-mainmenu.shutdown Shutdown
+mainmenu.service Instalation (service)
+mainmenu.settings System settings
+mainmenu.shutdown Shutdown (deep standby)
+mainmenu.shutdown_menu Shutdown
 mainmenu.sleeptimer SleepTimer
+mainmenu.standby Standby
 mainmenu.tvmode TV-Mode
 mainmenu.tvradio_switch TV-Radio Switch
 mainsettings.audio Audio
@@ -786,6 +789,7 @@ menu.hint_backlight Configure buttons backlight
 menu.hint_backup Backup configs and channels to selected dir
 menu.hint_bedit Edit favorites and bouquets
 menu.hint_cache_txt Start teletext caching after channel switch
+menu.hint_channels Open channel list
 menu.hint_cec_mode CEC mode
 menu.hint_cec_standby CEC standby
 menu.hint_cec_view_on CEC view ON
@@ -984,6 +988,7 @@ menu.hint_osd_language Select OSD language
 menu.hint_osd_preset Pre-configured screen margins for CRT and LCD TV
 menu.hint_parentallock_changepin Change PIN code
 menu.hint_parentallock_lockage Select age allowed to watch
+menu.hint_parentallock_menu Lock menus with pin code
 menu.hint_parentallock_prompt Configure when Neutrino-HD will ask you\nfor PIN code
 menu.hint_personalize Enable, disable or Protect menu items\nConfigure color-buttons user menus
 menu.hint_pictureviewer_defdir Default picture viewer directory
@@ -1112,6 +1117,7 @@ menu.hint_service_scan Tuner setup, service scan
 menu.hint_settings Configure Neutrino-HD\nNetwork, audio, video, OSD and more
 menu.hint_show_mute_icon Show mute icon, when volume set to 0
 menu.hint_shutdown Put your box in deep standby mode\nNo confirmation
+menu.hint_shutdown_menu Put you receiver in sleep or deep standby mode, set sleep timer
 menu.hint_shutdown_count Time to put box in deep-standby\nfrom soft-standby mode
 menu.hint_shutdown_rcdelay Enable deep-standby, if power button\npressed more than 1 second
 menu.hint_shutdown_real Enable soft-standby mode\nIf disabled, power button put box to deep-standby
@@ -1125,6 +1131,7 @@ menu.hint_softupdate_expert Separate partitions from the flash read / write to t
 menu.hint_softupdate_expert_read Separate partitions (U-Boot, Splash, Kernel, SystemFS) from the flash read
 menu.hint_softupdate_expert_write Separate partitions (Splash, Kernel, SystemFS) write to the flash
 menu.hint_softupdate_settings The local update directory and the configuration file to set
+menu.hint_standby Put receiver to sleep mode
 menu.hint_start_tostandby Enter standby mode after boot
 menu.hint_streaminfo Current channel info: pids, signal and noise ratio\nBitrate graphs
 menu.hint_subchannel_pos Select subchannels menu position
@@ -1317,7 +1324,7 @@ moviebrowser.foot_options Options
 moviebrowser.foot_play Start movie
 moviebrowser.foot_refresh Refresh list
 moviebrowser.foot_sort Sort:
-moviebrowser.head TS MovieBrowser
+moviebrowser.head My recordings
 moviebrowser.head_filter Filter movies by category:
 moviebrowser.head_playlist Last played:
 moviebrowser.head_recordlist Last recorded:
@@ -1534,6 +1541,7 @@ parentallock.lockage16 from 16 years up
 parentallock.lockage18 from 18 years up
 parentallock.lockedchannel Locked sender...
 parentallock.lockedprogram Locked program (from %d years up)
+parentallock.menu Menu Security
 parentallock.never never
 parentallock.onsignal on broadcasted lock
 parentallock.parentallock Parental lock
diff --git a/src/gui/audio_setup.cpp b/src/gui/audio_setup.cpp
index f2fadc797..85a09d179 100644
--- a/src/gui/audio_setup.cpp
+++ b/src/gui/audio_setup.cpp
@@ -148,16 +148,19 @@ int CAudioSetup::showAudioSetup()
 	CMenuOptionChooser * as_oj_dd_spdif 	= new CMenuOptionChooser(LOCALE_AUDIOMENU_SPDIF_DD, &g_settings.spdif_dd, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, audioSetupNotifier);
 	as_oj_dd_spdif->setHint("", LOCALE_MENU_HINT_AUDIO_SPDIF_DD);
 
-	//av synch
-	CMenuOptionChooser * as_oj_avsync	= new CMenuOptionChooser(LOCALE_AUDIOMENU_AVSYNC, &g_settings.avsync, AUDIOMENU_AVSYNC_OPTIONS, AUDIOMENU_AVSYNC_OPTION_COUNT, true, audioSetupNotifier);
-	as_oj_avsync->setHint("", LOCALE_MENU_HINT_AUDIO_AVSYNC);
+	CMenuOptionChooser * as_oj_avsync = NULL;
+	CMenuOptionNumberChooser * as_oj_vsteps = NULL;
+	if (!g_settings.easymenu) {
+		//av synch
+		as_oj_avsync	= new CMenuOptionChooser(LOCALE_AUDIOMENU_AVSYNC, &g_settings.avsync, AUDIOMENU_AVSYNC_OPTIONS, AUDIOMENU_AVSYNC_OPTION_COUNT, true, audioSetupNotifier);
+		as_oj_avsync->setHint("", LOCALE_MENU_HINT_AUDIO_AVSYNC);
 
-	//volume steps
-	CMenuOptionNumberChooser * as_oj_vsteps = new CMenuOptionNumberChooser(LOCALE_AUDIOMENU_VOLUME_STEP, (int *)&g_settings.current_volume_step, true, 1, 25, NULL);
-	as_oj_vsteps->setHint("", LOCALE_MENU_HINT_AUDIO_VOLSTEP);
-
-	//clock rec
-//	CMenuOptionChooser * as_oj_clockrec new CMenuOptionChooser(LOCALE_AUDIOMENU_CLOCKREC, &g_settings.clockrec, AUDIOMENU_CLOCKREC_OPTIONS, AUDIOMENU_CLOCKREC_OPTION_COUNT, true, audioSetupNotifier);
+		//volume steps
+		as_oj_vsteps = new CMenuOptionNumberChooser(LOCALE_AUDIOMENU_VOLUME_STEP, (int *)&g_settings.current_volume_step, true, 1, 25, NULL);
+		as_oj_vsteps->setHint("", LOCALE_MENU_HINT_AUDIO_VOLSTEP);
+		//clock rec
+		//CMenuOptionChooser * as_oj_clockrec new CMenuOptionChooser(LOCALE_AUDIOMENU_CLOCKREC, &g_settings.clockrec, AUDIOMENU_CLOCKREC_OPTIONS, AUDIOMENU_CLOCKREC_OPTION_COUNT, true, audioSetupNotifier);
+	}
 
 	//SRS
 	//SRS algo
@@ -191,11 +194,13 @@ int CAudioSetup::showAudioSetup()
 	audioSettings->addItem(as_oj_dd_hdmi);
 	audioSettings->addItem(as_oj_dd_spdif);
 	audioSettings->addItem(as_oj_ddsubchn);
-	audioSettings->addItem(GenericMenuSeparatorLine);
 	//---------------------------------------------------------
-	audioSettings->addItem(as_oj_avsync);
-	audioSettings->addItem(as_oj_vsteps);
-//	audioSettings->addItem(as_clockrec);
+	if (!g_settings.easymenu) {
+		audioSettings->addItem(GenericMenuSeparatorLine);
+		audioSettings->addItem(as_oj_avsync);
+		audioSettings->addItem(as_oj_vsteps);
+		//audioSettings->addItem(as_clockrec);
+	}
 	//---------------------------------------------------------
 	audioSettings->addItem(GenericMenuSeparatorLine);
 	audioSettings->addItem(as_oj_srsonoff);
diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp
index a1047ef59..c00f8ffb8 100644
--- a/src/gui/cam_menu.cpp
+++ b/src/gui/cam_menu.cpp
@@ -107,12 +107,14 @@ int CCAMMenuHandler::doMainMenu()
 	//cammenu->addItem( GenericMenuSeparatorLine );
 	cammenu->addIntroItems();
 
-	if(CiSlots) {
-		cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_RESET_STANDBY, &g_settings.ci_standby_reset, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
-		cammenu->addItem( new CMenuOptionNumberChooser(LOCALE_CI_CLOCK, &g_settings.ci_clock, true, 6, 12, this));
+	if (!g_settings.easymenu) {
+		if(CiSlots) {
+			cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_RESET_STANDBY, &g_settings.ci_standby_reset, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
+			cammenu->addItem( new CMenuOptionNumberChooser(LOCALE_CI_CLOCK, &g_settings.ci_clock, true, 6, 12, this));
+		}
+		cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_IGNORE_MSG, &g_settings.ci_ignore_messages, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
+		cammenu->addItem( GenericMenuSeparatorLine );
 	}
-	cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_IGNORE_MSG, &g_settings.ci_ignore_messages, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
-	cammenu->addItem( GenericMenuSeparatorLine );
 
 	CMenuWidget * tempMenu;
 	int i = 0;
diff --git a/src/gui/info_menue.cpp b/src/gui/info_menue.cpp
index c90c17b7d..6df35961f 100644
--- a/src/gui/info_menue.cpp
+++ b/src/gui/info_menue.cpp
@@ -40,6 +40,9 @@
 #include <gui/streaminfo2.h>
 
 #include <driver/screen_max.h>
+#include "gui/cam_menu.h"
+
+extern CCAMMenuHandler * g_CamHandler;
 
 CInfoMenu::CInfoMenu()
 {
@@ -83,6 +86,12 @@ int CInfoMenu::showMenu()
 	mf->setHint(NEUTRINO_ICON_HINT_STREAMINFO, LOCALE_MENU_HINT_STREAMINFO);
 	info->addItem(mf);
 
+	if (g_settings.easymenu) {
+		mf = new CMenuForwarder(LOCALE_CI_SETTINGS, true, NULL, g_CamHandler,  NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
+		mf->setHint(NEUTRINO_ICON_HINT_CI, LOCALE_MENU_HINT_CI);
+		info->addItem(mf);
+	}
+
 	int res = info->exec(NULL, "");
 	delete info;
 	return res;
diff --git a/src/gui/mediaplayer.cpp b/src/gui/mediaplayer.cpp
index 6ff2edbd7..75c72d334 100644
--- a/src/gui/mediaplayer.cpp
+++ b/src/gui/mediaplayer.cpp
@@ -157,14 +157,14 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p)
 	if (usage_mode != MODE_VIDEO)
 	{
 		//audio player
-		neutrino_msg_t audio_rc = usage_mode == MODE_AUDIO ? CRCInput::RC_audio:CRCInput::RC_red;
-		const char* audio_btn = usage_mode == MODE_AUDIO ? "" : NEUTRINO_ICON_BUTTON_RED;
+		neutrino_msg_t audio_rc = usage_mode == MODE_AUDIO ? CRCInput::RC_audio : g_settings.easymenu ? CRCInput::RC_green : CRCInput::RC_red;
+		const char* audio_btn = usage_mode == MODE_AUDIO ? "" : g_settings.easymenu ? NEUTRINO_ICON_BUTTON_GREEN: NEUTRINO_ICON_BUTTON_RED;
 		fw_audio = new CMenuForwarder(LOCALE_MAINMENU_AUDIOPLAYER, true, NULL, this, "audioplayer", audio_rc, audio_btn);
 		fw_audio->setHint(NEUTRINO_ICON_HINT_APLAY, LOCALE_MENU_HINT_APLAY);
-		
+
 		//internet player
-		neutrino_msg_t inet_rc = usage_mode == MODE_AUDIO ? CRCInput::RC_www : CRCInput::RC_green;
-		const char* inet_btn = usage_mode == MODE_AUDIO ? "" : NEUTRINO_ICON_BUTTON_GREEN;
+		neutrino_msg_t inet_rc = usage_mode == MODE_AUDIO ? CRCInput::RC_www : g_settings.easymenu ? CRCInput::RC_blue : CRCInput::RC_green;
+		const char* inet_btn = usage_mode == MODE_AUDIO ? "" : g_settings.easymenu ? NEUTRINO_ICON_BUTTON_BLUE : NEUTRINO_ICON_BUTTON_GREEN;
 		fw_inet = new CMenuForwarder(LOCALE_INETRADIO_NAME, true, NULL, this, "inetplayer", inet_rc, inet_btn);
 		fw_inet->setHint(NEUTRINO_ICON_HINT_INET_RADIO, LOCALE_MENU_HINT_INET_RADIO);
 	}
@@ -175,19 +175,27 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p)
 		if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) {
 			moviePlayer = new CMenuWidget(LOCALE_MAINMENU_MOVIEPLAYER, NEUTRINO_ICON_MULTIMEDIA, width, MN_WIDGET_ID_MEDIA_MOVIEPLAYER);
 			personalize->addWidget(moviePlayer);
-			fw_mp = new CMenuForwarder(LOCALE_MAINMENU_MOVIEPLAYER, true, NULL, moviePlayer, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
+			if (g_settings.easymenu)
+				fw_mp = new CMenuForwarder(LOCALE_MAINMENU_MOVIEPLAYER, true, NULL, moviePlayer, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
+			else
+				fw_mp = new CMenuForwarder(LOCALE_MAINMENU_MOVIEPLAYER, true, NULL, moviePlayer, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
 			fw_mp->setHint(NEUTRINO_ICON_HINT_MOVIE, LOCALE_MENU_HINT_MOVIE);
 		}
 
  		//pictureviewer
 		pictureviewergui = new CPictureViewerGui();
- 		fw_pviewer = new CMenuForwarder(LOCALE_MAINMENU_PICTUREVIEWER, true, NULL, pictureviewergui, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
+		if (g_settings.easymenu)
+			fw_pviewer = new CMenuForwarder(LOCALE_MAINMENU_PICTUREVIEWER, true, NULL, pictureviewergui, NULL, CRCInput::RC_1, NEUTRINO_ICON_BUTTON_1);
+		else
+			fw_pviewer = new CMenuForwarder(LOCALE_MAINMENU_PICTUREVIEWER, true, NULL, pictureviewergui, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
 		fw_pviewer->setHint(NEUTRINO_ICON_HINT_PICVIEW, LOCALE_MENU_HINT_PICVIEW);
 #if ENABLE_UPNP
 		//upnp browser
-		if (!upnpbrowsergui)
-			upnpbrowsergui = new CUpnpBrowserGui();
-		fw_upnp = new CMenuForwarder(LOCALE_UPNPBROWSER_HEAD, true, NULL, upnpbrowsergui, NULL, CRCInput::RC_0, NEUTRINO_ICON_BUTTON_0);
+		if (!g_settings.easymenu) {
+			if (!upnpbrowsergui)
+				upnpbrowsergui = new CUpnpBrowserGui();
+			fw_upnp = new CMenuForwarder(LOCALE_UPNPBROWSER_HEAD, true, NULL, upnpbrowsergui, NULL, CRCInput::RC_0, NEUTRINO_ICON_BUTTON_0);
+		}
 #endif
 //  		media->addIntroItems(NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, usage_mode == MODE_AUDIO ? CMenuWidget::BTN_TYPE_CANCEL : CMenuWidget::BTN_TYPE_BACK);
 	}
@@ -206,24 +214,43 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p)
 	}
 	else
 	{
-		//audio player
-		personalize->addItem(media, fw_audio, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_AUDIO]);
-		
-		//internet player
-		personalize->addItem(media, fw_inet, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_INETPLAY]);
-		
-		//movieplayer
-		if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) {
-			showMoviePlayer(moviePlayer,  personalize);
-			personalize->addItem(media, fw_mp, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_MPLAYER], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION);
-		}
-		
-		//picture viewer
-		personalize->addItem(media, fw_pviewer, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_PVIEWER]);
+		if (g_settings.easymenu) {
+			//movieplayer
+			if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) {
+				showMoviePlayer(moviePlayer,  personalize);
+				personalize->addItem(media, fw_mp, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_MPLAYER]);
+			}
+			//audio player
+			personalize->addItem(media, fw_audio, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_AUDIO]);
+			if (g_settings.easymenu) {
+				CMenuForwarder *fw_yt = new CMenuForwarder(LOCALE_MOVIEPLAYER_YTPLAYBACK, true, NULL, &CMoviePlayerGui::getInstance(), "ytplayback", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
+				fw_yt->setHint(NEUTRINO_ICON_HINT_YTPLAY, LOCALE_MENU_HINT_YTPLAY);
+				personalize->addItem(media, fw_yt, &g_settings.personalize[SNeutrinoSettings::P_MPLAYER_YTPLAY]);
+			}
+			//internet player
+			personalize->addItem(media, fw_inet, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_INETPLAY]);
+			//picture viewer
+			personalize->addItem(media, fw_pviewer, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_PVIEWER]);
+		} else {
+			//audio player
+			personalize->addItem(media, fw_audio, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_AUDIO]);
+
+			//internet player
+			personalize->addItem(media, fw_inet, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_INETPLAY]);
+
+			//movieplayer
+			if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) {
+				showMoviePlayer(moviePlayer,  personalize);
+				personalize->addItem(media, fw_mp, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_MPLAYER], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION);
+			}
+
+			//picture viewer
+			personalize->addItem(media, fw_pviewer, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_PVIEWER]);
 #if ENABLE_UPNP		
-		//upnp browser
-		personalize->addItem(media, fw_upnp, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_UPNP]);
+			//upnp browser
+			personalize->addItem(media, fw_upnp, &g_settings.personalize[SNeutrinoSettings::P_MEDIA_UPNP]);
 #endif
+		}
 	}
 	
 	int res = menu_return::RETURN_NONE;
@@ -253,8 +280,6 @@ void CMediaPlayerMenu::showMoviePlayer(CMenuWidget *moviePlayer, CPersonalizeGui
 	fw_mbrowser->setHint(NEUTRINO_ICON_HINT_MB, LOCALE_MENU_HINT_MB);
 	CMenuForwarder *fw_file = new CMenuForwarder(LOCALE_MOVIEPLAYER_FILEPLAYBACK, true, NULL, &CMoviePlayerGui::getInstance(), "fileplayback", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
 	fw_file->setHint(NEUTRINO_ICON_HINT_FILEPLAY, LOCALE_MENU_HINT_FILEPLAY);
-	CMenuForwarder *fw_yt = new CMenuForwarder(LOCALE_MOVIEPLAYER_YTPLAYBACK, true, NULL, &CMoviePlayerGui::getInstance(), "ytplayback", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
-	fw_yt->setHint(NEUTRINO_ICON_HINT_YTPLAY, LOCALE_MENU_HINT_YTPLAY);
 	
 	p->addIntroItems(moviePlayer);
 	
@@ -264,7 +289,11 @@ void CMediaPlayerMenu::showMoviePlayer(CMenuWidget *moviePlayer, CPersonalizeGui
 	//fileplayback
 	p->addItem(moviePlayer, fw_file, &g_settings.personalize[SNeutrinoSettings::P_MPLAYER_FILEPLAY]);
 	//ytplayback
-	p->addItem(moviePlayer, fw_yt, &g_settings.personalize[SNeutrinoSettings::P_MPLAYER_YTPLAY]);
+	if (!g_settings.easymenu) {
+		CMenuForwarder *fw_yt = new CMenuForwarder(LOCALE_MOVIEPLAYER_YTPLAYBACK, true, NULL, &CMoviePlayerGui::getInstance(), "ytplayback", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
+		fw_yt->setHint(NEUTRINO_ICON_HINT_YTPLAY, LOCALE_MENU_HINT_YTPLAY);
+		p->addItem(moviePlayer, fw_yt, &g_settings.personalize[SNeutrinoSettings::P_MPLAYER_YTPLAY]);
+	}
 
 // #if 0
 // 	//moviePlayer->addItem(new CMenuForwarder(LOCALE_MOVIEPLAYER_PESPLAYBACK, true, NULL, moviePlayerGui, "pesplayback"));
diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp
index ecccd6c04..60d24aa7f 100644
--- a/src/gui/miscsettings_menu.cpp
+++ b/src/gui/miscsettings_menu.cpp
@@ -58,6 +58,7 @@
 //#define ONE_KEY_PLUGIN
 
 extern CPlugins       * g_PluginList;
+extern cVideo *videoDecoder;
 
 CMiscMenue::CMiscMenue()
 {
@@ -125,6 +126,14 @@ int CMiscMenue::exec(CMenuTarget* parent, const std::string &actionKey)
 		ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, str, CMessageBox::mbrBack, CMessageBox::mbBack);
 		return menu_return::RETURN_REPAINT;
 	}
+	else if(actionKey == "energy")
+	{
+		return showMiscSettingsMenuEnergy();
+	}
+	else if(actionKey == "channellist")
+	{
+		return showMiscSettingsMenuChanlist();
+	}
 
 	return showMiscSettingsMenu();
 }
@@ -212,9 +221,7 @@ int CMiscMenue::showMiscSettingsMenu()
 	//energy, shutdown
 	if(cs_get_revision() > 7)
 	{
-		CMenuWidget *misc_menue_energy = new CMenuWidget(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_MISCSETUP_ENERGY);
-		showMiscSettingsMenuEnergy(misc_menue_energy);
-		mf = new CMenuDForwarder(LOCALE_MISCSETTINGS_ENERGY, true, NULL, misc_menue_energy, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
+		mf = new CMenuForwarder(LOCALE_MISCSETTINGS_ENERGY, true, NULL, this, "energy", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
 		mf->setHint("", LOCALE_MENU_HINT_MISC_ENERGY);
 		misc_menue.addItem(mf);
 	}
@@ -242,9 +249,7 @@ int CMiscMenue::showMiscSettingsMenu()
 	misc_menue.addItem(mf);
 
 	//channellist
-	CMenuWidget misc_menue_chanlist(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_MISCSETUP_CHANNELLIST);
-	showMiscSettingsMenuChanlist(&misc_menue_chanlist);
-	mf = new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLIST, true, NULL, &misc_menue_chanlist, NULL, CRCInput::RC_2);
+	mf = new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLIST, true, NULL, this, "channellist", CRCInput::RC_2);
 	mf->setHint("", LOCALE_MENU_HINT_MISC_CHANNELLIST);
 	misc_menue.addItem(mf);
 
@@ -264,8 +269,10 @@ int CMiscMenue::showMiscSettingsMenu()
 	int res = misc_menue.exec(NULL, "");
 	delete fanNotifier;
 	delete sectionsdConfigNotifier;
+#if 0
 	if(cs_get_revision() > 7)
 		delete miscNotifier;
+#endif
 	delete miscEpgNotifier;
 	return res;
 }
@@ -308,9 +315,17 @@ void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general)
 #endif /*ONE_KEY_PLUGIN*/
 }
 
-//energy and shutdown settings
-void CMiscMenue::showMiscSettingsMenuEnergy(CMenuWidget *ms_energy)
+#define VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT 2
+const CMenuOptionChooser::keyval VIDEOMENU_HDMI_CEC_MODE_OPTIONS[VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT] =
 {
+	{ VIDEO_HDMI_CEC_MODE_OFF       , LOCALE_OPTIONS_OFF   },
+	{ VIDEO_HDMI_CEC_MODE_TUNER     , LOCALE_OPTIONS_ON    }
+};
+
+//energy and shutdown settings
+int CMiscMenue::showMiscSettingsMenuEnergy()
+{
+	CMenuWidget *ms_energy = new CMenuWidget(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_MISCSETUP_ENERGY);
 	ms_energy->addIntroItems(LOCALE_MISCSETTINGS_ENERGY);
 
 	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);
@@ -319,8 +334,8 @@ void CMiscMenue::showMiscSettingsMenuEnergy(CMenuWidget *ms_energy)
 	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 ");
 	CMenuForwarder *m2 = new CMenuDForwarder(LOCALE_MISCSETTINGS_SHUTDOWN_COUNT, !g_settings.shutdown_real, g_settings.shutdown_count, miscSettings_shutdown_count);
 	m2->setHint("", LOCALE_MENU_HINT_SHUTDOWN_COUNT);
-	
-	miscNotifier = new COnOffNotifier(1);
+
+	COnOffNotifier * miscNotifier = new COnOffNotifier(1);
 	miscNotifier->addItem(m1);
 	miscNotifier->addItem(m2);
 
@@ -338,6 +353,17 @@ void CMiscMenue::showMiscSettingsMenuEnergy(CMenuWidget *ms_energy)
 	CMenuOptionChooser * m4 = new CMenuOptionChooser(LOCALE_MISCSETTINGS_SLEEPTIMER_MIN, &g_settings.sleeptimer_min, SLEEPTIMER_MIN_OPTIONS, SLEEPTIMER_MIN_OPTION_COUNT, true);
 	m4->setHint("", LOCALE_MENU_HINT_SLEEPTIMER_MIN);
 	ms_energy->addItem(m4);
+
+	if (g_settings.easymenu) {
+		CMenuOptionChooser *cec_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_CEC, &g_settings.hdmi_cec_mode, VIDEOMENU_HDMI_CEC_MODE_OPTIONS, VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT, true, this);
+		cec_ch->setHint("", LOCALE_MENU_HINT_CEC_MODE);
+		ms_energy->addItem(cec_ch);
+	}
+
+	int res = ms_energy->exec(NULL, "");
+	delete ms_energy;
+	delete miscNotifier;
+	return res;
 }
 
 //EPG settings
@@ -412,8 +438,9 @@ void CMiscMenue::showMiscSettingsMenuFBrowser(CMenuWidget *ms_fbrowser)
 }
 
 //channellist
-void CMiscMenue::showMiscSettingsMenuChanlist(CMenuWidget *ms_chanlist)
+int CMiscMenue::showMiscSettingsMenuChanlist()
 {
+	CMenuWidget * ms_chanlist = new CMenuWidget(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_MISCSETUP_CHANNELLIST);
 	ms_chanlist->addIntroItems(LOCALE_MISCSETTINGS_CHANNELLIST);
 
 	CMenuOptionChooser * mc;
@@ -444,6 +471,9 @@ void CMiscMenue::showMiscSettingsMenuChanlist(CMenuWidget *ms_chanlist)
 	mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_NUMERIC_ADJUST,   &g_settings.channellist_numeric_adjust, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
 	mc->setHint("", LOCALE_MENU_HINT_NUMERIC_ADJUST);
 	ms_chanlist->addItem(mc);
+	int res = ms_chanlist->exec(NULL, "");
+	delete ms_chanlist;
+	return res;
 }
 
 #ifdef CPU_FREQ
@@ -457,3 +487,23 @@ void CMiscMenue::showMiscSettingsMenuCPUFreq(CMenuWidget *ms_cpu)
 	ms_cpu->addItem(new CMenuOptionChooser(LOCALE_CPU_FREQ_STANDBY, &g_settings.standby_cpufreq, CPU_FREQ_OPTIONS, CPU_FREQ_OPTION_COUNT, true));
 }
 #endif /*CPU_FREQ*/
+
+bool CMiscMenue::changeNotify(const neutrino_locale_t OptionName, void * /*data*/)
+{
+	if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_HDMI_CEC))
+	{
+		printf("[neutrino CEC Settings] %s set CEC settings...\n", __FUNCTION__);
+		g_settings.hdmi_cec_standby = 0;
+		g_settings.hdmi_cec_view_on = 0;
+		if (g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF) {
+			g_settings.hdmi_cec_standby = 1;
+			g_settings.hdmi_cec_view_on = 1;
+			g_settings.hdmi_cec_mode = VIDEO_HDMI_CEC_MODE_TUNER;
+		}
+		videoDecoder->SetCECAutoStandby(g_settings.hdmi_cec_standby == 1);
+		videoDecoder->SetCECAutoView(g_settings.hdmi_cec_view_on == 1);
+		videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode);
+	}
+
+	return false;
+}
diff --git a/src/gui/miscsettings_menu.h b/src/gui/miscsettings_menu.h
index d9c0269fb..66afe0796 100644
--- a/src/gui/miscsettings_menu.h
+++ b/src/gui/miscsettings_menu.h
@@ -35,21 +35,21 @@
 
 //#define CPU_FREQ
 
-class CMiscMenue : public CMenuTarget
+class CMiscMenue : public CMenuTarget, CChangeObserver
 {	
 	private:
 		CFanControlNotifier *fanNotifier;
 		CSectionsdConfigNotifier* sectionsdConfigNotifier;
-		COnOffNotifier* miscNotifier;
+		//COnOffNotifier* miscNotifier;
 		COnOffNotifier* miscEpgNotifier;
 		int width;
 
 		int showMiscSettingsMenu();
 		void showMiscSettingsMenuGeneral(CMenuWidget *ms_general);
-		void showMiscSettingsMenuEnergy(CMenuWidget *ms_energy);
 		void showMiscSettingsMenuEpg(CMenuWidget *ms_epg);
 		void showMiscSettingsMenuFBrowser(CMenuWidget *ms_fbrowser);
-		void showMiscSettingsMenuChanlist(CMenuWidget *ms_chanlist);
+		int showMiscSettingsMenuEnergy();
+		int showMiscSettingsMenuChanlist();
 #ifdef CPU_FREQ
 		void showMiscSettingsMenuCPUFreq(CMenuWidget *ms_cpu);
 #endif /*CPU_FREQ*/
@@ -57,8 +57,7 @@ class CMiscMenue : public CMenuTarget
 		CMiscMenue();
 		~CMiscMenue();
 		int exec(CMenuTarget* parent, const std::string & actionKey);
-		
+		bool changeNotify(const neutrino_locale_t OptionName, void * /*data*/);
 };
 
-
 #endif
diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp
index 13d81ea53..ff844511a 100644
--- a/src/gui/network_setup.cpp
+++ b/src/gui/network_setup.cpp
@@ -306,10 +306,10 @@ int CNetworkSetup::showNetworkSetup()
 	//------------------------------------------------
 	networkSettings->addItem( m4);	//gateway
 	networkSettings->addItem( m5);	//nameserver
-	networkSettings->addItem(GenericMenuSeparatorLine);
 	//------------------------------------------------
 	if(ifcount > 1) // if there is only one, its probably wired
 	{
+		networkSettings->addItem(GenericMenuSeparatorLine);
 		//ssid
 		CStringInputSMS * networkSettings_ssid = new CStringInputSMS(LOCALE_NETWORKMENU_SSID, &network_ssid, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789 -_/()<>=+.,:!?\\'");
 		//key
@@ -325,38 +325,45 @@ int CNetworkSetup::showNetworkSetup()
 
 		networkSettings->addItem( m9);	//ssid
 		networkSettings->addItem( m10);	//key
-		networkSettings->addItem(GenericMenuSeparatorLine);
+		if (!g_settings.easymenu)
+			networkSettings->addItem(GenericMenuSeparatorLine);
 	}
 	//------------------------------------------------
-	//ntp submenu
-	sectionsdConfigNotifier = new CSectionsdConfigNotifier;
+	sectionsdConfigNotifier = NULL;
 	CMenuWidget ntp(LOCALE_MAINSETTINGS_NETWORK, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_NETWORKSETUP_NTP);
-	mf = new CMenuForwarder(LOCALE_NETWORKMENU_NTPTITLE, true, NULL, &ntp, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
-	mf->setHint("", LOCALE_MENU_HINT_NET_NTP);
-	networkSettings->addItem(mf);
+#ifdef ENABLE_GUI_MOUNT
+	CMenuWidget networkmounts(LOCALE_MAINSETTINGS_NETWORK, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_NETWORKSETUP_MOUNTS);
+#endif
+	CProxySetup proxy(LOCALE_MAINSETTINGS_NETWORK);
+	CNetworkServiceSetup services;
 
-	showNetworkNTPSetup(&ntp);
+	if (!g_settings.easymenu) {
+		//ntp submenu
+		sectionsdConfigNotifier = new CSectionsdConfigNotifier;
+		mf = new CMenuForwarder(LOCALE_NETWORKMENU_NTPTITLE, true, NULL, &ntp, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
+		mf->setHint("", LOCALE_MENU_HINT_NET_NTP);
+		networkSettings->addItem(mf);
+
+		showNetworkNTPSetup(&ntp);
 
 #ifdef ENABLE_GUI_MOUNT
-	//nfs mount submenu
-	CMenuWidget networkmounts(LOCALE_MAINSETTINGS_NETWORK, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_NETWORKSETUP_MOUNTS);
-	mf = new CMenuForwarder(LOCALE_NETWORKMENU_MOUNT, true, NULL, &networkmounts, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
-	mf->setHint("", LOCALE_MENU_HINT_NET_MOUNT);
-	networkSettings->addItem(mf);
-	showNetworkNFSMounts(&networkmounts);
+		//nfs mount submenu
+		mf = new CMenuForwarder(LOCALE_NETWORKMENU_MOUNT, true, NULL, &networkmounts, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
+		mf->setHint("", LOCALE_MENU_HINT_NET_MOUNT);
+		networkSettings->addItem(mf);
+		showNetworkNFSMounts(&networkmounts);
 #endif
 
-	//proxyserver submenu
-	CProxySetup proxy(LOCALE_MAINSETTINGS_NETWORK);
-	mf = new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYSERVER_SEP, true, NULL, &proxy, NULL, CRCInput::RC_0, NEUTRINO_ICON_BUTTON_0);
-	mf->setHint("", LOCALE_MENU_HINT_NET_PROXY);
-	networkSettings->addItem(mf);
+		//proxyserver submenu
+		mf = new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYSERVER_SEP, true, NULL, &proxy, NULL, CRCInput::RC_0, NEUTRINO_ICON_BUTTON_0);
+		mf->setHint("", LOCALE_MENU_HINT_NET_PROXY);
+		networkSettings->addItem(mf);
 
-	//services
-	CNetworkServiceSetup services;
-	mf = new CMenuForwarder(LOCALE_NETWORKMENU_SERVICES, true, NULL, &services, NULL, CRCInput::RC_1, NEUTRINO_ICON_BUTTON_1);
-	mf->setHint("", LOCALE_MENU_HINT_NET_SERVICES);
-	networkSettings->addItem(mf);
+		//services
+		mf = new CMenuForwarder(LOCALE_NETWORKMENU_SERVICES, true, NULL, &services, NULL, CRCInput::RC_1, NEUTRINO_ICON_BUTTON_1);
+		mf->setHint("", LOCALE_MENU_HINT_NET_SERVICES);
+		networkSettings->addItem(mf);
+	}
 
 	int ret = 0;
 	while(true) {
diff --git a/src/gui/parentallock_setup.cpp b/src/gui/parentallock_setup.cpp
index 5260fbd97..fba9290d0 100644
--- a/src/gui/parentallock_setup.cpp
+++ b/src/gui/parentallock_setup.cpp
@@ -59,7 +59,7 @@ int CParentalSetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
 		parent->hide();
 
 	if (check())
-		showParentalSetup();
+		res = showParentalSetup();
 
 	return res;
 }
@@ -97,7 +97,7 @@ const CMenuOptionChooser::keyval PARENTALLOCK_DEFAULTLOCKED_OPTIONS[PARENTALLOCK
 };
 
 extern bool parentallocked;
-void CParentalSetup::showParentalSetup()
+int CParentalSetup::showParentalSetup()
 {
 	//menue init
 	CMenuWidget* plock = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_LOCK, width, MN_WIDGET_ID_PLOCKSETUP);
@@ -108,22 +108,38 @@ void CParentalSetup::showParentalSetup()
 	// intros
 	plock->addIntroItems();
 
+	CPersonalizeGui &p = CNeutrinoApp::getInstance()->getPersonalizeGui();
+	CMenuForwarder * mf = new CMenuForwarder(LOCALE_PARENTALLOCK_MENU, true, NULL, &p, NULL, CRCInput::RC_red , NEUTRINO_ICON_BUTTON_RED);
+	mf->setHint("", LOCALE_MENU_HINT_PARENTALLOCK_MENU);
+	plock->addItem(mf);
+
 	CMenuOptionChooser * mc;
-	mc = new CMenuOptionChooser(LOCALE_PARENTALLOCK_PROMPT , &g_settings.parentallock_prompt , PARENTALLOCK_PROMPT_OPTIONS, PARENTALLOCK_PROMPT_OPTION_COUNT , !parentallocked);
+	if (g_settings.easymenu)
+		mc = new CMenuOptionChooser(LOCALE_PARENTALLOCK_PROMPT , &g_settings.parentallock_prompt , PARENTALLOCK_PROMPT_OPTIONS, PARENTALLOCK_PROMPT_OPTION_COUNT , !parentallocked, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
+	else
+		mc = new CMenuOptionChooser(LOCALE_PARENTALLOCK_PROMPT , &g_settings.parentallock_prompt , PARENTALLOCK_PROMPT_OPTIONS, PARENTALLOCK_PROMPT_OPTION_COUNT , !parentallocked);
 	mc->setHint("", LOCALE_MENU_HINT_PARENTALLOCK_PROMPT);
 	plock->addItem(mc);
 
-	mc = new CMenuOptionChooser(LOCALE_PARENTALLOCK_LOCKAGE, &g_settings.parentallock_lockage, PARENTALLOCK_LOCKAGE_OPTIONS, PARENTALLOCK_LOCKAGE_OPTION_COUNT, !parentallocked);
+	if (g_settings.easymenu)
+		mc = new CMenuOptionChooser(LOCALE_PARENTALLOCK_LOCKAGE, &g_settings.parentallock_lockage, PARENTALLOCK_LOCKAGE_OPTIONS, PARENTALLOCK_LOCKAGE_OPTION_COUNT, !parentallocked, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
+	else
+		mc = new CMenuOptionChooser(LOCALE_PARENTALLOCK_LOCKAGE, &g_settings.parentallock_lockage, PARENTALLOCK_LOCKAGE_OPTIONS, PARENTALLOCK_LOCKAGE_OPTION_COUNT, !parentallocked);
 	mc->setHint("", LOCALE_MENU_HINT_PARENTALLOCK_LOCKAGE);
 	plock->addItem(mc);
 
-	plock->addItem(new CMenuOptionChooser(LOCALE_PARENTALLOCK_BOUQUETMODE, &g_settings.parentallock_defaultlocked, PARENTALLOCK_DEFAULTLOCKED_OPTIONS, PARENTALLOCK_DEFAULTLOCKED_OPTION_COUNT, !parentallocked));
+	if (g_settings.easymenu)
+		mc = new CMenuOptionChooser(LOCALE_PARENTALLOCK_BOUQUETMODE, &g_settings.parentallock_defaultlocked, PARENTALLOCK_DEFAULTLOCKED_OPTIONS, PARENTALLOCK_DEFAULTLOCKED_OPTION_COUNT, !parentallocked, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
+	else
+		mc = new CMenuOptionChooser(LOCALE_PARENTALLOCK_BOUQUETMODE, &g_settings.parentallock_defaultlocked, PARENTALLOCK_DEFAULTLOCKED_OPTIONS, PARENTALLOCK_DEFAULTLOCKED_OPTION_COUNT, !parentallocked);
+	plock->addItem(mc);
 
 	CPINChangeWidget pinChangeWidget(LOCALE_PARENTALLOCK_CHANGEPIN, g_settings.parentallock_pincode, 4, LOCALE_PARENTALLOCK_CHANGEPIN_HINT1);
-	CMenuForwarder * mf = new CMenuForwarder(LOCALE_PARENTALLOCK_CHANGEPIN, true, g_settings.parentallock_pincode, &pinChangeWidget);
+	mf = new CMenuForwarder(LOCALE_PARENTALLOCK_CHANGEPIN, true, g_settings.parentallock_pincode, &pinChangeWidget);
 	mf->setHint("", LOCALE_MENU_HINT_PARENTALLOCK_CHANGEPIN);
 	plock->addItem(mf);
 
-	plock->exec(NULL, "");
+	int res = plock->exec(NULL, "");
 	delete plock;
+	return res;
 }
diff --git a/src/gui/parentallock_setup.h b/src/gui/parentallock_setup.h
index fde2310ed..d2e102782 100644
--- a/src/gui/parentallock_setup.h
+++ b/src/gui/parentallock_setup.h
@@ -44,7 +44,7 @@ class CParentalSetup : public CMenuTarget, public CPINProtection
 {
 	private:
 		int width;
-		void showParentalSetup();
+		int showParentalSetup();
 		
 	protected:
 		virtual CMenuTarget* getParent() { return( NULL);};
@@ -58,6 +58,7 @@ class CParentalSetup : public CMenuTarget, public CPINProtection
 		};
 		~CParentalSetup();
 		int exec(CMenuTarget* parent, const std::string & actionKey);
+		bool checkPin() { return check(); }
 };
 
 
diff --git a/src/gui/personalize.cpp b/src/gui/personalize.cpp
index 4cebbb484..a7a112988 100644
--- a/src/gui/personalize.cpp
+++ b/src/gui/personalize.cpp
@@ -256,7 +256,7 @@ int CPersonalizeGui::exec(CMenuTarget* parent, const string & actionKey)
 	//pin protected access to personalize menu also if found any pin protected items 
 	bool is_pin_protected = g_settings.personalize[SNeutrinoSettings::P_MAIN_PINSTATUS];
 	
-	if ( is_pin_protected || hasPinItems()){
+	if (!g_settings.easymenu && (is_pin_protected || hasPinItems())) {
 		setHint(LOCALE_PERSONALIZE_PINHINT); //from CPINProtection
 		if (check())
 			is_pin_protected = false;
@@ -283,13 +283,45 @@ int CPersonalizeGui::ShowPersonalizationMenu()
 {
 	width = w_max (40, 10);
 	
-	CMenuWidget* pMenu = new CMenuWidget(LOCALE_PERSONALIZE_HEAD, NEUTRINO_ICON_PERSONALIZE, width, MN_WIDGET_ID_PERSONALIZE);
+	CMenuWidget* pMenu = new CMenuWidget(g_settings.easymenu ? LOCALE_PARENTALLOCK_MENU : LOCALE_PERSONALIZE_HEAD, NEUTRINO_ICON_PERSONALIZE, width, MN_WIDGET_ID_PERSONALIZE);
 	pMenu->addIntroItems(NONEXISTANT_LOCALE, LOCALE_PERSONALIZE_ACCESS);
 	
 	//pin
 	CPINChangeWidget *pinChangeWidget = NULL;
-	if (show_pin_setup)
+	if (!g_settings.easymenu && show_pin_setup)
 		ShowPinSetup(pMenu, pinChangeWidget);
+	printf("CPersonalizeGui::ShowPinSetup: pinChangeWidget  %x\n", pinChangeWidget);
+
+	int res;
+	if (g_settings.easymenu) {
+		int count = 0;
+		for (uint j = 0; j<v_item.size(); j++) {
+			printf("v_item[i].widget [%s]\n", v_item[j].widget->getName().c_str());
+			//pin protected items only
+			if (v_item[j].item_mode == PERSONALIZE_SHOW_AS_ACCESS_OPTION)
+			{
+				const char* icon = (count == 0) ? NEUTRINO_ICON_BUTTON_RED :
+					(count == 1) ? NEUTRINO_ICON_BUTTON_GREEN :
+					(count == 2) ? NEUTRINO_ICON_BUTTON_YELLOW :
+					(count == 3) ? NEUTRINO_ICON_BUTTON_BLUE : NULL;
+				const neutrino_msg_t key = (count == 0) ? CRCInput::RC_red :
+					(count == 1) ? CRCInput::RC_green :
+					(count == 2) ? CRCInput::RC_yellow :
+					(count == 3) ? CRCInput::RC_blue : NULL;
+				count++;
+				string 	itm_name = g_Locale->getText(v_item[j].locale_name);
+				itm_name += " ";
+				itm_name += g_Locale->getText(LOCALE_PERSONALIZE_PINSTATUS);
+
+				if (v_item[j].personalize_mode != NULL)
+					pMenu->addItem(new CMenuOptionChooser(itm_name.c_str(), v_item[j].personalize_mode, PERSONALIZE_PROTECT_MODE_OPTIONS, PERSONALIZE_PROTECT_MODE_MAX, v_item[j].menuItem->active, NULL, key, icon));
+			}
+		}
+		res = pMenu->exec(NULL, "");
+		delete pMenu;
+		delete pinChangeWidget;
+		return res;
+	}
 
 	//personalized menues
 	CMenuForwarderNonLocalized *p_mn[widget_count];
@@ -322,7 +354,7 @@ int CPersonalizeGui::ShowPersonalizationMenu()
 	pMenu->addItem(GenericMenuSeparatorLine);
 	pMenu->addItem(new CMenuForwarder(LOCALE_PERSONALIZE_HELP, true, NULL, this, "personalize_help", CRCInput::RC_help, NEUTRINO_ICON_BUTTON_HELP));
 	
-	int res = pMenu->exec(NULL, "");
+	res = pMenu->exec(NULL, "");
 	delete pMenu;
 	delete uMenu;
 	delete pinChangeWidget;
@@ -446,7 +478,7 @@ void CPersonalizeGui::ShowPluginMenu(CMenuWidget* p_widget)
 int CPersonalizeGui::ShowMenuOptions(const int& widget)
 {
 	string mn_name = v_widget[widget]->getName();
-	printf("[neutrino-personalize] exec %s...\n", __FUNCTION__);
+	printf("[neutrino-personalize] exec %s for [%s]...\n", __FUNCTION__, mn_name.c_str());
 	
 	mn_widget_id_t w_index = widget+MN_WIDGET_ID_PERSONALIZE_MAIN;
 	CMenuWidget* pm = new CMenuWidget(LOCALE_PERSONALIZE_HEAD, NEUTRINO_ICON_PERSONALIZE, width, w_index);
@@ -597,24 +629,31 @@ void CPersonalizeGui::ShowHelpPersonalize()
 	helpbox.show(LOCALE_PERSONALIZE_HELP);
 }
 
+void CPersonalizeGui::ApplySettings()
+{
+	// replace old settings with new settings
+	for (uint i = 0; i < v_int_settings.size(); i++)
+		v_int_settings[i].old_val = *v_int_settings[i].p_val;
+	for (int i = 0; i<(widget_count); i++)
+		v_widget[i]->resetWidget();
+
+	addPersonalizedItems();
+}
+
 void CPersonalizeGui::SaveAndExit()
 {
 	// Save the settings and left menu, if user wants to!
 	if (haveChangedSettings())
 	{
+		if (g_settings.easymenu) {
+			ApplySettings();
+			return;
+		}
 		if (ShowMsgUTF(LOCALE_PERSONALIZE_HEAD, g_Locale->getText(LOCALE_PERSONALIZE_APPLY_SETTINGS), CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NEUTRINO_ICON_QUESTION) == CMessageBox::mbrYes)
 		{
 			CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_MAINSETTINGS_SAVESETTINGSNOW_HINT)); // UTF-8
 			hintBox.paint();
-			// replace old settings with new settings
-			for (uint i = 0; i < v_int_settings.size(); i++)
-				v_int_settings[i].old_val = *v_int_settings[i].p_val;
-			//CNeutrinoApp::getInstance()->saveSetup();
-
-			for (int i = 0; i<(widget_count); i++)
-				v_widget[i]->resetWidget();
-			
-			addPersonalizedItems();
+			ApplySettings();
 			hintBox.hide();
 		}
 		else
@@ -803,7 +842,7 @@ void CPersonalizeGui::addPersonalizedItems()
 					use_pin = true;
 				
 				//set pinmode for personalize menu or for settings manager menu and if any item is pin protected 
-				if (in_pinmode && !use_pin)		
+				if (!g_settings.easymenu && (in_pinmode && !use_pin))
 					if (v_item[i].personalize_mode == &g_settings.personalize[SNeutrinoSettings::P_MAIN_PINSTATUS] || v_item[i].personalize_mode == &g_settings.personalize[SNeutrinoSettings::P_MSET_SETTINGS_MANAGER])
 					{
 						use_pin = true;
@@ -811,7 +850,9 @@ void CPersonalizeGui::addPersonalizedItems()
 					}
 											
 				//convert item to locked forwarder and use generated pin mode for usage as ask parameter 
-				v_item[i].menuItem = new CLockedMenuForwarder(fw->getTextLocale(), g_settings.personalize_pincode, use_pin, fw->active, NULL, fw->getTarget(), fw->getActionKey().c_str(), d_key, fw->iconName.c_str(), lock_icon);
+				v_item[i].menuItem = new CLockedMenuForwarder(fw->getTextLocale(), 
+						g_settings.easymenu ? g_settings.parentallock_pincode : g_settings.personalize_pincode,
+						use_pin, fw->active, NULL, fw->getTarget(), fw->getActionKey().c_str(), d_key, fw->iconName.c_str(), lock_icon);
 				v_item[i].menuItem->hintIcon = fw->hintIcon;
 				v_item[i].menuItem->hint = fw->hint;
 				//add item if it's set to visible or pin protected and allow to add an forwarder as next
diff --git a/src/gui/personalize.h b/src/gui/personalize.h
index 9b6a452c4..fe34339c4 100644
--- a/src/gui/personalize.h
+++ b/src/gui/personalize.h
@@ -169,6 +169,7 @@ class CPersonalizeGui : public CMenuTarget, public CChangeObserver, public CPINP
 		void 	ShowPluginMenu(CMenuWidget* p_widget);
 		void 	ShowPreverredKeySetup(CMenuWidget* p_widget);
 		void 	SaveAndExit();
+		void	ApplySettings();
 		
 		bool	hasPinItems();
 		
diff --git a/src/gui/record_setup.cpp b/src/gui/record_setup.cpp
index bec04b041..125ea8ec5 100644
--- a/src/gui/record_setup.cpp
+++ b/src/gui/record_setup.cpp
@@ -173,19 +173,46 @@ int CRecordSetup::showRecordSetup()
 	//menue init
 	CMenuWidget* recordingSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_RECORDSETUP);
 
-	//apply settings
 	recordingSettings->addIntroItems(LOCALE_MAINSETTINGS_RECORDING);
+#if 0
+	//apply settings
 	mf = new CMenuForwarder(LOCALE_RECORDINGMENU_SETUPNOW, true, NULL, this, "recording", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
 	mf->setHint("", LOCALE_MENU_HINT_RECORD_APPLY);
 	recordingSettings->addItem(mf);
 	recordingSettings->addItem(GenericMenuSeparatorLine);
+#endif
+	CMenuWidget recordingTsSettings(LOCALE_MAINSETTINGS_RECORDING, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_RECORDSETUP_TIMESHIFT);
+	showRecordTimeShiftSetup(&recordingTsSettings);
+
+	CMenuWidget recordingTimerSettings(LOCALE_MAINSETTINGS_RECORDING, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_RECORDSETUP_TIMERSETTINGS);
+	showRecordTimerSetup(&recordingTimerSettings);
+
+	if (g_settings.easymenu) {
+		//timeshift
+		mf = new CMenuForwarder(LOCALE_RECORDINGMENU_TIMESHIFT, true, NULL, &recordingTsSettings, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
+		mf->setHint("", LOCALE_MENU_HINT_RECORD_TIMESHIFT);
+		recordingSettings->addItem(mf);
+
+		//timersettings
+		mf = new CMenuForwarder(LOCALE_TIMERSETTINGS_SEPARATOR, true, NULL, &recordingTimerSettings, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
+		mf->setHint("", LOCALE_MENU_HINT_RECORD_TIMER);
+		recordingSettings->addItem(mf);
+	}
 
 	//record dir
-	CMenuForwarder* fRecDir = new CMenuForwarder(LOCALE_RECORDINGMENU_DEFDIR, true, g_settings.network_nfs_recordingdir, this, "recordingdir");
+	CMenuForwarder* fRecDir;
+	if (g_settings.easymenu)
+		fRecDir = new CMenuForwarder(LOCALE_RECORDINGMENU_DEFDIR, true, g_settings.network_nfs_recordingdir, this, "recordingdir", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
+	else
+		fRecDir = new CMenuForwarder(LOCALE_RECORDINGMENU_DEFDIR, true, g_settings.network_nfs_recordingdir, this, "recordingdir");
 	fRecDir->setHint("", LOCALE_MENU_HINT_RECORD_DIR);
 	recordingSettings->addItem(fRecDir);
 
-	CMenuOptionChooser* channel_rec_dir = new CMenuOptionChooser(LOCALE_RECORDINGMENU_SAVE_IN_CHANNELDIR, &g_settings.recording_save_in_channeldir, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
+	CMenuOptionChooser* channel_rec_dir;
+	if (g_settings.easymenu)
+		channel_rec_dir = new CMenuOptionChooser(LOCALE_RECORDINGMENU_SAVE_IN_CHANNELDIR, &g_settings.recording_save_in_channeldir, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
+	else
+		channel_rec_dir = new CMenuOptionChooser(LOCALE_RECORDINGMENU_SAVE_IN_CHANNELDIR, &g_settings.recording_save_in_channeldir, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
 	channel_rec_dir->setHint("", LOCALE_MENU_HINT_RECORD_CHANDIR);
 	recordingSettings->addItem(channel_rec_dir);
 
@@ -199,45 +226,52 @@ int CRecordSetup::showRecordSetup()
 	end_of_recording->setHint("", LOCALE_MENU_HINT_RECORD_END);
 	recordingSettings->addItem(end_of_recording);
 
-	CMenuOptionChooser* slow_warn = new CMenuOptionChooser(LOCALE_RECORDINGMENU_SLOW_WARN, &g_settings.recording_slow_warning, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
-	slow_warn->setHint("", LOCALE_MENU_HINT_RECORD_SLOW_WARN);
-	recordingSettings->addItem(slow_warn);
+	if (!g_settings.easymenu) {
+		CMenuOptionChooser* slow_warn = new CMenuOptionChooser(LOCALE_RECORDINGMENU_SLOW_WARN, &g_settings.recording_slow_warning, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
+		slow_warn->setHint("", LOCALE_MENU_HINT_RECORD_SLOW_WARN);
+		recordingSettings->addItem(slow_warn);
+	}
 
 	//template
 	//CStringInput recordingSettings_filenameTemplate(LOCALE_RECORDINGMENU_FILENAME_TEMPLATE, &g_settings.recording_filename_template[0], 21, LOCALE_RECORDINGMENU_FILENAME_TEMPLATE_HINT, LOCALE_IPSETUP_HINT_2, "%/-_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 ");
 	//CMenuForwarder* mf11 = new CMenuForwarder(LOCALE_RECORDINGMENU_FILENAME_TEMPLATE, true, g_settings.recording_filename_template[0], &recordingSettings_filenameTemplate);
 	recordingSettings->addItem(GenericMenuSeparatorLine);
 
-	//timeshift
-	CMenuWidget recordingTsSettings(LOCALE_MAINSETTINGS_RECORDING, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_RECORDSETUP_TIMESHIFT);
-	showRecordTimeShiftSetup(&recordingTsSettings);
-	mf = new CMenuForwarder(LOCALE_RECORDINGMENU_TIMESHIFT, true, NULL, &recordingTsSettings, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
-	mf->setHint("", LOCALE_MENU_HINT_RECORD_TIMESHIFT);
-	recordingSettings->addItem(mf);
+	if (!g_settings.easymenu) {
+		//timeshift
+		mf = new CMenuForwarder(LOCALE_RECORDINGMENU_TIMESHIFT, true, NULL, &recordingTsSettings, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
+		mf->setHint("", LOCALE_MENU_HINT_RECORD_TIMESHIFT);
+		recordingSettings->addItem(mf);
 
-	//timersettings
-	CMenuWidget recordingTimerSettings(LOCALE_MAINSETTINGS_RECORDING, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_RECORDSETUP_TIMERSETTINGS);
-	showRecordTimerSetup(&recordingTimerSettings);
-	mf = new CMenuForwarder(LOCALE_TIMERSETTINGS_SEPARATOR, true, NULL, &recordingTimerSettings, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
-	mf->setHint("", LOCALE_MENU_HINT_RECORD_TIMER);
-	recordingSettings->addItem(mf);
+		//timersettings
+		mf = new CMenuForwarder(LOCALE_TIMERSETTINGS_SEPARATOR, true, NULL, &recordingTimerSettings, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
+		mf->setHint("", LOCALE_MENU_HINT_RECORD_TIMER);
+		recordingSettings->addItem(mf);
+	}
 
-	//audiosettings
 	CMenuWidget recordingaAudioSettings(LOCALE_MAINSETTINGS_RECORDING, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_RECORDSETUP_AUDIOSETTINGS);
-	showRecordAudioSetup(&recordingaAudioSettings);
-	mf = new CMenuForwarder(LOCALE_RECORDINGMENU_APIDS, true, NULL, &recordingaAudioSettings, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
-	mf->setHint("", LOCALE_MENU_HINT_RECORD_APIDS);
-	recordingSettings->addItem(mf);
-
-	//datasettings
 	CMenuWidget recordingaDataSettings(LOCALE_MAINSETTINGS_RECORDING, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_RECORDSETUP_DATASETTINGS);
-	showRecordDataSetup(&recordingaDataSettings);
-	mf = new CMenuForwarder(LOCALE_RECORDINGMENU_DATA_PIDS, true, NULL, &recordingaDataSettings, NULL,  CRCInput::RC_1);
-	mf->setHint("", LOCALE_MENU_HINT_RECORD_DATA);
-	recordingSettings->addItem(mf);
+	if (!g_settings.easymenu) {
+		//audiosettings
+		showRecordAudioSetup(&recordingaAudioSettings);
+		mf = new CMenuForwarder(LOCALE_RECORDINGMENU_APIDS, true, NULL, &recordingaAudioSettings, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
+		mf->setHint("", LOCALE_MENU_HINT_RECORD_APIDS);
+		recordingSettings->addItem(mf);
+
+		//datasettings
+		showRecordDataSetup(&recordingaDataSettings);
+		mf = new CMenuForwarder(LOCALE_RECORDINGMENU_DATA_PIDS, true, NULL, &recordingaDataSettings, NULL,  CRCInput::RC_1);
+		mf->setHint("", LOCALE_MENU_HINT_RECORD_DATA);
+		recordingSettings->addItem(mf);
+	}
 
 	int res = recordingSettings->exec(NULL, "");
 	delete recordingSettings;
+
+	/* activate changes */
+        CRecordManager::getInstance()->SetDirectory(g_settings.network_nfs_recordingdir);
+        CRecordManager::getInstance()->Config(g_settings.recording_stopsectionsd, g_settings.recording_stream_vtxt_pid, g_settings.recording_stream_pmt_pid, g_settings.recording_stream_subtitle_pids);
+
 	return res;
 }
 
diff --git a/src/gui/settings_manager.cpp b/src/gui/settings_manager.cpp
index 3f938dd55..9bb0d2bf5 100644
--- a/src/gui/settings_manager.cpp
+++ b/src/gui/settings_manager.cpp
@@ -146,33 +146,51 @@ int CSettingsManager::showMenu()
 	CMenuWidget * mset = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_SETTINGS_MNGR);
 	mset->addIntroItems(LOCALE_MAINSETTINGS_MANAGE);
 
-	CMenuForwarder * mf = new CMenuForwarder(LOCALE_RESET_SETTINGS,   true, NULL, resetNotifier,    "settings",     CRCInput::RC_recall);
+	CMenuForwarder * mf;
+	if (g_settings.easymenu)
+		mf = new CMenuForwarder(LOCALE_RESET_SETTINGS,   true, NULL, resetNotifier,    "settings",     CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
+	else
+		mf = new CMenuForwarder(LOCALE_RESET_SETTINGS,   true, NULL, resetNotifier,    "settings",     CRCInput::RC_recall);
+
 	mf->setHint(NEUTRINO_ICON_HINT_RESET, LOCALE_MENU_HINT_RESET); // FIXME: RC-button RECALL is broken
 	mset->addItem(mf);
 
-	mset->addItem(GenericMenuSeparatorLine);
+	if (!g_settings.easymenu) {
+		mset->addItem(GenericMenuSeparatorLine);
 
-	mf = new CMenuForwarder(LOCALE_EXTRA_SAVECONFIG, true, NULL, this, "saveconfig", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
-	mf->setHint(NEUTRINO_ICON_HINT_SAVEAS, LOCALE_MENU_HINT_SAVEAS);
-	mset->addItem(mf);
+		mf = new CMenuForwarder(LOCALE_EXTRA_SAVECONFIG, true, NULL, this, "saveconfig", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
+		mf->setHint(NEUTRINO_ICON_HINT_SAVEAS, LOCALE_MENU_HINT_SAVEAS);
+		mset->addItem(mf);
 
-	mf = new CMenuForwarder(LOCALE_EXTRA_LOADCONFIG, true, NULL, this, "loadconfig", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
-	mf->setHint(NEUTRINO_ICON_HINT_LOAD, LOCALE_MENU_HINT_LOAD);
-	mset->addItem(mf);
+		mf = new CMenuForwarder(LOCALE_EXTRA_LOADCONFIG, true, NULL, this, "loadconfig", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
+		mf->setHint(NEUTRINO_ICON_HINT_LOAD, LOCALE_MENU_HINT_LOAD);
+		mset->addItem(mf);
 
-	mset->addItem(GenericMenuSeparatorLine);
+		mset->addItem(GenericMenuSeparatorLine);
+	}
+
+	if (g_settings.easymenu)
+		mf = new CMenuForwarder(LOCALE_SETTINGS_BACKUP, true, NULL, this, "backup",  CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
+	else
+		mf = new CMenuForwarder(LOCALE_SETTINGS_BACKUP, true, NULL, this, "backup",  CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
 
-	mf = new CMenuForwarder(LOCALE_SETTINGS_BACKUP, true, NULL, this, "backup",  CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
 	mf->setHint(NEUTRINO_ICON_HINT_BACKUP, LOCALE_MENU_HINT_BACKUP);
 	mset->addItem(mf);
 
-	mf = new CMenuForwarder(LOCALE_SETTINGS_RESTORE, true, NULL, this, "restore", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
+	if (g_settings.easymenu)
+		mf = new CMenuForwarder(LOCALE_SETTINGS_RESTORE, true, NULL, this, "restore", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
+	else
+		mf = new CMenuForwarder(LOCALE_SETTINGS_RESTORE, true, NULL, this, "restore", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
+
 	mf->setHint(NEUTRINO_ICON_HINT_RESTORE, LOCALE_MENU_HINT_RESTORE);
 	mset->addItem(mf);
 
-	mset->addItem(GenericMenuSeparatorLine);
-
-	mf = new CMenuForwarder(LOCALE_RESET_ALL, true, NULL, resetNotifier, "all", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER);
+	if (g_settings.easymenu) {
+		mf = new CMenuForwarder(LOCALE_RESET_ALL, true, NULL, resetNotifier, "all", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
+	} else {
+		mset->addItem(GenericMenuSeparatorLine);
+		mf = new CMenuForwarder(LOCALE_RESET_ALL, true, NULL, resetNotifier, "all", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER);
+	}
 	mf->setHint(NEUTRINO_ICON_HINT_FACTORY, LOCALE_MENU_HINT_FACTORY);
 	mset->addItem(mf);
 
diff --git a/src/gui/start_wizard.cpp b/src/gui/start_wizard.cpp
index 4100ed542..60ced329c 100644
--- a/src/gui/start_wizard.cpp
+++ b/src/gui/start_wizard.cpp
@@ -112,7 +112,7 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/)
 			res = g_videoSettings->exec(NULL, "");
 			g_videoSettings->setWizardMode(CVideoSettings::V_SETUP_MODE_WIZARD_NO);
 		}
-		if(advanced && res != menu_return::RETURN_EXIT_ALL)
+		if(!g_settings.easymenu && advanced && res != menu_return::RETURN_EXIT_ALL)
 		{
 			COsdSetup osdSettings(COsdSetup::OSD_SETUP_MODE_WIZARD);
 			res = osdSettings.exec(NULL, "");
diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp
index 5a8b89623..7f072c6ef 100644
--- a/src/gui/videosettings.cpp
+++ b/src/gui/videosettings.cpp
@@ -269,24 +269,28 @@ int CVideoSettings::showVideoSetup()
 	CMenuOptionChooser * vs_videomodes_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_VIDEOMODE, &g_settings.video_Mode, VIDEOMENU_VIDEOMODE_OPTIONS, VIDEOMENU_VIDEOMODE_OPTION_COUNT, true, this, CRCInput::RC_nokey, "", true);
 	vs_videomodes_ch->setHint("", LOCALE_MENU_HINT_VIDEO_MODE);
 
-	//dbdr options
-	CMenuOptionChooser * vs_dbdropt_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_DBDR, &g_settings.video_dbdr, VIDEOMENU_DBDR_OPTIONS, VIDEOMENU_DBDR_OPTION_COUNT, true, this);
-	vs_dbdropt_ch->setHint("", LOCALE_MENU_HINT_VIDEO_DBDR);
-
-	//video system modes submenue
+	CMenuOptionChooser * vs_dbdropt_ch = NULL;
+	CMenuForwarder * vs_videomodes_fw = NULL;
 	CMenuWidget videomodes(LOCALE_MAINSETTINGS_VIDEO, NEUTRINO_ICON_SETTINGS);
-	videomodes.addIntroItems(LOCALE_VIDEOMENU_ENABLED_MODES);
-
 	CAutoModeNotifier anotify;
-	for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++)
-		videomodes.addItem(new CMenuOptionChooser(VIDEOMENU_VIDEOMODE_OPTIONS[i].valname, &g_settings.enabled_video_modes[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, &anotify));
-	//anotify.changeNotify(NONEXISTANT_LOCALE, 0);
+	if (!g_settings.easymenu) {
+		//dbdr options
+		vs_dbdropt_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_DBDR, &g_settings.video_dbdr, VIDEOMENU_DBDR_OPTIONS, VIDEOMENU_DBDR_OPTION_COUNT, true, this);
+		vs_dbdropt_ch->setHint("", LOCALE_MENU_HINT_VIDEO_DBDR);
 
-	CMenuForwarder * vs_videomodes_fw = new CMenuForwarder(LOCALE_VIDEOMENU_ENABLED_MODES, true, NULL, &videomodes, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED );
-	vs_videomodes_fw->setHint("", LOCALE_MENU_HINT_VIDEO_MODES);
+		//video system modes submenue
+		videomodes.addIntroItems(LOCALE_VIDEOMENU_ENABLED_MODES);
+
+		for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++)
+			videomodes.addItem(new CMenuOptionChooser(VIDEOMENU_VIDEOMODE_OPTIONS[i].valname, &g_settings.enabled_video_modes[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, &anotify));
+		//anotify.changeNotify(NONEXISTANT_LOCALE, 0);
+
+		vs_videomodes_fw = new CMenuForwarder(LOCALE_VIDEOMENU_ENABLED_MODES, true, NULL, &videomodes, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED );
+		vs_videomodes_fw->setHint("", LOCALE_MENU_HINT_VIDEO_MODES);
+	}
 
 	//---------------------------------------
-	videosetup->addIntroItems(LOCALE_MAINSETTINGS_VIDEO, LOCALE_VIDEOMENU_TV_SCART);
+	videosetup->addIntroItems(LOCALE_MAINSETTINGS_VIDEO /*, LOCALE_VIDEOMENU_TV_SCART*/);
 	//---------------------------------------
 	//videosetup->addItem(vs_scart_sep);	  //separator scart
 	if (vs_analg_ch != NULL)
@@ -295,25 +299,29 @@ int CVideoSettings::showVideoSetup()
 		videosetup->addItem(vs_scart_ch); //scart
 	if (vs_chinch_ch != NULL)
 		videosetup->addItem(vs_chinch_ch);//chinch
-	videosetup->addItem(GenericMenuSeparatorLine);
+	//videosetup->addItem(GenericMenuSeparatorLine);
 	//---------------------------------------
 	videosetup->addItem(vs_43mode_ch);	  //4:3 mode
 	videosetup->addItem(vs_dispformat_ch);	  //display format
 	videosetup->addItem(vs_videomodes_ch);	  //video system
-	videosetup->addItem(vs_dbdropt_ch);	  //dbdr options
-	videosetup->addItem(vs_videomodes_fw);	  //video modes submenue
+	if (!g_settings.easymenu) {
+		videosetup->addItem(vs_dbdropt_ch);	  //dbdr options
+		videosetup->addItem(vs_videomodes_fw);	  //video modes submenue
+	}
 
 #ifdef BOXMODEL_APOLLO
-	/* values are from -128 to 127, but brightness really no sense after +/- 40. changeNotify multiply contrast and saturation to 3 */
-	CMenuOptionNumberChooser * bcont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_BRIGHTNESS, &g_settings.brightness, true, -42, 42, this);
-	bcont->setHint("", LOCALE_MENU_HINT_VIDEO_BRIGHTNESS);
-	CMenuOptionNumberChooser * ccont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_CONTRAST, &g_settings.contrast, true, -42, 42, this);
-	ccont->setHint("", LOCALE_MENU_HINT_VIDEO_CONTRAST);
-	CMenuOptionNumberChooser * scont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_SATURATION, &g_settings.saturation, true, -42, 42, this);
-	scont->setHint("", LOCALE_MENU_HINT_VIDEO_SATURATION);
-	videosetup->addItem(bcont);
-	videosetup->addItem(ccont);
-	videosetup->addItem(scont);
+	if (!g_settings.easymenu) {
+		/* values are from -128 to 127, but brightness really no sense after +/- 40. changeNotify multiply contrast and saturation to 3 */
+		CMenuOptionNumberChooser * bcont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_BRIGHTNESS, &g_settings.brightness, true, -42, 42, this);
+		bcont->setHint("", LOCALE_MENU_HINT_VIDEO_BRIGHTNESS);
+		CMenuOptionNumberChooser * ccont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_CONTRAST, &g_settings.contrast, true, -42, 42, this);
+		ccont->setHint("", LOCALE_MENU_HINT_VIDEO_CONTRAST);
+		CMenuOptionNumberChooser * scont = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_SATURATION, &g_settings.saturation, true, -42, 42, this);
+		scont->setHint("", LOCALE_MENU_HINT_VIDEO_SATURATION);
+		videosetup->addItem(bcont);
+		videosetup->addItem(ccont);
+		videosetup->addItem(scont);
+	}
 #endif
 #ifdef ENABLE_PIP
 	CPipSetup pip;
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index d8958ebb8..f31ec5d17 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -90,6 +90,7 @@
 #include "gui/widget/menue.h"
 #include "gui/widget/messagebox.h"
 #include "gui/infoclock.h"
+#include "gui/parentallock_setup.h"
 #ifdef ENABLE_PIP
 #include "gui/pipsetup.h"
 #endif
@@ -303,6 +304,12 @@ int CNeutrinoApp::loadSetup(const char * fname)
 		parentallocked = true;
 		checkParentallocked.close();
 	}
+	g_settings.easymenu = configfile.getInt32("easymenu", 0);
+	/* if file present and no config file found, force easy mode */
+	if (erg && !access("/var/etc/.easymenu", F_OK))
+		g_settings.easymenu = 1;
+	INFO("************************************************** g_settings.easymenu %d\n", g_settings.easymenu);
+
 	// video
 	g_settings.video_Mode = configfile.getInt32("video_Mode", VIDEO_STD_1080I50); // VIDEO_STD_720P50
 #ifdef ANALOG_MODE
@@ -585,7 +592,8 @@ int CNeutrinoApp::loadSetup(const char * fname)
 	//recording (server + vcr)
 	g_settings.recording_type = configfile.getInt32("recording_type", RECORDING_FILE);
 	g_settings.recording_stopsectionsd         = configfile.getBool("recording_stopsectionsd"            , false );
-	g_settings.recording_audio_pids_default    = configfile.getInt32("recording_audio_pids_default", TIMERD_APIDS_STD | TIMERD_APIDS_AC3);
+	g_settings.recording_audio_pids_default    = configfile.getInt32("recording_audio_pids_default",
+		g_settings.easymenu ? TIMERD_APIDS_ALL : TIMERD_APIDS_STD | TIMERD_APIDS_AC3);
 	g_settings.recording_zap_on_announce       = configfile.getBool("recording_zap_on_announce"      , false);
 	g_settings.shutdown_timer_record_type      = configfile.getBool("shutdown_timer_record_type"      , false);
 
@@ -1204,6 +1212,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	configfile.setInt32("pip_width", g_settings.pip_width);
 	configfile.setInt32("pip_height", g_settings.pip_height);
 #endif
+	configfile.setInt32("easymenu", g_settings.easymenu);
 	if(strcmp(fname, NEUTRINO_SETTINGS_FILE))
 		configfile.saveConfig(fname);
 
@@ -2063,6 +2072,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
 					StopSubtitles();
 					if(g_settings.mode_clock)
 						InfoClock->StopClock();
+					int old_ttx = g_settings.cacheTXT;
 					mainMenu.exec(NULL, "");
 					if(g_settings.mode_clock)
 						InfoClock->StartClock();
@@ -2070,6 +2080,12 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
 					saveSetup(NEUTRINO_SETTINGS_FILE);
 					if (!g_settings.epg_scan)
 						CEpgScan::getInstance()->Clear();
+					if (old_ttx != g_settings.cacheTXT) {
+						if(g_settings.cacheTXT) {
+							tuxtxt_init();
+						} else
+							tuxtxt_close();
+					}
 				}
 			}
 			else if (((msg == CRCInput::RC_tv) || (msg == CRCInput::RC_radio)) && (g_settings.key_tvradio_mode == (int)CRCInput::RC_nokey)) {
@@ -2309,6 +2325,100 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
 	}
 }
 
+int CNeutrinoApp::showChannelList(const neutrino_msg_t _msg, bool from_menu)
+{
+	neutrino_msg_t msg = _msg;
+	if(g_settings.mode_clock)
+		InfoClock->StopClock();
+
+	StopSubtitles();
+
+_show:
+	int nNewChannel = -1;
+	int old_b = bouquetList->getActiveBouquetNumber();
+	t_channel_id old_id = 0;
+	if(!bouquetList->Bouquets.empty())
+		old_id = bouquetList->Bouquets[bouquetList->getActiveBouquetNumber()]->channelList->getActiveChannel_ChannelID();
+	//int old_mode = g_settings.channel_mode;
+	int old_mode = GetChannelMode();
+	printf("************************* ZAP START: bouquetList %p size %d old_b %d\n", bouquetList, (int)bouquetList->Bouquets.size(), old_b);fflush(stdout);
+
+#if 0
+	int old_num = 0;
+	if(!bouquetList->Bouquets.empty()) {
+		old_num = bouquetList->Bouquets[old_b]->channelList->getSelected();
+	}
+#endif
+	//_show:
+	if(msg == CRCInput::RC_ok)
+	{
+		if (g_settings.channellist_new_zap_mode > 0) /* allow or active */
+			g_audioMute->enableMuteIcon(false);
+		if( !bouquetList->Bouquets.empty() && bouquetList->Bouquets[old_b]->channelList->getSize() > 0)
+			nNewChannel = bouquetList->Bouquets[old_b]->channelList->exec();//with ZAP!
+		else
+			nNewChannel = bouquetList->exec(true);
+		if (g_settings.channellist_new_zap_mode > 0) /* allow or active */
+			g_audioMute->enableMuteIcon(true);
+	} else if(msg == CRCInput::RC_sat) {
+		SetChannelMode(LIST_MODE_SAT);
+		nNewChannel = bouquetList->exec(true);
+	} else if(msg == CRCInput::RC_favorites) {
+		SetChannelMode(LIST_MODE_FAV);
+		nNewChannel = bouquetList->exec(true);
+	}
+_repeat:
+	CVFD::getInstance ()->showServicename(channelList->getActiveChannelName());
+	CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
+	printf("************************* ZAP RES: nNewChannel %d\n", nNewChannel);fflush(stdout);
+	if(nNewChannel == -1) { // restore orig. bouquet and selected channel on cancel
+		/* FIXME if mode was changed while browsing,
+		 * other modes selected bouquet not restored */
+		SetChannelMode(old_mode);
+		bouquetList->activateBouquet(old_b, false);
+#if 0
+		if(!bouquetList->Bouquets.empty())
+			bouquetList->Bouquets[bouquetList->getActiveBouquetNumber()]->channelList->setSelected(old_num);
+#endif
+		if(!bouquetList->Bouquets.empty()) {
+			bouquetList->Bouquets[bouquetList->getActiveBouquetNumber()]->channelList->adjustToChannelID(old_id, false);
+		}
+		StartSubtitles(mode == mode_tv);
+	}
+	else if(nNewChannel == -3) { // list mode changed
+		printf("************************* ZAP NEW MODE: bouquetList %p size %d\n", bouquetList, (int)bouquetList->Bouquets.size());fflush(stdout);
+		nNewChannel = bouquetList->exec(true);
+		goto _repeat;
+	}
+	//else if(nNewChannel == -4)
+	if(g_channel_list_changed)
+	{
+		/* don't change bouquet after adding a channel to favorites */
+		if (nNewChannel != -5)
+			SetChannelMode(old_mode);
+		g_channel_list_changed = false;
+		if(old_b_id < 0) old_b_id = old_b;
+		//g_Zapit->saveBouquets();
+		/* lets do it in sync */
+		reloadhintBox->paint();
+		CServiceManager::getInstance()->SaveServices(true, true);
+		g_bouquetManager->saveBouquets();
+		g_bouquetManager->saveUBouquets();
+		g_bouquetManager->renumServices();
+		channelsInit(/*true*/);
+		t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID();
+		channelList->adjustToChannelID(live_channel_id);//FIXME what if deleted ?
+		bouquetList->activateBouquet(old_b_id, false);
+		msg = CRCInput::RC_ok;
+		goto _show;
+	}
+
+	if(!from_menu && g_settings.mode_clock)
+		InfoClock->StartClock();
+
+	return ((nNewChannel >= 0) ? menu_return::RETURN_EXIT_ALL : menu_return::RETURN_REPAINT);
+}
+
 int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
 {
 	int res = 0;
@@ -2361,94 +2471,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
 	/* ================================== KEYS ================================================ */
 	if( msg == CRCInput::RC_ok || (!g_InfoViewer->virtual_zap_mode && (msg == CRCInput::RC_sat || msg == CRCInput::RC_favorites))) {
 		if( (mode == mode_tv) || (mode == mode_radio) || (mode == mode_ts)) {
-			if(g_settings.mode_clock)
-				InfoClock->StopClock();
-
-			StopSubtitles();
-
-_show:
-			int nNewChannel = -1;
-			int old_b = bouquetList->getActiveBouquetNumber();
-			t_channel_id old_id = 0;
-			if(!bouquetList->Bouquets.empty())
-				old_id = bouquetList->Bouquets[bouquetList->getActiveBouquetNumber()]->channelList->getActiveChannel_ChannelID();
-			//int old_mode = g_settings.channel_mode;
-			int old_mode = GetChannelMode();
-			printf("************************* ZAP START: bouquetList %p size %d old_b %d\n", bouquetList, (int)bouquetList->Bouquets.size(), old_b);fflush(stdout);
-
-#if 0
-			int old_num = 0;
-			if(!bouquetList->Bouquets.empty()) {
-				old_num = bouquetList->Bouquets[old_b]->channelList->getSelected();
-			}
-#endif
-//_show:
-			if(msg == CRCInput::RC_ok)
-			{
-				if (g_settings.channellist_new_zap_mode > 0) /* allow or active */
-					g_audioMute->enableMuteIcon(false);
-				if( !bouquetList->Bouquets.empty() && bouquetList->Bouquets[old_b]->channelList->getSize() > 0)
-					nNewChannel = bouquetList->Bouquets[old_b]->channelList->exec();//with ZAP!
-				else
-					nNewChannel = bouquetList->exec(true);
-				if (g_settings.channellist_new_zap_mode > 0) /* allow or active */
-					g_audioMute->enableMuteIcon(true);
-			} else if(msg == CRCInput::RC_sat) {
-				SetChannelMode(LIST_MODE_SAT);
-				nNewChannel = bouquetList->exec(true);
-			} else if(msg == CRCInput::RC_favorites) {
-				SetChannelMode(LIST_MODE_FAV);
-				nNewChannel = bouquetList->exec(true);
-			}
-_repeat:
-			CVFD::getInstance ()->showServicename(channelList->getActiveChannelName());
-			CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
-			printf("************************* ZAP RES: nNewChannel %d\n", nNewChannel);fflush(stdout);
-			if(nNewChannel == -1) { // restore orig. bouquet and selected channel on cancel
-				/* FIXME if mode was changed while browsing,
-				 * other modes selected bouquet not restored */
-				SetChannelMode(old_mode);
-				bouquetList->activateBouquet(old_b, false);
-#if 0
-				if(!bouquetList->Bouquets.empty())
-					bouquetList->Bouquets[bouquetList->getActiveBouquetNumber()]->channelList->setSelected(old_num);
-#endif
-				if(!bouquetList->Bouquets.empty()) {
-					bouquetList->Bouquets[bouquetList->getActiveBouquetNumber()]->channelList->adjustToChannelID(old_id, false);
-				}
-				StartSubtitles(mode == mode_tv);
-			}
-			else if(nNewChannel == -3) { // list mode changed
-				printf("************************* ZAP NEW MODE: bouquetList %p size %d\n", bouquetList, (int)bouquetList->Bouquets.size());fflush(stdout);
-				nNewChannel = bouquetList->exec(true);
-				goto _repeat;
-			}
-			//else if(nNewChannel == -4)
-			if(g_channel_list_changed)
-			{
-				/* don't change bouquet after adding a channel to favorites */
-				if (nNewChannel != -5)
-					SetChannelMode(old_mode);
-				g_channel_list_changed = false;
-				if(old_b_id < 0) old_b_id = old_b;
-				//g_Zapit->saveBouquets();
-				/* lets do it in sync */
-				reloadhintBox->paint();
-				CServiceManager::getInstance()->SaveServices(true, true);
-				g_bouquetManager->saveBouquets();
-				g_bouquetManager->saveUBouquets();
-				g_bouquetManager->renumServices();
-				channelsInit(/*true*/);
-				t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID();
-				channelList->adjustToChannelID(live_channel_id);//FIXME what if deleted ?
-				bouquetList->activateBouquet(old_b_id, false);
-				msg = CRCInput::RC_ok;
-				goto _show;
-			}
-
-			if(g_settings.mode_clock)
-				InfoClock->StartClock();
-
+			showChannelList(msg);
 			return messages_return::handled;
 		}
 	}
@@ -3572,6 +3595,24 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
 	{
 		g_Sectionsd->freeMemory();
 	}
+	else if(actionKey == "channels")
+		return showChannelList(CRCInput::RC_ok, true);
+	else if(actionKey == "standby")
+		g_RCInput->postMsg(NeutrinoMessages::STANDBY_ON, 0);
+	else if(actionKey == "easyswitch") {
+		INFO("easyswitch\n");
+		CParentalSetup pin;
+		if (pin.checkPin()) {
+			if (parent)
+				parent->hide();
+
+			g_settings.easymenu = (g_settings.easymenu == 0) ? 1 : 0;
+			INFO("change easymenu to %d\n", g_settings.easymenu);
+			const char * text = g_settings.easymenu ? "Easy menu switched ON, restart box ?" : "Easy menu switched OFF, restart box ?";
+			if (ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, text, CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo, NEUTRINO_ICON_INFO, 0) == CMessageBox::mbrYes)
+				g_RCInput->postMsg(NeutrinoMessages::REBOOT, 0);
+		}
+	}
 
 	return returnval;
 }
diff --git a/src/neutrino.h b/src/neutrino.h
index c2d2c6a4a..734405e9b 100644
--- a/src/neutrino.h
+++ b/src/neutrino.h
@@ -211,6 +211,8 @@ public:
 
 	void saveEpg(bool cvfd_mode);
 	void stopDaemonsForFlash();
+	int showChannelList(const neutrino_msg_t msg, bool from_menu = false);
+	CPersonalizeGui & getPersonalizeGui() { return personalize; }
 };
 #endif
 
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index 9e815c6ff..ebb1e7907 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -89,6 +89,7 @@ enum
 	MENU_MAIN,
 	MENU_SETTINGS,
 	MENU_SERVICE,
+	MENU_SHUTDOWN,
 
 	MENU_MAX //3
 };
@@ -100,6 +101,7 @@ const mn_widget_struct_t menu_widgets[MENU_MAX] =
 	{LOCALE_MAINMENU_HEAD, 		NEUTRINO_ICON_MAINMENU, 	MENU_WIDTH},	/* 0 = MENU_MAIN*/
 	{LOCALE_MAINSETTINGS_HEAD, 	NEUTRINO_ICON_SETTINGS, 	MENU_WIDTH},	/* 1 = MENU_SETTINGS*/
 	{LOCALE_SERVICEMENU_HEAD,	NEUTRINO_ICON_SETTINGS, 	MENU_WIDTH}, 	/* 2 = MENU_SERVICE*/
+	{LOCALE_MAINMENU_SHUTDOWN_MENU,	NEUTRINO_ICON_BUTTON_POWER, 	MENU_WIDTH}, 	/* 3 = MENU_SHUTDOWN*/
 };
 
 //init all menues
@@ -110,7 +112,7 @@ void CNeutrinoApp::InitMenu()
 	//personalize: neutrino.h, neutrino.cpp
 	personalize.enableUsermenu();
 	personalize.enablePinSetup();
-	personalize.addWidgets(menu_widgets, MENU_MAX);
+	personalize.addWidgets(menu_widgets, g_settings.easymenu ? MENU_MAX : 3);
 
 	InitMenuMain();
  	InitMenuSettings();
@@ -131,27 +133,39 @@ void CNeutrinoApp::InitMenuMain()
 	// Dynamic renumbering
 	personalize.setShortcut();
 
-	//CMenuWidget &menu = personalize.getWidget(MENU_MAIN)/**main**/;
+	CMenuWidget &menu = personalize.getWidget(MENU_MAIN)/**main**/;
+	menu.addKey(CRCInput::RC_stop, this, "easyswitch");
 
 	//top
 	personalize.addItem(MENU_MAIN, GenericMenuSeparator, NULL, false, CPersonalizeGui::PERSONALIZE_SHOW_NO);
 
 	//1st section***************************************************************************************************
 
-	//tv <-> radio toggle
-	CMenuForwarder *tvradio_switch = new CMenuForwarder(LOCALE_MAINMENU_TVRADIO_SWITCH, true, NULL, this, "tv_radio_switch", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
-	tvradio_switch->setHint(NEUTRINO_ICON_HINT_TVRADIO_SWITCH, LOCALE_MENU_HINT_TVRADIO_SWITCH);
-	personalize.addItem(MENU_MAIN, tvradio_switch, &g_settings.personalize[SNeutrinoSettings::P_MAIN_TV_RADIO_MODE]);
+	if (g_settings.easymenu) {
+		if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) {
+			CMenuForwarder *mb = new CMenuForwarder(LOCALE_MOVIEBROWSER_HEAD, true, NULL, CMediaPlayerMenu::getInstance(), "movieplayer", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
+			mb->setHint(NEUTRINO_ICON_HINT_MB, LOCALE_MENU_HINT_MB);
+			personalize.addItem(MENU_MAIN, mb, &g_settings.personalize[SNeutrinoSettings::P_MPLAYER_MBROWSER]);
+		}
+		CMenuForwarder *cl = new CMenuForwarder(LOCALE_MAINMENU_CHANNELS, true, NULL, this, "channels", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
+		cl->setHint(NEUTRINO_ICON_HINT_TVMODE, LOCALE_MENU_HINT_CHANNELS);
+		personalize.addItem(MENU_MAIN, cl); //, &g_settings.personalize[SNeutrinoSettings::P_MAIN_TV_RADIO_MODE]);
+	} else {
+		//tv <-> radio toggle
+		CMenuForwarder *tvradio_switch = new CMenuForwarder(LOCALE_MAINMENU_TVRADIO_SWITCH, true, NULL, this, "tv_radio_switch", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
+		tvradio_switch->setHint(NEUTRINO_ICON_HINT_TVRADIO_SWITCH, LOCALE_MENU_HINT_TVRADIO_SWITCH);
+		personalize.addItem(MENU_MAIN, tvradio_switch, &g_settings.personalize[SNeutrinoSettings::P_MAIN_TV_RADIO_MODE]);
 
-	//tv-mode
-	CMenuForwarder *tvswitch = new CMenuForwarder(LOCALE_MAINMENU_TVMODE, true, NULL, this, "tv", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
-	tvswitch->setHint(NEUTRINO_ICON_HINT_TVMODE, LOCALE_MENU_HINT_TVMODE);
-	personalize.addItem(MENU_MAIN, tvswitch, &g_settings.personalize[SNeutrinoSettings::P_MAIN_TV_MODE], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ITEM_OPTION, tvradio_switch); //observed
+		//tv-mode
+		CMenuForwarder *tvswitch = new CMenuForwarder(LOCALE_MAINMENU_TVMODE, true, NULL, this, "tv", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
+		tvswitch->setHint(NEUTRINO_ICON_HINT_TVMODE, LOCALE_MENU_HINT_TVMODE);
+		personalize.addItem(MENU_MAIN, tvswitch, &g_settings.personalize[SNeutrinoSettings::P_MAIN_TV_MODE], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ITEM_OPTION, tvradio_switch); //observed
 
-	//radio-mode
-	CMenuForwarder *radioswitch = new CMenuForwarder(LOCALE_MAINMENU_RADIOMODE, true, NULL, this, "radio", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
-	radioswitch->setHint(NEUTRINO_ICON_HINT_RADIOMODE, LOCALE_MENU_HINT_RADIOMODE);
-	personalize.addItem(MENU_MAIN, radioswitch, &g_settings.personalize[SNeutrinoSettings::P_MAIN_RADIO_MODE], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ITEM_OPTION, tvradio_switch); //observed
+		//radio-mode
+		CMenuForwarder *radioswitch = new CMenuForwarder(LOCALE_MAINMENU_RADIOMODE, true, NULL, this, "radio", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
+		radioswitch->setHint(NEUTRINO_ICON_HINT_RADIOMODE, LOCALE_MENU_HINT_RADIOMODE);
+		personalize.addItem(MENU_MAIN, radioswitch, &g_settings.personalize[SNeutrinoSettings::P_MAIN_RADIO_MODE], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ITEM_OPTION, tvradio_switch); //observed
+	}
 
 	//timer
 	CMenuForwarder *timerlist = new CMenuForwarder(LOCALE_TIMERLIST_NAME, true, NULL, new CTimerList(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
@@ -161,24 +175,30 @@ void CNeutrinoApp::InitMenuMain()
 	//multimedia menu
 	CMenuForwarder *media = new CMenuForwarder(LOCALE_MAINMENU_MEDIA, true, NULL, CMediaPlayerMenu::getInstance(), NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
 	media->setHint(NEUTRINO_ICON_HINT_MEDIA, LOCALE_MENU_HINT_MEDIA);
- 	personalize.addItem(MENU_MAIN, media, &g_settings.personalize[SNeutrinoSettings::P_MAIN_MEDIA]);
+	if (g_settings.easymenu)
+		personalize.addItem(MENU_MAIN, media, &g_settings.personalize[SNeutrinoSettings::P_MAIN_MEDIA], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION);
+	else
+		personalize.addItem(MENU_MAIN, media, &g_settings.personalize[SNeutrinoSettings::P_MAIN_MEDIA]);
 
-	//separator
- 	personalize.addSeparator(MENU_MAIN);
+	CMenuForwarder * mf;
+	if (!g_settings.easymenu) {
+		//separator
+		personalize.addSeparator(MENU_MAIN);
 
-	//2nd section***************************************************************************************************
+		//2nd section***************************************************************************************************
 
-	//games
-	bool show_games = g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME);
-	CMenuForwarder * mf = new CMenuForwarder(LOCALE_MAINMENU_GAMES, show_games, NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME));
-	mf->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES);
-	personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_GAMES]);
+		//games
+		bool show_games = g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME);
+		mf = new CMenuForwarder(LOCALE_MAINMENU_GAMES, show_games, NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME));
+		mf->setHint(NEUTRINO_ICON_HINT_GAMES, LOCALE_MENU_HINT_GAMES);
+		personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_GAMES]);
 
-	//scripts
-	bool show_scripts = g_PluginList->hasPlugin(CPlugins::P_TYPE_SCRIPT);
-	mf = new CMenuForwarder(LOCALE_MAINMENU_SCRIPTS, show_scripts, NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT));
-	mf->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS);
-	personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SCRIPTS]);
+		//scripts
+		bool show_scripts = g_PluginList->hasPlugin(CPlugins::P_TYPE_SCRIPT);
+		mf = new CMenuForwarder(LOCALE_MAINMENU_SCRIPTS, show_scripts, NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT));
+		mf->setHint(NEUTRINO_ICON_HINT_SCRIPTS, LOCALE_MENU_HINT_SCRIPTS);
+		personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SCRIPTS]);
+	}
 
 	// settings, also as pin protected option in personalize menu, as a result of parameter value CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION
 	mf = new CMenuForwarder(LOCALE_MAINMENU_SETTINGS, true, NULL, &personalize.getWidget(MENU_SETTINGS)/**settings**/);
@@ -195,22 +215,24 @@ void CNeutrinoApp::InitMenuMain()
 
 	//3rd section***************************************************************************************************
 
-	//10. -- only 10 shortcuts (1-9, 0), the next could be the last also!(10. => 0)
-	//sleeptimer
-	mf = new CMenuForwarder(LOCALE_MAINMENU_SLEEPTIMER, true, NULL, new CSleepTimerWidget);
-	mf->setHint(NEUTRINO_ICON_HINT_SLEEPTIMER, LOCALE_MENU_HINT_SLEEPTIMER);
-	personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SLEEPTIMER]);
+	if (!g_settings.easymenu) {
+		//10. -- only 10 shortcuts (1-9, 0), the next could be the last also!(10. => 0)
+		//sleeptimer
+		mf = new CMenuForwarder(LOCALE_MAINMENU_SLEEPTIMER, true, NULL, new CSleepTimerWidget);
+		mf->setHint(NEUTRINO_ICON_HINT_SLEEPTIMER, LOCALE_MENU_HINT_SLEEPTIMER);
+		personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SLEEPTIMER]);
 
-	//reboot
-	mf = new CMenuForwarder(LOCALE_MAINMENU_REBOOT, true, NULL, this, "reboot");
-	mf->setHint(NEUTRINO_ICON_HINT_REBOOT, LOCALE_MENU_HINT_REBOOT);
-	personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_REBOOT]);
+		//reboot
+		mf = new CMenuForwarder(LOCALE_MAINMENU_REBOOT, true, NULL, this, "reboot");
+		mf->setHint(NEUTRINO_ICON_HINT_REBOOT, LOCALE_MENU_HINT_REBOOT);
+		personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_REBOOT]);
 
-	//shutdown
-	if(system_rev >= 8) {
-		mf = new CMenuForwarder(LOCALE_MAINMENU_SHUTDOWN, true, NULL, this, "shutdown", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER);
-		mf->setHint(NEUTRINO_ICON_HINT_SHUTDOWN, LOCALE_MENU_HINT_SHUTDOWN);
-		personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SHUTDOWN]);
+		//shutdown
+		if(system_rev >= 8) {
+			mf = new CMenuForwarder(LOCALE_MAINMENU_SHUTDOWN, true, NULL, this, "shutdown", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER);
+			mf->setHint(NEUTRINO_ICON_HINT_SHUTDOWN, LOCALE_MENU_HINT_SHUTDOWN);
+			personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SHUTDOWN]);
+		}
 	}
 
 	//separator
@@ -224,11 +246,39 @@ void CNeutrinoApp::InitMenuMain()
 	personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_INFOMENU]);
 
 	//cisettings
-	if (cCA::GetInstance()->GetNumberCISlots() > 0 || cCA::GetInstance()->GetNumberSmartCardSlots() > 0) {
+	if (!g_settings.easymenu && (cCA::GetInstance()->GetNumberCISlots() > 0 || cCA::GetInstance()->GetNumberSmartCardSlots() > 0)) {
 		mf = new CMenuForwarder(LOCALE_CI_SETTINGS, true, NULL, g_CamHandler);
 		mf->setHint(NEUTRINO_ICON_HINT_CI, LOCALE_MENU_HINT_CI);
 		personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_CISETTINGS]);
 	}
+	if (g_settings.easymenu) {
+		personalize.addIntroItems(MENU_SHUTDOWN);
+
+  		mf = new CMenuForwarder(LOCALE_MAINMENU_SHUTDOWN_MENU, true, NULL, &personalize.getWidget(MENU_SHUTDOWN), NULL, CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER);
+		mf->setHint(NEUTRINO_ICON_HINT_SHUTDOWN, LOCALE_MENU_HINT_SHUTDOWN_MENU);
+		personalize.addItem(MENU_MAIN, mf);
+
+		// standby
+		mf = new CMenuForwarder(LOCALE_MAINMENU_STANDBY, true, NULL, this, "standby", CRCInput::RC_red , NEUTRINO_ICON_BUTTON_RED);
+		mf->setHint(NEUTRINO_ICON_HINT_SLEEPTIMER, LOCALE_MENU_HINT_STANDBY);
+		personalize.addItem(MENU_SHUTDOWN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SLEEPTIMER]);
+		//sleeptimer
+		mf = new CMenuForwarder(LOCALE_MAINMENU_SLEEPTIMER, true, NULL, new CSleepTimerWidget, NULL, CRCInput::RC_green , NEUTRINO_ICON_BUTTON_GREEN);
+		mf->setHint(NEUTRINO_ICON_HINT_SLEEPTIMER, LOCALE_MENU_HINT_SLEEPTIMER);
+		personalize.addItem(MENU_SHUTDOWN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SLEEPTIMER]);
+
+		//reboot
+		mf = new CMenuForwarder(LOCALE_MAINMENU_REBOOT, true, NULL, this, "reboot", CRCInput::RC_yellow , NEUTRINO_ICON_BUTTON_YELLOW);
+		mf->setHint(NEUTRINO_ICON_HINT_REBOOT, LOCALE_MENU_HINT_REBOOT);
+		personalize.addItem(MENU_SHUTDOWN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_REBOOT]);
+
+		//shutdown
+		if(system_rev >= 8) {
+			mf = new CMenuForwarder(LOCALE_MAINMENU_SHUTDOWN, true, NULL, this, "shutdown", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
+			mf->setHint(NEUTRINO_ICON_HINT_SHUTDOWN, LOCALE_MENU_HINT_SHUTDOWN);
+			personalize.addItem(MENU_SHUTDOWN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SHUTDOWN]);
+		}
+	}
 
 #ifdef TEST_MENU
 	personalize.addItem(MENU_MAIN, new CMenuForwarderNonLocalized("Test menu", true, NULL, new CTestMenu()), NULL, false, CPersonalizeGui::PERSONALIZE_SHOW_NO);
@@ -251,42 +301,67 @@ void CNeutrinoApp::InitMenuSettings()
 	static int show = CPersonalizeGui::PERSONALIZE_MODE_VISIBLE;
 	//***************************************************************************************************
 	// save
-	CMenuForwarder * mf = new CMenuForwarder(LOCALE_MAINSETTINGS_SAVESETTINGSNOW, true, NULL, this, "savesettings", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
-	mf->setHint(NEUTRINO_ICON_HINT_SAVE_SETTINGS, LOCALE_MENU_HINT_SAVE_SETTINGS);
-	personalize.addItem(MENU_SETTINGS, mf, &show, false, CPersonalizeGui::PERSONALIZE_SHOW_NO);
+	CMenuForwarder * mf;
+	if (!g_settings.easymenu) {
+		mf = new CMenuForwarder(LOCALE_MAINSETTINGS_SAVESETTINGSNOW, true, NULL, this, "savesettings", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
+		mf->setHint(NEUTRINO_ICON_HINT_SAVE_SETTINGS, LOCALE_MENU_HINT_SAVE_SETTINGS);
+		personalize.addItem(MENU_SETTINGS, mf, &show, false, CPersonalizeGui::PERSONALIZE_SHOW_NO);
+	}
 
 	// settings manager
-	mf = new CMenuForwarder(LOCALE_MAINSETTINGS_MANAGE, true, NULL, new CSettingsManager(), NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
+	if (g_settings.easymenu) {
+		mf = new CMenuForwarder(LOCALE_MAINSETTINGS_MANAGE, true, NULL, new CSettingsManager(), NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
+		personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_SETTINGS_MANAGER]);
+	} else {
+		mf = new CMenuForwarder(LOCALE_MAINSETTINGS_MANAGE, true, NULL, new CSettingsManager(), NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
+		personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_SETTINGS_MANAGER], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION);
+	}
 	mf->setHint(NEUTRINO_ICON_HINT_MANAGE_SETTINGS, LOCALE_MENU_HINT_MANAGE_SETTINGS);
-	personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_SETTINGS_MANAGER], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION);
 
 	// personalize
-	mf = new CMenuForwarder(LOCALE_PERSONALIZE_HEAD, true, NULL, &personalize, NULL, CRCInput::RC_yellow , NEUTRINO_ICON_BUTTON_YELLOW, NEUTRINO_ICON_LOCK);
-	mf->setHint(NEUTRINO_ICON_HINT_PERSONALIZE, LOCALE_MENU_HINT_PERSONALIZE);
-	personalize.addItem(MENU_SETTINGS, mf, &show, false, CPersonalizeGui::PERSONALIZE_SHOW_NO);
+	if (!g_settings.easymenu) {
+		mf = new CMenuForwarder(LOCALE_PERSONALIZE_HEAD, true, NULL, &personalize, NULL, CRCInput::RC_yellow , NEUTRINO_ICON_BUTTON_YELLOW, NEUTRINO_ICON_LOCK);
+		mf->setHint(NEUTRINO_ICON_HINT_PERSONALIZE, LOCALE_MENU_HINT_PERSONALIZE);
+		personalize.addItem(MENU_SETTINGS, mf, &show, false, CPersonalizeGui::PERSONALIZE_SHOW_NO);
+	}
 
 	// miscSettings
-	mf = new CMenuForwarder(LOCALE_MAINSETTINGS_MISC, true, NULL, new CMiscMenue() , NULL, CRCInput::RC_blue , NEUTRINO_ICON_BUTTON_BLUE);
-	mf->setHint(NEUTRINO_ICON_HINT_EXTENDED, LOCALE_MENU_HINT_EXTENDED);
-	personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_MISC]);
+	if (!g_settings.easymenu) {
+		mf = new CMenuForwarder(LOCALE_MAINSETTINGS_MISC, true, NULL, new CMiscMenue() , NULL, CRCInput::RC_blue , NEUTRINO_ICON_BUTTON_BLUE);
+		mf->setHint(NEUTRINO_ICON_HINT_EXTENDED, LOCALE_MENU_HINT_EXTENDED);
+		personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_MISC]);
 
- 	//separator
- 	personalize.addSeparator(MENU_SETTINGS);
+		//separator
+		personalize.addSeparator(MENU_SETTINGS);
+	}
 
 	//1st section***************************************************************************************************
 
 	//use only 10 shortcuts (1-9, 0), >9 means -> no shortcut
 
 	// video.
-	mf = new CMenuForwarder(LOCALE_MAINSETTINGS_VIDEO, true, NULL, g_videoSettings);
+	if (g_settings.easymenu)
+		mf = new CMenuForwarder(LOCALE_MAINSETTINGS_VIDEO, true, NULL, g_videoSettings, NULL, CRCInput::RC_green , NEUTRINO_ICON_BUTTON_GREEN);
+	else
+		mf = new CMenuForwarder(LOCALE_MAINSETTINGS_VIDEO, true, NULL, g_videoSettings);
 	mf->setHint(NEUTRINO_ICON_HINT_VIDEO, LOCALE_MENU_HINT_VIDEO);
 	personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_VIDEO]);
 
 	// audio
-	mf = new CMenuForwarder(LOCALE_MAINSETTINGS_AUDIO, true, NULL, new CAudioSetup());
+	if (g_settings.easymenu)
+		mf = new CMenuForwarder(LOCALE_MAINSETTINGS_AUDIO, true, NULL, new CAudioSetup(), NULL, CRCInput::RC_yellow , NEUTRINO_ICON_BUTTON_YELLOW);
+	else
+		mf = new CMenuForwarder(LOCALE_MAINSETTINGS_AUDIO, true, NULL, new CAudioSetup());
 	mf->setHint(NEUTRINO_ICON_HINT_AUDIO, LOCALE_MENU_HINT_AUDIO);
 	personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_AUDIO]);
 
+	// channel list
+	if (g_settings.easymenu) {
+		mf = new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLIST, true, NULL, new CMiscMenue(), "channellist", CRCInput::RC_blue , NEUTRINO_ICON_BUTTON_BLUE);
+		mf->setHint("", LOCALE_MENU_HINT_MISC_CHANNELLIST);
+		personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_MISC]);
+	}
+
 	// parental lock
 	mf = new CMenuForwarder(LOCALE_PARENTALLOCK_PARENTALLOCK, true, NULL, new CParentalSetup());
 	mf->setHint(NEUTRINO_ICON_HINT_PROTECTION, LOCALE_MENU_HINT_PROTECTION);
@@ -310,9 +385,11 @@ void CNeutrinoApp::InitMenuSettings()
 	personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_OSDLANG]);
 
 	// osd
-	mf = new CMenuForwarder(LOCALE_MAINSETTINGS_OSD, true, NULL, new COsdSetup());
-	mf->setHint(NEUTRINO_ICON_HINT_OSD, LOCALE_MENU_HINT_OSD);
-	personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_OSD]);
+	if (!g_settings.easymenu) {
+		mf = new CMenuForwarder(LOCALE_MAINSETTINGS_OSD, true, NULL, new COsdSetup());
+		mf->setHint(NEUTRINO_ICON_HINT_OSD, LOCALE_MENU_HINT_OSD);
+		personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_OSD]);
+	}
 
 	// lcd
 	if (CVFD::getInstance()->has_lcd) {
@@ -328,20 +405,29 @@ void CNeutrinoApp::InitMenuSettings()
 		personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_DRIVES]);
 	}
 
-	// cisettings
-	mf = new CMenuForwarder(LOCALE_CI_SETTINGS, true, NULL, g_CamHandler);
-	mf->setHint(NEUTRINO_ICON_HINT_CI, LOCALE_MENU_HINT_CI);
-	personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_CISETTINGS]);
+	// energy
+	if (g_settings.easymenu) {
+		mf = new CMenuForwarder(LOCALE_MISCSETTINGS_ENERGY, true, NULL, new CMiscMenue(), "energy");
+		mf->setHint("", LOCALE_MENU_HINT_MISC_ENERGY);
+		personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_MISC]);
+	}
 
-	// keybindings
-	mf = new CMenuForwarder(LOCALE_MAINSETTINGS_KEYBINDING, true, NULL, new CKeybindSetup());
-	mf->setHint(NEUTRINO_ICON_HINT_KEYS, LOCALE_MENU_HINT_KEYS);
-	personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_KEYBINDING]);
+	if (!g_settings.easymenu) {
+		// cisettings
+		mf = new CMenuForwarder(LOCALE_CI_SETTINGS, true, NULL, g_CamHandler);
+		mf->setHint(NEUTRINO_ICON_HINT_CI, LOCALE_MENU_HINT_CI);
+		personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_CISETTINGS]);
 
-	// audioplayer/pictureviewer settings
-	mf = new CMenuForwarder(LOCALE_AUDIOPLAYERPICSETTINGS_GENERAL, true, NULL, new CMediaPlayerSetup());
-	mf->setHint(NEUTRINO_ICON_HINT_A_PIC, LOCALE_MENU_HINT_A_PIC);
-	personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_MEDIAPLAYER]);
+		// keybindings
+		mf = new CMenuForwarder(LOCALE_MAINSETTINGS_KEYBINDING, true, NULL, new CKeybindSetup());
+		mf->setHint(NEUTRINO_ICON_HINT_KEYS, LOCALE_MENU_HINT_KEYS);
+		personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_KEYBINDING]);
+
+		// audioplayer/pictureviewer settings
+		mf = new CMenuForwarder(LOCALE_AUDIOPLAYERPICSETTINGS_GENERAL, true, NULL, new CMediaPlayerSetup());
+		mf->setHint(NEUTRINO_ICON_HINT_A_PIC, LOCALE_MENU_HINT_A_PIC);
+		personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_MEDIAPLAYER]);
+	}
 }
 
 
@@ -365,51 +451,71 @@ void CNeutrinoApp::InitMenuService()
 	mf->setHint(NEUTRINO_ICON_HINT_SERVICE_SCAN, LOCALE_MENU_HINT_SERVICE_SCAN);
 	personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_SCANTS]);
 
-	//reload channels
-	mf = new CMenuForwarder(LOCALE_SERVICEMENU_RELOAD    , true, NULL, CScanSetup::getInstance(), "reloadchannels", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
-	mf->setHint(NEUTRINO_ICON_HINT_RELOAD_CHANNELS, LOCALE_MENU_HINT_RELOAD_CHANNELS);
-	personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RELOAD_CHANNELS]);
+	if (!g_settings.easymenu) {
+		//reload channels
+		mf = new CMenuForwarder(LOCALE_SERVICEMENU_RELOAD    , true, NULL, CScanSetup::getInstance(), "reloadchannels", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
+		mf->setHint(NEUTRINO_ICON_HINT_RELOAD_CHANNELS, LOCALE_MENU_HINT_RELOAD_CHANNELS);
+		personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RELOAD_CHANNELS]);
+	}
 
 	//bouquet edit
-	mf = new CMenuForwarder(LOCALE_BOUQUETEDITOR_NAME    , true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
+	if (g_settings.easymenu)
+		mf = new CMenuForwarder(LOCALE_BOUQUETEDITOR_NAME    , true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
+	else
+		mf = new CMenuForwarder(LOCALE_BOUQUETEDITOR_NAME    , true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
+
 	mf->setHint(NEUTRINO_ICON_HINT_BEDIT, LOCALE_MENU_HINT_BEDIT);
 	personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_BOUQUET_EDIT]);
 
 	//channel reset
 	CDataResetNotifier *resetNotifier = new CDataResetNotifier();
-	mf = new CMenuForwarder(LOCALE_RESET_CHANNELS    , true, NULL, resetNotifier, "channels", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
+	if (g_settings.easymenu)
+		mf = new CMenuForwarder(LOCALE_RESET_CHANNELS    , true, NULL, resetNotifier, "channels", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
+	else
+		mf = new CMenuForwarder(LOCALE_RESET_CHANNELS    , true, NULL, resetNotifier, "channels", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
+
 	mf->setHint(NEUTRINO_ICON_HINT_DELETE_CHANNELS, LOCALE_MENU_HINT_DELETE_CHANNELS);
 	personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RESET_CHANNELS]);
-	/* todo: only show if (g_settings.make_removed_list) */
-	mf = new CMenuForwarder(LOCALE_RESET_REMOVED, true, NULL, resetNotifier, "delete_removed");
-	mf->setHint(NEUTRINO_ICON_HINT_DELETE_CHANNELS, LOCALE_MENU_HINT_DELETE_REMOVED);
-	personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RESET_CHANNELS]);
+
+	if (!g_settings.easymenu) {
+		/* todo: only show if (g_settings.make_removed_list) */
+		mf = new CMenuForwarder(LOCALE_RESET_REMOVED, true, NULL, resetNotifier, "delete_removed");
+		mf->setHint(NEUTRINO_ICON_HINT_DELETE_CHANNELS, LOCALE_MENU_HINT_DELETE_REMOVED);
+		personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RESET_CHANNELS]);
+	}
 
 	//separator
-	personalize.addSeparator(MENU_SERVICE);
+	if (!g_settings.easymenu) {
+		personalize.addSeparator(MENU_SERVICE);
 
-	//restart neutrino
-	mf = new CMenuForwarder(LOCALE_SERVICEMENU_RESTART   , true, NULL, this, "restart", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER);
-	mf->setHint(NEUTRINO_ICON_HINT_SOFT_RESTART, LOCALE_MENU_HINT_SOFT_RESTART);
-	personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RESTART]);
+		//restart neutrino
+		mf = new CMenuForwarder(LOCALE_SERVICEMENU_RESTART   , true, NULL, this, "restart", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER);
+		mf->setHint(NEUTRINO_ICON_HINT_SOFT_RESTART, LOCALE_MENU_HINT_SOFT_RESTART);
+		personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RESTART]);
 
-	//reload plugins
-	mf = new CMenuForwarder(LOCALE_SERVICEMENU_GETPLUGINS, true, NULL, this, "reloadplugins");
-	mf->setHint(NEUTRINO_ICON_HINT_RELOAD_CHANNELS, LOCALE_MENU_HINT_RELOAD_PLUGINS);
-	personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RELOAD_PLUGINS]);
+		//reload plugins
+		mf = new CMenuForwarder(LOCALE_SERVICEMENU_GETPLUGINS, true, NULL, this, "reloadplugins");
+		mf->setHint(NEUTRINO_ICON_HINT_RELOAD_CHANNELS, LOCALE_MENU_HINT_RELOAD_PLUGINS);
+		personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RELOAD_PLUGINS]);
 
- 	//separator
-	personalize.addSeparator(MENU_SERVICE);
+		//separator
+		personalize.addSeparator(MENU_SERVICE);
+	}
 
 	//2nd section***************************************************************************************************
 
 	//infomenu
-	mf = new CMenuForwarder(LOCALE_MESSAGEBOX_INFO, true, NULL, new CInfoMenu(), NULL, CRCInput::RC_info, NEUTRINO_ICON_BUTTON_INFO_SMALL);
-	mf->setHint(NEUTRINO_ICON_HINT_INFO, LOCALE_MENU_HINT_INFO);
-	personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_SERVICE_INFOMENU]);
+	if (!g_settings.easymenu) {
+		mf = new CMenuForwarder(LOCALE_MESSAGEBOX_INFO, true, NULL, new CInfoMenu(), NULL, CRCInput::RC_info, NEUTRINO_ICON_BUTTON_INFO_SMALL);
+		mf->setHint(NEUTRINO_ICON_HINT_INFO, LOCALE_MENU_HINT_INFO);
+		personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_SERVICE_INFOMENU]);
+	}
 
 	//firmware update
-	mf = new CMenuForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, new CSoftwareUpdate());
+	if (g_settings.easymenu)
+		mf = new CMenuForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, new CSoftwareUpdate(), NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
+	else
+		mf = new CMenuForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, new CSoftwareUpdate());
 	mf->setHint(NEUTRINO_ICON_HINT_SW_UPDATE, LOCALE_MENU_HINT_SW_UPDATE);
 	personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_SOFTUPDATE]);
 }
diff --git a/src/system/locals.h b/src/system/locals.h
index e39f70cad..b65d33a37 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -749,6 +749,7 @@ typedef enum
 	LOCALE_LEDCONTROLER_ON_LED1,
 	LOCALE_LEDCONTROLER_ON_LED2,
 	LOCALE_MAINMENU_AUDIOPLAYER,
+	LOCALE_MAINMENU_CHANNELS,
 	LOCALE_MAINMENU_CLEARSECTIONSD,
 	LOCALE_MAINMENU_GAMES,
 	LOCALE_MAINMENU_HEAD,
@@ -765,7 +766,9 @@ typedef enum
 	LOCALE_MAINMENU_SERVICE,
 	LOCALE_MAINMENU_SETTINGS,
 	LOCALE_MAINMENU_SHUTDOWN,
+	LOCALE_MAINMENU_SHUTDOWN_MENU,
 	LOCALE_MAINMENU_SLEEPTIMER,
+	LOCALE_MAINMENU_STANDBY,
 	LOCALE_MAINMENU_TVMODE,
 	LOCALE_MAINMENU_TVRADIO_SWITCH,
 	LOCALE_MAINSETTINGS_AUDIO,
@@ -813,6 +816,7 @@ typedef enum
 	LOCALE_MENU_HINT_BACKUP,
 	LOCALE_MENU_HINT_BEDIT,
 	LOCALE_MENU_HINT_CACHE_TXT,
+	LOCALE_MENU_HINT_CHANNELS,
 	LOCALE_MENU_HINT_CEC_MODE,
 	LOCALE_MENU_HINT_CEC_STANDBY,
 	LOCALE_MENU_HINT_CEC_VIEW_ON,
@@ -1011,6 +1015,7 @@ typedef enum
 	LOCALE_MENU_HINT_OSD_PRESET,
 	LOCALE_MENU_HINT_PARENTALLOCK_CHANGEPIN,
 	LOCALE_MENU_HINT_PARENTALLOCK_LOCKAGE,
+	LOCALE_MENU_HINT_PARENTALLOCK_MENU,
 	LOCALE_MENU_HINT_PARENTALLOCK_PROMPT,
 	LOCALE_MENU_HINT_PERSONALIZE,
 	LOCALE_MENU_HINT_PICTUREVIEWER_DEFDIR,
@@ -1139,6 +1144,7 @@ typedef enum
 	LOCALE_MENU_HINT_SETTINGS,
 	LOCALE_MENU_HINT_SHOW_MUTE_ICON,
 	LOCALE_MENU_HINT_SHUTDOWN,
+	LOCALE_MENU_HINT_SHUTDOWN_MENU,
 	LOCALE_MENU_HINT_SHUTDOWN_COUNT,
 	LOCALE_MENU_HINT_SHUTDOWN_RCDELAY,
 	LOCALE_MENU_HINT_SHUTDOWN_REAL,
@@ -1152,6 +1158,7 @@ typedef enum
 	LOCALE_MENU_HINT_SOFTUPDATE_EXPERT_READ,
 	LOCALE_MENU_HINT_SOFTUPDATE_EXPERT_WRITE,
 	LOCALE_MENU_HINT_SOFTUPDATE_SETTINGS,
+	LOCALE_MENU_HINT_STANDBY,
 	LOCALE_MENU_HINT_START_TOSTANDBY,
 	LOCALE_MENU_HINT_STREAMINFO,
 	LOCALE_MENU_HINT_SUBCHANNEL_POS,
@@ -1561,6 +1568,7 @@ typedef enum
 	LOCALE_PARENTALLOCK_LOCKAGE18,
 	LOCALE_PARENTALLOCK_LOCKEDCHANNEL,
 	LOCALE_PARENTALLOCK_LOCKEDPROGRAM,
+	LOCALE_PARENTALLOCK_MENU,
 	LOCALE_PARENTALLOCK_NEVER,
 	LOCALE_PARENTALLOCK_ONSIGNAL,
 	LOCALE_PARENTALLOCK_PARENTALLOCK,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 9a4b964f8..efb40fbdf 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -749,6 +749,7 @@ const char * locale_real_names[] =
 	"ledcontroler.on.led1",
 	"ledcontroler.on.led2",
 	"mainmenu.audioplayer",
+	"mainmenu.channels",
 	"mainmenu.clearsectionsd",
 	"mainmenu.games",
 	"mainmenu.head",
@@ -765,7 +766,9 @@ const char * locale_real_names[] =
 	"mainmenu.service",
 	"mainmenu.settings",
 	"mainmenu.shutdown",
+	"mainmenu.shutdown_menu",
 	"mainmenu.sleeptimer",
+	"mainmenu.standby",
 	"mainmenu.tvmode",
 	"mainmenu.tvradio_switch",
 	"mainsettings.audio",
@@ -813,6 +816,7 @@ const char * locale_real_names[] =
 	"menu.hint_backup",
 	"menu.hint_bedit",
 	"menu.hint_cache_txt",
+	"menu.hint_channels",
 	"menu.hint_cec_mode",
 	"menu.hint_cec_standby",
 	"menu.hint_cec_view_on",
@@ -1011,6 +1015,7 @@ const char * locale_real_names[] =
 	"menu.hint_osd_preset",
 	"menu.hint_parentallock_changepin",
 	"menu.hint_parentallock_lockage",
+	"menu.hint_parentallock_menu",
 	"menu.hint_parentallock_prompt",
 	"menu.hint_personalize",
 	"menu.hint_pictureviewer_defdir",
@@ -1139,6 +1144,7 @@ const char * locale_real_names[] =
 	"menu.hint_settings",
 	"menu.hint_show_mute_icon",
 	"menu.hint_shutdown",
+	"menu.hint_shutdown_menu",
 	"menu.hint_shutdown_count",
 	"menu.hint_shutdown_rcdelay",
 	"menu.hint_shutdown_real",
@@ -1152,6 +1158,7 @@ const char * locale_real_names[] =
 	"menu.hint_softupdate_expert_read",
 	"menu.hint_softupdate_expert_write",
 	"menu.hint_softupdate_settings",
+	"menu.hint_standby",
 	"menu.hint_start_tostandby",
 	"menu.hint_streaminfo",
 	"menu.hint_subchannel_pos",
@@ -1561,6 +1568,7 @@ const char * locale_real_names[] =
 	"parentallock.lockage18",
 	"parentallock.lockedchannel",
 	"parentallock.lockedprogram",
+	"parentallock.menu",
 	"parentallock.never",
 	"parentallock.onsignal",
 	"parentallock.parentallock",
diff --git a/src/system/settings.cpp b/src/system/settings.cpp
index d848aec29..461606d22 100644
--- a/src/system/settings.cpp
+++ b/src/system/settings.cpp
@@ -57,7 +57,7 @@ const struct personalize_settings_t personalize_settings[SNeutrinoSettings::P_SE
 	{"personalize_cisettings_main"		, CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
 	
 	//main menu->settings menu
-	{"personalize_settingsmager"		, CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED},
+	{"personalize_settingsmager"		, CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
 	{"personalize_video"			, CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
 	{"personalize_audio"			, CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
 	{"personalize_network"			, CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
@@ -85,7 +85,7 @@ const struct personalize_settings_t personalize_settings[SNeutrinoSettings::P_SE
 	{"personalize_media_menu"		, CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED},
 	{"personalize_media_audio"		, CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
 	{"personalize_media_intetplay"		, CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
-	{"personalize_media_movieplayer"	, CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED},
+	{"personalize_media_movieplayer"	, CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
 	{"personalize_media_pviewer"		, CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
 	{"personalize_media_upnp"		, CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
 	
diff --git a/src/system/settings.h b/src/system/settings.h
index 1402c8dae..0994ada4a 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -125,6 +125,7 @@ struct SNeutrinoSettings
 	int ci_clock;
 	int ci_ignore_messages;
 	int radiotext_enable;
+	int easymenu;
 	
 	//vcr
 	int vcr_AutoSwitch;

From 6b58f32c4802aef24a1cdfc26a8fbec20ef206cd Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 25 Oct 2013 13:53:36 +0400
Subject: [PATCH 16/73] gui/personalize.cpp: fix memleak, fix warnings

---
 src/gui/personalize.cpp | 5 ++---
 src/gui/personalize.h   | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/gui/personalize.cpp b/src/gui/personalize.cpp
index a7a112988..0d96acc41 100644
--- a/src/gui/personalize.cpp
+++ b/src/gui/personalize.cpp
@@ -290,7 +290,6 @@ int CPersonalizeGui::ShowPersonalizationMenu()
 	CPINChangeWidget *pinChangeWidget = NULL;
 	if (!g_settings.easymenu && show_pin_setup)
 		ShowPinSetup(pMenu, pinChangeWidget);
-	printf("CPersonalizeGui::ShowPinSetup: pinChangeWidget  %x\n", pinChangeWidget);
 
 	int res;
 	if (g_settings.easymenu) {
@@ -307,7 +306,7 @@ int CPersonalizeGui::ShowPersonalizationMenu()
 				const neutrino_msg_t key = (count == 0) ? CRCInput::RC_red :
 					(count == 1) ? CRCInput::RC_green :
 					(count == 2) ? CRCInput::RC_yellow :
-					(count == 3) ? CRCInput::RC_blue : NULL;
+					(count == 3) ? CRCInput::RC_blue : CRCInput::RC_nokey;
 				count++;
 				string 	itm_name = g_Locale->getText(v_item[j].locale_name);
 				itm_name += " ";
@@ -370,7 +369,7 @@ int CPersonalizeGui::ShowPersonalizationMenu()
 }
 
 //init pin setup dialog
-void CPersonalizeGui::ShowPinSetup(CMenuWidget* p_widget, CPINChangeWidget *pin_widget)
+void CPersonalizeGui::ShowPinSetup(CMenuWidget* p_widget, CPINChangeWidget * &pin_widget)
 {
 	pin_widget = new CPINChangeWidget(LOCALE_PERSONALIZE_PINCODE, g_settings.personalize_pincode, 4, LOCALE_PERSONALIZE_PINHINT);
 	
diff --git a/src/gui/personalize.h b/src/gui/personalize.h
index fe34339c4..2ce9b0045 100644
--- a/src/gui/personalize.h
+++ b/src/gui/personalize.h
@@ -164,7 +164,7 @@ class CPersonalizeGui : public CMenuTarget, public CChangeObserver, public CPINP
 		int 	ShowPersonalizationMenu();
 		int 	ShowMenuOptions(const int& menu);
 		void 	ShowHelpPersonalize();
-		void 	ShowPinSetup(CMenuWidget* p_widget, CPINChangeWidget *pin_widget);
+		void 	ShowPinSetup(CMenuWidget* p_widget, CPINChangeWidget * &pin_widget);
 		void 	ShowUserMenu(CMenuWidget* p_widget, std::vector<CUserMenuSetup*> &v_umenu);
 		void 	ShowPluginMenu(CMenuWidget* p_widget);
 		void 	ShowPreverredKeySetup(CMenuWidget* p_widget);

From 067891fe52903d61f3c4dadb7854cfd5bd6d9744 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 25 Oct 2013 14:27:38 +0400
Subject: [PATCH 17/73] move tuner setup to Service menu

---
 data/locale/english.locale |  2 +-
 src/gui/scan_setup.cpp     |  4 ++--
 src/neutrino_menue.cpp     | 25 +++++++++++++++----------
 src/system/settings.cpp    |  1 +
 src/system/settings.h      |  1 +
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/data/locale/english.locale b/data/locale/english.locale
index edf6d0937..b79ddaf9b 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -1113,7 +1113,7 @@ menu.hint_scripts Run scripts
 menu.hint_selected_back Change selected item background color
 menu.hint_selected_text Change selected item text color
 menu.hint_service Tuner setup, service scan,\nbouquet editor, software upgrade
-menu.hint_service_scan Tuner setup, service scan
+menu.hint_service_scan Auto / manual service scan
 menu.hint_settings Configure Neutrino-HD\nNetwork, audio, video, OSD and more
 menu.hint_show_mute_icon Show mute icon, when volume set to 0
 menu.hint_shutdown Put your box in deep standby mode\nNo confirmation
diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index 6f76968b4..a5fe182e7 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -394,13 +394,13 @@ int CScanSetup::showScanMenu()
 	settings->addItem(mc);
 
 	//sat/provider selector
-
+#if 0
 	if(CFEManager::getInstance()->haveSat() || CFEManager::getInstance()->getFrontendCount() > 1) {
 		mf = new CMenuForwarder(LOCALE_SATSETUP_FE_SETUP, allow_start, NULL, this, "setup_frontend", CRCInput::convertDigitToKey(shortcut++));
 		mf->setHint("", LOCALE_MENU_HINT_SCAN_FESETUP);
 		settings->addItem(mf);
 	}
-
+#endif
 	if (CFEManager::getInstance()->haveSat()) {
 		r_system = DVB_S;
 
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index ebb1e7907..c2b7959bb 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -446,23 +446,31 @@ void CNeutrinoApp::InitMenuService()
 
 	//1st section***************************************************************************************************
 
+	CMenuForwarder * mf;
+	// tuner setup
+	if(CFEManager::getInstance()->haveSat() || CFEManager::getInstance()->getFrontendCount() > 1) {
+		mf = new CMenuForwarder(LOCALE_SATSETUP_FE_SETUP, true, NULL, CScanSetup::getInstance(), "setup_frontend", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
+		mf->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_SCAN_FESETUP);
+		personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_TUNER]);
+	}
+
 	// channel scan
-	CMenuForwarder * mf = new CMenuForwarder(LOCALE_SERVICEMENU_SCANTS    , true, NULL, CScanSetup::getInstance(), "", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
+	mf = new CMenuForwarder(LOCALE_SERVICEMENU_SCANTS    , true, NULL, CScanSetup::getInstance(), "", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
 	mf->setHint(NEUTRINO_ICON_HINT_SERVICE_SCAN, LOCALE_MENU_HINT_SERVICE_SCAN);
 	personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_SCANTS]);
 
 	if (!g_settings.easymenu) {
 		//reload channels
-		mf = new CMenuForwarder(LOCALE_SERVICEMENU_RELOAD    , true, NULL, CScanSetup::getInstance(), "reloadchannels", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
+		mf = new CMenuForwarder(LOCALE_SERVICEMENU_RELOAD    , true, NULL, CScanSetup::getInstance(), "reloadchannels", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
 		mf->setHint(NEUTRINO_ICON_HINT_RELOAD_CHANNELS, LOCALE_MENU_HINT_RELOAD_CHANNELS);
 		personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RELOAD_CHANNELS]);
 	}
 
 	//bouquet edit
 	if (g_settings.easymenu)
-		mf = new CMenuForwarder(LOCALE_BOUQUETEDITOR_NAME    , true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
-	else
 		mf = new CMenuForwarder(LOCALE_BOUQUETEDITOR_NAME    , true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
+	else
+		mf = new CMenuForwarder(LOCALE_BOUQUETEDITOR_NAME    , true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
 
 	mf->setHint(NEUTRINO_ICON_HINT_BEDIT, LOCALE_MENU_HINT_BEDIT);
 	personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_BOUQUET_EDIT]);
@@ -470,9 +478,9 @@ void CNeutrinoApp::InitMenuService()
 	//channel reset
 	CDataResetNotifier *resetNotifier = new CDataResetNotifier();
 	if (g_settings.easymenu)
-		mf = new CMenuForwarder(LOCALE_RESET_CHANNELS    , true, NULL, resetNotifier, "channels", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
-	else
 		mf = new CMenuForwarder(LOCALE_RESET_CHANNELS    , true, NULL, resetNotifier, "channels", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
+	else
+		mf = new CMenuForwarder(LOCALE_RESET_CHANNELS    , true, NULL, resetNotifier, "channels");
 
 	mf->setHint(NEUTRINO_ICON_HINT_DELETE_CHANNELS, LOCALE_MENU_HINT_DELETE_CHANNELS);
 	personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RESET_CHANNELS]);
@@ -512,10 +520,7 @@ void CNeutrinoApp::InitMenuService()
 	}
 
 	//firmware update
-	if (g_settings.easymenu)
-		mf = new CMenuForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, new CSoftwareUpdate(), NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
-	else
-		mf = new CMenuForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, new CSoftwareUpdate());
+	mf = new CMenuForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, new CSoftwareUpdate());
 	mf->setHint(NEUTRINO_ICON_HINT_SW_UPDATE, LOCALE_MENU_HINT_SW_UPDATE);
 	personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_SOFTUPDATE]);
 }
diff --git a/src/system/settings.cpp b/src/system/settings.cpp
index 461606d22..437db473f 100644
--- a/src/system/settings.cpp
+++ b/src/system/settings.cpp
@@ -72,6 +72,7 @@ const struct personalize_settings_t personalize_settings[SNeutrinoSettings::P_SE
 	{"personalize_misc"			, CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
 	
 	//main menu->service menu
+	{"personalize_tuner"			, CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
 	{"personalize_scants"			, CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
 	{"personalize_reload_channels"		, CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
 	{"personalize_bouquet_edit"		, CPersonalizeGui::PERSONALIZE_MODE_VISIBLE},
diff --git a/src/system/settings.h b/src/system/settings.h
index 0994ada4a..983d8354f 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -197,6 +197,7 @@ struct SNeutrinoSettings
 		P_MSET_MISC,
 		
 		//service menu
+		P_MSER_TUNER,
 		P_MSER_SCANTS,
 		P_MSER_RELOAD_CHANNELS,
 		P_MSER_BOUQUET_EDIT,

From 15c280b46a98a7c5724c11e86fcd3dff8d95ef22 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 25 Oct 2013 15:49:51 +0400
Subject: [PATCH 18/73] gui/update_menue.cpp: cut update menu for easy mode

---
 src/gui/update_menue.cpp | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/gui/update_menue.cpp b/src/gui/update_menue.cpp
index 0c23ef26b..886382fa6 100644
--- a/src/gui/update_menue.cpp
+++ b/src/gui/update_menue.cpp
@@ -97,28 +97,30 @@ int CSoftwareUpdate::showSoftwareUpdate()
 	update_item->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_CHECK_LOCAL);
 	softUpdate.addItem(update_item);
 
-	//settings
 	CUpdateSettings update_settings(update_item);
-	mf = new CMenuForwarder(LOCALE_FLASHUPDATE_SETTINGS, true, NULL, &update_settings, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
-	mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_SETTINGS);
-	softUpdate.addItem(mf);
-
-	softUpdate.addItem(GenericMenuSeparatorLine);
-
-	//expert-functions
 	CMenuWidget mtdexpert(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, NEUTRINO_ICON_UPDATE, width, MN_WIDGET_ID_MTDEXPERT);
-	showSoftwareUpdateExpert(&mtdexpert); 
-	mf = new CMenuForwarder(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, true, NULL, &mtdexpert, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
-	mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_EXPERT);
-	softUpdate.addItem(mf);
+	//settings
+	if (!g_settings.easymenu) {
+		mf = new CMenuForwarder(LOCALE_FLASHUPDATE_SETTINGS, true, NULL, &update_settings, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
+		mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_SETTINGS);
+		softUpdate.addItem(mf);
+
+		softUpdate.addItem(GenericMenuSeparatorLine);
+
+		//expert-functions
+		showSoftwareUpdateExpert(&mtdexpert); 
+		mf = new CMenuForwarder(LOCALE_FLASHUPDATE_EXPERTFUNCTIONS, true, NULL, &mtdexpert, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
+		mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_EXPERT);
+		softUpdate.addItem(mf);
 
 #ifdef BOXMODEL_APOLLO
-	softUpdate.addItem(GenericMenuSeparatorLine);
+		softUpdate.addItem(GenericMenuSeparatorLine);
 
-	mf = new CMenuForwarder(LOCALE_FLASHUPDATE_CREATEIMAGE_MENU, true, NULL, new CFlashExpertSetup(), NULL, CRCInput::convertDigitToKey(1));
-	mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_CREATEIMAGE_MENU);
-	softUpdate.addItem(mf);
+		mf = new CMenuForwarder(LOCALE_FLASHUPDATE_CREATEIMAGE_MENU, true, NULL, new CFlashExpertSetup(), NULL, CRCInput::convertDigitToKey(1));
+		mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_CREATEIMAGE_MENU);
+		softUpdate.addItem(mf);
 #endif
+	}
 
 	int res = softUpdate.exec (NULL, "");
 	return res;

From c437b8cf6ac09f03d7625c2771a49836bae194d2 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 25 Oct 2013 15:51:34 +0400
Subject: [PATCH 19/73] gui/scan_setup.cpp: fix crashes due to move tuner
 setup; auto-save settings; re-order menu options; should fix satSelect
 memleak

---
 src/gui/scan_setup.cpp | 52 +++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index a5fe182e7..73f1d1adf 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -214,6 +214,8 @@ CScanSetup::CScanSetup(bool wizard_mode)
 	allow_start	= true;
 	if (CFEManager::getInstance()->haveCable())
 		nid = new CIntInput(LOCALE_SATSETUP_CABLE_NID, (int&) scansettings.cable_nid, 5, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE);
+	if (CFEManager::getInstance()->haveSat())
+		satSelect = new CMenuOptionStringChooser(LOCALE_SATSETUP_SATELLITE, scansettings.satName, true, this, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED, true);
 }
 
 CScanSetup* CScanSetup::getInstance()
@@ -230,6 +232,8 @@ CScanSetup* CScanSetup::getInstance()
 
 CScanSetup::~CScanSetup()
 {
+	delete satSelect;
+	delete nid;
 }
 
 int CScanSetup::exec(CMenuTarget* parent, const std::string &actionKey)
@@ -376,6 +380,7 @@ int CScanSetup::showScanMenu()
 	//back
 	settings->addIntroItems(is_wizard ? NONEXISTANT_LOCALE : LOCALE_SERVICEMENU_SCANTS);
 	//----------------------------------------------------------------------
+#if 0
 	//save scan settings
 	mf = new CMenuForwarder(LOCALE_MAINSETTINGS_SAVESETTINGSNOW, true, NULL, this, "save_scansettings", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
 	mf->setHint("", LOCALE_MENU_HINT_SCAN_SAVESETTINGS);
@@ -383,16 +388,7 @@ int CScanSetup::showScanMenu()
 	//----------------------------------------------------------------------
 	settings->addItem(GenericMenuSeparatorLine);
 	//----------------------------------------------------------------------
-	//service select mode
-	mc = new CMenuOptionChooser(LOCALE_ZAPIT_SCANTYPE, (int *)&scansettings.scanType, SCANTS_ZAPIT_SCANTYPE, SCANTS_ZAPIT_SCANTYPE_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++), "", true);
-	mc->setHint("", LOCALE_MENU_HINT_SCAN_SCANTYPE);
-	settings->addItem(mc);
-
-	//bouquet generate mode
-	mc = new CMenuOptionChooser(LOCALE_SCANTS_BOUQUET, (int *)&scansettings.bouquetMode, SCANTS_BOUQUET_OPTIONS, SCANTS_BOUQUET_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++), "", true);
-	mc->setHint("", LOCALE_MENU_HINT_SCAN_BOUQUET);
-	settings->addItem(mc);
-
+#endif
 	//sat/provider selector
 #if 0
 	if(CFEManager::getInstance()->haveSat() || CFEManager::getInstance()->getFrontendCount() > 1) {
@@ -404,9 +400,9 @@ int CScanSetup::showScanMenu()
 	if (CFEManager::getInstance()->haveSat()) {
 		r_system = DVB_S;
 
-		settings->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_SCANTS_PREVERENCES_RECEIVING_SYSTEM));
+		//settings->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_SCANTS_PREVERENCES_RECEIVING_SYSTEM ));
 
-		satSelect = new CMenuOptionStringChooser(LOCALE_SATSETUP_SATELLITE, scansettings.satName, true, this, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED, true);
+		//satSelect = new CMenuOptionStringChooser(LOCALE_SATSETUP_SATELLITE, scansettings.satName, true, this, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED, true);
 		satSelect->setHint("", LOCALE_MENU_HINT_SCAN_SATELLITE);
 
 		satOnOff = new CMenuWidget(LOCALE_SATSETUP_SATELLITE, NEUTRINO_ICON_SETTINGS, width);
@@ -419,30 +415,29 @@ int CScanSetup::showScanMenu()
 		std::string s_capt_part = g_Locale->getText(LOCALE_SATSETUP_SATELLITE);
 		snprintf(autoscan, 64, g_Locale->getText(LOCALE_SATSETUP_AUTO_SCAN), s_capt_part.c_str());
 
-		/* FIXME leak, satSelect added to both auto and manual scan, so one of them cannot be deleted */
 		CMenuWidget * autoScan = new CMenuWidget(LOCALE_SERVICEMENU_SCANTS, NEUTRINO_ICON_SETTINGS, w/*width*/, MN_WIDGET_ID_SCAN_AUTO_SCAN);
 		addScanMenuAutoScan(autoScan);
-		mf = new CMenuForwarderNonLocalized(autoscan, true, NULL, autoScan, "", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
+		mf = new CMenuForwarderNonLocalized(autoscan, true, NULL, autoScan, "", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
 		mf->setHint("", LOCALE_MENU_HINT_SCAN_AUTO);
 		settings->addItem(mf);
 
 		//manual scan
 		CMenuWidget * manualScan = new CMenuWidget(LOCALE_SATSETUP_MANUAL_SCAN, NEUTRINO_ICON_SETTINGS, w/*width*/, MN_WIDGET_ID_SCAN_MANUAL_SCAN);
 		addScanMenuManualScan(manualScan);
-		mf = new CMenuForwarder(LOCALE_SATSETUP_MANUAL_SCAN, true, NULL, manualScan, "", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
+		mf = new CMenuForwarder(LOCALE_SATSETUP_MANUAL_SCAN, true, NULL, manualScan, "", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
 		mf->setHint("", LOCALE_MENU_HINT_SCAN_MANUAL);
 		settings->addItem(mf);
 		//auto scan all
 		CMenuWidget * autoScanAll = new CMenuWidget(LOCALE_SATSETUP_AUTO_SCAN_ALL, NEUTRINO_ICON_SETTINGS, w/*width*/, MN_WIDGET_ID_SCAN_AUTO_SCAN_ALL);
 		addScanMenuAutoScanAll(autoScanAll);
-		fautoScanAll = new CMenuDForwarder(LOCALE_SATSETUP_AUTO_SCAN_ALL, true /*(dmode != NO_DISEQC)*/, NULL, autoScanAll, "", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
+		fautoScanAll = new CMenuDForwarder(LOCALE_SATSETUP_AUTO_SCAN_ALL, true /*(dmode != NO_DISEQC)*/, NULL, autoScanAll, "", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
 		fautoScanAll->setHint("", LOCALE_MENU_HINT_SCAN_AUTOALL);
 		settings->addItem(fautoScanAll);
 #ifdef ENABLE_FASTSCAN
 		//fast scan
 		CMenuWidget * fastScanMenu = new CMenuWidget(LOCALE_SATSETUP_FASTSCAN_HEAD, NEUTRINO_ICON_SETTINGS, w, MN_WIDGET_ID_SCAN_FAST_SCAN);
 		addScanMenuFastScan(fastScanMenu);
-		mf = new CMenuDForwarder(LOCALE_SATSETUP_FASTSCAN_HEAD, true, NULL, fastScanMenu, "", CRCInput::convertDigitToKey(shortcut++));
+		mf = new CMenuDForwarder(LOCALE_SATSETUP_FASTSCAN_HEAD, true, NULL, fastScanMenu, "", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
 		mf->setHint("", LOCALE_MENU_HINT_SCAN_FAST);
 		settings->addItem(mf);
 #endif
@@ -470,32 +465,40 @@ int CScanSetup::showScanMenu()
 		snprintf(autoscan, 64, g_Locale->getText(LOCALE_SATSETUP_AUTO_SCAN), s_capt_part.c_str());
 		bool have_sat = CFEManager::getInstance()->haveSat();
 
-		/* FIXME leak, satSelect added to both auto and manual scan, so one of them cannot be deleted */
 		CMenuWidget * autoScan = new CMenuWidget(LOCALE_SERVICEMENU_SCANTS, NEUTRINO_ICON_SETTINGS, w/*width*/, MN_WIDGET_ID_SCAN_AUTO_SCAN);
 		addScanMenuAutoScan(autoScan);
-		mf = new CMenuForwarderNonLocalized(autoscan, true, NULL, autoScan, "", have_sat ? CRCInput::convertDigitToKey(shortcut++) : CRCInput::RC_green, have_sat ? NULL : NEUTRINO_ICON_BUTTON_GREEN);
+		mf = new CMenuForwarderNonLocalized(autoscan, true, NULL, autoScan, "", have_sat ? CRCInput::convertDigitToKey(shortcut++) : CRCInput::RC_red, have_sat ? NULL : NEUTRINO_ICON_BUTTON_RED);
 		mf->setHint("", LOCALE_MENU_HINT_SCAN_AUTO);
 		settings->addItem(mf);
 
 		//manual scan
 		CMenuWidget * manualScan = new CMenuWidget(LOCALE_SATSETUP_MANUAL_SCAN, NEUTRINO_ICON_SETTINGS, w/*width*/, MN_WIDGET_ID_SCAN_MANUAL_SCAN);
 		addScanMenuManualScan(manualScan);
-		mf = new CMenuForwarder(LOCALE_SATSETUP_MANUAL_SCAN, true, NULL, manualScan, "", have_sat ? CRCInput::convertDigitToKey(shortcut++) : CRCInput::RC_yellow, have_sat ? NULL : NEUTRINO_ICON_BUTTON_YELLOW);
+		mf = new CMenuForwarder(LOCALE_SATSETUP_MANUAL_SCAN, true, NULL, manualScan, "", have_sat ? CRCInput::convertDigitToKey(shortcut++) : CRCInput::RC_green, have_sat ? NULL : NEUTRINO_ICON_BUTTON_GREEN);
 		mf->setHint("", LOCALE_MENU_HINT_SCAN_MANUAL);
 		settings->addItem(mf);
 		//simple cable scan
 		CMenuWidget * cableScan = new CMenuWidget(LOCALE_SATSETUP_CABLE, NEUTRINO_ICON_SETTINGS, w/*width*/, MN_WIDGET_ID_SCAN_CABLE_SCAN);
 		addScanMenuCable(cableScan);
-		CMenuForwarder * fcableScan = new CMenuDForwarder(LOCALE_SATSETUP_CABLE, true, NULL, cableScan, "", have_sat ? CRCInput::convertDigitToKey(shortcut++) : CRCInput::RC_blue, have_sat ? NULL : NEUTRINO_ICON_BUTTON_BLUE);
+		CMenuForwarder * fcableScan = new CMenuDForwarder(LOCALE_SATSETUP_CABLE, true, NULL, cableScan, "", have_sat ? CRCInput::convertDigitToKey(shortcut++) : CRCInput::RC_yellow, have_sat ? NULL : NEUTRINO_ICON_BUTTON_YELLOW);
 		fcableScan->setHint("", LOCALE_MENU_HINT_SCAN_CABLE_SIMPLE);
 		settings->addItem(fcableScan);
 	}
+	settings->addItem(GenericMenuSeparatorLine);
+	//service select mode
+	mc = new CMenuOptionChooser(LOCALE_ZAPIT_SCANTYPE, (int *)&scansettings.scanType, SCANTS_ZAPIT_SCANTYPE, SCANTS_ZAPIT_SCANTYPE_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++), "", true);
+	mc->setHint("", LOCALE_MENU_HINT_SCAN_SCANTYPE);
+	settings->addItem(mc);
+
+	//bouquet generate mode
+	mc = new CMenuOptionChooser(LOCALE_SCANTS_BOUQUET, (int *)&scansettings.bouquetMode, SCANTS_BOUQUET_OPTIONS, SCANTS_BOUQUET_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++), "", true);
+	mc->setHint("", LOCALE_MENU_HINT_SCAN_BOUQUET);
+	settings->addItem(mc);
+
 	int res = settings->exec(NULL, "");
 
-	//delete satSelect;
 	delete satOnOff;
 	delete settings;
-	//delete nid;
 	return res;
 }
 
@@ -599,6 +602,7 @@ int CScanSetup::showScanMenuFrontendSetup()
 		if (live_channel_id && CNeutrinoApp::getInstance()->channelList)
 			CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(live_channel_id, true);
 	}
+	saveScanSetup();
 	return res;
 }
 
@@ -752,9 +756,11 @@ int CScanSetup::showFrontendSetup(int number)
 	feselected = setupMenu->getSelected();
 	msettings.Clear();
 
+#if 0
 	/* add configured satellites to satSelect in case they changed */
 	if (fe->isSat())
 		fillSatSelect(satSelect);
+#endif
 
 	delete setupMenu;
 	linkfe = NULL;

From 7bf76aad3dc6c87dd26e8e7d13330f9ded2162a5 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 25 Oct 2013 16:17:55 +0400
Subject: [PATCH 20/73] gui/scan_setup.cpp: fix broken zapit config for
 frontend setup

---
 src/gui/scan_setup.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index 73f1d1adf..9c189f600 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -524,6 +524,7 @@ int CScanSetup::showScanMenuFrontendSetup()
 
 	fe_restart = false;
 
+	CZapit::getInstance()->GetConfig(zapitCfg);
 	CMenuWidget * setupMenu = new CMenuWidget(LOCALE_SATSETUP_FE_SETUP, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_SCAN_FE_SETUP);
 	setupMenu->addIntroItems();
 

From dd509ef0c27bb4172a01d84a5f97702746869e65 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 25 Oct 2013 16:41:03 +0400
Subject: [PATCH 21/73] gui/miscsettings_menu.cpp: add video.h header

---
 src/gui/miscsettings_menu.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp
index 60d24aa7f..28e6474f0 100644
--- a/src/gui/miscsettings_menu.cpp
+++ b/src/gui/miscsettings_menu.cpp
@@ -54,6 +54,7 @@
 #include <eitd/sectionsd.h>
 
 #include <cs_api.h>
+#include <video.h>
 
 //#define ONE_KEY_PLUGIN
 

From 36e20a8535ca9287223a71dc3ba0d25c3646a78c Mon Sep 17 00:00:00 2001
From: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: Fri, 25 Oct 2013 12:13:22 +0200
Subject: [PATCH 22/73] Update deutsch.locale an fix sort order in
 english.locale

---
 data/locale/deutsch.locale | 16 ++++++++++++----
 data/locale/english.locale |  4 ++--
 src/system/locals.h        |  4 ++--
 src/system/locals_intern.h |  4 ++--
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 449b71794..0e3fd2c88 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -722,6 +722,7 @@ ledcontroler.on.all LED1 & LED2 an
 ledcontroler.on.led1 LED1 an
 ledcontroler.on.led2 LED2 an
 mainmenu.audioplayer Audioplayer
+mainmenu.channels Kanalliste
 mainmenu.clearsectionsd Lösche EPG Cache
 mainmenu.games Spiele
 mainmenu.head Hauptmenü
@@ -735,10 +736,12 @@ mainmenu.recording Aufnehmen
 mainmenu.recording_start Start
 mainmenu.recording_stop Stopp
 mainmenu.scripts Skripte
-mainmenu.service Service
-mainmenu.settings Einstellungen
+mainmenu.service Service Einstellungen
+mainmenu.settings System Einstellungen
 mainmenu.shutdown Ausschalten
+mainmenu.shutdown_menu Ausschalt Optionen
 mainmenu.sleeptimer SleepTimer
+mainmenu.standby Standby
 mainmenu.tvmode TV-Modus
 mainmenu.tvradio_switch TV-Radio Umschaltung
 mainsettings.audio Audio
@@ -796,6 +799,7 @@ menu.hint_channellist_extended Bei aktivierter Funktion wird vor dem Sendernamen
 menu.hint_channellist_fonts Ändern Sie die Schriftgrößen in der Kanalliste
 menu.hint_channellist_foot Definiert, welche Informationen im unteren Sendungsfenster angezeigt werden sollen
 menu.hint_channellist_setup Wählen Sie die Anzeigeoptionen für die Kanalliste
+menu.hint_channels Kanalliste öffnen
 menu.hint_ci Conditional-Access-Menü zum Einrichten Ihres CI-Moduls oder der eingebetteten Conax-Karte
 menu.hint_colors Konfigurieren Sie die Menü-Farben
 menu.hint_content_back Ändern Sie die Hintergrundfarbe für den Fensterinhalt
@@ -984,6 +988,7 @@ menu.hint_osd_language Wählen Sie ihre Menü-Sprache
 menu.hint_osd_preset Wählen Sie zwischen Röhren-TV (CRT) oder Flachbildschirm (LCD)
 menu.hint_parentallock_changepin Geben Sie den 4-stelligen PIN-Code ein, der dann ggf. abgefragt wird
 menu.hint_parentallock_lockage Legen Sie fest, bei welcher Altersklasse die Abfrage der PIN erfolgt
+menu.hint_parentallock_menu Menüs mit PIN Code sichern
 menu.hint_parentallock_prompt Legen Sie fest, wann die Eingabe einer PIN erfolgen soll
 menu.hint_personalize Personalisieren Sie ihre Menüs und konfigurieren Sie ihre Benutzermenüs
 menu.hint_pictureviewer_defdir Wählen Sie das Startverzeichnis für den Bildbetrachter
@@ -1108,11 +1113,12 @@ menu.hint_scripts Shell-Skripte ausführen
 menu.hint_selected_back Ändern Sie die Hintergrundfarbe für ausgewählte Fensterinhalte
 menu.hint_selected_text Ändern Sie die Textfarbe für ausgewählte Fensterinhalte
 menu.hint_service Sendersuchlauf, Bouquet-Verwaltung, Software-Aktualisierung und mehr
-menu.hint_service_scan Tuner-Einstellungen und Service-Suchlauf
+menu.hint_service_scan Automatischer / manueller Service Suchlauf
 menu.hint_settings Konfigurieren von Neutrino-HD,\nNetzwerk, Video, Audio, OSD und mehr
 menu.hint_show_mute_icon Definiert, ob bei einem Lautstärkewert von 0 das Stumm-Symbol eingeblendet werden soll
 menu.hint_shutdown Setzen Sie Ihre Box in den Standby-Modus oder schalten Sie die Box komplett aus
 menu.hint_shutdown_count Die Zeit zum Herunterfahren in den Deep-Standby, wenn die Box im Standby-Modus ist
+menu.hint_shutdown_menu Versetzen des Receivers in den Standby Modus, ausschalten des Receivers, setzen des Sleep Timers
 menu.hint_shutdown_rcdelay Aktiviert den Deep-Standby, wenn die Power-Taste länger als 1 Sekunde betätigt wird
 menu.hint_shutdown_real Aktiviert den Standby-Modus. Ist diese Option deaktiviert, fährt die Box in den Deep-Standby
 menu.hint_sleeptimer Zeitschaltuhr auf Ihrer Box aktivieren\nDie Box fährt dann in den Standby-Modus
@@ -1125,6 +1131,7 @@ menu.hint_softupdate_expert Einzelne Partitionen aus dem Flash lesen bzw. in den
 menu.hint_softupdate_expert_read Einzelne Partitionen (U-Boot, Splash, Kernel, SystemFS) aus dem Flash lesen
 menu.hint_softupdate_expert_write Einzelne Partitionen (Splash, Kernel, SystemFS) in den Flash schreiben
 menu.hint_softupdate_settings Das lokale Update-Verzeichnis und die Konfigurationsdatei festlegen
+menu.hint_standby Receiver in den Standby Modus versetzen
 menu.hint_start_tostandby Aktiviert den Standby-Modus direkt nach dem Starten der Box
 menu.hint_streaminfo Aktuelle Sender-Informationen über PIDs, SNR-Verhältnis, Bitrate und mehr
 menu.hint_subchannel_pos Wählen Sie die Anzeigeposition der Unterkanäle aus
@@ -1317,7 +1324,7 @@ moviebrowser.foot_options Optionen
 moviebrowser.foot_play Film starten
 moviebrowser.foot_refresh Liste neu laden
 moviebrowser.foot_sort Sortieren:
-moviebrowser.head TS Filmarchiv (eigene Aufnahmen)
+moviebrowser.head Meine Aufnahmen
 moviebrowser.head_filter Filme nach Kategorie filtern:
 moviebrowser.head_playlist Zuletzt gesehen:
 moviebrowser.head_recordlist Zuletzt aufgenommen:
@@ -1534,6 +1541,7 @@ parentallock.lockage16 ab 16 Jahren sperren
 parentallock.lockage18 ab 18 Jahren sperren
 parentallock.lockedchannel Vorgesperrter Sender...
 parentallock.lockedprogram Gesperrtes Programm (FSK ab %d)
+parentallock.menu Sicherheits Menü
 parentallock.never Nie
 parentallock.onsignal Bei gesendeter Vorsperre
 parentallock.parentallock Jugendschutz
diff --git a/data/locale/english.locale b/data/locale/english.locale
index b79ddaf9b..5672644fd 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -789,7 +789,6 @@ menu.hint_backlight Configure buttons backlight
 menu.hint_backup Backup configs and channels to selected dir
 menu.hint_bedit Edit favorites and bouquets
 menu.hint_cache_txt Start teletext caching after channel switch
-menu.hint_channels Open channel list
 menu.hint_cec_mode CEC mode
 menu.hint_cec_standby CEC standby
 menu.hint_cec_view_on CEC view ON
@@ -800,6 +799,7 @@ menu.hint_channellist_extended Show current event progress bar
 menu.hint_channellist_fonts Change channel list font sizes
 menu.hint_channellist_foot Show additional information\nin bottom box
 menu.hint_channellist_setup Configure channel list GUI options
+menu.hint_channels Open channel list
 menu.hint_ci Conditional access menu\nto setup your CI CAM or embeded Conax card
 menu.hint_colors Configure GUI colors
 menu.hint_content_back Change GUI window background color
@@ -1117,8 +1117,8 @@ menu.hint_service_scan Auto / manual service scan
 menu.hint_settings Configure Neutrino-HD\nNetwork, audio, video, OSD and more
 menu.hint_show_mute_icon Show mute icon, when volume set to 0
 menu.hint_shutdown Put your box in deep standby mode\nNo confirmation
-menu.hint_shutdown_menu Put you receiver in sleep or deep standby mode, set sleep timer
 menu.hint_shutdown_count Time to put box in deep-standby\nfrom soft-standby mode
+menu.hint_shutdown_menu Put you receiver in sleep or deep standby mode, set sleep timer
 menu.hint_shutdown_rcdelay Enable deep-standby, if power button\npressed more than 1 second
 menu.hint_shutdown_real Enable soft-standby mode\nIf disabled, power button put box to deep-standby
 menu.hint_sleeptimer Set timer to put your box\nin sleep mode
diff --git a/src/system/locals.h b/src/system/locals.h
index b65d33a37..decffe1dd 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -816,7 +816,6 @@ typedef enum
 	LOCALE_MENU_HINT_BACKUP,
 	LOCALE_MENU_HINT_BEDIT,
 	LOCALE_MENU_HINT_CACHE_TXT,
-	LOCALE_MENU_HINT_CHANNELS,
 	LOCALE_MENU_HINT_CEC_MODE,
 	LOCALE_MENU_HINT_CEC_STANDBY,
 	LOCALE_MENU_HINT_CEC_VIEW_ON,
@@ -827,6 +826,7 @@ typedef enum
 	LOCALE_MENU_HINT_CHANNELLIST_FONTS,
 	LOCALE_MENU_HINT_CHANNELLIST_FOOT,
 	LOCALE_MENU_HINT_CHANNELLIST_SETUP,
+	LOCALE_MENU_HINT_CHANNELS,
 	LOCALE_MENU_HINT_CI,
 	LOCALE_MENU_HINT_COLORS,
 	LOCALE_MENU_HINT_CONTENT_BACK,
@@ -1144,8 +1144,8 @@ typedef enum
 	LOCALE_MENU_HINT_SETTINGS,
 	LOCALE_MENU_HINT_SHOW_MUTE_ICON,
 	LOCALE_MENU_HINT_SHUTDOWN,
-	LOCALE_MENU_HINT_SHUTDOWN_MENU,
 	LOCALE_MENU_HINT_SHUTDOWN_COUNT,
+	LOCALE_MENU_HINT_SHUTDOWN_MENU,
 	LOCALE_MENU_HINT_SHUTDOWN_RCDELAY,
 	LOCALE_MENU_HINT_SHUTDOWN_REAL,
 	LOCALE_MENU_HINT_SLEEPTIMER,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index efb40fbdf..9295f71b8 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -816,7 +816,6 @@ const char * locale_real_names[] =
 	"menu.hint_backup",
 	"menu.hint_bedit",
 	"menu.hint_cache_txt",
-	"menu.hint_channels",
 	"menu.hint_cec_mode",
 	"menu.hint_cec_standby",
 	"menu.hint_cec_view_on",
@@ -827,6 +826,7 @@ const char * locale_real_names[] =
 	"menu.hint_channellist_fonts",
 	"menu.hint_channellist_foot",
 	"menu.hint_channellist_setup",
+	"menu.hint_channels",
 	"menu.hint_ci",
 	"menu.hint_colors",
 	"menu.hint_content_back",
@@ -1144,8 +1144,8 @@ const char * locale_real_names[] =
 	"menu.hint_settings",
 	"menu.hint_show_mute_icon",
 	"menu.hint_shutdown",
-	"menu.hint_shutdown_menu",
 	"menu.hint_shutdown_count",
+	"menu.hint_shutdown_menu",
 	"menu.hint_shutdown_rcdelay",
 	"menu.hint_shutdown_real",
 	"menu.hint_sleeptimer",

From ca22cb9241928741c34e13dc3fd0bf75303191f3 Mon Sep 17 00:00:00 2001
From: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: Sat, 26 Oct 2013 12:36:18 +0200
Subject: [PATCH 23/73] CTextBox: Fix background paint

---
 src/gui/widget/textbox.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/widget/textbox.cpp b/src/gui/widget/textbox.cpp
index 63049953c..2791fc211 100644
--- a/src/gui/widget/textbox.cpp
+++ b/src/gui/widget/textbox.cpp
@@ -554,7 +554,7 @@ void CTextBox::refreshText(void)
 			delete[] m_bgpixbuf;
 			m_bgpixbuf = NULL;
 		}
-		if (has_changed){
+		if (m_old_cText != m_cText || has_changed){
 			//TRACE("[CTextBox] %s paint bg %d\r\n", __FUNCTION__, __LINE__);
 			frameBuffer->paintBoxRel(ax, ay, dx, dy,  m_textBackgroundColor, m_nBgRadius, m_nBgRadiusType);
 		}

From 6dd1da06280bc8edc3b632ef57c8cddaa0f4fca1 Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Fri, 25 Oct 2013 17:21:00 +0200
Subject: [PATCH 24/73] revert 6ee7fac1a5cfb884fa72b36a8c10104bab6a5253

Was bad idea to rename. Other Classes can also inherit this. See CMenuTarget
---
 src/driver/framebuffer.cpp                    |  2 +-
 src/driver/volume.cpp                         |  2 +-
 src/gui/audiomute.cpp                         |  6 ++---
 src/gui/audioplayer.cpp                       |  8 +++---
 src/gui/bedit/bouqueteditor_channels.cpp      |  2 +-
 src/gui/channellist.cpp                       |  2 +-
 src/gui/components/cc_base.cpp                |  6 ++---
 src/gui/components/cc_base.h                  |  4 +--
 src/gui/components/cc_detailsline.cpp         |  2 +-
 src/gui/components/cc_frm.cpp                 |  6 ++---
 src/gui/components/cc_frm.h                   |  2 +-
 src/gui/components/cc_frm_signalbars.h        |  2 +-
 src/gui/components/cc_item.cpp                |  2 +-
 src/gui/components/cc_item_infobox.cpp        |  2 +-
 src/gui/components/cc_item_picture.cpp        |  2 +-
 src/gui/components/cc_item_picture.h          |  2 +-
 src/gui/components/cc_item_text.cpp           |  4 +--
 src/gui/components/cc_item_text.h             |  2 +-
 src/gui/components/cc_item_tvpic.cpp          |  4 +--
 src/gui/components/cc_item_tvpic.h            |  2 +-
 .../components/unmaintained/cc_item_box.cpp   |  8 +++---
 src/gui/imageinfo.cpp                         |  2 +-
 src/gui/infoviewer.cpp                        |  2 +-
 src/gui/streaminfo2.cpp                       |  2 +-
 src/gui/test_menu.cpp                         | 26 +++++++++----------
 src/gui/widget/menue.cpp                      | 12 ++++-----
 26 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp
index 6fd4a23da..ca6649176 100644
--- a/src/driver/framebuffer.cpp
+++ b/src/driver/framebuffer.cpp
@@ -1924,7 +1924,7 @@ bool CFrameBuffer::_checkFbArea(int _x, int _y, int _dx, int _dy, bool prev)
 //					waitForIdle();
 					fb_no_check = true;
 					if (prev)
-						CAudioMute::getInstance()->hideCC(true);
+						CAudioMute::getInstance()->hide(true);
 					else
 						CAudioMute::getInstance()->paint();
 					fb_no_check = false;
diff --git a/src/driver/volume.cpp b/src/driver/volume.cpp
index 7172a46bf..73167b4b6 100644
--- a/src/driver/volume.cpp
+++ b/src/driver/volume.cpp
@@ -177,7 +177,7 @@ bool CVolume::hideVolscale()
 	bool ret = false;
 	if (volscale) {
 		if (volscale->isPainted()) {
-			volscale->hideCC();
+			volscale->hide();
 			ret = true;
 		}
 		delete volscale;
diff --git a/src/gui/audiomute.cpp b/src/gui/audiomute.cpp
index bf614b668..f5309230e 100644
--- a/src/gui/audiomute.cpp
+++ b/src/gui/audiomute.cpp
@@ -67,7 +67,7 @@ void CAudioMute::AudioMute(int newValue, bool isEvent)
 			if (do_paint_mute_icon)
 			{
 				frameBuffer->fbNoCheck(true);
-				hideCC(true);
+				this->hide(true);
 				frameBuffer->fbNoCheck(false);
 			}
 			frameBuffer->setFbArea(CFrameBuffer::FB_PAINTAREA_MUTEICON1);
@@ -84,7 +84,7 @@ void CAudioMute::AudioMute(int newValue, bool isEvent)
 		}
 		else {
 			if (do_paint_mute_icon)
-				hideCC(true);
+				this->hide(true);
 			frameBuffer->setFbArea(CFrameBuffer::FB_PAINTAREA_MUTEICON1);
 		}
 		frameBuffer->fbNoCheck(false);
@@ -112,7 +112,7 @@ void CAudioMute::enableMuteIcon(bool enable)
 	}
 	else {
 		if (neutrino->isMuted())
-			hideCC(true);
+			this->hide(true);
 		frameBuffer->doPaintMuteIcon(false);
 		do_paint_mute_icon = false;
 	}
diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index 5d5d80bb2..e202f6d88 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -1904,11 +1904,11 @@ void CAudioPlayerGui::paintItemID3DetailsLine (int pos)
 
 	// clear details line
 	if (dline != NULL)
-		dline->hideCC();
+		dline->hide();
 
 	// clear infobox
 	if (ibox != NULL)
-		ibox->hideCC();
+		ibox->hide();
 
 	// paint Line if detail info (and not valid list pos) and info box
 	if (!m_playlist.empty() && (pos >= 0))
@@ -1956,9 +1956,9 @@ void CAudioPlayerGui::paintItemID3DetailsLine (int pos)
 	else
 	{
 		if (dline != NULL)
-			dline->hideCC();
+			dline->hide();
 		if (ibox != NULL)
-			ibox->hideCC();
+			ibox->hide();
 	}
 }
 //------------------------------------------------------------------------
diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp
index d6f4a45fe..9b87c2a3b 100644
--- a/src/gui/bedit/bouqueteditor_channels.cpp
+++ b/src/gui/bedit/bouqueteditor_channels.cpp
@@ -242,7 +242,7 @@ void CBEChannelWidget::initItem2DetailsLine (int pos, int /*ch_index*/)
 			ibox = new CComponentsInfoBox();
 
 		if (ibox->isPainted())
-			ibox->hideCC(CC_SAVE_SCREEN_NO);
+			ibox->hide(CC_SAVE_SCREEN_NO);
 		
 		ibox->setDimensionsAll(x, ypos2, width, info_height);
 		ibox->setFrameThickness(2);
diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 2e310c8eb..6864276e2 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -132,7 +132,7 @@ CChannelList::~CChannelList()
 	if (headerClock) {
 		headerClock->Stop();
 		if (headerClock->isPainted())
-			headerClock->hideCC();
+			headerClock->hide();
 		if (headerClock->isClockRun())
 			headerClock->stopThread();
 		delete headerClock;
diff --git a/src/gui/components/cc_base.cpp b/src/gui/components/cc_base.cpp
index d0f15b3ae..94693d13e 100644
--- a/src/gui/components/cc_base.cpp
+++ b/src/gui/components/cc_base.cpp
@@ -42,7 +42,7 @@ CComponents::CComponents()
 
 CComponents::~CComponents()
 {
- 	hideCC();
+ 	hide();
 	clearSavedScreen();
 	clear();
 }
@@ -172,11 +172,11 @@ inline fb_pixel_t* CComponents::getScreen(int ax, int ay, int dx, int dy)
 }
 
 //restore screen from buffer
-inline void CComponents::hideCC()
+inline void CComponents::hide()
 {
 	for(size_t i =0; i< v_fbdata.size() ;i++) {
 		if (v_fbdata[i].pixbuf != NULL){
-			frameBuffer->waitForIdle("CComponents::hideCC()");
+			frameBuffer->waitForIdle("CComponents::hide()");
 			frameBuffer->RestoreScreen(v_fbdata[i].x, v_fbdata[i].y, v_fbdata[i].dx, v_fbdata[i].dy, v_fbdata[i].pixbuf);
 			delete[] v_fbdata[i].pixbuf;
 			v_fbdata[i].pixbuf = NULL;
diff --git a/src/gui/components/cc_base.h b/src/gui/components/cc_base.h
index 9df3755ed..32605b04d 100644
--- a/src/gui/components/cc_base.h
+++ b/src/gui/components/cc_base.h
@@ -197,7 +197,7 @@ class CComponents
 		inline virtual void setShadowOnOff(bool has_shadow){shadow = has_shadow;};
 
 		///hide current screen and restore background
-		virtual void hideCC();
+		virtual void hide();
 		///erase current screen without restore of background, it's similar to paintBackgroundBoxRel() from CFrameBuffer
 		virtual void kill();
 		///returns paint mode, true=item was painted
@@ -251,7 +251,7 @@ class CComponentsItem : public CComponents
 		///abstract: paint item, arg: do_save_bg see paintInit() above
 		virtual void paint(bool do_save_bg = CC_SAVE_SCREEN_YES) = 0;
 		///hides item, arg: no_restore see hideCCItem() above
-		virtual void hideCC(bool no_restore = false);
+		virtual void hide(bool no_restore = false);
 
 		///get the current item type, see attribute cc_item_type above
 		virtual int getItemType();
diff --git a/src/gui/components/cc_detailsline.cpp b/src/gui/components/cc_detailsline.cpp
index 6aea94d5b..646b0292e 100644
--- a/src/gui/components/cc_detailsline.cpp
+++ b/src/gui/components/cc_detailsline.cpp
@@ -80,7 +80,7 @@ void CComponentsDetailLine::initVarDline()
 
 CComponentsDetailLine::~CComponentsDetailLine()
 {
-	hideCC(); //restore background
+	hide(); //restore background
 	clear();
 }
 
diff --git a/src/gui/components/cc_frm.cpp b/src/gui/components/cc_frm.cpp
index fc43b7256..1d2420a56 100644
--- a/src/gui/components/cc_frm.cpp
+++ b/src/gui/components/cc_frm.cpp
@@ -366,14 +366,14 @@ void CComponentsForm::paintCCItems()
 	}
 }
 
-void CComponentsForm::hideCC(bool no_restore)
+void CComponentsForm::hide(bool no_restore)
 {
 	// hack: ensure hiding of minitv during hide of forms and inherited classes,
 	// because the handling of minitv items are different to other item types
-	// and need an explizit call of hideCC()
+	// and need an explizit call of hide()
 	for(size_t i=0; i<v_cc_items.size(); i++) {
 		if (v_cc_items[i]->getItemType() == CC_ITEMTYPE_PIP){
-			v_cc_items[i]->hideCC();
+			v_cc_items[i]->hide();
 			break;
 		}
 	}
diff --git a/src/gui/components/cc_frm.h b/src/gui/components/cc_frm.h
index e03bba024..e00ae07d0 100644
--- a/src/gui/components/cc_frm.h
+++ b/src/gui/components/cc_frm.h
@@ -54,7 +54,7 @@ class CComponentsForm : public CComponentsItem
 		virtual ~CComponentsForm();
 		
 		void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
-		void hideCC(bool no_restore = false);
+		void hide(bool no_restore = false);
 		virtual void addCCItem(CComponentsItem* cc_Item);
 		virtual void insertCCItem(const uint& cc_item_id, CComponentsItem* cc_Item);
 		virtual void removeCCItem(const uint& cc_item_id);
diff --git a/src/gui/components/cc_frm_signalbars.h b/src/gui/components/cc_frm_signalbars.h
index bb2dae298..460270f12 100644
--- a/src/gui/components/cc_frm_signalbars.h
+++ b/src/gui/components/cc_frm_signalbars.h
@@ -225,7 +225,7 @@ void CSampleClass::hide ()
 	//other code;
 
 //Note: not required if signalbox is added to a CC-Container!
-	signalbox->hideCC(true);
+	signalbox->hide(true);
 	delete signalbox;
 	signalbox = NULL;
 
diff --git a/src/gui/components/cc_item.cpp b/src/gui/components/cc_item.cpp
index 6b970ba76..07d621e96 100644
--- a/src/gui/components/cc_item.cpp
+++ b/src/gui/components/cc_item.cpp
@@ -124,7 +124,7 @@ void CComponentsItem::hideCCItem(bool no_restore)
 	}
 }
 
-void CComponentsItem::hideCC(bool no_restore)
+void CComponentsItem::hide(bool no_restore)
 {
 	hideCCItem(no_restore);
 }
diff --git a/src/gui/components/cc_item_infobox.cpp b/src/gui/components/cc_item_infobox.cpp
index 7bc64f8c8..0ea76cd27 100644
--- a/src/gui/components/cc_item_infobox.cpp
+++ b/src/gui/components/cc_item_infobox.cpp
@@ -66,7 +66,7 @@ CComponentsInfoBox::CComponentsInfoBox(const int x_pos, const int y_pos, const i
 
 CComponentsInfoBox::~CComponentsInfoBox()
 {
-	hideCC();
+	hide();
 	clearSavedScreen();
 	clearCCText();
 	delete pic;
diff --git a/src/gui/components/cc_item_picture.cpp b/src/gui/components/cc_item_picture.cpp
index 700d60609..6ccc94de6 100644
--- a/src/gui/components/cc_item_picture.cpp
+++ b/src/gui/components/cc_item_picture.cpp
@@ -201,7 +201,7 @@ void CComponentsPicture::paint(bool do_save_bg)
 	paintPicture();
 }
 
-void CComponentsPicture::hideCC(bool no_restore)
+void CComponentsPicture::hide(bool no_restore)
 {
 	hideCCItem(no_restore);
 	pic_painted = false;
diff --git a/src/gui/components/cc_item_picture.h b/src/gui/components/cc_item_picture.h
index a0958ebe9..dd45ec449 100644
--- a/src/gui/components/cc_item_picture.h
+++ b/src/gui/components/cc_item_picture.h
@@ -83,7 +83,7 @@ class CComponentsPicture : public CComponentsItem
 		
 		virtual inline bool isPicPainted(){return pic_painted;};
 		virtual void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
-		virtual void hideCC(bool no_restore = false);
+		virtual void hide(bool no_restore = false);
 		virtual inline void getPictureSize(int *pwidth, int *pheight){*pwidth=pic_width; *pheight=pic_height;};
 		virtual void setMaxWidth(const int w_max){pic_max_w = w_max;};
 		virtual void setMaxHeight(const int h_max){pic_max_h = h_max;};
diff --git a/src/gui/components/cc_item_text.cpp b/src/gui/components/cc_item_text.cpp
index 845f25b02..dbd94b4c2 100644
--- a/src/gui/components/cc_item_text.cpp
+++ b/src/gui/components/cc_item_text.cpp
@@ -77,7 +77,7 @@ CComponentsText::CComponentsText(	const int x_pos, const int y_pos, const int w,
 
 CComponentsText::~CComponentsText()
 {
-	hideCC();
+	hide();
 	clearSavedScreen();
 	clearCCText();
 	clear();
@@ -246,7 +246,7 @@ void CComponentsText::paint(bool do_save_bg)
 	paintText(do_save_bg);
 }
 
-void CComponentsText::hideCC(bool no_restore)
+void CComponentsText::hide(bool no_restore)
 {
 	if (ct_textbox)
 		ct_textbox->hide();
diff --git a/src/gui/components/cc_item_text.h b/src/gui/components/cc_item_text.h
index 4d56beb63..2661641eb 100644
--- a/src/gui/components/cc_item_text.h
+++ b/src/gui/components/cc_item_text.h
@@ -92,7 +92,7 @@ class CComponentsText : public CComponentsItem, public CBox
 
 		///default members to paint a text box and hide painted text
 		///hide textbox
-		void hideCC(bool no_restore = false);
+		void hide(bool no_restore = false);
 		///paint text box, parameter do_save_bg: default = true, causes fill of backckrond pixel buffer
 		void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
 
diff --git a/src/gui/components/cc_item_tvpic.cpp b/src/gui/components/cc_item_tvpic.cpp
index 4d53815c0..9dc397c48 100644
--- a/src/gui/components/cc_item_tvpic.cpp
+++ b/src/gui/components/cc_item_tvpic.cpp
@@ -66,7 +66,7 @@ CComponentsPIP::CComponentsPIP(	const int x_pos, const int y_pos, const int perc
 
 CComponentsPIP::~CComponentsPIP()
 {
- 	hideCC();
+ 	hide();
  	videoDecoder->Pig(-1, -1, -1, -1);
  	clearSavedScreen();
  	clear();
@@ -99,7 +99,7 @@ void CComponentsPIP::paint(bool do_save_bg)
 }
 
 
-void CComponentsPIP::hideCC(bool no_restore)
+void CComponentsPIP::hide(bool no_restore)
 {
 	videoDecoder->Pig(-1, -1, -1, -1);
 	hideCCItem(no_restore);
diff --git a/src/gui/components/cc_item_tvpic.h b/src/gui/components/cc_item_tvpic.h
index 695bae27e..fef5a23b8 100644
--- a/src/gui/components/cc_item_tvpic.h
+++ b/src/gui/components/cc_item_tvpic.h
@@ -63,7 +63,7 @@ class CComponentsPIP : public CComponentsItem
 		///show tv box
 		void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
 		///remove tv box from screen
-		void hideCC(bool no_restore = false);
+		void hide(bool no_restore = false);
 };
 
 #endif
diff --git a/src/gui/components/unmaintained/cc_item_box.cpp b/src/gui/components/unmaintained/cc_item_box.cpp
index fe6f036ae..29140ebc2 100644
--- a/src/gui/components/unmaintained/cc_item_box.cpp
+++ b/src/gui/components/unmaintained/cc_item_box.cpp
@@ -43,7 +43,7 @@ CComponentsItemBox::CComponentsItemBox()
 
 CComponentsItemBox::~CComponentsItemBox()
 {
-	hideCC();
+	hide();
 	clearElements();
 	clearSavedScreen();
 	clear();
@@ -213,7 +213,7 @@ void CComponentsItemBox::refreshElement(size_t index, const std::string& element
 		case CC_ITEMBOX_PICTURE:
 			pic = static_cast<CComponentsPicture*>(v_element_data[index].handler1);
 			if (pic != NULL) {
-				pic->hideCC();
+				pic->hide();
 				delete pic;
 			}
 			v_element_data[index].element	= element;
@@ -240,7 +240,7 @@ void CComponentsItemBox::paintImage(size_t index, bool newElement)
 
 	if ((newElement) || (pic == NULL)) {
 		if (pic != NULL) {
-			pic->hideCC();
+			pic->hide();
 			delete pic;
 			pic = NULL;
 		}
@@ -287,7 +287,7 @@ void CComponentsItemBox::paintText(size_t index, bool newElement)
 
 	if ((newElement) || (textbox == NULL)) {
 		if (textbox != NULL) {
-			textbox->hideCC();
+			textbox->hide();
 			delete textbox;
 			textbox = NULL;
 		}
diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp
index 93067dafc..7254860ca 100644
--- a/src/gui/imageinfo.cpp
+++ b/src/gui/imageinfo.cpp
@@ -355,7 +355,7 @@ void CImageInfo::hide()
 {
 	printf("[CImageInfo]   [%s - %d] hide...\n", __FUNCTION__, __LINE__);
 	if (cc_win){
-		cc_win->hideCC();
+		cc_win->hide();
 		Clean();
 	}
 }
diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index 18ac9fa6b..f0f91474c 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -1824,7 +1824,7 @@ void CInfoViewer::killInfobarText()
 {
 	if (infobar_txt){
 		if (infobar_txt->isPainted())
-			infobar_txt->hideCC();
+			infobar_txt->hide();
 		delete infobar_txt;
 	}
 	infobar_txt = NULL;
diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp
index 0045970fe..fe2df548d 100644
--- a/src/gui/streaminfo2.cpp
+++ b/src/gui/streaminfo2.cpp
@@ -246,7 +246,7 @@ int CStreamInfo2::doSignalStrengthLoop ()
 
 void CStreamInfo2::hide ()
 {
-	pip->hideCC(true);
+	pip->hide(true);
 	frameBuffer->paintBackgroundBoxRel (0, 0, max_width, max_height);
 }
 
diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp
index 2815c66a3..106a8c5a4 100644
--- a/src/gui/test_menu.cpp
+++ b/src/gui/test_menu.cpp
@@ -369,7 +369,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 				button->setSelected(true);
 			button->paint();
 		}else			
-			button->hideCC();
+			button->hide();
 		
 		return res;
 	}
@@ -380,7 +380,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		if (!circle->isPainted())	
 			circle->paint();
 		else
-			circle->hideCC();			
+			circle->hide();			
 		return res;
 	}
 	else if (actionKey == "square"){
@@ -390,7 +390,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		if (!sq->isPainted())
 			sq->paint();
 		else
-			sq->hideCC();
+			sq->hide();
 		return res;
 	}
 	else if (actionKey == "picture"){
@@ -400,7 +400,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		if (!pic->isPainted() && !pic->isPicPainted())
 			pic->paint();
 		else
-			pic->hideCC();
+			pic->hide();
 		return res;
 	}
 	else if (actionKey == "channellogo"){
@@ -410,7 +410,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		if (!chnl_pic->isPainted() && !chnl_pic->isPicPainted())
 			chnl_pic->paint();
 		else
-			chnl_pic->hideCC();
+			chnl_pic->hide();
 		return res;
 	}
 	else if (actionKey == "form"){
@@ -445,7 +445,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		
 		
 		if (form->isPainted()) {
-			form->hideCC();
+			form->hide();
 			delete form;
 			form = NULL;
 		}
@@ -460,7 +460,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
  		txt->setText("This is a text for testing textbox", CTextBox::NO_AUTO_LINEBREAK);
 
 		if (txt->isPainted())
-			txt->hideCC();
+			txt->hide();
 		else
 			txt->paint();
 		return res;
@@ -504,7 +504,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		if (!header->isPainted())
 			header->paint();
 		else
-			header->hideCC();
+			header->hide();
 		return res;
 	}
 	else if (actionKey == "footer"){
@@ -520,7 +520,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		if (!footer->isPainted())
 			footer->paint();
 		else
-			footer->hideCC();
+			footer->hide();
 		return res;
 	}
 	else if (actionKey == "iconform"){
@@ -553,7 +553,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 // 		iconform->setIconAlign(CComponentsIconForm::CC_ICONS_FRM_ALIGN_RIGHT);
 		
 		if (iconform->isPainted())
-			iconform->hideCC();
+			iconform->hide();
 		else{
 			iconform->paint();
 		}
@@ -591,7 +591,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		if (!window->isPainted())
 			window->paint();
 		else
-			window->hideCC();
+			window->hide();
 
 		return res;
 	}
@@ -609,7 +609,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		}
 		else {
 			if (clock_r->Stop()){
-				clock_r->hideCC();
+				clock_r->hide();
 				delete clock_r;
 				clock_r = NULL;
 				return menu_return::RETURN_EXIT_ALL;
@@ -625,7 +625,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		if (!clock->isPainted())
 			clock->paint();
 		else {
-			clock->hideCC();
+			clock->hide();
 			delete clock;
 			clock = NULL;
 		}
diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index bb25d72bd..940c4a1fa 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -1083,7 +1083,7 @@ void CMenuWidget::paintHint(int pos)
 			if (savescreen)
 				details_line->restore();
 			else
-				details_line->hideCC();
+				details_line->hide();
 		}
 		/* clear info box */
 		if (info_box != NULL) {
@@ -1091,7 +1091,7 @@ void CMenuWidget::paintHint(int pos)
 				if (savescreen)
 					info_box->restore();
 				else
-					info_box->hideCC();
+					info_box->hide();
 			}
 		}
 		hint_painted = false;
@@ -1099,10 +1099,10 @@ void CMenuWidget::paintHint(int pos)
 	if (hint_painted) {
 		/* clear detailsline line */
 		if (details_line)
-			details_line->hideCC();
+			details_line->hide();
 		/* clear info box */
 		if ((info_box) && (pos == -1))
-			info_box->hideCC(true);
+			info_box->hide(true);
 		hint_painted = false;
 	}
 	if (pos < 0)
@@ -1116,11 +1116,11 @@ void CMenuWidget::paintHint(int pos)
 			if (savescreen)
 #endif
 		if (info_box)
-			info_box->hideCC(false);	
+			info_box->hide(false);	
 #if 0				
 				info_box->restore();
 			else
-				info_box->hideCC();
+				info_box->hide();
 		}
 #endif
 		return;

From 5c7e926a86dcb0a4aac65e27e8eee493defcc5cc Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Sun, 27 Oct 2013 14:43:19 +0100
Subject: [PATCH 25/73] CTextBox: fix repaint of background of textbox on
 scroll and changed text

suplement to ca22cb9241928741c34e13dc3fd0bf75303191f3
---
 src/gui/widget/textbox.cpp | 64 +++++++++++++++++++++++++-------------
 src/gui/widget/textbox.h   |  3 ++
 2 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/src/gui/widget/textbox.cpp b/src/gui/widget/textbox.cpp
index 2791fc211..71a0ae94a 100644
--- a/src/gui/widget/textbox.cpp
+++ b/src/gui/widget/textbox.cpp
@@ -168,6 +168,8 @@ void CTextBox::initVar(void)
 	m_cFrame.iWidth		= m_old_dx = MIN_WINDOW_WIDTH;
 	m_cFrame.iY		= m_old_y = g_settings.screen_StartY + ((g_settings.screen_EndY - g_settings.screen_StartY - MIN_WINDOW_HEIGHT) >>1);
 	m_cFrame.iHeight	= m_old_dy = MIN_WINDOW_HEIGHT;
+	
+	m_has_scrolled		= false;
 
 	m_nMaxHeight 		= MAX_WINDOW_HEIGHT;
 	m_nMaxWidth 		= MAX_WINDOW_WIDTH;
@@ -495,15 +497,45 @@ void CTextBox::refreshScroll(void)
 				m_cFrameScrollRel.iY + m_nCurrentPage * marker_size+m_cFrame.iY,
 				m_cFrameScrollRel.iWidth - 2*SCROLL_MARKER_BORDER,
 				marker_size, COL_MENUCONTENT_PLUS_3);
+		m_has_scrolled = true;
 	}
 	else
 	{
 		frameBuffer->paintBoxRel(m_cFrameScrollRel.iX+m_cFrame.iX, m_cFrameScrollRel.iY+m_cFrame.iY,
 				m_cFrameScrollRel.iWidth, m_cFrameScrollRel.iHeight,
 				m_textBackgroundColor);
+		m_has_scrolled = false;
 	}
 }
 
+//evaluate comparsion between old and current properties WITHOUT text contents, return true if found changes
+//first init is done in initVar() and reinit done in reInitToCompareVar()
+bool CTextBox::hasChanged(int* x, int* y, int* dx, int* dy)
+{
+	if (	   m_old_x != *x
+		|| m_old_y != *y
+		|| m_old_dx != *dx
+		|| m_old_dy != *dy
+		|| m_old_textBackgroundColor != m_textBackgroundColor
+		|| m_old_nBgRadius != m_nBgRadius
+		|| m_old_nBgRadiusType != m_nBgRadiusType
+		|| m_old_nMode != m_nMode){
+			return true;
+	}
+	return false;
+}
+void CTextBox::reInitToCompareVar(int* x, int* y, int* dx, int* dy)
+{
+	m_old_x = *x;
+	m_old_y = *y;
+	m_old_dx = *dx;
+	m_old_dy = *dy;
+	m_old_textBackgroundColor = m_textBackgroundColor;
+	m_old_nBgRadius = m_nBgRadius;
+	m_old_nBgRadiusType = m_nBgRadiusType;
+	m_old_nMode = m_nMode;
+}
+
 void CTextBox::refreshText(void)
 {
 	//TRACE("[CTextBox] %s Line %d\r\n", __FUNCTION__, __LINE__);
@@ -518,17 +550,10 @@ void CTextBox::refreshText(void)
 	int ay = /*m_cFrameTextRel.iY+*/m_cFrame.iY;
 	int dx = m_cFrameTextRel.iWidth;
 	int dy = m_cFrameTextRel.iHeight;
-	bool has_changed = false;
-
-	//evaluate comparsion properties
-	if (m_old_x != ax || m_old_y != ay || m_old_dx != dx || m_old_dy != dy ||
-		m_old_textBackgroundColor != m_textBackgroundColor ||
-		m_old_nBgRadius != m_nBgRadius ||m_old_nBgRadiusType != m_nBgRadiusType ||
-		m_nNrOfPages > 1 ||
-		m_old_nMode != m_nMode){
-			has_changed = true;
-	}
-
+	
+	//find changes
+	bool has_changed = hasChanged(&ax, &ay, &dx, &dy);
+	
 	//destroy pixel buffer on changed property values
 	if (has_changed){
 		if (m_bgpixbuf){
@@ -548,38 +573,33 @@ void CTextBox::refreshText(void)
 	}
 
 	//Paint Text Background
+	bool allow_paint_bg = (m_old_cText != m_cText || has_changed || m_has_scrolled);
 	if (m_nPaintBackground){
 		if (m_bgpixbuf){
 			//TRACE("[CTextBox] %s destroy bg %d\r\n", __FUNCTION__, __LINE__);
 			delete[] m_bgpixbuf;
 			m_bgpixbuf = NULL;
 		}
-		if (m_old_cText != m_cText || has_changed){
+		if (allow_paint_bg){
 			//TRACE("[CTextBox] %s paint bg %d\r\n", __FUNCTION__, __LINE__);
 			frameBuffer->paintBoxRel(ax, ay, dx, dy,  m_textBackgroundColor, m_nBgRadius, m_nBgRadiusType);
 		}
 	}
 	else{
 		if (m_bgpixbuf){
-			if (m_old_cText != m_cText || has_changed){
+			if (allow_paint_bg){
 				//TRACE("[CTextBox] %s restore bg %d\r\n", __FUNCTION__, __LINE__);
 				frameBuffer->RestoreScreen(ax, ay, dx, dy, m_bgpixbuf);
 			}
 		}
 	}
 
-	//save current comparsion properties
+	//save and reinit current comparsion properties
 	if (has_changed){
 		//TRACE("[CTextBox] %s set current values %d\r\n", __FUNCTION__, __LINE__);
-		m_old_x = ax;
-		m_old_y = ay;
-		m_old_dx = dx;
-		m_old_dy = dy;
-		m_old_textBackgroundColor = m_textBackgroundColor;
-		m_old_nBgRadius = m_nBgRadius;
-		m_old_nBgRadiusType = m_nBgRadiusType;
-		m_old_nMode = m_nMode;
+		reInitToCompareVar(&ax, &ay, &dx, &dy);
 	}
+	m_has_scrolled = false;
 
 	if( m_nNrOfLines <= 0)
 		return;
diff --git a/src/gui/widget/textbox.h b/src/gui/widget/textbox.h
index fc3edb57e..044c82b55 100644
--- a/src/gui/widget/textbox.h
+++ b/src/gui/widget/textbox.h
@@ -115,12 +115,15 @@ class CTextBox
 		void reSizeMainFrameWidth(int maxTextWidth);
 		void reSizeMainFrameHeight(int maxTextHeight);
 		int  getFontTextHeight();
+		bool hasChanged(int* x, int* y, int* dx, int* dy);
+		void reInitToCompareVar(int* x, int* y, int* dx, int* dy);
 
 		/* Variables */
 		std::string m_cText, m_old_cText;
 		std::vector<std::string> m_cLineArray;
 
 		int m_old_x, m_old_y, m_old_dx, m_old_dy, m_old_nBgRadius, m_old_nBgRadiusType, m_old_nMode;
+		bool m_has_scrolled;
 		fb_pixel_t m_old_textBackgroundColor;
 
 		bool m_showTextFrame;

From f9764e5e6542b29f4c914717f402093216b8a268 Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Sun, 27 Oct 2013 17:12:30 +0100
Subject: [PATCH 26/73] CMovieBrowser: force paint of background after show of
 movieinfo

Movieinfo text background was transparent after closed info message box and
reset of text causes a repaint.
see also:
http://www.dbox2world.net/board293-cst-coolstream/board314-cst-coolstream-development/p158375-next-cc-branch/#post158375
---
 src/gui/moviebrowser.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index 39c57743f..b29a57253 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -1242,12 +1242,14 @@ std::string CMovieBrowser::getScreenshotName(std::string movie)
 void CMovieBrowser::refreshMovieInfo(void)
 {
 //TRACE("[mb]->refreshMovieInfo m_vMovieInfo.size %d\n", m_vMovieInfo.size());
+	//reset text before new init, m_pcInfo must be clean
 	std::string emptytext = " ";
-	if(m_vMovieInfo.empty()) {
-		if(m_pcInfo != NULL)
-			m_pcInfo->setText(&emptytext);
+	if(m_pcInfo)
+		m_pcInfo->setText(&emptytext);
+	
+	if(m_vMovieInfo.empty())
 		return;
-	}
+	
 	if (m_movieSelectionHandler == NULL) {
 		// There is no selected element, clear LCD
 		m_pcInfo->setText(&emptytext);

From 96b7d939cad490fb223fa0106fe0c42b1459ae4c Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 30 Oct 2013 18:44:48 +0400
Subject: [PATCH 27/73] gui/scan_setup.cpp: add tuner type to tuner select menu

---
 src/gui/scan_setup.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index 9c189f600..f9f563b64 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -537,7 +537,11 @@ int CScanSetup::showScanMenuFrontendSetup()
 		snprintf(tmp, sizeof(tmp), "config_frontend%d", i);
 
 		char name[255];
-		snprintf(name, sizeof(name), "%s %d: %s", g_Locale->getText(LOCALE_SATSETUP_FE_SETUP), i+1, fe->getInfo()->name);
+		if (fe->getInfo()->type == FE_QPSK)
+		snprintf(name, sizeof(name), "%s %d: %s %s", g_Locale->getText(LOCALE_SATSETUP_FE_SETUP), i+1,
+				fe->getInfo()->type == FE_QPSK ? g_Locale->getText(LOCALE_SCANTS_ACTSATELLITE)
+				: g_Locale->getText(LOCALE_SCANTS_ACTCABLE),
+				fe->getInfo()->name);
 
 		const char * icon = NULL;
 		neutrino_msg_t key = CRCInput::RC_nokey;

From 53b351fc2b3aee388832c3a8ff1ff3d6c90418a0 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 30 Oct 2013 18:49:11 +0400
Subject: [PATCH 28/73] gui/update_menue.cpp: re-enable 'save current software'
 for easymenu mode

---
 src/gui/update_menue.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/gui/update_menue.cpp b/src/gui/update_menue.cpp
index 886382fa6..73162ae4e 100644
--- a/src/gui/update_menue.cpp
+++ b/src/gui/update_menue.cpp
@@ -77,9 +77,9 @@ int CSoftwareUpdate::showSoftwareUpdate()
 {
 	CMenuForwarder * mf;
 	CMenuWidget softUpdate(LOCALE_MAINMENU_SERVICE, NEUTRINO_ICON_UPDATE, width, MN_WIDGET_ID_SOFTWAREUPDATE);
-	
+
 	softUpdate.addIntroItems(LOCALE_SERVICEMENU_UPDATE);
-	
+
 	//flashing
 	CFlashUpdate flash;
 #if 0
@@ -113,14 +113,17 @@ int CSoftwareUpdate::showSoftwareUpdate()
 		mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_EXPERT);
 		softUpdate.addItem(mf);
 
-#ifdef BOXMODEL_APOLLO
-		softUpdate.addItem(GenericMenuSeparatorLine);
-
-		mf = new CMenuForwarder(LOCALE_FLASHUPDATE_CREATEIMAGE_MENU, true, NULL, new CFlashExpertSetup(), NULL, CRCInput::convertDigitToKey(1));
-		mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_CREATEIMAGE_MENU);
-		softUpdate.addItem(mf);
-#endif
 	}
+#ifdef BOXMODEL_APOLLO
+	softUpdate.addItem(GenericMenuSeparatorLine);
+
+	if (g_settings.easymenu)
+		mf = new CMenuForwarder(LOCALE_FLASHUPDATE_CREATEIMAGE_MENU, true, NULL, new CFlashExpertSetup(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
+	else
+		mf = new CMenuForwarder(LOCALE_FLASHUPDATE_CREATEIMAGE_MENU, true, NULL, new CFlashExpertSetup(), NULL, CRCInput::convertDigitToKey(1));
+	mf->setHint("", LOCALE_MENU_HINT_SOFTUPDATE_CREATEIMAGE_MENU);
+	softUpdate.addItem(mf);
+#endif
 
 	int res = softUpdate.exec (NULL, "");
 	return res;

From 74ba3ca979a3937124dee93478b8bc39aa9e3dd7 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 30 Oct 2013 18:49:41 +0400
Subject: [PATCH 29/73] gui/videosettings.cpp: add font scaling for easymenu
 mode

---
 src/gui/videosettings.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp
index 7f072c6ef..90a6fe3d3 100644
--- a/src/gui/videosettings.cpp
+++ b/src/gui/videosettings.cpp
@@ -43,6 +43,7 @@
 #include <gui/widget/stringinput.h>
 #include <gui/widget/hintbox.h>
 #include <gui/widget/messagebox.h>
+#include <gui/osd_setup.h>
 
 #include <driver/screen_max.h>
 
@@ -329,6 +330,11 @@ int CVideoSettings::showVideoSetup()
 	pipsetup->setHint("", LOCALE_MENU_HINT_VIDEO_PIP);
 	videosetup->addItem(pipsetup);
 #endif
+	if (g_settings.easymenu) {
+		CMenuForwarder * mf = new CMenuDForwarder(LOCALE_FONTMENU_SCALING, true, NULL, new COsdSetup(), "font_scaling");
+		mf->setHint("", LOCALE_MENU_HINT_FONT_SCALING);
+		videosetup->addItem(mf);
+	}
 	int res = videosetup->exec(NULL, "");
 	selected = videosetup->getSelected();
 	delete videosetup;

From b52d36ff54a8352ded8209d8ff7033a0800ab181 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 30 Oct 2013 18:53:04 +0400
Subject: [PATCH 30/73] zapit/src/femanager.cpp: set all cable tuner default
 mode to independent

---
 src/zapit/src/femanager.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/zapit/src/femanager.cpp b/src/zapit/src/femanager.cpp
index 7bbbb3be3..b8841c50a 100644
--- a/src/zapit/src/femanager.cpp
+++ b/src/zapit/src/femanager.cpp
@@ -226,7 +226,7 @@ bool CFEManager::loadSettings()
 		}
 	}
 	bool fsat = true;
-	bool fcable = true;
+	//bool fcable = true;
 	for(fe_map_iterator_t it = femap.begin(); it != femap.end(); it++) {
 		CFrontend * fe = it->second;
 		frontend_config_t & fe_config = fe->getConfig();
@@ -250,12 +250,15 @@ bool CFEManager::loadSettings()
 			def_mode = def_mode0;
 		}
 		if (fe->isCable()) {
+#if 0
 			if (fcable) {
 				fcable = false;
 				def_mode = def_mode0;
 			}
 			if (def_mode > CFrontend::FE_MODE_INDEPENDENT)
 				def_mode = CFrontend::FE_MODE_INDEPENDENT;
+#endif
+			def_mode = CFrontend::FE_MODE_INDEPENDENT;
 		}
 		if (femap.size() == 1)
 			def_mode = CFrontend::FE_MODE_INDEPENDENT;

From 694714b73e949f41bf5366caadec3c35103057a3 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Thu, 31 Oct 2013 11:48:04 +0400
Subject: [PATCH 31/73] gui/record_setup.cpp: fix double-blue key

---
 src/gui/record_setup.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/record_setup.cpp b/src/gui/record_setup.cpp
index 125ea8ec5..9e69ca291 100644
--- a/src/gui/record_setup.cpp
+++ b/src/gui/record_setup.cpp
@@ -210,9 +210,9 @@ int CRecordSetup::showRecordSetup()
 
 	CMenuOptionChooser* channel_rec_dir;
 	if (g_settings.easymenu)
-		channel_rec_dir = new CMenuOptionChooser(LOCALE_RECORDINGMENU_SAVE_IN_CHANNELDIR, &g_settings.recording_save_in_channeldir, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
-	else
 		channel_rec_dir = new CMenuOptionChooser(LOCALE_RECORDINGMENU_SAVE_IN_CHANNELDIR, &g_settings.recording_save_in_channeldir, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
+	else
+		channel_rec_dir = new CMenuOptionChooser(LOCALE_RECORDINGMENU_SAVE_IN_CHANNELDIR, &g_settings.recording_save_in_channeldir, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
 	channel_rec_dir->setHint("", LOCALE_MENU_HINT_RECORD_CHANDIR);
 	recordingSettings->addItem(channel_rec_dir);
 

From de8262f03f47473af6bfd0476cfa5109e5323e8e Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 1 Nov 2013 09:08:58 +0400
Subject: [PATCH 32/73] gui/scan_setup.cpp: fix
 96b7d939cad490fb223fa0106fe0c42b1459ae4c, do not show tuner name in tuner
 select menu for easymenu mode

---
 src/gui/scan_setup.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index f9f563b64..dae229838 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -537,11 +537,15 @@ int CScanSetup::showScanMenuFrontendSetup()
 		snprintf(tmp, sizeof(tmp), "config_frontend%d", i);
 
 		char name[255];
-		if (fe->getInfo()->type == FE_QPSK)
-		snprintf(name, sizeof(name), "%s %d: %s %s", g_Locale->getText(LOCALE_SATSETUP_FE_SETUP), i+1,
-				fe->getInfo()->type == FE_QPSK ? g_Locale->getText(LOCALE_SCANTS_ACTSATELLITE)
-				: g_Locale->getText(LOCALE_SCANTS_ACTCABLE),
-				fe->getInfo()->name);
+		if (g_settings.easymenu)
+			snprintf(name, sizeof(name), "%s %d: %s", g_Locale->getText(LOCALE_SATSETUP_FE_SETUP), i+1,
+					fe->getInfo()->type == FE_QPSK ? g_Locale->getText(LOCALE_SCANTS_ACTSATELLITE)
+					: g_Locale->getText(LOCALE_SCANTS_ACTCABLE));
+		else
+			snprintf(name, sizeof(name), "%s %d: %s %s", g_Locale->getText(LOCALE_SATSETUP_FE_SETUP), i+1,
+					fe->getInfo()->type == FE_QPSK ? g_Locale->getText(LOCALE_SCANTS_ACTSATELLITE)
+					: g_Locale->getText(LOCALE_SCANTS_ACTCABLE),
+					fe->getInfo()->name);
 
 		const char * icon = NULL;
 		neutrino_msg_t key = CRCInput::RC_nokey;

From 9a40a9f740af8ac6e75bad012852cbdb54f24dd9 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 1 Nov 2013 16:33:21 +0400
Subject: [PATCH 33/73] lib/libiw: add libiw from wireless tools v29, and
 wrapper to scan wlan networks

---
 lib/libiw/Makefile.am |    6 +
 lib/libiw/iwlib.c     | 3214 +++++++++++++++++++++++++++++++++++++++++
 lib/libiw/iwlib.h     |  600 ++++++++
 lib/libiw/iwscan.cpp  |  294 ++++
 lib/libiw/iwscan.h    |   36 +
 lib/libiw/wireless.h  | 1120 ++++++++++++++
 6 files changed, 5270 insertions(+)
 create mode 100644 lib/libiw/Makefile.am
 create mode 100644 lib/libiw/iwlib.c
 create mode 100644 lib/libiw/iwlib.h
 create mode 100644 lib/libiw/iwscan.cpp
 create mode 100644 lib/libiw/iwscan.h
 create mode 100644 lib/libiw/wireless.h

diff --git a/lib/libiw/Makefile.am b/lib/libiw/Makefile.am
new file mode 100644
index 000000000..65576e20d
--- /dev/null
+++ b/lib/libiw/Makefile.am
@@ -0,0 +1,6 @@
+noinst_LIBRARIES = libiw.a
+
+AM_CXXFLAGS = -I$(top_builddir) -fno-rtti -fno-exceptions
+
+libiw_a_SOURCES = iwlib.c iwscan.cpp
+
diff --git a/lib/libiw/iwlib.c b/lib/libiw/iwlib.c
new file mode 100644
index 000000000..0afa8c1e4
--- /dev/null
+++ b/lib/libiw/iwlib.c
@@ -0,0 +1,3214 @@
+/*
+ *	Wireless Tools
+ *
+ *		Jean II - HPLB 97->99 - HPL 99->07
+ *
+ * Common subroutines to all the wireless tools...
+ *
+ * This file is released under the GPL license.
+ *     Copyright (c) 1997-2007 Jean Tourrilhes <jt@hpl.hp.com>
+ */
+
+/***************************** INCLUDES *****************************/
+
+#include "iwlib.h"		/* Header */
+
+/************************ CONSTANTS & MACROS ************************/
+
+/*
+ * Constants fof WE-9->15
+ */
+#define IW15_MAX_FREQUENCIES	16
+#define IW15_MAX_BITRATES	8
+#define IW15_MAX_TXPOWER	8
+#define IW15_MAX_ENCODING_SIZES	8
+#define IW15_MAX_SPY		8
+#define IW15_MAX_AP		8
+
+/****************************** TYPES ******************************/
+
+/*
+ *	Struct iw_range up to WE-15
+ */
+struct	iw15_range
+{
+	__u32		throughput;
+	__u32		min_nwid;
+	__u32		max_nwid;
+	__u16		num_channels;
+	__u8		num_frequency;
+	struct iw_freq	freq[IW15_MAX_FREQUENCIES];
+	__s32		sensitivity;
+	struct iw_quality	max_qual;
+	__u8		num_bitrates;
+	__s32		bitrate[IW15_MAX_BITRATES];
+	__s32		min_rts;
+	__s32		max_rts;
+	__s32		min_frag;
+	__s32		max_frag;
+	__s32		min_pmp;
+	__s32		max_pmp;
+	__s32		min_pmt;
+	__s32		max_pmt;
+	__u16		pmp_flags;
+	__u16		pmt_flags;
+	__u16		pm_capa;
+	__u16		encoding_size[IW15_MAX_ENCODING_SIZES];
+	__u8		num_encoding_sizes;
+	__u8		max_encoding_tokens;
+	__u16		txpower_capa;
+	__u8		num_txpower;
+	__s32		txpower[IW15_MAX_TXPOWER];
+	__u8		we_version_compiled;
+	__u8		we_version_source;
+	__u16		retry_capa;
+	__u16		retry_flags;
+	__u16		r_time_flags;
+	__s32		min_retry;
+	__s32		max_retry;
+	__s32		min_r_time;
+	__s32		max_r_time;
+	struct iw_quality	avg_qual;
+};
+
+/*
+ * Union for all the versions of iwrange.
+ * Fortunately, I mostly only add fields at the end, and big-bang
+ * reorganisations are few.
+ */
+union	iw_range_raw
+{
+	struct iw15_range	range15;	/* WE 9->15 */
+	struct iw_range		range;		/* WE 16->current */
+};
+
+/*
+ * Offsets in iw_range struct
+ */
+#define iwr15_off(f)	( ((char *) &(((struct iw15_range *) NULL)->f)) - \
+			  (char *) NULL)
+#define iwr_off(f)	( ((char *) &(((struct iw_range *) NULL)->f)) - \
+			  (char *) NULL)
+
+/**************************** VARIABLES ****************************/
+
+/* Modes as human readable strings */
+const char * const iw_operation_mode[] = { "Auto",
+					"Ad-Hoc",
+					"Managed",
+					"Master",
+					"Repeater",
+					"Secondary",
+					"Monitor",
+					"Unknown/bug" };
+
+/* Modulations as human readable strings */
+const struct iw_modul_descr	iw_modul_list[] = {
+  /* Start with aggregate types, so that they display first */
+  { IW_MODUL_11AG, "11ag",
+    "IEEE 802.11a + 802.11g (2.4 & 5 GHz, up to 54 Mb/s)" },
+  { IW_MODUL_11AB, "11ab",
+    "IEEE 802.11a + 802.11b (2.4 & 5 GHz, up to 54 Mb/s)" },
+  { IW_MODUL_11G, "11g", "IEEE 802.11g (2.4 GHz, up to 54 Mb/s)" },
+  { IW_MODUL_11A, "11a", "IEEE 802.11a (5 GHz, up to 54 Mb/s)" },
+  { IW_MODUL_11B, "11b", "IEEE 802.11b (2.4 GHz, up to 11 Mb/s)" },
+
+  /* Proprietary aggregates */
+  { IW_MODUL_TURBO | IW_MODUL_11A, "turboa",
+    "Atheros turbo mode at 5 GHz (up to 108 Mb/s)" },
+  { IW_MODUL_TURBO | IW_MODUL_11G, "turbog",
+    "Atheros turbo mode at 2.4 GHz (up to 108 Mb/s)" },
+  { IW_MODUL_PBCC | IW_MODUL_11B, "11+",
+    "TI 802.11+ (2.4 GHz, up to 22 Mb/s)" },
+
+  /* Individual modulations */
+  { IW_MODUL_OFDM_G, "OFDMg",
+    "802.11g higher rates, OFDM at 2.4 GHz (up to 54 Mb/s)" },
+  { IW_MODUL_OFDM_A, "OFDMa", "802.11a, OFDM at 5 GHz (up to 54 Mb/s)" },
+  { IW_MODUL_CCK, "CCK", "802.11b higher rates (2.4 GHz, up to 11 Mb/s)" },
+  { IW_MODUL_DS, "DS", "802.11 Direct Sequence (2.4 GHz, up to 2 Mb/s)" },
+  { IW_MODUL_FH, "FH", "802.11 Frequency Hopping (2,4 GHz, up to 2 Mb/s)" },
+
+  /* Proprietary modulations */
+  { IW_MODUL_TURBO, "turbo",
+    "Atheros turbo mode, channel bonding (up to 108 Mb/s)" },
+  { IW_MODUL_PBCC, "PBCC",
+    "TI 802.11+ higher rates (2.4 GHz, up to 22 Mb/s)" },
+  { IW_MODUL_CUSTOM, "custom",
+    "Driver specific modulation (check driver documentation)" },
+};
+
+/* Disable runtime version warning in iw_get_range_info() */
+int	iw_ignore_version = 0;
+
+/************************ SOCKET SUBROUTINES *************************/
+
+/*------------------------------------------------------------------*/
+/*
+ * Open a socket.
+ * Depending on the protocol present, open the right socket. The socket
+ * will allow us to talk to the driver.
+ */
+int
+iw_sockets_open(void)
+{
+  static const int families[] = {
+    AF_INET, AF_IPX, AF_AX25, AF_APPLETALK
+  };
+  unsigned int	i;
+  int		sock;
+
+  /*
+   * Now pick any (exisiting) useful socket family for generic queries
+   * Note : don't open all the socket, only returns when one matches,
+   * all protocols might not be valid.
+   * Workaround by Jim Kaba <jkaba@sarnoff.com>
+   * Note : in 99% of the case, we will just open the inet_sock.
+   * The remaining 1% case are not fully correct...
+   */
+
+  /* Try all families we support */
+  for(i = 0; i < sizeof(families)/sizeof(int); ++i)
+    {
+      /* Try to open the socket, if success returns it */
+      sock = socket(families[i], SOCK_DGRAM, 0);
+      if(sock >= 0)
+	return sock;
+  }
+
+  return -1;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Extract the interface name out of /proc/net/wireless or /proc/net/dev.
+ */
+static inline char *
+iw_get_ifname(char *	name,	/* Where to store the name */
+	      int	nsize,	/* Size of name buffer */
+	      char *	buf)	/* Current position in buffer */
+{
+  char *	end;
+
+  /* Skip leading spaces */
+  while(isspace(*buf))
+    buf++;
+
+#ifndef IW_RESTRIC_ENUM
+  /* Get name up to the last ':'. Aliases may contain ':' in them,
+   * but the last one should be the separator */
+  end = strrchr(buf, ':');
+#else
+  /* Get name up to ": "
+   * Note : we compare to ": " to make sure to process aliased interfaces
+   * properly. Doesn't work on /proc/net/dev, because it doesn't guarantee
+   * a ' ' after the ':'*/
+  end = strstr(buf, ": ");
+#endif
+
+  /* Not found ??? To big ??? */
+  if((end == NULL) || (((end - buf) + 1) > nsize))
+    return(NULL);
+
+  /* Copy */
+  memcpy(name, buf, (end - buf));
+  name[end - buf] = '\0';
+
+  /* Return value currently unused, just make sure it's non-NULL */
+  return(end);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Enumerate devices and call specified routine
+ * The new way just use /proc/net/wireless, so get all wireless interfaces,
+ * whether configured or not. This is the default if available.
+ * The old way use SIOCGIFCONF, so get only configured interfaces (wireless
+ * or not).
+ */
+void
+iw_enum_devices(int		skfd,
+		iw_enum_handler	fn,
+		char *		args[],
+		int		count)
+{
+  char		buff[1024];
+  FILE *	fh;
+  struct ifconf ifc;
+  struct ifreq *ifr;
+  int		i;
+
+#ifndef IW_RESTRIC_ENUM
+  /* Check if /proc/net/dev is available */
+  fh = fopen(PROC_NET_DEV, "r");
+#else
+  /* Check if /proc/net/wireless is available */
+  fh = fopen(PROC_NET_WIRELESS, "r");
+#endif
+
+  if(fh != NULL)
+    {
+      /* Success : use data from /proc/net/wireless */
+
+      /* Eat 2 lines of header */
+      fgets(buff, sizeof(buff), fh);
+      fgets(buff, sizeof(buff), fh);
+
+      /* Read each device line */
+      while(fgets(buff, sizeof(buff), fh))
+	{
+	  char	name[IFNAMSIZ + 1];
+	  char *s;
+
+	  /* Skip empty or almost empty lines. It seems that in some
+	   * cases fgets return a line with only a newline. */
+	  if((buff[0] == '\0') || (buff[1] == '\0'))
+	    continue;
+
+	  /* Extract interface name */
+	  s = iw_get_ifname(name, sizeof(name), buff);
+
+	  if(!s)
+	    {
+	      /* Failed to parse, complain and continue */
+#ifndef IW_RESTRIC_ENUM
+	      fprintf(stderr, "Cannot parse " PROC_NET_DEV "\n");
+#else
+	      fprintf(stderr, "Cannot parse " PROC_NET_WIRELESS "\n");
+#endif
+	    }
+	  else
+	    /* Got it, print info about this interface */
+	    (*fn)(skfd, name, args, count);
+	}
+
+      fclose(fh);
+    }
+  else
+    {
+      /* Get list of configured devices using "traditional" way */
+      ifc.ifc_len = sizeof(buff);
+      ifc.ifc_buf = buff;
+      if(ioctl(skfd, SIOCGIFCONF, &ifc) < 0)
+	{
+	  fprintf(stderr, "SIOCGIFCONF: %s\n", strerror(errno));
+	  return;
+	}
+      ifr = ifc.ifc_req;
+
+      /* Print them */
+      for(i = ifc.ifc_len / sizeof(struct ifreq); --i >= 0; ifr++)
+	(*fn)(skfd, ifr->ifr_name, args, count);
+    }
+}
+
+/*********************** WIRELESS SUBROUTINES ************************/
+
+/*------------------------------------------------------------------*/
+/*
+ * Extract WE version number from /proc/net/wireless
+ * In most cases, you really want to get version information from
+ * the range info (range->we_version_compiled), see below...
+ *
+ * If we have WE-16 and later, the WE version is available at the
+ * end of the header line of the file.
+ * For version prior to that, we can only detect the change from
+ * v11 to v12, so we do an approximate job. Fortunately, v12 to v15
+ * are highly binary compatible (on the struct level).
+ */
+int
+iw_get_kernel_we_version(void)
+{
+  char		buff[1024];
+  FILE *	fh;
+  char *	p;
+  int		v;
+
+  /* Check if /proc/net/wireless is available */
+  fh = fopen(PROC_NET_WIRELESS, "r");
+
+  if(fh == NULL)
+    {
+      fprintf(stderr, "Cannot read " PROC_NET_WIRELESS "\n");
+      return(-1);
+    }
+
+  /* Read the first line of buffer */
+  fgets(buff, sizeof(buff), fh);
+
+  if(strstr(buff, "| WE") == NULL)
+    {
+      /* Prior to WE16, so explicit version not present */
+
+      /* Black magic */
+      if(strstr(buff, "| Missed") == NULL)
+	v = 11;
+      else
+	v = 15;
+      fclose(fh);
+      return(v);
+    }
+
+  /* Read the second line of buffer */
+  fgets(buff, sizeof(buff), fh);
+
+  /* Get to the last separator, to get the version */
+  p = strrchr(buff, '|');
+  if((p == NULL) || (sscanf(p + 1, "%d", &v) != 1))
+    {
+      fprintf(stderr, "Cannot parse " PROC_NET_WIRELESS "\n");
+      fclose(fh);
+      return(-1);
+    }
+
+  fclose(fh);
+  return(v);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Print the WE versions of the interface.
+ */
+static int
+print_iface_version_info(int	skfd,
+			 char *	ifname,
+			 char *	args[],		/* Command line args */
+			 int	count)		/* Args count */
+{
+  struct iwreq		wrq;
+  char			buffer[sizeof(iwrange) * 2];	/* Large enough */
+  struct iw_range *	range;
+
+  /* Avoid "Unused parameter" warning */
+  args = args; count = count;
+
+  /* If no wireless name : no wireless extensions.
+   * This enable us to treat the SIOCGIWRANGE failure below properly. */
+  if(iw_get_ext(skfd, ifname, SIOCGIWNAME, &wrq) < 0)
+    return(-1);
+
+  /* Cleanup */
+  memset(buffer, 0, sizeof(buffer));
+
+  wrq.u.data.pointer = (caddr_t) buffer;
+  wrq.u.data.length = sizeof(buffer);
+  wrq.u.data.flags = 0;
+  if(iw_get_ext(skfd, ifname, SIOCGIWRANGE, &wrq) < 0)
+    {
+      /* Interface support WE (see above), but not IWRANGE */
+      fprintf(stderr, "%-8.16s  Driver has no Wireless Extension version information.\n\n", ifname);
+      return(0);
+    }
+
+  /* Copy stuff at the right place, ignore extra */
+  range = (struct iw_range *) buffer;
+
+  /* For new versions, we can check the version directly, for old versions
+   * we use magic. 300 bytes is a also magic number, don't touch... */
+  if(wrq.u.data.length >= 300)
+    {
+      /* Version is always at the same offset, so it's ok */
+      printf("%-8.16s  Recommend Wireless Extension v%d or later,\n",
+	     ifname, range->we_version_source);
+      printf("          Currently compiled with Wireless Extension v%d.\n\n",
+	     range->we_version_compiled);
+    }
+  else
+    {
+      fprintf(stderr, "%-8.16s  Wireless Extension version too old.\n\n",
+		      ifname);
+    }
+
+
+  return(0);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Print the WE versions of the tools.
+ */
+int
+iw_print_version_info(const char *	toolname)
+{
+  int		skfd;			/* generic raw socket desc.	*/
+  int		we_kernel_version;
+
+  /* Create a channel to the NET kernel. */
+  if((skfd = iw_sockets_open()) < 0)
+    {
+      perror("socket");
+      return -1;
+    }
+
+  /* Information about the tools themselves */
+  if(toolname != NULL)
+    printf("%-8.16s  Wireless-Tools version %d\n", toolname, WT_VERSION);
+  printf("          Compatible with Wireless Extension v11 to v%d.\n\n",
+	 WE_MAX_VERSION);
+
+  /* Get version from kernel */
+  we_kernel_version = iw_get_kernel_we_version();
+  /* Only version >= 16 can be verified, other are guessed */
+  if(we_kernel_version > 15)
+    printf("Kernel    Currently compiled with Wireless Extension v%d.\n\n",
+	   we_kernel_version);
+
+  /* Version for each device */
+  iw_enum_devices(skfd, &print_iface_version_info, NULL, 0);
+
+  iw_sockets_close(skfd);
+
+  return 0;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Get the range information out of the driver
+ */
+int
+iw_get_range_info(int		skfd,
+		  const char *	ifname,
+		  iwrange *	range)
+{
+  struct iwreq		wrq;
+  char			buffer[sizeof(iwrange) * 2];	/* Large enough */
+  union iw_range_raw *	range_raw;
+
+  /* Cleanup */
+  bzero(buffer, sizeof(buffer));
+
+  wrq.u.data.pointer = (caddr_t) buffer;
+  wrq.u.data.length = sizeof(buffer);
+  wrq.u.data.flags = 0;
+  if(iw_get_ext(skfd, ifname, SIOCGIWRANGE, &wrq) < 0)
+    return(-1);
+
+  /* Point to the buffer */
+  range_raw = (union iw_range_raw *) buffer;
+
+  /* For new versions, we can check the version directly, for old versions
+   * we use magic. 300 bytes is a also magic number, don't touch... */
+  if(wrq.u.data.length < 300)
+    {
+      /* That's v10 or earlier. Ouch ! Let's make a guess...*/
+      range_raw->range.we_version_compiled = 9;
+    }
+
+  /* Check how it needs to be processed */
+  if(range_raw->range.we_version_compiled > 15)
+    {
+      /* This is our native format, that's easy... */
+      /* Copy stuff at the right place, ignore extra */
+      memcpy((char *) range, buffer, sizeof(iwrange));
+    }
+  else
+    {
+      /* Zero unknown fields */
+      bzero((char *) range, sizeof(struct iw_range));
+
+      /* Initial part unmoved */
+      memcpy((char *) range,
+	     buffer,
+	     iwr15_off(num_channels));
+      /* Frequencies pushed futher down towards the end */
+      memcpy((char *) range + iwr_off(num_channels),
+	     buffer + iwr15_off(num_channels),
+	     iwr15_off(sensitivity) - iwr15_off(num_channels));
+      /* This one moved up */
+      memcpy((char *) range + iwr_off(sensitivity),
+	     buffer + iwr15_off(sensitivity),
+	     iwr15_off(num_bitrates) - iwr15_off(sensitivity));
+      /* This one goes after avg_qual */
+      memcpy((char *) range + iwr_off(num_bitrates),
+	     buffer + iwr15_off(num_bitrates),
+	     iwr15_off(min_rts) - iwr15_off(num_bitrates));
+      /* Number of bitrates has changed, put it after */
+      memcpy((char *) range + iwr_off(min_rts),
+	     buffer + iwr15_off(min_rts),
+	     iwr15_off(txpower_capa) - iwr15_off(min_rts));
+      /* Added encoding_login_index, put it after */
+      memcpy((char *) range + iwr_off(txpower_capa),
+	     buffer + iwr15_off(txpower_capa),
+	     iwr15_off(txpower) - iwr15_off(txpower_capa));
+      /* Hum... That's an unexpected glitch. Bummer. */
+      memcpy((char *) range + iwr_off(txpower),
+	     buffer + iwr15_off(txpower),
+	     iwr15_off(avg_qual) - iwr15_off(txpower));
+      /* Avg qual moved up next to max_qual */
+      memcpy((char *) range + iwr_off(avg_qual),
+	     buffer + iwr15_off(avg_qual),
+	     sizeof(struct iw_quality));
+    }
+
+  /* We are now checking much less than we used to do, because we can
+   * accomodate more WE version. But, there are still cases where things
+   * will break... */
+  if(!iw_ignore_version)
+    {
+      /* We don't like very old version (unfortunately kernel 2.2.X) */
+      if(range->we_version_compiled <= 10)
+	{
+	  fprintf(stderr, "Warning: Driver for device %s has been compiled with an ancient version\n", ifname);
+	  fprintf(stderr, "of Wireless Extension, while this program support version 11 and later.\n");
+	  fprintf(stderr, "Some things may be broken...\n\n");
+	}
+
+      /* We don't like future versions of WE, because we can't cope with
+       * the unknown */
+      if(range->we_version_compiled > WE_MAX_VERSION)
+	{
+	  fprintf(stderr, "Warning: Driver for device %s has been compiled with version %d\n", ifname, range->we_version_compiled);
+	  fprintf(stderr, "of Wireless Extension, while this program supports up to version %d.\n", WE_MAX_VERSION);
+	  fprintf(stderr, "Some things may be broken...\n\n");
+	}
+
+      /* Driver version verification */
+      if((range->we_version_compiled > 10) &&
+	 (range->we_version_compiled < range->we_version_source))
+	{
+	  fprintf(stderr, "Warning: Driver for device %s recommend version %d of Wireless Extension,\n", ifname, range->we_version_source);
+	  fprintf(stderr, "but has been compiled with version %d, therefore some driver features\n", range->we_version_compiled);
+	  fprintf(stderr, "may not be available...\n\n");
+	}
+      /* Note : we are only trying to catch compile difference, not source.
+       * If the driver source has not been updated to the latest, it doesn't
+       * matter because the new fields are set to zero */
+    }
+
+  /* Don't complain twice.
+   * In theory, the test apply to each individual driver, but usually
+   * all drivers are compiled from the same kernel. */
+  iw_ignore_version = 1;
+
+  return(0);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Get information about what private ioctls are supported by the driver
+ *
+ * Note : there is one danger using this function. If it return 0, you
+ * still need to free() the buffer. Beware.
+ */
+int
+iw_get_priv_info(int		skfd,
+		 const char *	ifname,
+		 iwprivargs **	ppriv)
+{
+  struct iwreq		wrq;
+  iwprivargs *		priv = NULL;	/* Not allocated yet */
+  int			maxpriv = 16;	/* Minimum for compatibility WE<13 */
+  iwprivargs *		newpriv;
+
+  /* Some driver may return a very large number of ioctls. Some
+   * others a very small number. We now use a dynamic allocation
+   * of the array to satisfy everybody. Of course, as we don't know
+   * in advance the size of the array, we try various increasing
+   * sizes. Jean II */
+  do
+    {
+      /* (Re)allocate the buffer */
+      newpriv = realloc(priv, maxpriv * sizeof(priv[0]));
+      if(newpriv == NULL)
+	{
+	  fprintf(stderr, "%s: Allocation failed\n", __FUNCTION__);
+	  break;
+	}
+      priv = newpriv;
+
+      /* Ask the driver if it's large enough */
+      wrq.u.data.pointer = (caddr_t) priv;
+      wrq.u.data.length = maxpriv;
+      wrq.u.data.flags = 0;
+      if(iw_get_ext(skfd, ifname, SIOCGIWPRIV, &wrq) >= 0)
+	{
+	  /* Success. Pass the buffer by pointer */
+	  *ppriv = priv;
+	  /* Return the number of ioctls */
+	  return(wrq.u.data.length);
+	}
+
+      /* Only E2BIG means the buffer was too small, abort on other errors */
+      if(errno != E2BIG)
+	{
+	  /* Most likely "not supported". Don't barf. */
+	  break;
+	}
+
+      /* Failed. We probably need a bigger buffer. Check if the kernel
+       * gave us any hints. */
+      if(wrq.u.data.length > maxpriv)
+	maxpriv = wrq.u.data.length;
+      else
+	maxpriv *= 2;
+    }
+  while(maxpriv < 1000);
+
+  /* Cleanup */
+  if(priv)
+    free(priv);
+  *ppriv = NULL;
+
+  return(-1);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Get essential wireless config from the device driver
+ * We will call all the classical wireless ioctl on the driver through
+ * the socket to know what is supported and to get the settings...
+ * Note : compare to the version in iwconfig, we extract only
+ * what's *really* needed to configure a device...
+ */
+int
+iw_get_basic_config(int			skfd,
+		    const char *	ifname,
+		    wireless_config *	info)
+{
+  struct iwreq		wrq;
+
+  memset((char *) info, 0, sizeof(struct wireless_config));
+
+  /* Get wireless name */
+  if(iw_get_ext(skfd, ifname, SIOCGIWNAME, &wrq) < 0)
+    /* If no wireless name : no wireless extensions */
+    return(-1);
+  else
+    {
+      strncpy(info->name, wrq.u.name, IFNAMSIZ);
+      info->name[IFNAMSIZ] = '\0';
+    }
+
+  /* Get network ID */
+  if(iw_get_ext(skfd, ifname, SIOCGIWNWID, &wrq) >= 0)
+    {
+      info->has_nwid = 1;
+      memcpy(&(info->nwid), &(wrq.u.nwid), sizeof(iwparam));
+    }
+
+  /* Get frequency / channel */
+  if(iw_get_ext(skfd, ifname, SIOCGIWFREQ, &wrq) >= 0)
+    {
+      info->has_freq = 1;
+      info->freq = iw_freq2float(&(wrq.u.freq));
+      info->freq_flags = wrq.u.freq.flags;
+    }
+
+  /* Get encryption information */
+  wrq.u.data.pointer = (caddr_t) info->key;
+  wrq.u.data.length = IW_ENCODING_TOKEN_MAX;
+  wrq.u.data.flags = 0;
+  if(iw_get_ext(skfd, ifname, SIOCGIWENCODE, &wrq) >= 0)
+    {
+      info->has_key = 1;
+      info->key_size = wrq.u.data.length;
+      info->key_flags = wrq.u.data.flags;
+    }
+
+  /* Get ESSID */
+  wrq.u.essid.pointer = (caddr_t) info->essid;
+  wrq.u.essid.length = IW_ESSID_MAX_SIZE + 1;
+  wrq.u.essid.flags = 0;
+  if(iw_get_ext(skfd, ifname, SIOCGIWESSID, &wrq) >= 0)
+    {
+      info->has_essid = 1;
+      info->essid_on = wrq.u.data.flags;
+    }
+
+  /* Get operation mode */
+  if(iw_get_ext(skfd, ifname, SIOCGIWMODE, &wrq) >= 0)
+    {
+      info->has_mode = 1;
+      /* Note : event->u.mode is unsigned, no need to check <= 0 */
+      if(wrq.u.mode < IW_NUM_OPER_MODE)
+	info->mode = wrq.u.mode;
+      else
+	info->mode = IW_NUM_OPER_MODE;	/* Unknown/bug */
+    }
+
+  return(0);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Set essential wireless config in the device driver
+ * We will call all the classical wireless ioctl on the driver through
+ * the socket to know what is supported and to set the settings...
+ * We support only the restricted set as above...
+ */
+int
+iw_set_basic_config(int			skfd,
+		    const char *	ifname,
+		    wireless_config *	info)
+{
+  struct iwreq		wrq;
+  int			ret = 0;
+
+  /* Get wireless name (check if interface is valid) */
+  if(iw_get_ext(skfd, ifname, SIOCGIWNAME, &wrq) < 0)
+    /* If no wireless name : no wireless extensions */
+    return(-2);
+
+  /* Set the current mode of operation
+   * Mode need to be first : some settings apply only in a specific mode
+   * (such as frequency).
+   */
+  if(info->has_mode)
+    {
+      strncpy(wrq.ifr_name, ifname, IFNAMSIZ);
+      wrq.u.mode = info->mode;
+
+      if(iw_get_ext(skfd, ifname, SIOCSIWMODE, &wrq) < 0)
+	{
+	  fprintf(stderr, "SIOCSIWMODE: %s\n", strerror(errno));
+	  ret = -1;
+	}
+    }
+
+  /* Set frequency / channel */
+  if(info->has_freq)
+    {
+      iw_float2freq(info->freq, &(wrq.u.freq));
+
+      if(iw_set_ext(skfd, ifname, SIOCSIWFREQ, &wrq) < 0)
+	{
+	  fprintf(stderr, "SIOCSIWFREQ: %s\n", strerror(errno));
+	  ret = -1;
+	}
+    }
+
+  /* Set encryption information */
+  if(info->has_key)
+    {
+      int		flags = info->key_flags;
+
+      /* Check if there is a key index */
+      if((flags & IW_ENCODE_INDEX) > 0)
+	{
+	  /* Set the index */
+	  wrq.u.data.pointer = (caddr_t) NULL;
+	  wrq.u.data.flags = (flags & (IW_ENCODE_INDEX)) | IW_ENCODE_NOKEY;
+	  wrq.u.data.length = 0;
+
+	  if(iw_set_ext(skfd, ifname, SIOCSIWENCODE, &wrq) < 0)
+	    {
+	      fprintf(stderr, "SIOCSIWENCODE(%d): %s\n",
+		      errno, strerror(errno));
+	      ret = -1;
+	    }
+	}
+
+      /* Mask out index to minimise probability of reject when setting key */
+      flags = flags & (~IW_ENCODE_INDEX);
+
+      /* Set the key itself (set current key in this case) */
+      wrq.u.data.pointer = (caddr_t) info->key;
+      wrq.u.data.length = info->key_size;
+      wrq.u.data.flags = flags;
+
+      /* Compatibility with WE<13 */
+      if(flags & IW_ENCODE_NOKEY)
+	wrq.u.data.pointer = NULL;
+
+      if(iw_set_ext(skfd, ifname, SIOCSIWENCODE, &wrq) < 0)
+	{
+	  fprintf(stderr, "SIOCSIWENCODE(%d): %s\n",
+		  errno, strerror(errno));
+	  ret = -1;
+	}
+    }
+
+  /* Set Network ID, if available (this is for non-802.11 cards) */
+  if(info->has_nwid)
+    {
+      memcpy(&(wrq.u.nwid), &(info->nwid), sizeof(iwparam));
+      wrq.u.nwid.fixed = 1;	/* Hum... When in Rome... */
+
+      if(iw_set_ext(skfd, ifname, SIOCSIWNWID, &wrq) < 0)
+	{
+	  fprintf(stderr, "SIOCSIWNWID: %s\n", strerror(errno));
+	  ret = -1;
+	}
+    }
+
+  /* Set ESSID (extended network), if available.
+   * ESSID need to be last : most device re-perform the scanning/discovery
+   * when this is set, and things like encryption keys are better be
+   * defined if we want to discover the right set of APs/nodes.
+   */
+  if(info->has_essid)
+    {
+      int		we_kernel_version;
+      we_kernel_version = iw_get_kernel_we_version();
+
+      wrq.u.essid.pointer = (caddr_t) info->essid;
+      wrq.u.essid.length = strlen(info->essid);
+      wrq.u.data.flags = info->essid_on;
+      if(we_kernel_version < 21)
+	wrq.u.essid.length++;
+
+      if(iw_set_ext(skfd, ifname, SIOCSIWESSID, &wrq) < 0)
+	{
+	  fprintf(stderr, "SIOCSIWESSID: %s\n", strerror(errno));
+	  ret = -1;
+	}
+    }
+
+  return(ret);
+}
+
+/*********************** PROTOCOL SUBROUTINES ***********************/
+/*
+ * Fun stuff with protocol identifiers (SIOCGIWNAME).
+ * We assume that drivers are returning sensible values in there,
+ * which is not always the case :-(
+ */
+
+/*------------------------------------------------------------------*/
+/*
+ * Compare protocol identifiers.
+ * We don't want to know if the two protocols are the exactly same,
+ * but if they interoperate at some level, and also if they accept the
+ * same type of config (ESSID vs NWID, freq...).
+ * This is supposed to work around the alphabet soup.
+ * Return 1 if protocols are compatible, 0 otherwise
+ */
+int
+iw_protocol_compare(const char *	protocol1,
+		    const char *	protocol2)
+{
+  const char *	dot11 = "IEEE 802.11";
+  const char *	dot11_ds = "Dbg";
+  const char *	dot11_5g = "a";
+
+  /* If the strings are the same -> easy */
+  if(!strncmp(protocol1, protocol2, IFNAMSIZ))
+    return(1);
+
+  /* Are we dealing with one of the 802.11 variant ? */
+  if( (!strncmp(protocol1, dot11, strlen(dot11))) &&
+      (!strncmp(protocol2, dot11, strlen(dot11))) )
+    {
+      const char *	sub1 = protocol1 + strlen(dot11);
+      const char *	sub2 = protocol2 + strlen(dot11);
+      unsigned int	i;
+      int		isds1 = 0;
+      int		isds2 = 0;
+      int		is5g1 = 0;
+      int		is5g2 = 0;
+
+      /* Check if we find the magic letters telling it's DS compatible */
+      for(i = 0; i < strlen(dot11_ds); i++)
+	{
+	  if(strchr(sub1, dot11_ds[i]) != NULL)
+	    isds1 = 1;
+	  if(strchr(sub2, dot11_ds[i]) != NULL)
+	    isds2 = 1;
+	}
+      if(isds1 && isds2)
+	return(1);
+
+      /* Check if we find the magic letters telling it's 5GHz compatible */
+      for(i = 0; i < strlen(dot11_5g); i++)
+	{
+	  if(strchr(sub1, dot11_5g[i]) != NULL)
+	    is5g1 = 1;
+	  if(strchr(sub2, dot11_5g[i]) != NULL)
+	    is5g2 = 1;
+	}
+      if(is5g1 && is5g2)
+	return(1);
+    }
+  /* Not compatible */
+  return(0);
+}
+
+/********************** FREQUENCY SUBROUTINES ***********************/
+/*
+ * Note : the two functions below are the cause of troubles on
+ * various embeeded platforms, as they are the reason we require
+ * libm (math library).
+ * In this case, please use enable BUILD_NOLIBM in the makefile
+ *
+ * FIXME : check negative mantissa and exponent
+ */
+
+/*------------------------------------------------------------------*/
+/*
+ * Convert a floating point the our internal representation of
+ * frequencies.
+ * The kernel doesn't want to hear about floating point, so we use
+ * this custom format instead.
+ */
+void
+iw_float2freq(double	in,
+	      iwfreq *	out)
+{
+#ifdef WE_NOLIBM
+  /* Version without libm : slower */
+  out->e = 0;
+  while(in > 1e9)
+    {
+      in /= 10;
+      out->e++;
+    }
+  out->m = (long) in;
+#else	/* WE_NOLIBM */
+  /* Version with libm : faster */
+  out->e = (short) (floor(log10(in)));
+  if(out->e > 8)
+    {
+      out->m = ((long) (floor(in / pow(10,out->e - 6)))) * 100;
+      out->e -= 8;
+    }
+  else
+    {
+      out->m = (long) in;
+      out->e = 0;
+    }
+#endif	/* WE_NOLIBM */
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Convert our internal representation of frequencies to a floating point.
+ */
+double
+iw_freq2float(const iwfreq *	in)
+{
+#ifdef WE_NOLIBM
+  /* Version without libm : slower */
+  int		i;
+  double	res = (double) in->m;
+  for(i = 0; i < in->e; i++)
+    res *= 10;
+  return(res);
+#else	/* WE_NOLIBM */
+  /* Version with libm : faster */
+  return ((double) in->m) * pow(10,in->e);
+#endif	/* WE_NOLIBM */
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Output a frequency with proper scaling
+ */
+void
+iw_print_freq_value(char *	buffer,
+		    int		buflen,
+		    double	freq)
+{
+  if(freq < KILO)
+    snprintf(buffer, buflen, "%g", freq);
+  else
+    {
+      char	scale;
+      int	divisor;
+
+      if(freq >= GIGA)
+	{
+	  scale = 'G';
+	  divisor = GIGA;
+	}
+      else
+	{
+	  if(freq >= MEGA)
+	    {
+	      scale = 'M';
+	      divisor = MEGA;
+	    }
+	  else
+	    {
+	      scale = 'k';
+	      divisor = KILO;
+	    }
+	}
+      snprintf(buffer, buflen, "%g %cHz", freq / divisor, scale);
+    }
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Output a frequency with proper scaling
+ */
+void
+iw_print_freq(char *	buffer,
+	      int	buflen,
+	      double	freq,
+	      int	channel,
+	      int	freq_flags)
+{
+  char	sep = ((freq_flags & IW_FREQ_FIXED) ? '=' : ':');
+  char	vbuf[16];
+
+  /* Print the frequency/channel value */
+  iw_print_freq_value(vbuf, sizeof(vbuf), freq);
+
+  /* Check if channel only */
+  if(freq < KILO)
+    snprintf(buffer, buflen, "Channel%c%s", sep, vbuf);
+  else
+    {
+      /* Frequency. Check if we have a channel as well */
+      if(channel >= 0)
+	snprintf(buffer, buflen, "Frequency%c%s (Channel %d)",
+		 sep, vbuf, channel);
+      else
+	snprintf(buffer, buflen, "Frequency%c%s", sep, vbuf);
+    }
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Convert a frequency to a channel (negative -> error)
+ */
+int
+iw_freq_to_channel(double			freq,
+		   const struct iw_range *	range)
+{
+  double	ref_freq;
+  int		k;
+
+  /* Check if it's a frequency or not already a channel */
+  if(freq < KILO)
+    return(-1);
+
+  /* We compare the frequencies as double to ignore differences
+   * in encoding. Slower, but safer... */
+  for(k = 0; k < range->num_frequency; k++)
+    {
+      ref_freq = iw_freq2float(&(range->freq[k]));
+      if(freq == ref_freq)
+	return(range->freq[k].i);
+    }
+  /* Not found */
+  return(-2);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Convert a channel to a frequency (negative -> error)
+ * Return the channel on success
+ */
+int
+iw_channel_to_freq(int				channel,
+		   double *			pfreq,
+		   const struct iw_range *	range)
+{
+  int		has_freq = 0;
+  int		k;
+
+  /* Check if the driver support only channels or if it has frequencies */
+  for(k = 0; k < range->num_frequency; k++)
+    {
+      if((range->freq[k].e != 0) || (range->freq[k].m > (int) KILO))
+	has_freq = 1;
+    }
+  if(!has_freq)
+    return(-1);
+
+  /* Find the correct frequency in the list */
+  for(k = 0; k < range->num_frequency; k++)
+    {
+      if(range->freq[k].i == channel)
+	{
+	  *pfreq = iw_freq2float(&(range->freq[k]));
+	  return(channel);
+	}
+    }
+  /* Not found */
+  return(-2);
+}
+
+/*********************** BITRATE SUBROUTINES ***********************/
+
+/*------------------------------------------------------------------*/
+/*
+ * Output a bitrate with proper scaling
+ */
+void
+iw_print_bitrate(char *	buffer,
+		 int	buflen,
+		 int	bitrate)
+{
+  double	rate = bitrate;
+  char		scale;
+  int		divisor;
+
+  if(rate >= GIGA)
+    {
+      scale = 'G';
+      divisor = GIGA;
+    }
+  else
+    {
+      if(rate >= MEGA)
+	{
+	  scale = 'M';
+	  divisor = MEGA;
+	}
+      else
+	{
+	  scale = 'k';
+	  divisor = KILO;
+	}
+    }
+  snprintf(buffer, buflen, "%g %cb/s", rate / divisor, scale);
+}
+
+/************************ POWER SUBROUTINES *************************/
+
+/*------------------------------------------------------------------*/
+/*
+ * Convert a value in dBm to a value in milliWatt.
+ */
+int
+iw_dbm2mwatt(int	in)
+{
+#ifdef WE_NOLIBM
+  /* Version without libm : slower */
+  int		ip = in / 10;
+  int		fp = in % 10;
+  int		k;
+  double	res = 1.0;
+
+  /* Split integral and floating part to avoid accumulating rounding errors */
+  for(k = 0; k < ip; k++)
+    res *= 10;
+  for(k = 0; k < fp; k++)
+    res *= LOG10_MAGIC;
+  return((int) res);
+#else	/* WE_NOLIBM */
+  /* Version with libm : faster */
+  return((int) (floor(pow(10.0, (((double) in) / 10.0)))));
+#endif	/* WE_NOLIBM */
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Convert a value in milliWatt to a value in dBm.
+ */
+int
+iw_mwatt2dbm(int	in)
+{
+#ifdef WE_NOLIBM
+  /* Version without libm : slower */
+  double	fin = (double) in;
+  int		res = 0;
+
+  /* Split integral and floating part to avoid accumulating rounding errors */
+  while(fin > 10.0)
+    {
+      res += 10;
+      fin /= 10.0;
+    }
+  while(fin > 1.000001)	/* Eliminate rounding errors, take ceil */
+    {
+      res += 1;
+      fin /= LOG10_MAGIC;
+    }
+  return(res);
+#else	/* WE_NOLIBM */
+  /* Version with libm : faster */
+  return((int) (ceil(10.0 * log10((double) in))));
+#endif	/* WE_NOLIBM */
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Output a txpower with proper conversion
+ */
+void
+iw_print_txpower(char *			buffer,
+		 int			buflen,
+		 struct iw_param *	txpower)
+{
+  int		dbm;
+
+  /* Check if disabled */
+  if(txpower->disabled)
+    {
+      snprintf(buffer, buflen, "off");
+    }
+  else
+    {
+      /* Check for relative values */
+      if(txpower->flags & IW_TXPOW_RELATIVE)
+	{
+	  snprintf(buffer, buflen, "%d", txpower->value);
+	}
+      else
+	{
+	  /* Convert everything to dBm */
+	  if(txpower->flags & IW_TXPOW_MWATT)
+	    dbm = iw_mwatt2dbm(txpower->value);
+	  else
+	    dbm = txpower->value;
+
+	  /* Display */
+	  snprintf(buffer, buflen, "%d dBm", dbm);
+	}
+    }
+}
+
+/********************** STATISTICS SUBROUTINES **********************/
+
+/*------------------------------------------------------------------*/
+/*
+ * Read /proc/net/wireless to get the latest statistics
+ * Note : strtok not thread safe, not used in WE-12 and later.
+ */
+int
+iw_get_stats(int		skfd,
+	     const char *	ifname,
+	     iwstats *		stats,
+	     const iwrange *	range,
+	     int		has_range)
+{
+  /* Fortunately, we can always detect this condition properly */
+  if((has_range) && (range->we_version_compiled > 11))
+    {
+      struct iwreq		wrq;
+      wrq.u.data.pointer = (caddr_t) stats;
+      wrq.u.data.length = sizeof(struct iw_statistics);
+      wrq.u.data.flags = 1;		/* Clear updated flag */
+      strncpy(wrq.ifr_name, ifname, IFNAMSIZ);
+      if(iw_get_ext(skfd, ifname, SIOCGIWSTATS, &wrq) < 0)
+	return(-1);
+
+      /* Format has not changed since WE-12, no conversion */
+      return(0);
+    }
+  else
+    {
+      FILE *	f = fopen(PROC_NET_WIRELESS, "r");
+      char	buf[256];
+      char *	bp;
+      int	t;
+
+      if(f==NULL)
+	return -1;
+      /* Loop on all devices */
+      while(fgets(buf,255,f))
+	{
+	  bp=buf;
+	  while(*bp&&isspace(*bp))
+	    bp++;
+	  /* Is it the good device ? */
+	  if(strncmp(bp,ifname,strlen(ifname))==0 && bp[strlen(ifname)]==':')
+	    {
+	      /* Skip ethX: */
+	      bp=strchr(bp,':');
+	      bp++;
+	      /* -- status -- */
+	      bp = strtok(bp, " ");
+	      sscanf(bp, "%X", &t);
+	      stats->status = (unsigned short) t;
+	      /* -- link quality -- */
+	      bp = strtok(NULL, " ");
+	      if(strchr(bp,'.') != NULL)
+		stats->qual.updated |= 1;
+	      sscanf(bp, "%d", &t);
+	      stats->qual.qual = (unsigned char) t;
+	      /* -- signal level -- */
+	      bp = strtok(NULL, " ");
+	      if(strchr(bp,'.') != NULL)
+		stats->qual.updated |= 2;
+	      sscanf(bp, "%d", &t);
+	      stats->qual.level = (unsigned char) t;
+	      /* -- noise level -- */
+	      bp = strtok(NULL, " ");
+	      if(strchr(bp,'.') != NULL)
+		stats->qual.updated += 4;
+	      sscanf(bp, "%d", &t);
+	      stats->qual.noise = (unsigned char) t;
+	      /* -- discarded packets -- */
+	      bp = strtok(NULL, " ");
+	      sscanf(bp, "%d", &stats->discard.nwid);
+	      bp = strtok(NULL, " ");
+	      sscanf(bp, "%d", &stats->discard.code);
+	      bp = strtok(NULL, " ");
+	      sscanf(bp, "%d", &stats->discard.misc);
+	      fclose(f);
+	      /* No conversion needed */
+	      return 0;
+	    }
+	}
+      fclose(f);
+      return -1;
+    }
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Output the link statistics, taking care of formating
+ */
+void
+iw_print_stats(char *		buffer,
+	       int		buflen,
+	       const iwqual *	qual,
+	       const iwrange *	range,
+	       int		has_range)
+{
+  int		len;
+
+  /* People are very often confused by the 8 bit arithmetic happening
+   * here.
+   * All the values here are encoded in a 8 bit integer. 8 bit integers
+   * are either unsigned [0 ; 255], signed [-128 ; +127] or
+   * negative [-255 ; 0].
+   * Further, on 8 bits, 0x100 == 256 == 0.
+   *
+   * Relative/percent values are always encoded unsigned, between 0 and 255.
+   * Absolute/dBm values are always encoded between -192 and 63.
+   * (Note that up to version 28 of Wireless Tools, dBm used to be
+   *  encoded always negative, between -256 and -1).
+   *
+   * How do we separate relative from absolute values ?
+   * The old way is to use the range to do that. As of WE-19, we have
+   * an explicit IW_QUAL_DBM flag in updated...
+   * The range allow to specify the real min/max of the value. As the
+   * range struct only specify one bound of the value, we assume that
+   * the other bound is 0 (zero).
+   * For relative values, range is [0 ; range->max].
+   * For absolute values, range is [range->max ; 63].
+   *
+   * Let's take two example :
+   * 1) value is 75%. qual->value = 75 ; range->max_qual.value = 100
+   * 2) value is -54dBm. noise floor of the radio is -104dBm.
+   *    qual->value = -54 = 202 ; range->max_qual.value = -104 = 152
+   *
+   * Jean II
+   */
+
+  /* Just do it...
+   * The old way to detect dBm require both the range and a non-null
+   * level (which confuse the test). The new way can deal with level of 0
+   * because it does an explicit test on the flag. */
+  if(has_range && ((qual->level != 0)
+		   || (qual->updated & (IW_QUAL_DBM | IW_QUAL_RCPI))))
+    {
+      /* Deal with quality : always a relative value */
+      if(!(qual->updated & IW_QUAL_QUAL_INVALID))
+	{
+	  len = snprintf(buffer, buflen, "Quality%c%d/%d  ",
+			 qual->updated & IW_QUAL_QUAL_UPDATED ? '=' : ':',
+			 qual->qual, range->max_qual.qual);
+	  buffer += len;
+	  buflen -= len;
+	}
+
+      /* Check if the statistics are in RCPI (IEEE 802.11k) */
+      if(qual->updated & IW_QUAL_RCPI)
+	{
+	  /* Deal with signal level in RCPI */
+	  /* RCPI = int{(Power in dBm +110)*2} for 0dbm > Power > -110dBm */
+	  if(!(qual->updated & IW_QUAL_LEVEL_INVALID))
+	    {
+	      double	rcpilevel = (qual->level / 2.0) - 110.0;
+	      len = snprintf(buffer, buflen, "Signal level%c%g dBm  ",
+			     qual->updated & IW_QUAL_LEVEL_UPDATED ? '=' : ':',
+			     rcpilevel);
+	      buffer += len;
+	      buflen -= len;
+	    }
+
+	  /* Deal with noise level in dBm (absolute power measurement) */
+	  if(!(qual->updated & IW_QUAL_NOISE_INVALID))
+	    {
+	      double	rcpinoise = (qual->noise / 2.0) - 110.0;
+	      len = snprintf(buffer, buflen, "Noise level%c%g dBm",
+			     qual->updated & IW_QUAL_NOISE_UPDATED ? '=' : ':',
+			     rcpinoise);
+	    }
+	}
+      else
+	{
+	  /* Check if the statistics are in dBm */
+	  if((qual->updated & IW_QUAL_DBM)
+	     || (qual->level > range->max_qual.level))
+	    {
+	      /* Deal with signal level in dBm  (absolute power measurement) */
+	      if(!(qual->updated & IW_QUAL_LEVEL_INVALID))
+		{
+		  int	dblevel = qual->level;
+		  /* Implement a range for dBm [-192; 63] */
+		  if(qual->level >= 64)
+		    dblevel -= 0x100;
+		  len = snprintf(buffer, buflen, "Signal level%c%d dBm  ",
+				 qual->updated & IW_QUAL_LEVEL_UPDATED ? '=' : ':',
+				 dblevel);
+		  buffer += len;
+		  buflen -= len;
+		}
+
+	      /* Deal with noise level in dBm (absolute power measurement) */
+	      if(!(qual->updated & IW_QUAL_NOISE_INVALID))
+		{
+		  int	dbnoise = qual->noise;
+		  /* Implement a range for dBm [-192; 63] */
+		  if(qual->noise >= 64)
+		    dbnoise -= 0x100;
+		  len = snprintf(buffer, buflen, "Noise level%c%d dBm",
+				 qual->updated & IW_QUAL_NOISE_UPDATED ? '=' : ':',
+				 dbnoise);
+		}
+	    }
+	  else
+	    {
+	      /* Deal with signal level as relative value (0 -> max) */
+	      if(!(qual->updated & IW_QUAL_LEVEL_INVALID))
+		{
+		  len = snprintf(buffer, buflen, "Signal level%c%d/%d  ",
+				 qual->updated & IW_QUAL_LEVEL_UPDATED ? '=' : ':',
+				 qual->level, range->max_qual.level);
+		  buffer += len;
+		  buflen -= len;
+		}
+
+	      /* Deal with noise level as relative value (0 -> max) */
+	      if(!(qual->updated & IW_QUAL_NOISE_INVALID))
+		{
+		  len = snprintf(buffer, buflen, "Noise level%c%d/%d",
+				 qual->updated & IW_QUAL_NOISE_UPDATED ? '=' : ':',
+				 qual->noise, range->max_qual.noise);
+		}
+	    }
+	}
+    }
+  else
+    {
+      /* We can't read the range, so we don't know... */
+      snprintf(buffer, buflen,
+	       "Quality:%d  Signal level:%d  Noise level:%d",
+	       qual->qual, qual->level, qual->noise);
+    }
+}
+
+/*********************** ENCODING SUBROUTINES ***********************/
+
+/*------------------------------------------------------------------*/
+/*
+ * Output the encoding key, with a nice formating
+ */
+void
+iw_print_key(char *			buffer,
+	     int			buflen,
+	     const unsigned char *	key,		/* Must be unsigned */
+	     int			key_size,
+	     int			key_flags)
+{
+  int	i;
+
+  /* Check buffer size -> 1 bytes => 2 digits + 1/2 separator */
+  if((key_size * 3) > buflen)
+    {
+      snprintf(buffer, buflen, "<too big>");
+      return;
+    }
+
+  /* Is the key present ??? */
+  if(key_flags & IW_ENCODE_NOKEY)
+    {
+      /* Nope : print on or dummy */
+      if(key_size <= 0)
+	strcpy(buffer, "on");			/* Size checked */
+      else
+	{
+	  strcpy(buffer, "**");			/* Size checked */
+	  buffer +=2;
+	  for(i = 1; i < key_size; i++)
+	    {
+	      if((i & 0x1) == 0)
+		strcpy(buffer++, "-");		/* Size checked */
+	      strcpy(buffer, "**");		/* Size checked */
+	      buffer +=2;
+	    }
+	}
+    }
+  else
+    {
+      /* Yes : print the key */
+      sprintf(buffer, "%.2X", key[0]);		/* Size checked */
+      buffer +=2;
+      for(i = 1; i < key_size; i++)
+	{
+	  if((i & 0x1) == 0)
+	    strcpy(buffer++, "-");		/* Size checked */
+	  sprintf(buffer, "%.2X", key[i]);	/* Size checked */
+	  buffer +=2;
+	}
+    }
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Convert a passphrase into a key
+ * ### NOT IMPLEMENTED ###
+ * Return size of the key, or 0 (no key) or -1 (error)
+ */
+static int
+iw_pass_key(const char *	input,
+	    unsigned char *	key)
+{
+  input = input; key = key;
+  fprintf(stderr, "Error: Passphrase not implemented\n");
+  return(-1);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Parse a key from the command line.
+ * Return size of the key, or 0 (no key) or -1 (error)
+ * If the key is too long, it's simply truncated...
+ */
+int
+iw_in_key(const char *		input,
+	  unsigned char *	key)
+{
+  int		keylen = 0;
+
+  /* Check the type of key */
+  if(!strncmp(input, "s:", 2))
+    {
+      /* First case : as an ASCII string (Lucent/Agere cards) */
+      keylen = strlen(input + 2);		/* skip "s:" */
+      if(keylen > IW_ENCODING_TOKEN_MAX)
+	keylen = IW_ENCODING_TOKEN_MAX;
+      memcpy(key, input + 2, keylen);
+    }
+  else
+    if(!strncmp(input, "p:", 2))
+      {
+	/* Second case : as a passphrase (PrismII cards) */
+	return(iw_pass_key(input + 2, key));		/* skip "p:" */
+      }
+    else
+      {
+	const char *	p;
+	int		dlen;	/* Digits sequence length */
+	unsigned char	out[IW_ENCODING_TOKEN_MAX];
+
+	/* Third case : as hexadecimal digits */
+	p = input;
+	dlen = -1;
+
+	/* Loop until we run out of chars in input or overflow the output */
+	while(*p != '\0')
+	  {
+	    int	temph;
+	    int	templ;
+	    int	count;
+	    /* No more chars in this sequence */
+	    if(dlen <= 0)
+	      {
+		/* Skip separator */
+		if(dlen == 0)
+		  p++;
+		/* Calculate num of char to next separator */
+		dlen = strcspn(p, "-:;.,");
+	      }
+	    /* Get each char separatly (and not by two) so that we don't
+	     * get confused by 'enc' (=> '0E'+'0C') and similar */
+	    count = sscanf(p, "%1X%1X", &temph, &templ);
+	    if(count < 1)
+	      return(-1);		/* Error -> non-hex char */
+	    /* Fixup odd strings such as '123' is '01'+'23' and not '12'+'03'*/
+	    if(dlen % 2)
+	      count = 1;
+	    /* Put back two chars as one byte and output */
+	    if(count == 2)
+	      templ |= temph << 4;
+	    else
+	      templ = temph;
+	    out[keylen++] = (unsigned char) (templ & 0xFF);
+	    /* Check overflow in output */
+	    if(keylen >= IW_ENCODING_TOKEN_MAX)
+	      break;
+	    /* Move on to next chars */
+	    p += count;
+	    dlen -= count;
+	  }
+	/* We use a temporary output buffer 'out' so that if there is
+	 * an error, we don't overwrite the original key buffer.
+	 * Because of the way iwconfig loop on multiple key/enc arguments
+	 * until it finds an error in here, this is necessary to avoid
+	 * silently corrupting the encryption key... */
+	memcpy(key, out, keylen);
+      }
+
+#ifdef DEBUG
+  {
+    char buf[IW_ENCODING_TOKEN_MAX * 3];
+    iw_print_key(buf, sizeof(buf), key, keylen, 0);
+    printf("Got key : %d [%s]\n", keylen, buf);
+  }
+#endif
+
+  return(keylen);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Parse a key from the command line.
+ * Return size of the key, or 0 (no key) or -1 (error)
+ */
+int
+iw_in_key_full(int		skfd,
+	       const char *	ifname,
+	       const char *	input,
+	       unsigned char *	key,
+	       __u16 *		flags)
+{
+  int		keylen = 0;
+  char *	p;
+
+  if(!strncmp(input, "l:", 2))
+    {
+      struct iw_range	range;
+
+      /* Extra case : as a login (user:passwd - Cisco LEAP) */
+      keylen = strlen(input + 2) + 1;		/* skip "l:", add '\0' */
+      /* Most user/password is 8 char, so 18 char total, < 32 */
+      if(keylen > IW_ENCODING_TOKEN_MAX)
+	keylen = IW_ENCODING_TOKEN_MAX;
+      memcpy(key, input + 2, keylen);
+
+      /* Separate the two strings */
+      p = strchr((char *) key, ':');
+      if(p == NULL)
+	{
+	  fprintf(stderr, "Error: Invalid login format\n");
+	  return(-1);
+	}
+      *p = '\0';
+
+      /* Extract range info */
+      if(iw_get_range_info(skfd, ifname, &range) < 0)
+	/* Hum... Maybe we should return an error ??? */
+	memset(&range, 0, sizeof(range));
+
+      if(range.we_version_compiled > 15)
+	{
+
+	  printf("flags = %X, index = %X\n",
+		 *flags, range.encoding_login_index);
+	  if((*flags & IW_ENCODE_INDEX) == 0)
+	    {
+	      /* Extract range info */
+	      if(iw_get_range_info(skfd, ifname, &range) < 0)
+		memset(&range, 0, sizeof(range));
+	      printf("flags = %X, index = %X\n", *flags, range.encoding_login_index);
+	      /* Set the index the driver expects */
+	      *flags |= range.encoding_login_index & IW_ENCODE_INDEX;
+	    }
+	  printf("flags = %X, index = %X\n", *flags, range.encoding_login_index);
+	}
+    }
+  else
+    /* Simpler routine above */
+    keylen = iw_in_key(input, key);
+
+  return(keylen);
+}
+
+/******************* POWER MANAGEMENT SUBROUTINES *******************/
+
+/*------------------------------------------------------------------*/
+/*
+ * Output a power management value with all attributes...
+ */
+void
+iw_print_pm_value(char *	buffer,
+		  int		buflen,
+		  int		value,
+		  int		flags,
+		  int		we_version)
+{
+  /* Check size */
+  if(buflen < 25)
+    {
+      snprintf(buffer, buflen, "<too big>");
+      return;
+    }
+  buflen -= 25;
+
+  /* Modifiers */
+  if(flags & IW_POWER_MIN)
+    {
+      strcpy(buffer, " min");				/* Size checked */
+      buffer += 4;
+    }
+  if(flags & IW_POWER_MAX)
+    {
+      strcpy(buffer, " max");				/* Size checked */
+      buffer += 4;
+    }
+
+  /* Type */
+  if(flags & IW_POWER_TIMEOUT)
+    {
+      strcpy(buffer, " timeout:");			/* Size checked */
+      buffer += 9;
+    }
+  else
+    {
+      if(flags & IW_POWER_SAVING)
+	{
+	  strcpy(buffer, " saving:");			/* Size checked */
+	  buffer += 8;
+	}
+      else
+	{
+	  strcpy(buffer, " period:");			/* Size checked */
+	  buffer += 8;
+	}
+    }
+
+  /* Display value without units */
+  if(flags & IW_POWER_RELATIVE)
+    {
+      if(we_version < 21)
+	value /= MEGA;
+      snprintf(buffer, buflen, "%d", value);
+    }
+  else
+    {
+      /* Display value with units */
+      if(value >= (int) MEGA)
+	snprintf(buffer, buflen, "%gs", ((double) value) / MEGA);
+      else
+	if(value >= (int) KILO)
+	  snprintf(buffer, buflen, "%gms", ((double) value) / KILO);
+	else
+	  snprintf(buffer, buflen, "%dus", value);
+    }
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Output a power management mode
+ */
+void
+iw_print_pm_mode(char *	buffer,
+		 int	buflen,
+		 int	flags)
+{
+  /* Check size */
+  if(buflen < 28)
+    {
+      snprintf(buffer, buflen, "<too big>");
+      return;
+    }
+
+  /* Print the proper mode... */
+  switch(flags & IW_POWER_MODE)
+    {
+    case IW_POWER_UNICAST_R:
+      strcpy(buffer, "mode:Unicast only received");	/* Size checked */
+      break;
+    case IW_POWER_MULTICAST_R:
+      strcpy(buffer, "mode:Multicast only received");	/* Size checked */
+      break;
+    case IW_POWER_ALL_R:
+      strcpy(buffer, "mode:All packets received");	/* Size checked */
+      break;
+    case IW_POWER_FORCE_S:
+      strcpy(buffer, "mode:Force sending");		/* Size checked */
+      break;
+    case IW_POWER_REPEATER:
+      strcpy(buffer, "mode:Repeat multicasts");		/* Size checked */
+      break;
+    default:
+      strcpy(buffer, "");				/* Size checked */
+      break;
+    }
+}
+
+/***************** RETRY LIMIT/LIFETIME SUBROUTINES *****************/
+
+/*------------------------------------------------------------------*/
+/*
+ * Output a retry value with all attributes...
+ */
+void
+iw_print_retry_value(char *	buffer,
+		     int	buflen,
+		     int	value,
+		     int	flags,
+		     int	we_version)
+{
+  /* Check buffer size */
+  if(buflen < 20)
+    {
+      snprintf(buffer, buflen, "<too big>");
+      return;
+    }
+  buflen -= 20;
+
+  /* Modifiers */
+  if(flags & IW_RETRY_MIN)
+    {
+      strcpy(buffer, " min");				/* Size checked */
+      buffer += 4;
+    }
+  if(flags & IW_RETRY_MAX)
+    {
+      strcpy(buffer, " max");				/* Size checked */
+      buffer += 4;
+    }
+  if(flags & IW_RETRY_SHORT)
+    {
+      strcpy(buffer, " short");				/* Size checked */
+      buffer += 6;
+    }
+  if(flags & IW_RETRY_LONG)
+    {
+      strcpy(buffer, "  long");				/* Size checked */
+      buffer += 6;
+    }
+
+  /* Type lifetime of limit */
+  if(flags & IW_RETRY_LIFETIME)
+    {
+      strcpy(buffer, " lifetime:");			/* Size checked */
+      buffer += 10;
+
+      /* Display value without units */
+      if(flags & IW_RETRY_RELATIVE)
+	{
+	  if(we_version < 21)
+	    value /= MEGA;
+	  snprintf(buffer, buflen, "%d", value);
+	}
+      else
+	{
+	  /* Display value with units */
+	  if(value >= (int) MEGA)
+	    snprintf(buffer, buflen, "%gs", ((double) value) / MEGA);
+	  else
+	    if(value >= (int) KILO)
+	      snprintf(buffer, buflen, "%gms", ((double) value) / KILO);
+	    else
+	      snprintf(buffer, buflen, "%dus", value);
+	}
+    }
+  else
+    snprintf(buffer, buflen, " limit:%d", value);
+}
+
+/************************* TIME SUBROUTINES *************************/
+
+/*------------------------------------------------------------------*/
+/*
+ * Print timestamps
+ * Inspired from irdadump...
+ */
+void
+iw_print_timeval(char *				buffer,
+		 int				buflen,
+		 const struct timeval *		timev,
+		 const struct timezone *	tz)
+{
+        int s;
+
+	s = (timev->tv_sec - tz->tz_minuteswest * 60) % 86400;
+	snprintf(buffer, buflen, "%02d:%02d:%02d.%06u", 
+		s / 3600, (s % 3600) / 60, 
+		s % 60, (u_int32_t) timev->tv_usec);
+}
+
+/*********************** ADDRESS SUBROUTINES ************************/
+/*
+ * This section is mostly a cut & past from net-tools-1.2.0
+ * (Well... This has evolved over the years)
+ * manage address display and input...
+ */
+
+/*------------------------------------------------------------------*/
+/*
+ * Check if interface support the right MAC address type...
+ */
+int
+iw_check_mac_addr_type(int		skfd,
+		       const char *	ifname)
+{
+  struct ifreq		ifr;
+
+  /* Get the type of hardware address */
+  strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
+  if((ioctl(skfd, SIOCGIFHWADDR, &ifr) < 0) ||
+     ((ifr.ifr_hwaddr.sa_family != ARPHRD_ETHER)
+      && (ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211)))
+    {
+      /* Deep trouble... */
+      fprintf(stderr, "Interface %s doesn't support MAC addresses\n",
+	     ifname);
+      return(-1);
+    }
+
+#ifdef DEBUG
+  {
+    char buf[20];
+    printf("Hardware : %d - %s\n", ifr.ifr_hwaddr.sa_family,
+	   iw_saether_ntop(&ifr.ifr_hwaddr, buf));
+  }
+#endif
+
+  return(0);
+}
+
+
+/*------------------------------------------------------------------*/
+/*
+ * Check if interface support the right interface address type...
+ */
+int
+iw_check_if_addr_type(int		skfd,
+		      const char *	ifname)
+{
+  struct ifreq		ifr;
+
+  /* Get the type of interface address */
+  strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
+  if((ioctl(skfd, SIOCGIFADDR, &ifr) < 0) ||
+     (ifr.ifr_addr.sa_family !=  AF_INET))
+    {
+      /* Deep trouble... */
+      fprintf(stderr, "Interface %s doesn't support IP addresses\n", ifname);
+      return(-1);
+    }
+
+#ifdef DEBUG
+  printf("Interface : %d - 0x%lX\n", ifr.ifr_addr.sa_family,
+	 *((unsigned long *) ifr.ifr_addr.sa_data));
+#endif
+
+  return(0);
+}
+
+#if 0
+/*------------------------------------------------------------------*/
+/*
+ * Check if interface support the right address types...
+ */
+int
+iw_check_addr_type(int		skfd,
+		   char *	ifname)
+{
+  /* Check the interface address type */
+  if(iw_check_if_addr_type(skfd, ifname) < 0)
+    return(-1);
+
+  /* Check the interface address type */
+  if(iw_check_mac_addr_type(skfd, ifname) < 0)
+    return(-1);
+
+  return(0);
+}
+#endif
+
+#if 0
+/*------------------------------------------------------------------*/
+/*
+ * Ask the kernel for the MAC address of an interface.
+ */
+int
+iw_get_mac_addr(int			skfd,
+		const char *		ifname,
+		struct ether_addr *	eth,
+		unsigned short *	ptype)
+{
+  struct ifreq	ifr;
+  int		ret;
+
+  /* Prepare request */
+  bzero(&ifr, sizeof(struct ifreq));
+  strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
+
+  /* Do it */
+  ret = ioctl(skfd, SIOCGIFHWADDR, &ifr);
+
+  memcpy(eth->ether_addr_octet, ifr.ifr_hwaddr.sa_data, 6); 
+  *ptype = ifr.ifr_hwaddr.sa_family;
+  return(ret);
+}
+#endif
+
+/*------------------------------------------------------------------*/
+/*
+ * Display an arbitrary length MAC address in readable format.
+ */
+char *
+iw_mac_ntop(const unsigned char *	mac,
+	    int				maclen,
+	    char *			buf,
+	    int				buflen)
+{
+  int	i;
+
+  /* Overflow check (don't forget '\0') */
+  if(buflen < (maclen * 3 - 1 + 1))
+    return(NULL);
+
+  /* First byte */
+  sprintf(buf, "%02X", mac[0]);
+
+  /* Other bytes */
+  for(i = 1; i < maclen; i++)
+    sprintf(buf + (i * 3) - 1, ":%02X", mac[i]);
+  return(buf);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Display an Ethernet address in readable format.
+ */
+void
+iw_ether_ntop(const struct ether_addr *	eth,
+	      char *			buf)
+{
+  sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X",
+	  eth->ether_addr_octet[0], eth->ether_addr_octet[1],
+	  eth->ether_addr_octet[2], eth->ether_addr_octet[3],
+	  eth->ether_addr_octet[4], eth->ether_addr_octet[5]);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Display an Wireless Access Point Socket Address in readable format.
+ * Note : 0x44 is an accident of history, that's what the Orinoco/PrismII
+ * chipset report, and the driver doesn't filter it.
+ */
+char *
+iw_sawap_ntop(const struct sockaddr *	sap,
+	      char *			buf)
+{
+  const struct ether_addr ether_zero = {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }};
+  const struct ether_addr ether_bcast = {{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }};
+  const struct ether_addr ether_hack = {{ 0x44, 0x44, 0x44, 0x44, 0x44, 0x44 }};
+  const struct ether_addr * ether_wap = (const struct ether_addr *) sap->sa_data;
+
+  if(!iw_ether_cmp(ether_wap, &ether_zero))
+    sprintf(buf, "Not-Associated");
+  else
+    if(!iw_ether_cmp(ether_wap, &ether_bcast))
+      sprintf(buf, "Invalid");
+    else
+      if(!iw_ether_cmp(ether_wap, &ether_hack))
+	sprintf(buf, "None");
+      else
+	iw_ether_ntop(ether_wap, buf);
+  return(buf);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Input an arbitrary length MAC address and convert to binary.
+ * Return address size.
+ */
+int
+iw_mac_aton(const char *	orig,
+	    unsigned char *	mac,
+	    int			macmax)
+{
+  const char *	p = orig;
+  int		maclen = 0;
+
+  /* Loop on all bytes of the string */
+  while(*p != '\0')
+    {
+      int	temph;
+      int	templ;
+      int	count;
+      /* Extract one byte as two chars */
+      count = sscanf(p, "%1X%1X", &temph, &templ);
+      if(count != 2)
+	break;			/* Error -> non-hex chars */
+      /* Output two chars as one byte */
+      templ |= temph << 4;
+      mac[maclen++] = (unsigned char) (templ & 0xFF);
+
+      /* Check end of string */
+      p += 2;
+      if(*p == '\0')
+	{
+#ifdef DEBUG
+	  char buf[20];
+	  iw_ether_ntop((const struct ether_addr *) mac, buf);
+	  fprintf(stderr, "iw_mac_aton(%s): %s\n", orig, buf);
+#endif
+	  return(maclen);		/* Normal exit */
+	}
+
+      /* Check overflow */
+      if(maclen >= macmax)
+	{
+#ifdef DEBUG
+	  fprintf(stderr, "iw_mac_aton(%s): trailing junk!\n", orig);
+#endif
+	  errno = E2BIG;
+	  return(0);			/* Error -> overflow */
+	}
+
+      /* Check separator */
+      if(*p != ':')
+	break;
+      p++;
+    }
+
+  /* Error... */
+#ifdef DEBUG
+  fprintf(stderr, "iw_mac_aton(%s): invalid ether address!\n", orig);
+#endif
+  errno = EINVAL;
+  return(0);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Input an Ethernet address and convert to binary.
+ */
+int
+iw_ether_aton(const char *orig, struct ether_addr *eth)
+{
+  int	maclen;
+  maclen = iw_mac_aton(orig, (unsigned char *) eth, ETH_ALEN);
+  if((maclen > 0) && (maclen < ETH_ALEN))
+    {
+      errno = EINVAL;
+      maclen = 0;
+    }
+  return(maclen);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Input an Internet address and convert to binary.
+ */
+int
+iw_in_inet(char *name, struct sockaddr *sap)
+{
+  struct hostent *hp;
+  struct netent *np;
+  struct sockaddr_in *sain = (struct sockaddr_in *) sap;
+
+  /* Grmpf. -FvK */
+  sain->sin_family = AF_INET;
+  sain->sin_port = 0;
+
+  /* Default is special, meaning 0.0.0.0. */
+  if (!strcmp(name, "default")) {
+	sain->sin_addr.s_addr = INADDR_ANY;
+	return(1);
+  }
+
+  /* Try the NETWORKS database to see if this is a known network. */
+  if ((np = getnetbyname(name)) != (struct netent *)NULL) {
+	sain->sin_addr.s_addr = htonl(np->n_net);
+	strcpy(name, np->n_name);
+	return(1);
+  }
+
+  /* Always use the resolver (DNS name + IP addresses) */
+  if ((hp = gethostbyname(name)) == (struct hostent *)NULL) {
+	errno = h_errno;
+	return(-1);
+  }
+  memcpy((char *) &sain->sin_addr, (char *) hp->h_addr_list[0], hp->h_length);
+  strcpy(name, hp->h_name);
+  return(0);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Input an address and convert to binary.
+ */
+int
+iw_in_addr(int		skfd,
+	   const char *	ifname,
+	   char *	bufp,
+	   struct sockaddr *sap)
+{
+  /* Check if it is a hardware or IP address */
+  if(strchr(bufp, ':') == NULL)
+    {
+      struct sockaddr	if_address;
+      struct arpreq	arp_query;
+
+      /* Check if we have valid interface address type */
+      if(iw_check_if_addr_type(skfd, ifname) < 0)
+	{
+	  fprintf(stderr, "%-8.16s  Interface doesn't support IP addresses\n", ifname);
+	  return(-1);
+	}
+
+      /* Read interface address */
+      if(iw_in_inet(bufp, &if_address) < 0)
+	{
+	  fprintf(stderr, "Invalid interface address %s\n", bufp);
+	  return(-1);
+	}
+
+      /* Translate IP addresses to MAC addresses */
+      memcpy((char *) &(arp_query.arp_pa),
+	     (char *) &if_address,
+	     sizeof(struct sockaddr));
+      arp_query.arp_ha.sa_family = 0;
+      arp_query.arp_flags = 0;
+      /* The following restrict the search to the interface only */
+      /* For old kernels which complain, just comment it... */
+      strncpy(arp_query.arp_dev, ifname, IFNAMSIZ);
+      if((ioctl(skfd, SIOCGARP, &arp_query) < 0) ||
+	 !(arp_query.arp_flags & ATF_COM))
+	{
+	  fprintf(stderr, "Arp failed for %s on %s... (%d)\nTry to ping the address before setting it.\n",
+		  bufp, ifname, errno);
+	  return(-1);
+	}
+
+      /* Store new MAC address */
+      memcpy((char *) sap,
+	     (char *) &(arp_query.arp_ha),
+	     sizeof(struct sockaddr));
+
+#ifdef DEBUG
+      {
+	char buf[20];
+	printf("IP Address %s => Hw Address = %s\n",
+	       bufp, iw_saether_ntop(sap, buf));
+      }
+#endif
+    }
+  else	/* If it's an hardware address */
+    {
+      /* Check if we have valid mac address type */
+      if(iw_check_mac_addr_type(skfd, ifname) < 0)
+	{
+	  fprintf(stderr, "%-8.16s  Interface doesn't support MAC addresses\n", ifname);
+	  return(-1);
+	}
+
+      /* Get the hardware address */
+      if(iw_saether_aton(bufp, sap) == 0)
+	{
+	  fprintf(stderr, "Invalid hardware address %s\n", bufp);
+	  return(-1);
+	}
+    }
+
+#ifdef DEBUG
+  {
+    char buf[20];
+    printf("Hw Address = %s\n", iw_saether_ntop(sap, buf));
+  }
+#endif
+
+  return(0);
+}
+
+/************************* MISC SUBROUTINES **************************/
+
+/* Size (in bytes) of various events */
+static const int priv_type_size[] = {
+	0,				/* IW_PRIV_TYPE_NONE */
+	1,				/* IW_PRIV_TYPE_BYTE */
+	1,				/* IW_PRIV_TYPE_CHAR */
+	0,				/* Not defined */
+	sizeof(__u32),			/* IW_PRIV_TYPE_INT */
+	sizeof(struct iw_freq),		/* IW_PRIV_TYPE_FLOAT */
+	sizeof(struct sockaddr),	/* IW_PRIV_TYPE_ADDR */
+	0,				/* Not defined */
+};
+
+/*------------------------------------------------------------------*/
+/*
+ * Max size in bytes of an private argument.
+ */
+int
+iw_get_priv_size(int	args)
+{
+  int	num = args & IW_PRIV_SIZE_MASK;
+  int	type = (args & IW_PRIV_TYPE_MASK) >> 12;
+
+  return(num * priv_type_size[type]);
+}
+
+/************************ EVENT SUBROUTINES ************************/
+/*
+ * The Wireless Extension API 14 and greater define Wireless Events,
+ * that are used for various events and scanning.
+ * Those functions help the decoding of events, so are needed only in
+ * this case.
+ */
+
+/* -------------------------- CONSTANTS -------------------------- */
+
+/* Type of headers we know about (basically union iwreq_data) */
+#define IW_HEADER_TYPE_NULL	0	/* Not available */
+#define IW_HEADER_TYPE_CHAR	2	/* char [IFNAMSIZ] */
+#define IW_HEADER_TYPE_UINT	4	/* __u32 */
+#define IW_HEADER_TYPE_FREQ	5	/* struct iw_freq */
+#define IW_HEADER_TYPE_ADDR	6	/* struct sockaddr */
+#define IW_HEADER_TYPE_POINT	8	/* struct iw_point */
+#define IW_HEADER_TYPE_PARAM	9	/* struct iw_param */
+#define IW_HEADER_TYPE_QUAL	10	/* struct iw_quality */
+
+/* Handling flags */
+/* Most are not implemented. I just use them as a reminder of some
+ * cool features we might need one day ;-) */
+#define IW_DESCR_FLAG_NONE	0x0000	/* Obvious */
+/* Wrapper level flags */
+#define IW_DESCR_FLAG_DUMP	0x0001	/* Not part of the dump command */
+#define IW_DESCR_FLAG_EVENT	0x0002	/* Generate an event on SET */
+#define IW_DESCR_FLAG_RESTRICT	0x0004	/* GET : request is ROOT only */
+				/* SET : Omit payload from generated iwevent */
+#define IW_DESCR_FLAG_NOMAX	0x0008	/* GET : no limit on request size */
+/* Driver level flags */
+#define IW_DESCR_FLAG_WAIT	0x0100	/* Wait for driver event */
+
+/* ---------------------------- TYPES ---------------------------- */
+
+/*
+ * Describe how a standard IOCTL looks like.
+ */
+struct iw_ioctl_description
+{
+	__u8	header_type;		/* NULL, iw_point or other */
+	__u8	token_type;		/* Future */
+	__u16	token_size;		/* Granularity of payload */
+	__u16	min_tokens;		/* Min acceptable token number */
+	__u16	max_tokens;		/* Max acceptable token number */
+	__u32	flags;			/* Special handling of the request */
+};
+
+/* -------------------------- VARIABLES -------------------------- */
+
+/*
+ * Meta-data about all the standard Wireless Extension request we
+ * know about.
+ */
+static const struct iw_ioctl_description standard_ioctl_descr[] = {
+	[SIOCSIWCOMMIT	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_NULL,
+	},
+	[SIOCGIWNAME	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_CHAR,
+		.flags		= IW_DESCR_FLAG_DUMP,
+	},
+	[SIOCSIWNWID	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_PARAM,
+		.flags		= IW_DESCR_FLAG_EVENT,
+	},
+	[SIOCGIWNWID	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_PARAM,
+		.flags		= IW_DESCR_FLAG_DUMP,
+	},
+	[SIOCSIWFREQ	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_FREQ,
+		.flags		= IW_DESCR_FLAG_EVENT,
+	},
+	[SIOCGIWFREQ	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_FREQ,
+		.flags		= IW_DESCR_FLAG_DUMP,
+	},
+	[SIOCSIWMODE	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_UINT,
+		.flags		= IW_DESCR_FLAG_EVENT,
+	},
+	[SIOCGIWMODE	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_UINT,
+		.flags		= IW_DESCR_FLAG_DUMP,
+	},
+	[SIOCSIWSENS	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_PARAM,
+	},
+	[SIOCGIWSENS	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_PARAM,
+	},
+	[SIOCSIWRANGE	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_NULL,
+	},
+	[SIOCGIWRANGE	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= 1,
+		.max_tokens	= sizeof(struct iw_range),
+		.flags		= IW_DESCR_FLAG_DUMP,
+	},
+	[SIOCSIWPRIV	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_NULL,
+	},
+	[SIOCGIWPRIV	- SIOCIWFIRST] = { /* (handled directly by us) */
+		.header_type	= IW_HEADER_TYPE_NULL,
+	},
+	[SIOCSIWSTATS	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_NULL,
+	},
+	[SIOCGIWSTATS	- SIOCIWFIRST] = { /* (handled directly by us) */
+		.header_type	= IW_HEADER_TYPE_NULL,
+		.flags		= IW_DESCR_FLAG_DUMP,
+	},
+	[SIOCSIWSPY	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= sizeof(struct sockaddr),
+		.max_tokens	= IW_MAX_SPY,
+	},
+	[SIOCGIWSPY	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= sizeof(struct sockaddr) +
+				  sizeof(struct iw_quality),
+		.max_tokens	= IW_MAX_SPY,
+	},
+	[SIOCSIWTHRSPY	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= sizeof(struct iw_thrspy),
+		.min_tokens	= 1,
+		.max_tokens	= 1,
+	},
+	[SIOCGIWTHRSPY	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= sizeof(struct iw_thrspy),
+		.min_tokens	= 1,
+		.max_tokens	= 1,
+	},
+	[SIOCSIWAP	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_ADDR,
+	},
+	[SIOCGIWAP	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_ADDR,
+		.flags		= IW_DESCR_FLAG_DUMP,
+	},
+	[SIOCSIWMLME	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= 1,
+		.min_tokens	= sizeof(struct iw_mlme),
+		.max_tokens	= sizeof(struct iw_mlme),
+	},
+	[SIOCGIWAPLIST	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= sizeof(struct sockaddr) +
+				  sizeof(struct iw_quality),
+		.max_tokens	= IW_MAX_AP,
+		.flags		= IW_DESCR_FLAG_NOMAX,
+	},
+	[SIOCSIWSCAN	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= 1,
+		.min_tokens	= 0,
+		.max_tokens	= sizeof(struct iw_scan_req),
+	},
+	[SIOCGIWSCAN	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= 1,
+		.max_tokens	= IW_SCAN_MAX_DATA,
+		.flags		= IW_DESCR_FLAG_NOMAX,
+	},
+	[SIOCSIWESSID	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= 1,
+		.max_tokens	= IW_ESSID_MAX_SIZE + 1,
+		.flags		= IW_DESCR_FLAG_EVENT,
+	},
+	[SIOCGIWESSID	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= 1,
+		.max_tokens	= IW_ESSID_MAX_SIZE + 1,
+		.flags		= IW_DESCR_FLAG_DUMP,
+	},
+	[SIOCSIWNICKN	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= 1,
+		.max_tokens	= IW_ESSID_MAX_SIZE + 1,
+	},
+	[SIOCGIWNICKN	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= 1,
+		.max_tokens	= IW_ESSID_MAX_SIZE + 1,
+	},
+	[SIOCSIWRATE	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_PARAM,
+	},
+	[SIOCGIWRATE	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_PARAM,
+	},
+	[SIOCSIWRTS	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_PARAM,
+	},
+	[SIOCGIWRTS	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_PARAM,
+	},
+	[SIOCSIWFRAG	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_PARAM,
+	},
+	[SIOCGIWFRAG	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_PARAM,
+	},
+	[SIOCSIWTXPOW	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_PARAM,
+	},
+	[SIOCGIWTXPOW	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_PARAM,
+	},
+	[SIOCSIWRETRY	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_PARAM,
+	},
+	[SIOCGIWRETRY	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_PARAM,
+	},
+	[SIOCSIWENCODE	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= 1,
+		.max_tokens	= IW_ENCODING_TOKEN_MAX,
+		.flags		= IW_DESCR_FLAG_EVENT | IW_DESCR_FLAG_RESTRICT,
+	},
+	[SIOCGIWENCODE	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= 1,
+		.max_tokens	= IW_ENCODING_TOKEN_MAX,
+		.flags		= IW_DESCR_FLAG_DUMP | IW_DESCR_FLAG_RESTRICT,
+	},
+	[SIOCSIWPOWER	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_PARAM,
+	},
+	[SIOCGIWPOWER	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_PARAM,
+	},
+	[SIOCSIWMODUL	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_PARAM,
+	},
+	[SIOCGIWMODUL	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_PARAM,
+	},
+	[SIOCSIWGENIE	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= 1,
+		.max_tokens	= IW_GENERIC_IE_MAX,
+	},
+	[SIOCGIWGENIE	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= 1,
+		.max_tokens	= IW_GENERIC_IE_MAX,
+	},
+	[SIOCSIWAUTH	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_PARAM,
+	},
+	[SIOCGIWAUTH	- SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_PARAM,
+	},
+	[SIOCSIWENCODEEXT - SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= 1,
+		.min_tokens	= sizeof(struct iw_encode_ext),
+		.max_tokens	= sizeof(struct iw_encode_ext) +
+				  IW_ENCODING_TOKEN_MAX,
+	},
+	[SIOCGIWENCODEEXT - SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= 1,
+		.min_tokens	= sizeof(struct iw_encode_ext),
+		.max_tokens	= sizeof(struct iw_encode_ext) +
+				  IW_ENCODING_TOKEN_MAX,
+	},
+	[SIOCSIWPMKSA - SIOCIWFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= 1,
+		.min_tokens	= sizeof(struct iw_pmksa),
+		.max_tokens	= sizeof(struct iw_pmksa),
+	},
+};
+static const unsigned int standard_ioctl_num = (sizeof(standard_ioctl_descr) /
+						sizeof(struct iw_ioctl_description));
+
+/*
+ * Meta-data about all the additional standard Wireless Extension events
+ * we know about.
+ */
+static const struct iw_ioctl_description standard_event_descr[] = {
+	[IWEVTXDROP	- IWEVFIRST] = {
+		.header_type	= IW_HEADER_TYPE_ADDR,
+	},
+	[IWEVQUAL	- IWEVFIRST] = {
+		.header_type	= IW_HEADER_TYPE_QUAL,
+	},
+	[IWEVCUSTOM	- IWEVFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= 1,
+		.max_tokens	= IW_CUSTOM_MAX,
+	},
+	[IWEVREGISTERED	- IWEVFIRST] = {
+		.header_type	= IW_HEADER_TYPE_ADDR,
+	},
+	[IWEVEXPIRED	- IWEVFIRST] = {
+		.header_type	= IW_HEADER_TYPE_ADDR, 
+	},
+	[IWEVGENIE	- IWEVFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= 1,
+		.max_tokens	= IW_GENERIC_IE_MAX,
+	},
+	[IWEVMICHAELMICFAILURE	- IWEVFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT, 
+		.token_size	= 1,
+		.max_tokens	= sizeof(struct iw_michaelmicfailure),
+	},
+	[IWEVASSOCREQIE	- IWEVFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= 1,
+		.max_tokens	= IW_GENERIC_IE_MAX,
+	},
+	[IWEVASSOCRESPIE	- IWEVFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= 1,
+		.max_tokens	= IW_GENERIC_IE_MAX,
+	},
+	[IWEVPMKIDCAND	- IWEVFIRST] = {
+		.header_type	= IW_HEADER_TYPE_POINT,
+		.token_size	= 1,
+		.max_tokens	= sizeof(struct iw_pmkid_cand),
+	},
+};
+static const unsigned int standard_event_num = (sizeof(standard_event_descr) /
+						sizeof(struct iw_ioctl_description));
+
+/* Size (in bytes) of various events */
+static const int event_type_size[] = {
+	IW_EV_LCP_PK_LEN,	/* IW_HEADER_TYPE_NULL */
+	0,
+	IW_EV_CHAR_PK_LEN,	/* IW_HEADER_TYPE_CHAR */
+	0,
+	IW_EV_UINT_PK_LEN,	/* IW_HEADER_TYPE_UINT */
+	IW_EV_FREQ_PK_LEN,	/* IW_HEADER_TYPE_FREQ */
+	IW_EV_ADDR_PK_LEN,	/* IW_HEADER_TYPE_ADDR */
+	0,
+	IW_EV_POINT_PK_LEN,	/* Without variable payload */
+	IW_EV_PARAM_PK_LEN,	/* IW_HEADER_TYPE_PARAM */
+	IW_EV_QUAL_PK_LEN,	/* IW_HEADER_TYPE_QUAL */
+};
+
+/*------------------------------------------------------------------*/
+/*
+ * Initialise the struct stream_descr so that we can extract
+ * individual events from the event stream.
+ */
+void
+iw_init_event_stream(struct stream_descr *	stream,	/* Stream of events */
+		     char *			data,
+		     int			len)
+{
+  /* Cleanup */
+  memset((char *) stream, '\0', sizeof(struct stream_descr));
+
+  /* Set things up */
+  stream->current = data;
+  stream->end = data + len;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Extract the next event from the event stream.
+ */
+int
+iw_extract_event_stream(struct stream_descr *	stream,	/* Stream of events */
+			struct iw_event *	iwe,	/* Extracted event */
+			int			we_version)
+{
+  const struct iw_ioctl_description *	descr = NULL;
+  int		event_type = 0;
+  unsigned int	event_len = 1;		/* Invalid */
+  char *	pointer;
+  /* Don't "optimise" the following variable, it will crash */
+  unsigned	cmd_index;		/* *MUST* be unsigned */
+
+  /* Check for end of stream */
+  if((stream->current + IW_EV_LCP_PK_LEN) > stream->end)
+    return(0);
+
+#ifdef DEBUG
+  printf("DBG - stream->current = %p, stream->value = %p, stream->end = %p\n",
+	 stream->current, stream->value, stream->end);
+#endif
+
+  /* Extract the event header (to get the event id).
+   * Note : the event may be unaligned, therefore copy... */
+  memcpy((char *) iwe, stream->current, IW_EV_LCP_PK_LEN);
+
+#ifdef DEBUG
+  printf("DBG - iwe->cmd = 0x%X, iwe->len = %d\n",
+	 iwe->cmd, iwe->len);
+#endif
+
+  /* Check invalid events */
+  if(iwe->len <= IW_EV_LCP_PK_LEN)
+    return(-1);
+
+  /* Get the type and length of that event */
+  if(iwe->cmd <= SIOCIWLAST)
+    {
+      cmd_index = iwe->cmd - SIOCIWFIRST;
+      if(cmd_index < standard_ioctl_num)
+	descr = &(standard_ioctl_descr[cmd_index]);
+    }
+  else
+    {
+      cmd_index = iwe->cmd - IWEVFIRST;
+      if(cmd_index < standard_event_num)
+	descr = &(standard_event_descr[cmd_index]);
+    }
+  if(descr != NULL)
+    event_type = descr->header_type;
+  /* Unknown events -> event_type=0 => IW_EV_LCP_PK_LEN */
+  event_len = event_type_size[event_type];
+  /* Fixup for earlier version of WE */
+  if((we_version <= 18) && (event_type == IW_HEADER_TYPE_POINT))
+    event_len += IW_EV_POINT_OFF;
+
+  /* Check if we know about this event */
+  if(event_len <= IW_EV_LCP_PK_LEN)
+    {
+      /* Skip to next event */
+      stream->current += iwe->len;
+      return(2);
+    }
+  event_len -= IW_EV_LCP_PK_LEN;
+
+  /* Set pointer on data */
+  if(stream->value != NULL)
+    pointer = stream->value;			/* Next value in event */
+  else
+    pointer = stream->current + IW_EV_LCP_PK_LEN;	/* First value in event */
+
+#ifdef DEBUG
+  printf("DBG - event_type = %d, event_len = %d, pointer = %p\n",
+	 event_type, event_len, pointer);
+#endif
+
+  /* Copy the rest of the event (at least, fixed part) */
+  if((pointer + event_len) > stream->end)
+    {
+      /* Go to next event */
+      stream->current += iwe->len;
+      return(-2);
+    }
+  /* Fixup for WE-19 and later : pointer no longer in the stream */
+  /* Beware of alignement. Dest has local alignement, not packed */
+  if((we_version > 18) && (event_type == IW_HEADER_TYPE_POINT))
+    memcpy((char *) iwe + IW_EV_LCP_LEN + IW_EV_POINT_OFF,
+	   pointer, event_len);
+  else
+    memcpy((char *) iwe + IW_EV_LCP_LEN, pointer, event_len);
+
+  /* Skip event in the stream */
+  pointer += event_len;
+
+  /* Special processing for iw_point events */
+  if(event_type == IW_HEADER_TYPE_POINT)
+    {
+      /* Check the length of the payload */
+      unsigned int	extra_len = iwe->len - (event_len + IW_EV_LCP_PK_LEN);
+      if(extra_len > 0)
+	{
+	  /* Set pointer on variable part (warning : non aligned) */
+	  iwe->u.data.pointer = pointer;
+
+	  /* Check that we have a descriptor for the command */
+	  if(descr == NULL)
+	    /* Can't check payload -> unsafe... */
+	    iwe->u.data.pointer = NULL;	/* Discard paylod */
+	  else
+	    {
+	      /* Those checks are actually pretty hard to trigger,
+	       * because of the checks done in the kernel... */
+
+	      unsigned int	token_len = iwe->u.data.length * descr->token_size;
+
+	      /* Ugly fixup for alignement issues.
+	       * If the kernel is 64 bits and userspace 32 bits,
+	       * we have an extra 4+4 bytes.
+	       * Fixing that in the kernel would break 64 bits userspace. */
+	      if((token_len != extra_len) && (extra_len >= 4))
+		{
+		  __u16		alt_dlen = *((__u16 *) pointer);
+		  unsigned int	alt_token_len = alt_dlen * descr->token_size;
+		  if((alt_token_len + 8) == extra_len)
+		    {
+#ifdef DEBUG
+		      printf("DBG - alt_token_len = %d\n", alt_token_len);
+#endif
+		      /* Ok, let's redo everything */
+		      pointer -= event_len;
+		      pointer += 4;
+		      /* Dest has local alignement, not packed */
+		      memcpy((char *) iwe + IW_EV_LCP_LEN + IW_EV_POINT_OFF,
+			     pointer, event_len);
+		      pointer += event_len + 4;
+		      iwe->u.data.pointer = pointer;
+		      token_len = alt_token_len;
+		    }
+		}
+
+	      /* Discard bogus events which advertise more tokens than
+	       * what they carry... */
+	      if(token_len > extra_len)
+		iwe->u.data.pointer = NULL;	/* Discard paylod */
+	      /* Check that the advertised token size is not going to
+	       * produce buffer overflow to our caller... */
+	      if((iwe->u.data.length > descr->max_tokens)
+		 && !(descr->flags & IW_DESCR_FLAG_NOMAX))
+		iwe->u.data.pointer = NULL;	/* Discard paylod */
+	      /* Same for underflows... */
+	      if(iwe->u.data.length < descr->min_tokens)
+		iwe->u.data.pointer = NULL;	/* Discard paylod */
+#ifdef DEBUG
+	      printf("DBG - extra_len = %d, token_len = %d, token = %d, max = %d, min = %d\n",
+		     extra_len, token_len, iwe->u.data.length, descr->max_tokens, descr->min_tokens);
+#endif
+	    }
+	}
+      else
+	/* No data */
+	iwe->u.data.pointer = NULL;
+
+      /* Go to next event */
+      stream->current += iwe->len;
+    }
+  else
+    {
+      /* Ugly fixup for alignement issues.
+       * If the kernel is 64 bits and userspace 32 bits,
+       * we have an extra 4 bytes.
+       * Fixing that in the kernel would break 64 bits userspace. */
+      if((stream->value == NULL)
+	 && ((((iwe->len - IW_EV_LCP_PK_LEN) % event_len) == 4)
+	     || ((iwe->len == 12) && ((event_type == IW_HEADER_TYPE_UINT) ||
+				      (event_type == IW_HEADER_TYPE_QUAL))) ))
+	{
+#ifdef DEBUG
+	  printf("DBG - alt iwe->len = %d\n", iwe->len - 4);
+#endif
+	  pointer -= event_len;
+	  pointer += 4;
+	  /* Beware of alignement. Dest has local alignement, not packed */
+	  memcpy((char *) iwe + IW_EV_LCP_LEN, pointer, event_len);
+	  pointer += event_len;
+	}
+
+      /* Is there more value in the event ? */
+      if((pointer + event_len) <= (stream->current + iwe->len))
+	/* Go to next value */
+	stream->value = pointer;
+      else
+	{
+	  /* Go to next event */
+	  stream->value = NULL;
+	  stream->current += iwe->len;
+	}
+    }
+  return(1);
+}
+
+/*********************** SCANNING SUBROUTINES ***********************/
+/*
+ * The Wireless Extension API 14 and greater define Wireless Scanning.
+ * The normal API is complex, this is an easy API that return
+ * a subset of the scanning results. This should be enough for most
+ * applications that want to use Scanning.
+ * If you want to have use the full/normal API, check iwlist.c...
+ *
+ * Precaution when using scanning :
+ * The scanning operation disable normal network traffic, and therefore
+ * you should not abuse of scan.
+ * The scan need to check the presence of network on other frequencies.
+ * While you are checking those other frequencies, you can *NOT* be on
+ * your normal frequency to listen to normal traffic in the cell.
+ * You need typically in the order of one second to actively probe all
+ * 802.11b channels (do the maths). Some cards may do that in background,
+ * to reply to scan commands faster, but they still have to do it.
+ * Leaving the cell for such an extended period of time is pretty bad.
+ * Any kind of streaming/low latency traffic will be impacted, and the
+ * user will perceive it (easily checked with telnet). People trying to
+ * send traffic to you will retry packets and waste bandwidth. Some
+ * applications may be sensitive to those packet losses in weird ways,
+ * and tracing those weird behavior back to scanning may take time.
+ * If you are in ad-hoc mode, if two nodes scan approx at the same
+ * time, they won't see each other, which may create associations issues.
+ * For those reasons, the scanning activity should be limited to
+ * what's really needed, and continuous scanning is a bad idea.
+ * Jean II
+ */
+
+/*------------------------------------------------------------------*/
+/*
+ * Process/store one element from the scanning results in wireless_scan
+ */
+static inline struct wireless_scan *
+iw_process_scanning_token(struct iw_event *		event,
+			  struct wireless_scan *	wscan)
+{
+  struct wireless_scan *	oldwscan;
+
+  /* Now, let's decode the event */
+  switch(event->cmd)
+    {
+    case SIOCGIWAP:
+      /* New cell description. Allocate new cell descriptor, zero it. */
+      oldwscan = wscan;
+      wscan = (struct wireless_scan *) malloc(sizeof(struct wireless_scan));
+      if(wscan == NULL)
+	return(wscan);
+      /* Link at the end of the list */
+      if(oldwscan != NULL)
+	oldwscan->next = wscan;
+
+      /* Reset it */
+      bzero(wscan, sizeof(struct wireless_scan));
+
+      /* Save cell identifier */
+      wscan->has_ap_addr = 1;
+      memcpy(&(wscan->ap_addr), &(event->u.ap_addr), sizeof (sockaddr));
+      break;
+    case SIOCGIWNWID:
+      wscan->b.has_nwid = 1;
+      memcpy(&(wscan->b.nwid), &(event->u.nwid), sizeof(iwparam));
+      break;
+    case SIOCGIWFREQ:
+      wscan->b.has_freq = 1;
+      wscan->b.freq = iw_freq2float(&(event->u.freq));
+      wscan->b.freq_flags = event->u.freq.flags;
+      break;
+    case SIOCGIWMODE:
+      wscan->b.mode = event->u.mode;
+      if((wscan->b.mode < IW_NUM_OPER_MODE) && (wscan->b.mode >= 0))
+	wscan->b.has_mode = 1;
+      break;
+    case SIOCGIWESSID:
+      wscan->b.has_essid = 1;
+      wscan->b.essid_on = event->u.data.flags;
+      memset(wscan->b.essid, '\0', IW_ESSID_MAX_SIZE+1);
+      if((event->u.essid.pointer) && (event->u.essid.length))
+	memcpy(wscan->b.essid, event->u.essid.pointer, event->u.essid.length);
+      break;
+    case SIOCGIWENCODE:
+      wscan->b.has_key = 1;
+      wscan->b.key_size = event->u.data.length;
+      wscan->b.key_flags = event->u.data.flags;
+      if(event->u.data.pointer)
+	memcpy(wscan->b.key, event->u.essid.pointer, event->u.data.length);
+      else
+	wscan->b.key_flags |= IW_ENCODE_NOKEY;
+      break;
+    case IWEVQUAL:
+      /* We don't get complete stats, only qual */
+      wscan->has_stats = 1;
+      memcpy(&wscan->stats.qual, &event->u.qual, sizeof(struct iw_quality));
+      break;
+    case SIOCGIWRATE:
+      /* Scan may return a list of bitrates. As we have space for only
+       * a single bitrate, we only keep the largest one. */
+      if((!wscan->has_maxbitrate) ||
+	 (event->u.bitrate.value > wscan->maxbitrate.value))
+	{
+	  wscan->has_maxbitrate = 1;
+	  memcpy(&(wscan->maxbitrate), &(event->u.bitrate), sizeof(iwparam));
+	}
+    case IWEVCUSTOM:
+      /* How can we deal with those sanely ? Jean II */
+    default:
+      break;
+   }	/* switch(event->cmd) */
+
+  return(wscan);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Initiate the scan procedure, and process results.
+ * This is a non-blocking procedure and it will return each time
+ * it would block, returning the amount of time the caller should wait
+ * before calling again.
+ * Return -1 for error, delay to wait for (in ms), or 0 for success.
+ * Error code is in errno
+ */
+int
+iw_process_scan(int			skfd,
+		char *			ifname,
+		int			we_version,
+		wireless_scan_head *	context)
+{
+  struct iwreq		wrq;
+  unsigned char *	buffer = NULL;		/* Results */
+  int			buflen = IW_SCAN_MAX_DATA; /* Min for compat WE<17 */
+  unsigned char *	newbuf;
+
+  /* Don't waste too much time on interfaces (150 * 100 = 15s) */
+  context->retry++;
+  if(context->retry > 150)
+    {
+      errno = ETIME;
+      return(-1);
+    }
+
+  /* If we have not yet initiated scanning on the interface */
+  if(context->retry == 1)
+    {
+      /* Initiate Scan */
+      wrq.u.data.pointer = NULL;		/* Later */
+      wrq.u.data.flags = 0;
+      wrq.u.data.length = 0;
+      /* Remember that as non-root, we will get an EPERM here */
+      if((iw_set_ext(skfd, ifname, SIOCSIWSCAN, &wrq) < 0)
+	 && (errno != EPERM))
+	return(-1);
+      /* Success : now, just wait for event or results */
+      return(250);	/* Wait 250 ms */
+    }
+
+ realloc:
+  /* (Re)allocate the buffer - realloc(NULL, len) == malloc(len) */
+  newbuf = realloc(buffer, buflen);
+  if(newbuf == NULL)
+    {
+      /* man says : If realloc() fails the original block is left untouched */
+      if(buffer)
+	free(buffer);
+      errno = ENOMEM;
+      return(-1);
+    }
+  buffer = newbuf;
+
+  /* Try to read the results */
+  wrq.u.data.pointer = buffer;
+  wrq.u.data.flags = 0;
+  wrq.u.data.length = buflen;
+  if(iw_get_ext(skfd, ifname, SIOCGIWSCAN, &wrq) < 0)
+    {
+      /* Check if buffer was too small (WE-17 only) */
+      if((errno == E2BIG) && (we_version > 16))
+	{
+	  /* Some driver may return very large scan results, either
+	   * because there are many cells, or because they have many
+	   * large elements in cells (like IWEVCUSTOM). Most will
+	   * only need the regular sized buffer. We now use a dynamic
+	   * allocation of the buffer to satisfy everybody. Of course,
+	   * as we don't know in advance the size of the array, we try
+	   * various increasing sizes. Jean II */
+
+	  /* Check if the driver gave us any hints. */
+	  if(wrq.u.data.length > buflen)
+	    buflen = wrq.u.data.length;
+	  else
+	    buflen *= 2;
+
+	  /* Try again */
+	  goto realloc;
+	}
+
+      /* Check if results not available yet */
+      if(errno == EAGAIN)
+	{
+	  free(buffer);
+	  /* Wait for only 100ms from now on */
+	  return(100);	/* Wait 100 ms */
+	}
+
+      free(buffer);
+      /* Bad error, please don't come back... */
+      return(-1);
+    }
+
+  /* We have the results, process them */
+  if(wrq.u.data.length)
+    {
+      struct iw_event		iwe;
+      struct stream_descr	stream;
+      struct wireless_scan *	wscan = NULL;
+      int			ret;
+#ifdef DEBUG
+      /* Debugging code. In theory useless, because it's debugged ;-) */
+      int	i;
+      printf("Scan result [%02X", buffer[0]);
+      for(i = 1; i < wrq.u.data.length; i++)
+	printf(":%02X", buffer[i]);
+      printf("]\n");
+#endif
+
+      /* Init */
+      iw_init_event_stream(&stream, (char *) buffer, wrq.u.data.length);
+      /* This is dangerous, we may leak user data... */
+      context->result = NULL;
+
+      /* Look every token */
+      do
+	{
+	  /* Extract an event and print it */
+	  ret = iw_extract_event_stream(&stream, &iwe, we_version);
+	  if(ret > 0)
+	    {
+	      /* Convert to wireless_scan struct */
+	      wscan = iw_process_scanning_token(&iwe, wscan);
+	      /* Check problems */
+	      if(wscan == NULL)
+		{
+		  free(buffer);
+		  errno = ENOMEM;
+		  return(-1);
+		}
+	      /* Save head of list */
+	      if(context->result == NULL)
+		context->result = wscan;
+	    }
+	}
+      while(ret > 0);
+    }
+
+  /* Done with this interface - return success */
+  free(buffer);
+  return(0);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Perform a wireless scan on the specified interface.
+ * This is a blocking procedure and it will when the scan is completed
+ * or when an error occur.
+ *
+ * The scan results are given in a linked list of wireless_scan objects.
+ * The caller *must* free the result himself (by walking the list).
+ * If there is an error, -1 is returned and the error code is available
+ * in errno.
+ *
+ * The parameter we_version can be extracted from the range structure
+ * (range.we_version_compiled - see iw_get_range_info()), or using
+ * iw_get_kernel_we_version(). For performance reason, you should
+ * cache this parameter when possible rather than querying it every time.
+ *
+ * Return -1 for error and 0 for success.
+ */
+int
+iw_scan(int			skfd,
+	char *			ifname,
+	int			we_version,
+	wireless_scan_head *	context)
+{
+  int		delay;		/* in ms */
+
+  /* Clean up context. Potential memory leak if(context.result != NULL) */
+  context->result = NULL;
+  context->retry = 0;
+
+  /* Wait until we get results or error */
+  while(1)
+    {
+      /* Try to get scan results */
+      delay = iw_process_scan(skfd, ifname, we_version, context);
+
+      /* Check termination */
+      if(delay <= 0)
+	break;
+
+      /* Wait a bit */
+      usleep(delay * 1000);
+    }
+
+  /* End - return -1 or 0 */
+  return(delay);
+}
diff --git a/lib/libiw/iwlib.h b/lib/libiw/iwlib.h
new file mode 100644
index 000000000..31cf39b73
--- /dev/null
+++ b/lib/libiw/iwlib.h
@@ -0,0 +1,600 @@
+/*
+ *	Wireless Tools
+ *
+ *		Jean II - HPLB 97->99 - HPL 99->07
+ *
+ * Common header for the Wireless Extension library...
+ *
+ * This file is released under the GPL license.
+ *     Copyright (c) 1997-2007 Jean Tourrilhes <jt@hpl.hp.com>
+ */
+
+#ifndef IWLIB_H
+#define IWLIB_H
+
+/*#include "CHANGELOG.h"*/
+
+/***************************** INCLUDES *****************************/
+
+/* Standard headers */
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <stdio.h>
+#include <math.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <netdb.h>		/* gethostbyname, getnetbyname */
+#include <net/ethernet.h>	/* struct ether_addr */
+#include <sys/time.h>		/* struct timeval */
+#include <unistd.h>
+
+/* This is our header selection. Try to hide the mess and the misery :-(
+ * Don't look, you would go blind ;-)
+ * Note : compatibility with *old* distributions has been removed,
+ * you will need Glibc 2.2 and older to compile (which means 
+ * Mandrake 8.0, Debian 2.3, RH 7.1 or older).
+ */
+
+/* Set of headers proposed by Dr. Michael Rietz <rietz@mail.amps.de>, 27.3.2 */
+#include <net/if_arp.h>		/* For ARPHRD_ETHER */
+#include <sys/socket.h>		/* For AF_INET & struct sockaddr */
+#include <netinet/in.h>         /* For struct sockaddr_in */
+#include <netinet/if_ether.h>
+
+/* Fixup to be able to include kernel includes in userspace.
+ * Basically, kill the sparse annotations... Jean II */
+#ifndef __user
+#define __user
+#endif
+
+#include <linux/types.h>		/* for "caddr_t" et al		*/
+
+/* Glibc systems headers are supposedly less problematic than kernel ones */
+#include <sys/socket.h>			/* for "struct sockaddr" et al	*/
+#include <net/if.h>			/* for IFNAMSIZ and co... */
+
+/* Private copy of Wireless extensions (in this directoty) */
+#include "wireless.h"
+
+/* Make gcc understant that when we say inline, we mean it.
+ * I really hate when the compiler is trying to be more clever than me,
+ * because in this case gcc is not able to figure out functions with a
+ * single call site, so not only I have to tag those functions inline
+ * by hand, but then it refuse to inline them properly.
+ * Total saving for iwevent : 150B = 0.7%.
+ * Fortunately, in gcc 3.4, they now automatically inline static functions
+ * with a single call site. Hurrah !
+ * Jean II */
+#undef IW_GCC_HAS_BROKEN_INLINE
+#if __GNUC__ == 3
+#if __GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 4
+#define IW_GCC_HAS_BROKEN_INLINE	1
+#endif	/* __GNUC_MINOR__ */
+#endif	/* __GNUC__ */
+/* However, gcc 4.0 has introduce a new "feature", when compiling with
+ * '-Os', it does not want to inline iw_ether_cmp() and friends.
+ * So, we need to fix inline again !
+ * Jean II */
+#if __GNUC__ == 4
+#define IW_GCC_HAS_BROKEN_INLINE	1
+#endif	/* __GNUC__ */
+/* Now, really fix the inline */
+#ifdef IW_GCC_HAS_BROKEN_INLINE
+#ifdef inline
+#undef inline
+#endif	/* inline */
+#define inline		inline		__attribute__((always_inline))
+#endif	/* IW_GCC_HAS_BROKEN_INLINE */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/****************************** DEBUG ******************************/
+
+//#define DEBUG 1
+
+/************************ CONSTANTS & MACROS ************************/
+
+/* Various versions information */
+/* Recommended Wireless Extension version */
+#define WE_VERSION	21
+/* Maximum forward compatibility built in this version of WT */
+#define WE_MAX_VERSION	22
+/* Version of Wireless Tools */
+#define WT_VERSION	29
+
+/* Paths */
+#define PROC_NET_WIRELESS	"/proc/net/wireless"
+#define PROC_NET_DEV		"/proc/net/dev"
+
+/* Some usefull constants */
+#define KILO	1e3
+#define MEGA	1e6
+#define GIGA	1e9
+/* For doing log10/exp10 without libm */
+#define LOG10_MAGIC	1.25892541179
+
+/* Backward compatibility for network headers */
+#ifndef ARPHRD_IEEE80211
+#define ARPHRD_IEEE80211 801		/* IEEE 802.11			*/
+#endif /* ARPHRD_IEEE80211 */
+
+#ifndef IW_EV_LCP_PK_LEN
+/* Size of the Event prefix when packed in stream */
+#define IW_EV_LCP_PK_LEN	(4)
+/* Size of the various events when packed in stream */
+#define IW_EV_CHAR_PK_LEN	(IW_EV_LCP_PK_LEN + IFNAMSIZ)
+#define IW_EV_UINT_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(__u32))
+#define IW_EV_FREQ_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct iw_freq))
+#define IW_EV_PARAM_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct iw_param))
+#define IW_EV_ADDR_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct sockaddr))
+#define IW_EV_QUAL_PK_LEN	(IW_EV_LCP_PK_LEN + sizeof(struct iw_quality))
+#define IW_EV_POINT_PK_LEN	(IW_EV_LCP_PK_LEN + 4)
+
+struct iw_pk_event
+{
+	__u16		len;			/* Real lenght of this stuff */
+	__u16		cmd;			/* Wireless IOCTL */
+	union iwreq_data	u;		/* IOCTL fixed payload */
+} __attribute__ ((packed));
+struct	iw_pk_point
+{
+  void __user	*pointer;	/* Pointer to the data  (in user space) */
+  __u16		length;		/* number of fields or size in bytes */
+  __u16		flags;		/* Optional params */
+} __attribute__ ((packed));
+
+#define IW_EV_LCP_PK2_LEN	(sizeof(struct iw_pk_event) - sizeof(union iwreq_data))
+#define IW_EV_POINT_PK2_LEN	(IW_EV_LCP_PK2_LEN + sizeof(struct iw_pk_point) - IW_EV_POINT_OFF)
+
+#endif	/* IW_EV_LCP_PK_LEN */
+
+/****************************** TYPES ******************************/
+
+/* Shortcuts */
+typedef struct iw_statistics	iwstats;
+typedef struct iw_range		iwrange;
+typedef struct iw_param		iwparam;
+typedef struct iw_freq		iwfreq;
+typedef struct iw_quality	iwqual;
+typedef struct iw_priv_args	iwprivargs;
+typedef struct sockaddr		sockaddr;
+
+/* Structure for storing all wireless information for each device
+ * This is a cut down version of the one above, containing only
+ * the things *truly* needed to configure a card.
+ * Don't add other junk, I'll remove it... */
+typedef struct wireless_config
+{
+  char		name[IFNAMSIZ + 1];	/* Wireless/protocol name */
+  int		has_nwid;
+  iwparam	nwid;			/* Network ID */
+  int		has_freq;
+  double	freq;			/* Frequency/channel */
+  int		freq_flags;
+  int		has_key;
+  unsigned char	key[IW_ENCODING_TOKEN_MAX];	/* Encoding key used */
+  int		key_size;		/* Number of bytes */
+  int		key_flags;		/* Various flags */
+  int		has_essid;
+  int		essid_on;
+  char		essid[IW_ESSID_MAX_SIZE + 1];	/* ESSID (extended network) */
+  int		has_mode;
+  int		mode;			/* Operation mode */
+} wireless_config;
+
+/* Structure for storing all wireless information for each device
+ * This is pretty exhaustive... */
+typedef struct wireless_info
+{
+  struct wireless_config	b;	/* Basic information */
+
+  int		has_sens;
+  iwparam	sens;			/* sensitivity */
+  int		has_nickname;
+  char		nickname[IW_ESSID_MAX_SIZE + 1]; /* NickName */
+  int		has_ap_addr;
+  sockaddr	ap_addr;		/* Access point address */
+  int		has_bitrate;
+  iwparam	bitrate;		/* Bit rate in bps */
+  int		has_rts;
+  iwparam	rts;			/* RTS threshold in bytes */
+  int		has_frag;
+  iwparam	frag;			/* Fragmentation threshold in bytes */
+  int		has_power;
+  iwparam	power;			/* Power management parameters */
+  int		has_txpower;
+  iwparam	txpower;		/* Transmit Power in dBm */
+  int		has_retry;
+  iwparam	retry;			/* Retry limit or lifetime */
+
+  /* Stats */
+  iwstats	stats;
+  int		has_stats;
+  iwrange	range;
+  int		has_range;
+
+  /* Auth params for WPA/802.1x/802.11i */
+  int		auth_key_mgmt;
+  int		has_auth_key_mgmt;
+  int		auth_cipher_pairwise;
+  int		has_auth_cipher_pairwise;
+  int		auth_cipher_group;
+  int		has_auth_cipher_group;
+} wireless_info;
+
+/* Structure for storing an entry of a wireless scan.
+ * This is only a subset of all possible information, the flexible
+ * structure of scan results make it impossible to capture all
+ * information in such a static structure. */
+typedef struct wireless_scan
+{
+  /* Linked list */
+  struct wireless_scan *	next;
+
+  /* Cell identifiaction */
+  int		has_ap_addr;
+  sockaddr	ap_addr;		/* Access point address */
+
+  /* Other information */
+  struct wireless_config	b;	/* Basic information */
+  iwstats	stats;			/* Signal strength */
+  int		has_stats;
+  iwparam	maxbitrate;		/* Max bit rate in bps */
+  int		has_maxbitrate;
+} wireless_scan;
+
+/*
+ * Context used for non-blocking scan.
+ */
+typedef struct wireless_scan_head
+{
+  wireless_scan *	result;		/* Result of the scan */
+  int			retry;		/* Retry level */
+} wireless_scan_head;
+
+/* Structure used for parsing event streams, such as Wireless Events
+ * and scan results */
+typedef struct stream_descr
+{
+  char *	end;		/* End of the stream */
+  char *	current;	/* Current event in stream of events */
+  char *	value;		/* Current value in event */
+} stream_descr;
+
+/* Prototype for handling display of each single interface on the
+ * system - see iw_enum_devices() */
+typedef int (*iw_enum_handler)(int	skfd,
+			       char *	ifname,
+			       char *	args[],
+			       int	count);
+
+/* Describe a modulation */
+typedef struct iw_modul_descr
+{
+  unsigned int		mask;		/* Modulation bitmask */
+  char			cmd[8];		/* Short name */
+  char *		verbose;	/* Verbose description */
+} iw_modul_descr;
+
+/**************************** PROTOTYPES ****************************/
+/*
+ * All the functions in iwcommon.c
+ */
+
+/* ---------------------- SOCKET SUBROUTINES -----------------------*/
+int
+	iw_sockets_open(void);
+void
+	iw_enum_devices(int		skfd,
+			iw_enum_handler fn,
+			char *		args[],
+			int		count);
+/* --------------------- WIRELESS SUBROUTINES ----------------------*/
+int
+	iw_get_kernel_we_version(void);
+int
+	iw_print_version_info(const char *	toolname);
+int
+	iw_get_range_info(int		skfd,
+			  const char *	ifname,
+			  iwrange *	range);
+int
+	iw_get_priv_info(int		skfd,
+			 const char *	ifname,
+			 iwprivargs **	ppriv);
+int
+	iw_get_basic_config(int			skfd,
+			    const char *	ifname,
+			    wireless_config *	info);
+int
+	iw_set_basic_config(int			skfd,
+			    const char *	ifname,
+			    wireless_config *	info);
+/* --------------------- PROTOCOL SUBROUTINES --------------------- */
+int
+	iw_protocol_compare(const char *	protocol1,
+			    const char *	protocol2);
+/* -------------------- FREQUENCY SUBROUTINES --------------------- */
+void
+	iw_float2freq(double	in,
+		      iwfreq *	out);
+double
+	iw_freq2float(const iwfreq *	in);
+void
+	iw_print_freq_value(char *	buffer,
+			    int		buflen,
+			    double	freq);
+void
+	iw_print_freq(char *	buffer,
+		      int	buflen,
+		      double	freq,
+		      int	channel,
+		      int	freq_flags);
+int
+	iw_freq_to_channel(double			freq,
+			   const struct iw_range *	range);
+int
+	iw_channel_to_freq(int				channel,
+			   double *			pfreq,
+			   const struct iw_range *	range);
+void
+	iw_print_bitrate(char *	buffer,
+			 int	buflen,
+			 int	bitrate);
+/* ---------------------- POWER SUBROUTINES ----------------------- */
+int
+	iw_dbm2mwatt(int	in);
+int
+	iw_mwatt2dbm(int	in);
+void
+	iw_print_txpower(char *			buffer,
+			 int			buflen,
+			 struct iw_param *	txpower);
+/* -------------------- STATISTICS SUBROUTINES -------------------- */
+int
+	iw_get_stats(int		skfd,
+		     const char *	ifname,
+		     iwstats *		stats,
+		     const iwrange *	range,
+		     int		has_range);
+void
+	iw_print_stats(char *		buffer,
+		       int		buflen,
+		       const iwqual *	qual,
+		       const iwrange *	range,
+		       int		has_range);
+/* --------------------- ENCODING SUBROUTINES --------------------- */
+void
+	iw_print_key(char *			buffer,
+		     int			buflen,
+		     const unsigned char *	key,
+		     int			key_size,
+		     int			key_flags);
+int
+	iw_in_key(const char *		input,
+		  unsigned char *	key);
+int
+	iw_in_key_full(int		skfd,
+		       const char *	ifname,
+		       const char *	input,
+		       unsigned char *	key,
+		       __u16 *		flags);
+/* ----------------- POWER MANAGEMENT SUBROUTINES ----------------- */
+void
+	iw_print_pm_value(char *	buffer,
+			  int		buflen,
+			  int		value,
+			  int		flags,
+			  int		we_version);
+void
+	iw_print_pm_mode(char *		buffer,
+			 int		buflen,
+			 int		flags);
+/* --------------- RETRY LIMIT/LIFETIME SUBROUTINES --------------- */
+void
+	iw_print_retry_value(char *	buffer,
+			     int	buflen,
+			     int	value,
+			     int	flags,
+			     int	we_version);
+/* ----------------------- TIME SUBROUTINES ----------------------- */
+void
+	iw_print_timeval(char *				buffer,
+			 int				buflen,
+			 const struct timeval *		time,
+			 const struct timezone *	tz);
+/* --------------------- ADDRESS SUBROUTINES ---------------------- */
+int
+	iw_check_mac_addr_type(int		skfd,
+			       const char *	ifname);
+int
+	iw_check_if_addr_type(int		skfd,
+			      const char *	ifname);
+#if 0
+int
+	iw_check_addr_type(int		skfd,
+			   const char *	ifname);
+#endif
+#if 0
+int
+	iw_get_mac_addr(int			skfd,
+			const char *		name,
+			struct ether_addr *	eth,
+			unsigned short *	ptype);
+#endif
+char *
+	iw_mac_ntop(const unsigned char *	mac,
+		    int				maclen,
+		    char *			buf,
+		    int				buflen);
+void
+	iw_ether_ntop(const struct ether_addr *	eth,
+		      char *			buf);
+char *
+	iw_sawap_ntop(const struct sockaddr *	sap,
+		      char *			buf);
+int
+	iw_mac_aton(const char *	orig,
+		    unsigned char *	mac,
+		    int			macmax);
+int
+	iw_ether_aton(const char* bufp, struct ether_addr* eth);
+int
+	iw_in_inet(char *bufp, struct sockaddr *sap);
+int
+	iw_in_addr(int			skfd,
+		   const char *		ifname,
+		   char *		bufp,
+		   struct sockaddr *	sap);
+/* ----------------------- MISC SUBROUTINES ------------------------ */
+int
+	iw_get_priv_size(int		args);
+
+/* ---------------------- EVENT SUBROUTINES ---------------------- */
+void
+	iw_init_event_stream(struct stream_descr *	stream,
+			     char *			data,
+			     int			len);
+int
+	iw_extract_event_stream(struct stream_descr *	stream,
+				struct iw_event *	iwe,
+				int			we_version);
+/* --------------------- SCANNING SUBROUTINES --------------------- */
+int
+	iw_process_scan(int			skfd,
+			char *			ifname,
+			int			we_version,
+			wireless_scan_head *	context);
+int
+	iw_scan(int			skfd,
+		char *			ifname,
+		int			we_version,
+		wireless_scan_head *	context);
+
+/**************************** VARIABLES ****************************/
+
+/* Modes as human readable strings */
+extern const char * const	iw_operation_mode[];
+#define IW_NUM_OPER_MODE	7
+#define IW_NUM_OPER_MODE_EXT	8
+
+/* Modulations as human readable strings */
+extern const struct iw_modul_descr	iw_modul_list[];
+#define IW_SIZE_MODUL_LIST	16
+
+/************************* INLINE FUNTIONS *************************/
+/*
+ * Functions that are so simple that it's more efficient inlining them
+ */
+
+/*
+ * Note : I've defined wrapper for the ioctl request so that
+ * it will be easier to migrate to other kernel API if needed
+ */
+
+/*------------------------------------------------------------------*/
+/*
+ * Wrapper to push some Wireless Parameter in the driver
+ */
+static inline int
+iw_set_ext(int			skfd,		/* Socket to the kernel */
+	   const char *		ifname,		/* Device name */
+	   int			request,	/* WE ID */
+	   struct iwreq *	pwrq)		/* Fixed part of the request */
+{
+  /* Set device name */
+  strncpy(pwrq->ifr_name, ifname, IFNAMSIZ);
+  /* Do the request */
+  return(ioctl(skfd, request, pwrq));
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Wrapper to extract some Wireless Parameter out of the driver
+ */
+static inline int
+iw_get_ext(int			skfd,		/* Socket to the kernel */
+	   const char *		ifname,		/* Device name */
+	   int			request,	/* WE ID */
+	   struct iwreq *	pwrq)		/* Fixed part of the request */
+{
+  /* Set device name */
+  strncpy(pwrq->ifr_name, ifname, IFNAMSIZ);
+  /* Do the request */
+  return(ioctl(skfd, request, pwrq));
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Close the socket used for ioctl.
+ */
+static inline void
+iw_sockets_close(int	skfd)
+{
+  close(skfd);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Display an Ethernet Socket Address in readable format.
+ */
+static inline char *
+iw_saether_ntop(const struct sockaddr *sap, char* bufp)
+{
+  iw_ether_ntop((const struct ether_addr *) sap->sa_data, bufp);
+  return bufp;
+}
+/*------------------------------------------------------------------*/
+/*
+ * Input an Ethernet Socket Address and convert to binary.
+ */
+static inline int
+iw_saether_aton(const char *bufp, struct sockaddr *sap)
+{
+  sap->sa_family = ARPHRD_ETHER;
+  return iw_ether_aton(bufp, (struct ether_addr *) sap->sa_data);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Create an Ethernet broadcast address
+ */
+static inline void
+iw_broad_ether(struct sockaddr *sap)
+{
+  sap->sa_family = ARPHRD_ETHER;
+  memset((char *) sap->sa_data, 0xFF, ETH_ALEN);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Create an Ethernet NULL address
+ */
+static inline void
+iw_null_ether(struct sockaddr *sap)
+{
+  sap->sa_family = ARPHRD_ETHER;
+  memset((char *) sap->sa_data, 0x00, ETH_ALEN);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Compare two ethernet addresses
+ */
+static inline int
+iw_ether_cmp(const struct ether_addr* eth1, const struct ether_addr* eth2)
+{
+  return memcmp(eth1, eth2, sizeof(*eth1));
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* IWLIB_H */
diff --git a/lib/libiw/iwscan.cpp b/lib/libiw/iwscan.cpp
new file mode 100644
index 000000000..ab39a56e2
--- /dev/null
+++ b/lib/libiw/iwscan.cpp
@@ -0,0 +1,294 @@
+/*
+        Copyright (C) 2013 CoolStream International Ltd
+
+	Based on iwlist.c, Copyright (c) 1997-2007 Jean Tourrilhes <jt@hpl.hp.com>
+
+        License: GPLv2
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation;
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <sys/time.h>
+extern "C" {
+#include "iwlib.h"              /* Header */
+}
+
+#include <config.h>
+#include "iwscan.h"
+
+static void device_up(std::string dev)
+{
+	int sockfd;
+	struct ifreq ifr;
+
+	sockfd = socket(AF_INET, SOCK_DGRAM, 0);
+
+	if (sockfd < 0) {
+		perror("socket");
+		return;
+	}
+
+	memset(&ifr, 0, sizeof ifr);
+
+	strncpy(ifr.ifr_name, dev.c_str(), IFNAMSIZ);
+	if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0)
+		perror("SIOCGIFFLAGS");
+
+	ifr.ifr_flags |= IFF_UP | IFF_RUNNING;
+	if (ioctl(sockfd, SIOCSIFFLAGS, &ifr) < 0)
+		perror("SIOCSIFFLAGS");
+
+	close(sockfd);
+}
+
+bool get_wlan_list(std::string dev, std::vector<wlan_network> &networks)
+{
+	int skfd;
+	struct iwreq          wrq;
+	unsigned char *       buffer = NULL;          /* Results */
+	int                   buflen = IW_SCAN_MAX_DATA; /* Min for compat WE<17 */
+	struct iw_range       range;
+	int                   has_range;
+	struct timeval        tv;                             /* Select timeout */
+	int                   timeout = 15000000;             /* 15s */
+	const char * ifname = dev.c_str();
+
+	networks.clear();
+	device_up(dev);
+
+	if((skfd = iw_sockets_open()) < 0)
+	{
+		perror("socket");
+		return false;
+	}
+
+	/* Get range stuff */
+	has_range = (iw_get_range_info(skfd, ifname, &range) >= 0);
+
+	/* Check if the interface could support scanning. */
+	if((!has_range) || (range.we_version_compiled < 14))
+	{
+		fprintf(stderr, "%-8.16s  Interface doesn't support scanning.\n\n",
+				ifname);
+		goto _return;
+	}
+
+	/* Init timeout value -> 250ms between set and first get */
+	tv.tv_sec = 0;
+	tv.tv_usec = 250000;
+
+	wrq.u.data.pointer = NULL;
+	wrq.u.data.flags = 0;
+	wrq.u.data.length = 0;
+
+	/* Initiate Scanning */
+	if(iw_set_ext(skfd, ifname, SIOCSIWSCAN, &wrq) < 0)
+	{
+		if(errno != EPERM)
+		{
+			fprintf(stderr, "%-8.16s  Interface doesn't support scanning : %s\n\n",
+					ifname, strerror(errno));
+			goto _return;
+		}
+		/* If we don't have the permission to initiate the scan, we may
+		 * still have permission to read left-over results.
+		 * But, don't wait !!! */
+		tv.tv_usec = 0;
+	}
+	timeout -= tv.tv_usec;
+
+	/* Forever */
+	while(1)
+	{
+		fd_set            rfds;           /* File descriptors for select */
+		int               last_fd;        /* Last fd */
+		int               ret;
+
+		/* Guess what ? We must re-generate rfds each time */
+		FD_ZERO(&rfds);
+		last_fd = -1;
+
+		/* In here, add the rtnetlink fd in the list */
+
+		/* Wait until something happens */
+		ret = select(last_fd + 1, &rfds, NULL, NULL, &tv);
+
+		/* Check if there was an error */
+		if(ret < 0)
+		{
+			if(errno == EAGAIN || errno == EINTR)
+				continue;
+			fprintf(stderr, "Unhandled signal - exiting...\n");
+			goto _return;
+		}
+
+		/* Check if there was a timeout */
+		if(ret == 0)
+		{
+			unsigned char *       newbuf;
+
+realloc:
+			/* (Re)allocate the buffer - realloc(NULL, len) == malloc(len) */
+			newbuf = (unsigned char *) realloc(buffer, buflen);
+			if(newbuf == NULL)
+			{
+				fprintf(stderr, "%s: Allocation failed\n", __FUNCTION__);
+				goto _return;
+			}
+			buffer = newbuf;
+
+			/* Try to read the results */
+			wrq.u.data.pointer = buffer;
+			wrq.u.data.flags = 0;
+			wrq.u.data.length = buflen;
+			if(iw_get_ext(skfd, ifname, SIOCGIWSCAN, &wrq) < 0)
+			{
+				/* Check if buffer was too small (WE-17 only) */
+				if((errno == E2BIG) && (range.we_version_compiled > 16))
+				{
+					/* Some driver may return very large scan results, either
+					 * because there are many cells, or because they have many
+					 * large elements in cells (like IWEVCUSTOM). Most will
+					 * only need the regular sized buffer. We now use a dynamic
+					 * allocation of the buffer to satisfy everybody. Of course,
+					 * as we don't know in advance the size of the array, we try
+					 * various increasing sizes. Jean II */
+
+					/* Check if the driver gave us any hints. */
+					if(wrq.u.data.length > buflen)
+						buflen = wrq.u.data.length;
+					else
+						buflen *= 2;
+
+					/* Try again */
+					goto realloc;
+				}
+
+				/* Check if results not available yet */
+				if(errno == EAGAIN)
+				{
+					/* Restart timer for only 100ms*/
+					tv.tv_sec = 0;
+					tv.tv_usec = 100000;
+					timeout -= tv.tv_usec;
+					if(timeout > 0)
+						continue;   /* Try again later */
+				}
+
+				/* Bad error */
+				fprintf(stderr, "%-8.16s  Failed to read scan data : %s\n\n",
+						ifname, strerror(errno));
+				goto _return;
+			}
+			else
+				/* We have the results, go to process them */
+				break;
+		}
+
+		/* In here, check if event and event type
+		 * if scan event, read results. All errors bad & no reset timeout */
+	}
+
+	if(wrq.u.data.length)
+	{
+		struct iw_event           iwe;
+		struct iw_event * event = &iwe;
+		struct stream_descr       stream;
+		int                       ret;
+
+		printf("%-8.16s  Scan completed :\n", ifname);
+		iw_init_event_stream(&stream, (char *) buffer, wrq.u.data.length);
+		int count = -1;
+		while(1)
+		{
+			wlan_network network;
+			/* Extract an event and print it */
+			ret = iw_extract_event_stream(&stream, &iwe,
+					range.we_version_compiled);
+			if (ret <= 0)
+				break;
+			switch(event->cmd) {
+				case SIOCGIWESSID:
+					{
+						char essid[IW_ESSID_MAX_SIZE+1];
+						memset(essid, '\0', sizeof(essid));
+						if((event->u.essid.pointer) && (event->u.essid.length))
+							memcpy(essid, event->u.essid.pointer, event->u.essid.length);
+						if(event->u.essid.flags)
+						{
+							printf("                    ESSID:\"%s\"\n", essid);
+							network.ssid = essid;
+						}
+						else {
+							printf("                    ESSID:off/any/hidden\n");
+							network.ssid = "(hidden)";
+						}
+						count++;
+						networks.push_back(network);
+					}
+
+					break;
+				case SIOCGIWFREQ:
+					{
+						double          freq;                   /* Frequency/channel */
+						int             channel = -1;           /* Converted to channel */
+						char          buf[128];
+						freq = iw_freq2float(&(event->u.freq));
+						/* Convert to channel if possible */
+						if(has_range)
+							channel = iw_freq_to_channel(freq, &range);
+						iw_print_freq(buf, sizeof(buf),
+								freq, channel, event->u.freq.flags);
+#if 0
+						if ((channel < 0) && (freq < KILO))
+							channel = freq;
+#endif
+						printf("                    %s\n", buf);
+						networks[count].channel = buf;
+					}
+					break;
+				case IWEVQUAL:
+					{
+						char          buf[128];
+						iw_print_stats(buf, sizeof(buf),
+								&event->u.qual, &range, has_range);
+						printf("                    %s\n", buf);
+						networks[count].qual = buf;
+						std::size_t found = networks[count].qual.find_first_of(' ');
+						if (found != std::string::npos)
+							networks[count].qual = networks[count].qual.substr(0, found);
+					}
+					break;
+				case SIOCGIWENCODE:
+					if(event->u.data.flags & IW_ENCODE_DISABLED)
+						networks[count].encrypted = 0;
+					else
+						networks[count].encrypted = 1;
+
+					printf("                    Encryption key:%s\n", networks[count].encrypted ? "on" : "off");
+					break;
+			}
+		}
+		printf("\n");
+	}
+	else
+		printf("%-8.16s  No scan results\n\n", ifname);
+
+_return:
+	if (buffer)
+		free(buffer);
+	iw_sockets_close(skfd);
+
+	return !networks.empty();
+}
diff --git a/lib/libiw/iwscan.h b/lib/libiw/iwscan.h
new file mode 100644
index 000000000..4f9350c98
--- /dev/null
+++ b/lib/libiw/iwscan.h
@@ -0,0 +1,36 @@
+/*
+        Copyright (C) 2013 CoolStream International Ltd
+
+        License: GPLv2
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation;
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef _IWSCAN_H_
+#define _IWSCAN_H_
+
+#include <vector>
+#include <string>
+
+struct wlan_network
+{
+	std::string ssid;
+	int encrypted;
+	std::string channel;
+	std::string qual;
+	wlan_network(): encrypted(0) {}
+};
+
+bool get_wlan_list(std::string dev, std::vector<wlan_network> &networks);
+#endif
diff --git a/lib/libiw/wireless.h b/lib/libiw/wireless.h
new file mode 100644
index 000000000..2d94fabb3
--- /dev/null
+++ b/lib/libiw/wireless.h
@@ -0,0 +1,1120 @@
+/*
+ * This file define a set of standard wireless extensions
+ *
+ * Version :	21	14.3.06
+ *
+ * Authors :	Jean Tourrilhes - HPL - <jt@hpl.hp.com>
+ * Copyright (c) 1997-2005 Jean Tourrilhes, All Rights Reserved.
+ */
+
+#ifndef _LINUX_WIRELESS_H
+#define _LINUX_WIRELESS_H
+
+/************************** DOCUMENTATION **************************/
+/*
+ * Initial APIs (1996 -> onward) :
+ * -----------------------------
+ * Basically, the wireless extensions are for now a set of standard ioctl
+ * call + /proc/net/wireless
+ *
+ * The entry /proc/net/wireless give statistics and information on the
+ * driver.
+ * This is better than having each driver having its entry because
+ * its centralised and we may remove the driver module safely.
+ *
+ * Ioctl are used to configure the driver and issue commands.  This is
+ * better than command line options of insmod because we may want to
+ * change dynamically (while the driver is running) some parameters.
+ *
+ * The ioctl mechanimsm are copied from standard devices ioctl.
+ * We have the list of command plus a structure descibing the
+ * data exchanged...
+ * Note that to add these ioctl, I was obliged to modify :
+ *	# net/core/dev.c (two place + add include)
+ *	# net/ipv4/af_inet.c (one place + add include)
+ *
+ * /proc/net/wireless is a copy of /proc/net/dev.
+ * We have a structure for data passed from the driver to /proc/net/wireless
+ * Too add this, I've modified :
+ *	# net/core/dev.c (two other places)
+ *	# include/linux/netdevice.h (one place)
+ *	# include/linux/proc_fs.h (one place)
+ *
+ * New driver API (2002 -> onward) :
+ * -------------------------------
+ * This file is only concerned with the user space API and common definitions.
+ * The new driver API is defined and documented in :
+ *	# include/net/iw_handler.h
+ *
+ * Note as well that /proc/net/wireless implementation has now moved in :
+ *	# net/core/wireless.c
+ *
+ * Wireless Events (2002 -> onward) :
+ * --------------------------------
+ * Events are defined at the end of this file, and implemented in :
+ *	# net/core/wireless.c
+ *
+ * Other comments :
+ * --------------
+ * Do not add here things that are redundant with other mechanisms
+ * (drivers init, ifconfig, /proc/net/dev, ...) and with are not
+ * wireless specific.
+ *
+ * These wireless extensions are not magic : each driver has to provide
+ * support for them...
+ *
+ * IMPORTANT NOTE : As everything in the kernel, this is very much a
+ * work in progress. Contact me if you have ideas of improvements...
+ */
+
+/***************************** INCLUDES *****************************/
+
+/* This header is used in user-space, therefore need to be sanitised
+ * for that purpose. Those includes are usually not compatible with glibc.
+ * To know which includes to use in user-space, check iwlib.h. */
+#ifdef __KERNEL__
+#include <linux/types.h>		/* for "caddr_t" et al		*/
+#include <linux/socket.h>		/* for "struct sockaddr" et al	*/
+#include <linux/if.h>			/* for IFNAMSIZ and co... */
+#endif	/* __KERNEL__ */
+
+/***************************** VERSION *****************************/
+/*
+ * This constant is used to know the availability of the wireless
+ * extensions and to know which version of wireless extensions it is
+ * (there is some stuff that will be added in the future...)
+ * I just plan to increment with each new version.
+ */
+#define WIRELESS_EXT	21
+
+/*
+ * Changes :
+ *
+ * V2 to V3
+ * --------
+ *	Alan Cox start some incompatibles changes. I've integrated a bit more.
+ *	- Encryption renamed to Encode to avoid US regulation problems
+ *	- Frequency changed from float to struct to avoid problems on old 386
+ *
+ * V3 to V4
+ * --------
+ *	- Add sensitivity
+ *
+ * V4 to V5
+ * --------
+ *	- Missing encoding definitions in range
+ *	- Access points stuff
+ *
+ * V5 to V6
+ * --------
+ *	- 802.11 support (ESSID ioctls)
+ *
+ * V6 to V7
+ * --------
+ *	- define IW_ESSID_MAX_SIZE and IW_MAX_AP
+ *
+ * V7 to V8
+ * --------
+ *	- Changed my e-mail address
+ *	- More 802.11 support (nickname, rate, rts, frag)
+ *	- List index in frequencies
+ *
+ * V8 to V9
+ * --------
+ *	- Support for 'mode of operation' (ad-hoc, managed...)
+ *	- Support for unicast and multicast power saving
+ *	- Change encoding to support larger tokens (>64 bits)
+ *	- Updated iw_params (disable, flags) and use it for NWID
+ *	- Extracted iw_point from iwreq for clarity
+ *
+ * V9 to V10
+ * ---------
+ *	- Add PM capability to range structure
+ *	- Add PM modifier : MAX/MIN/RELATIVE
+ *	- Add encoding option : IW_ENCODE_NOKEY
+ *	- Add TxPower ioctls (work like TxRate)
+ *
+ * V10 to V11
+ * ----------
+ *	- Add WE version in range (help backward/forward compatibility)
+ *	- Add retry ioctls (work like PM)
+ *
+ * V11 to V12
+ * ----------
+ *	- Add SIOCSIWSTATS to get /proc/net/wireless programatically
+ *	- Add DEV PRIVATE IOCTL to avoid collisions in SIOCDEVPRIVATE space
+ *	- Add new statistics (frag, retry, beacon)
+ *	- Add average quality (for user space calibration)
+ *
+ * V12 to V13
+ * ----------
+ *	- Document creation of new driver API.
+ *	- Extract union iwreq_data from struct iwreq (for new driver API).
+ *	- Rename SIOCSIWNAME as SIOCSIWCOMMIT
+ *
+ * V13 to V14
+ * ----------
+ *	- Wireless Events support : define struct iw_event
+ *	- Define additional specific event numbers
+ *	- Add "addr" and "param" fields in union iwreq_data
+ *	- AP scanning stuff (SIOCSIWSCAN and friends)
+ *
+ * V14 to V15
+ * ----------
+ *	- Add IW_PRIV_TYPE_ADDR for struct sockaddr private arg
+ *	- Make struct iw_freq signed (both m & e), add explicit padding
+ *	- Add IWEVCUSTOM for driver specific event/scanning token
+ *	- Add IW_MAX_GET_SPY for driver returning a lot of addresses
+ *	- Add IW_TXPOW_RANGE for range of Tx Powers
+ *	- Add IWEVREGISTERED & IWEVEXPIRED events for Access Points
+ *	- Add IW_MODE_MONITOR for passive monitor
+ *
+ * V15 to V16
+ * ----------
+ *	- Increase the number of bitrates in iw_range to 32 (for 802.11g)
+ *	- Increase the number of frequencies in iw_range to 32 (for 802.11b+a)
+ *	- Reshuffle struct iw_range for increases, add filler
+ *	- Increase IW_MAX_AP to 64 for driver returning a lot of addresses
+ *	- Remove IW_MAX_GET_SPY because conflict with enhanced spy support
+ *	- Add SIOCSIWTHRSPY/SIOCGIWTHRSPY and "struct iw_thrspy"
+ *	- Add IW_ENCODE_TEMP and iw_range->encoding_login_index
+ *
+ * V16 to V17
+ * ----------
+ *	- Add flags to frequency -> auto/fixed
+ *	- Document (struct iw_quality *)->updated, add new flags (INVALID)
+ *	- Wireless Event capability in struct iw_range
+ *	- Add support for relative TxPower (yick !)
+ *
+ * V17 to V18 (From Jouni Malinen <jkmaline@cc.hut.fi>)
+ * ----------
+ *	- Add support for WPA/WPA2
+ *	- Add extended encoding configuration (SIOCSIWENCODEEXT and
+ *	  SIOCGIWENCODEEXT)
+ *	- Add SIOCSIWGENIE/SIOCGIWGENIE
+ *	- Add SIOCSIWMLME
+ *	- Add SIOCSIWPMKSA
+ *	- Add struct iw_range bit field for supported encoding capabilities
+ *	- Add optional scan request parameters for SIOCSIWSCAN
+ *	- Add SIOCSIWAUTH/SIOCGIWAUTH for setting authentication and WPA
+ *	  related parameters (extensible up to 4096 parameter values)
+ *	- Add wireless events: IWEVGENIE, IWEVMICHAELMICFAILURE,
+ *	  IWEVASSOCREQIE, IWEVASSOCRESPIE, IWEVPMKIDCAND
+ *
+ * V18 to V19
+ * ----------
+ *	- Remove (struct iw_point *)->pointer from events and streams
+ *	- Remove header includes to help user space
+ *	- Increase IW_ENCODING_TOKEN_MAX from 32 to 64
+ *	- Add IW_QUAL_ALL_UPDATED and IW_QUAL_ALL_INVALID macros
+ *	- Add explicit flag to tell stats are in dBm : IW_QUAL_DBM
+ *	- Add IW_IOCTL_IDX() and IW_EVENT_IDX() macros
+ *
+ * V20 to V21
+ * ----------
+ *	- Remove (struct net_device *)->get_wireless_stats()
+ *	- Change length in ESSID and NICK to strlen() instead of strlen()+1
+ *	- Add SIOCSIWMODUL/SIOCGIWMODUL for modulation setting
+ *	- Add IW_RETRY_SHORT/IW_RETRY_LONG retry modifiers
+ *	- Add IW_POWER_SAVING power type
+ *	- Power/Retry relative values no longer * 100000
+ *	- Add bitrate flags for unicast/broadcast
+ */
+
+/**************************** CONSTANTS ****************************/
+
+/* -------------------------- IOCTL LIST -------------------------- */
+
+/* Wireless Identification */
+#define SIOCSIWCOMMIT	0x8B00		/* Commit pending changes to driver */
+#define SIOCGIWNAME	0x8B01		/* get name == wireless protocol */
+/* SIOCGIWNAME is used to verify the presence of Wireless Extensions.
+ * Common values : "IEEE 802.11-DS", "IEEE 802.11-FH", "IEEE 802.11b"...
+ * Don't put the name of your driver there, it's useless. */
+
+/* Basic operations */
+#define SIOCSIWNWID	0x8B02		/* set network id (pre-802.11) */
+#define SIOCGIWNWID	0x8B03		/* get network id (the cell) */
+#define SIOCSIWFREQ	0x8B04		/* set channel/frequency (Hz) */
+#define SIOCGIWFREQ	0x8B05		/* get channel/frequency (Hz) */
+#define SIOCSIWMODE	0x8B06		/* set operation mode */
+#define SIOCGIWMODE	0x8B07		/* get operation mode */
+#define SIOCSIWSENS	0x8B08		/* set sensitivity (dBm) */
+#define SIOCGIWSENS	0x8B09		/* get sensitivity (dBm) */
+
+/* Informative stuff */
+#define SIOCSIWRANGE	0x8B0A		/* Unused */
+#define SIOCGIWRANGE	0x8B0B		/* Get range of parameters */
+#define SIOCSIWPRIV	0x8B0C		/* Unused */
+#define SIOCGIWPRIV	0x8B0D		/* get private ioctl interface info */
+#define SIOCSIWSTATS	0x8B0E		/* Unused */
+#define SIOCGIWSTATS	0x8B0F		/* Get /proc/net/wireless stats */
+/* SIOCGIWSTATS is strictly used between user space and the kernel, and
+ * is never passed to the driver (i.e. the driver will never see it). */
+
+/* Spy support (statistics per MAC address - used for Mobile IP support) */
+#define SIOCSIWSPY	0x8B10		/* set spy addresses */
+#define SIOCGIWSPY	0x8B11		/* get spy info (quality of link) */
+#define SIOCSIWTHRSPY	0x8B12		/* set spy threshold (spy event) */
+#define SIOCGIWTHRSPY	0x8B13		/* get spy threshold */
+
+/* Access Point manipulation */
+#define SIOCSIWAP	0x8B14		/* set access point MAC addresses */
+#define SIOCGIWAP	0x8B15		/* get access point MAC addresses */
+#define SIOCGIWAPLIST	0x8B17		/* Deprecated in favor of scanning */
+#define SIOCSIWSCAN	0x8B18		/* trigger scanning (list cells) */
+#define SIOCGIWSCAN	0x8B19		/* get scanning results */
+
+/* 802.11 specific support */
+#define SIOCSIWESSID	0x8B1A		/* set ESSID (network name) */
+#define SIOCGIWESSID	0x8B1B		/* get ESSID */
+#define SIOCSIWNICKN	0x8B1C		/* set node name/nickname */
+#define SIOCGIWNICKN	0x8B1D		/* get node name/nickname */
+/* As the ESSID and NICKN are strings up to 32 bytes long, it doesn't fit
+ * within the 'iwreq' structure, so we need to use the 'data' member to
+ * point to a string in user space, like it is done for RANGE... */
+
+/* Other parameters useful in 802.11 and some other devices */
+#define SIOCSIWRATE	0x8B20		/* set default bit rate (bps) */
+#define SIOCGIWRATE	0x8B21		/* get default bit rate (bps) */
+#define SIOCSIWRTS	0x8B22		/* set RTS/CTS threshold (bytes) */
+#define SIOCGIWRTS	0x8B23		/* get RTS/CTS threshold (bytes) */
+#define SIOCSIWFRAG	0x8B24		/* set fragmentation thr (bytes) */
+#define SIOCGIWFRAG	0x8B25		/* get fragmentation thr (bytes) */
+#define SIOCSIWTXPOW	0x8B26		/* set transmit power (dBm) */
+#define SIOCGIWTXPOW	0x8B27		/* get transmit power (dBm) */
+#define SIOCSIWRETRY	0x8B28		/* set retry limits and lifetime */
+#define SIOCGIWRETRY	0x8B29		/* get retry limits and lifetime */
+
+/* Encoding stuff (scrambling, hardware security, WEP...) */
+#define SIOCSIWENCODE	0x8B2A		/* set encoding token & mode */
+#define SIOCGIWENCODE	0x8B2B		/* get encoding token & mode */
+/* Power saving stuff (power management, unicast and multicast) */
+#define SIOCSIWPOWER	0x8B2C		/* set Power Management settings */
+#define SIOCGIWPOWER	0x8B2D		/* get Power Management settings */
+/* Modulation bitmask */
+#define SIOCSIWMODUL	0x8B2E		/* set Modulations settings */
+#define SIOCGIWMODUL	0x8B2F		/* get Modulations settings */
+
+/* WPA : Generic IEEE 802.11 informatiom element (e.g., for WPA/RSN/WMM).
+ * This ioctl uses struct iw_point and data buffer that includes IE id and len
+ * fields. More than one IE may be included in the request. Setting the generic
+ * IE to empty buffer (len=0) removes the generic IE from the driver. Drivers
+ * are allowed to generate their own WPA/RSN IEs, but in these cases, drivers
+ * are required to report the used IE as a wireless event, e.g., when
+ * associating with an AP. */
+#define SIOCSIWGENIE	0x8B30		/* set generic IE */
+#define SIOCGIWGENIE	0x8B31		/* get generic IE */
+
+/* WPA : IEEE 802.11 MLME requests */
+#define SIOCSIWMLME	0x8B16		/* request MLME operation; uses
+					 * struct iw_mlme */
+/* WPA : Authentication mode parameters */
+#define SIOCSIWAUTH	0x8B32		/* set authentication mode params */
+#define SIOCGIWAUTH	0x8B33		/* get authentication mode params */
+
+/* WPA : Extended version of encoding configuration */
+#define SIOCSIWENCODEEXT 0x8B34		/* set encoding token & mode */
+#define SIOCGIWENCODEEXT 0x8B35		/* get encoding token & mode */
+
+/* WPA2 : PMKSA cache management */
+#define SIOCSIWPMKSA	0x8B36		/* PMKSA cache operation */
+
+/* -------------------- DEV PRIVATE IOCTL LIST -------------------- */
+
+/* These 32 ioctl are wireless device private, for 16 commands.
+ * Each driver is free to use them for whatever purpose it chooses,
+ * however the driver *must* export the description of those ioctls
+ * with SIOCGIWPRIV and *must* use arguments as defined below.
+ * If you don't follow those rules, DaveM is going to hate you (reason :
+ * it make mixed 32/64bit operation impossible).
+ */
+#define SIOCIWFIRSTPRIV	0x8BE0
+#define SIOCIWLASTPRIV	0x8BFF
+/* Previously, we were using SIOCDEVPRIVATE, but we now have our
+ * separate range because of collisions with other tools such as
+ * 'mii-tool'.
+ * We now have 32 commands, so a bit more space ;-).
+ * Also, all 'odd' commands are only usable by root and don't return the
+ * content of ifr/iwr to user (but you are not obliged to use the set/get
+ * convention, just use every other two command). More details in iwpriv.c.
+ * And I repeat : you are not forced to use them with iwpriv, but you
+ * must be compliant with it.
+ */
+
+/* ------------------------- IOCTL STUFF ------------------------- */
+
+/* The first and the last (range) */
+#define SIOCIWFIRST	0x8B00
+#define SIOCIWLAST	SIOCIWLASTPRIV		/* 0x8BFF */
+#define IW_IOCTL_IDX(cmd)	((cmd) - SIOCIWFIRST)
+
+/* Even : get (world access), odd : set (root access) */
+#define IW_IS_SET(cmd)	(!((cmd) & 0x1))
+#define IW_IS_GET(cmd)	((cmd) & 0x1)
+
+/* ----------------------- WIRELESS EVENTS ----------------------- */
+/* Those are *NOT* ioctls, do not issue request on them !!! */
+/* Most events use the same identifier as ioctl requests */
+
+#define IWEVTXDROP	0x8C00		/* Packet dropped to excessive retry */
+#define IWEVQUAL	0x8C01		/* Quality part of statistics (scan) */
+#define IWEVCUSTOM	0x8C02		/* Driver specific ascii string */
+#define IWEVREGISTERED	0x8C03		/* Discovered a new node (AP mode) */
+#define IWEVEXPIRED	0x8C04		/* Expired a node (AP mode) */
+#define IWEVGENIE	0x8C05		/* Generic IE (WPA, RSN, WMM, ..)
+					 * (scan results); This includes id and
+					 * length fields. One IWEVGENIE may
+					 * contain more than one IE. Scan
+					 * results may contain one or more
+					 * IWEVGENIE events. */
+#define IWEVMICHAELMICFAILURE 0x8C06	/* Michael MIC failure
+					 * (struct iw_michaelmicfailure)
+					 */
+#define IWEVASSOCREQIE	0x8C07		/* IEs used in (Re)Association Request.
+					 * The data includes id and length
+					 * fields and may contain more than one
+					 * IE. This event is required in
+					 * Managed mode if the driver
+					 * generates its own WPA/RSN IE. This
+					 * should be sent just before
+					 * IWEVREGISTERED event for the
+					 * association. */
+#define IWEVASSOCRESPIE	0x8C08		/* IEs used in (Re)Association
+					 * Response. The data includes id and
+					 * length fields and may contain more
+					 * than one IE. This may be sent
+					 * between IWEVASSOCREQIE and
+					 * IWEVREGISTERED events for the
+					 * association. */
+#define IWEVPMKIDCAND	0x8C09		/* PMKID candidate for RSN
+					 * pre-authentication
+					 * (struct iw_pmkid_cand) */
+
+#define IWEVFIRST	0x8C00
+#define IW_EVENT_IDX(cmd)	((cmd) - IWEVFIRST)
+
+/* ------------------------- PRIVATE INFO ------------------------- */
+/*
+ * The following is used with SIOCGIWPRIV. It allow a driver to define
+ * the interface (name, type of data) for its private ioctl.
+ * Privates ioctl are SIOCIWFIRSTPRIV -> SIOCIWLASTPRIV
+ */
+
+#define IW_PRIV_TYPE_MASK	0x7000	/* Type of arguments */
+#define IW_PRIV_TYPE_NONE	0x0000
+#define IW_PRIV_TYPE_BYTE	0x1000	/* Char as number */
+#define IW_PRIV_TYPE_CHAR	0x2000	/* Char as character */
+#define IW_PRIV_TYPE_INT	0x4000	/* 32 bits int */
+#define IW_PRIV_TYPE_FLOAT	0x5000	/* struct iw_freq */
+#define IW_PRIV_TYPE_ADDR	0x6000	/* struct sockaddr */
+
+#define IW_PRIV_SIZE_FIXED	0x0800	/* Variable or fixed number of args */
+
+#define IW_PRIV_SIZE_MASK	0x07FF	/* Max number of those args */
+
+/*
+ * Note : if the number of args is fixed and the size < 16 octets,
+ * instead of passing a pointer we will put args in the iwreq struct...
+ */
+
+/* ----------------------- OTHER CONSTANTS ----------------------- */
+
+/* Maximum frequencies in the range struct */
+#define IW_MAX_FREQUENCIES	32
+/* Note : if you have something like 80 frequencies,
+ * don't increase this constant and don't fill the frequency list.
+ * The user will be able to set by channel anyway... */
+
+/* Maximum bit rates in the range struct */
+#define IW_MAX_BITRATES		32
+
+/* Maximum tx powers in the range struct */
+#define IW_MAX_TXPOWER		8
+/* Note : if you more than 8 TXPowers, just set the max and min or
+ * a few of them in the struct iw_range. */
+
+/* Maximum of address that you may set with SPY */
+#define IW_MAX_SPY		8
+
+/* Maximum of address that you may get in the
+   list of access points in range */
+#define IW_MAX_AP		64
+
+/* Maximum size of the ESSID and NICKN strings */
+#define IW_ESSID_MAX_SIZE	32
+
+/* Modes of operation */
+#define IW_MODE_AUTO	0	/* Let the driver decides */
+#define IW_MODE_ADHOC	1	/* Single cell network */
+#define IW_MODE_INFRA	2	/* Multi cell network, roaming, ... */
+#define IW_MODE_MASTER	3	/* Synchronisation master or Access Point */
+#define IW_MODE_REPEAT	4	/* Wireless Repeater (forwarder) */
+#define IW_MODE_SECOND	5	/* Secondary master/repeater (backup) */
+#define IW_MODE_MONITOR	6	/* Passive monitor (listen only) */
+
+/* Statistics flags (bitmask in updated) */
+#define IW_QUAL_QUAL_UPDATED	0x01	/* Value was updated since last read */
+#define IW_QUAL_LEVEL_UPDATED	0x02
+#define IW_QUAL_NOISE_UPDATED	0x04
+#define IW_QUAL_ALL_UPDATED	0x07
+#define IW_QUAL_DBM		0x08	/* Level + Noise are dBm */
+#define IW_QUAL_QUAL_INVALID	0x10	/* Driver doesn't provide value */
+#define IW_QUAL_LEVEL_INVALID	0x20
+#define IW_QUAL_NOISE_INVALID	0x40
+#define IW_QUAL_RCPI		0x80	/* Level + Noise are 802.11k RCPI */
+#define IW_QUAL_ALL_INVALID	0x70
+
+/* Frequency flags */
+#define IW_FREQ_AUTO		0x00	/* Let the driver decides */
+#define IW_FREQ_FIXED		0x01	/* Force a specific value */
+
+/* Maximum number of size of encoding token available
+ * they are listed in the range structure */
+#define IW_MAX_ENCODING_SIZES	8
+
+/* Maximum size of the encoding token in bytes */
+#define IW_ENCODING_TOKEN_MAX	64	/* 512 bits (for now) */
+
+/* Flags for encoding (along with the token) */
+#define IW_ENCODE_INDEX		0x00FF	/* Token index (if needed) */
+#define IW_ENCODE_FLAGS		0xFF00	/* Flags defined below */
+#define IW_ENCODE_MODE		0xF000	/* Modes defined below */
+#define IW_ENCODE_DISABLED	0x8000	/* Encoding disabled */
+#define IW_ENCODE_ENABLED	0x0000	/* Encoding enabled */
+#define IW_ENCODE_RESTRICTED	0x4000	/* Refuse non-encoded packets */
+#define IW_ENCODE_OPEN		0x2000	/* Accept non-encoded packets */
+#define IW_ENCODE_NOKEY		0x0800  /* Key is write only, so not present */
+#define IW_ENCODE_TEMP		0x0400  /* Temporary key */
+
+/* Power management flags available (along with the value, if any) */
+#define IW_POWER_ON		0x0000	/* No details... */
+#define IW_POWER_TYPE		0xF000	/* Type of parameter */
+#define IW_POWER_PERIOD		0x1000	/* Value is a period/duration of  */
+#define IW_POWER_TIMEOUT	0x2000	/* Value is a timeout (to go asleep) */
+#define IW_POWER_SAVING		0x4000	/* Value is relative (how aggressive)*/
+#define IW_POWER_MODE		0x0F00	/* Power Management mode */
+#define IW_POWER_UNICAST_R	0x0100	/* Receive only unicast messages */
+#define IW_POWER_MULTICAST_R	0x0200	/* Receive only multicast messages */
+#define IW_POWER_ALL_R		0x0300	/* Receive all messages though PM */
+#define IW_POWER_FORCE_S	0x0400	/* Force PM procedure for sending unicast */
+#define IW_POWER_REPEATER	0x0800	/* Repeat broadcast messages in PM period */
+#define IW_POWER_MODIFIER	0x000F	/* Modify a parameter */
+#define IW_POWER_MIN		0x0001	/* Value is a minimum  */
+#define IW_POWER_MAX		0x0002	/* Value is a maximum */
+#define IW_POWER_RELATIVE	0x0004	/* Value is not in seconds/ms/us */
+
+/* Transmit Power flags available */
+#define IW_TXPOW_TYPE		0x00FF	/* Type of value */
+#define IW_TXPOW_DBM		0x0000	/* Value is in dBm */
+#define IW_TXPOW_MWATT		0x0001	/* Value is in mW */
+#define IW_TXPOW_RELATIVE	0x0002	/* Value is in arbitrary units */
+#define IW_TXPOW_RANGE		0x1000	/* Range of value between min/max */
+
+/* Retry limits and lifetime flags available */
+#define IW_RETRY_ON		0x0000	/* No details... */
+#define IW_RETRY_TYPE		0xF000	/* Type of parameter */
+#define IW_RETRY_LIMIT		0x1000	/* Maximum number of retries*/
+#define IW_RETRY_LIFETIME	0x2000	/* Maximum duration of retries in us */
+#define IW_RETRY_MODIFIER	0x00FF	/* Modify a parameter */
+#define IW_RETRY_MIN		0x0001	/* Value is a minimum  */
+#define IW_RETRY_MAX		0x0002	/* Value is a maximum */
+#define IW_RETRY_RELATIVE	0x0004	/* Value is not in seconds/ms/us */
+#define IW_RETRY_SHORT		0x0010	/* Value is for short packets  */
+#define IW_RETRY_LONG		0x0020	/* Value is for long packets */
+
+/* Scanning request flags */
+#define IW_SCAN_DEFAULT		0x0000	/* Default scan of the driver */
+#define IW_SCAN_ALL_ESSID	0x0001	/* Scan all ESSIDs */
+#define IW_SCAN_THIS_ESSID	0x0002	/* Scan only this ESSID */
+#define IW_SCAN_ALL_FREQ	0x0004	/* Scan all Frequencies */
+#define IW_SCAN_THIS_FREQ	0x0008	/* Scan only this Frequency */
+#define IW_SCAN_ALL_MODE	0x0010	/* Scan all Modes */
+#define IW_SCAN_THIS_MODE	0x0020	/* Scan only this Mode */
+#define IW_SCAN_ALL_RATE	0x0040	/* Scan all Bit-Rates */
+#define IW_SCAN_THIS_RATE	0x0080	/* Scan only this Bit-Rate */
+/* struct iw_scan_req scan_type */
+#define IW_SCAN_TYPE_ACTIVE 0
+#define IW_SCAN_TYPE_PASSIVE 1
+/* Maximum size of returned data */
+#define IW_SCAN_MAX_DATA	4096	/* In bytes */
+
+/* Max number of char in custom event - use multiple of them if needed */
+#define IW_CUSTOM_MAX		256	/* In bytes */
+
+/* Generic information element */
+#define IW_GENERIC_IE_MAX	1024
+
+/* MLME requests (SIOCSIWMLME / struct iw_mlme) */
+#define IW_MLME_DEAUTH		0
+#define IW_MLME_DISASSOC	1
+
+/* SIOCSIWAUTH/SIOCGIWAUTH struct iw_param flags */
+#define IW_AUTH_INDEX		0x0FFF
+#define IW_AUTH_FLAGS		0xF000
+/* SIOCSIWAUTH/SIOCGIWAUTH parameters (0 .. 4095)
+ * (IW_AUTH_INDEX mask in struct iw_param flags; this is the index of the
+ * parameter that is being set/get to; value will be read/written to
+ * struct iw_param value field) */
+#define IW_AUTH_WPA_VERSION		0
+#define IW_AUTH_CIPHER_PAIRWISE		1
+#define IW_AUTH_CIPHER_GROUP		2
+#define IW_AUTH_KEY_MGMT		3
+#define IW_AUTH_TKIP_COUNTERMEASURES	4
+#define IW_AUTH_DROP_UNENCRYPTED	5
+#define IW_AUTH_80211_AUTH_ALG		6
+#define IW_AUTH_WPA_ENABLED		7
+#define IW_AUTH_RX_UNENCRYPTED_EAPOL	8
+#define IW_AUTH_ROAMING_CONTROL		9
+#define IW_AUTH_PRIVACY_INVOKED		10
+
+/* IW_AUTH_WPA_VERSION values (bit field) */
+#define IW_AUTH_WPA_VERSION_DISABLED	0x00000001
+#define IW_AUTH_WPA_VERSION_WPA		0x00000002
+#define IW_AUTH_WPA_VERSION_WPA2	0x00000004
+
+/* IW_AUTH_PAIRWISE_CIPHER and IW_AUTH_GROUP_CIPHER values (bit field) */
+#define IW_AUTH_CIPHER_NONE	0x00000001
+#define IW_AUTH_CIPHER_WEP40	0x00000002
+#define IW_AUTH_CIPHER_TKIP	0x00000004
+#define IW_AUTH_CIPHER_CCMP	0x00000008
+#define IW_AUTH_CIPHER_WEP104	0x00000010
+
+/* IW_AUTH_KEY_MGMT values (bit field) */
+#define IW_AUTH_KEY_MGMT_802_1X	1
+#define IW_AUTH_KEY_MGMT_PSK	2
+
+/* IW_AUTH_80211_AUTH_ALG values (bit field) */
+#define IW_AUTH_ALG_OPEN_SYSTEM	0x00000001
+#define IW_AUTH_ALG_SHARED_KEY	0x00000002
+#define IW_AUTH_ALG_LEAP	0x00000004
+
+/* IW_AUTH_ROAMING_CONTROL values */
+#define IW_AUTH_ROAMING_ENABLE	0	/* driver/firmware based roaming */
+#define IW_AUTH_ROAMING_DISABLE	1	/* user space program used for roaming
+					 * control */
+
+/* SIOCSIWENCODEEXT definitions */
+#define IW_ENCODE_SEQ_MAX_SIZE	8
+/* struct iw_encode_ext ->alg */
+#define IW_ENCODE_ALG_NONE	0
+#define IW_ENCODE_ALG_WEP	1
+#define IW_ENCODE_ALG_TKIP	2
+#define IW_ENCODE_ALG_CCMP	3
+/* struct iw_encode_ext ->ext_flags */
+#define IW_ENCODE_EXT_TX_SEQ_VALID	0x00000001
+#define IW_ENCODE_EXT_RX_SEQ_VALID	0x00000002
+#define IW_ENCODE_EXT_GROUP_KEY		0x00000004
+#define IW_ENCODE_EXT_SET_TX_KEY	0x00000008
+
+/* IWEVMICHAELMICFAILURE : struct iw_michaelmicfailure ->flags */
+#define IW_MICFAILURE_KEY_ID	0x00000003 /* Key ID 0..3 */
+#define IW_MICFAILURE_GROUP	0x00000004
+#define IW_MICFAILURE_PAIRWISE	0x00000008
+#define IW_MICFAILURE_STAKEY	0x00000010
+#define IW_MICFAILURE_COUNT	0x00000060 /* 1 or 2 (0 = count not supported)
+					    */
+
+/* Bit field values for enc_capa in struct iw_range */
+#define IW_ENC_CAPA_WPA		0x00000001
+#define IW_ENC_CAPA_WPA2	0x00000002
+#define IW_ENC_CAPA_CIPHER_TKIP	0x00000004
+#define IW_ENC_CAPA_CIPHER_CCMP	0x00000008
+
+/* Event capability macros - in (struct iw_range *)->event_capa
+ * Because we have more than 32 possible events, we use an array of
+ * 32 bit bitmasks. Note : 32 bits = 0x20 = 2^5. */
+#define IW_EVENT_CAPA_BASE(cmd)		((cmd >= SIOCIWFIRSTPRIV) ? \
+					 (cmd - SIOCIWFIRSTPRIV + 0x60) : \
+					 (cmd - SIOCSIWCOMMIT))
+#define IW_EVENT_CAPA_INDEX(cmd)	(IW_EVENT_CAPA_BASE(cmd) >> 5)
+#define IW_EVENT_CAPA_MASK(cmd)		(1 << (IW_EVENT_CAPA_BASE(cmd) & 0x1F))
+/* Event capability constants - event autogenerated by the kernel
+ * This list is valid for most 802.11 devices, customise as needed... */
+#define IW_EVENT_CAPA_K_0	(IW_EVENT_CAPA_MASK(0x8B04) | \
+				 IW_EVENT_CAPA_MASK(0x8B06) | \
+				 IW_EVENT_CAPA_MASK(0x8B1A))
+#define IW_EVENT_CAPA_K_1	(IW_EVENT_CAPA_MASK(0x8B2A))
+/* "Easy" macro to set events in iw_range (less efficient) */
+#define IW_EVENT_CAPA_SET(event_capa, cmd) (event_capa[IW_EVENT_CAPA_INDEX(cmd)] |= IW_EVENT_CAPA_MASK(cmd))
+#define IW_EVENT_CAPA_SET_KERNEL(event_capa) {event_capa[0] |= IW_EVENT_CAPA_K_0; event_capa[1] |= IW_EVENT_CAPA_K_1; }
+
+/* Modulations bitmasks */
+#define IW_MODUL_ALL		0x00000000	/* Everything supported */
+#define IW_MODUL_FH		0x00000001	/* Frequency Hopping */
+#define IW_MODUL_DS		0x00000002	/* Original Direct Sequence */
+#define IW_MODUL_CCK		0x00000004	/* 802.11b : 5.5 + 11 Mb/s */
+#define IW_MODUL_11B		(IW_MODUL_DS | IW_MODUL_CCK)
+#define IW_MODUL_PBCC		0x00000008	/* TI : 5.5 + 11 + 22 Mb/s */
+#define IW_MODUL_OFDM_A		0x00000010	/* 802.11a : 54 Mb/s */
+#define IW_MODUL_11A		(IW_MODUL_OFDM_A)
+#define IW_MODUL_11AB		(IW_MODUL_11B | IW_MODUL_11A)
+#define IW_MODUL_OFDM_G		0x00000020	/* 802.11g : 54 Mb/s */
+#define IW_MODUL_11G		(IW_MODUL_11B | IW_MODUL_OFDM_G)
+#define IW_MODUL_11AG		(IW_MODUL_11G | IW_MODUL_11A)
+#define IW_MODUL_TURBO		0x00000040	/* ATH : bonding, 108 Mb/s */
+/* In here we should define MIMO stuff. Later... */
+#define IW_MODUL_CUSTOM		0x40000000	/* Driver specific */
+
+/* Bitrate flags available */
+#define IW_BITRATE_TYPE		0x00FF	/* Type of value */
+#define IW_BITRATE_UNICAST	0x0001	/* Maximum/Fixed unicast bitrate */
+#define IW_BITRATE_BROADCAST	0x0002	/* Fixed broadcast bitrate */
+
+/****************************** TYPES ******************************/
+
+/* --------------------------- SUBTYPES --------------------------- */
+/*
+ *	Generic format for most parameters that fit in an int
+ */
+struct	iw_param
+{
+  __s32		value;		/* The value of the parameter itself */
+  __u8		fixed;		/* Hardware should not use auto select */
+  __u8		disabled;	/* Disable the feature */
+  __u16		flags;		/* Various specifc flags (if any) */
+};
+
+/*
+ *	For all data larger than 16 octets, we need to use a
+ *	pointer to memory allocated in user space.
+ */
+struct	iw_point
+{
+  void __user	*pointer;	/* Pointer to the data  (in user space) */
+  __u16		length;		/* number of fields or size in bytes */
+  __u16		flags;		/* Optional params */
+};
+
+/*
+ *	A frequency
+ *	For numbers lower than 10^9, we encode the number in 'm' and
+ *	set 'e' to 0
+ *	For number greater than 10^9, we divide it by the lowest power
+ *	of 10 to get 'm' lower than 10^9, with 'm'= f / (10^'e')...
+ *	The power of 10 is in 'e', the result of the division is in 'm'.
+ */
+struct	iw_freq
+{
+	__s32		m;		/* Mantissa */
+	__s16		e;		/* Exponent */
+	__u8		i;		/* List index (when in range struct) */
+	__u8		flags;		/* Flags (fixed/auto) */
+};
+
+/*
+ *	Quality of the link
+ */
+struct	iw_quality
+{
+	__u8		qual;		/* link quality (%retries, SNR,
+					   %missed beacons or better...) */
+	__u8		level;		/* signal level (dBm) */
+	__u8		noise;		/* noise level (dBm) */
+	__u8		updated;	/* Flags to know if updated */
+};
+
+/*
+ *	Packet discarded in the wireless adapter due to
+ *	"wireless" specific problems...
+ *	Note : the list of counter and statistics in net_device_stats
+ *	is already pretty exhaustive, and you should use that first.
+ *	This is only additional stats...
+ */
+struct	iw_discarded
+{
+	__u32		nwid;		/* Rx : Wrong nwid/essid */
+	__u32		code;		/* Rx : Unable to code/decode (WEP) */
+	__u32		fragment;	/* Rx : Can't perform MAC reassembly */
+	__u32		retries;	/* Tx : Max MAC retries num reached */
+	__u32		misc;		/* Others cases */
+};
+
+/*
+ *	Packet/Time period missed in the wireless adapter due to
+ *	"wireless" specific problems...
+ */
+struct	iw_missed
+{
+	__u32		beacon;		/* Missed beacons/superframe */
+};
+
+/*
+ *	Quality range (for spy threshold)
+ */
+struct	iw_thrspy
+{
+	struct sockaddr		addr;		/* Source address (hw/mac) */
+	struct iw_quality	qual;		/* Quality of the link */
+	struct iw_quality	low;		/* Low threshold */
+	struct iw_quality	high;		/* High threshold */
+};
+
+/*
+ *	Optional data for scan request
+ *
+ *	Note: these optional parameters are controlling parameters for the
+ *	scanning behavior, these do not apply to getting scan results
+ *	(SIOCGIWSCAN). Drivers are expected to keep a local BSS table and
+ *	provide a merged results with all BSSes even if the previous scan
+ *	request limited scanning to a subset, e.g., by specifying an SSID.
+ *	Especially, scan results are required to include an entry for the
+ *	current BSS if the driver is in Managed mode and associated with an AP.
+ */
+struct	iw_scan_req
+{
+	__u8		scan_type; /* IW_SCAN_TYPE_{ACTIVE,PASSIVE} */
+	__u8		essid_len;
+	__u8		num_channels; /* num entries in channel_list;
+				       * 0 = scan all allowed channels */
+	__u8		flags; /* reserved as padding; use zero, this may
+				* be used in the future for adding flags
+				* to request different scan behavior */
+	struct sockaddr	bssid; /* ff:ff:ff:ff:ff:ff for broadcast BSSID or
+				* individual address of a specific BSS */
+
+	/*
+	 * Use this ESSID if IW_SCAN_THIS_ESSID flag is used instead of using
+	 * the current ESSID. This allows scan requests for specific ESSID
+	 * without having to change the current ESSID and potentially breaking
+	 * the current association.
+	 */
+	__u8		essid[IW_ESSID_MAX_SIZE];
+
+	/*
+	 * Optional parameters for changing the default scanning behavior.
+	 * These are based on the MLME-SCAN.request from IEEE Std 802.11.
+	 * TU is 1.024 ms. If these are set to 0, driver is expected to use
+	 * reasonable default values. min_channel_time defines the time that
+	 * will be used to wait for the first reply on each channel. If no
+	 * replies are received, next channel will be scanned after this. If
+	 * replies are received, total time waited on the channel is defined by
+	 * max_channel_time.
+	 */
+	__u32		min_channel_time; /* in TU */
+	__u32		max_channel_time; /* in TU */
+
+	struct iw_freq	channel_list[IW_MAX_FREQUENCIES];
+};
+
+/* ------------------------- WPA SUPPORT ------------------------- */
+
+/*
+ *	Extended data structure for get/set encoding (this is used with
+ *	SIOCSIWENCODEEXT/SIOCGIWENCODEEXT. struct iw_point and IW_ENCODE_*
+ *	flags are used in the same way as with SIOCSIWENCODE/SIOCGIWENCODE and
+ *	only the data contents changes (key data -> this structure, including
+ *	key data).
+ *
+ *	If the new key is the first group key, it will be set as the default
+ *	TX key. Otherwise, default TX key index is only changed if
+ *	IW_ENCODE_EXT_SET_TX_KEY flag is set.
+ *
+ *	Key will be changed with SIOCSIWENCODEEXT in all cases except for
+ *	special "change TX key index" operation which is indicated by setting
+ *	key_len = 0 and ext_flags |= IW_ENCODE_EXT_SET_TX_KEY.
+ *
+ *	tx_seq/rx_seq are only used when respective
+ *	IW_ENCODE_EXT_{TX,RX}_SEQ_VALID flag is set in ext_flags. Normal
+ *	TKIP/CCMP operation is to set RX seq with SIOCSIWENCODEEXT and start
+ *	TX seq from zero whenever key is changed. SIOCGIWENCODEEXT is normally
+ *	used only by an Authenticator (AP or an IBSS station) to get the
+ *	current TX sequence number. Using TX_SEQ_VALID for SIOCSIWENCODEEXT and
+ *	RX_SEQ_VALID for SIOCGIWENCODEEXT are optional, but can be useful for
+ *	debugging/testing.
+ */
+struct	iw_encode_ext
+{
+	__u32		ext_flags; /* IW_ENCODE_EXT_* */
+	__u8		tx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
+	__u8		rx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
+	struct sockaddr	addr; /* ff:ff:ff:ff:ff:ff for broadcast/multicast
+			       * (group) keys or unicast address for
+			       * individual keys */
+	__u16		alg; /* IW_ENCODE_ALG_* */
+	__u16		key_len;
+	__u8		key[0];
+};
+
+/* SIOCSIWMLME data */
+struct	iw_mlme
+{
+	__u16		cmd; /* IW_MLME_* */
+	__u16		reason_code;
+	struct sockaddr	addr;
+};
+
+/* SIOCSIWPMKSA data */
+#define IW_PMKSA_ADD		1
+#define IW_PMKSA_REMOVE		2
+#define IW_PMKSA_FLUSH		3
+
+#define IW_PMKID_LEN	16
+
+struct	iw_pmksa
+{
+	__u32		cmd; /* IW_PMKSA_* */
+	struct sockaddr	bssid;
+	__u8		pmkid[IW_PMKID_LEN];
+};
+
+/* IWEVMICHAELMICFAILURE data */
+struct	iw_michaelmicfailure
+{
+	__u32		flags;
+	struct sockaddr	src_addr;
+	__u8		tsc[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */
+};
+
+/* IWEVPMKIDCAND data */
+#define IW_PMKID_CAND_PREAUTH	0x00000001 /* RNS pre-authentication enabled */
+struct	iw_pmkid_cand
+{
+	__u32		flags; /* IW_PMKID_CAND_* */
+	__u32		index; /* the smaller the index, the higher the
+				* priority */
+	struct sockaddr	bssid;
+};
+
+/* ------------------------ WIRELESS STATS ------------------------ */
+/*
+ * Wireless statistics (used for /proc/net/wireless)
+ */
+struct	iw_statistics
+{
+	__u16		status;		/* Status
+					 * - device dependent for now */
+
+	struct iw_quality	qual;		/* Quality of the link
+						 * (instant/mean/max) */
+	struct iw_discarded	discard;	/* Packet discarded counts */
+	struct iw_missed	miss;		/* Packet missed counts */
+};
+
+/* ------------------------ IOCTL REQUEST ------------------------ */
+/*
+ * This structure defines the payload of an ioctl, and is used 
+ * below.
+ *
+ * Note that this structure should fit on the memory footprint
+ * of iwreq (which is the same as ifreq), which mean a max size of
+ * 16 octets = 128 bits. Warning, pointers might be 64 bits wide...
+ * You should check this when increasing the structures defined
+ * above in this file...
+ */
+union	iwreq_data
+{
+	/* Config - generic */
+	char		name[IFNAMSIZ];
+	/* Name : used to verify the presence of  wireless extensions.
+	 * Name of the protocol/provider... */
+
+	struct iw_point	essid;		/* Extended network name */
+	struct iw_param	nwid;		/* network id (or domain - the cell) */
+	struct iw_freq	freq;		/* frequency or channel :
+					 * 0-1000 = channel
+					 * > 1000 = frequency in Hz */
+
+	struct iw_param	sens;		/* signal level threshold */
+	struct iw_param	bitrate;	/* default bit rate */
+	struct iw_param	txpower;	/* default transmit power */
+	struct iw_param	rts;		/* RTS threshold threshold */
+	struct iw_param	frag;		/* Fragmentation threshold */
+	__u32		mode;		/* Operation mode */
+	struct iw_param	retry;		/* Retry limits & lifetime */
+
+	struct iw_point	encoding;	/* Encoding stuff : tokens */
+	struct iw_param	power;		/* PM duration/timeout */
+	struct iw_quality qual;		/* Quality part of statistics */
+
+	struct sockaddr	ap_addr;	/* Access point address */
+	struct sockaddr	addr;		/* Destination address (hw/mac) */
+
+	struct iw_param	param;		/* Other small parameters */
+	struct iw_point	data;		/* Other large parameters */
+};
+
+/*
+ * The structure to exchange data for ioctl.
+ * This structure is the same as 'struct ifreq', but (re)defined for
+ * convenience...
+ * Do I need to remind you about structure size (32 octets) ?
+ */
+struct	iwreq 
+{
+	union
+	{
+		char	ifrn_name[IFNAMSIZ];	/* if name, e.g. "eth0" */
+	} ifr_ifrn;
+
+	/* Data part (defined just above) */
+	union	iwreq_data	u;
+};
+
+/* -------------------------- IOCTL DATA -------------------------- */
+/*
+ *	For those ioctl which want to exchange mode data that what could
+ *	fit in the above structure...
+ */
+
+/*
+ *	Range of parameters
+ */
+
+struct	iw_range
+{
+	/* Informative stuff (to choose between different interface) */
+	__u32		throughput;	/* To give an idea... */
+	/* In theory this value should be the maximum benchmarked
+	 * TCP/IP throughput, because with most of these devices the
+	 * bit rate is meaningless (overhead an co) to estimate how
+	 * fast the connection will go and pick the fastest one.
+	 * I suggest people to play with Netperf or any benchmark...
+	 */
+
+	/* NWID (or domain id) */
+	__u32		min_nwid;	/* Minimal NWID we are able to set */
+	__u32		max_nwid;	/* Maximal NWID we are able to set */
+
+	/* Old Frequency (backward compat - moved lower ) */
+	__u16		old_num_channels;
+	__u8		old_num_frequency;
+
+	/* Wireless event capability bitmasks */
+	__u32		event_capa[6];
+
+	/* signal level threshold range */
+	__s32		sensitivity;
+
+	/* Quality of link & SNR stuff */
+	/* Quality range (link, level, noise)
+	 * If the quality is absolute, it will be in the range [0 ; max_qual],
+	 * if the quality is dBm, it will be in the range [max_qual ; 0].
+	 * Don't forget that we use 8 bit arithmetics... */
+	struct iw_quality	max_qual;	/* Quality of the link */
+	/* This should contain the average/typical values of the quality
+	 * indicator. This should be the threshold between a "good" and
+	 * a "bad" link (example : monitor going from green to orange).
+	 * Currently, user space apps like quality monitors don't have any
+	 * way to calibrate the measurement. With this, they can split
+	 * the range between 0 and max_qual in different quality level
+	 * (using a geometric subdivision centered on the average).
+	 * I expect that people doing the user space apps will feedback
+	 * us on which value we need to put in each driver... */
+	struct iw_quality	avg_qual;	/* Quality of the link */
+
+	/* Rates */
+	__u8		num_bitrates;	/* Number of entries in the list */
+	__s32		bitrate[IW_MAX_BITRATES];	/* list, in bps */
+
+	/* RTS threshold */
+	__s32		min_rts;	/* Minimal RTS threshold */
+	__s32		max_rts;	/* Maximal RTS threshold */
+
+	/* Frag threshold */
+	__s32		min_frag;	/* Minimal frag threshold */
+	__s32		max_frag;	/* Maximal frag threshold */
+
+	/* Power Management duration & timeout */
+	__s32		min_pmp;	/* Minimal PM period */
+	__s32		max_pmp;	/* Maximal PM period */
+	__s32		min_pmt;	/* Minimal PM timeout */
+	__s32		max_pmt;	/* Maximal PM timeout */
+	__u16		pmp_flags;	/* How to decode max/min PM period */
+	__u16		pmt_flags;	/* How to decode max/min PM timeout */
+	__u16		pm_capa;	/* What PM options are supported */
+
+	/* Encoder stuff */
+	__u16	encoding_size[IW_MAX_ENCODING_SIZES];	/* Different token sizes */
+	__u8	num_encoding_sizes;	/* Number of entry in the list */
+	__u8	max_encoding_tokens;	/* Max number of tokens */
+	/* For drivers that need a "login/passwd" form */
+	__u8	encoding_login_index;	/* token index for login token */
+
+	/* Transmit power */
+	__u16		txpower_capa;	/* What options are supported */
+	__u8		num_txpower;	/* Number of entries in the list */
+	__s32		txpower[IW_MAX_TXPOWER];	/* list, in bps */
+
+	/* Wireless Extension version info */
+	__u8		we_version_compiled;	/* Must be WIRELESS_EXT */
+	__u8		we_version_source;	/* Last update of source */
+
+	/* Retry limits and lifetime */
+	__u16		retry_capa;	/* What retry options are supported */
+	__u16		retry_flags;	/* How to decode max/min retry limit */
+	__u16		r_time_flags;	/* How to decode max/min retry life */
+	__s32		min_retry;	/* Minimal number of retries */
+	__s32		max_retry;	/* Maximal number of retries */
+	__s32		min_r_time;	/* Minimal retry lifetime */
+	__s32		max_r_time;	/* Maximal retry lifetime */
+
+	/* Frequency */
+	__u16		num_channels;	/* Number of channels [0; num - 1] */
+	__u8		num_frequency;	/* Number of entry in the list */
+	struct iw_freq	freq[IW_MAX_FREQUENCIES];	/* list */
+	/* Note : this frequency list doesn't need to fit channel numbers,
+	 * because each entry contain its channel index */
+
+	__u32		enc_capa;	/* IW_ENC_CAPA_* bit field */
+
+	/* More power management stuff */
+	__s32		min_pms;	/* Minimal PM saving */
+	__s32		max_pms;	/* Maximal PM saving */
+	__u16		pms_flags;	/* How to decode max/min PM saving */
+
+	/* All available modulations for driver (hw may support less) */
+	__s32		modul_capa;	/* IW_MODUL_* bit field */
+
+	/* More bitrate stuff */
+	__u32		bitrate_capa;	/* Types of bitrates supported */
+};
+
+/*
+ * Private ioctl interface information
+ */
+ 
+struct	iw_priv_args
+{
+	__u32		cmd;		/* Number of the ioctl to issue */
+	__u16		set_args;	/* Type and number of args */
+	__u16		get_args;	/* Type and number of args */
+	char		name[IFNAMSIZ];	/* Name of the extension */
+};
+
+/* ----------------------- WIRELESS EVENTS ----------------------- */
+/*
+ * Wireless events are carried through the rtnetlink socket to user
+ * space. They are encapsulated in the IFLA_WIRELESS field of
+ * a RTM_NEWLINK message.
+ */
+
+/*
+ * A Wireless Event. Contains basically the same data as the ioctl...
+ */
+struct iw_event
+{
+	__u16		len;			/* Real lenght of this stuff */
+	__u16		cmd;			/* Wireless IOCTL */
+	union iwreq_data	u;		/* IOCTL fixed payload */
+};
+
+/* Size of the Event prefix (including padding and alignement junk) */
+#define IW_EV_LCP_LEN	(sizeof(struct iw_event) - sizeof(union iwreq_data))
+/* Size of the various events */
+#define IW_EV_CHAR_LEN	(IW_EV_LCP_LEN + IFNAMSIZ)
+#define IW_EV_UINT_LEN	(IW_EV_LCP_LEN + sizeof(__u32))
+#define IW_EV_FREQ_LEN	(IW_EV_LCP_LEN + sizeof(struct iw_freq))
+#define IW_EV_PARAM_LEN	(IW_EV_LCP_LEN + sizeof(struct iw_param))
+#define IW_EV_ADDR_LEN	(IW_EV_LCP_LEN + sizeof(struct sockaddr))
+#define IW_EV_QUAL_LEN	(IW_EV_LCP_LEN + sizeof(struct iw_quality))
+
+/* iw_point events are special. First, the payload (extra data) come at
+ * the end of the event, so they are bigger than IW_EV_POINT_LEN. Second,
+ * we omit the pointer, so start at an offset. */
+#define IW_EV_POINT_OFF (((char *) &(((struct iw_point *) NULL)->length)) - \
+			  (char *) NULL)
+#define IW_EV_POINT_LEN	(IW_EV_LCP_LEN + sizeof(struct iw_point) - \
+			 IW_EV_POINT_OFF)
+
+#endif	/* _LINUX_WIRELESS_H */

From 7f01a5740ddba2830b42f9e30d15a77b6f2d4604 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 1 Nov 2013 16:33:47 +0400
Subject: [PATCH 34/73] add libiw to build

---
 configure.ac    | 1 +
 lib/Makefile.am | 1 +
 src/Makefile.am | 1 +
 3 files changed, 3 insertions(+)

diff --git a/configure.ac b/configure.ac
index 394eb677f..fd211fdb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,6 +179,7 @@ lib/libtriple/Makefile
 lib/libtuxtxt/Makefile
 lib/libdvbsub/Makefile
 lib/libupnpclient/Makefile
+lib/libiw/Makefile
 src/lcddisplay/Makefile
 src/nhttpd/Makefile
 src/nhttpd/web/Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 47d51625a..089a06010 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -8,6 +8,7 @@ SUBDIRS = \
 	libnet \
 	xmltree \
 	libtuxtxt \
+	libiw \
 	libdvbsub
 
 if ENABLE_UPNP
diff --git a/src/Makefile.am b/src/Makefile.am
index a34f695cd..3d3c29d6b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -96,6 +96,7 @@ neutrino_LDADD = \
 	$(top_builddir)/lib/libmd5sum/libtuxbox-md5sum.a \
 	$(top_builddir)/lib/libtuxtxt/libtuxtxt.a \
 	$(top_builddir)/lib/libdvbsub/libdvbsub.a \
+	$(top_builddir)/lib/libiw/libiw.a \
 	@CURL_LIBS@ \
 	@FREETYPE_LIBS@ \
 	@PNG_LIBS@ \

From 71510aa3f0dcb19c3ec138337d045404cbc29aee Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 1 Nov 2013 16:34:32 +0400
Subject: [PATCH 35/73] locals: add locales for wlan scan

---
 data/locale/english.locale | 4 ++++
 src/system/locals.h        | 4 ++++
 src/system/locals_intern.h | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/data/locale/english.locale b/data/locale/english.locale
index 5672644fd..ffa3f0e03 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -976,6 +976,7 @@ menu.hint_net_setupnow Apply current settings
 menu.hint_net_setuponstartup Start network at boot time
 menu.hint_net_show Show current network settings
 menu.hint_net_ssid Enter SSID of wireless network\nyou want to connect to
+menu.hint_net_ssid_scan Scan for available WLAN networks
 menu.hint_net_telnet Enable telnet login to your box
 menu.hint_net_test Test network connection: ping gateway,\n name server and external IP
 menu.hint_net_ushare Share connected HDD over uPnp
@@ -1490,6 +1491,9 @@ networkmenu.setupnow Apply network settings now
 networkmenu.setuponstartup Setup network on startup
 networkmenu.show Show active Network settings
 networkmenu.ssid Network name (SSID)
+networkmenu.ssid_scan WLAN network scan
+networkmenu.ssid_scan_error No WLAN networks are found.
+networkmenu.ssid_scan_wait WLAN network scan in progress...
 networkmenu.test Test network now
 neutrino_starting Neutrino-HD starting...
 nfs.alreadymounted directory already mounted
diff --git a/src/system/locals.h b/src/system/locals.h
index decffe1dd..f2e681f7d 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -1003,6 +1003,7 @@ typedef enum
 	LOCALE_MENU_HINT_NET_SETUPONSTARTUP,
 	LOCALE_MENU_HINT_NET_SHOW,
 	LOCALE_MENU_HINT_NET_SSID,
+	LOCALE_MENU_HINT_NET_SSID_SCAN,
 	LOCALE_MENU_HINT_NET_TELNET,
 	LOCALE_MENU_HINT_NET_TEST,
 	LOCALE_MENU_HINT_NET_USHARE,
@@ -1517,6 +1518,9 @@ typedef enum
 	LOCALE_NETWORKMENU_SETUPONSTARTUP,
 	LOCALE_NETWORKMENU_SHOW,
 	LOCALE_NETWORKMENU_SSID,
+	LOCALE_NETWORKMENU_SSID_SCAN,
+	LOCALE_NETWORKMENU_SSID_SCAN_ERROR,
+	LOCALE_NETWORKMENU_SSID_SCAN_WAIT,
 	LOCALE_NETWORKMENU_TEST,
 	LOCALE_NEUTRINO_STARTING,
 	LOCALE_NFS_ALREADYMOUNTED,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 9295f71b8..ee641767d 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -1003,6 +1003,7 @@ const char * locale_real_names[] =
 	"menu.hint_net_setuponstartup",
 	"menu.hint_net_show",
 	"menu.hint_net_ssid",
+	"menu.hint_net_ssid_scan",
 	"menu.hint_net_telnet",
 	"menu.hint_net_test",
 	"menu.hint_net_ushare",
@@ -1517,6 +1518,9 @@ const char * locale_real_names[] =
 	"networkmenu.setuponstartup",
 	"networkmenu.show",
 	"networkmenu.ssid",
+	"networkmenu.ssid_scan",
+	"networkmenu.ssid_scan_error",
+	"networkmenu.ssid_scan_wait",
 	"networkmenu.test",
 	"neutrino_starting",
 	"nfs.alreadymounted",

From 595c6a961b05e1997329b5bd868d8fb2f3e447bb Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 1 Nov 2013 16:36:08 +0400
Subject: [PATCH 36/73] src/gui/network_setup.cpp: add wlan scan

---
 src/gui/network_setup.cpp | 57 ++++++++++++++++++++++++++++++++++++++-
 src/gui/network_setup.h   |  5 ++--
 2 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp
index ff844511a..75fa1da60 100644
--- a/src/gui/network_setup.cpp
+++ b/src/gui/network_setup.cpp
@@ -56,6 +56,7 @@
 #include <system/debug.h>
 
 #include <libnet.h>
+#include <libiw/iwscan.h>
 
 extern "C" int pinghost( const char *hostname );
 
@@ -120,6 +121,10 @@ int CNetworkSetup::exec(CMenuTarget* parent, const std::string &actionKey)
 		showCurrentNetworkSettings();
 		return res;
 	}
+	else if(actionKey=="scanssid")
+	{
+		return showWlanList();
+	}
 	else if(actionKey=="restore")
 	{
 		int result =  	ShowMsgUTF(LOCALE_MAINSETTINGS_NETWORK, g_Locale->getText(LOCALE_NETWORKMENU_RESET_SETTINGS_NOW), CMessageBox::mbrNo,
@@ -316,13 +321,17 @@ int CNetworkSetup::showNetworkSetup()
 		CStringInputSMS * networkSettings_key = new CStringInputSMS(LOCALE_NETWORKMENU_PASSWORD, &network_key, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-.! ");
 		CMenuForwarder *m9 = new CMenuDForwarder(LOCALE_NETWORKMENU_SSID      , networkConfig->wireless, network_ssid , networkSettings_ssid );
 		CMenuForwarder *m10 = new CMenuDForwarder(LOCALE_NETWORKMENU_PASSWORD , networkConfig->wireless, network_key , networkSettings_key );
+		CMenuForwarder *m11 = new CMenuForwarder(LOCALE_NETWORKMENU_SSID_SCAN , networkConfig->wireless, NULL, this, "scanssid");
 
 		m9->setHint("", LOCALE_MENU_HINT_NET_SSID);
 		m10->setHint("", LOCALE_MENU_HINT_NET_PASS);
+		m11->setHint("", LOCALE_MENU_HINT_NET_SSID_SCAN);
 
 		wlanEnable[0] = m9;
 		wlanEnable[1] = m10;
+		wlanEnable[2] = m11;
 
+		networkSettings->addItem( m11);	//ssid scan
 		networkSettings->addItem( m9);	//ssid
 		networkSettings->addItem( m10);	//key
 		if (!g_settings.easymenu)
@@ -649,7 +658,6 @@ bool CNetworkSetup::changeNotify(const neutrino_locale_t locale, void * Data)
 		int ecnt = sizeof(wlanEnable) / sizeof(CMenuForwarder*);
 		for(int i = 0; i < ecnt; i++)
 			wlanEnable[i]->setActive(CNetworkConfig::getInstance()->wireless);
-
 	} else if(locale == LOCALE_NETWORKMENU_DHCP) {
 		CNetworkConfig::getInstance()->inet_static = (network_dhcp == NETWORK_DHCP_OFF);
 		int ecnt = sizeof(dhcpDisable) / sizeof(CMenuForwarder*);
@@ -798,3 +806,50 @@ void CNetworkSetup::testNetworkSettings()
 
 	ShowMsgUTF(LOCALE_NETWORKMENU_TEST, text, CMessageBox::mbrBack, CMessageBox::mbBack); // UTF-8
 }
+
+int CNetworkSetup::showWlanList()
+{
+	int   res = menu_return::RETURN_REPAINT;
+
+	CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_NETWORKMENU_SSID_SCAN_WAIT));
+	hintBox.paint();
+
+	std::vector<wlan_network> networks;
+	bool found = get_wlan_list(g_settings.ifname, networks);
+	hintBox.hide();
+	if (!found) {
+		ShowMsgUTF(LOCALE_MESSAGEBOX_ERROR, g_Locale->getText(LOCALE_NETWORKMENU_SSID_SCAN_ERROR), CMessageBox::mbrBack, CMessageBox::mbBack); // UTF-8
+		return res;
+	}
+
+	CMenuWidget wlist(LOCALE_MAINSETTINGS_NETWORK, NEUTRINO_ICON_SETTINGS, width);
+	wlist.addIntroItems(LOCALE_NETWORKMENU_SSID_SCAN); //intros
+
+	char cnt[5];
+	int select = -1;
+	CMenuSelectorTarget * selector = new CMenuSelectorTarget(&select);
+
+	std::string option[networks.size()];
+	for (unsigned i = 0; i < networks.size(); ++i) {
+		sprintf(cnt, "%d", i);
+		
+		option[i] = networks[i].qual;
+		option[i] += ", ";
+		option[i] += networks[i].channel;
+
+		const char * icon = NULL;
+		if (networks[i].encrypted)
+			icon = NEUTRINO_ICON_LOCK;
+		CMenuForwarderNonLocalized * net = new CMenuForwarderNonLocalized(networks[i].ssid.c_str(), true, option[i], selector, cnt, CRCInput::RC_nokey, NULL, icon);
+		net->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
+		wlist.addItem(net, networks[i].ssid == network_ssid);
+	}
+	res = wlist.exec(NULL, "");
+	delete selector;
+
+	printf("CNetworkSetup::showWlanList: selected: %d\n", select);
+	if (select >= 0) {
+		network_ssid = networks[select].ssid;
+	}
+	return res;
+}
diff --git a/src/gui/network_setup.h b/src/gui/network_setup.h
index 2464f573c..f2c015c24 100644
--- a/src/gui/network_setup.h
+++ b/src/gui/network_setup.h
@@ -75,7 +75,7 @@ class CNetworkSetup : public CMenuTarget, CChangeObserver
 
 
 		CMenuForwarder* dhcpDisable[5];
-		CMenuForwarder* wlanEnable[2];
+		CMenuForwarder* wlanEnable[3];
 
 		CSectionsdConfigNotifier* sectionsdConfigNotifier;
 			
@@ -89,7 +89,8 @@ class CNetworkSetup : public CMenuTarget, CChangeObserver
 		int saveChangesDialog();
 		void applyNetworkSettings();
 		void saveNetworkSettings();
-		
+		int showWlanList();
+
 		bool checkIntSettings();
 		bool checkStringSettings();
 		bool checkForIP();

From 22138336d472646b1fb21d4e28a061849015229b Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 1 Nov 2013 16:37:29 +0400
Subject: [PATCH 37/73] src/gui/widget/stringinput.cpp: copy valueString to
 value in ::exec, to follow extenal valueString updates

---
 src/gui/widget/stringinput.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/gui/widget/stringinput.cpp b/src/gui/widget/stringinput.cpp
index b4c4a440d..59a5e8be8 100644
--- a/src/gui/widget/stringinput.cpp
+++ b/src/gui/widget/stringinput.cpp
@@ -84,9 +84,12 @@ CStringInput::CStringInput(const neutrino_locale_t Name, std::string* Value, int
 {
         name =  Name;
 	head = NULL;
+	value = NULL;
+#if 0
         value = new char[Size+1];
         value[Size] = '\0';
         strncpy(value,Value->c_str(),Size);
+#endif
         valueString = Value;
 	lower_bound = -1;
 	upper_bound = -1;
@@ -121,10 +124,12 @@ CStringInput::CStringInput(char * Head, char* Value, int Size, const neutrino_lo
 
 CStringInput::~CStringInput()
 {
+#if 0
 	if (valueString != NULL)
 	{
 		delete[] value;
 	}
+#endif
 	if(head) {
 		free(head);
 	}
@@ -379,6 +384,11 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & )
 		delete[] oldval;
 		return res;
 	}
+	if (valueString != NULL) {
+		value = new char[size+1];
+		value[size] = '\0';
+		strncpy(value,valueString->c_str(),size);
+	}
         oldval[size] = 0;
         dispval[size] = 0;
 
@@ -531,6 +541,9 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & )
         {
                 observ->changeNotify(name, value);
         }
+	if (valueString != NULL)
+		delete[] value;
+
 	delete[] dispval;
 	delete[] oldval;
 	return res;

From c9aa4bd7073b1821f5137708207ae6fc6ab689f4 Mon Sep 17 00:00:00 2001
From: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: Sat, 2 Nov 2013 07:50:59 +0100
Subject: [PATCH 38/73] deutsch.locale mainmenu.service/settings: Restore
 original values

---
 data/locale/deutsch.locale | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 0e3fd2c88..9e025fbbe 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -736,8 +736,8 @@ mainmenu.recording Aufnehmen
 mainmenu.recording_start Start
 mainmenu.recording_stop Stopp
 mainmenu.scripts Skripte
-mainmenu.service Service Einstellungen
-mainmenu.settings System Einstellungen
+mainmenu.service Service
+mainmenu.settings Einstellungen
 mainmenu.shutdown Ausschalten
 mainmenu.shutdown_menu Ausschalt Optionen
 mainmenu.sleeptimer SleepTimer

From d976dbbba0a47041834ec2f3f0a44da977f91565 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Sat, 2 Nov 2013 13:30:51 +0100
Subject: [PATCH 39/73] - deutsch.locale: add locales for wlan scan

---
 data/locale/deutsch.locale | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 9e025fbbe..e26e427ff 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -976,6 +976,7 @@ menu.hint_net_setupnow Weisen Sie die aktuellen Einstellungen zu oder übernehme
 menu.hint_net_setuponstartup Startet das Netzwerk automatisch beim Starten der Box
 menu.hint_net_show Zeigen Ihnen die aktuellen Netzwerkeinstellungen
 menu.hint_net_ssid Geben Sie die SSID des WLAN ein, mit dem Sie eine Verbindung herstellen möchten
+menu.hint_net_ssid_scan Nach verfügbaren WLAN-Netzwerken suchen
 menu.hint_net_telnet Aktiviert Telnet auf Ihrer Box
 menu.hint_net_test Testet die Netzwerkverbindung:\nPing auf Gateway, Name-Server und externe IP-Adressen
 menu.hint_net_ushare Freigabe verbundener Datenträger über UPnP
@@ -1490,6 +1491,9 @@ networkmenu.setupnow Einstellungen jetzt zuweisen
 networkmenu.setuponstartup Beim Start Netzwerk setzen
 networkmenu.show Aktive Einstellungen zeigen
 networkmenu.ssid Netzwerkname (SSID)
+networkmenu.ssid_scan WLAN-Netzwerke suchen
+networkmenu.ssid_scan_error Keine WLAN-Netzwerke gefunden.
+networkmenu.ssid_scan_wait WLAN-Netzwerke werden gesucht...
 networkmenu.test Netzwerk testen
 neutrino_starting Neutrino-HD wird gestartet...
 nfs.alreadymounted Verzeichnis bereits gemountet.

From be1e8facac9455f2df843071ab6e9eb37213c37d Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Sat, 2 Nov 2013 13:33:10 +0100
Subject: [PATCH 40/73] - locales: more suitable locales for
 networkmenu.setuponstartup

---
 data/locale/deutsch.locale | 2 +-
 data/locale/english.locale | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index e26e427ff..48cfd8e94 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -1488,7 +1488,7 @@ networkmenu.reset_settings_now Sollen die vorherigen Einstellungen \nwieder herg
 networkmenu.select_if Schnittstelle
 networkmenu.services Netzwerkservice
 networkmenu.setupnow Einstellungen jetzt zuweisen
-networkmenu.setuponstartup Beim Start Netzwerk setzen
+networkmenu.setuponstartup Schnittstelle beim Start aktivieren
 networkmenu.show Aktive Einstellungen zeigen
 networkmenu.ssid Netzwerkname (SSID)
 networkmenu.ssid_scan WLAN-Netzwerke suchen
diff --git a/data/locale/english.locale b/data/locale/english.locale
index ffa3f0e03..d4d9d64b4 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -1488,7 +1488,7 @@ networkmenu.reset_settings_now Do you want restore the previous settings?
 networkmenu.select_if Interface
 networkmenu.services Network services
 networkmenu.setupnow Apply network settings now
-networkmenu.setuponstartup Setup network on startup
+networkmenu.setuponstartup Setup interface on startup
 networkmenu.show Show active Network settings
 networkmenu.ssid Network name (SSID)
 networkmenu.ssid_scan WLAN network scan

From ad9e8e1ce3cc33d932da188a53804ff003cfe8a5 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Sat, 2 Nov 2013 14:08:40 +0100
Subject: [PATCH 41/73] - neutrino_menue: show always seperator line for secons
 section

---
 src/neutrino_menue.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index c2b7959bb..dfef56f8b 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -182,11 +182,6 @@ void CNeutrinoApp::InitMenuMain()
 
 	CMenuForwarder * mf;
 	if (!g_settings.easymenu) {
-		//separator
-		personalize.addSeparator(MENU_MAIN);
-
-		//2nd section***************************************************************************************************
-
 		//games
 		bool show_games = g_PluginList->hasPlugin(CPlugins::P_TYPE_GAME);
 		mf = new CMenuForwarder(LOCALE_MAINMENU_GAMES, show_games, NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME));
@@ -200,6 +195,11 @@ void CNeutrinoApp::InitMenuMain()
 		personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SCRIPTS]);
 	}
 
+	//separator
+	personalize.addSeparator(MENU_MAIN);
+
+	//2nd section***************************************************************************************************
+
 	// settings, also as pin protected option in personalize menu, as a result of parameter value CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION
 	mf = new CMenuForwarder(LOCALE_MAINMENU_SETTINGS, true, NULL, &personalize.getWidget(MENU_SETTINGS)/**settings**/);
 	mf->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_SETTINGS);

From 87f9ac539b3a2e183870462c74851a501387b46b Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Mon, 4 Nov 2013 09:25:43 +0100
Subject: [PATCH 42/73] - yWeb: remove descriptions from rcu tooltips

---
 src/nhttpd/web/languages/Deutsch | 72 ++++++++++++++++----------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch
index dd6d71641..8673724a9 100644
--- a/src/nhttpd/web/languages/Deutsch
+++ b/src/nhttpd/web/languages/Deutsch
@@ -542,8 +542,8 @@ info.your_version=Deine Version
 info.actual_version=Aktuelle Version
 
 =========Remote control
-rc.key_power=Standby - Schaltet den Receiver ein bzw. aus
-rc.key_mute=Mute - Schaltet den Ton an bzw. aus
+rc.key_power=Standby
+rc.key_mute=Mute
 rc.key_1=1
 rc.key_2=2
 rc.key_3=3
@@ -554,40 +554,40 @@ rc.key_7=7
 rc.key_8=8
 rc.key_9=9
 rc.key_0=0
-rc.key_text=Text - Zeigt den Teletext an
-rc.key_favorites=Favoriten - Zeigt die Favoritenliste an
-rc.key_volumeup=Vol+ - Erhöht die Lautstärke
-rc.key_volumedown=Vol- - Verringert die Lautstärke
-rc.key_pageup=Page+ - Blättert im Menü eine Seite hoch
-rc.key_pagedown=Page- - Blättert im Menü eine Seiter runter
-rc.key_mode=TV/Radio - Wechselt zwischen TV- und Radio-Modus
-rc.key_next=Skip- - Ändert das 4:3 Anzeigeverhalten
-rc.key_previous=Skip+ - Ändert das Bildschirmformat
-rc.key_sleep=Sleep - Setzt einen Ausschalt-Timer
-rc.key_audio=Audio - Startet den Audioplayer bzw. Internetradio
-rc.key_help=Help - Startet je nach Modus verschiedene Funktionen
-rc.key_red=Rot - Öffnet das Menü 'EPG/Vorschau'
-rc.key_green=Grün - Offnet das Menü 'Ton-Optionen'
-rc.key_yellow=Gelb - Öffnet das Menü 'Bild-Optionen' (wenn verfügbar)
-rc.key_blue=Blau - Öffnet das Menü 'Erweiterungen'
-rc.key_epg=EPG - Zeigt EPG-Informationen an
-rc.key_info=Info - Zeigt die Infobar und EPG-Beschreibung an
-rc.key_ok=OK - Bestätigt Auswahl im Menüfenster
-rc.key_up=Hoch - Programmwechsel und Menünavigation
-rc.key_down=Runter - Programmwechsel und Menünavigation
-rc.key_left=Links - Programmwechsel und Menünavigation
-rc.key_right=Rechts - Programmwechsel und Menünavigation
-rc.key_setup=Menü - Öffnet bzw. schließt das Hauptmenü
-rc.key_home=Exit - Schließt das geöffnete Menüfenster
-rc.key_sat=Sat - Öffnet Satelliten- bzw. Anbieterübersicht
+rc.key_text=Text
+rc.key_favorites=Favoriten
+rc.key_volumeup=Vol+
+rc.key_volumedown=Vol-
+rc.key_pageup=Page+
+rc.key_pagedown=Page-
+rc.key_mode=TV/Radio
+rc.key_next=Skip-
+rc.key_previous=Skip+
+rc.key_sleep=Sleep
+rc.key_audio=Audio
+rc.key_help=Help
+rc.key_red=Rot
+rc.key_green=Grün
+rc.key_yellow=Gelb
+rc.key_blue=Blau
+rc.key_epg=EPG
+rc.key_info=Info
+rc.key_ok=OK
+rc.key_up=Hoch
+rc.key_down=Runter
+rc.key_left=Links
+rc.key_right=Rechts
+rc.key_setup=Menü
+rc.key_home=Exit
+rc.key_sat=Sat
 rc.key_www=
-rc.key_rewind=Rewind - Zurückspulen
-rc.key_play=Play -  Öffnet das Filmarchiv oder startet die Wiedergabe
-rc.key_forward=Forward - Vorspulen
-rc.key_stop=Stop - Beendet Aufnahme, Timeshift oder Wiedergabe
-rc.key_record=Record - Startet Aufnahme
-rc.key_pause=Pause - Aktiviert timeshift oder pausiert die Wiedergabe
+rc.key_rewind=Rewind
+rc.key_play=Play
+rc.key_forward=Forward
+rc.key_stop=Stop
+rc.key_record=Record
+rc.key_pause=Pause
 rc.key_games=
 rc.key_time=
-rc.key_picsize=Pic Size - Ändert das 4:3 Anzeigeverhalten
-rc.key_picmode=Pic Mode - Ändert das Bildschirmformat
+rc.key_picsize=Pic Size
+rc.key_picmode=Pic Mode

From a3173c82cf8c38ae902f75d173fb41d4459ea39f Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Mon, 4 Nov 2013 12:44:25 +0100
Subject: [PATCH 43/73] - audioplayer: fix corner_type in header

---
 src/gui/audioplayer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index e202f6d88..5b9004340 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -1645,7 +1645,7 @@ void CAudioPlayerGui::paintHead()
 		return;
 
 	CComponentsHeader header(m_x, m_y + m_title_height, m_width, m_theight, LOCALE_AUDIOPLAYER_HEAD, NEUTRINO_ICON_MP3);
-	header.setCorner(RADIUS_MID);
+	header.setCorner(RADIUS_MID, CORNER_TOP);
 
 	if (m_inetmode)
 		header.setCaption(LOCALE_INETRADIO_NAME);

From 7de3ac679e1c895a9c2f020731af1039a8ecbe2f Mon Sep 17 00:00:00 2001
From: BPanther <bpanther_ts@hotmail.com>
Date: Wed, 2 Oct 2013 16:56:51 +0200
Subject: [PATCH 44/73] fix char (thx mohousch)

---
 src/eitd/edvbstring.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/eitd/edvbstring.cpp b/src/eitd/edvbstring.cpp
index a896b8914..fa0fa1459 100644
--- a/src/eitd/edvbstring.cpp
+++ b/src/eitd/edvbstring.cpp
@@ -1599,7 +1599,7 @@ const unsigned short cGB2312UNI[] = {
 // Two Char Mapping ( many polish services and UPC Direct/HBO services)
 // get from http://mitglied.lycos.de/buran/charsets/videotex-suppl.html
 //static inline unsigned int doVideoTexSuppl(int c1, int c2)
-static inline unsigned int doVideoTexSuppl(char c1, char c2)
+static inline unsigned int doVideoTexSuppl(unsigned char c1, unsigned char c2)
 {
 	switch (c1)
 	{

From bace5ce91b9e86d803a69adc1706808661e1447d Mon Sep 17 00:00:00 2001
From: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: Mon, 4 Nov 2013 11:51:05 +0100
Subject: [PATCH 45/73] Audioplayer: Remove special handling for display mute
 icon

---
 src/driver/volume.cpp     | 10 ----------
 src/gui/audiomute.cpp     |  8 +-------
 src/gui/audioplayer.cpp   |  7 -------
 src/gui/audioplayer.h     |  1 -
 src/gui/mediaplayer.cpp   |  2 --
 src/gui/pictureviewer.cpp |  3 +--
 6 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/src/driver/volume.cpp b/src/driver/volume.cpp
index 73167b4b6..a8fe704a3 100644
--- a/src/driver/volume.cpp
+++ b/src/driver/volume.cpp
@@ -105,11 +105,6 @@ void CVolume::setVolume(const neutrino_msg_t key)
 				if (CNeutrinoApp::getInstance()->isMuted() && (dir > 0 || g_settings.current_volume > 0)) {
 					hideVolscale();
 					CAudioMute::getInstance()->AudioMute(false, true);
-					if (mode == CNeutrinoApp::mode_audio) {
-						CAudioPlayerGui *cap = CMediaPlayerMenu::getInstance()->getPlayerInstance();
-							if (cap != NULL)
-								cap->refreshMuteIcon();
-					}
 					setVolume(msg);
 					return;
 				}
@@ -126,11 +121,6 @@ void CVolume::setVolume(const neutrino_msg_t key)
 						if (g_settings.show_mute_icon) {
 							hideVolscale();
 							CAudioMute::getInstance()->AudioMute(true, true);
-							if (mode == CNeutrinoApp::mode_audio) {
-								CAudioPlayerGui *cap = CMediaPlayerMenu::getInstance()->getPlayerInstance();
-									if (cap != NULL)
-										cap->refreshMuteIcon();
-							}
 							setVolume(msg);
 							return;
 						}
diff --git a/src/gui/audiomute.cpp b/src/gui/audiomute.cpp
index f5309230e..90ef21734 100644
--- a/src/gui/audiomute.cpp
+++ b/src/gui/audiomute.cpp
@@ -60,7 +60,7 @@ void CAudioMute::AudioMute(int newValue, bool isEvent)
 	neutrino->setCurrentMuted(newValue);
 	g_Zapit->muteAudio(newValue);
 
-	if( isEvent && ( neutrino->getMode() != CNeutrinoApp::mode_scart ) && ( neutrino->getMode() != CNeutrinoApp::mode_audio) && ( neutrino->getMode() != CNeutrinoApp::mode_pic))
+	if( isEvent && ( neutrino->getMode() != CNeutrinoApp::mode_scart ) && ( neutrino->getMode() != CNeutrinoApp::mode_pic))
 	{
 		CVolumeHelper::getInstance()->getMuteIconDimensions(&x, &y, &width, &height);
 		if ((y_old != y)) {
@@ -92,12 +92,6 @@ void CAudioMute::AudioMute(int newValue, bool isEvent)
 		if (doInit)
 			CVolumeHelper::getInstance()->refresh();
 	}
-	else if (neutrino->getMode() == CNeutrinoApp::mode_audio) {
-		if (newValue)
-			frameBuffer->setFbArea(CFrameBuffer::FB_PAINTAREA_MUTEICON1, x, y, width, height);
-		else
-			frameBuffer->setFbArea(CFrameBuffer::FB_PAINTAREA_MUTEICON1);
-	}
 }
 
 void CAudioMute::enableMuteIcon(bool enable)
diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index 5b9004340..7f07aecb3 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -281,8 +281,6 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
 	m_fheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
 
 	int iw, ih;
-	m_frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MUTE, &iw, &ih);
-	m_theight = std::max(m_theight, ih+2);
 	m_frameBuffer->getIconSize(NEUTRINO_ICON_MP3, &iw, &ih);
 	m_theight = std::max(m_theight, ih+4);
 
@@ -901,8 +899,6 @@ int CAudioPlayerGui::show()
 				ret = menu_return::RETURN_EXIT_ALL;
 				loop = false;
 			}
-			// update mute icon
-			paintHead();
 			paintLCD();
 		}
 	}
@@ -1650,9 +1646,6 @@ void CAudioPlayerGui::paintHead()
 	if (m_inetmode)
 		header.setCaption(LOCALE_INETRADIO_NAME);
 
-	if (CNeutrinoApp::getInstance()->isMuted())
-		header.addButtonIcon(NEUTRINO_ICON_BUTTON_MUTE_SMALL);
-
 #ifdef ENABLE_GUI_MOUNT
 	if (!m_inetmode)
 		header.addButtonIcon(NEUTRINO_ICON_BUTTON_MENU);
diff --git a/src/gui/audioplayer.h b/src/gui/audioplayer.h
index 8ed6eb5f8..74284ed4a 100644
--- a/src/gui/audioplayer.h
+++ b/src/gui/audioplayer.h
@@ -261,7 +261,6 @@ class CAudioPlayerGui : public CMenuTarget
 	bool playNext(bool allow_rotate = false);
 	bool playPrev(bool allow_rotate = false);
 	int getAudioPlayerM_current() {return m_current;}
-	void refreshMuteIcon() { paintHead(); }
 };
 
 
diff --git a/src/gui/mediaplayer.cpp b/src/gui/mediaplayer.cpp
index 75c72d334..3c8d87bf5 100644
--- a/src/gui/mediaplayer.cpp
+++ b/src/gui/mediaplayer.cpp
@@ -91,11 +91,9 @@ int CMediaPlayerMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 	CAudioMute *audiomute = CAudioMute::getInstance();
 	if (actionKey == "audioplayer")
 	{
-		audiomute->enableMuteIcon(false);
 		if (audioPlayer == NULL)
 			audioPlayer = new CAudioPlayerGui();
 		int res = audioPlayer->exec(NULL, "init");
-		audiomute->enableMuteIcon(true);
 		return res /*menu_return::RETURN_REPAINT*/;
 	}
 	else if	(actionKey == "inetplayer")
diff --git a/src/gui/pictureviewer.cpp b/src/gui/pictureviewer.cpp
index 742080811..58ef0afe8 100644
--- a/src/gui/pictureviewer.cpp
+++ b/src/gui/pictureviewer.cpp
@@ -637,8 +637,7 @@ int CPictureViewerGui::show()
 	}
 	hide();
 
-	if (!audioplayer)
-		CAudioMute::getInstance()->enableMuteIcon(true);
+	CAudioMute::getInstance()->enableMuteIcon(true);
 
 	return(res);
 }

From 1c3ee43410748b37b80d0515fbecc135737ea05c Mon Sep 17 00:00:00 2001
From: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: Mon, 4 Nov 2013 17:09:21 +0100
Subject: [PATCH 46/73] Audioplayer: Remove special handling for display mute
 icon

- Supplement to bace5ce91b9e86d803a69adc1706808661e1447d
---
 src/gui/mediaplayer.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/gui/mediaplayer.cpp b/src/gui/mediaplayer.cpp
index 3c8d87bf5..f3ce226ce 100644
--- a/src/gui/mediaplayer.cpp
+++ b/src/gui/mediaplayer.cpp
@@ -98,11 +98,9 @@ int CMediaPlayerMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 	}
 	else if	(actionKey == "inetplayer")
 	{
-		audiomute->enableMuteIcon(false);
 		if (inetPlayer == NULL)
 			inetPlayer = new CAudioPlayerGui(true);
 		int res = inetPlayer->exec(NULL, "init");
-		audiomute->enableMuteIcon(true);
 		return res; //menu_return::RETURN_REPAINT;
 	}
 	else if (actionKey == "movieplayer")

From fed0bfda8c8e89326f5dec1d4f196013aee61bcc Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Mon, 4 Nov 2013 21:54:13 +0100
Subject: [PATCH 47/73] - moviebrowser: disable hdd-bar in youtube mode

---
 src/gui/moviebrowser.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index b29a57253..1eb47dbee 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -1286,7 +1286,9 @@ printf("CMovieBrowser::refreshMovieInfo\n");
 //printf("refreshMovieInfo: EpgId %llx id %llx y %d\n", m_movieSelectionHandler->epgEpgId, m_movieSelectionHandler->epgId, m_cBoxFrameTitleRel.iY);
 		int lx = m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX+m_cBoxFrameTitleRel.iWidth-logo_w-10;
 		int ly = m_cBoxFrameTitleRel.iY+m_cBoxFrame.iY+ (m_cBoxFrameTitleRel.iHeight-logo_h)/2;
-		const short pb_hdd_offset = 104;
+		short pb_hdd_offset = 104;
+		if (show_mode == MB_SHOW_YT)
+			pb_hdd_offset = 0;
 		m_pcWindow->paintBoxRel(lx - pb_hdd_offset , ly, logo_w, logo_h, TITLE_BACKGROUND_COLOR);
         	std::string lname;
 		if(g_PicViewer->GetLogoName(m_movieSelectionHandler->epgEpgId >>16, m_movieSelectionHandler->epgChannel, lname, &logo_w, &logo_h)){
@@ -1310,6 +1312,9 @@ printf("CMovieBrowser::refreshMovieInfo\n");
 
 void CMovieBrowser::info_hdd_level(bool paint_hdd)
 {
+	if (show_mode == MB_SHOW_YT)
+		return;
+
 	struct statfs s;
 	long	blocks_percent_used =0;
 	static long tmp_blocks_percent_used = 0;

From 404de5376b75c96bb3d79590b9cedc5cb8f8533e Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Mon, 4 Nov 2013 14:38:35 +0400
Subject: [PATCH 48/73] gui/personalize.cpp: fix CPinSetupNotifier: return
 false, menu repaint not needed

---
 src/gui/personalize.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/personalize.cpp b/src/gui/personalize.cpp
index 0d96acc41..62979bb86 100644
--- a/src/gui/personalize.cpp
+++ b/src/gui/personalize.cpp
@@ -974,5 +974,6 @@ bool CPinSetupNotifier::changeNotify(const neutrino_locale_t, void *)
 {
 	toDisable->setActive(g_settings.personalize[SNeutrinoSettings::P_MAIN_PINSTATUS]);
    
-   return g_settings.personalize[SNeutrinoSettings::P_MAIN_PINSTATUS];
+//   return g_settings.personalize[SNeutrinoSettings::P_MAIN_PINSTATUS];
+	return false;
 }

From 86762541509ca259196be569889c77b7d618f679 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Mon, 4 Nov 2013 14:39:37 +0400
Subject: [PATCH 49/73] PERSONALIZE_ACTIVE_MODE_OPTIONS: fix
 PERSONALIZE_PROTECT_MODE_MAX, PERSONALIZE_ACTIVE_MODE_OPTIONS need 2 options,
 not 3

---
 src/gui/personalize.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/personalize.h b/src/gui/personalize.h
index 2ce9b0045..cb537d4b4 100644
--- a/src/gui/personalize.h
+++ b/src/gui/personalize.h
@@ -194,7 +194,7 @@ class CPersonalizeGui : public CMenuTarget, public CChangeObserver, public CPINP
 			PERSONALIZE_PROTECT_MODE_NOT_PROTECTED =  0,
 			PERSONALIZE_PROTECT_MODE_PIN_PROTECTED  =  2,
 			
-			PERSONALIZE_PROTECT_MODE_MAX
+			PERSONALIZE_PROTECT_MODE_MAX = 2
 		};
 
 		//options for show_epg_feat options

From 9fe3e97c84b9f5ddc9e18a5d9fa07abad9c67a73 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Mon, 4 Nov 2013 14:47:09 +0400
Subject: [PATCH 50/73] gui/widget/menue.cpp: fix jump to some item types with
 direct key

---
 src/gui/widget/menue.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index 940c4a1fa..988bd6ff0 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -560,6 +560,8 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
 					if (titem->isSelectable()) {
 						items[selected]->paint( false );
 						selected= i;
+						paintHint(selected);
+						pos = selected;
 						msg= CRCInput::RC_ok;
 					} else {
 						// swallow-key...

From 8ef3efc72dd98621acf345e6809563a1b701278a Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Tue, 5 Nov 2013 11:43:55 +0400
Subject: [PATCH 51/73] gui/scan_setup.cpp: set wizard mode for frontend setup
 menu

---
 src/gui/scan_setup.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index dae229838..701a82bbc 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -527,6 +527,7 @@ int CScanSetup::showScanMenuFrontendSetup()
 	CZapit::getInstance()->GetConfig(zapitCfg);
 	CMenuWidget * setupMenu = new CMenuWidget(LOCALE_SATSETUP_FE_SETUP, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_SCAN_FE_SETUP);
 	setupMenu->addIntroItems();
+	setupMenu->setWizardMode(is_wizard);
 
 	int count = CFEManager::getInstance()->getFrontendCount();
 

From 0c724b457a4b1f979f98059c6bf342b5dbeec9e6 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Tue, 5 Nov 2013 11:44:28 +0400
Subject: [PATCH 52/73] gui/start_wizard.cpp: fix missing frontend setup

---
 src/gui/start_wizard.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui/start_wizard.cpp b/src/gui/start_wizard.cpp
index 60ced329c..827781abf 100644
--- a/src/gui/start_wizard.cpp
+++ b/src/gui/start_wizard.cpp
@@ -141,7 +141,9 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/)
 		{
 			CScanSetup::getInstance()->setWizardMode(CScanSetup::SCAN_SETUP_MODE_WIZARD);
 			if (advanced) {
-				res = CScanSetup::getInstance()->exec(NULL, "");
+				res = CScanSetup::getInstance()->exec(NULL, "setup_frontend");
+				if(res != menu_return::RETURN_EXIT_ALL)
+					res = CScanSetup::getInstance()->exec(NULL, "");
 			} else {
 				CZapit::getInstance()->GetConfig(zapitCfg);
 #ifdef ENABLE_FASTSCAN

From 789280736d7a504bbb7721f3c0ff9ff7dab57180 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Tue, 5 Nov 2013 10:09:08 +0100
Subject: [PATCH 53/73] - moviebrowser: use ccomponents to paint header

---
 src/gui/moviebrowser.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index 1eb47dbee..ea6d891f8 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -1619,7 +1619,6 @@ void CMovieBrowser::refreshBookmarkList(void) // P3
 
 void CMovieBrowser::refreshTitle(void)
 {
-	//Paint Text Background
 	std::string title = m_textTitle.c_str();
 	if (show_mode == MB_SHOW_YT) {
 		title = g_Locale->getText(LOCALE_MOVIEPLAYER_YTPLAYBACK);
@@ -1629,17 +1628,14 @@ void CMovieBrowser::refreshTitle(void)
 	
 	TRACE("[mb]->refreshTitle : %s\r\n", title.c_str());
 
-	const short text_border_width = 8;
-	int start_y = m_cBoxFrame.iY+	m_cBoxFrameTitleRel.iY;
+	int x = m_cBoxFrameTitleRel.iX + m_cBoxFrame.iX;
+	int y = m_cBoxFrameTitleRel.iY + m_cBoxFrame.iY;
+	int w = m_cBoxFrameTitleRel.iWidth;
+	int h = m_cBoxFrameTitleRel.iHeight;
 	
-	m_pcWindow->paintBoxRel(m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX, start_y,
-				m_cBoxFrameTitleRel.iWidth, m_cBoxFrameTitleRel.iHeight, TITLE_BACKGROUND_COLOR, RADIUS_LARGE, CORNER_TOP);
-	
-	int iconw = 0, iconh = 0;
-	CFrameBuffer::getInstance()->getIconSize(NEUTRINO_ICON_MOVIEPLAYER, &iconw, &iconh);
-	m_pcWindow->paintIcon(NEUTRINO_ICON_MOVIEPLAYER, m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX+6, start_y+ m_cBoxFrameTitleRel.iHeight/2 - iconh/2);
+	CComponentsHeader header(x, y, w, h, title.c_str(), NEUTRINO_ICON_MOVIEPLAYER);
+	header.paint(CC_SAVE_SCREEN_NO);
 
-	m_pcFontTitle->RenderString(m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX + iconw + text_border_width, start_y + m_cBoxFrameTitleRel.iHeight, m_cBoxFrameTitleRel.iWidth - (text_border_width << 1), title.c_str(), TITLE_FONT_COLOR, 0, true); // UTF-8
 	info_hdd_level(true);
 }
 

From 1e247dd6f4955adef473b579310ddbf446c58ce6 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Tue, 5 Nov 2013 15:29:43 +0400
Subject: [PATCH 54/73] data/locale/english.locale: fix typo

---
 data/locale/english.locale | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/locale/english.locale b/data/locale/english.locale
index d4d9d64b4..ef9a06cc0 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -736,7 +736,7 @@ mainmenu.recording Recording
 mainmenu.recording_start start
 mainmenu.recording_stop stop
 mainmenu.scripts Scripts
-mainmenu.service Instalation (service)
+mainmenu.service Installation (service)
 mainmenu.settings System settings
 mainmenu.shutdown Shutdown (deep standby)
 mainmenu.shutdown_menu Shutdown

From 70725b323b6e5d580759bd1c42492bd78e87cfbc Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Tue, 5 Nov 2013 15:33:12 +0400
Subject: [PATCH 55/73] gui/scan_setup.cpp: do not add satellites to select
 from disabled frontend; add intro items for scan menu not dependent on wizard
 mode: after wizard mode disabled, code add one more item (subhead), and saved
 selected invalidated, as result ie no selected item at all

---
 src/gui/scan_setup.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index 701a82bbc..5bbe9e787 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -374,11 +374,11 @@ int CScanSetup::showScanMenu()
 	allow_start = !CRecordManager::getInstance()->RecordingStatus() || CRecordManager::getInstance()->TimeshiftOnly();
 
 	//main
-	CMenuWidget * settings = new CMenuWidget(is_wizard ? LOCALE_SERVICEMENU_SCANTS : LOCALE_SERVICEMENU_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_SCAN_MAIN);
+	CMenuWidget * settings = new CMenuWidget(/*is_wizard ? LOCALE_SERVICEMENU_SCANTS :*/ LOCALE_SERVICEMENU_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_SCAN_MAIN);
 	settings->setWizardMode(is_wizard);
 
 	//back
-	settings->addIntroItems(is_wizard ? NONEXISTANT_LOCALE : LOCALE_SERVICEMENU_SCANTS);
+	settings->addIntroItems(/*is_wizard ? NONEXISTANT_LOCALE : */ LOCALE_SERVICEMENU_SCANTS);
 	//----------------------------------------------------------------------
 #if 0
 	//save scan settings
@@ -877,7 +877,7 @@ void CScanSetup::fillSatSelect(CMenuOptionStringChooser * select)
 	for(int i = 0; i < count; i++) {
 		CFrontend * fe = CFEManager::getInstance()->getFE(i);
 
-		if (fe->getInfo()->type != FE_QPSK)
+		if ((fe->getInfo()->type != FE_QPSK) || (fe->getMode() == CFrontend::FE_MODE_UNUSED))
 			continue;
 
 		satellite_map_t & satmap = fe->getSatellites();

From ae78af966c21534f9612ba6d715abe6fd2eb8350 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Tue, 5 Nov 2013 15:54:13 +0400
Subject: [PATCH 56/73] gui/test_menu.h: disable test menu

---
 src/gui/test_menu.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/test_menu.h b/src/gui/test_menu.h
index 38a69968d..b77bd9294 100644
--- a/src/gui/test_menu.h
+++ b/src/gui/test_menu.h
@@ -33,7 +33,7 @@
 #include <gui/widget/icons.h>
 #include <gui/components/cc.h>
 
-#define TEST_MENU
+//#define TEST_MENU
 
 #include <string>
 

From 6f700d80c0aa3a5cea62c5121deb041c95bfea54 Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Mon, 4 Nov 2013 22:00:06 +0100
Subject: [PATCH 57/73] CTestMenu: add configure option --enable-testmenu

---
 configure.ac           | 6 ++++++
 src/gui/Makefile.am    | 6 +++++-
 src/gui/test_menu.cpp  | 3 +--
 src/neutrino_menue.cpp | 4 +++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index fd211fdb9..6d617f9ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,6 +127,12 @@ AC_ARG_ENABLE(pip,
 	[AC_DEFINE(ENABLE_PIP,1,[enable picture in picture support])])
 
 
+AM_CONDITIONAL(ENABLE_TEST_MENU,test "$enable_testmenu" = "yes")
+if test "$enable_testmenu" = "yes"; then
+	AC_DEFINE(ENABLE_TEST_MENU,1,[include test menu in neutrino main menu - not recommended for general users!])
+fi
+
+
 if test "$BOXTYPE" = "coolstream"; then
 if test -e ${srcdir}/lib/libcoolstream/nevis_ir.h; then
 	AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H,1,[Define to 1 if you have the <nevis_ir.h> header file.])
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 37dd4915a..ec2ff3afd 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -95,7 +95,6 @@ libneutrino_gui_a_SOURCES = \
 	start_wizard.cpp \
 	streaminfo2.cpp \
 	subchannel_select.cpp \
-	test_menu.cpp \
 	themes.cpp \
 	timeosd.cpp \
 	update.cpp \
@@ -109,6 +108,11 @@ libneutrino_gui_a_SOURCES = \
 	volumebar.cpp \
 	zapit_setup.cpp
 
+if ENABLE_TEST_MENU
+libneutrino_gui_a_SOURCES += \
+	test_menu.cpp
+endif
+
 libneutrino_gui2_a_SOURCES = \
 	cam_menu.cpp \
 	color.cpp \
diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp
index 106a8c5a4..2eb8e2aa8 100644
--- a/src/gui/test_menu.cpp
+++ b/src/gui/test_menu.cpp
@@ -58,7 +58,7 @@
 
 extern int cs_test_card(int unit, char * str);
 
-#ifdef TEST_MENU
+
 CTestMenu::CTestMenu()
 {
 	width = w_max (50, 10);
@@ -737,4 +737,3 @@ void CTestMenu::showHWTests(CMenuWidget *widget)
 	}
 	CFEManager::getInstance()->linkFrontends(true);
 }
-#endif
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index dfef56f8b..77481348a 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -71,7 +71,9 @@
 #include "gui/sleeptimer.h"
 #include "gui/update_menue.h"
 #include "gui/streaminfo2.h"
+#ifdef ENABLE_TEST_MENU
 #include "gui/test_menu.h"
+#endif
 #include "gui/update.h"
 #include "gui/vfd_setup.h"
 #include "driver/record.h"
@@ -280,7 +282,7 @@ void CNeutrinoApp::InitMenuMain()
 		}
 	}
 
-#ifdef TEST_MENU
+#ifdef ENABLE_TEST_MENU
 	personalize.addItem(MENU_MAIN, new CMenuForwarderNonLocalized("Test menu", true, NULL, new CTestMenu()), NULL, false, CPersonalizeGui::PERSONALIZE_SHOW_NO);
 #endif
 }

From aaad29a245e13beb997fae5eb21cfad9fc79e2b2 Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <crashdvb@googlemail.com>
Date: Tue, 5 Nov 2013 15:42:50 +0100
Subject: [PATCH 58/73] CControlAPI::_GetBouquetActualEPGItem: -add eventid &
 timeTotal to secondEPG

---
 src/nhttpd/tuxboxapi/coolstream/controlapi.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
index d699533a6..438d496c3 100644
--- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
@@ -808,11 +808,14 @@ std::string CControlAPI::_GetBouquetActualEPGItem(CyhookHandler *hh, CZapitChann
 		firstEPG += hh->outPair("timeElapsed", string_printf("%d", (time(NULL) - event->startTime) / 60), true);
 		firstEPG += hh->outPair("timeTotal", string_printf("%d", event->duration / 60), true);
 		firstEPG += hh->outPair("percentage", string_printf("%d", percentage), false);
+		firstEPG += hh->outPair("eventid", string_printf("%llu", currentNextInfo.current_uniqueKey), true);
 
 		if (currentNextInfo.flags & CSectionsdClient::epgflags::has_next) {
 			timestr = timeString(currentNextInfo.next_zeit.startzeit);
 			secondEPG += hh->outPair("startTime", timestr, true);
 			secondEPG += hh->outPair("description", hh->outValue(currentNextInfo.next_name), false);
+			secondEPG += hh->outPair("timeTotal", string_printf("%d", currentNextInfo.next_zeit.dauer / 60), true);
+			secondEPG += hh->outPair("eventid", string_printf("%llu", currentNextInfo.next_uniqueKey), true);
 		}
 	}
 

From 3a5d58f13946788b1afff1e7b4a1b45d2f7bd37d Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 6 Nov 2013 14:13:19 +0400
Subject: [PATCH 59/73] gui/personalize.cpp: fix pin access in case personalize
 pin is off, but items with enabled pincode present

---
 src/gui/personalize.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/personalize.cpp b/src/gui/personalize.cpp
index 62979bb86..0db1700a4 100644
--- a/src/gui/personalize.cpp
+++ b/src/gui/personalize.cpp
@@ -258,6 +258,7 @@ int CPersonalizeGui::exec(CMenuTarget* parent, const string & actionKey)
 	
 	if (!g_settings.easymenu && (is_pin_protected || hasPinItems())) {
 		setHint(LOCALE_PERSONALIZE_PINHINT); //from CPINProtection
+		is_pin_protected = true;
 		if (check())
 			is_pin_protected = false;
 	}

From 40e3106e5377127b946a9c4698e65fea3e36e2ba Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 6 Nov 2013 14:17:55 +0400
Subject: [PATCH 60/73] gui/personalize.cpp: fix pin change active/enactive,
 broken after commit 404de5376b75c96bb3d79590b9cedc5cb8f8533e

---
 src/gui/personalize.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/personalize.cpp b/src/gui/personalize.cpp
index 0db1700a4..d9637f11a 100644
--- a/src/gui/personalize.cpp
+++ b/src/gui/personalize.cpp
@@ -378,7 +378,7 @@ void CPersonalizeGui::ShowPinSetup(CMenuWidget* p_widget, CPINChangeWidget * &pi
  	pin_setup_notifier = new CPinSetupNotifier(fw_pin_setup);
  	p_widget->addItem(new CMenuOptionChooser(LOCALE_PERSONALIZE_PIN_IN_USE, &g_settings.personalize[SNeutrinoSettings::P_MAIN_PINSTATUS], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, pin_setup_notifier));
 	
-	fw_pin_setup->setActive(pin_setup_notifier->changeNotify());
+	pin_setup_notifier->changeNotify();
 	p_widget->addItem(fw_pin_setup);
 	
 	p_widget->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_PERSONALIZE_MENUCONFIGURATION));

From d7403be65997ba245183e654c22f6c4c17af9aaa Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 6 Nov 2013 14:27:02 +0400
Subject: [PATCH 61/73] system/settings.cpp: set fastscan default type to HD

---
 src/system/settings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/system/settings.cpp b/src/system/settings.cpp
index 437db473f..4a8cf8e72 100644
--- a/src/system/settings.cpp
+++ b/src/system/settings.cpp
@@ -152,7 +152,7 @@ bool CScanSettings::loadSettings(const char * const fileName, const delivery_sys
 #if 1
 	if(sat_TP_fec == 4) sat_TP_fec = 5;
 #endif
-	fast_type = configfile.getInt32("fast_type", 1);
+	fast_type = configfile.getInt32("fast_type", 2);
 	fast_op = configfile.getInt32("fast_op", 0);
 	cable_nid = configfile.getInt32("cable_nid", 0);
 

From 4ce96d5adaac30d1868cd696458919921f11a8b7 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 6 Nov 2013 15:08:11 +0400
Subject: [PATCH 62/73] zapit/src/fastscan.cpp: set current channel to channel
 number 1

---
 src/zapit/src/fastscan.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/zapit/src/fastscan.cpp b/src/zapit/src/fastscan.cpp
index 83a8f33a6..311183113 100644
--- a/src/zapit/src/fastscan.cpp
+++ b/src/zapit/src/fastscan.cpp
@@ -359,6 +359,9 @@ bool CServiceScan::ParseFst(unsigned short pid, fast_scan_operator_t * op)
 
 						if (!(g_bouquetManager->existsChannelInBouquet(bouquetId, newchannel->getChannelID())))
 							bouquet->addService(newchannel);
+
+						if (num == 1)
+							CZapit::getInstance()->SetCurrentChannelID(newchannel->getChannelID());
 					}
 					break;
 				default:

From 1eb658fc21a87a01554612668102a7c3426bed77 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Thu, 7 Nov 2013 17:23:40 +0400
Subject: [PATCH 63/73] neutrino.cpp: add window width/height settings

---
 src/neutrino.cpp      | 4 ++++
 src/system/settings.h | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index f31ec5d17..fc0a86546 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -661,6 +661,8 @@ int CNeutrinoApp::loadSetup(const char * fname)
 
 	g_settings.bigFonts = configfile.getInt32("bigFonts", 0);
 	g_settings.window_size = configfile.getInt32("window_size", 100);
+	g_settings.window_width = configfile.getInt32("window_width", g_settings.window_size);
+	g_settings.window_height = configfile.getInt32("window_height", g_settings.window_size);
 
 	g_settings.remote_control_hardware = configfile.getInt32( "remote_control_hardware",  CRCInput::RC_HW_COOLSTREAM);
 	g_settings.audiochannel_up_down_enable = configfile.getBool("audiochannel_up_down_enable", false);
@@ -1201,6 +1203,8 @@ void CNeutrinoApp::saveSetup(const char * fname)
 
 	configfile.setInt32("bigFonts", g_settings.bigFonts);
 	configfile.setInt32("window_size", g_settings.window_size);
+	configfile.setInt32("window_width", g_settings.window_width);
+	configfile.setInt32("window_height", g_settings.window_height);
 #ifdef BOXMODEL_APOLLO
 	configfile.setInt32("brightness", g_settings.brightness );
 	configfile.setInt32("contrast", g_settings.contrast );
diff --git a/src/system/settings.h b/src/system/settings.h
index 983d8354f..dcd43bb14 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -442,6 +442,8 @@ struct SNeutrinoSettings
 	int pip_y;
 	int bigFonts;
 	int window_size;
+	int window_width;
+	int window_height;
 	int eventlist_additional;
 	int channellist_additional;
 	int channellist_epgtext_align_right;

From 0dc92e99f93a5069d05b5dfc9270ab4f8bb8f9c1 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Thu, 7 Nov 2013 17:25:15 +0400
Subject: [PATCH 64/73] driver/framebuffer.cpp: switch from window_size to
 window width/height, allow 50% min window size

---
 src/driver/framebuffer.cpp | 4 ++--
 src/driver/framebuffer.h   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp
index ca6649176..31f008a17 100644
--- a/src/driver/framebuffer.cpp
+++ b/src/driver/framebuffer.cpp
@@ -459,14 +459,14 @@ unsigned int CFrameBuffer::getScreenHeight(bool real)
 
 unsigned int CFrameBuffer::getScreenWidthRel(bool force_small)
 {
-	int percent = force_small ? WINDOW_SIZE_MIN : g_settings.window_size;
+	int percent = force_small ? WINDOW_SIZE_MIN_FORCED : g_settings.window_width;
 	// always reduce a possible detailline
 	return (g_settings.screen_EndX - g_settings.screen_StartX - 2*ConnectLineBox_Width) * percent / 100;
 }
 
 unsigned int CFrameBuffer::getScreenHeightRel(bool force_small)
 {
-	int percent = force_small ? WINDOW_SIZE_MIN : g_settings.window_size;
+	int percent = force_small ? WINDOW_SIZE_MIN_FORCED : g_settings.window_height;
 	return (g_settings.screen_EndY - g_settings.screen_StartY) * percent / 100;
 }
 
diff --git a/src/driver/framebuffer.h b/src/driver/framebuffer.h
index 527157b9b..575c2510a 100644
--- a/src/driver/framebuffer.h
+++ b/src/driver/framebuffer.h
@@ -55,7 +55,8 @@ typedef struct fb_var_screeninfo t_fb_var_screeninfo;
 #define FADE_RESET 0xFFFF
 
 #define WINDOW_SIZE_MAX		100 // %
-#define WINDOW_SIZE_MIN		80 // %
+#define WINDOW_SIZE_MIN		50 // %
+#define WINDOW_SIZE_MIN_FORCED	80 // %
 #define ConnectLineBox_Width	16 // px
 
 /** Ausfuehrung als Singleton */

From aaf9d3edf6dd3fc01fe5b8eb95cb96f8cd9f05c2 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Thu, 7 Nov 2013 17:27:23 +0400
Subject: [PATCH 65/73] gui/osd_setup.cpp: add support to change window width
 and height, use buttons up/down to change height, left/right to change width,
 page up/down to change both

---
 src/gui/osd_setup.cpp | 94 ++++++++++++++++++++++++++-----------------
 src/gui/osd_setup.h   |  3 +-
 2 files changed, 60 insertions(+), 37 deletions(-)

diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index 361b3e159..bf1deeddc 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -268,27 +268,11 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
 		return res;
 	}
 	else if(actionKey=="window_size") {
-		if (win_demo == NULL) {
-			win_demo = new CComponentsShapeSquare(0, 0, 0, 0);
-			win_demo->setFrameThickness(8);
-			win_demo->setShadowOnOff(CC_SHADOW_OFF);
-			win_demo->setColorBody(COL_BACKGROUND);
-			win_demo->setColorFrame(COL_RED);
-			win_demo->doPaintBg(true);
-		}
-		else {
-			if (win_demo->isPainted())
-				win_demo->kill();
-		}
+		int old_window_width = g_settings.window_width;
+		int old_window_height = g_settings.window_height;
 
-		win_demo->setWidth(frameBuffer->getScreenWidthRel());
-		win_demo->setHeight(frameBuffer->getScreenHeightRel());
-		win_demo->setXPos(getScreenStartX(win_demo->getWidth()));
-		win_demo->setYPos(getScreenStartY(win_demo->getHeight()));
+		paintWindowSize(old_window_width, old_window_height);
 
-		win_demo->paint(CC_SAVE_SCREEN_NO);
-
-		int old_window_size = g_settings.window_size;
 		uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 
 		bool loop=true;
@@ -301,30 +285,34 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
 			if ( msg == CRCInput::RC_ok ) {
 				loop = false;
 				memset(window_size_value, 0, sizeof(window_size_value));
-				snprintf(window_size_value, sizeof(window_size_value)-1, "%d", g_settings.window_size);
+				snprintf(window_size_value, sizeof(window_size_value)-1, "%d / %d", g_settings.window_width, g_settings.window_height);
 				mfWindowSize->setOption(window_size_value);
 				break;
 			} else if ((msg == CRCInput::RC_home) || (msg == CRCInput::RC_timeout)) {
-				g_settings.window_size = old_window_size;
+				g_settings.window_width = old_window_width;
+				g_settings.window_height = old_window_height;
 				loop = false;
-			} else if ((msg == CRCInput::RC_up) || (msg == CRCInput::RC_down)) {
-				if ((msg == CRCInput::RC_up) && (g_settings.window_size < WINDOW_SIZE_MAX)) {
-					g_settings.window_size += 1;
-				}
-				if ((msg == CRCInput::RC_down) && (g_settings.window_size > WINDOW_SIZE_MIN)) {
-					g_settings.window_size -= 1;
-				}
+			} else if ((msg == CRCInput::RC_page_up) || (msg == CRCInput::RC_page_down) ||
+				(msg == CRCInput::RC_left) || (msg == CRCInput::RC_right) ||
+				(msg == CRCInput::RC_up) || (msg == CRCInput::RC_down)) {
 
-				if (win_demo->isPainted())
-					win_demo->kill();
+				int dir = 1;
+				if ((msg == CRCInput::RC_page_down) || (msg == CRCInput::RC_left) || (msg == CRCInput::RC_down))
+					dir = -1;
 
-				win_demo->setWidth(frameBuffer->getScreenWidthRel());
-				win_demo->setHeight(frameBuffer->getScreenHeightRel());
-				win_demo->setXPos(getScreenStartX(win_demo->getWidth()));
-				win_demo->setYPos(getScreenStartY(win_demo->getHeight()));
+				int mask = 3;
+				if ((msg == CRCInput::RC_left) || (msg == CRCInput::RC_right))
+					mask = 1;
+				else if ((msg == CRCInput::RC_up) || (msg == CRCInput::RC_down))
+					mask = 2;
+				if (mask & 1)
+					g_settings.window_width += dir;
+				if (mask & 2)
+					g_settings.window_height += dir;
 
-				win_demo->paint(CC_SAVE_SCREEN_NO);
+				paintWindowSize(g_settings.window_width, g_settings.window_height);
 
+			} else if ((msg == CRCInput::RC_left) || (msg == CRCInput::RC_right)) {
 			} else if (msg > CRCInput::RC_MaxRC) {
 				if ( CNeutrinoApp::getInstance()->handleMsg( msg, data ) & messages_return::cancel_all ) {
 					loop = false;
@@ -584,7 +572,7 @@ int COsdSetup::showOsdSetup()
 
 	// window size
 	memset(window_size_value, 0, sizeof(window_size_value));
-	snprintf(window_size_value, sizeof(window_size_value)-1, "%d", g_settings.window_size);
+	snprintf(window_size_value, sizeof(window_size_value)-1, "%d / %d", g_settings.window_width, g_settings.window_height);
 	mfWindowSize = new CMenuForwarder(LOCALE_WINDOW_SIZE, true, window_size_value, this, "window_size", CRCInput::convertDigitToKey(shortcut++));
 	mfWindowSize->setHint("", LOCALE_MENU_HINT_WINDOW_SIZE);
 	osd_menu->addItem(mfWindowSize);
@@ -1162,3 +1150,37 @@ void COsdSetup::showOsdScreenShotSetup(CMenuWidget *menu_screenshot)
 	mc->setHint("", LOCALE_MENU_HINT_SCREENSHOT_COVER);
 	menu_screenshot->addItem(mc);
 }
+
+void COsdSetup::paintWindowSize(int w, int h)
+{
+	if (win_demo == NULL) {
+		win_demo = new CComponentsShapeSquare(0, 0, 0, 0);
+		win_demo->setFrameThickness(8);
+		win_demo->setShadowOnOff(CC_SHADOW_OFF);
+		win_demo->setColorBody(COL_BACKGROUND);
+		win_demo->setColorFrame(COL_RED);
+		win_demo->doPaintBg(true);
+	}
+	else {
+		if (win_demo->isPainted())
+			win_demo->kill();
+	}
+	
+	g_settings.window_width = w;
+	g_settings.window_height = h;
+	if (g_settings.window_width > WINDOW_SIZE_MAX)	
+		g_settings.window_width = WINDOW_SIZE_MAX;
+	if (g_settings.window_width < WINDOW_SIZE_MIN)	
+		g_settings.window_width = WINDOW_SIZE_MIN;
+	if (g_settings.window_height > WINDOW_SIZE_MAX)	
+		g_settings.window_height = WINDOW_SIZE_MAX;
+	if (g_settings.window_height < WINDOW_SIZE_MIN)	
+		g_settings.window_height = WINDOW_SIZE_MIN;
+
+	win_demo->setWidth(frameBuffer->getScreenWidthRel());
+	win_demo->setHeight(frameBuffer->getScreenHeightRel());
+	win_demo->setXPos(getScreenStartX(win_demo->getWidth()));
+	win_demo->setYPos(getScreenStartY(win_demo->getHeight()));
+
+	win_demo->paint(CC_SAVE_SCREEN_NO);
+}
diff --git a/src/gui/osd_setup.h b/src/gui/osd_setup.h
index 3b50a4593..68ab6ad17 100644
--- a/src/gui/osd_setup.h
+++ b/src/gui/osd_setup.h
@@ -50,7 +50,7 @@ class COsdSetup : public CMenuTarget, public CChangeObserver
 		CMenuWidget *osd_menu;
 		CMenuWidget *submenu_menus;
 		CMenuForwarder *mfFontFile, *mfTtxFontFile, *mfWindowSize;
-		char window_size_value[6];
+		char window_size_value[10];
 		std::string osdFontFile, osdTtxFontFile;
 		CComponentsShapeSquare *win_demo;
 
@@ -69,6 +69,7 @@ class COsdSetup : public CMenuTarget, public CChangeObserver
 		void showOsdEventlistSetup(CMenuWidget *menu_eventlist);
 		void showOsdVolumeSetup(CMenuWidget *menu_volume);
 		void showOsdScreenShotSetup(CMenuWidget *menu_screenshot);
+		void paintWindowSize(int w, int h);
 
  		void AddFontSettingItem(CMenuWidget &font_Settings, const SNeutrinoSettings::FONT_TYPES number_of_fontsize_entry);
  

From 4e423e2bd79422f8c915d56104bd57218a890dbb Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Thu, 7 Nov 2013 18:59:42 +0400
Subject: [PATCH 66/73] gui/osd_setup.cpp: fix Window size in menu, snprintf
 take care about 0 at the end

---
 src/gui/osd_setup.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index bf1deeddc..9760ea225 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -285,7 +285,7 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
 			if ( msg == CRCInput::RC_ok ) {
 				loop = false;
 				memset(window_size_value, 0, sizeof(window_size_value));
-				snprintf(window_size_value, sizeof(window_size_value)-1, "%d / %d", g_settings.window_width, g_settings.window_height);
+				snprintf(window_size_value, sizeof(window_size_value), "%d / %d", g_settings.window_width, g_settings.window_height);
 				mfWindowSize->setOption(window_size_value);
 				break;
 			} else if ((msg == CRCInput::RC_home) || (msg == CRCInput::RC_timeout)) {
@@ -572,7 +572,7 @@ int COsdSetup::showOsdSetup()
 
 	// window size
 	memset(window_size_value, 0, sizeof(window_size_value));
-	snprintf(window_size_value, sizeof(window_size_value)-1, "%d / %d", g_settings.window_width, g_settings.window_height);
+	snprintf(window_size_value, sizeof(window_size_value), "%d / %d", g_settings.window_width, g_settings.window_height);
 	mfWindowSize = new CMenuForwarder(LOCALE_WINDOW_SIZE, true, window_size_value, this, "window_size", CRCInput::convertDigitToKey(shortcut++));
 	mfWindowSize->setHint("", LOCALE_MENU_HINT_WINDOW_SIZE);
 	osd_menu->addItem(mfWindowSize);

From 395767adf4cd1f47a6ae3d165e734236387d07a8 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Thu, 7 Nov 2013 22:09:23 +0100
Subject: [PATCH 67/73] - audioplayer: use and show play/pause/stop/rew/ff keys

---
 src/gui/audioplayer.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index 7f07aecb3..beb1be8cb 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -611,7 +611,7 @@ int CAudioPlayerGui::show()
 			if (m_key_level == 1)
 				stop();
 		}
-		else if (msg == CRCInput::RC_green)
+		else if ((msg == CRCInput::RC_rewind) || (msg == CRCInput::RC_green))
 		{
 			if (m_key_level == 0)
 			{
@@ -653,7 +653,7 @@ int CAudioPlayerGui::show()
 				}
 			}
 		}
-		else if (msg == CRCInput::RC_yellow)
+		else if ((msg == CRCInput::RC_pause) || (msg == CRCInput::RC_yellow))
 		{
 			if (m_key_level == 0)
 			{
@@ -677,7 +677,7 @@ int CAudioPlayerGui::show()
 				paint();
 			}
 		}
-		else if (msg == CRCInput::RC_blue)
+		else if ((msg == CRCInput::RC_forward) || (msg == CRCInput::RC_blue))
 		{
 			if (m_key_level == 0)
 			{
@@ -1658,10 +1658,10 @@ void CAudioPlayerGui::paintHead()
 const struct button_label AudioPlayerButtons[][4] =
 {
 	{
-		{ NEUTRINO_ICON_BUTTON_RED   , LOCALE_AUDIOPLAYER_STOP                        },
-		{ NEUTRINO_ICON_BUTTON_GREEN , LOCALE_AUDIOPLAYER_REWIND                      },
-		{ NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_AUDIOPLAYER_PAUSE                       },
-		{ NEUTRINO_ICON_BUTTON_BLUE  , LOCALE_AUDIOPLAYER_FASTFORWARD                 },
+		{ NEUTRINO_ICON_BUTTON_STOP    , LOCALE_AUDIOPLAYER_STOP                      },
+		{ NEUTRINO_ICON_BUTTON_BACKWARD, LOCALE_AUDIOPLAYER_REWIND                    },
+		{ NEUTRINO_ICON_BUTTON_PAUSE   , LOCALE_AUDIOPLAYER_PAUSE                     },
+		{ NEUTRINO_ICON_BUTTON_FORWARD , LOCALE_AUDIOPLAYER_FASTFORWARD               },
 	},
 	{
 		{ NEUTRINO_ICON_BUTTON_RED   , LOCALE_AUDIOPLAYER_DELETE                      },
@@ -1686,8 +1686,8 @@ const struct button_label AudioPlayerButtons[][4] =
 		{ NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_AUDIOPLAYER_BUTTON_SELECT_TITLE_BY_NAME },
 	},
 	{
-		{ NEUTRINO_ICON_BUTTON_RED   , LOCALE_AUDIOPLAYER_STOP                        },
-		{ NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_AUDIOPLAYER_PAUSE                       },
+		{ NEUTRINO_ICON_BUTTON_STOP  , LOCALE_AUDIOPLAYER_STOP                        },
+		{ NEUTRINO_ICON_BUTTON_PAUSE , LOCALE_AUDIOPLAYER_PAUSE                       },
 	},
 	{
 		{ NEUTRINO_ICON_BUTTON_GREEN , LOCALE_AUDIOPLAYER_ADD                         },

From 7c4b9d3fdd768fe687bf65642a5aa22686216a4f Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 8 Nov 2013 15:50:10 +0400
Subject: [PATCH 68/73] gui/scan_setup.cpp: disable frontend setup, if record
 running

---
 src/gui/scan_setup.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index 5bbe9e787..fca95d6e6 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -523,6 +523,7 @@ int CScanSetup::showScanMenuFrontendSetup()
 	int shortcut = 1;
 
 	fe_restart = false;
+	allow_start = !CRecordManager::getInstance()->RecordingStatus() || CRecordManager::getInstance()->TimeshiftOnly();
 
 	CZapit::getInstance()->GetConfig(zapitCfg);
 	CMenuWidget * setupMenu = new CMenuWidget(LOCALE_SATSETUP_FE_SETUP, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_SCAN_FE_SETUP);
@@ -565,7 +566,8 @@ int CScanSetup::showScanMenuFrontendSetup()
 		}
 
 		modestr[i] = g_Locale->getText(getModeLocale(fe->getMode()));
-		mf = new CMenuForwarderNonLocalized(name, true, modestr[i], this, tmp, key, icon);
+
+		mf = new CMenuForwarderNonLocalized(name, allow_start, modestr[i], this, tmp, key, icon);
 		mf->setHint("", LOCALE_MENU_HINT_SCAN_SETUP_FE);
 		setupMenu->addItem(mf);
 		if(i != 0)

From 339b047019087175db983b483123f016770705ef Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 8 Nov 2013 15:54:20 +0400
Subject: [PATCH 69/73] gui/scan_setup.cpp: force fe link on master change, too

---
 src/gui/scan_setup.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index fca95d6e6..a97d48bc3 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -1390,6 +1390,7 @@ bool CScanSetup::changeNotify(const neutrino_locale_t OptionName, void * /*data*
 	}
 	else if(ARE_LOCALES_EQUAL(OptionName, LOCALE_SATSETUP_FE_MODE_MASTER)) {
 		printf("[neutrino] CScanSetup::%s: fe%d link %d \n", __FUNCTION__, fenumber, femaster);
+		fe_restart = true;
 		CFrontend * fe = CFEManager::getInstance()->getFE(fenumber);
 		if (fe)
 			fe->setMaster(femaster);

From f9515444f0ea839839e507eac6eaac8f51f7f7c4 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 8 Nov 2013 15:06:05 +0100
Subject: [PATCH 70/73] - libconfigfile: allow configfiles with another
 delimiter as '='

---
 lib/libconfigfile/configfile.cpp | 16 ++++++++--------
 lib/libconfigfile/configfile.h   |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/libconfigfile/configfile.cpp b/lib/libconfigfile/configfile.cpp
index 354d5ec97..651562335 100644
--- a/lib/libconfigfile/configfile.cpp
+++ b/lib/libconfigfile/configfile.cpp
@@ -51,7 +51,7 @@ void CConfigFile::clear()
 //
 // public file operation methods
 //
-bool CConfigFile::loadConfig(const char * const filename)
+bool CConfigFile::loadConfig(const char * const filename, char _delimiter)
 {
 	std::ifstream configFile(filename);
 
@@ -67,7 +67,7 @@ bool CConfigFile::loadConfig(const char * const filename)
 			if (configFile.fail())
 				break;
 
-			std::string::size_type i = s.find('=');
+			std::string::size_type i = s.find(_delimiter);
 			if (i != std::string::npos)
 			{
 				std::string::size_type j = s.find('#');
@@ -86,12 +86,12 @@ bool CConfigFile::loadConfig(const char * const filename)
 	}
 }
 
-bool CConfigFile::loadConfig(const std::string & filename)
+bool CConfigFile::loadConfig(const std::string & filename, char _delimiter)
 {
-	return loadConfig(filename.c_str());
+	return loadConfig(filename.c_str(), _delimiter);
 }
 
-bool CConfigFile::saveConfig(const char * const filename)
+bool CConfigFile::saveConfig(const char * const filename, char _delimiter)
 {
 	std::string tmpname = std::string(filename) + ".tmp";
 	unlink(tmpname.c_str());
@@ -102,7 +102,7 @@ bool CConfigFile::saveConfig(const char * const filename)
 		std::cout << "[ConfigFile] saving " << filename << std::endl;
 		for (ConfigDataMap::const_iterator it = configData.begin(); it != configData.end(); ++it)
 		{
-			configFile << it->first << "=" << it->second << std::endl;
+			configFile << it->first << _delimiter << it->second << std::endl;
 		}
 
 		configFile.sync();
@@ -123,9 +123,9 @@ bool CConfigFile::saveConfig(const char * const filename)
 	}
 }
 
-bool CConfigFile::saveConfig(const std::string & filename)
+bool CConfigFile::saveConfig(const std::string & filename, char _delimiter)
 {
-	return saveConfig(filename.c_str());
+	return saveConfig(filename.c_str(), _delimiter);
 }
 
 
diff --git a/lib/libconfigfile/configfile.h b/lib/libconfigfile/configfile.h
index 5a247a556..6f1e052e7 100644
--- a/lib/libconfigfile/configfile.h
+++ b/lib/libconfigfile/configfile.h
@@ -50,11 +50,11 @@ class CConfigFile
  public:
 	CConfigFile(const char p_delimiter, const bool p_saveDefaults = true);
 
-	bool loadConfig(const char * const filename);
-	bool loadConfig(const std::string & filename);
+	bool loadConfig(const char * const filename, char _delimiter = '=');
+	bool loadConfig(const std::string & filename, char _delimiter = '=');
 
-	bool saveConfig(const char * const filename);
-	bool saveConfig(const std::string & filename);
+	bool saveConfig(const char * const filename, char _delimiter = '=');
+	bool saveConfig(const std::string & filename, char _delimiter = '=');
 
 	void clear();
 

From 5324c57a38dafe1e3754e6c94cd63a66dfb42c00 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 8 Nov 2013 15:07:02 +0100
Subject: [PATCH 71/73] - ylanguage.cpp: add neutrino locale as an additional
 locale file for yWeb

---
 src/nhttpd/yhttpd_core/Makefile.am   |  8 ++++++++
 src/nhttpd/yhttpd_core/ylanguage.cpp | 25 +++++++++++++++++++++++++
 src/nhttpd/yhttpd_core/ylanguage.h   |  1 +
 3 files changed, 34 insertions(+)

diff --git a/src/nhttpd/yhttpd_core/Makefile.am b/src/nhttpd/yhttpd_core/Makefile.am
index 1a0a81aaa..e4ffb5e10 100644
--- a/src/nhttpd/yhttpd_core/Makefile.am
+++ b/src/nhttpd/yhttpd_core/Makefile.am
@@ -11,6 +11,14 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/libconfigfile \
 	@FREETYPE_CFLAGS@
 
+if BOXTYPE_COOL
+if BOXMODEL_APOLLO
+AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream2
+else
+AM_CPPFLAGS += -I$(top_srcdir)/lib/libcoolstream
+endif
+endif
+
 AM_CPPFLAGS += -fno-rtti -fno-exceptions
 
 noinst_LIBRARIES = libyhttpd.a
diff --git a/src/nhttpd/yhttpd_core/ylanguage.cpp b/src/nhttpd/yhttpd_core/ylanguage.cpp
index 38c67f9df..f07a01809 100644
--- a/src/nhttpd/yhttpd_core/ylanguage.cpp
+++ b/src/nhttpd/yhttpd_core/ylanguage.cpp
@@ -15,6 +15,9 @@
 #include "ytypes_globals.h"
 #include "ylanguage.h"
 #include "yconnection.h"
+
+#include <global.h>
+
 //=============================================================================
 // Instance Handling - like Singelton Pattern
 //=============================================================================
@@ -24,6 +27,7 @@
 CLanguage* CLanguage::instance = NULL;
 CConfigFile* CLanguage::DefaultLanguage = NULL;
 CConfigFile* CLanguage::ConfigLanguage = NULL;
+CConfigFile* CLanguage::NeutrinoLanguage = NULL;
 std::string CLanguage::language = "";
 std::string CLanguage::language_dir = "";
 //-----------------------------------------------------------------------------
@@ -49,6 +53,7 @@ CLanguage::CLanguage(void)
 {
 	DefaultLanguage = new CConfigFile(',');
 	ConfigLanguage = new CConfigFile(',');
+	NeutrinoLanguage = new CConfigFile(',');
 	language = "";
 	language_dir =getLanguageDir();
 }
@@ -58,6 +63,7 @@ CLanguage::~CLanguage(void)
 {
 	delete DefaultLanguage;
 	delete ConfigLanguage;
+	delete NeutrinoLanguage;
 }
 
 //=============================================================================
@@ -67,6 +73,23 @@ void CLanguage::setLanguage(std::string _language){
 	language=_language;
 	ConfigLanguage->loadConfig(language_dir + "/" + _language);
 	DefaultLanguage->loadConfig(language_dir + "/" + HTTPD_DEFAULT_LANGUAGE);
+
+	const char * path[2] = { CONFIGDIR "/locale/", DATADIR "/neutrino/locale/"};
+	for (int i = 0; i < 2; i++)
+	{
+		std::string filename = path[i];
+		filename += g_settings.language;
+		filename += ".locale";
+
+		if(access(filename.c_str(), F_OK) == 0) {
+			NeutrinoLanguage->loadConfig(filename, ' ');
+			break;
+		}
+		else if (i == 2) {
+			// load neutrino default language
+			NeutrinoLanguage->loadConfig(DATADIR "/neutrino/locale/english.locale", ' ');
+		}
+	}
 }
 
 //-----------------------------------------------------------------------------
@@ -74,6 +97,8 @@ void CLanguage::setLanguage(std::string _language){
 //-----------------------------------------------------------------------------
 std::string CLanguage::getTranslation(std::string id){
 	std::string trans=ConfigLanguage->getString(id,"");
+	if(trans=="")
+		trans=NeutrinoLanguage->getString(id,"");
 	if(trans=="")
 		trans=DefaultLanguage->getString(id,"");
 	return trans;
diff --git a/src/nhttpd/yhttpd_core/ylanguage.h b/src/nhttpd/yhttpd_core/ylanguage.h
index e90658fc2..06570ccfe 100644
--- a/src/nhttpd/yhttpd_core/ylanguage.h
+++ b/src/nhttpd/yhttpd_core/ylanguage.h
@@ -24,6 +24,7 @@ class CLanguage
 
 		static CConfigFile 	*DefaultLanguage;
 		static CConfigFile 	*ConfigLanguage;
+		static CConfigFile 	*NeutrinoLanguage;
 
 	public:
 		// Instance Handling

From 9b71f720ea9cd111eba4903aacc0aa62f7912fb1 Mon Sep 17 00:00:00 2001
From: defans <defans@bluepeercrew.us>
Date: Sat, 9 Nov 2013 13:00:53 +0100
Subject: [PATCH 72/73] small fix, possible segfault in hddmenu

---
 src/gui/hdd_menu.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/hdd_menu.cpp b/src/gui/hdd_menu.cpp
index 1b917e609..79a68614e 100644
--- a/src/gui/hdd_menu.cpp
+++ b/src/gui/hdd_menu.cpp
@@ -161,6 +161,7 @@ int CHDDMenuHandler::doMenu ()
 	std::string tmp_str[n];
 	CMenuWidget * tempMenu[n];
 	for(int i = 0; i < n;i++) {
+		tempMenu[i] = NULL;
 		char str[256];
 		char sstr[256];
 		char vendor[128], model[128];

From 1e8764be2e50cb8e36d3cb61c1a7407f3ce90c23 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Sat, 9 Nov 2013 14:40:58 +0100
Subject: [PATCH 73/73] - ylanguage.cpp: fix wrong value in for loop

---
 src/nhttpd/yhttpd_core/ylanguage.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nhttpd/yhttpd_core/ylanguage.cpp b/src/nhttpd/yhttpd_core/ylanguage.cpp
index f07a01809..9003a536a 100644
--- a/src/nhttpd/yhttpd_core/ylanguage.cpp
+++ b/src/nhttpd/yhttpd_core/ylanguage.cpp
@@ -85,8 +85,8 @@ void CLanguage::setLanguage(std::string _language){
 			NeutrinoLanguage->loadConfig(filename, ' ');
 			break;
 		}
-		else if (i == 2) {
-			// load neutrino default language
+		else if (i == 1) {
+			// load neutrino default language (should not happen)
 			NeutrinoLanguage->loadConfig(DATADIR "/neutrino/locale/english.locale", ' ');
 		}
 	}