mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-03 10:51:05 +02:00
CTimerList: fix behavior of hide() for remotebox sub menus
After hide() the the background was not fully restored or
was partially damaged the corners beside the header.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d9b7c1360
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-08 (Sun, 08 Oct 2017)
Origin message was:
------------------
CTimerList: fix behavior of hide() for remotebox sub menus
After hide() the the background was not fully restored or
was partially damaged the corners beside the header.
------------------
This commit was generated by Migit
This commit is contained in:
@@ -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;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user