Fix bouquet name in epgplus; Fix bitrate for radio channels; Show language settings before setup banner

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@688 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 913a94ce76
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-07-29 (Thu, 29 Jul 2010)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2010-07-29 11:25:43 +00:00
parent 7b4f248060
commit 4db8b82638
5 changed files with 72 additions and 21 deletions

View File

@@ -2612,24 +2612,22 @@ int CNeutrinoApp::run(int argc, char **argv)
if (display_language_selection) {
hintBox->hide();
if(ShowMsgUTF (LOCALE_WIZARD_WELCOME_HEAD, g_Locale->getText(LOCALE_WIZARD_WELCOME_TEXT), CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbrCancel) == CMessageBox::mbrYes) {
languageSettings.setWizardMode(true);
int ret = languageSettings.exec(NULL, "");
languageSettings.setWizardMode(false);
languageSettings.setWizardMode(true);
languageSettings.exec(NULL, "");
languageSettings.setWizardMode(false);
if(ret != menu_return::RETURN_EXIT_ALL) {
videoSettings->setWizardMode(true);
videoSettings->exec(NULL, "");
videoSettings->setWizardMode(false);
}
if(ShowMsgUTF (LOCALE_WIZARD_WELCOME_HEAD, g_Locale->getText(LOCALE_WIZARD_WELCOME_TEXT), CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbrCancel) == CMessageBox::mbrYes) {
videoSettings->setWizardMode(true);
ret = videoSettings->exec(NULL, "");
videoSettings->setWizardMode(false);
if(ret != menu_return::RETURN_EXIT_ALL) {
colorSettings.setWizardMode(true);
colorSettings.exec(NULL, "");
ret = colorSettings.exec(NULL, "");
colorSettings.setWizardMode(false);
}
if(ret != menu_return::RETURN_EXIT_ALL) {
networkSettings.setWizardMode(true);
networkSettings.exec(NULL, "");
ret = networkSettings.exec(NULL, "");
networkSettings.setWizardMode(false);
}
if(ret != menu_return::RETURN_EXIT_ALL) {