fix menue

This commit is contained in:
TangoCash
2016-10-21 10:47:38 +02:00
committed by svenhoefer
parent 083c547e27
commit 9b0137377a
2 changed files with 10 additions and 16 deletions

View File

@@ -301,23 +301,23 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
remotebox_NetworkIP.hide(); remotebox_NetworkIP.hide();
changed = true; changed = true;
} }
return menu_return::RETURN_EXIT; return menu_return::RETURN_REPAINT;
} }
if(actionKey == "del_ip") { if(actionKey == "del_ip") {
selected = remboxmenu->getSelected(); bselected = remboxmenu->getSelected();
if (selected >= item_offset) { if (bselected >= item_offset) {
remboxmenu->removeItem(selected); remboxmenu->removeItem(bselected);
remboxmenu->hide(); remboxmenu->hide();
selected = remboxmenu->getSelected(); bselected = remboxmenu->getSelected();
changed = true; changed = true;
} }
return menu_return::RETURN_EXIT; return menu_return::RETURN_REPAINT;
} }
if(actionKey == "cha_ip") { if(actionKey == "cha_ip") {
selected = remboxmenu->getSelected(); bselected = remboxmenu->getSelected();
CMenuItem* item = remboxmenu->getItem(selected); CMenuItem* item = remboxmenu->getItem(bselected);
CMenuForwarder *f = static_cast<CMenuForwarder*>(item); CMenuForwarder *f = static_cast<CMenuForwarder*>(item);
std::string remoteip = f->getName(); std::string remoteip = f->getName();
CIPInput remotebox_NetworkIP(LOCALE_REMOTEBOX_IP , &remoteip); CIPInput remotebox_NetworkIP(LOCALE_REMOTEBOX_IP , &remoteip);
@@ -326,7 +326,7 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
remotebox_NetworkIP.hide(); remotebox_NetworkIP.hide();
changed = true; changed = true;
} }
return menu_return::RETURN_EXIT; return menu_return::RETURN_REPAINT;
} }
if (strcmp(key, "modifytimer") == 0) if (strcmp(key, "modifytimer") == 0)
@@ -887,10 +887,8 @@ int CTimerList::show()
} }
else if (msg==CRCInput::RC_setup) else if (msg==CRCInput::RC_setup)
{ {
hide();
enterRemoteBox(); enterRemoteBox();
update=true; update=true;
paint();
} }
else if (msg==CRCInput::RC_yellow) else if (msg==CRCInput::RC_yellow)
{ {
@@ -905,11 +903,6 @@ int CTimerList::show()
loop=false; loop=false;
} }
#endif #endif
else if (msg==CRCInput::RC_setup)
{
res=menu_return::RETURN_EXIT_ALL;
loop=false;
}
else if ( msg == CRCInput::RC_help || msg == CRCInput::RC_info) else if ( msg == CRCInput::RC_help || msg == CRCInput::RC_info)
{ {
CTimerd::responseGetTimer* timer=&timerlist[selected]; CTimerd::responseGetTimer* timer=&timerlist[selected];

View File

@@ -93,6 +93,7 @@ class CTimerList : public CMenuTarget, public CListHelpers
int rem_pre,rem_post; int rem_pre,rem_post;
int item_offset; int item_offset;
bool changed; bool changed;
int bselected;
CMenuWidget *remboxmenu; CMenuWidget *remboxmenu;
public: public: