X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d3eca61ede32dd385b2e53fb33c669efa26cbcfb..0cfa2e76e477e6e0abf46c97640a2e38a2fc308d:/lib/gui/esubtitle.cpp diff --git a/lib/gui/esubtitle.cpp b/lib/gui/esubtitle.cpp index 6e8d48e9..f859c170 100644 --- a/lib/gui/esubtitle.cpp +++ b/lib/gui/esubtitle.cpp @@ -52,13 +52,13 @@ void eSubtitleWidget::setPage(const eDVBTeletextSubtitlePage &p) void eSubtitleWidget::setPage(const eDVBSubtitlePage &p) { -// eDebug("setPage"); + eDebug("setPage"); m_dvb_page = p; invalidate(m_visible_region); // invalidate old visible regions m_visible_region.rects.clear(); for (std::list::iterator it(m_dvb_page.m_regions.begin()); it != m_dvb_page.m_regions.end(); ++it) { -// eDebug("add %d %d %d %d", it->m_position.x(), it->m_position.y(), it->m_pixmap->size().width(), it->m_pixmap->size().height()); + eDebug("add %d %d %d %d", it->m_position.x(), it->m_position.y(), it->m_pixmap->size().width(), it->m_pixmap->size().height()); m_visible_region.rects.push_back(eRect(it->m_position, it->m_pixmap->size())); } m_dvb_page_ok = 1; @@ -66,15 +66,62 @@ void eSubtitleWidget::setPage(const eDVBSubtitlePage &p) invalidate(m_visible_region); // invalidate new regions } +void eSubtitleWidget::setPage(const ePangoSubtitlePage &p) +{ + m_pango_page = p; + m_pango_page_ok = 1; + invalidate(m_visible_region); // invalidate old visible regions + m_visible_region.rects.clear(); + + int elements = m_pango_page.m_elements.size(); + if (elements) + { + int startY = elements > 1 + ? size().height() / 2 + : size().height() / 3 * 2; + int width = size().width() - startX * 2; + int height = size().height() - startY; + int size_per_element = height / (elements ? elements : 1); + for (int i=0; i &pixmap, gRegion changed) +{ + m_pixmap = pixmap; + invalidate(changed); +} + +std::string eSubtitleWidget::replace_all(const std::string &in, const std::string &entity, const std::string &symbol) +{ + std::string out = in; + std::string::size_type loc = 0; + while (( loc = out.find(entity, loc)) != std::string::npos ) + out.replace(loc, entity.length(), symbol); + return out; +} + int eSubtitleWidget::event(int event, void *data, void *data2) { switch (event) @@ -85,14 +132,15 @@ int eSubtitleWidget::event(int event, void *data, void *data2) gPainter &painter = *(gPainter*)data2; getStyle(style); - eWidget::event(event, data, data2); - ePtr font = new gFont("Regular", 38); - painter.setFont(font); - - if (m_page_ok) + + if (m_pixmap) + painter.blit(m_pixmap, ePoint(0,0)); + else if (m_page_ok) { int elements = m_page.m_elements.size(); + ePtr font = new gFont("Regular", 38); + painter.setFont(font); for (int i=0; i font = new gFont("Regular", 38); + for (int i=0; i::iterator it(m_dvb_page.m_regions.begin()); it != m_dvb_page.m_regions.end(); ++it)