mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +02:00
Return menu result
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1902 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: cfff1ee16b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-11-25 (Fri, 25 Nov 2011)
This commit is contained in:
@@ -138,14 +138,12 @@ int CSettingsManager::exec(CMenuTarget* parent, const std::string &actionKey)
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
showMenu();
|
res = showMenu();
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int CSettingsManager::showMenu()
|
||||||
|
|
||||||
void CSettingsManager::showMenu()
|
|
||||||
{
|
{
|
||||||
printf("[neutrino] CSettingsManager call %s...\n", __FUNCTION__);
|
printf("[neutrino] CSettingsManager call %s...\n", __FUNCTION__);
|
||||||
|
|
||||||
@@ -166,13 +164,10 @@ void CSettingsManager::showMenu()
|
|||||||
mset->addItem(GenericMenuSeparatorLine);
|
mset->addItem(GenericMenuSeparatorLine);
|
||||||
mset->addItem(new CMenuForwarder(LOCALE_RESET_ALL, true, NULL, resetNotifier, "all", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER));
|
mset->addItem(new CMenuForwarder(LOCALE_RESET_ALL, true, NULL, resetNotifier, "all", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER));
|
||||||
|
|
||||||
mset->exec(NULL, "");
|
int res = mset->exec(NULL, "");
|
||||||
mset->hide();
|
mset->hide();
|
||||||
selected = mset->getSelected();
|
selected = mset->getSelected();
|
||||||
delete resetNotifier;
|
delete resetNotifier;
|
||||||
delete mset;
|
delete mset;
|
||||||
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@@ -40,7 +40,7 @@ class CSettingsManager : public CMenuTarget
|
|||||||
private:
|
private:
|
||||||
int width, selected;
|
int width, selected;
|
||||||
|
|
||||||
void showMenu();
|
int showMenu();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
CSettingsManager();
|
CSettingsManager();
|
||||||
|
@@ -165,7 +165,6 @@ private:
|
|||||||
|
|
||||||
void SetupFrameBuffer();
|
void SetupFrameBuffer();
|
||||||
void CmdParser(int argc, char **argv);
|
void CmdParser(int argc, char **argv);
|
||||||
void saveColors(const char * fname);
|
|
||||||
CNeutrinoApp();
|
CNeutrinoApp();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
Reference in New Issue
Block a user