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

eventlist: make additional infos switchable

Browse Source 
* new menu 'eventlist' in osd-setup
* fix offset in infozone
* fontsize for infozone adjustable


Origin commit data
------------------
Commit: 473d6f38ba
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-04-13 (Sat, 13 Apr 2013)

Origin message was:
------------------
- eventlist: make additional infos switchable

* new menu 'eventlist' in osd-setup
* fix offset in infozone
* fontsize for infozone adjustable
This commit is contained in:
vanhofen
2013-04-13 11:13:23 +02:00
parent 877a014ea1
commit e3905bf5c7
10 changed files with 78 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/eventlist.cpp
View File

@@ -249,7 +249,10 @@ int CNeutrinoEventList::exec(const t_channel_id channel_id, const std::string& c
full_width = frameBuffer->getScreenWidthRel();
x = getScreenStartX(full_width);
width = full_width / 3 * 2;
if (g_settings.eventlist_additional)
width = full_width / 3 * 2;
else
width = full_width;
height = frameBuffer->getScreenHeightRel();
iheight = ::paintButtons(0, 0, 0, 1, tmp_button, 0, 0, false, COL_INFOBAR_SHADOW, NULL, 0, false);
@@ -282,7 +285,8 @@ int CNeutrinoEventList::exec(const t_channel_id channel_id, const std::string& c
infozone_width = full_width - width;
// init right info_zone
cc_infozone = new CComponentsText(x+width+5, y+theight+10, infozone_width-10, listmaxshow*fheight-20);
if (g_settings.eventlist_additional)
cc_infozone = new CComponentsText(x+width+10, y+theight, infozone_width-20, listmaxshow*fheight);
int res = menu_return::RETURN_REPAINT;
//printf("CNeutrinoEventList::exec: channel_id %llx\n", channel_id);
@@ -673,7 +677,8 @@ int CNeutrinoEventList::exec(const t_channel_id channel_id, const std::string& c
}
}
delete cc_infozone;
if (cc_infozone)
delete cc_infozone;
cc_infozone = NULL;
oldIndex = -1;
oldEventID = -1;
@@ -816,6 +821,9 @@ void CNeutrinoEventList::paintItem(unsigned int pos, t_channel_id channel_idI)
void CNeutrinoEventList::paintDescription(int index)
{
if (!g_settings.eventlist_additional)
return;
if (evtlist[index].eventID == oldEventID) {
if (oldEventID == 0) {
if (index == oldIndex)
@@ -838,7 +846,7 @@ void CNeutrinoEventList::paintDescription(int index)
else
infozone_text = g_Locale->getText(LOCALE_EPGLIST_NOEVENTS);
cc_infozone->setText(infozone_text, CTextBox::TOP, g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMLARGE]);
cc_infozone->setText(infozone_text, CTextBox::TOP, g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_EVENT]);
cc_infozone->doPaintBg(false);
cc_infozone->paint(CC_SAVE_SCREEN_NO);
}
@@ -901,7 +909,7 @@ void CNeutrinoEventList::paint(t_channel_id channel_id)
}
// paint background for right box
if (!bgRightBoxPaint) {
if (g_settings.eventlist_additional && !bgRightBoxPaint) {
frameBuffer->paintBoxRel(x+width,y+theight,infozone_width,listmaxshow*fheight,COL_MENUCONTENT_PLUS_0);
bgRightBoxPaint = true;
}