mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +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@1879 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-11-22 11:46:22 +00:00
parent 8dceacd2a7
commit d4eb80abec
8 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/audioplayer_setup.cpp
View File

@@ -82,7 +82,7 @@ int CAudioPlayerSetup::exec(CMenuTarget* parent, const std::string &actionKey)
return res; return res;
} }
showAudioPlayerSetup(); res = showAudioPlayerSetup();
return res; return res;
} }
@@ -97,7 +97,7 @@ const CMenuOptionChooser::keyval AUDIOPLAYER_DISPLAY_ORDER_OPTIONS[AUDIOPLAYER_D
/*shows the audio setup menue*/ /*shows the audio setup menue*/
void CAudioPlayerSetup::showAudioPlayerSetup() int CAudioPlayerSetup::showAudioPlayerSetup()
{ {
CMenuWidget* audioplayerSetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width); CMenuWidget* audioplayerSetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
audioplayerSetup->setSelected(selected); audioplayerSetup->setSelected(selected);
@@ -120,8 +120,9 @@ void CAudioPlayerSetup::showAudioPlayerSetup()
audioplayerSetup->addItem(new CMenuForwarder(LOCALE_AUDIOPLAYER_DEFDIR, true, g_settings.network_nfs_audioplayerdir, this, "audioplayerdir")); audioplayerSetup->addItem(new CMenuForwarder(LOCALE_AUDIOPLAYER_DEFDIR, true, g_settings.network_nfs_audioplayerdir, this, "audioplayerdir"));
audioplayerSetup->addItem(new CMenuOptionChooser(LOCALE_AUDIOPLAYER_ENABLE_SC_METADATA, &g_settings.audioplayer_enable_sc_metadata, MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true )); audioplayerSetup->addItem(new CMenuOptionChooser(LOCALE_AUDIOPLAYER_ENABLE_SC_METADATA, &g_settings.audioplayer_enable_sc_metadata, MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true ));
audioplayerSetup->exec (NULL, ""); int res = audioplayerSetup->exec (NULL, "");
audioplayerSetup->hide (); audioplayerSetup->hide ();
selected = audioplayerSetup->getSelected(); selected = audioplayerSetup->getSelected();
delete audioplayerSetup; delete audioplayerSetup;
return res;
} }

2
src/gui/audioplayer_setup.h
View File

@@ -41,7 +41,7 @@ class CAudioPlayerSetup : public CMenuTarget
private: private:
int width, selected; int width, selected;
void showAudioPlayerSetup(); int showAudioPlayerSetup();
public: public:

8
src/gui/mediaplayer_setup.cpp
View File

@@ -74,13 +74,13 @@ int CMediaPlayerSetup::exec(CMenuTarget* parent, const std::string & /*actionKey
parent->hide(); parent->hide();
showMediaPlayerSetup(); res = showMediaPlayerSetup();
return res; return res;
} }
/*shows media setup menue entries*/ /*shows media setup menue entries*/
void CMediaPlayerSetup::showMediaPlayerSetup() int CMediaPlayerSetup::showMediaPlayerSetup()
{ {
CMenuWidget* mediaSetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width); CMenuWidget* mediaSetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
@@ -92,9 +92,9 @@ void CMediaPlayerSetup::showMediaPlayerSetup()
mediaSetup->addItem(new CMenuForwarder(LOCALE_PICTUREVIEWER_HEAD, true, NULL, new CPictureViewerSetup(), "", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); mediaSetup->addItem(new CMenuForwarder(LOCALE_PICTUREVIEWER_HEAD, true, NULL, new CPictureViewerSetup(), "", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));
mediaSetup->addItem(new CMenuForwarder(LOCALE_AUDIOPLAYER_NAME, true, NULL, new CAudioPlayerSetup(), "", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN)); mediaSetup->addItem(new CMenuForwarder(LOCALE_AUDIOPLAYER_NAME, true, NULL, new CAudioPlayerSetup(), "", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
mediaSetup->exec (NULL, ""); int res = mediaSetup->exec (NULL, "");
mediaSetup->hide (); mediaSetup->hide ();
selected = mediaSetup->getSelected(); selected = mediaSetup->getSelected();
delete mediaSetup; delete mediaSetup;
return res;
} }

2
src/gui/mediaplayer_setup.h
View File

@@ -42,7 +42,7 @@ class CMediaPlayerSetup : public CMenuTarget
private: private:
int width, selected; int width, selected;
void showMediaPlayerSetup(); int showMediaPlayerSetup();
public: public:

9
src/gui/miscsettings_menu.cpp
View File

@@ -117,9 +117,7 @@ int CMiscMenue::exec(CMenuTarget* parent, const std::string &actionKey)
} }
#endif /*ONE_KEY_PLUGIN*/ #endif /*ONE_KEY_PLUGIN*/
showMiscSettingsMenu(); return showMiscSettingsMenu();
return menu_return::RETURN_REPAINT;
} }
@@ -160,7 +158,7 @@ const CMenuOptionChooser::keyval_ext CPU_FREQ_OPTIONS[CPU_FREQ_OPTION_COUNT] =
#endif /*CPU_FREQ*/ #endif /*CPU_FREQ*/
//show misc settings menue //show misc settings menue
void CMiscMenue::showMiscSettingsMenu() int CMiscMenue::showMiscSettingsMenu()
{ {
//misc settings //misc settings
fanNotifier = new CFanControlNotifier(); fanNotifier = new CFanControlNotifier();
@@ -212,11 +210,12 @@ void CMiscMenue::showMiscSettingsMenu()
misc_menue->addItem( new CMenuForwarderNonLocalized("CPU", true, NULL, misc_menue_cpu, NULL, CRCInput::RC_4)); misc_menue->addItem( new CMenuForwarderNonLocalized("CPU", true, NULL, misc_menue_cpu, NULL, CRCInput::RC_4));
#endif /*CPU_FREQ*/ #endif /*CPU_FREQ*/
misc_menue->exec(NULL, ""); int res = misc_menue->exec(NULL, "");
misc_menue->hide(); misc_menue->hide();
selected = misc_menue->getSelected(); selected = misc_menue->getSelected();
delete fanNotifier; delete fanNotifier;
delete misc_menue; delete misc_menue;
return res;
} }
//general settings //general settings

2
src/gui/miscsettings_menu.h
View File

@@ -42,7 +42,7 @@ class CMiscMenue : public CMenuTarget
CFanControlNotifier *fanNotifier; CFanControlNotifier *fanNotifier;
int width, selected; int width, selected;
void showMiscSettingsMenu(); int showMiscSettingsMenu();
void showMiscSettingsMenuGeneral(CMenuWidget *ms_general); void showMiscSettingsMenuGeneral(CMenuWidget *ms_general);
void showMiscSettingsMenuEnergy(CMenuWidget *ms_energy); void showMiscSettingsMenuEnergy(CMenuWidget *ms_energy);
void showMiscSettingsMenuEpg(CMenuWidget *ms_epg); void showMiscSettingsMenuEpg(CMenuWidget *ms_epg);

7
src/gui/pictureviewer_setup.cpp
View File

@@ -81,7 +81,7 @@ int CPictureViewerSetup::exec(CMenuTarget* parent, const std::string &actionKey)
return res; return res;
} }
showPictureViewerSetup(); res = showPictureViewerSetup();
return res; return res;
} }
@@ -97,7 +97,7 @@ const CMenuOptionChooser::keyval PICTUREVIEWER_SCALING_OPTIONS[PICTUREVIEWER_SCA
/*shows the picviewer setup menue*/ /*shows the picviewer setup menue*/
void CPictureViewerSetup::showPictureViewerSetup() int CPictureViewerSetup::showPictureViewerSetup()
{ {
CMenuWidget* picviewsetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width); CMenuWidget* picviewsetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
@@ -111,8 +111,9 @@ void CPictureViewerSetup::showPictureViewerSetup()
picviewsetup->addItem(new CMenuForwarder(LOCALE_PICTUREVIEWER_SLIDE_TIME, true, g_settings.picviewer_slide_time, pic_timeout)); picviewsetup->addItem(new CMenuForwarder(LOCALE_PICTUREVIEWER_SLIDE_TIME, true, g_settings.picviewer_slide_time, pic_timeout));
picviewsetup->addItem(new CMenuForwarder(LOCALE_PICTUREVIEWER_DEFDIR, true, g_settings.network_nfs_picturedir, this, "picturedir")); picviewsetup->addItem(new CMenuForwarder(LOCALE_PICTUREVIEWER_DEFDIR, true, g_settings.network_nfs_picturedir, this, "picturedir"));
picviewsetup->exec(NULL, ""); int res = picviewsetup->exec(NULL, "");
picviewsetup->hide(); picviewsetup->hide();
selected = picviewsetup->getSelected(); selected = picviewsetup->getSelected();
delete picviewsetup; delete picviewsetup;
return res;
} }

2
src/gui/pictureviewer_setup.h
View File

@@ -43,7 +43,7 @@ class CPictureViewerSetup : public CMenuTarget
private: private:
int width, selected; int width, selected;
void showPictureViewerSetup(); int showPictureViewerSetup();
public: public: