[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-89-gcf53e3b
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-89-gcf53e3b
|
From: Thilo G. <tux...@ne...> - 2013-04-06 19:03:31
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via cf53e3b3fd4f361346e0d57cabea8cd0ffbb9622 (commit)
via b59f8af6b12e54f8f2bd8e8c1b7b4257b335c44f (commit)
via 8311bc1c1ad934ac0833676928d3426046e935ee (commit)
via 1eaeff6d050fd4c6b759d5f71fb844fcafe1261b (commit)
from 3f027bea78d52a62045a2e356c8c26e67a57660b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cf53e3b3fd4f361346e0d57cabea8cd0ffbb9622
Author: Jacek Jendrzej <cra...@go...>
Date: Fri Apr 5 23:05:42 2013 +0200
neutrino: show epginfo from followlist also
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/epgview.cpp b/tuxbox/neutrino/src/gui/epgview.cpp
index eacc09f..dc18466 100644
--- a/tuxbox/neutrino/src/gui/epgview.cpp
+++ b/tuxbox/neutrino/src/gui/epgview.cpp
@@ -447,12 +447,12 @@ static bool sortByDateTime (const CChannelEvent& a, const CChannelEvent& b)
return a.startTime< b.startTime;
}
-int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_t* a_startzeit, bool doLoop )
+int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_t* a_startzeit, bool doLoop, bool callFromfollowlist )
{
int res = menu_return::RETURN_REPAINT;
static unsigned long long id;
static time_t startzeit;
-
+ call_fromfollowlist = callFromfollowlist;
if(a_startzeit)
startzeit=*a_startzeit;
id=a_id;
@@ -649,13 +649,13 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
}
GetPrevNextEPGData( epgData.eventID, &epgData.epg_times.startzeit );
- if (prev_id != 0)
+ if ((prev_id != 0) && !call_fromfollowlist)
{
frameBuffer->paintBoxRel(sx+ 5, sy+ oy- botboxheight+ 4, botboxheight- 8, botboxheight- 8, COL_MENUCONTENT_PLUS_3);
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->RenderString(sx+ 10, sy+ oy- 3, widthr, "<", COL_MENUCONTENT + 3);
}
- if (next_id != 0)
+ if ((next_id != 0) && !call_fromfollowlist)
{
frameBuffer->paintBoxRel(sx+ ox- botboxheight+ 8- 5, sy+ oy- botboxheight+ 4, botboxheight- 8, botboxheight- 8, COL_MENUCONTENT_PLUS_3);
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->RenderString(sx+ ox- botboxheight+ 8, sy+ oy- 3, widthr, ">", COL_MENUCONTENT + 3);
@@ -681,7 +681,7 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
switch ( msg )
{
case CRCInput::RC_left:
- if (prev_id != 0)
+ if ((prev_id != 0) && !call_fromfollowlist)
{
frameBuffer->paintBoxRel(sx+ 5, sy+ oy- botboxheight+ 4, botboxheight- 8, botboxheight- 8, COL_MENUCONTENT_PLUS_1);
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->RenderString(sx+ 10, sy+ oy- 3, widthr, "<", COL_MENUCONTENT + 1);
@@ -692,7 +692,7 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
break;
case CRCInput::RC_right:
- if (next_id != 0)
+ if ((next_id != 0) && !call_fromfollowlist)
{
frameBuffer->paintBoxRel(sx+ ox- botboxheight+ 8- 5, sy+ oy- botboxheight+ 4, botboxheight- 8, botboxheight- 8, COL_MENUCONTENT_PLUS_1);
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->RenderString(sx+ ox- botboxheight+ 8, sy+ oy- 3, widthr, ">", COL_MENUCONTENT + 1);
@@ -733,7 +733,12 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
CRecDirChooser recDirs(LOCALE_TIMERLIST_RECORDING_DIR, NEUTRINO_ICON_TIMER, NULL, &recDir);
hide();
recDirs.exec(NULL,"");
- show(channel_id,epgData.eventID,&epgData.epg_times.startzeit,false);
+ if (!bigFonts && g_settings.bigFonts) {
+ g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->setSize(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->getSize() * BIG_FONT_FAKTOR / 10);
+ g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getSize() * BIG_FONT_FAKTOR / 10);
+ }
+ bigFonts = g_settings.bigFonts;
+ show(channel_id, id, &startzeit, false, call_fromfollowlist);
recDir = recDirs.get_selected_dir();
}
@@ -792,9 +797,11 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
// more screenings
case CRCInput::RC_blue:
- if (!followlist.empty())
+ if (!followlist.empty() && !call_fromfollowlist)
{
hide();
+ time_t tmp_sZeit = epgData.epg_times.startzeit;
+ unsigned long long tmp_eID = epgData.eventID;
EventList* eventList = new EventList();
res = eventList->exec(channel_id, g_Locale->getText(LOCALE_EPGVIEWER_MORE_SCREENINGS_SHORT), followlist); // UTF-8
delete eventList;
@@ -807,7 +814,7 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getSize() * BIG_FONT_FAKTOR / 10);
}
bigFonts = g_settings.bigFonts;
- show(channel_id, id, &startzeit, false);
+ show(channel_id, tmp_eID, &tmp_sZeit, false);
showPos = 0;
}
}
@@ -825,7 +832,7 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getSize() * 10 / BIG_FONT_FAKTOR);
}
g_settings.bigFonts = bigFonts;
- show(channel_id, id, &startzeit, false);
+ show(channel_id, id, &startzeit, false, call_fromfollowlist);
showPos=0;
break;
@@ -1018,7 +1025,7 @@ void CEpgData::showTimerEventBar(bool _show)
::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, sx + 8 + ButtonWidth, by, ButtonWidth, 1, &epgviewButtons[1]);
// Button: more screenings
- if (!followlist.empty())
+ if (!followlist.empty() && !call_fromfollowlist)
::paintButtons(frameBuffer, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL], g_Locale, sx + 8 + 2 * ButtonWidth, by, ButtonWidth, 1, &epgviewButtons[2], 2 * ButtonWidth - 2 * (ICON_LARGE_WIDTH + 2) - 4);
}
diff --git a/tuxbox/neutrino/src/gui/epgview.h b/tuxbox/neutrino/src/gui/epgview.h
index db206fd..5d8872e 100644
--- a/tuxbox/neutrino/src/gui/epgview.h
+++ b/tuxbox/neutrino/src/gui/epgview.h
@@ -61,6 +61,7 @@ class CEpgData
std::string epg_start;
std::string epg_end;
int epg_done;
+ bool call_fromfollowlist;
unsigned long long prev_id;
time_t prev_zeit;
@@ -90,7 +91,7 @@ class CEpgData
CEpgData();
void start( );
- int show(const t_channel_id channel_id, unsigned long long id = 0, time_t* startzeit = NULL, bool doLoop = true );
+ int show(const t_channel_id channel_id, unsigned long long id = 0, time_t* startzeit = NULL, bool doLoop = true, bool callFromfollowlist = false );
void hide();
};
diff --git a/tuxbox/neutrino/src/gui/eventlist.cpp b/tuxbox/neutrino/src/gui/eventlist.cpp
index 3e4161e..dcd87c0 100644
--- a/tuxbox/neutrino/src/gui/eventlist.cpp
+++ b/tuxbox/neutrino/src/gui/eventlist.cpp
@@ -553,12 +553,12 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
#endif
else if (msg==CRCInput::RC_help || msg==CRCInput::RC_right || msg==CRCInput::RC_ok)
{
- if (!showfollow && evtlist[selected].eventID != 0)
+ if (evtlist[selected].eventID != 0)
{
hide();
// res = g_EpgData->show(channel_id, evtlist[selected].eventID, &evtlist[selected].startTime);
- res = g_EpgData->show(evtlist[selected].get_channel_id(), evtlist[selected].eventID, &evtlist[selected].startTime);
+ res = g_EpgData->show(evtlist[selected].get_channel_id(), evtlist[selected].eventID, &evtlist[selected].startTime, true, showfollow);
if ( res == menu_return::RETURN_EXIT_ALL )
{
loop = false;
@@ -743,7 +743,7 @@ void EventList::paint()
liststart = (selected/listmaxshow)*listmaxshow;
- if (!showfollow && evtlist[0].eventID != 0)
+ if (evtlist[0].eventID != 0)
{
int iconw = 0, iconh = 0;
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_HELP, &iconw, &iconh);
commit b59f8af6b12e54f8f2bd8e8c1b7b4257b335c44f
Author: Jacek Jendrzej <cra...@go...>
Date: Fri Apr 5 21:10:59 2013 +0200
neutrino: epgview: osd fix dates, tab for screening
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/epgview.cpp b/tuxbox/neutrino/src/gui/epgview.cpp
index aff3f07..eacc09f 100644
--- a/tuxbox/neutrino/src/gui/epgview.cpp
+++ b/tuxbox/neutrino/src/gui/epgview.cpp
@@ -143,7 +143,7 @@ void CEpgData::start()
toph = topboxheight;
}
-void CEpgData::addTextToArray(const std::string & text) // UTF-8
+void CEpgData::addTextToArray(const std::string & text, int screening) // UTF-8
{
//printf("line: >%s<\n", text.c_str() );
if (text==" ")
@@ -151,17 +151,17 @@ void CEpgData::addTextToArray(const std::string & text) // UTF-8
emptyLineCount ++;
if(emptyLineCount<2)
{
- epgText.push_back(text);
+ epgText.push_back(epg_pair(text, screening));
}
}
else
{
emptyLineCount = 0;
- epgText.push_back(text);
+ epgText.push_back(epg_pair(text, screening));
}
}
-void CEpgData::processTextToArray(std::string text) // UTF-8
+void CEpgData::processTextToArray(std::string text, int screening) // UTF-8
{
std::string aktLine = "";
std::string aktWord = "";
@@ -181,14 +181,14 @@ void CEpgData::processTextToArray(std::string text) // UTF-8
// check the wordwidth - add to this line if size ok
int aktWordWidth = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getRenderWidth(aktWord);
- if((aktWordWidth+aktWidth)<(ox- 20- 15))
+ if((aktWordWidth+aktWidth)<(ox- 10- 15))
{//space ok, add
aktWidth += aktWordWidth;
aktLine += aktWord;
if(*text_=='\n')
{ //enter-handler
- addTextToArray( aktLine );
+ addTextToArray( aktLine, screening);
aktLine = "";
aktWidth= 0;
}
@@ -196,7 +196,7 @@ void CEpgData::processTextToArray(std::string text) // UTF-8
}
else
{//new line needed
- addTextToArray( aktLine );
+ addTextToArray( aktLine, screening);
aktLine = aktWord;
aktWidth = aktWordWidth;
aktWord = "";
@@ -213,7 +213,7 @@ void CEpgData::processTextToArray(std::string text) // UTF-8
text_++;
}
//add the rest
- addTextToArray( aktLine + aktWord );
+ addTextToArray( aktLine + aktWord, screening );
}
void CEpgData::showText( int startPos, int ypos )
@@ -224,15 +224,45 @@ void CEpgData::showText( int startPos, int ypos )
int textSize = epgText.size();
int y=ypos;
-
+ const char tok = ' ';
+ int offset = 0, count = 0;
+ int max_mon_w = 0, max_wday_w = 0;
+ int digi = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getRenderWidth("29..");
+ for(int i = 0; i < 12;i++){
+ max_mon_w = std::max(max_mon_w, g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getRenderWidth(std::string(g_Locale->getText(CLocaleManager::getMonth(i))) + ".", true)); // UTF-8
+ if(i > 6)
+ continue;
+ max_wday_w = std::max(max_wday_w, g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getRenderWidth(std::string(g_Locale->getText(CLocaleManager::getWeekday(i))) + ".", true)); // UTF-8
+ }
frameBuffer->paintBoxRel(sx, y, ox- 15, sb, COL_MENUCONTENT_PLUS_0); // background of the text box
-
for(int i = startPos; i < textSize && i < startPos + medlinecount; i++, y += medlineheight)
{
- if ( i< info1_lines )
- g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->RenderString(sx+10, y+medlineheight, ox- 15- 15, epgText[i], COL_MENUCONTENT, 0, true); // UTF-8
- else
- g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->RenderString(sx+10, y+medlineheight, ox- 15- 15, epgText[i], COL_MENUCONTENT, 0, true); // UTF-8
+ if(epgText[i].second){
+ std::string::size_type pos1 = epgText[i].first.find_first_not_of(tok, 0);
+ std::string::size_type pos2 = epgText[i].first.find_first_of(tok, pos1);
+ while( pos2 != string::npos || pos1 != string::npos ){
+ switch(count){
+ case 1:
+ offset += max_wday_w;
+ break;
+ case 3:
+ offset += max_mon_w;
+ break;
+ default:
+ offset += digi;
+ break;
+ }
+ g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->RenderString(sx+10+offset, y+medlineheight, ox- 15- 15, epgText[i].first.substr(pos1, pos2 - pos1), (epgText[i].second==2)? COL_MENUCONTENTINACTIVE: COL_MENUCONTENT, 0, true); // UTF-8
+ count++;
+ pos1 = epgText[i].first.find_first_not_of(tok, pos2);
+ pos2 = epgText[i].first.find_first_of(tok, pos1);
+ }
+ offset = 0;
+ count = 0;
+ }
+ else{
+ g_Font[( i< info1_lines ) ?SNeutrinoSettings::FONT_TYPE_EPG_INFO1:SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->RenderString(sx+10, y+medlineheight, ox- 15- 15, epgText[i].first, COL_MENUCONTENT, 0, true); // UTF-8
+ }
}
int sbc = ((textSize - 1)/ medlinecount) + 1;
@@ -567,7 +597,7 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
if (hasFollowScreenings(channel_id, epgData.title, epgData.epg_times.startzeit)) {
processTextToArray(""); // UTF-8
processTextToArray(std::string(g_Locale->getText(LOCALE_EPGVIEWER_MORE_SCREENINGS)) + ':'); // UTF-8
- FollowScreenings();
+ FollowScreenings(epgData.epg_times.startzeit);
}
//show the epg
@@ -861,7 +891,7 @@ void CEpgData::GetEPGData(const t_channel_id channel_id, unsigned long long id,
}
struct tm *pStartZeit = localtime(&(epgData.epg_times).startzeit);
- char temp[11];
+ char temp[11] = {0};
strftime( temp, sizeof(temp), "%d.%m.%Y", pStartZeit);
epg_date = g_Locale->getText(CLocaleManager::getWeekday(pStartZeit));
epg_date += ". ";
@@ -919,12 +949,13 @@ void CEpgData::GetPrevNextEPGData( unsigned long long id, time_t* startzeit )
// -- 2002-05-03 rasc
//
-void CEpgData::FollowScreenings()
+void CEpgData::FollowScreenings(const time_t startzeit)
{
- CChannelEventList::iterator e;
- struct tm *tmStartZeit;
- std::string screening_dates,screening_nodual;
- char tmpstr[256];
+ CChannelEventList::iterator e;
+ struct tm *tmStartZeit;
+ std::string screening_dates, screening_nodual;
+ int flag = 1;
+ char tmpstr[256] = {0};
screening_dates = screening_nodual = "";
@@ -932,22 +963,22 @@ void CEpgData::FollowScreenings()
{
tmStartZeit = localtime(&(e->startTime));
- screening_dates = " ";
-
- screening_dates += g_Locale->getText(CLocaleManager::getWeekday(tmStartZeit));
+ screening_dates = g_Locale->getText(CLocaleManager::getWeekday(tmStartZeit));
screening_dates += '.';
- strftime(tmpstr, sizeof(tmpstr), " %d.", tmStartZeit );
+ strftime(tmpstr, sizeof(tmpstr), " %d.", tmStartZeit );
screening_dates += tmpstr;
screening_dates += g_Locale->getText(CLocaleManager::getMonth(tmStartZeit));
- strftime(tmpstr, sizeof(tmpstr), ". %H:%M ", tmStartZeit );
+ strftime(tmpstr, sizeof(tmpstr), ". %H:%M ", tmStartZeit );
screening_dates += tmpstr;
+ flag = (e->startTime <= startzeit) ? 2 : 1;
+
if (screening_dates != screening_nodual){
screening_nodual=screening_dates;
- processTextToArray(screening_dates ); // UTF-8
+ processTextToArray(screening_dates, flag ); // UTF-8
}
}
}
diff --git a/tuxbox/neutrino/src/gui/epgview.h b/tuxbox/neutrino/src/gui/epgview.h
index 619d5f3..db206fd 100644
--- a/tuxbox/neutrino/src/gui/epgview.h
+++ b/tuxbox/neutrino/src/gui/epgview.h
@@ -70,7 +70,8 @@ class CEpgData
int ox, oy, sx, sy, toph, sb;
int emptyLineCount, info1_lines;
int textCount;
- std::vector<std::string> epgText;
+ typedef std::pair<std::string,int> epg_pair;
+ std::vector<epg_pair> epgText;
int topheight,topboxheight;
int botheight,botboxheight;
int medlineheight,medlinecount;
@@ -78,11 +79,11 @@ class CEpgData
void GetEPGData(const t_channel_id channel_id, unsigned long long id, time_t* startzeit );
void GetPrevNextEPGData( unsigned long long id, time_t* startzeit );
- void addTextToArray( const std::string & text );
- void processTextToArray(std::string text);
+ void addTextToArray( const std::string & text, int screening );
+ void processTextToArray(std::string text, int screening = 0);
void showText( int startPos, int ypos );
bool hasFollowScreenings(const t_channel_id channel_id, const std::string & title, const time_t startzeit);
- void FollowScreenings();
+ void FollowScreenings(const time_t startzeit);
void showTimerEventBar(bool show);
public:
diff --git a/tuxbox/neutrino/src/system/localize.cpp b/tuxbox/neutrino/src/system/localize.cpp
index d63462d..5ab8489 100644
--- a/tuxbox/neutrino/src/system/localize.cpp
+++ b/tuxbox/neutrino/src/system/localize.cpp
@@ -330,8 +330,23 @@ neutrino_locale_t CLocaleManager::getMonth(const struct tm * struct_tm_p)
return locale_month[struct_tm_p->tm_mon];
}
+neutrino_locale_t CLocaleManager::getMonth(const int mon)
+{
+ if(mon > -1 && mon < 12)
+ return locale_month[mon];
+ else
+ return LOCALE_MESSAGEBOX_ERROR;
+}
+
neutrino_locale_t CLocaleManager::getWeekday(const struct tm * struct_tm_p)
{
return locale_weekday[struct_tm_p->tm_wday];
}
+neutrino_locale_t CLocaleManager::getWeekday(const int wday)
+{
+ if(wday > -1 && wday < 7)
+ return locale_weekday[wday];
+ else
+ return LOCALE_MESSAGEBOX_ERROR;
+}
diff --git a/tuxbox/neutrino/src/system/localize.h b/tuxbox/neutrino/src/system/localize.h
index 1a4098f..e6a0837 100644
--- a/tuxbox/neutrino/src/system/localize.h
+++ b/tuxbox/neutrino/src/system/localize.h
@@ -62,6 +62,8 @@ class CLocaleManager
const char * getText(const neutrino_locale_t keyName) const;
static neutrino_locale_t getMonth (const struct tm * struct_tm_p);
+ static neutrino_locale_t getMonth (const int mon);
static neutrino_locale_t getWeekday(const struct tm * struct_tm_p);
+ static neutrino_locale_t getWeekday(const int wday);
};
#endif
commit 8311bc1c1ad934ac0833676928d3426046e935ee
Author: Christian Schuett <Gau...@ho...>
Date: Thu Apr 4 20:01:17 2013 +0200
Neutrino: use big font setting also in movieinfo window
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/widget/msgbox.cpp b/tuxbox/neutrino/src/gui/widget/msgbox.cpp
index 2c97da5..910f620 100644
--- a/tuxbox/neutrino/src/gui/widget/msgbox.cpp
+++ b/tuxbox/neutrino/src/gui/widget/msgbox.cpp
@@ -861,10 +861,16 @@ int ShowMsg2UTF( const char * const Title,
CBox position(x, y, width, height);
int oldfontsize = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getSize();
- bool bigfonts = false;
+ bool bigfonts = !g_settings.bigFonts;
+
int ret, res;
do {
- //TRACE("\r\n->ShowTextUTF %s\r\n",Text);
+ bigfonts = !bigfonts;
+ if (bigfonts)
+ g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize(oldfontsize * 15 / 10);
+ else
+ g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize(oldfontsize);
+
CMsgBox* msgBox = new CMsgBox( Text,
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2],
mode,
@@ -879,15 +885,11 @@ int ShowMsg2UTF( const char * const Title,
res = msgBox->result();
delete msgBox;
- bigfonts = !bigfonts;
- if (bigfonts)
- g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize(oldfontsize * 15 / 10);
- else
- g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize(oldfontsize);
} while (ret == -1);
if (bigfonts)
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize(oldfontsize);
-
+ g_settings.bigFonts = bigfonts;
+
return res;
}
commit 1eaeff6d050fd4c6b759d5f71fb844fcafe1261b
Author: GetAway <get...@t-...>
Date: Thu Apr 4 16:10:06 2013 +0200
neutrino: calculate centering of channellist including itemline
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/src/gui/channellist.cpp b/tuxbox/neutrino/src/gui/channellist.cpp
index 3f2013e..517f883 100644
--- a/tuxbox/neutrino/src/gui/channellist.cpp
+++ b/tuxbox/neutrino/src/gui/channellist.cpp
@@ -165,7 +165,7 @@ void CChannelList::calcSize()
listmaxshow = (height - theight - footerHeight -0)/fheight;
height = theight + footerHeight + listmaxshow * fheight;
- x = getScreenStartX(full_width);
+ x = getScreenStartX(full_width - ConnectLineBox_Width);
y = getScreenStartY(height + info_height);
infozone_width = full_width - width;
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/src/gui/channellist.cpp | 2 +-
tuxbox/neutrino/src/gui/epgview.cpp | 114 +++++++++++++++++++----------
tuxbox/neutrino/src/gui/epgview.h | 12 ++-
tuxbox/neutrino/src/gui/eventlist.cpp | 6 +-
tuxbox/neutrino/src/gui/widget/msgbox.cpp | 18 +++--
tuxbox/neutrino/src/system/localize.cpp | 15 ++++
tuxbox/neutrino/src/system/localize.h | 2 +
7 files changed, 114 insertions(+), 55 deletions(-)
--
Tuxbox-GIT: apps
|
