From 469e86c835e29791ed8a48f43ba92b2606bd64a2 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 26 Sep 2018 00:28:56 +0200 Subject: [PATCH] multimedia-setup: re-organize menu Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/e8604065ce949115c17ac00fed873a0960c1f8fd Author: vanhofen Date: 2018-09-26 (Wed, 26 Sep 2018) Origin message was: ------------------ - multimedia-setup: re-organize menu ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/mediaplayer_setup.cpp | 39 ++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/src/gui/mediaplayer_setup.cpp b/src/gui/mediaplayer_setup.cpp index e3fc1e4ad..477a15dce 100644 --- a/src/gui/mediaplayer_setup.cpp +++ b/src/gui/mediaplayer_setup.cpp @@ -88,33 +88,34 @@ int CMediaPlayerSetup::showMediaPlayerSetup() CMenuForwarder *mf; + CWebTVSetup wsetup; + mf = new CMenuForwarder(LOCALE_WEBTV_HEAD, true, NULL, &wsetup, "webtv_menu", CRCInput::RC_red); + mf->setHint(NEUTRINO_ICON_HINT_WEBTV, LOCALE_MENU_HINT_WEBTV_SETUP); + mediaSetup->addItem(mf); + + mf = new CMenuForwarder(LOCALE_WEBRADIO_HEAD, true, NULL, &wsetup, "webradio_menu", CRCInput::RC_green); + mf->setHint(NEUTRINO_ICON_HINT_WEBTV /*FIXME*/, LOCALE_MENU_HINT_WEBRADIO_SETUP); + mediaSetup->addItem(mf); + + CXMLTVSetup xmltvsetup; + mf = new CMenuForwarder(LOCALE_XMLTV_HEAD, true, NULL, &xmltvsetup, "show_menu", CRCInput::RC_yellow); + mf->setHint(NEUTRINO_ICON_HINT_XMLTV, LOCALE_MENU_HINT_XMLTV_SETUP); + mediaSetup->addItem(mf); + + mediaSetup->addItem(GenericMenuSeparatorLine); + + int shortcut = 1; + CAudioPlayerSetup asetup; - mf = new CMenuForwarder(LOCALE_AUDIOPLAYER_INTERNETRADIO_NAME, true, NULL, &asetup, "", CRCInput::RC_red); + mf = new CMenuForwarder(LOCALE_AUDIOPLAYER_INTERNETRADIO_NAME, true, NULL, &asetup, "", CRCInput::convertDigitToKey(shortcut++)); 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 = new CMenuForwarder(LOCALE_PICTUREVIEWER_HEAD, true, NULL, &psetup, "", CRCInput::convertDigitToKey(shortcut++)); mf->setHint(NEUTRINO_ICON_HINT_PICVIEW, LOCALE_MENU_HINT_PICTUREVIEWER_SETUP); mediaSetup->addItem(mf); - mediaSetup->addItem(GenericMenuSeparator); - - CWebTVSetup wsetup; - mf = new CMenuForwarder(LOCALE_WEBTV_HEAD, true, NULL, &wsetup, "webtv_menu", CRCInput::RC_yellow); - mf->setHint(NEUTRINO_ICON_HINT_WEBTV, LOCALE_MENU_HINT_WEBTV_SETUP); - mediaSetup->addItem(mf); - - mf = new CMenuForwarder(LOCALE_WEBRADIO_HEAD, true, NULL, &wsetup, "webradio_menu", CRCInput::RC_blue); - mf->setHint(NEUTRINO_ICON_HINT_WEBTV /*FIXME*/, LOCALE_MENU_HINT_WEBRADIO_SETUP); - mediaSetup->addItem(mf); - - int shortcut = 1; - CXMLTVSetup xmltvsetup; - mf = new CMenuForwarder(LOCALE_XMLTV_HEAD, true, NULL, &xmltvsetup, "show_menu", CRCInput::convertDigitToKey(shortcut++)); - mf->setHint(NEUTRINO_ICON_HINT_XMLTV, LOCALE_MENU_HINT_XMLTV_SETUP); - mediaSetup->addItem(mf); - mediaSetup->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MAINMENU_MOVIEPLAYER)); CMovieBrowser msetup;