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

- moviebrowser: allow RC_left/right for page navigation

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2022-11-07 21:22:46 +01:00
committed by Thilo Graf
parent b9ef7f0b9c
commit a605f0ce3a
1 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2245,7 +2245,6 @@ 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);
@@ -2415,7 +2414,8 @@ void CMovieBrowser::scrollBrowserItem(bool next, bool page)
mode = cYTFeedParser::NEXT; mode = cYTFeedParser::NEXT;
if (show_mode == MB_SHOW_YT && !next && ytparser.HavePrev() && m_pcBrowser->getSelectedLine() == 0) if (show_mode == MB_SHOW_YT && !next && ytparser.HavePrev() && m_pcBrowser->getSelectedLine() == 0)
mode = cYTFeedParser::PREV; mode = cYTFeedParser::PREV;
if (mode >= 0) { if (mode >= 0)
{
CHintBox loadBox(LOCALE_MOVIEPLAYER_YTPLAYBACK, (show_mode == MB_SHOW_YT) CHintBox loadBox(LOCALE_MOVIEPLAYER_YTPLAYBACK, (show_mode == MB_SHOW_YT)
? g_Locale->getText(LOCALE_MOVIEBROWSER_SCAN_FOR_VIDEOS) ? g_Locale->getText(LOCALE_MOVIEBROWSER_SCAN_FOR_VIDEOS)
: g_Locale->getText(LOCALE_MOVIEBROWSER_SCAN_FOR_MOVIES), 450); : g_Locale->getText(LOCALE_MOVIEBROWSER_SCAN_FOR_MOVIES), 450);
@@ -2443,9 +2443,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) else if ((msg == (neutrino_msg_t)g_settings.key_pageup) || (msg == CRCInput::RC_left))
scrollBrowserItem(false, true); scrollBrowserItem(false, true);
else if (msg == (neutrino_msg_t)g_settings.key_pagedown) else if ((msg == (neutrino_msg_t)g_settings.key_pagedown) || (msg == CRCInput::RC_right))
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);
@@ -2467,9 +2467,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) else if ((msg == (neutrino_msg_t)g_settings.key_pageup) || (msg == CRCInput::RC_left))
m_pcLastPlay->scrollPageUp(1); m_pcLastPlay->scrollPageUp(1);
else if (msg == (neutrino_msg_t)g_settings.key_pagedown) else if ((msg == (neutrino_msg_t)g_settings.key_pagedown) || (msg == CRCInput::RC_right))
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);
@@ -2491,9 +2491,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) else if ((msg == (neutrino_msg_t)g_settings.key_pageup) || (msg == CRCInput::RC_left))
m_pcLastRecord->scrollPageUp(1); m_pcLastRecord->scrollPageUp(1);
else if (msg == (neutrino_msg_t)g_settings.key_pagedown) else if ((msg == (neutrino_msg_t)g_settings.key_pagedown) || (msg == CRCInput::RC_right))
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);
@@ -2512,21 +2512,13 @@ 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();
@@ -2560,10 +2552,7 @@ bool CMovieBrowser::onButtonPressFilterList(neutrino_msg_t msg)
} }
} }
else else
{
// default
result = false; result = false;
}
return (result); return (result);
} }
@@ -2573,16 +2562,20 @@ 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) if ((msg == CRCInput::RC_up) || (msg == (neutrino_msg_t)g_settings.key_pageup))
{
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;