osd_setup: add channellogo-setup menu

Origin commit data
------------------
Commit: e9297bcc1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- osd_setup: add channellogo-setup menu

data/locale/deutsch.locale

@@ -1134,6 +1134,7 @@ menu.hint_channellist_show_channellogo Zeigt Senderlogos in der Kanalliste.
 menu.hint_channellist_show_channelnumber Zeigt Kanalnummer in der Kanalliste.
 menu.hint_channellist_show_empty_favs Zeigt oder versteckt leere Bouquets in den Favoriten
 menu.hint_channellist_show_infobox Zeigt oder versteckt das untere Sendungsfenster
+menu.hint_channellogos_setup Wählen Sie die globalen Optionen für die Senderlogos aus
 menu.hint_channels Kanalliste öffnen
 menu.hint_ci Conditional-Access-Menü zum Einrichten Ihres CI-Moduls oder der eingebetteten Conax-Karte
 menu.hint_ci_mode Zu diesen Kanälen kann bei einer laufenden CI-Aufnahme gewechselt werden.
@@ -1669,6 +1670,7 @@ messagebox.ok OK
 messagebox.yes Ja
 miscsettings.channellist Kanalliste
 miscsettings.channellist_epgtext_align Event-Text ausrichten
+miscsettings.channellogos Senderlogos
 miscsettings.colored_events Sendung hervorheben
 miscsettings.colored_events_0 keine
 miscsettings.colored_events_1 aktuelle

data/locale/english.locale

@@ -1134,6 +1134,7 @@ menu.hint_channellist_show_channellogo Show channel logos in channel list
 menu.hint_channellist_show_channelnumber Show channel number in channel list
 menu.hint_channellist_show_empty_favs Show or hide empty bouquets in favorites
 menu.hint_channellist_show_infobox Show or hide bottom infobox of channellist
+menu.hint_channellogos_setup Configure global channelogos options
 menu.hint_channels Open channel list
 menu.hint_ci Conditional access menu\nto setup your CI CAM or embeded Conax card
 menu.hint_ci_mode Allow switching to these channels while CI recording
@@ -1669,6 +1670,7 @@ messagebox.ok Ok
 messagebox.yes Yes
 miscsettings.channellist Channellist
 miscsettings.channellist_epgtext_align Programtext Align
+miscsettings.channellogos Channellogos
 miscsettings.colored_events Program colored
 miscsettings.colored_events_0 none
 miscsettings.colored_events_1 current

src/gui/osd_setup.cpp

@@ -614,6 +614,13 @@ int COsdSetup::showOsdSetup()
 	mf->setHint("", LOCALE_MENU_HINT_PROGRESSBAR);
 	osd_menu->addItem(mf);
 
+	//NI channellogos
+	CMenuWidget osd_menu_channellogos(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_CHANNELLOGOS);
+	showOsdChannellogosSetup(&osd_menu_channellogos);
+	mf = new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLOGOS, true, NULL, &osd_menu_channellogos, NULL, CRCInput::convertDigitToKey(shortcut++));
+	mf->setHint("", LOCALE_MENU_HINT_CHANNELLOGOS_SETUP);
+	osd_menu->addItem(mf);
+
 	//infobar
 	CMenuWidget osd_menu_infobar(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_INFOBAR);
 	showOsdInfobarSetup(&osd_menu_infobar);
@@ -1193,6 +1200,19 @@ const CMenuOptionChooser::keyval INFOVIEWER_ECMINFO_OPTIONS[] =
 };
 #define INFOVIEWER_ECMINFO_OPTION_COUNT (sizeof(INFOVIEWER_ECMINFO_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
 
+//NI channellogos
+void COsdSetup::showOsdChannellogosSetup(CMenuWidget *menu_channellogos)
+{
+	menu_channellogos->addIntroItems(LOCALE_MISCSETTINGS_CHANNELLOGOS);
+
+	CMenuForwarder * mf;
+
+	// logo directory
+	mf = new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR, true, g_settings.logo_hdd_dir, this, "logo_dir");
+	mf->setHint("", LOCALE_MENU_HINT_INFOBAR_LOGO_DIR);
+	menu_channellogos->addItem(mf);
+}
+
 //infobar
 void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar)
 {
@@ -1202,7 +1222,7 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar)
 	sigc::slot0<void> slot_ibar = sigc::mem_fun(g_InfoViewer, &CInfoViewer::ResetModules);
 
 	CMenuOptionChooser * mc;
-	CMenuForwarder * mf;
+	//NI CMenuForwarder * mf;
 
 	// show on epg change
 	mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW, &g_settings.infobar_show, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
@@ -1232,10 +1252,13 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar)
 	mc->setHint("", LOCALE_MENU_HINT_INFOBAR_LOGO);
 	menu_infobar->addItem(mc);
 
+//NI
+#if 0
 	// logo directory
 	mf = new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR, true, g_settings.logo_hdd_dir, this, "logo_dir");
 	mf->setHint("", LOCALE_MENU_HINT_INFOBAR_LOGO_DIR);
 	menu_infobar->addItem(mf);
+#endif
 
 	// satellite/cable provider
 	mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY, &g_settings.infobar_sat_display, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);

src/gui/osd_setup.h

@@ -75,6 +75,7 @@ class COsdSetup : public CMenuTarget, public CChangeObserver
 		void showOsdFontSizeSetup(CMenuWidget *menu_fonts);
 		void showOsdTimeoutSetup(CMenuWidget *menu_timeout);
 		void showOsdMenusSetup(CMenuWidget *menu_menus);
+		void showOsdChannellogosSetup(CMenuWidget *menu_channellogos); //NI
 		void showOsdInfobarSetup(CMenuWidget *menu_infobar);
 		void showOsdChanlistSetup(CMenuWidget *menu_chanlist);
 		void showOsdEventlistSetup(CMenuWidget *menu_eventlist);

src/neutrino_menue.h

@@ -58,6 +58,7 @@ enum MN_WIDGET_ID
 	MN_WIDGET_ID_OSDSETUP_EVENTLIST,
 	MN_WIDGET_ID_OSDSETUP_FONT,
 	MN_WIDGET_ID_OSDSETUP_FONTSCALE,
+	MN_WIDGET_ID_OSDSETUP_CHANNELLOGOS, //NI
 	MN_WIDGET_ID_OSDSETUP_INFOBAR,
 	MN_WIDGET_ID_OSDSETUP_MENUCOLORS,
 	MN_WIDGET_ID_OSDSETUP_TIMEOUT,

src/system/locals.h

@@ -1161,6 +1161,7 @@ typedef enum
 	LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELNUMBER,
 	LOCALE_MENU_HINT_CHANNELLIST_SHOW_EMPTY_FAVS,
 	LOCALE_MENU_HINT_CHANNELLIST_SHOW_INFOBOX,
+	LOCALE_MENU_HINT_CHANNELLOGOS_SETUP,
 	LOCALE_MENU_HINT_CHANNELS,
 	LOCALE_MENU_HINT_CI,
 	LOCALE_MENU_HINT_CI_MODE,
@@ -1696,6 +1697,7 @@ typedef enum
 	LOCALE_MESSAGEBOX_YES,
 	LOCALE_MISCSETTINGS_CHANNELLIST,
 	LOCALE_MISCSETTINGS_CHANNELLIST_EPGTEXT_ALIGN,
+	LOCALE_MISCSETTINGS_CHANNELLOGOS,
 	LOCALE_MISCSETTINGS_COLORED_EVENTS,
 	LOCALE_MISCSETTINGS_COLORED_EVENTS_0,
 	LOCALE_MISCSETTINGS_COLORED_EVENTS_1,

src/system/locals_intern.h

@@ -1161,6 +1161,7 @@ const char * locale_real_names[] =
 	"menu.hint_channellist_show_channelnumber",
 	"menu.hint_channellist_show_empty_favs",
 	"menu.hint_channellist_show_infobox",
+	"menu.hint_channellogos_setup",
 	"menu.hint_channels",
 	"menu.hint_ci",
 	"menu.hint_ci_mode",
@@ -1696,6 +1697,7 @@ const char * locale_real_names[] =
 	"messagebox.yes",
 	"miscsettings.channellist",
 	"miscsettings.channellist_epgtext_align",
+	"miscsettings.channellogos",
 	"miscsettings.colored_events",
 	"miscsettings.colored_events_0",
 	"miscsettings.colored_events_1",