diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 80b09008d..691f7c9ca 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1635,6 +1635,7 @@ moviebrowser.book_position Position: moviebrowser.book_type Sprung (<0 zurück, >0 vor): moviebrowser.book_type_backward Wiederholung moviebrowser.book_type_forward Überspringen +moviebrowser.browser_additional Zusätzliche Informationen moviebrowser.browser_frame_high Anzeigehöhe oberes Fenster [%] moviebrowser.browser_row_head Spalten Einstellungen moviebrowser.browser_row_item Spalteninfo @@ -1663,11 +1664,12 @@ moviebrowser.edit_book_type_info1 Neue Sprunglänge (s) moviebrowser.edit_book_type_info2 <0 zurück , >0 vor, 0: kein moviebrowser.edit_serie Name der Serie moviebrowser.error_no_movies Keine Filme gefunden +moviebrowser.filter_off Filter aus moviebrowser.foot_filter Filter: -moviebrowser.foot_focus Fenster umschalten +moviebrowser.foot_focus Fenster wechseln moviebrowser.foot_options Optionen -moviebrowser.foot_play Film starten -moviebrowser.foot_refresh Liste neu laden +moviebrowser.foot_play Wiedergabe +moviebrowser.foot_refresh Neu laden moviebrowser.foot_sort Sortieren: moviebrowser.head Meine Aufnahmen moviebrowser.head_filter Filme nach Kategorie filtern: diff --git a/data/locale/english.locale b/data/locale/english.locale index 2c25697a1..71133073f 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1635,6 +1635,7 @@ moviebrowser.book_position Position: moviebrowser.book_type Jump (<0 back , >0 for): moviebrowser.book_type_backward Repeat moviebrowser.book_type_forward jump over +moviebrowser.browser_additional Additional informations moviebrowser.browser_frame_high Browser height [%] moviebrowser.browser_row_head Row settings moviebrowser.browser_row_item Row item @@ -1663,10 +1664,11 @@ moviebrowser.edit_book_type_info1 Enter new jump length (s) moviebrowser.edit_book_type_info2 <0 back , >0 for, 0: none moviebrowser.edit_serie Enter name of serie moviebrowser.error_no_movies No movies found +moviebrowser.filter_off Filter off moviebrowser.foot_filter Filter: moviebrowser.foot_focus Switch window moviebrowser.foot_options Options -moviebrowser.foot_play Start movie +moviebrowser.foot_play Playback moviebrowser.foot_refresh Refresh list moviebrowser.foot_sort Sort: moviebrowser.head My recordings diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index be68c9f3f..0c720fdaa 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1700,6 +1700,7 @@ void CChannelList::showChannelLogo() //TODO: move into an own handler, eg. heade return; if(g_settings.channellist_show_channellogo){ int logo_w_max = full_width / 4; + int logo_h_max = theight - 2*OFFSET_INNER_MIN; if (CChannelLogo) { if (headerNew) CChannelLogo->clearSavedScreen(); @@ -1711,8 +1712,8 @@ void CChannelList::showChannelLogo() //TODO: move into an own handler, eg. heade if (CChannelLogo->hasLogo()){ CChannelLogo->setWidth(min(CChannelLogo->getWidth(), logo_w_max), true); - if (CChannelLogo->getHeight() > theight) //scale image if required - CChannelLogo->setHeight(theight, true); + if (CChannelLogo->getHeight() > logo_h_max) + CChannelLogo->setHeight(logo_h_max, true); CChannelLogo->setXPos(x + full_width - logo_off - CChannelLogo->getWidth()); CChannelLogo->setYPos(y + (theight - CChannelLogo->getHeight()) / 2); CChannelLogo->paint(); diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp index 69d88a173..c9c29c075 100644 --- a/src/gui/components/cc_frm_header.cpp +++ b/src/gui/components/cc_frm_header.cpp @@ -121,7 +121,7 @@ void CComponentsHeader::initVarHeader( const int& x_pos, const int& y_pos, const cch_col_text = COL_MENUHEAD_TEXT; cch_caption_align = CTextBox::NO_AUTO_LINEBREAK; cch_items_y = CC_CENTERED; - cch_offset = 8; + cch_offset = OFFSET_INNER_MID; cch_icon_x = cch_offset; cch_icon_w = 0; cch_clock_w = 0; diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 2798f4397..9593a4022 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -195,7 +195,7 @@ void CEpgData::processTextToArray(std::string text, int screening, bool has_cove // 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 - (has_cover? ((ox/4)+10) :0))) + if ((aktWordWidth+aktWidth)<(ox - 2*OFFSET_INNER_MID - 15 - (has_cover ? ((ox/4)+OFFSET_INNER_MID) : 0))) {//space ok, add aktWidth += aktWordWidth; aktLine += aktWord; @@ -238,7 +238,7 @@ void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear) std::string cover = "/tmp/tmdb.jpg"; //todo: maybe add a getCover()-function to tmdb class int cover_max_width = ox/4; //25% - int cover_max_height = sb-(2*10); + int cover_max_height = sb-(2*OFFSET_INNER_MID); int cover_width = 0; int cover_height = 0; int cover_offset = 0; @@ -249,7 +249,7 @@ void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear) if (cover_width && cover_height) { g_PicViewer->rescaleImageDimensions(&cover_width, &cover_height, cover_max_width, cover_max_height); - cover_offset = cover_width + 10; + cover_offset = cover_width + OFFSET_INNER_MID; } } @@ -269,7 +269,7 @@ void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear) frameBuffer->paintBoxRel(sx+offs, y, ox-15-offs, sb, COL_MENUCONTENT_PLUS_0); // background of the text box if (has_cover) { - if (!g_PicViewer->DisplayImage(cover ,sx+10 ,y+10+((sb-cover_height)/2), cover_width, cover_height, CFrameBuffer::TM_NONE)) { + if (!g_PicViewer->DisplayImage(cover ,sx+OFFSET_INNER_MID ,y+OFFSET_INNER_MID+((sb-cover_height)/2), cover_width, cover_height, CFrameBuffer::TM_NONE)) { cover_offset = 0; frameBuffer->paintBoxRel(sx, y, ox-15, sb, COL_MENUCONTENT_PLUS_0); // background of the text box } @@ -280,8 +280,8 @@ void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear) if (tmdb_active && startPos == 0) { frameBuffer->getIconSize(NEUTRINO_ICON_TMDB, &icon_w, &icon_h); - frameBuffer->paintIcon(NEUTRINO_ICON_TMDB, sx+10+cover_offset, y+(medlineheight-icon_h)/2); - logo_offset = icon_w + 10; + frameBuffer->paintIcon(NEUTRINO_ICON_TMDB, sx+OFFSET_INNER_MID+cover_offset, y+(medlineheight-icon_h)/2); + logo_offset = icon_w + OFFSET_INNER_MID; } if (stars > 0 && startPos == 0) { @@ -308,7 +308,7 @@ void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear) 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_TEXT: COL_MENUCONTENT_TEXT); + g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->RenderString(sx+OFFSET_INNER_MID+offset, y+medlineheight, ox- 15- 15, epgText[i].first.substr(pos1, pos2 - pos1), (epgText[i].second==2)? COL_MENUCONTENTINACTIVE_TEXT: COL_MENUCONTENT_TEXT); count++; pos1 = epgText[i].first.find_first_not_of(tok, pos2); pos2 = epgText[i].first.find_first_of(tok, pos1); @@ -317,7 +317,7 @@ void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear) count = 0; } else{ - g_Font[( i< info1_lines ) ?SNeutrinoSettings::FONT_TYPE_EPG_INFO1:SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->RenderString(sx+10+cover_offset, y+medlineheight, ox-15-15-cover_offset, epgText[i].first, COL_MENUCONTENT_TEXT); + g_Font[( i< info1_lines ) ?SNeutrinoSettings::FONT_TYPE_EPG_INFO1:SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->RenderString(sx+OFFSET_INNER_MID+cover_offset, y+medlineheight, ox-15-15-cover_offset, epgText[i].first, COL_MENUCONTENT_TEXT); } } @@ -707,12 +707,17 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start hide(); return res; } + + const int pic_h = 39; + toph = std::max(toph, pic_h); + // Calculate offset for the title when logo appears. int pic_offx = 0; std::string lname; int logo_w = 0; int logo_h = 0; int logo_w_max = ox / 4; + int logo_h_max = toph - 2*OFFSET_INNER_MIN; std::string channel_name; if (mp_info) channel_name = mp_movie_info->channelName; @@ -720,36 +725,31 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start channel_name = g_Zapit->getChannelName(channel_id); if (g_settings.infobar_show_channellogo && g_PicViewer->GetLogoName(channel_id, channel_name, lname, &logo_w, &logo_h)) { - if ((logo_h > (toph-4)) || (logo_w > logo_w_max)) - g_PicViewer->rescaleImageDimensions(&logo_w, &logo_h, logo_w_max, toph-4); - pic_offx = logo_w + 10; + if ((logo_h > logo_h_max) || (logo_w > logo_w_max)) + g_PicViewer->rescaleImageDimensions(&logo_w, &logo_h, logo_w_max, logo_h_max); + pic_offx = logo_w + OFFSET_INNER_MID; } int pos; std::string text1 = epgData.title; std::string text2 = ""; - if (g_Font[SNeutrinoSettings::FONT_TYPE_EPG_TITLE]->getRenderWidth(text1) > ox - pic_offx - 18) + if (g_Font[SNeutrinoSettings::FONT_TYPE_EPG_TITLE]->getRenderWidth(text1) > ox - pic_offx - 2*OFFSET_INNER_MID) { do { pos = text1.find_last_of("[ .]+"); if (pos != -1) text1 = text1.substr(0, pos); - } while ((pos != -1) && (g_Font[SNeutrinoSettings::FONT_TYPE_EPG_TITLE]->getRenderWidth(text1) > ox - pic_offx - 18)); + } while ((pos != -1) && (g_Font[SNeutrinoSettings::FONT_TYPE_EPG_TITLE]->getRenderWidth(text1) > ox - pic_offx - 2*OFFSET_INNER_MID)); if (epgData.title.length() > text1.length()) // shold never be false in this place text2 = epgData.title.substr(text1.length()+ 1, uint(-1) ); } - const int pic_h = 39; - if(!topboxheight) + if (!topboxheight) start(); if (!text2.empty()) toph = 2 * topboxheight; - else - toph = topboxheight; - - toph = std::max(toph, pic_h); sb = oy - toph - botboxheight; @@ -881,11 +881,11 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start CComponentsPicture* headerPic = NULL; //NOTE: class CComponentsChannelLogo is preferred for channel logos if (pic_offx > 0) { - headerPic = new CComponentsPicture(sx+10, sy + (header_h-logo_h)/2, logo_w, logo_h, lname); + headerPic = new CComponentsPicture(sx + OFFSET_INNER_MID, sy + (header_h-logo_h)/2, logo_w, logo_h, lname); headerPic->doPaintBg(false); } std::string textAll = (!text2.empty()) ? text1 + "\n" + text2 : text1; - CComponentsText headerText(sx+15+pic_offx, sy, ox-15-pic_offx, header_h, textAll, CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_EPG_TITLE]); + CComponentsText headerText(sx + OFFSET_INNER_MID + pic_offx, sy, ox - 2*OFFSET_INNER_MID - pic_offx, header_h, textAll, CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_EPG_TITLE]); headerText.doPaintBg(false); headerText.setTextColor(COL_MENUHEAD_TEXT); header->paint(CC_SAVE_SCREEN_NO); @@ -905,23 +905,23 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start if (!iw && !ih) frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_LEFT, &iw, &ih); if (!io && iw) - io = iw + 10; + io = iw + OFFSET_INNER_MID; std::string fromto = epg_start + " - " + epg_end; int widthl = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->getRenderWidth(fromto); - g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->RenderString(sx+10+io, sy+oy-3, widthl, fromto, COL_MENUHEAD_TEXT); + g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->RenderString(sx+OFFSET_INNER_MID+io, sy+oy-3, widthl, fromto, COL_MENUHEAD_TEXT); int widthr = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->getRenderWidth(epg_date); - g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->RenderString(sx+ox-10-io-widthr, sy+oy-3, widthr, epg_date, COL_MENUHEAD_TEXT); + g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->RenderString(sx+ox-OFFSET_INNER_MID-io-widthr, sy+oy-3, widthr, epg_date, COL_MENUHEAD_TEXT); GetPrevNextEPGData(epgData.eventID, &epgData.epg_times.startzeit); if (!call_fromfollowlist) { int iy = sy + oy - botboxheight + (botboxheight - iw)/2; if (prev_id) - frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_LEFT, sx + 10, iy); + frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_LEFT, sx + OFFSET_INNER_MID, iy); if (next_id) - frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_RIGHT, sx + ox - iw - 10, iy); + frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_RIGHT, sx + ox - iw - OFFSET_INNER_MID, iy); } } showProgressBar(); diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 96eb2331d..cd7da703b 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -855,28 +855,23 @@ void CEventList::paintHead(t_channel_id _channel_id, std::string _channelname, s } header->clear(); - int x_off = 10; + int x_off = OFFSET_INNER_MID; int mid_width = full_width * 40 / 100; // 40% + int max_height = theight - 2*OFFSET_INNER_MIN; int side_width = ((full_width - mid_width) / 2) - (2 * x_off); //create an logo object CComponentsChannelLogoScalable* midLogo = new CComponentsChannelLogoScalable(0, 0, _channelname, _channel_id, header); - if (midLogo->hasLogo()) { - //if logo object has found a logo and was ititialized, the hand it's size - int w_logo = midLogo->getWidth(); + if (midLogo->hasLogo()) + { + midLogo->setWidth(min(midLogo->getWidth(), mid_width), true); + if (midLogo->getHeight() > max_height) + midLogo->setHeight(max_height, true); - //scale image if required, TODO: move into an own handler, eg. header, so channel logo should be paint in header object - int h_logo = midLogo->getHeight(); - if (h_logo > theight){ - uint8_t h_ratio = uint8_t(theight*100/h_logo); - midLogo->setHeight(theight); - w_logo = h_ratio*w_logo/100; - midLogo->setWidth(w_logo); - } midLogo->setPos(CC_CENTERED, CC_CENTERED); // recalc widths - side_width = ((full_width - w_logo) / 2) - (4 * x_off); + side_width = ((full_width - midLogo->getWidth()) / 2) - (4 * x_off); } else { header->removeCCItem(midLogo); //remove/destroy logo object, if it is not available diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 8fd9ba3d6..50a9e8879 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -2255,7 +2255,7 @@ int CInfoViewer::showChannelLogo(const t_channel_id logo_channel_id, const int c else if (g_settings.infobar_show_channellogo == 2 || g_settings.infobar_show_channellogo == 5 || g_settings.infobar_show_channellogo == 6) // paint logo in place of channel name { // check logo dimensions - g_PicViewer->rescaleImageDimensions(&logo_w, &logo_h, chan_w, header_height); + g_PicViewer->rescaleImageDimensions(&logo_w, &logo_h, chan_w, header_height - 2*OFFSET_INNER_MIN); // hide channel name // this is too ugly... ChannelName = ""; // calculate logo position @@ -2271,7 +2271,7 @@ int CInfoViewer::showChannelLogo(const t_channel_id logo_channel_id, const int c { // check logo dimensions int Logo_max_width = chan_w - logo_w - 10; - g_PicViewer->rescaleImageDimensions(&logo_w, &logo_h, Logo_max_width, header_height); + g_PicViewer->rescaleImageDimensions(&logo_w, &logo_h, Logo_max_width, header_height - 2*OFFSET_INNER_MIN); // calculate logo position y_mid = ChanNameY + header_height / 2; logo_x = start_x + 10; diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index a145fc48d..32dbaf352 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -255,11 +255,14 @@ CMovieBrowser::~CMovieBrowser() clearListLines(); - if (CChannelLogo) - delete CChannelLogo; + if (m_detailsLine) + delete m_detailsLine; - if (pic) - delete pic; + if (m_channelLogo) + delete m_channelLogo; + + if (m_movieCover) + delete m_movieCover; } void CMovieBrowser::clearListLines() @@ -324,9 +327,9 @@ void CMovieBrowser::init(void) m_pcBrowser = NULL; m_pcLastPlay = NULL; m_pcLastRecord = NULL; - m_pcInfo = NULL; + m_pcInfo1 = NULL; + m_pcInfo2 = NULL; m_pcFilter = NULL; - pic = NULL; m_windowFocus = MB_FOCUS_BROWSER; m_textTitle = g_Locale->getText(LOCALE_MOVIEBROWSER_HEAD); @@ -406,7 +409,10 @@ void CMovieBrowser::init(void) filelist_it = filelist.end(); movielist.clear(); - CChannelLogo = NULL; + m_detailsLine = NULL; + m_channelLogo = NULL; + m_movieCover = NULL; + old_EpgId = 0; m_doRefresh = false; m_doLoadMovies = false; @@ -428,7 +434,7 @@ void CMovieBrowser::initGlobalSettings(void) m_settings.sorting.direction = MB_DIRECTION_DOWN; m_settings.filter.item = MB_INFO_MAX_NUMBER; - m_settings.filter.optionString = ""; + m_settings.filter.optionString = g_Locale->getText(LOCALE_OPTIONS_OFF); m_settings.filter.optionVar = 0; m_settings.parentalLockAge = MI_PARENTAL_OVER18; @@ -447,7 +453,7 @@ void CMovieBrowser::initGlobalSettings(void) } /***** Browser List **************/ - m_settings.browserFrameHeight = 50; /* percent */ + m_settings.browserFrameHeight = 65; /* percent */ m_settings.browserRowNr = 6; m_settings.browserRowItem[0] = MB_INFO_CHANNEL; @@ -460,16 +466,18 @@ void CMovieBrowser::initGlobalSettings(void) m_settings.browserRowItem[7] = MB_INFO_MAX_NUMBER; m_settings.browserRowItem[8] = MB_INFO_MAX_NUMBER; - m_settings.browserRowWidth[0] = m_defaultRowWidth[m_settings.browserRowItem[0]]; //300; - m_settings.browserRowWidth[1] = m_defaultRowWidth[m_settings.browserRowItem[1]]; //100; - m_settings.browserRowWidth[2] = m_defaultRowWidth[m_settings.browserRowItem[2]]; //80; - m_settings.browserRowWidth[3] = m_defaultRowWidth[m_settings.browserRowItem[3]]; //50; - m_settings.browserRowWidth[4] = m_defaultRowWidth[m_settings.browserRowItem[4]]; //30; - m_settings.browserRowWidth[5] = m_defaultRowWidth[m_settings.browserRowItem[5]]; //30; + m_settings.browserRowWidth[0] = m_defaultRowWidth[m_settings.browserRowItem[0]]; + m_settings.browserRowWidth[1] = m_defaultRowWidth[m_settings.browserRowItem[1]]; + m_settings.browserRowWidth[2] = m_defaultRowWidth[m_settings.browserRowItem[2]]; + m_settings.browserRowWidth[3] = m_defaultRowWidth[m_settings.browserRowItem[3]]; + m_settings.browserRowWidth[4] = m_defaultRowWidth[m_settings.browserRowItem[4]]; + m_settings.browserRowWidth[5] = m_defaultRowWidth[m_settings.browserRowItem[5]]; m_settings.browserRowWidth[6] = m_defaultRowWidth[m_settings.browserRowItem[6]]; m_settings.browserRowWidth[7] = m_defaultRowWidth[m_settings.browserRowItem[7]]; m_settings.browserRowWidth[8] = m_defaultRowWidth[m_settings.browserRowItem[8]]; + m_settings.browserAdditional = 0; + m_settings.ts_only = 1; m_settings.ytmode = cYTFeedParser::MOST_POPULAR; m_settings.ytorderby = cYTFeedParser::ORDERBY_PUBLISHED; @@ -503,33 +511,42 @@ void CMovieBrowser::initFrames(void) m_cBoxFrameBrowserList.iX = m_cBoxFrame.iX; m_cBoxFrameBrowserList.iY = m_cBoxFrame.iY + m_cBoxFrameTitleRel.iHeight; - m_cBoxFrameBrowserList.iWidth = m_cBoxFrame.iWidth; + if (m_settings.browserAdditional) + m_cBoxFrameBrowserList.iWidth = m_cBoxFrame.iWidth / 3 * 2; + else + m_cBoxFrameBrowserList.iWidth = m_cBoxFrame.iWidth; m_cBoxFrameBrowserList.iHeight = m_cBoxFrame.iHeight * m_settings.browserFrameHeight / 100; - m_cBoxFrameFootRel.iX = 0; + + m_cBoxFrameFootRel.iX = m_cBoxFrameBrowserList.iX; m_cBoxFrameFootRel.iHeight = refreshFoot(false); - m_cBoxFrameFootRel.iY = m_cBoxFrame.iHeight - m_cBoxFrameFootRel.iHeight; - m_cBoxFrameFootRel.iWidth = m_cBoxFrameBrowserList.iWidth; + m_cBoxFrameFootRel.iY = m_cBoxFrameBrowserList.iY + m_cBoxFrameBrowserList.iHeight; + m_cBoxFrameFootRel.iWidth = m_cBoxFrame.iWidth; m_cBoxFrameLastPlayList.iX = m_cBoxFrameBrowserList.iX; m_cBoxFrameLastPlayList.iY = m_cBoxFrameBrowserList.iY ; - m_cBoxFrameLastPlayList.iWidth = (m_cBoxFrameBrowserList.iWidth>>1) - (OFFSET_INTER>>1); + m_cBoxFrameLastPlayList.iWidth = m_cBoxFrame.iWidth / 2; m_cBoxFrameLastPlayList.iHeight = m_cBoxFrameBrowserList.iHeight; - m_cBoxFrameLastRecordList.iX = m_cBoxFrameLastPlayList.iX + m_cBoxFrameLastPlayList.iWidth + OFFSET_INTER; + m_cBoxFrameLastRecordList.iX = m_cBoxFrameLastPlayList.iX + m_cBoxFrameLastPlayList.iWidth; m_cBoxFrameLastRecordList.iY = m_cBoxFrameLastPlayList.iY; - m_cBoxFrameLastRecordList.iWidth = m_cBoxFrame.iWidth - m_cBoxFrameLastPlayList.iWidth - OFFSET_INTER; + m_cBoxFrameLastRecordList.iWidth = m_cBoxFrame.iWidth - m_cBoxFrameLastPlayList.iWidth; m_cBoxFrameLastRecordList.iHeight = m_cBoxFrameLastPlayList.iHeight; - m_cBoxFrameInfo.iX = m_cBoxFrameBrowserList.iX; - m_cBoxFrameInfo.iY = m_cBoxFrameBrowserList.iY + m_cBoxFrameBrowserList.iHeight + OFFSET_INTER; - m_cBoxFrameInfo.iWidth = m_cBoxFrameBrowserList.iWidth; - m_cBoxFrameInfo.iHeight = m_cBoxFrame.iHeight - m_cBoxFrameBrowserList.iHeight - OFFSET_INTER - m_cBoxFrameFootRel.iHeight - m_cBoxFrameTitleRel.iHeight; + m_cBoxFrameInfo1.iX = m_cBoxFrameBrowserList.iX; + m_cBoxFrameInfo1.iY = m_cBoxFrameFootRel.iY + m_cBoxFrameFootRel.iHeight + OFFSET_INTER; + m_cBoxFrameInfo1.iWidth = m_cBoxFrame.iWidth; + m_cBoxFrameInfo1.iHeight = m_cBoxFrame.iHeight - m_cBoxFrameBrowserList.iHeight - OFFSET_INTER - m_cBoxFrameFootRel.iHeight - m_cBoxFrameTitleRel.iHeight; - m_cBoxFrameFilter.iX = m_cBoxFrameInfo.iX; - m_cBoxFrameFilter.iY = m_cBoxFrameInfo.iY; - m_cBoxFrameFilter.iWidth = m_cBoxFrameInfo.iWidth; - m_cBoxFrameFilter.iHeight = m_cBoxFrameInfo.iHeight; + m_cBoxFrameInfo2.iX = m_cBoxFrameBrowserList.iX + m_cBoxFrameBrowserList.iWidth; + m_cBoxFrameInfo2.iY = m_cBoxFrameBrowserList.iY; + m_cBoxFrameInfo2.iWidth = m_cBoxFrame.iWidth - m_cBoxFrameBrowserList.iWidth; + m_cBoxFrameInfo2.iHeight = m_cBoxFrameBrowserList.iHeight; + + m_cBoxFrameFilter.iX = m_cBoxFrameInfo1.iX; + m_cBoxFrameFilter.iY = m_cBoxFrameInfo1.iY; + m_cBoxFrameFilter.iWidth = m_cBoxFrameInfo1.iWidth; + m_cBoxFrameFilter.iHeight = m_cBoxFrameInfo1.iHeight; } void CMovieBrowser::initRows(void) @@ -614,6 +631,8 @@ bool CMovieBrowser::loadSettings(MB_SETTINGS* settings) settings->browserRowItem[i] = (MB_INFO_ITEM)configfile.getInt32("mb_browserRowItem_" + to_string(i), MB_INFO_MAX_NUMBER); settings->browserRowWidth[i] = configfile.getInt32("mb_browserRowWidth_" + to_string(i), 50); } + settings->browserAdditional = configfile.getInt32("mb_browserAdditional", 0); + settings->ytmode = configfile.getInt32("mb_ytmode", cYTFeedParser::MOST_POPULAR); settings->ytorderby = configfile.getInt32("mb_ytorderby", cYTFeedParser::ORDERBY_PUBLISHED); settings->ytresults = configfile.getInt32("mb_ytresults", 10); @@ -679,6 +698,8 @@ bool CMovieBrowser::saveSettings(MB_SETTINGS* settings) configfile.setInt32("mb_browserRowItem_" + to_string(i), settings->browserRowItem[i]); configfile.setInt32("mb_browserRowWidth_" + to_string(i), settings->browserRowWidth[i]); } + configfile.setInt32("mb_browserAdditional", settings->browserAdditional); + configfile.setInt32("mb_ytmode", settings->ytmode); configfile.setInt32("mb_ytorderby", settings->ytorderby); configfile.setInt32("mb_ytresults", settings->ytresults); @@ -1049,9 +1070,10 @@ int CMovieBrowser::exec(const char* path) void CMovieBrowser::hide(void) { //TRACE("[mb]->%s\n", __func__); - if (CChannelLogo){ - delete CChannelLogo; - CChannelLogo = NULL; + if (m_channelLogo) + { + delete m_channelLogo; + m_channelLogo = NULL; } old_EpgId = 0; framebuffer->paintBackground(); @@ -1078,8 +1100,10 @@ void CMovieBrowser::hide(void) delete m_pcLastRecord; m_pcLastRecord = NULL; - delete m_pcInfo; - m_pcInfo = NULL; + delete m_pcInfo1; + m_pcInfo1 = NULL; + delete m_pcInfo2; + m_pcInfo2 = NULL; } int CMovieBrowser::paint(void) @@ -1100,23 +1124,26 @@ int CMovieBrowser::paint(void) m_pcLastRecord = new CListFrame(&m_recordListLines, font, CListFrame::SCROLL | CListFrame::HEADER_LINE | CListFrame::TITLE, &m_cBoxFrameLastRecordList, g_Locale->getText(LOCALE_MOVIEBROWSER_HEAD_RECORDLIST), g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_HEAD]); - m_pcFilter = new CListFrame(&m_FilterLines, font, CListFrame::SCROLL | CListFrame::TITLE, + m_pcFilter = new CListFrame(&m_FilterLines, g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_INFO], CListFrame::SCROLL | CListFrame::TITLE, &m_cBoxFrameFilter, g_Locale->getText(LOCALE_MOVIEBROWSER_HEAD_FILTER), g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_HEAD]); - m_pcInfo = new CTextBox(" ", g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_INFO], CTextBox::TOP | CTextBox::SCROLL, &m_cBoxFrameInfo); + m_pcInfo1 = new CTextBox(" ", g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_INFO], CTextBox::TOP | CTextBox::SCROLL, &m_cBoxFrameInfo1); + m_pcInfo2 = new CTextBox(" ", g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_INFO], CTextBox::TOP | CTextBox::SCROLL, &m_cBoxFrameInfo2); if (m_pcBrowser == NULL || m_pcLastPlay == NULL || - m_pcLastRecord == NULL || m_pcInfo == NULL || m_pcFilter == NULL) + m_pcLastRecord == NULL || m_pcInfo1 == NULL || m_pcInfo2 == NULL || m_pcFilter == NULL) { TRACE("[mb] paint, ERROR: not enought memory to allocate windows"); if (m_pcFilter != NULL)delete m_pcFilter; if (m_pcBrowser != NULL)delete m_pcBrowser; if (m_pcLastPlay != NULL) delete m_pcLastPlay; if (m_pcLastRecord != NULL)delete m_pcLastRecord; - if (m_pcInfo != NULL) delete m_pcInfo; + if (m_pcInfo1 != NULL) delete m_pcInfo1; + if (m_pcInfo2 != NULL) delete m_pcInfo2; - m_pcInfo = NULL; + m_pcInfo1 = NULL; + m_pcInfo2 = NULL; m_pcLastPlay = NULL; m_pcLastRecord = NULL; m_pcBrowser = NULL; @@ -1125,6 +1152,14 @@ int CMovieBrowser::paint(void) return (false); } + m_pcFilter->setBackGroundRadius(RADIUS_LARGE); + + m_pcInfo1->setBackGroundColor(COL_MENUCONTENTDARK_PLUS_0); + m_pcInfo1->setTextColor(COL_MENUCONTENTDARK_TEXT); + m_pcInfo1->setBackGroundRadius(RADIUS_LARGE); + //m_pcInfo1->setTextBorderWidth(OFFSET_INNER_MID, OFFSET_INNER_SMALL); + m_pcInfo2->setTextBorderWidth(OFFSET_INNER_MID, OFFSET_INNER_SMALL); + clearSelection(); if (m_file_info_stale == true) { loadMovies(); @@ -1170,7 +1205,7 @@ void CMovieBrowser::refresh(void) m_pcLastPlay->refresh(); if (m_pcLastRecord != NULL && m_showLastRecordFiles == true) m_pcLastRecord->refresh(); - if (m_pcInfo != NULL && m_showMovieInfo == true) + if (m_pcInfo1 != NULL && m_pcInfo2 != NULL && m_showMovieInfo == true) refreshMovieInfo(); if (m_pcFilter != NULL && m_showFilter == true) m_pcFilter->refresh(); @@ -1242,114 +1277,256 @@ std::string CMovieBrowser::getScreenshotName(std::string movie, bool is_dir) return ""; } +void CMovieBrowser::refreshChannelLogo(void) +{ + TRACE("[mb]->%s:%d\n", __func__, __LINE__); + + int w_logo_max = m_cBoxFrameTitleRel.iWidth / 4; + int h_logo_max = m_cBoxFrameTitleRel.iHeight - 2*OFFSET_INNER_MIN; + short pb_hdd_offset = 100 + OFFSET_INNER_MID; + + if (show_mode == MB_SHOW_YT) + pb_hdd_offset = 0; + + if (m_channelLogo && (old_EpgId != m_movieSelectionHandler->epgId >> 16)) + { + if (newHeader) + m_channelLogo->clearFbData(); // reset logo screen data + else + m_channelLogo->hide(); + delete m_channelLogo; + m_channelLogo = NULL; + } + + if (old_EpgId != m_movieSelectionHandler->epgId >> 16) + { + if (m_channelLogo == NULL) + m_channelLogo = new CComponentsChannelLogoScalable(0, 0, m_movieSelectionHandler->channelName, m_movieSelectionHandler->epgId >>16); //TODO: add logo into header as item + old_EpgId = m_movieSelectionHandler->epgId >> 16; + } + + if (m_channelLogo && m_channelLogo->hasLogo()) + { + // TODO: move into an own handler, eg. header, so channel logo should be paint in header object + m_channelLogo->setWidth(min(m_channelLogo->getWidth(), w_logo_max), true); + if (m_channelLogo->getHeight() > h_logo_max) + m_channelLogo->setHeight(h_logo_max, true); + + int x = m_cBoxFrame.iX + m_cBoxFrameTitleRel.iX + m_cBoxFrameTitleRel.iWidth - m_channelLogo->getWidth() - OFFSET_INNER_MID; + int y = m_cBoxFrame.iY + m_cBoxFrameTitleRel.iY + (m_cBoxFrameTitleRel.iHeight - m_channelLogo->getHeight())/2; + m_channelLogo->setXPos(x - pb_hdd_offset); + m_channelLogo->setYPos(y); + m_channelLogo->hide(); + m_channelLogo->paint(); + newHeader = false; + } +} + +void CMovieBrowser::initMovieCover(void) +{ + TRACE("[mb]->%s:%d\n", __func__, __LINE__); + + CBox movieCoverBox; + + int cover_w = 0; + int cover_h = 0; + + if (m_windowFocus == MB_FOCUS_BROWSER && m_settings.browserAdditional) + { + movieCoverBox = m_cBoxFrameInfo2; + + // we have to align cover to box width + cover_w = movieCoverBox.iWidth - 2*OFFSET_INNER_MID - OFFSET_SHADOW; + } + else + { + movieCoverBox = m_cBoxFrameInfo1; + + // we have to align cover to box height + cover_h = movieCoverBox.iHeight - 2*OFFSET_INNER_MID - OFFSET_SHADOW; + } + + std::string cover_file; + if (show_mode == MB_SHOW_YT) + { + cover_file = m_movieSelectionHandler->tfile; + } + else + { + cover_file = getScreenshotName(m_movieSelectionHandler->file.Name, S_ISDIR(m_movieSelectionHandler->file.Mode)); + if ((cover_file.empty()) && (m_movieSelectionHandler->file.Name.length() > 18)) + { + std::string cover = m_movieSelectionHandler->file.Name; + cover.replace((cover.length()-18), 15, ""); //covername without yyyymmdd_hhmmss + cover_file = getScreenshotName(cover); + } + } + + bool got_cover = !cover_file.empty(); + + if (m_movieCover) + { + if (m_movieCover->getPictureName() != cover_file || !got_cover) + { + delete m_movieCover; + m_movieCover = NULL; + } + } + + if (m_settings.gui != MB_GUI_FILTER && got_cover) + { + if (m_movieCover == NULL) + { + m_movieCover = new CComponentsPicture(0, 0, cover_file, NULL, CC_SHADOW_ON, COL_MENUCONTENTDARK_PLUS_0); + + m_movieCover->enableFrame(true, 1); + m_movieCover->doPaintBg(false); + } + + // always align positions and dimensions + if (m_windowFocus == MB_FOCUS_BROWSER && m_settings.browserAdditional) + { + if (m_movieCover->getWidth() < m_movieCover->getHeight()) + cover_w /= 2; // cover is upright, so we use just half width first + + m_movieCover->setHeight(0); // force recalculation +TRACE("[mb]->%s:%d m_movieCover->getHeight(): %d\n", __func__, __LINE__, m_movieCover->getHeight()); + m_movieCover->setWidth(cover_w, true); + if (m_movieCover->getHeight() > movieCoverBox.iHeight/3) + m_movieCover->setHeight(movieCoverBox.iHeight/3, true); // use maximal one third of box height + + m_movieCover->setXPos(movieCoverBox.iX + (movieCoverBox.iWidth - m_movieCover->getWidth())/2); + m_movieCover->setYPos(movieCoverBox.iY + OFFSET_INNER_MID); + } + else + { + m_movieCover->setWidth(0); // force recalculation +TRACE("[mb]->%s:%d m_movieCover->getWidth(): %d\n", __func__, __LINE__, m_movieCover->getWidth()); + m_movieCover->setHeight(cover_h, true); + + m_movieCover->setXPos(movieCoverBox.iX + movieCoverBox.iWidth - m_movieCover->getWidth() - 2*OFFSET_INNER_MID - OFFSET_SHADOW); + m_movieCover->setYPos(movieCoverBox.iY + (movieCoverBox.iHeight - m_movieCover->getHeight())/2); + } + + if (!m_movieSelectionHandler->epgInfo2.empty()) + { + if (m_pcInfo1->OnAfterScrollPage.empty()) + { + //m_movieCover->enableCache(); + m_pcInfo1->OnAfterScrollPage.connect(sigc::mem_fun(m_movieCover, &CComponentsPicture::paint0)); + } + } + } +} + +void CMovieBrowser::refreshMovieCover(void) +{ + TRACE("[mb]->%s:%d\n", __func__, __LINE__); + + if (m_movieCover) + m_movieCover->paint(CC_SAVE_SCREEN_YES); +} + +void CMovieBrowser::hideMovieCover(void) +{ + TRACE("[mb]->%s:%d\n", __func__, __LINE__); + + if (m_movieCover) + m_movieCover->hide(); +} + void CMovieBrowser::refreshMovieInfo(void) { TRACE("[mb]->%s m_vMovieInfo.size %d\n", __func__, m_vMovieInfo.size()); - //reset text before new init, m_pcInfo must be clean - std::string emptytext = " "; - m_pcInfo->setText(&emptytext); + + hideDetailsLine(); + + // clear m_pcInfo1 text before new init + m_pcInfo1->clear(); + + // clear m_pcInfo2 text, reset position and dimensions before new init + m_pcInfo2->movePosition(m_cBoxFrameInfo2.iX, m_cBoxFrameInfo2.iY); + m_pcInfo2->setWindowMaxDimensions(m_cBoxFrameInfo2.iWidth, m_cBoxFrameInfo2.iHeight); + m_pcInfo2->setWindowMinDimensions(m_cBoxFrameInfo2.iWidth, m_cBoxFrameInfo2.iHeight); + m_pcInfo2->clear(); + + if (m_windowFocus == MB_FOCUS_BROWSER && m_settings.browserAdditional) + m_pcInfo1->setTextFont(g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_LIST]); + else + m_pcInfo1->setTextFont(g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_INFO]); if (m_vMovieInfo.empty() || m_movieSelectionHandler == NULL) return; - std::string fname; - if (show_mode == MB_SHOW_YT) { - fname = m_movieSelectionHandler->tfile; - } else { - fname = getScreenshotName(m_movieSelectionHandler->file.Name, S_ISDIR(m_movieSelectionHandler->file.Mode)); - if ((fname.empty()) && (m_movieSelectionHandler->file.Name.length() > 18)) { - std::string cover = m_movieSelectionHandler->file.Name; - cover.replace((cover.length()-18),15,""); //covername without yyyymmdd_hhmmss - fname = getScreenshotName(cover); - } - } - bool logo_ok = (!fname.empty()); - int flogo_w = 0, flogo_h = 0; - if (logo_ok) { - flogo_w = (int)(((float)16 / (float)9) * (float)m_cBoxFrameInfo.iHeight); - flogo_h = m_cBoxFrameInfo.iHeight*90/100; + refreshChannelLogo(); + + initMovieCover(); + int cover_x_offset = 0; + int cover_y_offset = 0; + if (m_movieCover) + { + cover_x_offset = m_movieCover->getWidth(); + cover_y_offset = m_movieCover->getHeight(); + if (cover_x_offset) + cover_x_offset += 2*OFFSET_INNER_MID; + if (cover_y_offset) + cover_y_offset += 2*OFFSET_INNER_MID; } -// static int logo_w = 0; -// static int logo_h = 0; - int logo_w_max = m_cBoxFrameTitleRel.iWidth / 4; + std::string pcInfo1_content = " "; + if (m_windowFocus == MB_FOCUS_BROWSER && m_settings.browserAdditional) + { + m_pcInfo2->setWindowMaxDimensions(m_cBoxFrameInfo2.iWidth, m_cBoxFrameInfo2.iHeight - cover_y_offset); + m_pcInfo2->setWindowMinDimensions(m_cBoxFrameInfo2.iWidth, m_cBoxFrameInfo2.iHeight - cover_y_offset); + m_pcInfo2->movePosition(m_cBoxFrameInfo2.iX, m_cBoxFrameInfo2.iY + cover_y_offset); + m_pcInfo2->setText(&m_movieSelectionHandler->epgInfo2); - //printf("refreshMovieInfo: EpgId %llx id %llx y %d\n", m_movieSelectionHandler->epgId, m_movieSelectionHandler->channelId, m_cBoxFrameTitleRel.iY); - int lx = 0;//never read m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX+m_cBoxFrameTitleRel.iWidth-logo_w-10; - int ly = 0;//never read m_cBoxFrameTitleRel.iY+m_cBoxFrame.iY+ (m_cBoxFrameTitleRel.iHeight-logo_h)/2; - short pb_hdd_offset = 104; - if (show_mode == MB_SHOW_YT) - pb_hdd_offset = 0; - - if (CChannelLogo && (old_EpgId != m_movieSelectionHandler->epgId >>16)) { - if (newHeader) - CChannelLogo->clearFbData(); // reset logo screen data - else - CChannelLogo->hide(); - delete CChannelLogo; - CChannelLogo = NULL; + pcInfo1_content = m_movieSelectionHandler->epgInfo1; + pcInfo1_content += "\n"; + pcInfo1_content += m_movieSelectionHandler->channelName; } - if (old_EpgId != m_movieSelectionHandler->epgId >>16) { - if (CChannelLogo == NULL) - CChannelLogo = new CComponentsChannelLogoScalable(0, 0, m_movieSelectionHandler->channelName, m_movieSelectionHandler->epgId >>16); //TODO: add logo into header as item - old_EpgId = m_movieSelectionHandler->epgId >>16; + else + { + pcInfo1_content = m_movieSelectionHandler->epgInfo2; + } + m_pcInfo1->setText(&pcInfo1_content, m_cBoxFrameInfo1.iWidth - cover_x_offset); + + updateInfoSelection(); + + refreshMovieCover(); + + if (m_windowFocus == MB_FOCUS_BROWSER) + refreshDetailsLine(m_pcBrowser->getSelectedLineRel()); +} + +void CMovieBrowser::hideDetailsLine() +{ + refreshDetailsLine(-1); +} + +void CMovieBrowser::refreshDetailsLine(int pos) +{ + if (m_detailsLine) + { + m_detailsLine->kill(); + delete m_detailsLine; + m_detailsLine = NULL; } - if (CChannelLogo && CChannelLogo->hasLogo()) { - //scale image if required, TODO: move into an own handler, eg. header, so channel logo should be paint in header object - int h_logo = CChannelLogo->getHeight(); - if (h_logo > m_cBoxFrameTitleRel.iHeight){ - uint8_t ratio = m_cBoxFrameTitleRel.iHeight*100/h_logo; - CChannelLogo->setHeight(m_cBoxFrameTitleRel.iHeight); - int w_logo = ratio*CChannelLogo->getWidth()/100; - CChannelLogo->setWidth(min(w_logo, logo_w_max)); - } + if (pos >= 0) + { + int fheight = g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_LIST]->getHeight(); + int hheight = m_pcBrowser->getHeaderListHeight(); + int theight = m_pcBrowser->getTitleHeight(); - lx = m_cBoxFrame.iX+m_cBoxFrameTitleRel.iX+m_cBoxFrameTitleRel.iWidth-CChannelLogo->getWidth()-10; - ly = m_cBoxFrameTitleRel.iY+m_cBoxFrame.iY+ (m_cBoxFrameTitleRel.iHeight-CChannelLogo->getHeight())/2; - CChannelLogo->setXPos(lx - pb_hdd_offset); - CChannelLogo->setYPos(ly); - CChannelLogo->hide(); - CChannelLogo->paint(); - newHeader = false; + int xpos = m_cBoxFrameBrowserList.iX - ConnectLineBox_Width; + int ypos1 = m_cBoxFrameBrowserList.iY + hheight + theight + OFFSET_INNER_MID + pos*fheight + (fheight/2); + int ypos2 = m_cBoxFrameInfo1.iY + (m_cBoxFrameInfo1.iHeight/2); + + if (m_detailsLine == NULL) + m_detailsLine = new CComponentsDetailLine(xpos, ypos1, ypos2, fheight/2, m_cBoxFrameInfo1.iHeight-2*RADIUS_LARGE); + m_detailsLine->paint(false); } - - if (pic){ - if (pic->getPictureName() != fname || !logo_ok){ - delete pic; pic = NULL; - } - } - - if (m_settings.gui != MB_GUI_FILTER && logo_ok) { - lx = m_cBoxFrameInfo.iX + m_cBoxFrameBrowserList.iWidth - flogo_w -14; - ly = m_cBoxFrameInfo.iY + (m_cBoxFrameInfo.iHeight-flogo_h)/2; - if (pic == NULL){ //TODO: paint custom covers with different ratio, currently only works with default ratio HD 16/9 - pic = new CComponentsPicture(lx, ly, fname, NULL, CC_SHADOW_ON, COL_MENUCONTENTDARK_PLUS_0, COL_MENUCONTENT_PLUS_0); - - if (pic->getHeight() < flogo_h/2){ - flogo_h = flogo_h/2; - pic->setYPos(m_cBoxFrameInfo.iY + (m_cBoxFrameInfo.iHeight-flogo_h)/2); - } - pic->setHeight(flogo_h, true); - pic->enableFrame(true, 2); - pic->doPaintBg(false); - flogo_w = pic->getWidth(); - pic->setXPos(m_cBoxFrameInfo.iX + m_cBoxFrameInfo.iWidth - flogo_w - 24); - } - - if (!m_movieSelectionHandler->epgInfo2.empty()){ - if (m_pcInfo->OnAfterScrollPage.empty()){ - pic->enableCache(); - m_pcInfo->OnAfterScrollPage.connect(sigc::mem_fun(pic, &CComponentsPicture::paint0)); - } - } - - } - if (pic) - flogo_w = pic->getWidth(); - m_pcInfo->setText(&m_movieSelectionHandler->epgInfo2, m_cBoxFrameInfo.iWidth - flogo_w - (flogo_w ? 24 : 0)); - if (pic) - pic->paint(CC_SAVE_SCREEN_NO); } void CMovieBrowser::info_hdd_level(bool paint_hdd) @@ -1376,8 +1553,8 @@ void CMovieBrowser::info_hdd_level(bool paint_hdd) pb.setValues(blocks_percent_used, 100); pb.paint(false); } - } + void CMovieBrowser::refreshLCD(void) { if (m_vMovieInfo.empty() || m_movieSelectionHandler == NULL) @@ -1414,7 +1591,7 @@ void CMovieBrowser::refreshFilterList(void) } else { - std::string tmp = g_Locale->getText(LOCALE_MENU_BACK); + std::string tmp = g_Locale->getText(LOCALE_MOVIEBROWSER_FILTER_OFF); m_FilterLines.lineArray[0].push_back(tmp); if (m_settings.filter.item == MB_INFO_FILEPATH) @@ -1673,17 +1850,19 @@ int CMovieBrowser::refreshFoot(bool show) int ok_loc_len = std::max(FOOT_FONT->getRenderWidth(g_Locale->getText(LOCALE_BOOKMARKMANAGER_SELECT), true), FOOT_FONT->getRenderWidth(g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_PLAY), true)); std::string filter_text = g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_FILTER); + filter_text += " "; filter_text += m_settings.filter.optionString; std::string sort_text = g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_SORT); - sort_text += g_Locale->getText(m_localizedItemName[m_settings.sorting.item]); - int sort_text_len = FOOT_FONT->getRenderWidth(g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_SORT), true); + sort_text += " "; + int sort_text_len = FOOT_FONT->getRenderWidth(sort_text, true); int len = 0; for (int i = 0; m_localizedItemName[i] != NONEXISTANT_LOCALE; i++) len = std::max(len, FOOT_FONT->getRenderWidth(g_Locale->getText(m_localizedItemName[i]), true)); sort_text_len += len; + sort_text += g_Locale->getText(m_localizedItemName[m_settings.sorting.item]); button_label_ext footerButtons[] = { - { NEUTRINO_ICON_BUTTON_RED, NONEXISTANT_LOCALE, sort_text.c_str(), sort_text_len, false }, + { NEUTRINO_ICON_BUTTON_RED, NONEXISTANT_LOCALE, sort_text.c_str(), sort_text_len, false }, { NEUTRINO_ICON_BUTTON_GREEN, NONEXISTANT_LOCALE, filter_text.c_str(), 0, true }, { NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_MOVIEBROWSER_FOOT_FOCUS, NULL, 0, false }, { NEUTRINO_ICON_BUTTON_BLUE, LOCALE_MOVIEBROWSER_FOOT_REFRESH, NULL, 0, false }, @@ -1695,7 +1874,7 @@ int CMovieBrowser::refreshFoot(bool show) int cnt = sizeof(footerButtons) / sizeof(button_label_ext); if (show) - return paintButtons(footerButtons + offset, cnt - offset, m_cBoxFrame.iX+m_cBoxFrameFootRel.iX, m_cBoxFrame.iY+m_cBoxFrameFootRel.iY, m_cBoxFrameFootRel.iWidth, m_cBoxFrameFootRel.iHeight, m_cBoxFrameFootRel.iWidth); + return paintButtons(footerButtons + offset, cnt - offset, m_cBoxFrameFootRel.iX, m_cBoxFrameFootRel.iY, m_cBoxFrameFootRel.iWidth, m_cBoxFrameFootRel.iHeight, m_cBoxFrameFootRel.iWidth); else return paintButtons(footerButtons, cnt, 0, 0, 0, 0, 0, false, NULL, NULL); } @@ -1713,7 +1892,7 @@ bool CMovieBrowser::onButtonPress(neutrino_msg_t msg) result = onButtonPressLastPlayList(msg); else if (m_windowFocus == MB_FOCUS_LAST_RECORD) result = onButtonPressLastRecordList(msg); - else if (m_windowFocus == MB_FOCUS_MOVIE_INFO) + else if (m_windowFocus == MB_FOCUS_MOVIE_INFO1 || m_windowFocus == MB_FOCUS_MOVIE_INFO2) result = onButtonPressMovieInfoList(msg); else if (m_windowFocus == MB_FOCUS_FILTER) result = onButtonPressFilterList(msg); @@ -1752,32 +1931,32 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg) else if (msg == (neutrino_msg_t) g_settings.mbkey_cover) { if (m_movieSelectionHandler != NULL) { - std::string fname = getScreenshotName(m_movieSelectionHandler->file.Name, S_ISDIR(m_movieSelectionHandler->file.Mode)); - if (!fname.empty()) + std::string cover_file = getScreenshotName(m_movieSelectionHandler->file.Name, S_ISDIR(m_movieSelectionHandler->file.Mode)); + if (!cover_file.empty()) { //delete Cover if (ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEBROWSER_DELETE_SCREENSHOT, CMsgBox::mbrNo, CMsgBox:: mbYes | CMsgBox::mbNo) == CMsgBox::mbrYes) { - unlink(fname.c_str()); + unlink(cover_file.c_str()); refresh(); } } else if (g_settings.tmdb_enabled) { //add TMDB Cover - fname = m_movieSelectionHandler->file.Name.c_str(); + cover_file = m_movieSelectionHandler->file.Name.c_str(); int ext_pos = 0; - ext_pos = fname.rfind('.'); + ext_pos = cover_file.rfind('.'); if( ext_pos > 0) { std::string extension; - extension = fname.substr(ext_pos + 1, fname.length() - ext_pos); + extension = cover_file.substr(ext_pos + 1, cover_file.length() - ext_pos); extension = "." + extension; - str_replace(extension, ".jpg", fname); - printf("TMDB: %s : %s\n",m_movieSelectionHandler->file.Name.c_str(),fname.c_str()); + str_replace(extension, ".jpg", cover_file); + printf("TMDB: %s : %s\n",m_movieSelectionHandler->file.Name.c_str(),cover_file.c_str()); cTmdb* tmdb = new cTmdb(m_movieSelectionHandler->epgTitle); if ((tmdb->getResults() > 0) && (tmdb->hasCover())) { - if (!fname.empty()) - if (tmdb->getSmallCover(fname)) + if (!cover_file.empty()) + if (tmdb->getSmallCover(cover_file)) refresh(); } if (tmdb) @@ -1795,12 +1974,16 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg) } else if (msg == CRCInput::RC_left) { - if (show_mode != MB_SHOW_YT) + if (m_windowFocus == MB_FOCUS_MOVIE_INFO2 && m_settings.browserAdditional) + onSetFocusNext(); + else if (show_mode != MB_SHOW_YT) onSetGUIWindowPrev(); } else if (msg == CRCInput::RC_right) { - if (show_mode != MB_SHOW_YT) + if (m_windowFocus == MB_FOCUS_BROWSER && m_settings.browserAdditional) + onSetFocusNext(); + else if (show_mode != MB_SHOW_YT) onSetGUIWindowNext(); } else if (msg == CRCInput::RC_green) @@ -2086,7 +2269,7 @@ bool CMovieBrowser::onButtonPressFilterList(neutrino_msg_t msg) if (selected_line == 0) { m_settings.filter.item = MB_INFO_MAX_NUMBER; - m_settings.filter.optionString = ""; + m_settings.filter.optionString = g_Locale->getText(LOCALE_OPTIONS_OFF); m_settings.filter.optionVar = 0; refreshFilterList(); m_pcFilter->setSelectedLine(0); @@ -2116,12 +2299,20 @@ bool CMovieBrowser::onButtonPressMovieInfoList(neutrino_msg_t msg) bool result = true; if (msg == CRCInput::RC_up) - m_pcInfo->scrollPageUp(1); + if (m_windowFocus == MB_FOCUS_MOVIE_INFO2 && m_settings.browserAdditional) + m_pcInfo2->scrollPageUp(1); + else + m_pcInfo1->scrollPageUp(1); else if (msg == CRCInput::RC_down) - m_pcInfo->scrollPageDown(1); + if (m_windowFocus == MB_FOCUS_MOVIE_INFO2 && m_settings.browserAdditional) + m_pcInfo2->scrollPageDown(1); + else + m_pcInfo1->scrollPageDown(1); else result = false; + updateInfoSelection(); + return (result); } @@ -2186,9 +2377,9 @@ bool CMovieBrowser::onDeleteFile(MI_MOVIE_INFO *movieinfo, bool skipAsk) hintBox->paint(); delFile(movieinfo->file); - std::string fname = getScreenshotName(movieinfo->file.Name, S_ISDIR(movieinfo->file.Mode)); - if (!fname.empty()) - unlink(fname.c_str()); + std::string cover_file = getScreenshotName(movieinfo->file.Name, S_ISDIR(movieinfo->file.Mode)); + if (!cover_file.empty()) + unlink(cover_file.c_str()); CFile file_xml = movieinfo->file; if (m_movieInfo.convertTs2XmlName(file_xml.Name)) @@ -2314,6 +2505,7 @@ void CMovieBrowser::onSetGUIWindow(MB_GUI gui) m_pcBrowser->hide(); m_pcFilter->hide(); + m_pcInfo2->hide(); m_pcLastRecord->paint(); m_pcLastPlay->paint(); @@ -2329,6 +2521,7 @@ void CMovieBrowser::onSetGUIWindow(MB_GUI gui) m_pcBrowser->hide(); m_pcFilter->hide(); + m_pcInfo2->hide(); m_pcLastRecord->paint(); m_pcLastPlay->paint(); @@ -2338,13 +2531,21 @@ void CMovieBrowser::onSetGUIWindow(MB_GUI gui) m_showMovieInfo = false; - m_pcInfo->hide(); + m_pcInfo1->hide(); + if (m_windowFocus == MB_FOCUS_BROWSER && m_settings.browserAdditional) + { + hideMovieCover(); + m_pcInfo2->clear(); + } + hideDetailsLine(); m_pcFilter->paint(); onSetFocus(MB_FOCUS_FILTER); } if (m_showMovieInfo) { - m_pcInfo->paint(); + m_pcInfo1->paint(); + if (m_windowFocus == MB_FOCUS_BROWSER && m_settings.browserAdditional) + m_pcInfo2->paint(); refreshMovieInfo(); } } @@ -2390,6 +2591,8 @@ void CMovieBrowser::onSetFocus(MB_FOCUS new_focus) m_pcFilter->showSelection(true); updateMovieSelection(); + if (m_windowFocus != MB_FOCUS_FILTER) + updateInfoSelection(); refreshFoot(); } @@ -2407,23 +2610,26 @@ void CMovieBrowser::onSetFocusNext(void) else if (m_settings.gui == MB_GUI_MOVIE_INFO) { if (m_windowFocus == MB_FOCUS_BROWSER) - onSetFocus(MB_FOCUS_MOVIE_INFO); + if (m_settings.browserAdditional) + onSetFocus(MB_FOCUS_MOVIE_INFO2); + else + onSetFocus(MB_FOCUS_MOVIE_INFO1); else onSetFocus(MB_FOCUS_BROWSER); } else if (m_settings.gui == MB_GUI_LAST_PLAY) { - if (m_windowFocus == MB_FOCUS_MOVIE_INFO) + if (m_windowFocus == MB_FOCUS_MOVIE_INFO1 || m_windowFocus == MB_FOCUS_MOVIE_INFO2) onSetFocus(MB_FOCUS_LAST_PLAY); else if (m_windowFocus == MB_FOCUS_LAST_PLAY) - onSetFocus(MB_FOCUS_MOVIE_INFO); + onSetFocus(MB_FOCUS_MOVIE_INFO1); } else if (m_settings.gui == MB_GUI_LAST_RECORD) { - if (m_windowFocus == MB_FOCUS_MOVIE_INFO) + if (m_windowFocus == MB_FOCUS_MOVIE_INFO1 || m_windowFocus == MB_FOCUS_MOVIE_INFO2) onSetFocus(MB_FOCUS_LAST_RECORD); else if (m_windowFocus == MB_FOCUS_LAST_RECORD) - onSetFocus(MB_FOCUS_MOVIE_INFO); + onSetFocus(MB_FOCUS_MOVIE_INFO1); } } @@ -2761,6 +2967,25 @@ void CMovieBrowser::updateMovieSelection(void) //TRACE("\n"); } +void CMovieBrowser::updateInfoSelection(void) +{ + int col_frame; + int thickness = 2; + int radius = m_pcInfo1->getBackGroundRadius(); + + /* + Maybe we should change background of box + instead of changing frame color. + */ + if (m_windowFocus == MB_FOCUS_MOVIE_INFO1) + col_frame = COL_MENUCONTENTSELECTED_PLUS_2; + else + col_frame = COL_FRAME_PLUS_0; + + // CTextBox can't paint frames, so let's do it "manually" + framebuffer->paintBoxFrame(m_cBoxFrameInfo1.iX, m_cBoxFrameInfo1.iY, m_cBoxFrameInfo1.iWidth, m_cBoxFrameInfo1.iHeight, thickness, col_frame, radius); +} + void CMovieBrowser::updateFilterSelection(void) { //TRACE("[mb]->updateFilterSelection \n"); @@ -3087,6 +3312,7 @@ bool CMovieBrowser::showMenu(bool calledExternally) /** optionsMenuBrowser **************************************************/ int oldRowNr = m_settings.browserRowNr; int oldFrameHeight = m_settings.browserFrameHeight; + int oldAdditional = m_settings.browserAdditional; CIntInput playMaxUserIntInput(LOCALE_MOVIEBROWSER_LAST_PLAY_MAX_ITEMS, (int *)&m_settings.lastPlayMaxItems, 3, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE); CIntInput recMaxUserIntInput(LOCALE_MOVIEBROWSER_LAST_RECORD_MAX_ITEMS, (int *)&m_settings.lastRecordMaxItems, 3, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE); CIntInput browserFrameUserIntInput(LOCALE_MOVIEBROWSER_BROWSER_FRAME_HIGH, (int *)&m_settings.browserFrameHeight, 3, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE); @@ -3097,6 +3323,7 @@ bool CMovieBrowser::showMenu(bool calledExternally) optionsMenuBrowser.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_LAST_PLAY_MAX_ITEMS, true, playMaxUserIntInput.getValue(), &playMaxUserIntInput)); optionsMenuBrowser.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_LAST_RECORD_MAX_ITEMS, true, recMaxUserIntInput.getValue(), &recMaxUserIntInput)); optionsMenuBrowser.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BROWSER_FRAME_HIGH, true, browserFrameUserIntInput.getValue(), &browserFrameUserIntInput)); + optionsMenuBrowser.addItem(new CMenuOptionChooser(LOCALE_MOVIEBROWSER_BROWSER_ADDITIONAL, (int*)(&m_settings.browserAdditional), MESSAGEBOX_YES_NO_OPTIONS, MESSAGEBOX_YES_NO_OPTIONS_COUNT, true)); optionsMenuBrowser.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MOVIEBROWSER_BROWSER_ROW_HEAD)); optionsMenuBrowser.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BROWSER_ROW_NR, true, browserRowNrIntInput.getValue(), &browserRowNrIntInput)); optionsMenuBrowser.addItem(GenericMenuSeparator); @@ -3180,7 +3407,24 @@ bool CMovieBrowser::showMenu(bool calledExternally) if (ts_only != m_settings.ts_only || dirMenu.isChanged()) loadMovies(false); - if (oldRowNr != m_settings.browserRowNr || oldFrameHeight != m_settings.browserFrameHeight) { + bool reInitFrames = ( + m_settings.browserRowNr != oldRowNr + || m_settings.browserFrameHeight != oldFrameHeight + || m_settings.browserAdditional != oldAdditional + ); + + if (reInitFrames) { +#if 1 + if (m_settings.browserAdditional && oldAdditional != m_settings.browserAdditional) + { + /* + Bad 'hack' to force a smaller m_pcInfo1 box. + This can be reconfigured by user later. + It's just to align view to channellist's view. + */ + m_settings.browserFrameHeight = 75; + } +#endif initFrames(); hide(); paint(); diff --git a/src/gui/moviebrowser/mb.h b/src/gui/moviebrowser/mb.h index aefffc146..3bd73fa17 100644 --- a/src/gui/moviebrowser/mb.h +++ b/src/gui/moviebrowser/mb.h @@ -96,6 +96,7 @@ typedef struct int browserRowNr; MB_INFO_ITEM browserRowItem[MB_MAX_ROWS]; int browserRowWidth[MB_MAX_ROWS]; + int browserAdditional; // to be added to config later int lastPlayMaxItems; @@ -144,23 +145,29 @@ class CMovieBrowser : public CMenuTarget private: // Variables CFrameBuffer * framebuffer; - CComponentsPicture *pic; + CListFrame* m_pcBrowser; CListFrame* m_pcLastPlay; CListFrame* m_pcLastRecord; - CTextBox* m_pcInfo; + CTextBox* m_pcInfo1; // bottom box + CTextBox* m_pcInfo2; // right box CListFrame* m_pcFilter; CBox m_cBoxFrame; CBox m_cBoxFrameLastPlayList; CBox m_cBoxFrameLastRecordList; CBox m_cBoxFrameBrowserList; - CBox m_cBoxFrameInfo; + CBox m_cBoxFrameInfo1; + CBox m_cBoxFrameInfo2; CBox m_cBoxFrameBookmarkList; CBox m_cBoxFrameFilter; CBox m_cBoxFrameFootRel; CBox m_cBoxFrameTitleRel; + CComponentsDetailLine *m_detailsLine; + CComponentsChannelLogo *m_channelLogo; + CComponentsPicture *m_movieCover; + LF_LINES m_browserListLines; LF_LINES m_recordListLines; LF_LINES m_playListLines; @@ -214,7 +221,6 @@ class CMovieBrowser : public CMenuTarget CFileList::iterator filelist_it; P_MI_MOVIE_LIST movielist; - CComponentsChannelLogo* CChannelLogo; uint64_t old_EpgId; int movieInfoUpdateAll[MB_INFO_MAX_NUMBER]; int movieInfoUpdateAllIfDestEmptyOnly; @@ -284,10 +290,16 @@ class CMovieBrowser : public CMenuTarget void refreshBrowserList(void); //P1 void refreshFilterList(void); //P1 void refreshMovieInfo(void); //P1 + void refreshChannelLogo(void); //P1 + void initMovieCover(void); //P1 + void refreshMovieCover(void); //P1 + void hideMovieCover(void); //P1 int refreshFoot(bool show = true); //P2 void refreshTitle(void); //P2 void refreshInfo(void); // P2 void refreshLCD(void); // P2 + void refreshDetailsLine(int pos); + void hideDetailsLine(); ///// Events /////////////////////////// bool onButtonPress(neutrino_msg_t msg); // P1 @@ -339,6 +351,7 @@ class CMovieBrowser : public CMenuTarget bool isParentalLock(MI_MOVIE_INFO& movie_info); bool getMovieInfoItem(MI_MOVIE_INFO& movie_info, MB_INFO_ITEM item, std::string* item_string); void updateMovieSelection(void); + void updateInfoSelection(void); void updateFilterSelection(void); void updateSerienames(void); void autoFindSerie(void); @@ -352,7 +365,6 @@ class CMovieBrowser : public CMenuTarget bool addFile(CFile &file, int dirItNr); }; - // I tried a lot to use the menu.cpp as ListBox selection, and I got three solution which are all garbage. //Might be replaced by somebody who is familiar with this stuff . @@ -365,7 +377,6 @@ class CSelectedMenu : public CMenuTarget inline int exec(CMenuTarget* /*parent*/, const std::string & /*actionKey*/){selected = true; return menu_return::RETURN_EXIT;}; }; - // This Class creates a menue item, which writes its caption to an given string (or an given int value to an given variable). // The programm could use this class to verify, what menu was selected. // A good listbox class might do the same. There might be better ways to do so. @@ -397,7 +408,6 @@ class CMenuWidgetSelection : public CMenuWidget int getSelectedLine(void){return exit_pressed ? -1 : selected;}; }; - class CFileChooser : public CMenuWidget { private: @@ -408,8 +418,6 @@ class CFileChooser : public CMenuWidget int exec(CMenuTarget* parent, const std::string & actionKey); }; - - class CDirMenu : public CMenuWidget { private: @@ -428,7 +436,4 @@ class CDirMenu : public CMenuWidget bool isChanged(){return changed;}; }; - - - #endif /*MOVIEBROWSER_H_*/ diff --git a/src/gui/moviebrowser/mb_types.h b/src/gui/moviebrowser/mb_types.h index b260d0ec7..30ba01b93 100644 --- a/src/gui/moviebrowser/mb_types.h +++ b/src/gui/moviebrowser/mb_types.h @@ -104,9 +104,10 @@ typedef enum MB_FOCUS_BROWSER = 0, MB_FOCUS_LAST_PLAY = 1, MB_FOCUS_LAST_RECORD = 2, - MB_FOCUS_MOVIE_INFO = 3, - MB_FOCUS_FILTER = 4, - MB_FOCUS_MAX_NUMBER = 5 // MUST be allways the last item in the list + MB_FOCUS_MOVIE_INFO1 = 3, + MB_FOCUS_MOVIE_INFO2 = 4, + MB_FOCUS_FILTER = 5, + MB_FOCUS_MAX_NUMBER = 6 // MUST be allways the last item in the list }MB_FOCUS; typedef enum diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index 5a96b2ecf..9a33ff1c7 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -1371,8 +1371,8 @@ void CTimerList::paintItem(int pos) void CTimerList::paintHead() { - CComponentsHeaderLocalized header(x, y, width, theight, LOCALE_TIMERLIST_NAME, NEUTRINO_ICON_TIMER, CComponentsHeader::CC_BTN_EXIT, NULL, CC_SHADOW_ON); - header.enableClock(true, "%d.%m.%Y %H:%M"); + CComponentsHeaderLocalized header(x, y, width, theight, LOCALE_TIMERLIST_NAME, NEUTRINO_ICON_TIMER, CComponentsHeader::CC_BTN_MENU | CComponentsHeader::CC_BTN_EXIT, NULL, CC_SHADOW_ON); + header.enableClock(true, "%d.%m.%Y %H:%M"); header.paint(CC_SAVE_SCREEN_NO); } diff --git a/src/gui/widget/listframe.cpp b/src/gui/widget/listframe.cpp index 01cbcd52c..4b9495fba 100644 --- a/src/gui/widget/listframe.cpp +++ b/src/gui/widget/listframe.cpp @@ -55,10 +55,7 @@ #include "listframe.h" #include -#define TEXT_BORDER_WIDTH 8 -#define ROW_BORDER_WIDTH 4 -#define SCROLL_FRAME_WIDTH 10 -#define SCROLL_MARKER_BORDER 2 +#define SCROLL_FRAME_WIDTH 10 #define MAX_WINDOW_WIDTH (frameBuffer->getScreenWidth() - 40) #define MAX_WINDOW_HEIGHT (frameBuffer->getScreenHeight() - 40) @@ -190,9 +187,11 @@ void CListFrame::initVar(void) m_nCurrentPage = 0; m_nSelectedLine = 0; + m_nBgRadius = RADIUS_NONE; + m_cFrame.iX = frameBuffer->getScreenX() + ((frameBuffer->getScreenWidth() - MIN_WINDOW_WIDTH) >>1); - m_cFrame.iWidth = MIN_WINDOW_WIDTH; m_cFrame.iY = frameBuffer->getScreenY() + ((frameBuffer->getScreenHeight() - MIN_WINDOW_HEIGHT) >>1); + m_cFrame.iWidth = MIN_WINDOW_WIDTH; m_cFrame.iHeight = MIN_WINDOW_HEIGHT; m_nMaxHeight = MAX_WINDOW_HEIGHT; @@ -204,7 +203,7 @@ void CListFrame::reSizeMainFrameWidth(int textWidth) { //TRACE("[CListFrame]->ReSizeMainFrameWidth: %d, current: %d\r\n",textWidth,m_cFrameListRel.iWidth); - int iNewWindowWidth = textWidth + m_cFrameScrollRel.iWidth + 2*TEXT_BORDER_WIDTH; + int iNewWindowWidth = textWidth + m_cFrameScrollRel.iWidth + 2*OFFSET_INNER_MID; if( iNewWindowWidth > m_nMaxWidth) iNewWindowWidth = m_nMaxWidth; if((unsigned int) iNewWindowWidth < MIN_WINDOW_WIDTH) iNewWindowWidth = MIN_WINDOW_WIDTH; @@ -219,7 +218,7 @@ void CListFrame::reSizeMainFrameHeight(int textHeight) { //TRACE("[CListFrame]->ReSizeMainFrameHeight: %d, current: %d\r\n",textHeight,m_cFrameListRel.iHeight); - int iNewWindowHeight = textHeight + 2*TEXT_BORDER_WIDTH; + int iNewWindowHeight = textHeight + 2*OFFSET_INNER_MID; if( iNewWindowHeight > m_nMaxHeight) iNewWindowHeight = m_nMaxHeight; if( iNewWindowHeight < MIN_WINDOW_HEIGHT) iNewWindowHeight = MIN_WINDOW_HEIGHT; @@ -236,8 +235,8 @@ void CListFrame::initFramesRel(void) if(m_nMode & TITLE) { - m_cFrameTitleRel.iX = 0; - m_cFrameTitleRel.iY = 0; + m_cFrameTitleRel.iX = 0; + m_cFrameTitleRel.iY = 0; m_cFrameTitleRel.iHeight = m_nFontTitleHeight +2 ; m_cFrameTitleRel.iWidth = m_cFrame.iWidth ; } @@ -245,51 +244,51 @@ void CListFrame::initFramesRel(void) { m_cFrameTitleRel.iX = 0; m_cFrameTitleRel.iY = 0; - m_cFrameTitleRel.iHeight= 0; - m_cFrameTitleRel.iWidth = 0; + m_cFrameTitleRel.iHeight = 0; + m_cFrameTitleRel.iWidth = 0; } if(m_nMode & HEADER_LINE) { - m_cFrameHeaderListRel.iX = 0; - m_cFrameHeaderListRel.iY = 0 + m_cFrameTitleRel.iHeight; + m_cFrameHeaderListRel.iX = 0; + m_cFrameHeaderListRel.iY = 0 + m_cFrameTitleRel.iHeight; m_cFrameHeaderListRel.iHeight = m_nFontHeaderListHeight ; } else { - m_cFrameHeaderListRel.iX = 0; - m_cFrameHeaderListRel.iY = 0; + m_cFrameHeaderListRel.iX = 0; + m_cFrameHeaderListRel.iY = 0; m_cFrameHeaderListRel.iHeight = 0; m_cFrameHeaderListRel.iWidth = 0; } m_cFrameListRel.iX = 0; m_cFrameListRel.iY = m_cFrameHeaderListRel.iHeight + m_cFrameTitleRel.iHeight; - m_cFrameListRel.iHeight = m_cFrame.iHeight - m_cFrameHeaderListRel.iHeight - m_cFrameTitleRel.iHeight; + m_cFrameListRel.iHeight = m_cFrame.iHeight - m_cFrameHeaderListRel.iHeight - m_cFrameTitleRel.iHeight; if(m_nMode & SCROLL) { m_cFrameScrollRel.iX = m_cFrame.iWidth - SCROLL_FRAME_WIDTH; m_cFrameScrollRel.iY = m_cFrameTitleRel.iHeight; m_cFrameScrollRel.iWidth = SCROLL_FRAME_WIDTH; - m_cFrameScrollRel.iHeight = m_cFrameListRel.iHeight + m_cFrameHeaderListRel.iHeight; + m_cFrameScrollRel.iHeight = m_cFrameHeaderListRel.iHeight + m_cFrameListRel.iHeight - m_nBgRadius; } else { m_cFrameScrollRel.iX = 0; m_cFrameScrollRel.iY = 0; - m_cFrameScrollRel.iHeight = 0; m_cFrameScrollRel.iWidth = 0; + m_cFrameScrollRel.iHeight = 0; } - m_cFrameListRel.iWidth = m_cFrame.iWidth - m_cFrameScrollRel.iWidth; + m_cFrameListRel.iWidth = m_cFrame.iWidth - m_cFrameScrollRel.iWidth; if(m_nMode & HEADER_LINE) { m_cFrameHeaderListRel.iWidth = m_cFrame.iWidth - m_cFrameScrollRel.iWidth; } - m_nLinesPerPage = (m_cFrameListRel.iHeight - (2*TEXT_BORDER_WIDTH)) / m_nFontListHeight; + m_nLinesPerPage = (m_cFrameListRel.iHeight - (2*OFFSET_INNER_MID)) / m_nFontListHeight; } void CListFrame::onNewLineArray(void) @@ -311,7 +310,7 @@ void CListFrame::onNewLineArray(void) { reSizeMainFrameHeight(m_nNrOfLines * m_nFontListHeight); } - m_nLinesPerPage = (m_cFrameListRel.iHeight - (2*TEXT_BORDER_WIDTH)) / m_nFontListHeight; + m_nLinesPerPage = (m_cFrameListRel.iHeight - (2*OFFSET_INNER_MID)) / m_nFontListHeight; if(m_nLinesPerPage <= 0) m_nLinesPerPage = 1; @@ -354,11 +353,12 @@ void CListFrame::refreshTitle(void) if( frameBuffer == NULL) return; frameBuffer->paintBoxRel(m_cFrameTitleRel.iX+m_cFrame.iX, m_cFrameTitleRel.iY+m_cFrame.iY, - m_cFrameTitleRel.iWidth, m_cFrameTitleRel.iHeight, TITLE_BACKGROUND_COLOR); + m_cFrameTitleRel.iWidth, m_cFrameTitleRel.iHeight, TITLE_BACKGROUND_COLOR, + m_nBgRadius, CORNER_TOP); - m_pcFontTitle->RenderString(m_cFrameTitleRel.iX + TEXT_BORDER_WIDTH + m_cFrame.iX, + m_pcFontTitle->RenderString(m_cFrameTitleRel.iX + OFFSET_INNER_MID + m_cFrame.iX, m_cFrameTitleRel.iY + m_cFrameTitleRel.iHeight + m_cFrame.iY, - m_cFrameTitleRel.iWidth - (TEXT_BORDER_WIDTH << 1), + m_cFrameTitleRel.iWidth - (OFFSET_INNER_MID << 1), m_textTitle.c_str(), TITLE_FONT_COLOR); } @@ -376,17 +376,18 @@ void CListFrame::refreshScroll(void) if (1) { frameBuffer->paintBoxRel(m_cFrameScrollRel.iX+m_cFrame.iX, m_cFrameScrollRel.iY+m_cFrame.iY, - m_cFrameScrollRel.iWidth, m_cFrameScrollRel.iHeight, COL_MENUCONTENT_PLUS_0); + m_cFrameScrollRel.iWidth, m_cFrameHeaderListRel.iHeight + m_cFrameListRel.iHeight, COL_MENUCONTENT_PLUS_0, + m_nBgRadius, CORNER_BOTTOM_RIGHT); } if (m_nNrOfPages > 1) { frameBuffer->paintBoxRel(m_cFrameScrollRel.iX+m_cFrame.iX, m_cFrameScrollRel.iY+m_cFrame.iY, m_cFrameScrollRel.iWidth, m_cFrameScrollRel.iHeight, COL_SCROLLBAR_PASSIVE_PLUS_0, RADIUS_MIN); - unsigned int marker_size = (m_cFrameScrollRel.iHeight - 2*SCROLL_MARKER_BORDER) / m_nNrOfPages; - frameBuffer->paintBoxRel(m_cFrameScrollRel.iX + SCROLL_MARKER_BORDER+m_cFrame.iX, - m_cFrameScrollRel.iY + SCROLL_MARKER_BORDER + m_nCurrentPage * marker_size +m_cFrame.iY, - m_cFrameScrollRel.iWidth - (2*SCROLL_MARKER_BORDER), + unsigned int marker_size = (m_cFrameScrollRel.iHeight - 2*OFFSET_INNER_MIN) / m_nNrOfPages; + frameBuffer->paintBoxRel(m_cFrameScrollRel.iX + OFFSET_INNER_MIN+m_cFrame.iX, + m_cFrameScrollRel.iY + OFFSET_INNER_MIN + m_nCurrentPage * marker_size +m_cFrame.iY, + m_cFrameScrollRel.iWidth - (2*OFFSET_INNER_MIN), marker_size, COL_SCROLLBAR_ACTIVE_PLUS_0, RADIUS_MIN); } } @@ -399,7 +400,7 @@ int CListFrame::paintListIcon(int x, int y, int line) frameBuffer->getIconSize(m_pLines->Icon[line].c_str(), &icol_w, &icol_h); if ((icol_w > 0) && (icol_h > 0)) { frameBuffer->paintIcon(m_pLines->Icon[line], x+m_cFrame.iX, y+m_cFrame.iY-m_nFontListHeight, m_nFontListHeight); - xDiff = icol_w + TEXT_BORDER_WIDTH; + xDiff = icol_w + OFFSET_INNER_MID; } } return xDiff; @@ -408,16 +409,17 @@ int CListFrame::paintListIcon(int x, int y, int line) void CListFrame::refreshList(void) { //TRACE("[CListFrame]->refreshList: %d\r\n",m_nCurrentLine); - if( frameBuffer == NULL) return; - frameBuffer->paintBoxRel(m_cFrameListRel.iX+m_cFrame.iX, m_cFrameListRel.iY+m_cFrame.iY, - m_cFrameListRel.iWidth, m_cFrameListRel.iHeight, COL_MENUCONTENT_PLUS_0); - - if( m_nNrOfLines <= 0) + if (frameBuffer == NULL) return; - for(int line = m_nCurrentLine; - line < m_nNrOfLines && line < m_nCurrentLine + m_nLinesPerPage; - line++) + frameBuffer->paintBoxRel(m_cFrameListRel.iX+m_cFrame.iX, m_cFrameListRel.iY+m_cFrame.iY, + m_cFrameListRel.iWidth, m_cFrameListRel.iHeight, COL_MENUCONTENT_PLUS_0, + m_nBgRadius, CORNER_BOTTOM_LEFT); + + if (m_nNrOfLines <= 0) + return; + + for (int line = m_nCurrentLine; line < m_nNrOfLines && line < m_nCurrentLine + m_nLinesPerPage; line++) { refreshLine(line); } @@ -434,7 +436,7 @@ void CListFrame::refreshLine(int line) fb_pixel_t color, bgcolor; int rel_line = line - m_nCurrentLine; - int y = m_cFrameListRel.iY + TEXT_BORDER_WIDTH + (rel_line*m_nFontListHeight); + int y = m_cFrameListRel.iY + OFFSET_INNER_MID + (rel_line*m_nFontListHeight); int radius = 0; bool selected = (line == m_nSelectedLine && m_showSelection == true); @@ -449,22 +451,22 @@ void CListFrame::refreshLine(int line) m_cFrameListRel.iWidth, m_nFontListHeight, bgcolor, radius); int width; - int x = m_cFrameListRel.iX + TEXT_BORDER_WIDTH; + int x = m_cFrameListRel.iX + OFFSET_INNER_MID; y += m_nFontListHeight; int xDiff = paintListIcon(x, y, line); - int net_width = m_cFrameListRel.iWidth - ROW_BORDER_WIDTH * (m_pLines->rows - 1); + int net_width = m_cFrameListRel.iWidth - OFFSET_INNER_SMALL * (m_pLines->rows - 1); for(int row = 0; row < m_pLines->rows; row++) { width = std::min(m_pLines->rowWidth[row] * net_width / 100, - m_cFrameListRel.iWidth - x + m_cFrameListRel.iX - TEXT_BORDER_WIDTH); + m_cFrameListRel.iWidth - x + m_cFrameListRel.iX - OFFSET_INNER_MID); if (row > 0) xDiff = 0; m_pcFontList->RenderString(x+m_cFrame.iX+xDiff, y+m_cFrame.iY, width-xDiff, m_pLines->lineArray[row][line].c_str(), color); - x += width + ROW_BORDER_WIDTH; + x += width + OFFSET_INNER_SMALL; } } @@ -478,23 +480,23 @@ void CListFrame::refreshHeaderList(void) m_cFrameHeaderListRel.iWidth, m_cFrameHeaderListRel.iHeight, HEADER_LIST_BACKGROUND_COLOR); int width; - int x = m_cFrameHeaderListRel.iX + TEXT_BORDER_WIDTH; + int x = m_cFrameHeaderListRel.iX + OFFSET_INNER_MID; int y = m_cFrameHeaderListRel.iY + m_nFontHeaderListHeight + 2; - int net_width = m_cFrameHeaderListRel.iWidth - ROW_BORDER_WIDTH * (m_pLines->rows - 1); + int net_width = m_cFrameHeaderListRel.iWidth - OFFSET_INNER_SMALL * (m_pLines->rows - 1); bool loop = true; for(int row = 0; row < m_pLines->rows && loop == true; row++) { width = m_pLines->rowWidth[row] * net_width / 100; - if (width > m_cFrameHeaderListRel.iWidth - x + m_cFrameHeaderListRel.iX - TEXT_BORDER_WIDTH) + if (width > m_cFrameHeaderListRel.iWidth - x + m_cFrameHeaderListRel.iX - OFFSET_INNER_MID) { - width = m_cFrameHeaderListRel.iWidth - x + m_cFrameHeaderListRel.iX - TEXT_BORDER_WIDTH; + width = m_cFrameHeaderListRel.iWidth - x + m_cFrameHeaderListRel.iX - OFFSET_INNER_MID; //TRACE(" normalize width to %d , x:%d \r\n",width,x); loop = false; } m_pcFontHeaderList->RenderString(x+m_cFrame.iX, y+m_cFrame.iY, width, m_pLines->lineHeader[row].c_str(), HEADER_LIST_FONT_COLOR); - x += width + ROW_BORDER_WIDTH; + x += width + OFFSET_INNER_SMALL; } } diff --git a/src/gui/widget/listframe.h b/src/gui/widget/listframe.h index 95c3b53e3..35332b4c9 100644 --- a/src/gui/widget/listframe.h +++ b/src/gui/widget/listframe.h @@ -104,6 +104,8 @@ class CListFrame int m_nCurrentPage; int m_nSelectedLine; + int m_nBgRadius; + bool m_showSelection; Font* m_pcFontTitle; @@ -141,6 +143,11 @@ class CListFrame bool setTitle(char* title); bool setSelectedLine(int selection); void setSelectedMarked(bool enable); + void setBackGroundRadius(const int radius) + { + m_nBgRadius = radius; + initFramesRel(); + }; void clearMarked() { if (m_pLines) @@ -152,6 +159,9 @@ class CListFrame inline CBox getWindowsPos(void) {return(m_cFrame);}; inline int getSelectedLine(void) {return(m_nSelectedLine);}; +inline int getSelectedLineRel(void) {return(m_nSelectedLine - m_nLinesPerPage*m_nCurrentPage);}; +inline int getTitleHeight(void) {return(m_cFrameTitleRel.iHeight);}; +inline int getHeaderListHeight(void) {return(m_cFrameHeaderListRel.iHeight);}; inline int getLines(void) {return(m_nNrOfLines);}; inline int getPages(void) {return(m_nNrOfPages);}; inline void showSelection(bool show) {m_showSelection = show;refreshLine(m_nSelectedLine);}; diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index 104078179..bc527ed68 100644 --- a/src/gui/widget/menue.h +++ b/src/gui/widget/menue.h @@ -47,6 +47,7 @@ #include #include #include +#include "menue_target.h" extern "C" { #include #include @@ -100,19 +101,6 @@ class CActivateObserver virtual void activateNotify(const neutrino_locale_t /*OptionName*/) {} }; -class CMenuTarget -{ - protected: - std::string *valueString; - std::string valueStringTmp; - public: - CMenuTarget(){ valueString = &valueStringTmp; } - virtual ~CMenuTarget(){} - virtual void hide(){} - virtual int exec(CMenuTarget* parent, const std::string & actionKey) = 0; - virtual std::string &getValue(void) { return *valueString; } - virtual fb_pixel_t getColor(void) { return 0; } -}; class CMenuItem : public CComponentsSignals { diff --git a/src/gui/widget/menue_target.h b/src/gui/widget/menue_target.h new file mode 100644 index 000000000..772831033 --- /dev/null +++ b/src/gui/widget/menue_target.h @@ -0,0 +1,42 @@ +/* + Based up Neutrino-GUI - Tuxbox-Project + Copyright (C) 2001 by Steffen Hehn 'McClean' + + License: GPL + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + + +#ifndef __MENU_TARGET__ +#define __MENU_TARGET__ + + + +class CMenuTarget +{ + protected: + std::string *valueString; + std::string valueStringTmp; + public: + CMenuTarget(){ valueString = &valueStringTmp; } + virtual ~CMenuTarget(){} + virtual void hide(){} + virtual int exec(CMenuTarget* parent, const std::string & actionKey) = 0; + virtual std::string &getValue(void) { return *valueString; } + virtual fb_pixel_t getColor(void) { return 0; } +}; + + +#endif /*__MENU_TARGET__*/ diff --git a/src/gui/widget/textbox.cpp b/src/gui/widget/textbox.cpp index 7120b7a16..bbddf0fb4 100644 --- a/src/gui/widget/textbox.cpp +++ b/src/gui/widget/textbox.cpp @@ -836,6 +836,16 @@ void CTextBox::hide (void) frameBuffer = NULL; } +void CTextBox::clear(void) +{ + //TRACE("[CTextBox] %s Line %d\r\n", __FUNCTION__, __LINE__); + if (frameBuffer == NULL) + return; + + std::string empty(" "); + setText(&empty); +} + bool CTextBox::clearScreenBuffer() { if(m_bgpixbuf){ diff --git a/src/gui/widget/textbox.h b/src/gui/widget/textbox.h index cb5f26a24..c062b62e7 100644 --- a/src/gui/widget/textbox.h +++ b/src/gui/widget/textbox.h @@ -204,11 +204,13 @@ class CTextBox : public sigc::trackable inline int getLines(void) {return(m_nNrOfLines);}; inline int getLinesPerPage(void) {return m_nLinesPerPage;}; inline int getPages(void) {return(m_nNrOfPages);}; + inline int getBackGroundRadius(void) {return(m_nBgRadius);}; inline void movePosition(int x, int y) {m_cFrame.iX = x; m_cFrame.iY = y;}; int getFontTextHeight(); inline int getTextMode() {return m_nMode;}; void paint (void); void hide (void); + void clear(void); bool clearScreenBuffer(); sigc::signal OnAfterRefresh; sigc::signal OnAfterScrollPage; diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index e3c56761d..a228f09b9 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -174,6 +174,7 @@ const CControlAPI::TyCgiCall CControlAPI::yCgiCallList[]= {"signal", &CControlAPI::SignalInfoCGI, "text/plain"}, {"getonidsid", &CControlAPI::GetChannelIDCGI, "text/plain"}, {"getchannelid", &CControlAPI::GetChannelIDCGI, ""}, + {"getepgid", &CControlAPI::GetEpgIDCGI, ""}, {"currenttpchannels", &CControlAPI::GetTPChannel_IDCGI, "text/plain"}, // boxcontrol - system {"standby", &CControlAPI::StandbyCGI, "text/plain"}, @@ -698,6 +699,45 @@ void CControlAPI::GetChannelIDCGI(CyhookHandler *hh) hh->SendResult(result); } +//------------------------------------------------------------------------- +/** Display epg id's + * @param hh CyhookHandler + * + * @par nhttpd-usage + * @code + * /control/getepgid[?format=plain|json|xml] + * @endcode + * + * @par output (xml) + * @code + * /control/getepgid?format=xml + * @endcode + * + * @code + * + * 361d03f300012b66 + * 3f300012b66 + * + * @endcode + */ +//----------------------------------------------------------------------------- +// get actual epg_id +void CControlAPI::GetEpgIDCGI(CyhookHandler *hh) +{ + t_channel_id channel_id = CZapit::getInstance()->GetCurrentChannelID(); + t_channel_id epg_id = channel_id; + CZapitChannel * ch = CServiceManager::getInstance()->FindChannel(channel_id); + if (ch) + epg_id = ch->getEpgID(); + + hh->outStart(); + std::string result = ""; + result = hh->outPair("epg_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, epg_id), true); + result += hh->outPair("short_epg_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, epg_id & 0xFFFFFFFFFFFFULL), false); + result = hh->outObject("epg_id", result); + hh->SendResult(result); +} + //----------------------------------------------------------------------------- void CControlAPI::GetTPChannel_IDCGI(CyhookHandler *hh) { @@ -1112,7 +1152,9 @@ std::string CControlAPI::_GetBouquetWriteItem(CyhookHandler *hh, CZapitChannel * if (channelNr > -1) result += hh->outPair("number", string_printf("%u", channelNr), true); result += hh->outPair("id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getChannelID()), true); - result += hh->outPair("short_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getChannelID()&0xFFFFFFFFFFFFULL), true); + result += hh->outPair("short_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getChannelID() & 0xFFFFFFFFFFFFULL), true); + result += hh->outPair("epg_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getEpgID()), true); + result += hh->outPair("short_epg_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getEpgID() & 0xFFFFFFFFFFFFULL), true); result += hh->outPair("name", hh->outValue(channel->getName()), true); result += hh->outPair("logo", hh->outValue(NeutrinoAPI->getLogoFile(channel->getChannelID())), false); if (bouquetNr > -1) @@ -1169,11 +1211,33 @@ std::string CControlAPI::_GetBouquetWriteItem(CyhookHandler *hh, CZapitChannel * * /control/getbouquet?bouquet=2&format=json * @endcode * @code - * {"success": "true", "data":{"channels": [ {"number": "1", "id": "12ea043100016e3d", "short_id": "43100016e3d", "name": "ARD-TEST-1", "logo": "", "bouquetnr": "1"}, - * {"number": "2", "id": "4792041b00017034", "short_id": "41b00017034", "name": "arte", "logo": "", "bouquetnr": "1"}, + * {"success": "true", + * "data": { + * "channels": [ + * { + * "number": "1", + * "id": "12ea043100016e3d", + * "short_id": "43100016e3d", + * "epg_id": "12ea043100016e3d", + * "short_epg_id": "43100016e3d", + * "name": "ARD-TEST-1", + * "logo": "", + * "bouquetnr": "1" + * }, * [...snip...] - * {"number": "26", "id": "11aa044d00016dcf", "short_id": "44d00016dcf", "name": "WDR Köln", "logo": "", "bouquetnr": "1"}] - * }} + * { + * "number": "1376", + * "id": "ffffffffa8aae742", + * "short_id": "ffffa8aae742", + * "epg_id": "6e5d040f00012887", + * "short_epg_id": "40f00012887", + * "name": "Tagesschau24 (WebTV)", + * "logo": "/share/tuxbox/neutrino/icons/logo/ffffa8aae742.png", + * "bouquetnr": "1" + * } + * ] + * } + * } * @endcode * * @par output (plain) output only (channel number, channel id, channel name) @@ -1182,10 +1246,8 @@ std::string CControlAPI::_GetBouquetWriteItem(CyhookHandler *hh, CZapitChannel * * @endcode * @code * 1 12ea043100016e3d ARD-TEST-1 - * 2 4792041b00017034 arte * [...snip...] - * 25 4792041b00017036 Test-R - * 26 11aa044d00016dcf WDR Köln + * 1376 ffffffffa8aae742 Tagesschau24 (WebTV) * @endcode * * @par output (xml) @@ -1196,21 +1258,25 @@ std::string CControlAPI::_GetBouquetWriteItem(CyhookHandler *hh, CZapitChannel * * * * 1 - * 1 * 12ea043100016e3d * 43100016e3d + * 12ea043100016e3d + * 43100016e3d * * + * 1 * * [...snip...] * - * 26 + * 1376 + * ffffffffa8aae742 + * ffffa8aae742 + * 6e5d040f00012887 + * 40f00012887 + * + * * 1 - * 11aa044d00016dcf - * 44d00016dcf - * - * - * + * * * @endcode */ @@ -1314,7 +1380,9 @@ void CControlAPI::GetBouquetCGI(CyhookHandler *hh) * { * "id": "361d03f300012b66", * "short_id": "3f300012b66", - * "name": "ZDFHD", + * "epg_id": "361d03f300012b66", + * "short_epg_id": "3f300012b66", + * "name": "ZDF HD", * "logo": "/share/tuxbox/neutrino/icons/logo/3f300012b66.png" * } * ] @@ -1481,9 +1549,17 @@ std::string CControlAPI::channelEPGformated(CyhookHandler *hh, int bouquetnr, t_ { std::string result = ""; std::string channelData = ""; + + t_channel_id epg_id = channel_id; + CZapitChannel * ch = CServiceManager::getInstance()->FindChannel(channel_id); + if (ch) + epg_id = ch->getEpgID(); + channelData += hh->outPair("channel_name", hh->outValue(NeutrinoAPI->GetServiceName(channel_id)), true); channelData += hh->outPair("channel_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel_id), true); - channelData += hh->outPair("channel_short_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel_id & 0xFFFFFFFFFFFFULL), (bouquetnr > -1)); + channelData += hh->outPair("channel_short_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel_id & 0xFFFFFFFFFFFFULL), true); + channelData += hh->outPair("epg_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, epg_id), true); + channelData += hh->outPair("short_epg_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, epg_id & 0xFFFFFFFFFFFFULL), (bouquetnr > -1)); if (bouquetnr > -1) channelData += hh->outPair("bouquetnr", string_printf("%d", bouquetnr), false); if (hh->outType == json) @@ -1492,11 +1568,6 @@ std::string CControlAPI::channelEPGformated(CyhookHandler *hh, int bouquetnr, t_ CChannelEventList::iterator eventIterator; bool isFirstLine = true; - t_channel_id epg_id = channel_id; - CZapitChannel * ch = CServiceManager::getInstance()->FindChannel(channel_id); - if (ch) - epg_id = ch->getEpgID(); - CChannelEventList eList; CEitManager::getInstance()->getEventsServiceKey(epg_id, eList); @@ -1509,6 +1580,7 @@ std::string CControlAPI::channelEPGformated(CyhookHandler *hh, int bouquetnr, t_ prog += hh->outPair("bouquetnr", string_printf("%d", bouquetnr), true); prog += hh->outPair("channel_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel_id), true); + prog += hh->outPair("epg_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, epg_id), true); prog += hh->outPair("eventid", string_printf("%llu", eventIterator->eventID), true); prog += hh->outPair("eventid_hex", string_printf("%llx", eventIterator->eventID), true); prog += hh->outPair("start_sec", string_printf("%ld", eventIterator->startTime), true); @@ -1748,11 +1820,17 @@ void CControlAPI::SendFoundEvents(CyhookHandler *hh, bool xml_format) if( (eventIterator->startTime+eventIterator->duration) < u_azeit) continue; + t_channel_id chan_id = eventIterator->channelID; + t_channel_id epg_id = chan_id; + CZapitChannel * ch = CServiceManager::getInstance()->FindChannel(chan_id); + if (ch) + epg_id = ch->getEpgID(); + struct tm *tmStartZeit = localtime(&eventIterator->startTime); item.clear(); if (hh->outType == json || hh->outType == xml) { - item += hh->outPair("channelname", NeutrinoAPI->GetServiceName(eventIterator->channelID), true); + item += hh->outPair("channelname", NeutrinoAPI->GetServiceName(chan_id), true); item += hh->outPair("epgtitle", hh->outValue(epg.title), true); if (return_epginfo) { item += hh->outPair("info1", hh->outValue(epg.info1), true); @@ -1776,7 +1854,8 @@ void CControlAPI::SendFoundEvents(CyhookHandler *hh, bool xml_format) strftime(tmpstr, sizeof(tmpstr), "%H:%M", tmStartZeit ); item += hh->outPair("time", tmpstr, true); item += hh->outPair("duration", string_printf("%d", eventIterator->duration / 60), true); - item += hh->outPair("channel_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, eventIterator->channelID), true); + item += hh->outPair("channel_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, chan_id), true); + item += hh->outPair("epg_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, epg_id), true); item += hh->outPair("eventid", string_printf("%llu", eventIterator->eventID), false); result += hh->outArrayItem("item", item, got_next); @@ -1794,7 +1873,7 @@ void CControlAPI::SendFoundEvents(CyhookHandler *hh, bool xml_format) datetimer_str += tmpstr; result += hh->outSingle(datetimer_str); - result += hh->outSingle(NeutrinoAPI->GetServiceName(eventIterator->channelID)); + result += hh->outSingle(NeutrinoAPI->GetServiceName(chan_id)); result += hh->outSingle(epg.title); if (return_epginfo) { if(!epg.info1.empty()) diff --git a/src/nhttpd/tuxboxapi/controlapi.h b/src/nhttpd/tuxboxapi/controlapi.h index e80702b28..36873b8fc 100644 --- a/src/nhttpd/tuxboxapi/controlapi.h +++ b/src/nhttpd/tuxboxapi/controlapi.h @@ -85,6 +85,7 @@ private: void GetBouquetsxmlCGI(CyhookHandler *hh); void GetUBouquetsxmlCGI(CyhookHandler *hh); void GetChannelIDCGI(CyhookHandler *hh); + void GetEpgIDCGI(CyhookHandler *hh); void GetTPChannel_IDCGI(CyhookHandler *hh); void MessageCGI(CyhookHandler *hh); void InfoCGI(CyhookHandler *hh); diff --git a/src/system/locals.h b/src/system/locals.h index da5e395db..b46ec6beb 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1662,6 +1662,7 @@ typedef enum LOCALE_MOVIEBROWSER_BOOK_TYPE, LOCALE_MOVIEBROWSER_BOOK_TYPE_BACKWARD, LOCALE_MOVIEBROWSER_BOOK_TYPE_FORWARD, + LOCALE_MOVIEBROWSER_BROWSER_ADDITIONAL, LOCALE_MOVIEBROWSER_BROWSER_FRAME_HIGH, LOCALE_MOVIEBROWSER_BROWSER_ROW_HEAD, LOCALE_MOVIEBROWSER_BROWSER_ROW_ITEM, @@ -1690,6 +1691,7 @@ typedef enum LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO2, LOCALE_MOVIEBROWSER_EDIT_SERIE, LOCALE_MOVIEBROWSER_ERROR_NO_MOVIES, + LOCALE_MOVIEBROWSER_FILTER_OFF, LOCALE_MOVIEBROWSER_FOOT_FILTER, LOCALE_MOVIEBROWSER_FOOT_FOCUS, LOCALE_MOVIEBROWSER_FOOT_OPTIONS, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 960c71e3a..0182af917 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1662,6 +1662,7 @@ const char * locale_real_names[] = "moviebrowser.book_type", "moviebrowser.book_type_backward", "moviebrowser.book_type_forward", + "moviebrowser.browser_additional", "moviebrowser.browser_frame_high", "moviebrowser.browser_row_head", "moviebrowser.browser_row_item", @@ -1690,6 +1691,7 @@ const char * locale_real_names[] = "moviebrowser.edit_book_type_info2", "moviebrowser.edit_serie", "moviebrowser.error_no_movies", + "moviebrowser.filter_off", "moviebrowser.foot_filter", "moviebrowser.foot_focus", "moviebrowser.foot_options", diff --git a/src/system/settings.h b/src/system/settings.h index 60f322cbf..bf67d66fc 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -903,7 +903,7 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO #define OFFSET_INNER_LARGE 20 #define OFFSET_INNER_MID 10 #define OFFSET_INNER_SMALL 5 - +#define OFFSET_INNER_MIN 2 struct SglobalInfo {