diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 77df22846..41d361536 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -948,6 +948,7 @@ menu.back Zurück menu.cancel Abbrechen menu.hint_a_pic Konfigurieren Sie den Audioplayer und den Bildbetrachter menu.hint_adzap Der Werbe-Zapper schaltet nach der eingestellten Zeit wieder auf den ursprünglichen Kanal zurück +menu.hint_adzap_active Der Werbe-Zapper ist aktiv. Mit einem erneuten Aufruf wird er deaktiviert. menu.hint_aplay Audioplayer menu.hint_aplay_setup Ändern Sie Audioplayer-Einstellungen wie Titel-Anzeige, Startverzeichnis oder Bildschirmschoner. menu.hint_audio Audio-Ausgang, Dolby Digital und SRS TruVolume Optionen und mehr diff --git a/data/locale/english.locale b/data/locale/english.locale index 60fa687eb..df7a3336b 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -948,6 +948,7 @@ menu.back Back menu.cancel Cancel menu.hint_a_pic Configure audio player and picture viewer menu.hint_adzap AdZap will switch back to the current channel when the selected time is up +menu.hint_adzap_active AdZap is active. With a new call it will be deactivated. menu.hint_aplay Audio player menu.hint_aplay_setup Change title display, start directory, screen saver and more menu.hint_audio Audio output, DD\nSRS True volume options diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index f4e643dc1..95ee64bc6 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -68,6 +68,7 @@ #include #include +#include #include #include #include @@ -186,6 +187,8 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) bool _mode_webtv = (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webtv) && (!CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty()); + bool adzap_active = CAdZapMenu::getInstance()->isActive(); + std::string itemstr_last("1"); std::vector items = ::split(g_settings.usermenu[button]->items, ','); @@ -374,8 +377,8 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) break; case SNeutrinoSettings::ITEM_ADZAP: keyhelper.get(&key,&icon,CRCInput::RC_blue); - menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_ADZAP, true, NULL, neutrino, "adzap", key, icon); - menu_item->setHint("", LOCALE_MENU_HINT_ADZAP); + menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_ADZAP, true, adzap_active ? g_Locale->getText(LOCALE_OPTIONS_OFF) : NULL, neutrino, "adzap", key, icon); + menu_item->setHint("", adzap_active ? LOCALE_MENU_HINT_ADZAP_ACTIVE : LOCALE_MENU_HINT_ADZAP); break; #if 0 case SNeutrinoSettings::ITEM_TUNER_RESTART: diff --git a/src/system/locals.h b/src/system/locals.h index 965d6cd84..331a9fff6 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -975,6 +975,7 @@ typedef enum LOCALE_MENU_CANCEL, LOCALE_MENU_HINT_A_PIC, LOCALE_MENU_HINT_ADZAP, + LOCALE_MENU_HINT_ADZAP_ACTIVE, LOCALE_MENU_HINT_APLAY, LOCALE_MENU_HINT_APLAY_SETUP, LOCALE_MENU_HINT_AUDIO, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 2eb1f2b95..f33bb62ab 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -975,6 +975,7 @@ const char * locale_real_names[] = "menu.cancel", "menu.hint_a_pic", "menu.hint_adzap", + "menu.hint_adzap_active", "menu.hint_aplay", "menu.hint_aplay_setup", "menu.hint_audio",