mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-28 16:01:20 +02:00
Return menu result, to close all menus
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1873 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
@@ -89,8 +89,7 @@ int CVideoSettings::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
|
|||||||
parent->hide();
|
parent->hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
showVideoSetup();
|
res = showVideoSetup();
|
||||||
|
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
@@ -178,7 +177,7 @@ const CMenuOptionChooser::keyval VIDEOMENU_DBDR_OPTIONS[VIDEOMENU_DBDR_OPTION_CO
|
|||||||
{ 2, LOCALE_VIDEOMENU_DBDR_BOTH }
|
{ 2, LOCALE_VIDEOMENU_DBDR_BOTH }
|
||||||
};
|
};
|
||||||
|
|
||||||
void CVideoSettings::showVideoSetup()
|
int CVideoSettings::showVideoSetup()
|
||||||
{
|
{
|
||||||
//init
|
//init
|
||||||
CMenuWidget * videosetup = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width);
|
CMenuWidget * videosetup = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width);
|
||||||
@@ -243,10 +242,11 @@ void CVideoSettings::showVideoSetup()
|
|||||||
videosetup->addItem(vs_dbdropt_ch); //dbdr options
|
videosetup->addItem(vs_dbdropt_ch); //dbdr options
|
||||||
videosetup->addItem(vs_videomodes_fw); //video modes submenue
|
videosetup->addItem(vs_videomodes_fw); //video modes submenue
|
||||||
|
|
||||||
videosetup->exec(NULL, "");
|
int res = videosetup->exec(NULL, "");
|
||||||
videosetup->hide();
|
videosetup->hide();
|
||||||
selected = videosetup->getSelected();
|
selected = videosetup->getSelected();
|
||||||
delete videosetup;
|
delete videosetup;
|
||||||
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -48,7 +48,7 @@ class CVideoSettings : public CMenuWidget, CChangeObserver
|
|||||||
bool is_wizard;
|
bool is_wizard;
|
||||||
|
|
||||||
int width, selected;
|
int width, selected;
|
||||||
void showVideoSetup();
|
int showVideoSetup();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
enum VIDEO_SETUP_MODE
|
enum VIDEO_SETUP_MODE
|
||||||
|
Reference in New Issue
Block a user