record_setup: close all menus on menu key.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1856 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
micha-bbg
2011-11-17 08:59:27 +00:00
parent 3230ff1c58
commit d1d6121124
2 changed files with 5 additions and 5 deletions

View File

@@ -136,7 +136,7 @@ int CRecordSetup::exec(CMenuTarget* parent, const std::string &actionKey)
} }
if (!CNeutrinoApp::getInstance()->recordingstatus) if (!CNeutrinoApp::getInstance()->recordingstatus)
showRecordSetup(); res = showRecordSetup();
else else
DisplayInfoMessage(g_Locale->getText(LOCALE_RECORDINGMENU_RECORD_IS_RUNNING)); DisplayInfoMessage(g_Locale->getText(LOCALE_RECORDINGMENU_RECORD_IS_RUNNING));
@@ -167,7 +167,7 @@ const CMenuOptionChooser::keyval END_OF_RECORDING[END_OF_RECORDING_COUNT] =
{1, LOCALE_RECORDINGMENU_END_OF_RECORDING_EPG} {1, LOCALE_RECORDINGMENU_END_OF_RECORDING_EPG}
}; };
void CRecordSetup::showRecordSetup() int CRecordSetup::showRecordSetup()
{ {
//menue init //menue init
CMenuWidget* recordingSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width); CMenuWidget* recordingSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width);
@@ -207,12 +207,12 @@ void CRecordSetup::showRecordSetup()
CMenuWidget* recordingaAudioSettings = new CMenuWidget(LOCALE_MAINSETTINGS_RECORDING, NEUTRINO_ICON_SETTINGS, width); CMenuWidget* recordingaAudioSettings = new CMenuWidget(LOCALE_MAINSETTINGS_RECORDING, NEUTRINO_ICON_SETTINGS, width);
showRecordAudioSetup(recordingaAudioSettings); showRecordAudioSetup(recordingaAudioSettings);
recordingSettings->addItem(new CMenuForwarder(LOCALE_RECORDINGMENU_APIDS, true, NULL, recordingaAudioSettings, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); recordingSettings->addItem(new CMenuForwarder(LOCALE_RECORDINGMENU_APIDS, true, NULL, recordingaAudioSettings, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));
recordingSettings->exec(NULL, ""); int res = recordingSettings->exec(NULL, "");
recordingSettings->hide(); recordingSettings->hide();
selected = recordingSettings->getSelected(); selected = recordingSettings->getSelected();
delete recordingSettings; delete recordingSettings;
return res;
} }
void CRecordSetup::showRecordTimerSetup(CMenuWidget *menu_timersettings) void CRecordSetup::showRecordTimerSetup(CMenuWidget *menu_timersettings)

View File

@@ -41,7 +41,7 @@ class CRecordSetup : public CMenuTarget
private: private:
int width, selected; int width, selected;
void showRecordSetup(); int showRecordSetup();
void showRecordTimerSetup(CMenuWidget *menu_timersettings); void showRecordTimerSetup(CMenuWidget *menu_timersettings);
void showRecordAudioSetup(CMenuWidget *menu_audiosettings); void showRecordAudioSetup(CMenuWidget *menu_audiosettings);
void showRecordTimeShiftSetup(CMenuWidget *menu_ts); void showRecordTimeShiftSetup(CMenuWidget *menu_ts);