diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index ecc8fe7a9..4afdc021a 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -736,6 +736,7 @@ miscsettings.infobar_disp_log Logo miscsettings.infobar_logo_hdd_dir Logo Verz. miscsettings.infobar_sat_display Kabel-/Satellitenanbieter miscsettings.infobar_show Info bei EPG Änderungen +miscsettings.infobar_show_dd_available DD-Verfügbarkeit anzeigen miscsettings.infobar_show_res Auflösung anzeigen miscsettings.infobar_show_res_simple einfach miscsettings.infobar_show_sysfs_hdd Füllstandanzeige (sysFS & hdd) diff --git a/data/locale/english.locale b/data/locale/english.locale index 0608f6466..13c8993ad 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -736,6 +736,7 @@ miscsettings.infobar_disp_log Logo miscsettings.infobar_logo_hdd_dir Logo dir miscsettings.infobar_sat_display Satellite display on infobar miscsettings.infobar_show show Info on EPG change +miscsettings.infobar_show_dd_available show DD availability miscsettings.infobar_show_res show resolution on infobar miscsettings.infobar_show_res_simple simple miscsettings.infobar_show_sysfs_hdd Fill level (sysFS & hdd) diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 3ff3e5531..d5f433c1e 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -420,8 +420,8 @@ void CInfoViewerBB::showIcon_DD() if ((g_RemoteControl->current_PIDs.PIDs.selected_apid < g_RemoteControl->current_PIDs.APIDs.size()) && (g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].is_ac3)) dd_icon = NEUTRINO_ICON_DD; - else - dd_icon = (g_RemoteControl->has_ac3) ? NEUTRINO_ICON_DD_AVAIL : NEUTRINO_ICON_DD_GREY; + else + dd_icon = (g_settings.infobar_show_dd_available && g_RemoteControl->has_ac3) ? NEUTRINO_ICON_DD_AVAIL : NEUTRINO_ICON_DD_GREY; showBBIcons(CInfoViewerBB::ICON_DD, dd_icon); } diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 116055d52..a200c2921 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -616,6 +616,7 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar) menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY, &g_settings.infobar_sat_display, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_SYSFS_HDD, &g_settings.infobar_show_sysfs_hdd, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_RES, &g_settings.infobar_show_res, INFOBAR_SHOW_RES_MODE_OPTIONS, INFOBAR_SHOW_RES_MODE_OPTION_COUNT, true)); + menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_DD_AVAILABLE, &g_settings.infobar_show_dd_available, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_TUNER, &g_settings.infobar_show_tuner, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW, &g_settings.infobar_show, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS, &g_settings.colored_events_infobar, OPTIONS_COLORED_EVENTS_OPTIONS, OPTIONS_COLORED_EVENTS_OPTION_COUNT, true)); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index b8ca3037a..23e1ba71c 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -408,6 +408,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.infobar_show_sysfs_hdd = configfile.getBool("infobar_show_sysfs_hdd" , true ); g_settings.show_mute_icon = configfile.getInt32("show_mute_icon" ,0); g_settings.infobar_show_res = configfile.getInt32("infobar_show_res", 0 ); + g_settings.infobar_show_dd_available = configfile.getInt32("infobar_show_dd_available", 1 ); g_settings.infobar_show_tuner = configfile.getInt32("infobar_show_tuner", 1 ); g_settings.radiotext_enable = configfile.getBool("radiotext_enable" , false); //audio @@ -851,6 +852,7 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32("infobar_show_sysfs_hdd" , g_settings.infobar_show_sysfs_hdd ); configfile.setInt32("show_mute_icon" , g_settings.show_mute_icon); configfile.setInt32("infobar_show_res" , g_settings.infobar_show_res ); + configfile.setInt32("infobar_show_dd_available" , g_settings.infobar_show_dd_available ); configfile.setInt32("infobar_show_tuner" , g_settings.infobar_show_tuner ); configfile.setBool("radiotext_enable" , g_settings.radiotext_enable); //audio diff --git a/src/system/locals.h b/src/system/locals.h index e79f6d50c..145eb3f6b 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -763,6 +763,7 @@ typedef enum LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR, LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY, LOCALE_MISCSETTINGS_INFOBAR_SHOW, + LOCALE_MISCSETTINGS_INFOBAR_SHOW_DD_AVAILABLE, LOCALE_MISCSETTINGS_INFOBAR_SHOW_RES, LOCALE_MISCSETTINGS_INFOBAR_SHOW_RES_SIMPLE, LOCALE_MISCSETTINGS_INFOBAR_SHOW_SYSFS_HDD, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index bfb277a3f..30aea307e 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -763,6 +763,7 @@ const char * locale_real_names[] = "miscsettings.infobar_logo_hdd_dir", "miscsettings.infobar_sat_display", "miscsettings.infobar_show", + "miscsettings.infobar_show_dd_available", "miscsettings.infobar_show_res", "miscsettings.infobar_show_res_simple", "miscsettings.infobar_show_sysfs_hdd", diff --git a/src/system/settings.h b/src/system/settings.h index 1516c2bbd..820cdb1f0 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -76,6 +76,7 @@ struct SNeutrinoSettings int infobar_show_sysfs_hdd; int infobar_show_res; int infobar_show_tuner; + int infobar_show_dd_available; //audio int audio_AnalogMode; int audio_DolbyDigital;