diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index d30542243..60ccfbcb9 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1474,7 +1474,7 @@ menu.hint_plugin_type_games Legt fest, ob Spiele im Benutzermenü unter der Rubr menu.hint_plugin_type_lua Legt fest, ob Plugins 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_tools Legt fest, ob Werkzeuge im Benutzermenü unter der Rubrik 'Plugin-Typen' gezeigt werden sollen -menu.hint_plugins_control Verwaltung von installierten Plugins und Diensten +menu.hint_plugins_control Plugin-Einstellungen und Verwaltung von installierten Plugins menu.hint_plugins_hdd_dir Auswahl des Verzeichnisses zum Laden der Plugins von einem externen Datenträger menu.hint_plugins_hide Integrierte Plugins oder Plugins in den Benutzermenüs verstecken oder anzeigen menu.hint_power_leds Konfiguriert das Verhalten der LEDs an der Power-Taste @@ -2310,8 +2310,8 @@ pinprotection.head PIN-Abfrage pinprotection.wrongcode Geben Sie den Code nocheinmal ein! plugin.hide_no Anzeigen plugin.hide_yes Verstecken -plugins.control Plugins und Services verwalten -plugins.hdd_dir Externes Plugin-Verz. +plugins.control Plugins verwalten +plugins.hdd_dir Externes Plugin-Verzeichnis plugins.hide Plugins verstecken oder anzeigen plugins.no_plugin Kein Plugin plugins.result Pluginausgabe diff --git a/data/locale/english.locale b/data/locale/english.locale index 4c58afcc1..6ebd119cc 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1473,7 +1473,7 @@ menu.hint_plugin_type_games Show games in usermenu at selection 'Plugin types' menu.hint_plugin_type_lua Show plugins in usermenu at selection 'Plugin types' menu.hint_plugin_type_scripts Show scripts in usermenu at selection 'Plugin types' menu.hint_plugin_type_tools Show tools in usermenu at selection 'Plugin types' -menu.hint_plugins_control Configuration of installed plugins and services +menu.hint_plugins_control Plugin settings and management of installed plugins menu.hint_plugins_hdd_dir Select directory to load\nplugins from menu.hint_plugins_hide Hide or show integrated plugins or plugins in user menus menu.hint_power_leds Configure power-button LEDs behavior @@ -2309,8 +2309,8 @@ pinprotection.head Enter PIN code pinprotection.wrongcode PIN-Code was wrong! Try again. plugin.hide_no Show plugin.hide_yes Hide -plugins.control Control plugins and services -plugins.hdd_dir Plugin HDD dir. +plugins.control Control plugins +plugins.hdd_dir External plugin directory plugins.hide Hide or show plugins plugins.no_plugin No plugin plugins.result plugin output diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index 7142a44d7..de91e7ff8 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -145,6 +145,10 @@ int CMiscMenue::exec(CMenuTarget* parent, const std::string &actionKey) { return showMiscSettingsMenuOnlineServices(); } + else if(actionKey == "plugins") + { + return showMiscSettingsMenuPlugins(); + } else if(actionKey == "epg_read_now") { printf("Reading epg cache from %s....\n", g_settings.epg_dir.c_str()); @@ -310,6 +314,11 @@ int CMiscMenue::showMiscSettingsMenu() mf->setHint(NEUTRINO_ICON_HINT_LCD4L, LOCALE_MENU_HINT_LCD4L_SUPPORT); misc_menue.addItem(mf); + // plugins + mf = new CMenuForwarder(LOCALE_PLUGINS_CONTROL, true, NULL, this, "plugins", CRCInput::RC_8); + mf->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_PLUGINS_CONTROL); + misc_menue.addItem(mf); + int res = misc_menue.exec(NULL, ""); delete fanNotifier; @@ -346,16 +355,6 @@ void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general) ms_general->addItem(mn); } - ms_general->addItem(GenericMenuSeparatorLine); - - CMenuForwarder * mf = new CMenuForwarder(LOCALE_PLUGINS_HDD_DIR, true, g_settings.plugin_hdd_dir, this, "plugin_dir"); - mf->setHint("", LOCALE_MENU_HINT_PLUGINS_HDD_DIR); - ms_general->addItem(mf); - - mf = new CMenuForwarder(LOCALE_MPKEY_PLUGIN, true, g_settings.movieplayer_plugin, this, "movieplayer_plugin"); - mf->setHint("", LOCALE_MENU_HINT_MOVIEPLAYER_PLUGIN); - ms_general->addItem(mf); - //set debug level ms_general->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_DEBUG)); CMenuOptionChooser * md = new CMenuOptionChooser(LOCALE_DEBUG_LEVEL, &debug, DEBUG_MODE_OPTIONS, DEBUG_MODES, true); @@ -622,6 +621,27 @@ int CMiscMenue::showMiscSettingsMenuOnlineServices() return res; } +// plugins +int CMiscMenue::showMiscSettingsMenuPlugins() +{ + CMenuWidget *ms_plugins = new CMenuWidget(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_MISCSETUP_PLUGINS); + ms_plugins->addIntroItems(LOCALE_PLUGINS_CONTROL); + + CMenuForwarder * mf = new CMenuForwarder(LOCALE_PLUGINS_HDD_DIR, true, g_settings.plugin_hdd_dir, this, "plugin_dir"); + mf->setHint("", LOCALE_MENU_HINT_PLUGINS_HDD_DIR); + ms_plugins->addItem(mf); + + mf = new CMenuForwarder(LOCALE_MPKEY_PLUGIN, true, g_settings.movieplayer_plugin, this, "movieplayer_plugin"); + mf->setHint("", LOCALE_MENU_HINT_MOVIEPLAYER_PLUGIN); + ms_plugins->addItem(mf); + + ms_plugins->addItem(GenericMenuSeparatorLine); + + int res = ms_plugins->exec(NULL, ""); + delete ms_plugins; + return res; +} + #ifdef CPU_FREQ //CPU void CMiscMenue::showMiscSettingsMenuCPUFreq(CMenuWidget *ms_cpu) diff --git a/src/gui/miscsettings_menu.h b/src/gui/miscsettings_menu.h index 61e01b561..f96f1ae59 100644 --- a/src/gui/miscsettings_menu.h +++ b/src/gui/miscsettings_menu.h @@ -69,6 +69,7 @@ class CMiscMenue : public CMenuTarget, CChangeObserver int showMiscSettingsMenuEnergy(); int showMiscSettingsMenuChanlist(); int showMiscSettingsMenuOnlineServices(); + int showMiscSettingsMenuPlugins(); #ifdef CPU_FREQ void showMiscSettingsMenuCPUFreq(CMenuWidget *ms_cpu); #endif /*CPU_FREQ*/ diff --git a/src/neutrino_menue.h b/src/neutrino_menue.h index cf4147586..f6321293c 100644 --- a/src/neutrino_menue.h +++ b/src/neutrino_menue.h @@ -123,6 +123,7 @@ enum MN_WIDGET_ID MN_WIDGET_ID_MISCSETUP_FILEBROWSER, MN_WIDGET_ID_MISCSETUP_CHANNELLIST, MN_WIDGET_ID_MISCSETUP_ONLINESERVICES, + MN_WIDGET_ID_MISCSETUP_PLUGINS, //media menu MN_WIDGET_ID_MEDIA,