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

Merge branch 'master' into pu/msgbox

Browse Source 
Origin commit data
------------------
Commit: 97006c6615
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)
This commit is contained in:
Thilo Graf
2016-11-11 21:33:12 +01:00
parent 373c2967dd b1af01a476
commit dc607fd1df
6 changed files with 54 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -910,7 +910,6 @@ int CMovieBrowser::exec(CMenuTarget* parent, const std::string & actionKey)
}
}
}
return returnval;
}
@@ -2011,18 +2010,42 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
if (m_settings.gui != MB_GUI_LAST_PLAY && m_settings.gui != MB_GUI_LAST_RECORD)
{
// sorting is not avialable for last play and record
do
{
if (m_settings.sorting.item + 1 >= MB_INFO_MAX_NUMBER)
m_settings.sorting.item = (MB_INFO_ITEM)0;
else
m_settings.sorting.item = (MB_INFO_ITEM)(m_settings.sorting.item + 1);
} while (sortBy[m_settings.sorting.item] == NULL);
TRACE("[mb]->new sorting %d,%s\n",m_settings.sorting.item,g_Locale->getText(m_localizedItemName[m_settings.sorting.item]));
refreshBrowserList();
refreshMovieInfo();
refreshFoot();
int directkey = 1;
int selected = -1;
CMenuSelectorTarget * selector = new CMenuSelectorTarget(&selected);
CMenuWidget m(LOCALE_MOVIEBROWSER_FOOT_SORT, NEUTRINO_ICON_SETTINGS);
m.addIntroItems();
// just show sorting options for displayed rows; sorted by rows
for (int row = 0; row < MB_MAX_ROWS && row < m_settings.browserRowNr; row++)
{
for (unsigned int i = 0; i < MB_INFO_MAX_NUMBER; i++)
{
if (sortBy[i] == NULL)
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++)));
}
}
m.enableSaveScreen(true);
m.exec(NULL, "");
delete selector;
if (selected >= 0)
{
m_settings.sorting.item = (MB_INFO_ITEM) selected;
TRACE("[mb]->new sorting %d, %s\n", m_settings.sorting.item, g_Locale->getText(m_localizedItemName[m_settings.sorting.item]));
refreshBrowserList();
refreshMovieInfo();
refreshFoot();
}
}
}
else if (msg == CRCInput::RC_spkr)
@@ -3415,14 +3438,17 @@ bool CMovieBrowser::showMenu(bool calledExternally)
if (reInitFrames) {
#if 1
if (m_settings.browserAdditional && oldAdditional != m_settings.browserAdditional)
if (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;
if (m_settings.browserAdditional)
m_settings.browserFrameHeight = 75;
else
m_settings.browserFrameHeight = 65;
}
#endif
initFrames();