diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 980b6acec..ace7a977d 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -873,66 +873,18 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start showText(showPos, sy + toph); // small bottom box with left/right navigation - if (!Bottombox){ - Bottombox = new CComponentsFrmChain(sx, sy+oy-botboxheight, ox, botboxheight); - Bottombox->setColorBody(COL_MENUFOOT_PLUS_0); - Bottombox->setCornerType(CORNER_NONE); - Bottombox->enableColBodyGradient(g_settings.theme.infobar_gradient_bottom,COL_MENUFOOT_PLUS_0,g_settings.theme.infobar_gradient_bottom_direction); - Bottombox->set2ndColor(COL_MENUCONTENT_PLUS_0); - } + if (!Bottombox) + Bottombox = new CNaviBar(sx, sy+oy-botboxheight, ox, botboxheight); if (!mp_info){ std::string fromto = epg_start + " - " + epg_end; - int x_off = OFFSET_INNER_MID; - int mid_width = ox * 40 / 100; // 40% - int side_width = ((ox - mid_width) / 2) - (2 * x_off); GetPrevNextEPGData(epgData.eventID, &epgData.epg_times.startzeit); - // init left arrow - if (!lpic){ - lpic = new CComponentsPictureScalable(x_off,CC_CENTERED,NEUTRINO_ICON_BUTTON_LEFT); - lpic->doPaintBg(false); - Bottombox->addCCItem(lpic); - lpic->enableSaveBg(); - } - lpic->allowPaint(prev_id && !call_fromfollowlist); - - // init right arrow - if (!rpic){ - rpic = new CComponentsPictureScalable(0,CC_CENTERED,NEUTRINO_ICON_BUTTON_RIGHT); - - rpic->doPaintBg(false); - Bottombox->addCCItem(rpic); - rpic->enableSaveBg(); - int x_pos = ox - rpic->getWidth() - x_off; - rpic->setXPos(x_pos); - } - rpic->allowPaint(next_id && !call_fromfollowlist); - - // init text left "from to" - if (!lText){ - lText = new CComponentsText(x_off + lpic->getWidth() + x_off, CC_CENTERED, side_width, toph, "", CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE], CComponentsText::FONT_STYLE_REGULAR, NULL, CC_SHADOW_OFF, COL_MENUHEAD_TEXT); - lText->doPaintBg(false); - Bottombox->addCCItem(lText); - lText->enableSaveBg(); - } - lText->setText(fromto, CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE], COL_MENUHEAD_TEXT, CComponentsText::FONT_STYLE_REGULAR); - - // init text right "follow" - if (!rText){ - rText = new CComponentsText(0, CC_CENTERED, side_width, toph, "", CTextBox::NO_AUTO_LINEBREAK | CTextBox::RIGHT, g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE], CComponentsText::FONT_STYLE_REGULAR, Bottombox, CC_SHADOW_OFF, COL_MENUHEAD_TEXT); - rText->doPaintBg(false); - rText->enableSaveBg(); - } - rText->setText(epg_date, CTextBox::NO_AUTO_LINEBREAK | CTextBox::RIGHT, g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]); - rText->setXPos(rpic->getXPos() - x_off - rText->getWidth()); + Bottombox->enableArrows(prev_id && !call_fromfollowlist, next_id && !call_fromfollowlist); + Bottombox->setText(fromto, epg_date); } - //ensure clean background - if(Bottombox->isPainted()) - Bottombox->hideCCItems(); - //paint bottombox contents Bottombox->paint(false); showProgressBar(); diff --git a/src/gui/epgview.h b/src/gui/epgview.h index 44de63c05..d873b82de 100644 --- a/src/gui/epgview.h +++ b/src/gui/epgview.h @@ -38,7 +38,7 @@ #include #include "widget/menue.h" - +#include "widget/navibar.h" #include #include @@ -51,7 +51,7 @@ class CEpgData CChannelEventList followlist; CEPGData epgData; CComponentsHeader *header; - CComponentsFrmChain *Bottombox; + CNaviBar *Bottombox; CComponentsPictureScalable *lpic, *rpic; CComponentsText *lText, *rText; CProgressBar *pb; diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index ebb8d5e8f..3d7c56e01 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -889,44 +889,14 @@ void CEventList::paintHead(t_channel_id _channel_id, std::string _channelname, s void CEventList::paintBottomBox(std::string _channelname_prev, std::string _channelname_next) { int by = y + height - iheight - botboxheight; - int font_lr = SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMLARGE; - int x_off = OFFSET_INNER_MID; - int mid_width = full_width * 40 / 100; // 40% - int side_width = ((full_width - mid_width) / 2) - (2 * x_off); if (!Bottombox){ - Bottombox = new CComponentsFrmChain(x, by, full_width, botboxheight); - Bottombox->setColorBody(COL_MENUFOOT_PLUS_0); - Bottombox->enableColBodyGradient(g_settings.theme.infobar_gradient_bottom,COL_MENUFOOT_PLUS_0,g_settings.theme.infobar_gradient_bottom_direction); - Bottombox->set2ndColor(COL_MENUCONTENT_PLUS_0); - }else{ - if (Bottombox->isPainted()) - Bottombox->hideCCItems(); - Bottombox->clear(); + Bottombox = new CNaviBar(x, by, full_width, botboxheight); + Bottombox->setFont(g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMLARGE]); } - if (!_channelname_prev.empty()) { - CComponentsPictureScalable *lpic = new CComponentsPictureScalable(x_off,CC_CENTERED,NEUTRINO_ICON_BUTTON_LEFT,Bottombox); - lpic->doPaintBg(false); - lpic->enableSaveBg(); - - CComponentsText *lText = new CComponentsText(x_off + lpic->getWidth() + OFFSET_INNER_MID, CC_CENTERED, side_width, theight, _channelname_prev, CTextBox::NO_AUTO_LINEBREAK, g_Font[font_lr], CComponentsText::FONT_STYLE_REGULAR, Bottombox, CC_SHADOW_OFF, COL_MENUHEAD_TEXT); - lText->doPaintBg(false); - lText->enableSaveBg(); - } - - if (!_channelname_next.empty()) { - CComponentsPictureScalable *rpic = new CComponentsPictureScalable(0,CC_CENTERED,NEUTRINO_ICON_BUTTON_RIGHT,Bottombox); - int x_pos = full_width - rpic->getWidth() - OFFSET_INNER_MID; - rpic->doPaintBg(false); - rpic->setXPos(x_pos); - rpic->enableSaveBg(); - - CComponentsText *rText = new CComponentsText(0, CC_CENTERED, side_width, theight, _channelname_next, CTextBox::NO_AUTO_LINEBREAK | CTextBox::RIGHT, g_Font[font_lr], CComponentsText::FONT_STYLE_REGULAR, Bottombox, CC_SHADOW_OFF, COL_MENUHEAD_TEXT); - rText->setXPos(x_pos - OFFSET_INNER_MID - rText->getWidth()); - rText->doPaintBg(false); - rText->enableSaveBg(); - } + Bottombox->enableArrows(!_channelname_prev.empty(), !_channelname_next.empty()); + Bottombox->setText(_channelname_prev, _channelname_next); Bottombox->paint(false); } diff --git a/src/gui/eventlist.h b/src/gui/eventlist.h index 8b81aefb5..69cf7442c 100644 --- a/src/gui/eventlist.h +++ b/src/gui/eventlist.h @@ -32,7 +32,7 @@ #include #include #include - +#include #include "infoviewer.h" #include "widget/menue.h" @@ -104,8 +104,8 @@ class CEventList : public CListHelpers event_id_t item_event_ID; CComponentsText *cc_infozone; CComponentsHeader *header; - CProgressBar *pb; - CComponentsFrmChain *Bottombox; + CProgressBar *pb; + CNaviBar *Bottombox; const char * unit_short_minute; void paintItem(unsigned pos, t_channel_id channel_id = 0);