From cdc91ef60168f5761a343bc54443ea65be1765f9 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Fri, 14 May 2021 22:24:33 +0200 Subject: [PATCH] - neutrino-menu: change position of avinput; add hint and icons Signed-off-by: Thilo Graf --- data/icons/hints/Makefile.am | 2 ++ data/icons/hints/hint_avinputmode.png | Bin 0 -> 3085 bytes data/icons/hints/hint_avinputmode_pip.png | Bin 0 -> 3263 bytes data/locale/deutsch.locale | 2 ++ data/locale/english.locale | 2 ++ src/gui/widget/icons.h | 2 ++ src/neutrino_menue.cpp | 27 +++++++++++----------- src/system/locals.h | 2 ++ src/system/locals_intern.h | 2 ++ 9 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 data/icons/hints/hint_avinputmode.png create mode 100644 data/icons/hints/hint_avinputmode_pip.png diff --git a/data/icons/hints/Makefile.am b/data/icons/hints/Makefile.am index b29ee3f75..d46ceedc6 100644 --- a/data/icons/hints/Makefile.am +++ b/data/icons/hints/Makefile.am @@ -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 \ diff --git a/data/icons/hints/hint_avinputmode.png b/data/icons/hints/hint_avinputmode.png new file mode 100644 index 0000000000000000000000000000000000000000..512defa1ce9b76855b826697320e4e7d3d947104 GIT binary patch literal 3085 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 literal 0 HcmV?d00001 diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 7815f9c7a..82c24afde 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -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 diff --git a/data/locale/english.locale b/data/locale/english.locale index c2d4c9709..59ffb167a 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -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 diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index 21e5b028e..b67d4311e 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -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" diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 9a60852f0..6137833d3 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -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); diff --git a/src/system/locals.h b/src/system/locals.h index 75a6abf6d..34412f3de 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -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, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 8e48870c6..eb6fafb59 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -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",