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

- epgview: rework button arrangement; green = imdb, yellow = tmdb

Browse Source 
Conflicts:
	src/gui/epgview.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>

Changed CProgressBar to CRateBanner cc_starbar object,
CProgressBar contains no PB_STARBAR mode,
otherwise the build would be broken.

TODO: Fix text arrangement inside epgview window. Seems the
Bottombox-object is not sufficient considered.
It will be over painted in some conditions, watched
if using of (very) large font scaling.
This commit is contained in:
svenhoefer
2021-05-03 01:00:35 +02:00
committed by Thilo Graf
parent 49752cc478
commit c39084efc7
1 changed files with 134 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

225
src/gui/epgview.cpp
View File

@@ -291,31 +291,40 @@ void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear)
// recalculate // recalculate
medlineheight = font->getHeight(); medlineheight = font->getHeight();
medlinecount = sb / medlineheight;
// show ranking
if (startPos == 0 && (imdb_active || tmdb_active)) if (startPos == 0 && (imdb_active || tmdb_active))
{ {
std::string provider_logo = ""; std::string provider_logo = "";
int stars = 0; int stars = 0;
if (tmdb_active && startPos == 0) if (imdb_active)
provider_logo = NEUTRINO_ICON_TMDB; {
if (imdb_active && startPos == 0)
provider_logo = NEUTRINO_ICON_IMDB; provider_logo = NEUTRINO_ICON_IMDB;
stars = imdb_stars;
}
else if (tmdb_active)
{
provider_logo = NEUTRINO_ICON_TMDB;
stars = tmdb_stars;
}
// show ranking
if (stars > 0)
{
int max_stars = 10; int max_stars = 10;
if (imdb_active && imdb_stars) //TODO: unify imdb and tmdb if (imdb_active && imdb_stars)
stars = imdb_stars / max_stars; // FIXME: recalculate stars value for starbar, native values with decimal places like float are required stars = imdb_stars / max_stars;
if (tmdb_active && tmdb_stars)
stars = tmdb_stars / max_stars;
//create and paint ranking banner //create and paint ranking banner
CRateBanner rate_bar(sx+OFFSET_INNER_MID+cover_offset, y+OFFSET_INNER_MID, stars, max_stars, provider_logo); CRateBanner cc_starbar(sx+OFFSET_INNER_MID+cover_offset, y+OFFSET_INNER_MID, stars, max_stars, provider_logo);
rate_bar.paint(); cc_starbar.paint();
if (imdb_active) //TODO: unify imdb and tmdb medlinecount = (sb - cc_starbar.getHeight()) / medlineheight;
paintTextBoxRel(imdb_rating, sx + 2*OFFSET_INNER_MID + cover_offset + rate_bar.getWidth(), y + OFFSET_INNER_MID + rate_bar.getHeight()/2 - font->getHeight()/2, 0, rate_bar.getHeight(), font ); }
y += medlineheight;
medlinecount = (sb - rate_bar.getHeight() - 2*OFFSET_INNER_MID) / medlineheight;
y = rate_bar.getYPos() + rate_bar.getHeight();
} }
for (int i = startPos; i < textSize && i < startPos + medlinecount; i++, y += medlineheight) for (int i = startPos; i < textSize && i < startPos + medlinecount; i++, y += medlineheight)
@@ -706,6 +715,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
imdb_active = false; imdb_active = false;
imdb_stars = 0; imdb_stars = 0;
tmdb_active = false; tmdb_active = false;
tmdb_stars = 0;
t_channel_id epg_id = channel_id; t_channel_id epg_id = channel_id;
CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id); CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id);
@@ -922,6 +932,8 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
//paint bottombox contents //paint bottombox contents
Bottombox->paint(false); Bottombox->paint(false);
// // small separator line
// frameBuffer->paintHLineRel(sx, ox, sy + oy - 1, COL_FRAME);
showProgressBar(); showProgressBar();
// show Timer Event Buttons // show Timer Event Buttons
@@ -1008,7 +1020,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
if (showPos+scrollCount<textCount) if (showPos+scrollCount<textCount)
{ {
showPos += scrollCount; showPos += scrollCount;
showText(showPos, sy + toph, (tmdb_active && tmdb->hasPoster()) || (imdb_active && imdb->hasPoster()), false); showText(showPos, sy + toph, (imdb_active && imdb->hasPoster()) || (tmdb_active && tmdb->hasPoster()), false);
} }
break; break;
case CRCInput::RC_up: case CRCInput::RC_up:
@@ -1016,7 +1028,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
showPos -= scrollCount; showPos -= scrollCount;
if (showPos < 0) if (showPos < 0)
showPos = 0; showPos = 0;
showText(showPos, sy + toph, (tmdb_active && tmdb->hasPoster()) || (imdb_active && imdb->hasPoster()), false); showText(showPos, sy + toph, (imdb_active && imdb->hasPoster()) || (tmdb_active && tmdb->hasPoster()), false);
} }
break; break;
case CRCInput::RC_page_up: case CRCInput::RC_page_up:
@@ -1152,48 +1164,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
printf("timerd not available\n"); printf("timerd not available\n");
} }
break; break;
case CRCInput::RC_0: //imdb // imdb/omdb info
{
if (imdb_active)
{
imdb_active = false;
imdb_stars = 0;
showTimerEventBar(true, !mp_info && isCurrentEPG(channel_id), mp_info); //show buttons
epgText = epgText_saved;
textCount = epgText.size();
}
if (g_settings.tmdb_enabled)
{
showPos = 0;
if (!tmdb_active)
{
tmdb->setTitle(epgData.title);
if ((tmdb->getResults() > 0) && (!tmdb->getDescription().empty()))
{
tmdb_active = true;
tmdb_stars = tmdb->getStars();
epgText_saved = epgText;
epgText.clear();
epgTextSwitch = tmdb->getMovieText();
processTextToArray(tmdb->getEPGText(), 0, tmdb->hasPoster());
textCount = epgText.size();
showText(showPos, sy + toph, tmdb->hasPoster());
timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
}
else
ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_EPGVIEWER_NODETAILED, CMsgBox::mbrOk , CMsgBox::mbrOk);
}
else
{
tmdb_active = false;
tmdb_stars = 0;
epgText = epgText_saved;
textCount = epgText.size();
showText(showPos, sy + toph);
}
}
break;
}
case CRCInput::RC_green: case CRCInput::RC_green:
{ {
if (tmdb_active) if (tmdb_active)
@@ -1260,7 +1231,79 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
} }
break; break;
} }
// tmdb info
case CRCInput::RC_yellow: case CRCInput::RC_yellow:
{
if (imdb_active)
{
imdb_active = false;
imdb_stars = 0;
showTimerEventBar(true, !mp_info && isCurrentEPG(channel_id), mp_info); //show buttons
epgText = epgText_saved;
textCount = epgText.size();
}
if (g_settings.tmdb_enabled)
{
showPos = 0;
if (!tmdb_active)
{
tmdb->setTitle(epgData.title);
if ((tmdb->getResults() > 0) && (!tmdb->getDescription().empty()))
{
tmdb_active = true;
tmdb_stars = tmdb->getStars();
epgText_saved = epgText;
epgText.clear();
epgTextSwitch = tmdb->getMovieText();
processTextToArray(tmdb->getEPGText(), 0, tmdb->hasPoster());
textCount = epgText.size();
showText(showPos, sy + toph, tmdb->hasPoster());
timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
}
else
ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_EPGVIEWER_NODETAILED, CMsgBox::mbrOk , CMsgBox::mbrOk);
}
else
{
tmdb_active = false;
tmdb_stars = 0;
epgText = epgText_saved;
textCount = epgText.size();
showText(showPos, sy + toph);
}
}
break;
}
case CRCInput::RC_blue:
{
imdb_active = false;
imdb_stars = 0;
tmdb_active = false;
tmdb_stars = 0;
if(!followlist.empty() && !call_fromfollowlist){
hide();
time_t tmp_sZeit = epgData.epg_times.startzeit;
uint64_t tmp_eID = epgData.eventID;
CEventList *ee = new CEventList;
res = ee->exec(channel_id, g_Locale->getText(LOCALE_EPGVIEWER_MORE_SCREENINGS_SHORT),"","",followlist); // UTF-8
delete ee;
if (res == menu_return::RETURN_EXIT_ALL)
loop = false;
else {
if (!bigFonts && g_settings.bigFonts) {
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->getSize() * BIGFONT_FACTOR));
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getSize() * BIGFONT_FACTOR));
}
bigFonts = g_settings.bigFonts;
show(channel_id,tmp_eID,&tmp_sZeit,false);
showPos=0;
}
}
break;
}
case CRCInput::RC_0:
{ {
if (!mp_info) if (!mp_info)
{ {
@@ -1295,39 +1338,15 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
} }
break; break;
} }
case CRCInput::RC_blue: case CRCInput::RC_help:
{
if(imdb_active)
imdb_active = false; imdb_active = false;
imdb_stars = 0;
tmdb_active = false;
tmdb_stars = 0;
if(!followlist.empty() && !call_fromfollowlist){
hide();
time_t tmp_sZeit = epgData.epg_times.startzeit;
uint64_t tmp_eID = epgData.eventID;
CEventList *ee = new CEventList;
res = ee->exec(channel_id, g_Locale->getText(LOCALE_EPGVIEWER_MORE_SCREENINGS_SHORT),"","",followlist); // UTF-8
delete ee;
if (res == menu_return::RETURN_EXIT_ALL)
loop = false;
else {
if (!bigFonts && g_settings.bigFonts) {
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->getSize() * BIGFONT_FACTOR));
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getSize() * BIGFONT_FACTOR));
}
bigFonts = g_settings.bigFonts;
show(channel_id,tmp_eID,&tmp_sZeit,false);
showPos=0;
}
}
break;
}
case CRCInput::RC_info:
bigFonts = bigFonts ? false : true; bigFonts = bigFonts ? false : true;
ResetModules(); ResetModules();
frameBuffer->paintBackgroundBoxRel(sx, sy, ox, oy); frameBuffer->paintBackgroundBoxRel(sx, sy, ox, oy);
tmdb_active = false; // reset tmdb
imdb_active = false; // reset imdb
showTimerEventBar (false); showTimerEventBar (false);
//textypos = sy; //textypos = sy;
//printf("bigFonts %d\n", bigFonts); //printf("bigFonts %d\n", bigFonts);
@@ -1352,7 +1371,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
case CRCInput::CRCInput::RC_tv: case CRCInput::CRCInput::RC_tv:
case CRCInput::CRCInput::RC_radio: case CRCInput::CRCInput::RC_radio:
#endif #endif
case CRCInput::RC_help: case CRCInput::RC_info:
case CRCInput::RC_ok: case CRCInput::RC_ok:
case CRCInput::RC_timeout: case CRCInput::RC_timeout:
if(fader.StartFadeOut()) { if(fader.StartFadeOut()) {
@@ -1586,15 +1605,15 @@ struct button_label EpgButtons[][5] =
// TV_BUTTONS // TV_BUTTONS
{ NEUTRINO_ICON_BUTTON_RED, LOCALE_TIMERBAR_RECORDEVENT }, { NEUTRINO_ICON_BUTTON_RED, LOCALE_TIMERBAR_RECORDEVENT },
{ NEUTRINO_ICON_BUTTON_GREEN, LOCALE_IMDB_INFO }, { NEUTRINO_ICON_BUTTON_GREEN, LOCALE_IMDB_INFO },
{ NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_TIMERBAR_CHANNELSWITCH }, { NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_TMDB_INFO },
{ NEUTRINO_ICON_BUTTON_BLUE, LOCALE_EPGVIEWER_MORE_SCREENINGS_SHORT }, { NEUTRINO_ICON_BUTTON_BLUE, LOCALE_EPGVIEWER_MORE_SCREENINGS_SHORT },
{ NEUTRINO_ICON_BUTTON_0, LOCALE_TMDB_INFO } { NEUTRINO_ICON_BUTTON_0, LOCALE_TIMERBAR_CHANNELSWITCH }
}, },
{ {
// MP_BUTTONS // MP_BUTTONS
{ NEUTRINO_ICON_BUTTON_RED, LOCALE_EPG_SAVING }, { NEUTRINO_ICON_BUTTON_RED, LOCALE_EPG_SAVING },
{ NEUTRINO_ICON_BUTTON_GREEN, LOCALE_IMDB_INFO }, { NEUTRINO_ICON_BUTTON_GREEN, LOCALE_IMDB_INFO },
{ NEUTRINO_ICON_BUTTON_0, LOCALE_TMDB_INFO } { NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_TMDB_INFO }
} }
}; };
@@ -1626,6 +1645,9 @@ void CEpgData::showTimerEventBar (bool pshow, bool adzap, bool mp_info)
} }
// check imdb button
if (g_settings.omdb_enabled)
{
if (imdb_active) if (imdb_active)
{ {
EpgButtons[UsedButtons][1].button = (imdb->hasPoster()) ? NEUTRINO_ICON_BUTTON_GREEN : NEUTRINO_ICON_BUTTON_DUMMY_SMALL; EpgButtons[UsedButtons][1].button = (imdb->hasPoster()) ? NEUTRINO_ICON_BUTTON_GREEN : NEUTRINO_ICON_BUTTON_DUMMY_SMALL;
@@ -1636,35 +1658,32 @@ void CEpgData::showTimerEventBar (bool pshow, bool adzap, bool mp_info)
EpgButtons[UsedButtons][1].button = NEUTRINO_ICON_BUTTON_GREEN; EpgButtons[UsedButtons][1].button = NEUTRINO_ICON_BUTTON_GREEN;
EpgButtons[UsedButtons][1].locale = LOCALE_IMDB_INFO; EpgButtons[UsedButtons][1].locale = LOCALE_IMDB_INFO;
} }
}
else
EpgButtons[UsedButtons][1].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL;
// check tmdb button
if (g_settings.tmdb_enabled)
EpgButtons[UsedButtons][2].button = NEUTRINO_ICON_BUTTON_YELLOW;
else
EpgButtons[UsedButtons][2].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL;
if (mp_info) if (mp_info)
{ {
// check tmdb button
if (g_settings.tmdb_enabled)
EpgButtons[MP_BUTTONS][2].button = NEUTRINO_ICON_BUTTON_0;
else
EpgButtons[MP_BUTTONS][2].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL;
::paintButtons(x, y, w, MaxButtons, EpgButtons[MP_BUTTONS], w, h); ::paintButtons(x, y, w, MaxButtons, EpgButtons[MP_BUTTONS], w, h);
} }
else else
{ {
// check followscreenings button // check followscreenings button
if (has_follow_screenings && !call_fromfollowlist) if (has_follow_screenings && !call_fromfollowlist)
EpgButtons[TV_BUTTONS][3].button = NEUTRINO_ICON_BUTTON_BLUE;
else
EpgButtons[TV_BUTTONS][3].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL;
// check tmdb button
if (g_settings.tmdb_enabled)
EpgButtons[TV_BUTTONS][4].button = NEUTRINO_ICON_BUTTON_0; EpgButtons[TV_BUTTONS][4].button = NEUTRINO_ICON_BUTTON_0;
else else
EpgButtons[TV_BUTTONS][4].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL; EpgButtons[TV_BUTTONS][4].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL;
if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF)
::paintButtons(x, y, w, MaxButtons, EpgButtons[TV_BUTTONS], w, h, "", false, COL_MENUFOOT_TEXT, adzap ? adzap_button.c_str() : NULL, 2); ::paintButtons(x, y, w, MaxButtons, EpgButtons[TV_BUTTONS], w, h, "", false, COL_MENUFOOT_TEXT, adzap ? adzap_button.c_str() : NULL, 4);
else // don't show recording button else // don't show recording button
::paintButtons(x, y, w, MaxButtons, &EpgButtons[TV_BUTTONS][1], w, h, "", false, COL_MENUFOOT_TEXT, adzap ? adzap_button.c_str() : NULL, 1); ::paintButtons(x, y, w, MaxButtons, &EpgButtons[TV_BUTTONS][1], w, h, "", false, COL_MENUFOOT_TEXT, adzap ? adzap_button.c_str() : NULL, 3);
} }
} }