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

neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii

Browse Source
This commit is contained in:
[CST] Focus
2014-09-05 17:49:11 +04:00
parent f07e81c4b9
commit 420af7a4dc
45 changed files with 1767 additions and 1144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/upnpbrowser.cpp
View File

@@ -490,9 +490,9 @@ void CUpnpBrowserGui::selectDevice()
else if (msg_repeatok == (neutrino_msg_t) g_settings.key_list_end) {
updateDeviceSelection(m_devices.size()-1);
}
else if (msg_repeatok == CRCInput::RC_up || (int) msg == g_settings.key_channelList_pageup)
else if (msg_repeatok == CRCInput::RC_up || (int) msg == g_settings.key_pageup)
{
int step = ((int) msg == g_settings.key_channelList_pageup) ? m_listmaxshow : 1; // browse or step 1
int step = ((int) msg == g_settings.key_pageup) ? m_listmaxshow : 1; // browse or step 1
int new_selected = m_selecteddevice - step;
if (new_selected < 0) {
if (m_selecteddevice != 0 && step != 1)
@@ -502,9 +502,9 @@ void CUpnpBrowserGui::selectDevice()
}
updateDeviceSelection(new_selected);
}
else if (msg_repeatok == CRCInput::RC_down || (int) msg == g_settings.key_channelList_pagedown)
else if (msg_repeatok == CRCInput::RC_down || (int) msg == g_settings.key_pagedown)
{
int step = ((int) msg == g_settings.key_channelList_pagedown) ? m_listmaxshow : 1; // browse or step 1
int step = ((int) msg == g_settings.key_pagedown) ? m_listmaxshow : 1; // browse or step 1
int new_selected = m_selecteddevice + step;
if (new_selected >= (int) m_devices.size()) {
if ((m_devices.size() - m_listmaxshow -1 < m_selecteddevice) && (m_selecteddevice != (m_devices.size() - 1)) && (step != 1))
@@ -726,8 +726,8 @@ bool CUpnpBrowserGui::selectItem(std::string id)
else if (!timeout && (msg_repeatok == (neutrino_msg_t) g_settings.key_list_end)) {
updateItemSelection(id, entries, total-1, selected, liststart);
}
else if (!timeout && (msg_repeatok == CRCInput::RC_up || (int) msg == g_settings.key_channelList_pageup)) {
int step = ((int) msg == g_settings.key_channelList_pageup) ? m_listmaxshow : 1; // browse or step 1
else if (!timeout && (msg_repeatok == CRCInput::RC_up || (int) msg == g_settings.key_pageup)) {
int step = ((int) msg == g_settings.key_pageup) ? m_listmaxshow : 1; // browse or step 1
int new_selected = selected - step;
if (new_selected < 0) {
if (selected != 0 && step != 1)
@@ -737,8 +737,8 @@ bool CUpnpBrowserGui::selectItem(std::string id)
}
updateItemSelection(id, entries, new_selected, selected, liststart);
}
else if (!timeout && (msg_repeatok == CRCInput::RC_down || (int) msg == g_settings.key_channelList_pagedown)) {
int step = ((int) msg == g_settings.key_channelList_pagedown) ? m_listmaxshow : 1; // browse or step 1
else if (!timeout && (msg_repeatok == CRCInput::RC_down || (int) msg == g_settings.key_pagedown)) {
int step = ((int) msg == g_settings.key_pagedown) ? m_listmaxshow : 1; // browse or step 1
int new_selected = selected + step;
if (new_selected >= (int) total) {
if ((total - m_listmaxshow -1 < selected) && (selected != (total - 1)) && (step != 1))