mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 15:02:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

- neutrino-menu: change position of avinput; add hint and icons

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-05-14 22:24:33 +02:00
committed by Thilo Graf
parent c5b442e141
commit cdc91ef601
9 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/icons/hints/Makefile.am
View File

@@ -5,6 +5,8 @@ install_DATA = \
hint_adzap.png \
hint_aplay.png \
hint_audio.png \
hint_avinputmode.png \
hint_avinputmode_pip.png \
hint_back.png \
hint_backup.png \
hint_bedit.png \

BIN
data/icons/hints/hint_avinputmode.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
data/icons/hints/hint_avinputmode_pip.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

2
data/locale/deutsch.locale
View File

@@ -1250,6 +1250,8 @@ menu.hint_audioplayer_title Aktivieren Sie die Titelsuche (SMS-Stil) in der Play
menu.hint_auto_lang Wählen Sie, ob automatisch ihre bevorzugte Tonspur ausgewählt wird, wenn sie vorhanden ist
menu.hint_auto_subs Automatische Anzeige der Untertitel in Ihrer bevorzugten Sprache
menu.hint_auto_update_check Prüfintervalle für Updates festlegen.
menu.hint_avinputmode AV-Eingang des Receivers verwenden
menu.hint_avinputmode_pip AV-Eingang des Receivers im PiP verwenden
menu.hint_back Zurück zum vorherigen Menü.\nDie Taste 'Menü' schließt alle Menüs
menu.hint_back_brief Zurück zum vorherigen Menü.
menu.hint_backlight Konfigurieren Sie die Hintergrundbeleuchtung der Buttons

2
data/locale/english.locale
View File

@@ -1250,6 +1250,8 @@ menu.hint_audioplayer_title Enable SMS-style title search in playlist
menu.hint_auto_lang Auto-switch audio to preferred language
menu.hint_auto_subs Auto-start subtitles for preferred language
menu.hint_auto_update_check Set interval mode for update checks.
menu.hint_avinputmode Use AV input of your receiver
menu.hint_avinputmode_pip Use AV input of your receiver in PiP mode
menu.hint_back Return to previous menu\nPress menu key to close all menus
menu.hint_back_brief Return to previous menu
menu.hint_backlight Configure buttons backlight

2
src/gui/widget/icons.h
View File

@@ -154,6 +154,8 @@
/* media */
#define NEUTRINO_ICON_HINT_APLAY "hint_aplay"
#define NEUTRINO_ICON_HINT_AVINPUTMODE "hint_avinputmode"
#define NEUTRINO_ICON_HINT_AVINPUTMODE_PIP "hint_avinputmode_pip"
#define NEUTRINO_ICON_HINT_INET_RADIO "hint_inetradio"
#define NEUTRINO_ICON_HINT_MOVIE "hint_movie"
#define NEUTRINO_ICON_HINT_PICVIEW "hint_picview"

27
src/neutrino_menue.cpp
View File

@@ -158,19 +158,6 @@ void CNeutrinoApp::InitMenuMain()
radioswitch->setHint(NEUTRINO_ICON_HINT_RADIOMODE, LOCALE_MENU_HINT_RADIOMODE);
personalize.addItem(MENU_MAIN, radioswitch, &g_settings.personalize[SNeutrinoSettings::P_MAIN_RADIO_MODE], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ITEM_OPTION, tvradio_switch, DCOND_MODE_RADIO | DCOND_MODE_TS); //observed
//avinput mode
if ((g_info.hw_caps->has_SCART_input) || (g_info.hw_caps->has_HDMI_input)) {
CMenuForwarder *avinputmode = new CMenuForwarder(LOCALE_MAINMENU_AVINPUTMODE, true, NULL, this, "avinput", g_settings.personalize[SNeutrinoSettings::P_MAIN_TV_RADIO_MODE] != 0 ? CRCInput::RC_green : CRCInput::RC_nokey);
//avinputmode->setHint(NEUTRINO_ICON_HINT_AVINPUTMODE, LOCALE_MAINMENU_HINT_AVINPUTMODE);
personalize.addItem(MENU_MAIN, avinputmode, &g_settings.personalize[SNeutrinoSettings::P_MAIN_AVINPUT]);
#ifdef ENABLE_PIP
CMenuForwarder *avinputmode_pip = new CMenuForwarder(LOCALE_MAINMENU_AVINPUTMODE_PIP, true, NULL, this, "avinput_pip", false /*CRCInput::RC_nokey*/);
//avinputmode_pip->setHint(NEUTRINO_ICON_HINT_AVINPUTMODE_PIP, LOCALE_MAINMENU_HINT_AVINPUTMODE_PIP);
personalize.addItem(MENU_MAIN, avinputmode_pip, &g_settings.personalize[SNeutrinoSettings::P_MAIN_AVINPUT_PIP]);
#endif
}
//timer
CMenuForwarder *timerlist = new CMenuForwarder(LOCALE_TIMERLIST_NAME, true, NULL, new CTimerList(), NULL, CRCInput::RC_yellow);
timerlist->setHint(NEUTRINO_ICON_HINT_TIMERS, LOCALE_MENU_HINT_TIMERS);
@@ -181,6 +168,20 @@ void CNeutrinoApp::InitMenuMain()
media->setHint(NEUTRINO_ICON_HINT_MEDIA, LOCALE_MENU_HINT_MEDIA);
personalize.addItem(MENU_MAIN, media, &g_settings.personalize[SNeutrinoSettings::P_MAIN_MEDIA]);
//avinput mode
if ((g_info.hw_caps->has_SCART_input) || (g_info.hw_caps->has_HDMI_input)) {
personalize.addSeparator(MENU_MAIN);
CMenuForwarder *avinputmode = new CMenuForwarder(LOCALE_MAINMENU_AVINPUTMODE, true, NULL, this, "avinput");
avinputmode->setHint(NEUTRINO_ICON_HINT_AVINPUTMODE, LOCALE_MENU_HINT_AVINPUTMODE);
personalize.addItem(MENU_MAIN, avinputmode, &g_settings.personalize[SNeutrinoSettings::P_MAIN_AVINPUT]);
#ifdef ENABLE_PIP
CMenuForwarder *avinputmode_pip = new CMenuForwarder(LOCALE_MAINMENU_AVINPUTMODE_PIP, true, NULL, this, "avinput_pip");
avinputmode_pip->setHint(NEUTRINO_ICON_HINT_AVINPUTMODE_PIP, LOCALE_MENU_HINT_AVINPUTMODE_PIP);
personalize.addItem(MENU_MAIN, avinputmode_pip, &g_settings.personalize[SNeutrinoSettings::P_MAIN_AVINPUT_PIP]);
#endif
}
CMenuForwarder * mf;
//games
bool show_games = g_Plugins->hasPlugin(CPlugins::P_TYPE_GAME);

2
src/system/locals.h
View File

@@ -1277,6 +1277,8 @@ typedef enum
LOCALE_MENU_HINT_AUTO_LANG,
LOCALE_MENU_HINT_AUTO_SUBS,
LOCALE_MENU_HINT_AUTO_UPDATE_CHECK,
LOCALE_MENU_HINT_AVINPUTMODE,
LOCALE_MENU_HINT_AVINPUTMODE_PIP,
LOCALE_MENU_HINT_BACK,
LOCALE_MENU_HINT_BACK_BRIEF,
LOCALE_MENU_HINT_BACKLIGHT,

2
src/system/locals_intern.h
View File

@@ -1277,6 +1277,8 @@ const char * locale_real_names[] =
"menu.hint_auto_lang",
"menu.hint_auto_subs",
"menu.hint_auto_update_check",
"menu.hint_avinputmode",
"menu.hint_avinputmode_pip",
"menu.hint_back",
"menu.hint_back_brief",
"menu.hint_backlight",