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

- infoviewer: do always show all buttons; enable is controlled by usermenu

Browse Source
This commit is contained in:
svenhoefer
2015-12-14 20:34:23 +01:00
parent 6fc8fb2bee
commit a52a0e6c1b
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/infoviewer.cpp
View File

@@ -1347,16 +1347,20 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data)
if (is_visible) showRecordIcon(true); if (is_visible) showRecordIcon(true);
} else if (msg == NeutrinoMessages::EVT_ZAP_GOTAPIDS) { } else if (msg == NeutrinoMessages::EVT_ZAP_GOTAPIDS) {
if ((*(t_channel_id *) data) == current_channel_id) { if ((*(t_channel_id *) data) == current_channel_id) {
#if 0
if (is_visible && showButtonBar) if (is_visible && showButtonBar)
infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_GREEN); infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_GREEN);
#endif
if (g_settings.radiotext_enable && g_Radiotext && !g_RemoteControl->current_PIDs.APIDs.empty() && ((CNeutrinoApp::getInstance()->getMode()) == NeutrinoMessages::mode_radio)) if (g_settings.radiotext_enable && g_Radiotext && !g_RemoteControl->current_PIDs.APIDs.empty() && ((CNeutrinoApp::getInstance()->getMode()) == NeutrinoMessages::mode_radio))
g_Radiotext->setPid(g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].pid); g_Radiotext->setPid(g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].pid);
} }
return messages_return::handled; return messages_return::handled;
} else if (msg == NeutrinoMessages::EVT_ZAP_GOT_SUBSERVICES) { } else if (msg == NeutrinoMessages::EVT_ZAP_GOT_SUBSERVICES) {
if ((*(t_channel_id *) data) == current_channel_id) { if ((*(t_channel_id *) data) == current_channel_id) {
#if 0
if (is_visible && showButtonBar) if (is_visible && showButtonBar)
infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_YELLOW); infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_YELLOW);
#endif
} }
return messages_return::handled; return messages_return::handled;
} else if (msg == NeutrinoMessages::EVT_ZAP_SUB_COMPLETE) { } else if (msg == NeutrinoMessages::EVT_ZAP_SUB_COMPLETE) {
@@ -1758,6 +1762,8 @@ void CInfoViewer::show_Data (bool calledFromEvent)
} }
#endif #endif
infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_RED); infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_RED);
infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_GREEN);
infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_YELLOW);
} }
if ((info_CurrentNext.flags & CSectionsdClient::epgflags::not_broadcast) || if ((info_CurrentNext.flags & CSectionsdClient::epgflags::not_broadcast) ||

4
src/gui/infoviewer_bb.cpp
View File

@@ -313,7 +313,11 @@ void CInfoViewerBB::getBBButtonInfo()
// continue; // continue;
} }
else else
#else
if (!bbButtonInfo[i].active)
bbButtonInfo[i].paint = false;
#endif #endif
else
{ {
count++; count++;
bbButtonInfo[i].paint = true; bbButtonInfo[i].paint = true;