mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

adzap: align locale in usermenu item to adzap active status

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1dfc1bc452
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)

Origin message was:
------------------
- adzap: align locale in usermenu item to adzap active status

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-02-29 00:13:38 +01:00
parent db71efdc01
commit f277c6d889
5 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -948,6 +948,7 @@ menu.back Zurück
menu.cancel Abbrechen menu.cancel Abbrechen
menu.hint_a_pic Konfigurieren Sie den Audioplayer und den Bildbetrachter 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 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 Audioplayer
menu.hint_aplay_setup Ändern Sie Audioplayer-Einstellungen wie Titel-Anzeige, Startverzeichnis oder Bildschirmschoner. 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 menu.hint_audio Audio-Ausgang, Dolby Digital und SRS TruVolume Optionen und mehr

1
data/locale/english.locale
View File

@@ -948,6 +948,7 @@ menu.back Back
menu.cancel Cancel menu.cancel Cancel
menu.hint_a_pic Configure audio player and picture viewer 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 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 Audio player
menu.hint_aplay_setup Change title display, start directory, screen saver and more menu.hint_aplay_setup Change title display, start directory, screen saver and more
menu.hint_audio Audio output, DD\nSRS True volume options menu.hint_audio Audio output, DD\nSRS True volume options

7
src/gui/user_menue.cpp
View File

@@ -68,6 +68,7 @@
#include <mymenu.h> #include <mymenu.h>
#include <gui/widget/icons.h> #include <gui/widget/icons.h>
#include <gui/adzap.h>
#include <gui/network_setup.h> #include <gui/network_setup.h>
#include <gui/update_menue.h> #include <gui/update_menue.h>
#include <gui/hdd_menu.h> #include <gui/hdd_menu.h>
@@ -186,6 +187,8 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
bool _mode_webtv = (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webtv) && bool _mode_webtv = (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webtv) &&
(!CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty()); (!CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty());
bool adzap_active = CAdZapMenu::getInstance()->isActive();
std::string itemstr_last("1"); std::string itemstr_last("1");
std::vector<std::string> items = ::split(g_settings.usermenu[button]->items, ','); std::vector<std::string> items = ::split(g_settings.usermenu[button]->items, ',');
@@ -374,8 +377,8 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
break; break;
case SNeutrinoSettings::ITEM_ADZAP: case SNeutrinoSettings::ITEM_ADZAP:
keyhelper.get(&key,&icon,CRCInput::RC_blue); keyhelper.get(&key,&icon,CRCInput::RC_blue);
menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_ADZAP, true, NULL, neutrino, "adzap", key, icon); 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("", LOCALE_MENU_HINT_ADZAP); menu_item->setHint("", adzap_active ? LOCALE_MENU_HINT_ADZAP_ACTIVE : LOCALE_MENU_HINT_ADZAP);
break; break;
#if 0 #if 0
case SNeutrinoSettings::ITEM_TUNER_RESTART: case SNeutrinoSettings::ITEM_TUNER_RESTART:

1
src/system/locals.h
View File

@@ -975,6 +975,7 @@ typedef enum
LOCALE_MENU_CANCEL, LOCALE_MENU_CANCEL,
LOCALE_MENU_HINT_A_PIC, LOCALE_MENU_HINT_A_PIC,
LOCALE_MENU_HINT_ADZAP, LOCALE_MENU_HINT_ADZAP,
LOCALE_MENU_HINT_ADZAP_ACTIVE,
LOCALE_MENU_HINT_APLAY, LOCALE_MENU_HINT_APLAY,
LOCALE_MENU_HINT_APLAY_SETUP, LOCALE_MENU_HINT_APLAY_SETUP,
LOCALE_MENU_HINT_AUDIO, LOCALE_MENU_HINT_AUDIO,

1
src/system/locals_intern.h
View File

@@ -975,6 +975,7 @@ const char * locale_real_names[] =
"menu.cancel", "menu.cancel",
"menu.hint_a_pic", "menu.hint_a_pic",
"menu.hint_adzap", "menu.hint_adzap",
"menu.hint_adzap_active",
"menu.hint_aplay", "menu.hint_aplay",
"menu.hint_aplay_setup", "menu.hint_aplay_setup",
"menu.hint_audio", "menu.hint_audio",