mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/msgbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: aa40d88300
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2016-11-14 20:38:01 +01:00
parent b31f96a58c 5e16302783
commit e0d6d5537f
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/gui/moviebrowser/mb.cpp
View File

@@ -1440,8 +1440,6 @@ void CMovieBrowser::refreshMovieInfo(void)
{
TRACE("[mb]->%s m_vMovieInfo.size %d\n", __func__, m_vMovieInfo.size());
hideDetailsLine();
// clear m_pcInfo1 text before new init
m_pcInfo1->clear();
@@ -1502,18 +1500,12 @@ void CMovieBrowser::refreshMovieInfo(void)
void CMovieBrowser::hideDetailsLine()
{
refreshDetailsLine(-1);
if (m_detailsLine)
m_detailsLine->hide();
}
void CMovieBrowser::refreshDetailsLine(int pos)
{
if (m_detailsLine)
{
m_detailsLine->kill();
delete m_detailsLine;
m_detailsLine = NULL;
}
if (pos >= 0)
{
int fheight = g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_LIST]->getHeight();
@@ -1525,8 +1517,10 @@ void CMovieBrowser::refreshDetailsLine(int pos)
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);
m_detailsLine = new CComponentsDetailLine();
m_detailsLine->setDimensionsAll(xpos, ypos1, ypos2, fheight/2, m_cBoxFrameInfo1.iHeight-2*RADIUS_LARGE);
m_detailsLine->paint(true);
}
}
@@ -2020,6 +2014,18 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
CMenuWidget m(LOCALE_MOVIEBROWSER_FOOT_SORT, NEUTRINO_ICON_SETTINGS);
m.addIntroItems();
// add PREVPLAYDATE/RECORDDATE sort buttons to footer
m.addKey(CRCInput::RC_red, selector, to_string(MB_INFO_PREVPLAYDATE).c_str());
m.addKey(CRCInput::RC_green, selector, to_string(MB_INFO_RECORDDATE).c_str());
button_label footerButtons[] = {
{ NEUTRINO_ICON_BUTTON_RED, LOCALE_MOVIEBROWSER_INFO_PREVPLAYDATE},
{ NEUTRINO_ICON_BUTTON_GREEN, LOCALE_MOVIEBROWSER_INFO_RECORDDATE}
};
int footerButtonsCount = sizeof(footerButtons) / sizeof(button_label);
m.setFooter(footerButtons, footerButtonsCount);
// just show sorting options for displayed rows; sorted by rows
for (int row = 0; row < MB_MAX_ROWS && row < m_settings.browserRowNr; row++)
{
@@ -2028,6 +2034,10 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
if (sortBy[i] == NULL)
continue;
// already added to footer
if (i == MB_INFO_PREVPLAYDATE || i == MB_INFO_RECORDDATE)
continue;
if (m_settings.browserRowItem[row] == i)
m.addItem(new CMenuForwarder(g_Locale->getText(m_localizedItemName[i]), true, NULL, selector, to_string(i).c_str(), CRCInput::convertDigitToKey(directkey++)));
}

2
src/gui/widget/menue.cpp
View File

@@ -1429,7 +1429,7 @@ void CMenuWidget::paintHint(int pos)
if (details_line)
details_line->hide();
/* clear info box */
if ((info_box) && (pos < 0))
if ((info_box) && ((pos < 0) || savescreen))
savescreen ? info_box->hide() : info_box->kill();
if (info_box)
hint_painted = info_box->isPainted();