diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index c5d344db3..9e58088a1 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -569,7 +569,12 @@ fprintf(stderr, "after showchannellogo, mode = %d ret = %d logo_ok = %d\n",g_set showSNR(); frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_BLUE, ChanInfoX + 16*3 + asize * 3 + 2*6, BBarY, InfoHeightY_Info); - g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX + 16*4 + asize * 3 + 2*8, BBarFontY, ButtonWidth - (2 + NEUTRINO_ICON_BUTTON_BLUE_WIDTH + 4 + 2), g_Locale->getText(LOCALE_INFOVIEWER_STREAMINFO), COL_INFOBAR_BUTTONS, 0, true); // UTF-8 + + std::string txt = g_settings.usermenu_text[SNeutrinoSettings::BUTTON_BLUE]; + if (txt.empty()) + txt = g_Locale->getText(LOCALE_INFOVIEWER_STREAMINFO); + + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX + 16*4 + asize * 3 + 2*8, BBarFontY, ButtonWidth - (2 + NEUTRINO_ICON_BUTTON_BLUE_WIDTH + 4 + 2), txt, COL_INFOBAR_BUTTONS, 0, true); // UTF-8 showButton_Audio (); showButton_SubServices (); @@ -1047,10 +1052,14 @@ void CInfoViewer::showButton_SubServices () { if (!(g_RemoteControl->subChannels.empty ())) { frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_YELLOW, - ChanInfoX + 10 + NEUTRINO_ICON_BUTTON_RED_WIDTH + 4 + asize + 2 + NEUTRINO_ICON_BUTTON_GREEN_WIDTH + 4 + asize + 2, BBarY, InfoHeightY_Info); + ChanInfoX + 10 + NEUTRINO_ICON_BUTTON_RED_WIDTH + 4 + asize + 2 + NEUTRINO_ICON_BUTTON_GREEN_WIDTH + 4 + asize + 2, BBarY, InfoHeightY_Info); + std::string txt = g_settings.usermenu_text[SNeutrinoSettings::BUTTON_YELLOW]; + if (txt.empty()) + txt = g_Locale->getText((g_RemoteControl->are_subchannels) ? LOCALE_INFOVIEWER_SUBSERVICE : LOCALE_INFOVIEWER_SELECTTIME); + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString( ChanInfoX + 10 + NEUTRINO_ICON_BUTTON_RED_WIDTH + 4 + asize + 2 + NEUTRINO_ICON_BUTTON_GREEN_WIDTH + 4 + asize + 2 + NEUTRINO_ICON_BUTTON_YELLOW_WIDTH + 4, - BBarFontY, asize, g_Locale->getText((g_RemoteControl->are_subchannels) ? LOCALE_INFOVIEWER_SUBSERVICE : LOCALE_INFOVIEWER_SELECTTIME), COL_INFOBAR_BUTTONS, 0, true); // UTF-8 + BBarFontY, asize, txt, COL_INFOBAR_BUTTONS, 0, true); // UTF-8 } } @@ -1375,7 +1384,10 @@ void CInfoViewer::show_Data (bool calledFromEvent) #endif if (info_CurrentNext.flags & CSectionsdClient::epgflags::has_anything) { frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_RED, ChanInfoX + 10, BBarY, InfoHeightY_Info); - g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX + (10 + NEUTRINO_ICON_BUTTON_RED_WIDTH + 4), BBarFontY, asize, g_Locale->getText(LOCALE_INFOVIEWER_EVENTLIST), COL_INFOBAR_BUTTONS, 0, true); // UTF-8 + std::string txt = g_settings.usermenu_text[SNeutrinoSettings::BUTTON_RED]; + if (txt.empty()) + txt = g_Locale->getText(LOCALE_INFOVIEWER_EVENTLIST); + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX + (10 + NEUTRINO_ICON_BUTTON_RED_WIDTH + 4), BBarFontY, asize, txt, COL_INFOBAR_BUTTONS, 0, true); // UTF-8 } } @@ -1509,17 +1521,21 @@ void CInfoViewer::showButton_Audio () // green, in case of several APIDs uint32_t count = g_RemoteControl->current_PIDs.APIDs.size (); frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_GREEN, - ChanInfoX + 10 + NEUTRINO_ICON_BUTTON_RED_WIDTH + 4 + asize + 2, - BBarY, InfoHeightY_Info); + ChanInfoX + 10 + NEUTRINO_ICON_BUTTON_RED_WIDTH + 4 + asize + 2, + BBarY, InfoHeightY_Info); + std::string txt = g_settings.usermenu_text[SNeutrinoSettings::BUTTON_GREEN]; if (count > 0) { int selected = g_RemoteControl->current_PIDs.PIDs.selected_apid; int sx = ChanInfoX + 10 + NEUTRINO_ICON_BUTTON_RED_WIDTH + 4 + asize + 2 + NEUTRINO_ICON_BUTTON_GREEN_WIDTH + 4; frameBuffer->paintBoxRel(sx, BBarY, asize, InfoHeightY_Info, COL_INFOBAR_BUTTONS_BACKGROUND); + if (txt.empty()) + txt = g_RemoteControl->current_PIDs.APIDs[selected].desc; + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(sx, BBarFontY, asize, - g_RemoteControl->current_PIDs.APIDs[selected].desc, COL_INFOBAR_BUTTONS, 0, true); // UTF-8 + txt, COL_INFOBAR_BUTTONS, 0, true); // UTF-8 } const char *dd_icon; if ((g_RemoteControl->current_PIDs.PIDs.selected_apid < count) && (g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].is_ac3))