diff --git a/data/icons/hints/Makefile.am b/data/icons/hints/Makefile.am index ee449319b..41ab0dee7 100644 --- a/data/icons/hints/Makefile.am +++ b/data/icons/hints/Makefile.am @@ -6,7 +6,6 @@ install_DATA = \ hint_aplay.png \ hint_audio.png \ hint_avinputmode.png \ - hint_avinputmode_pip.png \ hint_back.png \ hint_backup.png \ hint_bedit.png \ @@ -67,3 +66,12 @@ install_DATA = \ hint_webtv.png \ hint_xmltv.png \ hint_ytplay.png + +if ENABLE_PIP +install_DATA += \ + hint_avinputmode_pip.png +if ENABLE_QUADPIP +install_DATA += \ + hint_quadpip.png +endif +endif diff --git a/data/icons/hints/hint_avinputmode.png b/data/icons/hints/hint_avinputmode.png index 512defa1c..832f6f323 100644 Binary files a/data/icons/hints/hint_avinputmode.png and b/data/icons/hints/hint_avinputmode.png differ diff --git a/data/icons/hints/hint_avinputmode_pip.png b/data/icons/hints/hint_avinputmode_pip.png index 30b308175..e3ef4107e 100644 Binary files a/data/icons/hints/hint_avinputmode_pip.png and b/data/icons/hints/hint_avinputmode_pip.png differ diff --git a/data/icons/hints/hint_quadpip.png b/data/icons/hints/hint_quadpip.png new file mode 100644 index 000000000..4cc6bc2e5 Binary files /dev/null and b/data/icons/hints/hint_quadpip.png differ diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 8acb1944d..4a370274f 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1573,6 +1573,7 @@ menu.hint_progressbar_timescale_invert Wählen Sie den Farbverlauf menu.hint_progressbar_timescale_red Hier können Sie den roten Farbanteil bunter Fortschrittsbalken anpassen menu.hint_progressbar_timescale_yellow Hier können Sie den gelben Farbanteil bunter Fortschrittsbalken anpassen menu.hint_protection Schützen Sie Inhalte per PIN-Code\nStandard-PIN ist 0000 +menu.hint_quadpip QuadPiP aktivieren menu.hint_radiomode Schaltet zum Radio-Modus menu.hint_reboot Startet die Box neu\nDer Neustart erfolgt ohne Bestätigung! menu.hint_record_already_found_check Prüft vor dem Setzen eines neues Aufnahmetimers, ob ein gleichnamiger Titel bereits vorhanden ist diff --git a/data/locale/english.locale b/data/locale/english.locale index 3a4178e6d..c04dda991 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1573,6 +1573,7 @@ menu.hint_progressbar_timescale_invert Select your preferred color gradient menu.hint_progressbar_timescale_red Choose the red portion of colored progressbars menu.hint_progressbar_timescale_yellow Choose the yellow portion of colored progressbars menu.hint_protection Protect content by PIN code\nDefault PIN 0000 +menu.hint_quadpip Activate QuadPiP menu.hint_radiomode Switch box to radio mode menu.hint_reboot Reboot box\nNo confirmation menu.hint_record_already_found_check Checks before setting a new record timer if an eponymous title already exists diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index 14c7fd763..e1e3aab28 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -157,6 +157,7 @@ #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_QUADPIP "hint_quadpip" #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 576425d0a..ae1be540d 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -274,6 +274,7 @@ void CNeutrinoApp::InitMenuMain() #if ENABLE_PIP && ENABLE_QUADPIP CMenuForwarder *quadpip = new CMenuForwarder(LOCALE_QUADPIP, true, NULL, new CQuadPiPSetup(), NULL, CRCInput::RC_nokey); + quadpip->setHint(NEUTRINO_ICON_HINT_QUADPIP, LOCALE_MENU_HINT_QUADPIP); personalize.addItem(MENU_MAIN, quadpip/*, &g_settings.personalize[SNeutrinoSettings::P_MAIN_QUADPIP]*/); #endif diff --git a/src/system/locals.h b/src/system/locals.h index f9e3c3577..caa187509 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1600,6 +1600,7 @@ typedef enum LOCALE_MENU_HINT_PROGRESSBAR_TIMESCALE_RED, LOCALE_MENU_HINT_PROGRESSBAR_TIMESCALE_YELLOW, LOCALE_MENU_HINT_PROTECTION, + LOCALE_MENU_HINT_QUADPIP, LOCALE_MENU_HINT_RADIOMODE, LOCALE_MENU_HINT_REBOOT, LOCALE_MENU_HINT_RECORD_ALREADY_FOUND_CHECK, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 2fb93592a..554074ba7 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1600,6 +1600,7 @@ const char * locale_real_names[] = "menu.hint_progressbar_timescale_red", "menu.hint_progressbar_timescale_yellow", "menu.hint_protection", + "menu.hint_quadpip", "menu.hint_radiomode", "menu.hint_reboot", "menu.hint_record_already_found_check",