mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Return menu result, to close all menus

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1876 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-11-22 11:30:50 +00:00
parent 294f597fb7
commit 3c5a037292
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/osdlang_setup.cpp
View File

@@ -71,13 +71,13 @@ int COsdLangSetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
if(parent != NULL) if(parent != NULL)
parent->hide(); parent->hide();
showLocalSetup(); int res = showLocalSetup();
return menu_return::RETURN_REPAINT; return res;
} }
//show international settings menu //show international settings menu
void COsdLangSetup::showLocalSetup() int COsdLangSetup::showLocalSetup()
{ {
//main local setup //main local setup
CMenuWidget *localSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_LANGUAGE, width); CMenuWidget *localSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_LANGUAGE, width);
@@ -105,10 +105,11 @@ void COsdLangSetup::showLocalSetup()
localSettings->addItem(new CMenuForwarder(LOCALE_AUDIOMENU_PREF_LANGUAGES, true, NULL, prefMenu, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); localSettings->addItem(new CMenuForwarder(LOCALE_AUDIOMENU_PREF_LANGUAGES, true, NULL, prefMenu, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));
langNotifier->changeNotify(NONEXISTANT_LOCALE, NULL); langNotifier->changeNotify(NONEXISTANT_LOCALE, NULL);
localSettings->exec(NULL, ""); int res = localSettings->exec(NULL, "");
localSettings->hide(); localSettings->hide();
selected = localSettings->getSelected(); selected = localSettings->getSelected();
delete localSettings; delete localSettings;
return res;
} }
@@ -263,7 +264,3 @@ bool CLangSelectNotifier::changeNotify(const neutrino_locale_t, void *)
return true; return true;
} }

6
src/gui/osdlang_setup.h
View File

@@ -55,7 +55,7 @@ class COsdLangSetup : public CMenuTarget, CChangeObserver
bool is_wizard; bool is_wizard;
void showLocalSetup(); int showLocalSetup();
void showLanguageSetup(CMenuWidget *osdl_setup); void showLanguageSetup(CMenuWidget *osdl_setup);
void showPrefMenu(CMenuWidget *prefMenu, CLangSelectNotifier *langNotifier); void showPrefMenu(CMenuWidget *prefMenu, CLangSelectNotifier *langNotifier);
@@ -76,8 +76,4 @@ class COsdLangSetup : public CMenuTarget, CChangeObserver
int exec(CMenuTarget* parent, const std::string & actionKey); int exec(CMenuTarget* parent, const std::string & actionKey);
}; };
#endif #endif