mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-30 08:51:10 +02:00
Return menu result
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1893 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
@@ -40,14 +40,12 @@
|
|||||||
|
|
||||||
#include <driver/screen_max.h>
|
#include <driver/screen_max.h>
|
||||||
|
|
||||||
|
|
||||||
CInfoMenu::CInfoMenu()
|
CInfoMenu::CInfoMenu()
|
||||||
{
|
{
|
||||||
width = w_max (40, 10);
|
width = w_max (40, 10);
|
||||||
selected = -1;
|
selected = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
CInfoMenu::~CInfoMenu()
|
CInfoMenu::~CInfoMenu()
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -62,14 +60,12 @@ int CInfoMenu::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
|
|||||||
if (parent != NULL)
|
if (parent != NULL)
|
||||||
parent->hide();
|
parent->hide();
|
||||||
|
|
||||||
showMenu();
|
res = showMenu();
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int CInfoMenu::showMenu()
|
||||||
|
|
||||||
void CInfoMenu::showMenu()
|
|
||||||
{
|
{
|
||||||
printf("[neutrino] CInfoMenu call %s...\n", __FUNCTION__);
|
printf("[neutrino] CInfoMenu call %s...\n", __FUNCTION__);
|
||||||
|
|
||||||
@@ -81,11 +77,10 @@ void CInfoMenu::showMenu()
|
|||||||
info->addItem(new CMenuForwarder(LOCALE_EXTRA_DBOXINFO, true, NULL, new CDBoxInfoWidget, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
|
info->addItem(new CMenuForwarder(LOCALE_EXTRA_DBOXINFO, true, NULL, new CDBoxInfoWidget, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
|
||||||
info->addItem(new CMenuForwarder(LOCALE_STREAMINFO_HEAD, true, NULL, new CStreamInfo2(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));
|
info->addItem(new CMenuForwarder(LOCALE_STREAMINFO_HEAD, true, NULL, new CStreamInfo2(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));
|
||||||
|
|
||||||
info->exec(NULL, "");
|
int res = info->exec(NULL, "");
|
||||||
info->hide();
|
info->hide();
|
||||||
selected = info->getSelected();
|
selected = info->getSelected();
|
||||||
delete info;
|
delete info;
|
||||||
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@@ -40,7 +40,7 @@ class CInfoMenu : public CMenuTarget
|
|||||||
private:
|
private:
|
||||||
int width, selected;
|
int width, selected;
|
||||||
|
|
||||||
void showMenu();
|
int showMenu();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
CInfoMenu();
|
CInfoMenu();
|
||||||
|
Reference in New Issue
Block a user