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

Alternate user-menu names

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@389 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2010-02-20 13:41:35 +00:00
parent b5655fb6f4
commit 6c1ef017b7
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gui/infoviewer.cpp
View File

@@ -569,7 +569,12 @@ fprintf(stderr, "after showchannellogo, mode = %d ret = %d logo_ok = %d\n",g_set
showSNR(); showSNR();
frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_BLUE, ChanInfoX + 16*3 + asize * 3 + 2*6, frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_BLUE, ChanInfoX + 16*3 + asize * 3 + 2*6,
BBarY, InfoHeightY_Info); 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_Audio ();
showButton_SubServices (); showButton_SubServices ();
@@ -1047,10 +1052,14 @@ void CInfoViewer::showButton_SubServices ()
{ {
if (!(g_RemoteControl->subChannels.empty ())) { if (!(g_RemoteControl->subChannels.empty ())) {
frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_YELLOW, 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( 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, 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 #endif
if (info_CurrentNext.flags & CSectionsdClient::epgflags::has_anything) { if (info_CurrentNext.flags & CSectionsdClient::epgflags::has_anything) {
frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_RED, ChanInfoX + 10, BBarY, InfoHeightY_Info); 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 // green, in case of several APIDs
uint32_t count = g_RemoteControl->current_PIDs.APIDs.size (); uint32_t count = g_RemoteControl->current_PIDs.APIDs.size ();
frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_GREEN, frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_GREEN,
ChanInfoX + 10 + NEUTRINO_ICON_BUTTON_RED_WIDTH + 4 + asize + 2, ChanInfoX + 10 + NEUTRINO_ICON_BUTTON_RED_WIDTH + 4 + asize + 2,
BBarY, InfoHeightY_Info); BBarY, InfoHeightY_Info);
std::string txt = g_settings.usermenu_text[SNeutrinoSettings::BUTTON_GREEN];
if (count > 0) { if (count > 0) {
int selected = g_RemoteControl->current_PIDs.PIDs.selected_apid; 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; 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); 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_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; 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)) if ((g_RemoteControl->current_PIDs.PIDs.selected_apid < count) && (g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].is_ac3))