From 86f4e21779a59342371b99ed7a65af593553feb2 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 19 Dec 2017 12:46:04 +0100 Subject: [PATCH] locale: split fileplay hints into audio and video Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/8115cf24ab35e2df3108a277051c9afcca1d1543 Author: vanhofen Date: 2017-12-19 (Tue, 19 Dec 2017) Origin message was: ------------------ - locale: split fileplay hints into audio and video --- data/locale/deutsch.locale | 3 ++- data/locale/english.locale | 3 ++- src/gui/mediaplayer.cpp | 4 ++-- src/gui/user_menue.cpp | 4 ++-- src/system/locals.h | 3 ++- src/system/locals_intern.h | 3 ++- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 57d224cbf..fac496032 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1227,7 +1227,8 @@ menu.hint_fade Bei aktivierter Funktion werden die GUI-Fenster 'weich' ein- bzw. menu.hint_fan_speed Steuerung der Lüftergeschwindigkeit für die CPU menu.hint_filebrowser_denydirectoryleave Verhindert das Verlassen des Startverzeichnisses menu.hint_filebrowser_showrights Anzeige der Dateirechte der Dateien im Filebrowser -menu.hint_fileplay Abspielen verschiedener Video-Dateien +menu.hint_fileplay_audio Abspielen verschiedener Audio-Dateien +menu.hint_fileplay_video Abspielen verschiedener Video-Dateien menu.hint_filesystem_is_utf8 Kodierung für Unicode-Zeichen im Filebrowser menu.hint_font_gui Wählen Sie die Schriftart für die Menüs menu.hint_font_scaling Legen Sie die vertikale und horizontale Skalierung der Menüschrift fest diff --git a/data/locale/english.locale b/data/locale/english.locale index 4610b6f51..bb6fc8e3f 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1226,7 +1226,8 @@ menu.hint_fade Fade GUI windows menu.hint_fan_speed Control fan speed menu.hint_filebrowser_denydirectoryleave Deny filebrowser to leave initial directory menu.hint_filebrowser_showrights Show file permissions in file browser -menu.hint_fileplay Play various video files +menu.hint_fileplay_audio Play various audio files +menu.hint_fileplay_video Play various video files menu.hint_filesystem_is_utf8 Filebrowser filesystem encoding menu.hint_font_gui Select font file to use for GUI menu.hint_font_scaling Set global vertical and horizontal\nGUI font scaling diff --git a/src/gui/mediaplayer.cpp b/src/gui/mediaplayer.cpp index 69c35319a..73fe9ae07 100644 --- a/src/gui/mediaplayer.cpp +++ b/src/gui/mediaplayer.cpp @@ -167,13 +167,13 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p) //fileplayback video CMenuForwarder *fw_fileplay_video = new CMenuForwarder(LOCALE_MOVIEPLAYER_FILEPLAYBACK_VIDEO, true, NULL, &CMoviePlayerGui::getInstance(), "fileplayback_video", CRCInput::RC_green); - fw_fileplay_video->setHint(NEUTRINO_ICON_HINT_FILEPLAY, LOCALE_MENU_HINT_FILEPLAY); + fw_fileplay_video->setHint(NEUTRINO_ICON_HINT_FILEPLAY, LOCALE_MENU_HINT_FILEPLAY_VIDEO); personalize->addItem(movieplayer_menu, fw_fileplay_video, &g_settings.personalize[SNeutrinoSettings::P_MPLAYER_FILEPLAY_VIDEO]); #if !HAVE_COOL_HARDWARE //fileplayback audio CMenuForwarder *fw_fileplay_audio = new CMenuForwarder(LOCALE_MOVIEPLAYER_FILEPLAYBACK_AUDIO, true, NULL, &CMoviePlayerGui::getInstance(), "fileplayback_audio", CRCInput::RC_yellow); - fw_fileplay_audio->setHint(NEUTRINO_ICON_HINT_FILEPLAY, LOCALE_MENU_HINT_FILEPLAY); + fw_fileplay_audio->setHint(NEUTRINO_ICON_HINT_FILEPLAY, LOCALE_MENU_HINT_FILEPLAY_AUDIO); personalize->addItem(movieplayer_menu, fw_fileplay_audio, &g_settings.personalize[SNeutrinoSettings::P_MPLAYER_FILEPLAY_AUDIO]); #endif diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index 60d531e3a..99552ea1f 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -447,14 +447,14 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) { keyhelper.get(&key,&icon); menu_item = new CMenuForwarder(LOCALE_MOVIEPLAYER_FILEPLAYBACK_VIDEO, !_mode_ts, NULL, neutrino, "fileplayback_video", key, icon); - menu_item->setHint(NEUTRINO_ICON_HINT_FILEPLAY, LOCALE_MENU_HINT_FILEPLAY); + menu_item->setHint(NEUTRINO_ICON_HINT_FILEPLAY, LOCALE_MENU_HINT_FILEPLAY_VIDEO); break; } case SNeutrinoSettings::ITEM_FILEPLAY_AUDIO: { keyhelper.get(&key,&icon); menu_item = new CMenuForwarder(LOCALE_MOVIEPLAYER_FILEPLAYBACK_AUDIO, !_mode_ts, NULL, neutrino, "fileplayback_audio", key, icon); - menu_item->setHint(NEUTRINO_ICON_HINT_FILEPLAY, LOCALE_MENU_HINT_FILEPLAY); + menu_item->setHint(NEUTRINO_ICON_HINT_FILEPLAY, LOCALE_MENU_HINT_FILEPLAY_AUDIO); break; } case SNeutrinoSettings::ITEM_TOOLS: diff --git a/src/system/locals.h b/src/system/locals.h index 584b39b02..21f3e1416 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1253,7 +1253,8 @@ typedef enum LOCALE_MENU_HINT_FAN_SPEED, LOCALE_MENU_HINT_FILEBROWSER_DENYDIRECTORYLEAVE, LOCALE_MENU_HINT_FILEBROWSER_SHOWRIGHTS, - LOCALE_MENU_HINT_FILEPLAY, + LOCALE_MENU_HINT_FILEPLAY_AUDIO, + LOCALE_MENU_HINT_FILEPLAY_VIDEO, LOCALE_MENU_HINT_FILESYSTEM_IS_UTF8, LOCALE_MENU_HINT_FONT_GUI, LOCALE_MENU_HINT_FONT_SCALING, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index bbb074fad..843d2ce3f 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1253,7 +1253,8 @@ const char * locale_real_names[] = "menu.hint_fan_speed", "menu.hint_filebrowser_denydirectoryleave", "menu.hint_filebrowser_showrights", - "menu.hint_fileplay", + "menu.hint_fileplay_audio", + "menu.hint_fileplay_video", "menu.hint_filesystem_is_utf8", "menu.hint_font_gui", "menu.hint_font_scaling",