mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 09:21:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "- moviebrowser: allow RC_left/right for page navigation"

Browse Source 
This reverts commit a605f0ce3a.

This brakes navigation.
This commit is contained in:
Thilo Graf
2023-01-03 20:18:54 +01:00
parent 3a7888c792
commit e209a4cc41
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2153,6 +2153,7 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg)
if (m_settings.gui != MB_GUI_LAST_PLAY && m_settings.gui != MB_GUI_LAST_RECORD) if (m_settings.gui != MB_GUI_LAST_PLAY && m_settings.gui != MB_GUI_LAST_RECORD)
{ {
// sorting is not avialable for last play and record // sorting is not avialable for last play and record
int directkey = 1; int directkey = 1;
int selected = -1; int selected = -1;
CMenuSelectorTarget * selector = new CMenuSelectorTarget(&selected); CMenuSelectorTarget * selector = new CMenuSelectorTarget(&selected);
@@ -2328,9 +2329,9 @@ bool CMovieBrowser::onButtonPressBrowserList(neutrino_msg_t msg)
scrollBrowserItem(false, false); scrollBrowserItem(false, false);
else if (msg == CRCInput::RC_down) else if (msg == CRCInput::RC_down)
scrollBrowserItem(true, false); scrollBrowserItem(true, false);
else if ((msg == (neutrino_msg_t)g_settings.key_pageup) || (msg == CRCInput::RC_left)) else if (msg == (neutrino_msg_t)g_settings.key_pageup)
scrollBrowserItem(false, true); scrollBrowserItem(false, true);
else if ((msg == (neutrino_msg_t)g_settings.key_pagedown) || (msg == CRCInput::RC_right)) else if (msg == (neutrino_msg_t)g_settings.key_pagedown)
scrollBrowserItem(true, true); scrollBrowserItem(true, true);
else if (msg == CRCInput::RC_play || msg == CRCInput::RC_playpause) else if (msg == CRCInput::RC_play || msg == CRCInput::RC_playpause)
markItem(m_pcBrowser); markItem(m_pcBrowser);
@@ -2352,9 +2353,9 @@ bool CMovieBrowser::onButtonPressLastPlayList(neutrino_msg_t msg)
m_pcLastPlay->scrollLineUp(1); m_pcLastPlay->scrollLineUp(1);
else if (msg == CRCInput::RC_down) else if (msg == CRCInput::RC_down)
m_pcLastPlay->scrollLineDown(1); m_pcLastPlay->scrollLineDown(1);
else if ((msg == (neutrino_msg_t)g_settings.key_pageup) || (msg == CRCInput::RC_left)) else if (msg == (neutrino_msg_t)g_settings.key_pageup)
m_pcLastPlay->scrollPageUp(1); m_pcLastPlay->scrollPageUp(1);
else if ((msg == (neutrino_msg_t)g_settings.key_pagedown) || (msg == CRCInput::RC_right)) else if (msg == (neutrino_msg_t)g_settings.key_pagedown)
m_pcLastPlay->scrollPageDown(1); m_pcLastPlay->scrollPageDown(1);
else if (msg == CRCInput::RC_play || msg == CRCInput::RC_playpause) else if (msg == CRCInput::RC_play || msg == CRCInput::RC_playpause)
markItem(m_pcLastPlay); markItem(m_pcLastPlay);
@@ -2376,9 +2377,9 @@ bool CMovieBrowser::onButtonPressLastRecordList(neutrino_msg_t msg)
m_pcLastRecord->scrollLineUp(1); m_pcLastRecord->scrollLineUp(1);
else if (msg == CRCInput::RC_down) else if (msg == CRCInput::RC_down)
m_pcLastRecord->scrollLineDown(1); m_pcLastRecord->scrollLineDown(1);
else if ((msg == (neutrino_msg_t)g_settings.key_pageup) || (msg == CRCInput::RC_left)) else if (msg == (neutrino_msg_t)g_settings.key_pageup)
m_pcLastRecord->scrollPageUp(1); m_pcLastRecord->scrollPageUp(1);
else if ((msg == (neutrino_msg_t)g_settings.key_pagedown) || (msg == CRCInput::RC_right)) else if (msg == (neutrino_msg_t)g_settings.key_pagedown)
m_pcLastRecord->scrollPageDown(1); m_pcLastRecord->scrollPageDown(1);
else if (msg == CRCInput::RC_play || msg == CRCInput::RC_playpause) else if (msg == CRCInput::RC_play || msg == CRCInput::RC_playpause)
markItem(m_pcLastRecord); markItem(m_pcLastRecord);
@@ -2397,13 +2398,21 @@ bool CMovieBrowser::onButtonPressFilterList(neutrino_msg_t msg)
bool result = true; bool result = true;
if (msg==CRCInput::RC_up) if (msg==CRCInput::RC_up)
{
m_pcFilter->scrollLineUp(1); m_pcFilter->scrollLineUp(1);
}
else if (msg == CRCInput::RC_down) else if (msg == CRCInput::RC_down)
{
m_pcFilter->scrollLineDown(1); m_pcFilter->scrollLineDown(1);
else if ((msg == (neutrino_msg_t)g_settings.key_pageup) || (msg == CRCInput::RC_left)) }
else if (msg == (neutrino_msg_t)g_settings.key_pageup)
{
m_pcFilter->scrollPageUp(1); m_pcFilter->scrollPageUp(1);
else if ((msg == (neutrino_msg_t)g_settings.key_pagedown) || (msg == CRCInput::RC_right)) }
else if (msg == (neutrino_msg_t)g_settings.key_pagedown)
{
m_pcFilter->scrollPageDown(1); m_pcFilter->scrollPageDown(1);
}
else if (msg == CRCInput::RC_ok) else if (msg == CRCInput::RC_ok)
{ {
int selected_line = m_pcFilter->getSelectedLine(); int selected_line = m_pcFilter->getSelectedLine();
@@ -2437,7 +2446,10 @@ bool CMovieBrowser::onButtonPressFilterList(neutrino_msg_t msg)
} }
} }
else else
{
// default
result = false; result = false;
}
return (result); return (result);
} }
@@ -2447,20 +2459,16 @@ bool CMovieBrowser::onButtonPressMovieInfoList(neutrino_msg_t msg)
// TRACE("[mb]->onButtonPressEPGInfoList %d\n",msg); // TRACE("[mb]->onButtonPressEPGInfoList %d\n",msg);
bool result = true; bool result = true;
if ((msg == CRCInput::RC_up) || (msg == (neutrino_msg_t)g_settings.key_pageup)) if (msg == CRCInput::RC_up)
{
if (m_windowFocus == MB_FOCUS_MOVIE_INFO2 && m_settings.browserAdditional) if (m_windowFocus == MB_FOCUS_MOVIE_INFO2 && m_settings.browserAdditional)
m_pcInfo2->scrollPageUp(1); m_pcInfo2->scrollPageUp(1);
else else
m_pcInfo1->scrollPageUp(1); m_pcInfo1->scrollPageUp(1);
} else if (msg == CRCInput::RC_down)
else if ((msg == CRCInput::RC_down) || (msg == (neutrino_msg_t)g_settings.key_pagedown))
{
if (m_windowFocus == MB_FOCUS_MOVIE_INFO2 && m_settings.browserAdditional) if (m_windowFocus == MB_FOCUS_MOVIE_INFO2 && m_settings.browserAdditional)
m_pcInfo2->scrollPageDown(1); m_pcInfo2->scrollPageDown(1);
else else
m_pcInfo1->scrollPageDown(1); m_pcInfo1->scrollPageDown(1);
}
else else
result = false; result = false;