mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-28 16:01:20 +02:00
drop explicit CMenuForwarder icon assignments
Conflicts: src/gui/3dsetup.cpp src/gui/bouquetlist.cpp src/gui/hdd_menu.cpp src/gui/keybind_setup.cpp src/gui/mediaplayer.cpp src/gui/mediaplayer_setup.cpp src/gui/moviebrowser.cpp src/gui/network_setup.cpp src/gui/nfs.cpp src/gui/osd_setup.cpp src/gui/osdlang_setup.cpp src/gui/parentallock_setup.cpp src/gui/personalize.cpp src/gui/proxyserver_setup.cpp src/gui/record_setup.cpp src/gui/scan_setup.cpp src/gui/screensetup.cpp src/gui/settings_manager.cpp src/gui/timerlist.cpp src/gui/update_menue.cpp src/gui/vfd_setup.cpp src/gui/videosettings.cpp src/neutrino_menue.cpp
This commit is contained in:
@@ -91,13 +91,13 @@ int CMediaPlayerSetup::showMediaPlayerSetup()
|
||||
mediaSetup->addIntroItems(LOCALE_MAINSETTINGS_MULTIMEDIA);
|
||||
|
||||
CPictureViewerSetup psetup;
|
||||
mediaSetup->addItem(new CMenuForwarder(LOCALE_PICTUREVIEWER_HEAD, true, NULL, &psetup, "", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));
|
||||
mediaSetup->addItem(new CMenuForwarder(LOCALE_PICTUREVIEWER_HEAD, true, NULL, &psetup, "", CRCInput::RC_red));
|
||||
CAudioPlayerSetup asetup;
|
||||
mediaSetup->addItem(new CMenuForwarder(LOCALE_AUDIOPLAYER_NAME, true, NULL, &asetup, "", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
|
||||
mediaSetup->addItem(new CMenuForwarder(LOCALE_AUDIOPLAYER_NAME, true, NULL, &asetup, "", CRCInput::RC_green));
|
||||
|
||||
CWebTVSetup wsetup;
|
||||
CMenuForwarder *mf;
|
||||
mf = new CMenuForwarder(LOCALE_WEBTV_HEAD, true, NULL, &wsetup, "show_menu", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
|
||||
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);
|
||||
|
||||
|
Reference in New Issue
Block a user