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

epgview: try to fix wrong buttonbar in imdb view

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6390b616be
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-11 (Thu, 11 Aug 2016)

Origin message was:
------------------
- epgview: try to fix wrong buttonbar in imdb view

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-11 00:10:21 +02:00
parent d70425b838
commit d29f46a44a
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/epgview.cpp
View File

@@ -1201,7 +1201,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
//NI //NI
if (imdb_active) { if (imdb_active) {
imdb_active = false; imdb_active = false;
showTimerEventBar (true); //show buttons showTimerEventBar(true, !mp_info && isCurrentEPG(channel_id), mp_info); //show buttons
epgText = epgText_saved; epgText = epgText_saved;
textCount = epgText.size(); textCount = epgText.size();
} }
@@ -1248,17 +1248,18 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
if (!imdb_active) if (!imdb_active)
{ {
//show IMDb info //show IMDb info
imdb_active = true;
showIMDb(true); //show splashscreen only showIMDb(true); //show splashscreen only
imdb->getIMDb(epgData.title); imdb->getIMDb(epgData.title);
showIMDb(); showIMDb();
showTimerEventBar (true); //show buttons showTimerEventBar(true, !mp_info && isCurrentEPG(channel_id), mp_info); //show buttons
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]);
} }
else else
{ {
imdb_active = false;
CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, LOCALE_IMDB_INFO_SAVE); CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, LOCALE_IMDB_INFO_SAVE);
hintBox->paint(); hintBox->paint();
imdb_active = false;
std::string picname; std::string picname;
if (mp_info) if (mp_info)
@@ -1275,7 +1276,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
sleep(2); sleep(2);
hintBox->hide(); hintBox->hide();
showTimerEventBar (true); //show buttons showTimerEventBar(true, !mp_info && isCurrentEPG(channel_id), mp_info); //show buttons
} }
break; break;
} }
@@ -1642,7 +1643,7 @@ void CEpgData::showTimerEventBar (bool pshow, bool adzap, bool mp_info)
} }
bool tmdb = g_settings.tmdb_enabled; bool tmdb = g_settings.tmdb_enabled;
bool fscr = (has_follow_screenings && !call_fromfollowlist); bool fscr = (has_follow_screenings && !call_fromfollowlist);
EpgButtons[fscr ? 0 : 1][1].locale = imdb_active ? LOCALE_IMDB_INFO_SAVE : LOCALE_IMDB_INFO; //NI EpgButtons[mp_info ? 2 : (fscr ? 0 : 1)][1].locale = imdb_active ? LOCALE_IMDB_INFO_SAVE : LOCALE_IMDB_INFO; //NI
if (mp_info) if (mp_info)
::paintButtons(x, y, w, tmdb ? 3 : 2, EpgButtons[2], w, h); //NI ::paintButtons(x, y, w, tmdb ? 3 : 2, EpgButtons[2], w, h); //NI
else else
@@ -1678,8 +1679,6 @@ int CEpgData::showIMDb(bool splash)
if(((title.find("IMDb: URL (Seite) nicht gefunden")) != std::string::npos)) if(((title.find("IMDb: URL (Seite) nicht gefunden")) != std::string::npos))
return 1; return 1;
imdb_active = true;
// clear epg array // clear epg array
epgText_saved = epgText; epgText_saved = epgText;
epgText.clear(); epgText.clear();