diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 50e30b9ac..2407f3409 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1089,6 +1089,7 @@ 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_channellist_show_res_icon Zeigt oder versteckt das Icon zur Signalisierung der Auflösung +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_clock_background Lassen Sie die Uhr mit Hintergrund anzeigen @@ -1589,6 +1590,7 @@ messagebox.yes Ja miscsettings.channellist Kanalliste miscsettings.channellist_enablesdt Transponder Hintergrundaktualisierung 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 diff --git a/data/locale/english.locale b/data/locale/english.locale index 33c99af23..cf924cd6e 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1088,6 +1088,7 @@ 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_channellist_show_res_icon Show or hide the icon to signalize resolution +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_clock_background Show clock with theme's background color @@ -1587,6 +1588,7 @@ messagebox.yes Yes miscsettings.channellist Channellist miscsettings.channellist_enablesdt Transponder background update miscsettings.channellist_epgtext_align Programtext Align +miscsettings.channellogos Channellogos miscsettings.colored_events Program colored miscsettings.colored_events_0 none miscsettings.colored_events_1 current diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index e992177b3..0dedf6202 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -604,6 +604,13 @@ int COsdSetup::showOsdSetup() mf->setHint("", LOCALE_MENU_HINT_PROGRESSBAR); osd_menu->addItem(mf); + //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); @@ -1170,7 +1177,20 @@ const CMenuOptionChooser::keyval HDD_STATFS_OPTIONS[HDD_STATFS_OPTION_COUNT] = { SNeutrinoSettings::HDD_STATFS_RECORDING, LOCALE_HDD_STATFS_RECORDING } }; -//infobar +// 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) { menu_infobar->addIntroItems(LOCALE_MISCSETTINGS_INFOBAR); @@ -1178,8 +1198,8 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar) infobarHddNotifier = new COnOffNotifier(); sigc::slot0 slot_ibar = sigc::mem_fun(g_InfoViewer, &CInfoViewer::ResetModules); - CMenuOptionChooser * mc; - CMenuForwarder * mf; + CMenuOptionChooser * mc; +// 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); @@ -1203,12 +1223,12 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar) mc->OnAfterChangeOption.connect(slot_ibar); mc->setHint("", LOCALE_MENU_HINT_INFOBAR_LOGO); menu_infobar->addItem(mc); - +#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); mc->OnAfterChangeOption.connect(slot_ibar); @@ -1223,14 +1243,13 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar) mc->OnAfterChangeOption.connect(slot_ibar); mc->setHint("", LOCALE_MENU_HINT_INFOBAR_CASYS); menu_infobar->addItem(mc); -#if 1 +#if 0 // CA system dotmatrix mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DOTMATRIX, &g_settings.infobar_casystem_dotmatrix, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.infobar_casystem_display < 2); mc->setHint("", LOCALE_MENU_HINT_INFOBAR_CASYS_DOTMATRIX); menu_infobar->addItem(mc); casystemActivate.Add(mc); #endif - // CA system frame mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_FRAME, &g_settings.infobar_casystem_frame, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.infobar_casystem_display < 2); mc->OnAfterChangeOption.connect(slot_ibar); diff --git a/src/gui/osd_setup.h b/src/gui/osd_setup.h index cdea56535..1d97b9a47 100644 --- a/src/gui/osd_setup.h +++ b/src/gui/osd_setup.h @@ -70,6 +70,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); diff --git a/src/neutrino_menue.h b/src/neutrino_menue.h index 2519d84a2..a4188727b 100644 --- a/src/neutrino_menue.h +++ b/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, MN_WIDGET_ID_OSDSETUP_INFOBAR, MN_WIDGET_ID_OSDSETUP_MENUCOLORS, MN_WIDGET_ID_OSDSETUP_TIMEOUT, diff --git a/src/system/locals.h b/src/system/locals.h index dd37c8f35..bbc679944 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1116,6 +1116,7 @@ typedef enum LOCALE_MENU_HINT_CHANNELLIST_SHOW_EMPTY_FAVS, LOCALE_MENU_HINT_CHANNELLIST_SHOW_INFOBOX, LOCALE_MENU_HINT_CHANNELLIST_SHOW_RES_ICON, + LOCALE_MENU_HINT_CHANNELLOGOS_SETUP, LOCALE_MENU_HINT_CHANNELS, LOCALE_MENU_HINT_CI, LOCALE_MENU_HINT_CLOCK_BACKGROUND, @@ -1616,6 +1617,7 @@ typedef enum LOCALE_MISCSETTINGS_CHANNELLIST, LOCALE_MISCSETTINGS_CHANNELLIST_ENABLESDT, LOCALE_MISCSETTINGS_CHANNELLIST_EPGTEXT_ALIGN, + LOCALE_MISCSETTINGS_CHANNELLOGOS, LOCALE_MISCSETTINGS_COLORED_EVENTS, LOCALE_MISCSETTINGS_COLORED_EVENTS_0, LOCALE_MISCSETTINGS_COLORED_EVENTS_1, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 3cb19a408..dabfb3e34 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1116,6 +1116,7 @@ const char * locale_real_names[] = "menu.hint_channellist_show_empty_favs", "menu.hint_channellist_show_infobox", "menu.hint_channellist_show_res_icon", + "menu.hint_channellogos_setup", "menu.hint_channels", "menu.hint_ci", "menu.hint_clock_background", @@ -1616,6 +1617,7 @@ const char * locale_real_names[] = "miscsettings.channellist", "miscsettings.channellist_enablesdt", "miscsettings.channellist_epgtext_align", + "miscsettings.channellogos", "miscsettings.colored_events", "miscsettings.colored_events_0", "miscsettings.colored_events_1",