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

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-10-08 18:03:01 +02:00
parent 3010cd24d7 cbe21aade7
commit 2661fa4287
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/timerlist.cpp
View File

@@ -315,6 +315,8 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
remotebox_user.forceSaveScreen(true); remotebox_user.forceSaveScreen(true);
CKeyboardInput remotebox_pass(LOCALE_REMOTEBOX_PASS, &pass, 15); CKeyboardInput remotebox_pass(LOCALE_REMOTEBOX_PASS, &pass, 15);
remotebox_pass.forceSaveScreen(true); remotebox_pass.forceSaveScreen(true);
//menu add remote box
CMenuWidget * rbsetup = new CMenuWidget(LOCALE_REMOTEBOX_HEAD, NEUTRINO_ICON_TIMER); CMenuWidget * rbsetup = new CMenuWidget(LOCALE_REMOTEBOX_HEAD, NEUTRINO_ICON_TIMER);
rbsetup->addItem(new CMenuForwarder(LOCALE_REMOTEBOX_RBNAME, true, rbname, &remotebox_name)); rbsetup->addItem(new CMenuForwarder(LOCALE_REMOTEBOX_RBNAME, true, rbname, &remotebox_name));
rbsetup->addItem(new CMenuForwarder(LOCALE_REMOTEBOX_RBADDR, true, rbaddress, &remotebox_address)); rbsetup->addItem(new CMenuForwarder(LOCALE_REMOTEBOX_RBADDR, true, rbaddress, &remotebox_address));
@@ -325,8 +327,6 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
if ((rbsetup->exec(NULL,"") == true) && (!rbaddress.empty())) if ((rbsetup->exec(NULL,"") == true) && (!rbaddress.empty()))
{ {
remboxmenu->addItem(new CMenuForwarder(rbname, true, NULL, this, "cha_ip")); remboxmenu->addItem(new CMenuForwarder(rbname, true, NULL, this, "cha_ip"));
rbsetup->hide();
remboxmenu->enableSaveScreen(false);
remboxmenu->hide(); remboxmenu->hide();
timer_remotebox_item timer_rb; timer_remotebox_item timer_rb;
timer_rb.rbaddress = rbaddress; timer_rb.rbaddress = rbaddress;
@@ -377,6 +377,8 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
remotebox_user.forceSaveScreen(true); remotebox_user.forceSaveScreen(true);
CKeyboardInput remotebox_pass(LOCALE_REMOTEBOX_PASS, &it->pass, 15); CKeyboardInput remotebox_pass(LOCALE_REMOTEBOX_PASS, &it->pass, 15);
remotebox_pass.forceSaveScreen(true); remotebox_pass.forceSaveScreen(true);
//remote box edit
CMenuWidget * rbsetup = new CMenuWidget(LOCALE_REMOTEBOX_HEAD, NEUTRINO_ICON_TIMER); CMenuWidget * rbsetup = new CMenuWidget(LOCALE_REMOTEBOX_HEAD, NEUTRINO_ICON_TIMER);
rbsetup->addItem(new CMenuForwarder(LOCALE_REMOTEBOX_RBNAME, true, it->rbname, &remotebox_name)); rbsetup->addItem(new CMenuForwarder(LOCALE_REMOTEBOX_RBNAME, true, it->rbname, &remotebox_name));
rbsetup->addItem(new CMenuForwarder(LOCALE_REMOTEBOX_RBADDR, true, it->rbaddress, &remotebox_address)); rbsetup->addItem(new CMenuForwarder(LOCALE_REMOTEBOX_RBADDR, true, it->rbaddress, &remotebox_address));
@@ -388,8 +390,6 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
{ {
it->port = atoi(port); it->port = atoi(port);
f->setName(it->rbname); f->setName(it->rbname);
rbsetup->hide();
remboxmenu->enableSaveScreen(false);
remboxmenu->hide(); remboxmenu->hide();
changed = true; changed = true;
} }
@@ -1098,7 +1098,7 @@ void CTimerList::hide()
bool CTimerList::RemoteBoxSetup() bool CTimerList::RemoteBoxSetup()
{ {
bool ret = false; bool ret = false;
remboxmenu = new CMenuWidget(LOCALE_REMOTEBOX_HEAD, NEUTRINO_ICON_TIMER); remboxmenu = new CMenuWidget(LOCALE_REMOTEBOX_HEAD, NEUTRINO_ICON_TIMER, 50);
remboxmenu->addKey(CRCInput::RC_red, this, "del_ip"); remboxmenu->addKey(CRCInput::RC_red, this, "del_ip");
remboxmenu->addKey(CRCInput::RC_green, this, "add_ip"); remboxmenu->addKey(CRCInput::RC_green, this, "add_ip");

3
src/gui/upnpbrowser.cpp
View File

@@ -869,8 +869,7 @@ bool CUpnpBrowserGui::selectItem(std::string id)
m_frameBuffer->Clear(); m_frameBuffer->Clear();
refresh = true; refresh = true;
} }
else if (m_folderplay && (msg == (neutrino_msg_t) CRCInput::RC_prev) else if (m_folderplay && ((msg == (neutrino_msg_t) CRCInput::RC_prev) || video_key_msg == CMoviePlayerGui::PLUGIN_PLAYSTATE_PREV)){
|| video_key_msg == CMoviePlayerGui::PLUGIN_PLAYSTATE_PREV){
timeout = 0; timeout = 0;
m_playid -= 2; m_playid -= 2;
if (m_playid < 0) if (m_playid < 0)

4
src/gui/widget/menue.cpp
View File

@@ -1454,10 +1454,8 @@ void CMenuWidget::enableSaveScreen(bool enable)
void CMenuWidget::paintHint(int pos) void CMenuWidget::paintHint(int pos)
{ {
if (!g_settings.show_menu_hints){ if (!g_settings.show_menu_hints)
//ResetModules(); //ensure clean up on changed setting
return; return;
}
if (pos < 0 && !hint_painted) if (pos < 0 && !hint_painted)
return; return;