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

Merge branch 'cst-next' into nmp-cst-next

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b0a6edba8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-18 (Mon, 18 Jan 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-01-18 09:12:21 +01:00
parent ff66a11130 bfdb68d9ca
commit df30970a78
21 changed files with 204 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gui/channellist.cpp
View File

@@ -2,7 +2,7 @@
Neutrino-GUI - DBoxII-Project
Copyright (C) 2001 Steffen Hehn 'McClean'
Copyright (C) 2007-2015 Stefan Seyfried
Copyright (C) 2007-2016 Stefan Seyfried
Kommentar:
@@ -728,31 +728,13 @@ int CChannelList::show()
else if (!empty && msg == (neutrino_msg_t) g_settings.key_list_end) {
actzap = updateSelection((*chanlist).size()-1);
}
else if (!empty && (msg == CRCInput::RC_up || (int) msg == g_settings.key_pageup))
else if (!empty && (msg == CRCInput::RC_up || (int)msg == g_settings.key_pageup ||
msg == CRCInput::RC_down || (int)msg == g_settings.key_pagedown))
{
displayList = 1;
int step = ((int) msg == g_settings.key_pageup) ? listmaxshow : 1; // browse or step 1
int new_selected = selected - step;
if (new_selected < 0) {
if (selected != 0 && step != 1)
new_selected = 0;
else
new_selected = (*chanlist).size() - 1;
}
actzap = updateSelection(new_selected);
}
else if (!empty && (msg == CRCInput::RC_down || (int) msg == g_settings.key_pagedown))
{
displayList = 1;
int step = ((int) msg == g_settings.key_pagedown) ? listmaxshow : 1; // browse or step 1
int new_selected = selected + step;
if (new_selected > (int) (*chanlist).size() - 1) {
if ((selected != (*chanlist).size() - 1))
new_selected = (*chanlist).size() - 1;
else
new_selected = 0;
}
actzap = updateSelection(new_selected);
int new_selected = UpDownKey((*chanlist), msg, listmaxshow, selected);
if (new_selected >= 0)
actzap = updateSelection(new_selected);
}
else if (!edit_state && (msg == (neutrino_msg_t)g_settings.key_bouquet_up ||
msg == (neutrino_msg_t)g_settings.key_bouquet_down)) {