- neutrino_menue: rename audioplayer/picviewer menu to multimedia menu

data/locale/deutsch.locale

@@ -176,7 +176,6 @@ audioplayer.shuffle Zufällig
 audioplayer.spectrum LCD Skala
 audioplayer.stop Stopp
 audioplayer.title_artist Titel, Interpret
-audioplayerpicsettings.general Audioplayer/Bildbetrachter
 bookmarkmanager.delete Löschen
 bookmarkmanager.name Bookmarks
 bookmarkmanager.rename Umbenennen
@@ -833,6 +832,7 @@ mainsettings.language Sprache
 mainsettings.lcd VFD-Display
 mainsettings.manage Einstellungen verwalten
 mainsettings.misc Erweiterte Einstellungen
+mainsettings.multimedia Multimedia
 mainsettings.network Netzwerk
 mainsettings.osd OSD
 mainsettings.recording Aufnahme

data/locale/english.locale

@@ -176,7 +176,6 @@ audioplayer.shuffle shuffle
 audioplayer.spectrum lcd a-spectrum
 audioplayer.stop Stop
 audioplayer.title_artist Title, Artist
-audioplayerpicsettings.general Audioplayer / Picviewer
 bookmarkmanager.delete delete
 bookmarkmanager.name bookmarks
 bookmarkmanager.rename rename
@@ -833,6 +832,7 @@ mainsettings.language Language / Timezone
 mainsettings.lcd VFD-Display
 mainsettings.manage Manage settings
 mainsettings.misc Extended settings
+mainsettings.multimedia Multimedia
 mainsettings.network Network
 mainsettings.osd OSD
 mainsettings.recording Recording

src/gui/mediaplayer_setup.cpp

@@ -88,7 +88,7 @@ int CMediaPlayerSetup::showMediaPlayerSetup()
 	mediaSetup->setSelected(selected);
 
 	// intros
-	mediaSetup->addIntroItems(LOCALE_AUDIOPLAYERPICSETTINGS_GENERAL);
+	mediaSetup->addIntroItems(LOCALE_MAINSETTINGS_MULTIMEDIA);
 
 	CPictureViewerSetup psetup;
 	mediaSetup->addItem(new CMenuForwarder(LOCALE_PICTUREVIEWER_HEAD, true, NULL, &psetup, "", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));
@@ -97,8 +97,7 @@ int CMediaPlayerSetup::showMediaPlayerSetup()
 
 	CWebTVSetup wsetup;
 	CMenuForwarder *mf;
-	int shortcut = 1;
+	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::convertDigitToKey(shortcut++));
 	mf->setHint(NEUTRINO_ICON_HINT_TVMODE /* FIXME */, LOCALE_MENU_HINT_WEBTV_SETUP);
 	mediaSetup->addItem(mf);
 

src/neutrino_menue.cpp

@@ -445,8 +445,8 @@ void CNeutrinoApp::InitMenuSettings()
 		mf->setHint(NEUTRINO_ICON_HINT_KEYS, LOCALE_MENU_HINT_KEYS);
 		personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_KEYBINDING]);
 
-		// audioplayer/pictureviewer settings
+		// multimedia settings
-		mf = new CMenuForwarder(LOCALE_AUDIOPLAYERPICSETTINGS_GENERAL, true, NULL, new CMediaPlayerSetup());
+		mf = new CMenuForwarder(LOCALE_MAINSETTINGS_MULTIMEDIA, true, NULL, new CMediaPlayerSetup());
 		mf->setHint(NEUTRINO_ICON_HINT_A_PIC, LOCALE_MENU_HINT_A_PIC);
 		personalize.addItem(MENU_SETTINGS, mf, &g_settings.personalize[SNeutrinoSettings::P_MSET_MEDIAPLAYER]);
 	}

src/system/locals.h

@@ -203,7 +203,6 @@ typedef enum
 	LOCALE_AUDIOPLAYER_SPECTRUM,
 	LOCALE_AUDIOPLAYER_STOP,
 	LOCALE_AUDIOPLAYER_TITLE_ARTIST,
-	LOCALE_AUDIOPLAYERPICSETTINGS_GENERAL,
 	LOCALE_BOOKMARKMANAGER_DELETE,
 	LOCALE_BOOKMARKMANAGER_NAME,
 	LOCALE_BOOKMARKMANAGER_RENAME,
@@ -860,6 +859,7 @@ typedef enum
 	LOCALE_MAINSETTINGS_LCD,
 	LOCALE_MAINSETTINGS_MANAGE,
 	LOCALE_MAINSETTINGS_MISC,
+	LOCALE_MAINSETTINGS_MULTIMEDIA,
 	LOCALE_MAINSETTINGS_NETWORK,
 	LOCALE_MAINSETTINGS_OSD,
 	LOCALE_MAINSETTINGS_RECORDING,

src/system/locals_intern.h

@@ -203,7 +203,6 @@ const char * locale_real_names[] =
 	"audioplayer.spectrum",
 	"audioplayer.stop",
 	"audioplayer.title_artist",
-	"audioplayerpicsettings.general",
 	"bookmarkmanager.delete",
 	"bookmarkmanager.name",
 	"bookmarkmanager.rename",
@@ -860,6 +859,7 @@ const char * locale_real_names[] =
 	"mainsettings.lcd",
 	"mainsettings.manage",
 	"mainsettings.misc",
+	"mainsettings.multimedia",
 	"mainsettings.network",
 	"mainsettings.osd",
 	"mainsettings.recording",