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

src/gui/epgview.cpp: fixes2 from tuxbox, THX Gaucho316

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d23bdf7bb8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-08 (Mon, 08 Apr 2013)

Origin message was:
------------------
src/gui/epgview.cpp: fixes2 from tuxbox, THX Gaucho316

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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2013-04-08 20:41:36 +02:00
parent e909d5607a
commit ffc07dc953
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/epgview.cpp
View File

@@ -741,7 +741,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
case CRCInput::RC_up: case CRCInput::RC_up:
showPos -= scrollCount; showPos -= scrollCount;
if (showPos<0) if (showPos<0)
showPos = 0; showPos=0;
else else
showText(showPos, sy + toph); showText(showPos, sy + toph);
break; break;
@@ -765,7 +765,13 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
strcpy(recDir, b.getSelectedFile()->Name.c_str()); strcpy(recDir, b.getSelectedFile()->Name.c_str());
} else } else
doRecord = false; doRecord = false;
if (!bigFonts && g_settings.bigFonts) {
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->getSize() * BIG_FONT_FAKTOR));
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getSize() * BIG_FONT_FAKTOR));
}
bigFonts = g_settings.bigFonts;
show(channel_id,epgData.eventID,&epgData.epg_times.startzeit,false); show(channel_id,epgData.eventID,&epgData.epg_times.startzeit,false);
showPos=0;
} }
else if (g_settings.recording_choose_direct_rec_dir == 1) else if (g_settings.recording_choose_direct_rec_dir == 1)
{ {
@@ -775,7 +781,13 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
{ {
hide(); hide();
recDirs.exec(NULL,""); recDirs.exec(NULL,"");
if (!bigFonts && g_settings.bigFonts) {
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->getSize() * BIG_FONT_FAKTOR));
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getSize() * BIG_FONT_FAKTOR));
}
bigFonts = g_settings.bigFonts;
show(channel_id,epgData.eventID,&epgData.epg_times.startzeit,false); show(channel_id,epgData.eventID,&epgData.epg_times.startzeit,false);
showPos=0;
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]);
} else } else
{ {
@@ -857,6 +869,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
} }
bigFonts = g_settings.bigFonts; bigFonts = g_settings.bigFonts;
show(channel_id,tmp_eID,&tmp_sZeit,false); show(channel_id,tmp_eID,&tmp_sZeit,false);
showPos=0;
} }
break; break;
} }