mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-27 15:32:52 +02:00
neutrino-menu: change position of avinput; add hint and icons
Origin commit data
------------------
Commit: 9ea1cf945b
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-05-14 (Fri, 14 May 2021)
Origin message was:
------------------
- neutrino-menu: change position of avinput; add hint and icons
This commit is contained in:
@@ -5,6 +5,8 @@ install_DATA = \
|
|||||||
hint_adzap.png \
|
hint_adzap.png \
|
||||||
hint_aplay.png \
|
hint_aplay.png \
|
||||||
hint_audio.png \
|
hint_audio.png \
|
||||||
|
hint_avinputmode.png \
|
||||||
|
hint_avinputmode_pip.png \
|
||||||
hint_back.png \
|
hint_back.png \
|
||||||
hint_backup.png \
|
hint_backup.png \
|
||||||
hint_bedit.png \
|
hint_bedit.png \
|
||||||
|
BIN
data/icons/hints/hint_avinputmode.png
Normal file
BIN
data/icons/hints/hint_avinputmode.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.0 KiB |
BIN
data/icons/hints/hint_avinputmode_pip.png
Normal file
BIN
data/icons/hints/hint_avinputmode_pip.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.2 KiB |
@@ -1331,6 +1331,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_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_subs Automatische Anzeige der Untertitel in Ihrer bevorzugten Sprache
|
||||||
menu.hint_auto_update_check Prüfintervalle für Updates festlegen.
|
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 Zurück zum vorherigen Menü.\nDie Taste 'Menü' schließt alle Menüs
|
||||||
menu.hint_back_brief Zurück zum vorherigen Menü.
|
menu.hint_back_brief Zurück zum vorherigen Menü.
|
||||||
menu.hint_backlight Konfigurieren Sie die Hintergrundbeleuchtung der Buttons
|
menu.hint_backlight Konfigurieren Sie die Hintergrundbeleuchtung der Buttons
|
||||||
|
@@ -1331,6 +1331,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_lang Auto-switch audio to preferred language
|
||||||
menu.hint_auto_subs Auto-start subtitles for 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_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 Return to previous menu\nPress menu key to close all menus
|
||||||
menu.hint_back_brief Return to previous menu
|
menu.hint_back_brief Return to previous menu
|
||||||
menu.hint_backlight Configure buttons backlight
|
menu.hint_backlight Configure buttons backlight
|
||||||
|
@@ -154,6 +154,8 @@
|
|||||||
|
|
||||||
/* media */
|
/* media */
|
||||||
#define NEUTRINO_ICON_HINT_APLAY "hint_aplay"
|
#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_INET_RADIO "hint_inetradio"
|
||||||
#define NEUTRINO_ICON_HINT_MOVIE "hint_movie"
|
#define NEUTRINO_ICON_HINT_MOVIE "hint_movie"
|
||||||
#define NEUTRINO_ICON_HINT_PICVIEW "hint_picview"
|
#define NEUTRINO_ICON_HINT_PICVIEW "hint_picview"
|
||||||
|
@@ -156,19 +156,6 @@ void CNeutrinoApp::InitMenuMain()
|
|||||||
radioswitch->setHint(NEUTRINO_ICON_HINT_RADIOMODE, LOCALE_MENU_HINT_RADIOMODE);
|
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
|
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
|
//timer
|
||||||
CMenuForwarder *timerlist = new CMenuForwarder(LOCALE_TIMERLIST_NAME, true, NULL, new CTimerList(), NULL, CRCInput::RC_yellow);
|
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);
|
timerlist->setHint(NEUTRINO_ICON_HINT_TIMERS, LOCALE_MENU_HINT_TIMERS);
|
||||||
@@ -179,6 +166,20 @@ void CNeutrinoApp::InitMenuMain()
|
|||||||
media->setHint(NEUTRINO_ICON_HINT_MEDIA, LOCALE_MENU_HINT_MEDIA);
|
media->setHint(NEUTRINO_ICON_HINT_MEDIA, LOCALE_MENU_HINT_MEDIA);
|
||||||
personalize.addItem(MENU_MAIN, media, &g_settings.personalize[SNeutrinoSettings::P_MAIN_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;
|
CMenuForwarder * mf;
|
||||||
//games
|
//games
|
||||||
bool show_games = g_Plugins->hasPlugin(CPlugins::P_TYPE_GAME);
|
bool show_games = g_Plugins->hasPlugin(CPlugins::P_TYPE_GAME);
|
||||||
|
@@ -1358,6 +1358,8 @@ typedef enum
|
|||||||
LOCALE_MENU_HINT_AUTO_LANG,
|
LOCALE_MENU_HINT_AUTO_LANG,
|
||||||
LOCALE_MENU_HINT_AUTO_SUBS,
|
LOCALE_MENU_HINT_AUTO_SUBS,
|
||||||
LOCALE_MENU_HINT_AUTO_UPDATE_CHECK,
|
LOCALE_MENU_HINT_AUTO_UPDATE_CHECK,
|
||||||
|
LOCALE_MENU_HINT_AVINPUTMODE,
|
||||||
|
LOCALE_MENU_HINT_AVINPUTMODE_PIP,
|
||||||
LOCALE_MENU_HINT_BACK,
|
LOCALE_MENU_HINT_BACK,
|
||||||
LOCALE_MENU_HINT_BACK_BRIEF,
|
LOCALE_MENU_HINT_BACK_BRIEF,
|
||||||
LOCALE_MENU_HINT_BACKLIGHT,
|
LOCALE_MENU_HINT_BACKLIGHT,
|
||||||
|
@@ -1358,6 +1358,8 @@ const char * locale_real_names[] =
|
|||||||
"menu.hint_auto_lang",
|
"menu.hint_auto_lang",
|
||||||
"menu.hint_auto_subs",
|
"menu.hint_auto_subs",
|
||||||
"menu.hint_auto_update_check",
|
"menu.hint_auto_update_check",
|
||||||
|
"menu.hint_avinputmode",
|
||||||
|
"menu.hint_avinputmode_pip",
|
||||||
"menu.hint_back",
|
"menu.hint_back",
|
||||||
"menu.hint_back_brief",
|
"menu.hint_back_brief",
|
||||||
"menu.hint_backlight",
|
"menu.hint_backlight",
|
||||||
|
Reference in New Issue
Block a user