From 2246437303b86cb27640f947471111cddcff3310 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 11 Nov 2016 15:31:56 +0100 Subject: [PATCH 1/5] osd_setup: change moviebrowser's default font sizes Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8495ac091e151595cccce73c6e57be0576c778be Author: vanhofen Date: 2016-11-11 (Fri, 11 Nov 2016) Origin message was: ------------------ - osd_setup: change moviebrowser's default font sizes ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/osd_setup.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 3c7c0961a..f95cfb91c 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -211,9 +211,9 @@ font_sizes_struct neutrino_font[SNeutrinoSettings::FONT_TYPE_COUNT] = {LOCALE_FONTSIZE_INFOBAR_ECMINFO , 15, CNeutrinoFonts::FONT_STYLE_REGULAR, 0}, //NI {LOCALE_FONTSIZE_FILEBROWSER_ITEM , 16, CNeutrinoFonts::FONT_STYLE_BOLD , 1}, {LOCALE_FONTSIZE_MENU_HINT , 16, CNeutrinoFonts::FONT_STYLE_REGULAR, 0}, - {LOCALE_FONTSIZE_MOVIEBROWSER_HEAD , 15, CNeutrinoFonts::FONT_STYLE_REGULAR, 2}, - {LOCALE_FONTSIZE_MOVIEBROWSER_LIST , 17, CNeutrinoFonts::FONT_STYLE_REGULAR, 0}, - {LOCALE_FONTSIZE_MOVIEBROWSER_INFO , 17, CNeutrinoFonts::FONT_STYLE_REGULAR, 0}, + {LOCALE_FONTSIZE_MOVIEBROWSER_HEAD , 14, CNeutrinoFonts::FONT_STYLE_REGULAR, 2}, //NI + {LOCALE_FONTSIZE_MOVIEBROWSER_LIST , 20, CNeutrinoFonts::FONT_STYLE_REGULAR, 0}, //NI + {LOCALE_FONTSIZE_MOVIEBROWSER_INFO , 16, CNeutrinoFonts::FONT_STYLE_REGULAR, 0}, //NI {LOCALE_FONTSIZE_SUBTITLES , 25, CNeutrinoFonts::FONT_STYLE_BOLD , 0} }; From ebec9b29c677e7833161a082f5db5c4fb021c028 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 11 Nov 2016 16:38:24 +0100 Subject: [PATCH 2/5] moviebrowser: use own defaults for moviebrowser's view Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/98ba673e19d290efd750fd33ed1d03d2fae1f8c7 Author: vanhofen Date: 2016-11-11 (Fri, 11 Nov 2016) Origin message was: ------------------ - moviebrowser: use own defaults for moviebrowser's view ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/moviebrowser/mb.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index 35b1ac382..f65a5e13c 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -465,22 +465,22 @@ void CMovieBrowser::initGlobalSettings(void) m_settings.browserFrameHeight = 65; /* percent */ m_settings.browserRowNr = 6; - m_settings.browserRowItem[0] = MB_INFO_CHANNEL; - m_settings.browserRowItem[1] = MB_INFO_TITLE; - m_settings.browserRowItem[2] = MB_INFO_RECORDDATE; - m_settings.browserRowItem[3] = MB_INFO_SIZE; + m_settings.browserRowItem[0] = MB_INFO_TITLE; //NI + m_settings.browserRowItem[1] = MB_INFO_SPACER; //NI + m_settings.browserRowItem[2] = MB_INFO_INFO1; //NI + m_settings.browserRowItem[3] = MB_INFO_SPACER; //NI m_settings.browserRowItem[4] = MB_INFO_LENGTH; - m_settings.browserRowItem[5] = MB_INFO_INFO1; + m_settings.browserRowItem[5] = MB_INFO_RECORDDATE; //NI m_settings.browserRowItem[6] = MB_INFO_MAX_NUMBER; 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]]; - 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[0] = 36; //NI - title + m_settings.browserRowWidth[1] = 1; //NI - spacer + m_settings.browserRowWidth[2] = 36; //NI - info1 + m_settings.browserRowWidth[3] = 1; //NI - spacer + m_settings.browserRowWidth[4] = 11; //NI - length + m_settings.browserRowWidth[5] = 14; //NI - recorddate 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]]; From 569ce7dbbc5e3ac4845d610b00cab65191226072 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 12 Nov 2016 20:40:28 +0100 Subject: [PATCH 3/5] moviebrowser: fix MB_INFO_SPACER's empty content Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/da604fb9a5b5626b02f38d43b1a9f86a30efc7d8 Author: vanhofen Date: 2016-11-12 (Sat, 12 Nov 2016) Origin message was: ------------------ - moviebrowser: fix MB_INFO_SPACER's empty content ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/moviebrowser/mb.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index 42d995daf..7cde3f83e 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -3726,6 +3726,8 @@ bool CMovieBrowser::getMovieInfoItem(MI_MOVIE_INFO& movie_info, MB_INFO_ITEM ite } break; case MB_INFO_SPACER: // = 21, + *item_string=""; + break; case MB_INFO_MAX_NUMBER: // = 22 default: *item_string=""; From 0b245e051c24abd8f01fda461cf75b21a0ce1c9c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 12 Nov 2016 22:00:12 +0100 Subject: [PATCH 4/5] cc_item_picture: reset keep_aspect variables after use Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/73b97ecd4df690d8283ea706fe4ca4bbc48a0d1f Author: vanhofen Date: 2016-11-12 (Sat, 12 Nov 2016) Origin message was: ------------------ - cc_item_picture: reset keep_aspect variables after use ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/components/cc_item_picture.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gui/components/cc_item_picture.cpp b/src/gui/components/cc_item_picture.cpp index 89ffaed86..ad3ec018b 100644 --- a/src/gui/components/cc_item_picture.cpp +++ b/src/gui/components/cc_item_picture.cpp @@ -216,17 +216,21 @@ void CComponentsPicture::initCCItem() * by setters setWidth/setHeight * these steps are required to assign the current image dimensions to item dimensions */ - if (keep_dx_aspect && dy){ + if (keep_dx_aspect && dy) + { float h_ratio = float(height)*100/(float)dy; width = int(h_ratio*(float)dx/100); #ifdef BOXMODEL_APOLLO if (do_scale && (width > 10 || height > 10)) width = GetWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness; #endif + keep_dx_aspect = false; } - if (keep_dy_aspect && dx){ + if (keep_dy_aspect && dx) + { float w_ratio = float(width)*100/(float)dx; height = int(w_ratio*(float)dy/100); + keep_dy_aspect = false; } //resize image and apply current assigned scale values From 9bd690019e6ad1ee76b4356763b9e0be75c4e7e9 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 12 Nov 2016 22:03:05 +0100 Subject: [PATCH 5/5] moviebrowser: limit cover to one third of m_cBoxFrameInfo1 width Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/a47a5cd422b2df4180aa0b91bdfc34ba6de6e86c Author: vanhofen Date: 2016-11-12 (Sat, 12 Nov 2016) Origin message was: ------------------ - moviebrowser: limit cover to one third of m_cBoxFrameInfo1 width ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/moviebrowser/mb.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index 7cde3f83e..a021f4ad0 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -1402,6 +1402,8 @@ TRACE("[mb]->%s:%d m_movieCover->getHeight(): %d\n", __func__, __LINE__, m_movie 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); + if (m_movieCover->getWidth() > movieCoverBox.iWidth/3) + m_movieCover->setWidth(movieCoverBox.iWidth/3, true); // use maximal one third of box width 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);