gui/mediaplayer_setup.cpp: integrate MB / YT settings, (c) martii

This commit is contained in:
[CST] Focus
2014-12-26 14:16:02 +03:00
parent 751d23fbbb
commit 9b78e49d0e
7 changed files with 124 additions and 48 deletions

View File

@@ -34,7 +34,6 @@
#include <config.h>
#endif
#include "mediaplayer_setup.h"
#include <global.h>
@@ -43,18 +42,15 @@
#include <gui/widget/icons.h>
#include <gui/widget/stringinput.h>
#include <gui/audioplayer_setup.h>
#include <gui/pictureviewer_setup.h>
#include <gui/webtv_setup.h>
#include <gui/moviebrowser.h>
#include <driver/screen_max.h>
#include <system/debug.h>
CMediaPlayerSetup::CMediaPlayerSetup()
{
width = w_max (40, 10);
@@ -63,7 +59,6 @@ CMediaPlayerSetup::CMediaPlayerSetup()
CMediaPlayerSetup::~CMediaPlayerSetup()
{
}
int CMediaPlayerSetup::exec(CMenuTarget* parent, const std::string & /*actionKey*/)
@@ -83,7 +78,48 @@ int CMediaPlayerSetup::exec(CMenuTarget* parent, const std::string & /*actionKey
/*shows media setup menue entries*/
int CMediaPlayerSetup::showMediaPlayerSetup()
{
CMenuWidget* mediaSetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
mediaSetup->setSelected(selected);
// intros
mediaSetup->addIntroItems(LOCALE_MAINMENU_MEDIA);
CMenuForwarder *mf;
CAudioPlayerSetup asetup;
mf = new CMenuForwarder(LOCALE_AUDIOPLAYER_NAME, true, NULL, &asetup, "", CRCInput::RC_red);
mf->setHint(NEUTRINO_ICON_HINT_APLAY, LOCALE_MENU_HINT_APLAY_SETUP);
mediaSetup->addItem(mf);
CPictureViewerSetup psetup;
mf = new CMenuForwarder(LOCALE_PICTUREVIEWER_HEAD, true, NULL, &psetup, "", CRCInput::RC_green);
mf->setHint(NEUTRINO_ICON_HINT_PICVIEW, LOCALE_MENU_HINT_PICTUREVIEWER_SETUP);
mediaSetup->addItem(mf);
CWebTVSetup wsetup;
mf = new CMenuForwarder(LOCALE_WEBTV_HEAD, true, NULL, &wsetup, "show_menu", CRCInput::RC_yellow);
mf->setHint(NEUTRINO_ICON_HINT_TVMODE /* FIXME */, LOCALE_MENU_HINT_WEBTV_SETUP);
mediaSetup->addItem(mf);
mediaSetup->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MAINMENU_MOVIEPLAYER));
CMovieBrowser msetup;
int shortcut = 1;
mf = new CMenuForwarder(LOCALE_MOVIEBROWSER_HEAD, true, NULL, &msetup, "show_menu", CRCInput::convertDigitToKey(shortcut++));
mf->setHint(NEUTRINO_ICON_HINT_MB, LOCALE_MENU_HINT_MOVIEBROWSER_SETUP);
mediaSetup->addItem(mf);
mf = new CMenuForwarder(LOCALE_MOVIEPLAYER_YTPLAYBACK, true, NULL, &msetup, "show_ytmenu", CRCInput::convertDigitToKey(shortcut++));
mf->setHint(NEUTRINO_ICON_HINT_YTPLAY, LOCALE_MENU_HINT_YTPLAY_SETUP);
mediaSetup->addItem(mf);
int res = mediaSetup->exec (NULL, "");
selected = mediaSetup->getSelected();
delete mediaSetup;
return res;
#if 0
CMenuWidget* mediaSetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
mediaSetup->setSelected(selected);
@@ -105,4 +141,5 @@ int CMediaPlayerSetup::showMediaPlayerSetup()
selected = mediaSetup->getSelected();
delete mediaSetup;
return res;
#endif
}