From 193c49d55e1c694d2a19134e1dad6fb0426bf2da Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Tue, 27 May 2014 17:21:42 +0200 Subject: [PATCH] Revert "styling for EPG view/eventlist (patch from Benny, thanks!)" This reverts commit 5809315cc59d3436ad62bbeacb3c0e11446a10d9 because this commit seems to need some more affection. --- src/gui/epgview.cpp | 20 +++++++++++++------- src/gui/eventlist.cpp | 20 +++++++++++--------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index ee17b8e4b..9f4e9e35d 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -180,7 +180,7 @@ void CEpgData::processTextToArray(std::string text, int screening) // UTF-8 // check the wordwidth - add to this line if size ok int aktWordWidth = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getRenderWidth(aktWord, true); - if ((aktWordWidth+aktWidth)<(ox - 20 - 15)) + if ((aktWordWidth+aktWidth)<(ox- 20- 15)) {//space ok, add aktWidth += aktWordWidth; aktLine += aktWord; @@ -228,10 +228,10 @@ void CEpgData::showText( int startPos, int ypos ) 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 + 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 + 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) @@ -245,7 +245,7 @@ void CEpgData::showText( int startPos, int ypos ) offset += max_wday_w; break; case 3: - offset += max_mon_w/2; + offset += max_mon_w; break; default: offset += digi; @@ -1111,9 +1111,15 @@ int CEpgData::FollowScreenings (const t_channel_id /*channel_id*/, const std::st tmStartZeit = localtime(&(e->startTime)); screening_dates = g_Locale->getText(CLocaleManager::getWeekday(tmStartZeit)); - screening_dates += strftime(", %d", tmStartZeit); + screening_dates += '.'; + + strftime(tmpstr, sizeof(tmpstr), " %d.", tmStartZeit ); + screening_dates += tmpstr; + screening_dates += g_Locale->getText(CLocaleManager::getMonth(tmStartZeit)); - screening_dates += strftime(", %R", tmStartZeit); + + strftime(tmpstr, sizeof(tmpstr), ". %H:%M", tmStartZeit ); + screening_dates += tmpstr; if (e->startTime <= tmp_curent_zeit) flag = 2; else diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 06e755c74..8cca0c519 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -749,11 +749,16 @@ void CNeutrinoEventList::paintItem(unsigned int pos, t_channel_id channel_idI) datetime1_str = g_Locale->getText(CLocaleManager::getWeekday(tmStartZeit)); - datetime1_str += strftime(", %H:%M,", tmStartZeit ); - datetime1_str += strftime(" %d", tmStartZeit ); - datetime1_str += g_Locale->getText(CLocaleManager::getMonth(tmStartZeit)); - //datetime2_str += '.'; + strftime(tmpstr, sizeof(tmpstr), ". %H:%M, ", tmStartZeit ); + datetime1_str += tmpstr; + + strftime(tmpstr, sizeof(tmpstr), " %d. ", tmStartZeit ); + datetime2_str = tmpstr; + + datetime2_str += g_Locale->getText(CLocaleManager::getMonth(tmStartZeit)); + + datetime2_str += '.'; if ( m_showChannel ) // show the channel if we made a event search only (which could be made through all channels ). { @@ -767,11 +772,8 @@ void CNeutrinoEventList::paintItem(unsigned int pos, t_channel_id channel_idI) } // 1st line - int fwidth1a=g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->getRenderWidth(datetime1_str); - //int fwidth1b=g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->getRenderWidth(datetime2_str); - - g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->RenderString(x+5, ypos+ fheight1+3, fwidth1a, datetime1_str, color, 0, true); // UTF-8 - //g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->RenderString(x+5+fwidth1a/2, ypos+ fheight1+3, fwidth1b, datetime2_str, color, 0, true); // UTF-8 + g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->RenderString(x+5, ypos+ fheight1+3, fwidth1+5, datetime1_str, color, 0, true); // UTF-8 + g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_DATETIME]->RenderString(x+5+fwidth1, ypos+ fheight1+3, width-fwidth1-10- 20, datetime2_str, color, 0, true); // UTF-8 int seit = ( evtlist[curpos].startTime - time(NULL) ) / 60; if ( (seit> 0) && (seit<100) && (duration_str.length()!=0) )