add menu item to force usertitles for color buttons in infobar

Origin commit data
------------------
Branch: ni/coolstream
Commit: 3107e621ef
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)

Origin message was:
------------------
- add menu item to force usertitles for color buttons in infobar

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

data/locale/deutsch.locale

@@ -1047,6 +1047,7 @@ menu.hint_inactive_textcolor Ändern Sie die Textfarbe für deaktivierte Fenster
 menu.hint_inet_radio Internetradio
 menu.hint_info Informationen über das Image, CPU, Arbeitsspeicher und Stream und mehr
 menu.hint_infobar_back Ändern Sie die Hintergrundfarbe für die Infobar
+menu.hint_infobar_buttons_usertitle Erzwingt die benutzerdefinierten Titel der Farbtasten
 menu.hint_infobar_casys ein: zeigt alle Aktiven farbig, Mini: einzelnes Symbol ob gesperrt, Diskret: alle Aktiven CA-Systeme
 menu.hint_infobar_casys_color Ändern Sie die Hintergrundfarbe für die CA-Systemanzeige der Infobar
 menu.hint_infobar_casys_dotmatrix ein: CA-Systemanzeige mit Punktematrix im Hintergrund
@@ -1477,6 +1478,7 @@ miscsettings.epg_scan_standby Im Standby Modus
 miscsettings.general Allgemein
 miscsettings.head Erweitert
 miscsettings.infobar Infobar
+miscsettings.infobar_buttons_usertitle Benutzertitel für Farbtasten
 miscsettings.infobar_casystem_display CA-Systemanzeige
 miscsettings.infobar_casystem_dotmatrix CA-Anzeige mit Punktematrix
 miscsettings.infobar_casystem_frame CA-Anzeige mit Rahmen

data/locale/english.locale

@@ -1047,6 +1047,7 @@ menu.hint_inactive_textcolor Change inactive item text color
 menu.hint_inet_radio Internet radio
 menu.hint_info Information about image, box cpu and storage,\nstream information
 menu.hint_infobar_back Change infobar background color
+menu.hint_infobar_buttons_usertitle Forces userdefined titles for the color keys
 menu.hint_infobar_casys On: display all with colored active, mini: single\nlocked icon, descreet: all active ca-systems
 menu.hint_infobar_casys_color Change CA-System background color
 menu.hint_infobar_casys_dotmatrix on: CA-System with dot matrix in background
@@ -1477,6 +1478,7 @@ miscsettings.epg_scan_standby Standby
 miscsettings.general General
 miscsettings.head Extended settings
 miscsettings.infobar Infobar
+miscsettings.infobar_buttons_usertitle Usertitles for color keys
 miscsettings.infobar_casystem_display CA-System display
 miscsettings.infobar_casystem_dotmatrix CA display with dot matrix
 miscsettings.infobar_casystem_frame CA display with frame

src/gui/osd_setup.cpp

@@ -1045,6 +1045,11 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar)
 	mc->setHint("", LOCALE_MENU_HINT_INFOBAR_RADIOTEXT);
 	menu_infobar->addItem(mc);
 
+	// buttons usertitle
+	mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_BUTTONS_USERTITLE, &g_settings.infobar_buttons_usertitle, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this);
+	mc->setHint("", LOCALE_MENU_HINT_INFOBAR_BUTTONS_USERTITLE);
+	menu_infobar->addItem(mc);
+
 	menu_infobar->addItem(GenericMenuSeparator);
 
 	// display options

src/neutrino.cpp

@@ -464,6 +464,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 	g_settings.infobar_sat_display   = configfile.getBool("infobar_sat_display"  , true );
 	g_settings.infobar_show_channeldesc   = configfile.getBool("infobar_show_channeldesc"  , false );
 	g_settings.infobar_subchan_disp_pos = configfile.getInt32("infobar_subchan_disp_pos"  , 0 );
+	g_settings.infobar_buttons_usertitle = configfile.getBool("infobar_buttons_usertitle", false );
 	g_settings.progressbar_gradient = configfile.getBool("progressbar_gradient", true );
 	g_settings.progressbar_design =  configfile.getInt32("progressbar_design", CProgressBar::PB_COLOR);
 	bool pb_color = configfile.getBool("progressbar_color", true );
@@ -1011,6 +1012,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	configfile.setBool("infobar_sat_display"  , g_settings.infobar_sat_display  );
 	configfile.setBool("infobar_show_channeldesc"  , g_settings.infobar_show_channeldesc  );
 	configfile.setInt32("infobar_subchan_disp_pos"  , g_settings.infobar_subchan_disp_pos  );
+	configfile.setBool("infobar_buttons_usertitle", g_settings.infobar_buttons_usertitle);
 	configfile.setBool("progressbar_gradient", g_settings.progressbar_gradient);
 	configfile.setInt32("progressbar_design", g_settings.progressbar_design);
 	configfile.setInt32("progressbar_timescale_red", g_settings.progressbar_timescale_red);

src/system/locals.h

@@ -1074,6 +1074,7 @@ typedef enum
 	LOCALE_MENU_HINT_INET_RADIO,
 	LOCALE_MENU_HINT_INFO,
 	LOCALE_MENU_HINT_INFOBAR_BACK,
+	LOCALE_MENU_HINT_INFOBAR_BUTTONS_USERTITLE,
 	LOCALE_MENU_HINT_INFOBAR_CASYS,
 	LOCALE_MENU_HINT_INFOBAR_CASYS_COLOR,
 	LOCALE_MENU_HINT_INFOBAR_CASYS_DOTMATRIX,
@@ -1504,6 +1505,7 @@ typedef enum
 	LOCALE_MISCSETTINGS_GENERAL,
 	LOCALE_MISCSETTINGS_HEAD,
 	LOCALE_MISCSETTINGS_INFOBAR,
+	LOCALE_MISCSETTINGS_INFOBAR_BUTTONS_USERTITLE,
 	LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DISPLAY,
 	LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DOTMATRIX,
 	LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_FRAME,

src/system/locals_intern.h

@@ -1074,6 +1074,7 @@ const char * locale_real_names[] =
 	"menu.hint_inet_radio",
 	"menu.hint_info",
 	"menu.hint_infobar_back",
+	"menu.hint_infobar_buttons_usertitle",
 	"menu.hint_infobar_casys",
 	"menu.hint_infobar_casys_color",
 	"menu.hint_infobar_casys_dotmatrix",
@@ -1504,6 +1505,7 @@ const char * locale_real_names[] =
 	"miscsettings.general",
 	"miscsettings.head",
 	"miscsettings.infobar",
+	"miscsettings.infobar_buttons_usertitle",
 	"miscsettings.infobar_casystem_display",
 	"miscsettings.infobar_casystem_dotmatrix",
 	"miscsettings.infobar_casystem_frame",

src/system/settings.h

@@ -169,6 +169,7 @@ struct SNeutrinoSettings
 	int infobar_sat_display;
 	int infobar_show_channeldesc;
 	int infobar_subchan_disp_pos;
+	int infobar_buttons_usertitle;
 	int fan_speed;
 	int infobar_show;
 	int infobar_show_channellogo;