From 368bfd4fe24d71db161808aefd069edb48ce792f Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 21 Feb 2014 23:59:45 +0100 Subject: [PATCH] personalizing: show menuhints in plugin type selection menu Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/70f61217f7a39e78a0cf0977baf9f40785846244 Author: vanhofen Date: 2014-02-21 (Fri, 21 Feb 2014) Origin message was: ------------------ - personalizing: show menuhints in plugin type selection menu --- data/locale/deutsch.locale | 4 ++++ data/locale/english.locale | 4 ++++ src/gui/personalize.cpp | 21 +++++++++++++++++---- src/system/locals.h | 4 ++++ src/system/locals_intern.h | 4 ++++ 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 7364b7a54..98cb8aac8 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1023,6 +1023,10 @@ menu.hint_pictureviewer_defdir Wählen Sie das Startverzeichnis für den Bildbet menu.hint_pictureviewer_scaling Stellen Sie die Bildauflösung ein menu.hint_pictureviewer_slide_time Ändern Sie den Diashow-Intervall.\nStandardmäßig sind 10 Sekunden eingstellt menu.hint_picview Bilder anzeigen +menu.hint_plugin_type_games Legt fest, ob Spiele im Benutzermenü unter der Rubrik 'Plugin-Typen' gezeigt werden sollen +menu.hint_plugin_type_tools Legt fest, ob Werkzeuge im Benutzermenü unter der Rubrik 'Plugin-Typen' gezeigt werden sollen +menu.hint_plugin_type_scripts Legt fest, ob Skripte im Benutzermenü unter der Rubrik 'Plugin-Typen' gezeigt werden sollen +menu.hint_plugin_type_lua Legt fest, ob Plugins im Benutzermenü unter der Rubrik 'Plugin-Typen' gezeigt werden sollen menu.hint_plugins_hdd_dir Auswahl des Verzeichnisses zum Laden der Plugins von einem externen Datenträger menu.hint_power_leds Konfiguriert das Verhalten der LEDs an der Power-Taste menu.hint_pref_lang Wählen Sie ihre bevorzugte Tonspur und EPG-Sprache,\ndie Einstellung 'none' deaktiviert diese Option diff --git a/data/locale/english.locale b/data/locale/english.locale index 96e24a83d..f12ce722a 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1025,6 +1025,10 @@ menu.hint_pictureviewer_defdir Default picture viewer directory menu.hint_pictureviewer_scaling Picture scaling algorithm menu.hint_pictureviewer_slide_time Slideshow interval, in seconds menu.hint_picview View pictures +menu.hint_plugin_type_games Show games in usermenu at selection 'Plugin types' +menu.hint_plugin_type_tools Show tools in usermenu at selection 'Plugin types' +menu.hint_plugin_type_scripts Show scripts in usermenu at selection 'Plugin types' +menu.hint_plugin_type_lua Show plugins in usermenu at selection 'Plugin types' menu.hint_plugins_hdd_dir Select directory to load\nplugins from menu.hint_power_leds Configure power-button LEDs behavior menu.hint_pref_lang Select preferred audio and EPG language\nselect 'none' to disable diff --git a/src/gui/personalize.cpp b/src/gui/personalize.cpp index 887cf60b4..b36f2044f 100644 --- a/src/gui/personalize.cpp +++ b/src/gui/personalize.cpp @@ -457,10 +457,23 @@ void CPersonalizeGui::ShowUserMenu(CMenuWidget* p_widget, vectoraddIntroItems(LOCALE_MAINMENU_SETTINGS); - pluginSelectionMenu->addItem(new CMenuOptionChooser(LOCALE_MAINMENU_GAMES, &g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_GAMES], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); - pluginSelectionMenu->addItem(new CMenuOptionChooser(LOCALE_MAINMENU_TOOLS, &g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_TOOLS], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); - pluginSelectionMenu->addItem(new CMenuOptionChooser(LOCALE_MAINMENU_SCRIPTS, &g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_SCRIPTS], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); - pluginSelectionMenu->addItem(new CMenuOptionChooser(LOCALE_MAINMENU_LUA, &g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_LUA], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); + + CMenuOptionChooser * /*oc = NULL;*/ + oc = new CMenuOptionChooser(LOCALE_MAINMENU_GAMES, &g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_GAMES], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + oc->setHint(NEUTRINO_ICON_HINT_PERSONALIZE, LOCALE_MENU_HINT_PLUGIN_TYPE_GAMES); + pluginSelectionMenu->addItem(oc); + + oc = new CMenuOptionChooser(LOCALE_MAINMENU_TOOLS, &g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_TOOLS], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + oc->setHint(NEUTRINO_ICON_HINT_PERSONALIZE, LOCALE_MENU_HINT_PLUGIN_TYPE_TOOLS); + pluginSelectionMenu->addItem(oc); + + oc = new CMenuOptionChooser(LOCALE_MAINMENU_SCRIPTS, &g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_SCRIPTS], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + oc->setHint(NEUTRINO_ICON_HINT_PERSONALIZE, LOCALE_MENU_HINT_PLUGIN_TYPE_SCRIPTS); + pluginSelectionMenu->addItem(oc); + + oc = new CMenuOptionChooser(LOCALE_MAINMENU_LUA, &g_settings.personalize[SNeutrinoSettings::P_UMENU_PLUGIN_TYPE_LUA], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + oc->setHint(NEUTRINO_ICON_HINT_PERSONALIZE, LOCALE_MENU_HINT_PLUGIN_TYPE_LUA); + pluginSelectionMenu->addItem(oc); p_widget->addItem(new CMenuForwarder(LOCALE_PERSONALIZE_USERMENU_PLUGIN_TYPES, true, NULL, pluginSelectionMenu)); } diff --git a/src/system/locals.h b/src/system/locals.h index c190d8946..a26be137f 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1052,6 +1052,10 @@ typedef enum LOCALE_MENU_HINT_PICTUREVIEWER_SCALING, LOCALE_MENU_HINT_PICTUREVIEWER_SLIDE_TIME, LOCALE_MENU_HINT_PICVIEW, + LOCALE_MENU_HINT_PLUGIN_TYPE_GAMES, + LOCALE_MENU_HINT_PLUGIN_TYPE_TOOLS, + LOCALE_MENU_HINT_PLUGIN_TYPE_SCRIPTS, + LOCALE_MENU_HINT_PLUGIN_TYPE_LUA, LOCALE_MENU_HINT_PLUGINS_HDD_DIR, LOCALE_MENU_HINT_POWER_LEDS, LOCALE_MENU_HINT_PREF_LANG, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index df36700af..6b0817caf 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1052,6 +1052,10 @@ const char * locale_real_names[] = "menu.hint_pictureviewer_scaling", "menu.hint_pictureviewer_slide_time", "menu.hint_picview", + "menu.hint_plugin_type_games", + "menu.hint_plugin_type_tools", + "menu.hint_plugin_type_scripts", + "menu.hint_plugin_type_lua", "menu.hint_plugins_hdd_dir", "menu.hint_power_leds", "menu.hint_pref_lang",