channellist: channellogos can be disabled

Origin commit data
------------------
Branch: ni/coolstream
Commit: 9fb63a20d9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-28 (Sat, 28 Dec 2013)

Origin message was:
------------------
- channellist: channellogos can be disabled

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

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

data/locale/deutsch.locale

@@ -242,6 +242,7 @@ channellist.recording_not_possible Aufnahme nicht möglich!
 channellist.reset_all Entferne Markierung "Neu" für alle Kanäle
 channellist.reset_flags Entferne Kanal-Markierung "Neu"
 channellist.sats Satelliten
+channellist.show_channellogo Senderlogos zeigen
 channellist.since seit
 channellist.start Start
 ci.clock CI Takt (Mhz)
@@ -812,6 +813,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_channellist_show_channellogo Zeigt Senderlogos in der Kanalliste.
 menu.hint_channels Kanalliste öffnen
 menu.hint_ci Conditional-Access-Menü zum Einrichten Ihres CI-Moduls oder der eingebetteten Conax-Karte
 menu.hint_clock_background Lassen Sie die Uhr mit Hintergrund anzeigen

data/locale/english.locale

@@ -242,6 +242,7 @@ channellist.recording_not_possible Recording not possible!
 channellist.reset_all Reset 'new' flag for all channels
 channellist.reset_flags Reset 'new' channel flag
 channellist.sats Satellites
+channellist.show_channellogo Show channellogos
 channellist.since since
 channellist.start starts
 ci.clock CI clock (Mhz)
@@ -812,6 +813,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_channellist_show_channellogo Show channellogos in channel list
 menu.hint_channels Open channel list
 menu.hint_ci Conditional access menu\nto setup your CI CAM or embeded Conax card
 menu.hint_clock_background Show clock with theme's background color

src/gui/channellist.cpp

@@ -1761,7 +1761,7 @@ void CChannelList::paintItem2DetailsLine (int pos)
 
 void CChannelList::showChannelLogo()
 {
-	if(g_settings.infobar_show_channellogo){
+	if(g_settings.channellist_show_channellogo){
 		static int logo_w = 0;
 		static int logo_h = 0;
 		int logo_w_max = full_width / 4;

src/gui/osd_setup.cpp

@@ -958,6 +958,11 @@ void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist)
 	mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_CHANNELLIST_COLORED_EVENTS, &g_settings.colored_events_channellist, OPTIONS_COLORED_EVENTS_OPTIONS, OPTIONS_COLORED_EVENTS_OPTION_COUNT, true);
 	mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_COLORED);
 	menu_chanlist->addItem(mc);
+
+	//show channel logo
+	mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELLOGO, &g_settings.channellist_show_channellogo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
+	mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO);
+	menu_chanlist->addItem(mc);
 }
 
 //eventlist
@@ -1133,6 +1138,11 @@ int COsdSetup::showContextChanlistMenu()
 	mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_COLORED);
 	menu_chanlist->addItem(mc);
 
+	//show channel logo
+	mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELLOGO, &g_settings.channellist_show_channellogo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
+	mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO);
+	menu_chanlist->addItem(mc);
+
 	menu_chanlist->addItem(new CMenuSeparator(CMenuSeparator::LINE));
 
 	CMenuWidget *fontSettingsSubMenu = new CMenuWidget(LOCALE_FONTMENU_HEAD, NEUTRINO_ICON_KEYBINDING);

src/neutrino.cpp

@@ -634,6 +634,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 	g_settings.channellist_new_zap_mode = configfile.getInt32("channellist_new_zap_mode", 1);
 	g_settings.channellist_sort_mode  = configfile.getInt32("channellist_sort_mode", 0);//sort mode: alpha, freq, sat 
 	g_settings.channellist_numeric_adjust  = configfile.getInt32("channellist_numeric_adjust", 0);
+	g_settings.channellist_show_channellogo = configfile.getInt32("channellist_show_channellogo", 1);
 
 	//screen configuration
 	g_settings.screen_xres = configfile.getInt32("screen_xres", 100);
@@ -1115,6 +1116,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	configfile.setBool  ( "audiochannel_up_down_enable", g_settings.audiochannel_up_down_enable );
 	configfile.setInt32("channellist_sort_mode", g_settings.channellist_sort_mode);
 	configfile.setInt32("channellist_numeric_adjust", g_settings.channellist_numeric_adjust);
+	configfile.setInt32("channellist_show_channellogo", g_settings.channellist_show_channellogo);
 
 	//screen configuration
 	configfile.setInt32( "screen_xres", g_settings.screen_xres);

src/system/locals.h

@@ -269,6 +269,7 @@ typedef enum
 	LOCALE_CHANNELLIST_RESET_ALL,
 	LOCALE_CHANNELLIST_RESET_FLAGS,
 	LOCALE_CHANNELLIST_SATS,
+	LOCALE_CHANNELLIST_SHOW_CHANNELLOGO,
 	LOCALE_CHANNELLIST_SINCE,
 	LOCALE_CHANNELLIST_START,
 	LOCALE_CI_CLOCK,
@@ -839,6 +840,7 @@ typedef enum
 	LOCALE_MENU_HINT_CHANNELLIST_FONTS,
 	LOCALE_MENU_HINT_CHANNELLIST_FOOT,
 	LOCALE_MENU_HINT_CHANNELLIST_SETUP,
+	LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO,
 	LOCALE_MENU_HINT_CHANNELS,
 	LOCALE_MENU_HINT_CI,
 	LOCALE_MENU_HINT_CLOCK_BACKGROUND,

src/system/locals_intern.h

@@ -269,6 +269,7 @@ const char * locale_real_names[] =
 	"channellist.reset_all",
 	"channellist.reset_flags",
 	"channellist.sats",
+	"channellist.show_channellogo",
 	"channellist.since",
 	"channellist.start",
 	"ci.clock",
@@ -839,6 +840,7 @@ const char * locale_real_names[] =
 	"menu.hint_channellist_fonts",
 	"menu.hint_channellist_foot",
 	"menu.hint_channellist_setup",
+	"menu.hint_channellist_show_channellogo",
 	"menu.hint_channels",
 	"menu.hint_ci",
 	"menu.hint_clock_background",

src/system/settings.h

@@ -464,6 +464,7 @@ struct SNeutrinoSettings
 	int channellist_new_zap_mode;
 	int channellist_sort_mode;
 	int channellist_numeric_adjust;
+	int channellist_show_channellogo;
 	int repeat_blocker;
 	int repeat_genericblocker;
 	int remote_control_hardware;