diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 1a60ab8df..07f296992 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -2705,6 +2705,7 @@ webtv.xml WebTV-XML-Dateien webtv.xml.add XML-Datei hinzufügen webtv.xml.auto XML-Dateien automatisch laden webtv.xml.del XML-Datei entfernen +webtv.xml.reload XML-Dateien neu laden window_size Fenstergröße in % wizard.initial_settings Grundeinstellungen gefunden wizard.install_settings Kanalliste für Astra 19.2°E installieren? diff --git a/data/locale/english.locale b/data/locale/english.locale index 081329034..4c3b757a2 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -2705,6 +2705,7 @@ webtv.xml WebTV XML files webtv.xml.add Add XML file webtv.xml.auto Auto-load XML files webtv.xml.del Remove XML file +webtv.xml.reload Reload XML files window_size Window size in % wizard.initial_settings Initial settings found wizard.install_settings Do you want to install channels for Astra 19.2°E? diff --git a/src/gui/webtv_setup.cpp b/src/gui/webtv_setup.cpp index ee8f7e7bb..afda45884 100644 --- a/src/gui/webtv_setup.cpp +++ b/src/gui/webtv_setup.cpp @@ -60,10 +60,11 @@ const CMenuOptionChooser::keyval_ext LIVESTREAM_RESOLUTION_OPTIONS[] = }; #define LIVESTREAM_RESOLUTION_OPTION_COUNT (sizeof(LIVESTREAM_RESOLUTION_OPTIONS)/sizeof(CMenuOptionChooser::keyval_ext)) -#define CWebTVSetupFooterButtonCount 2 +#define CWebTVSetupFooterButtonCount 3 //NI static const struct button_label CWebTVSetupFooterButtons[CWebTVSetupFooterButtonCount] = { { NEUTRINO_ICON_BUTTON_RED, LOCALE_WEBTV_XML_DEL }, - { NEUTRINO_ICON_BUTTON_GREEN, LOCALE_WEBTV_XML_ADD } + { NEUTRINO_ICON_BUTTON_GREEN, LOCALE_WEBTV_XML_ADD }, + { NEUTRINO_ICON_BUTTON_BLUE, LOCALE_WEBTV_XML_RELOAD } //NI }; int CWebTVSetup::exec(CMenuTarget* parent, const std::string & actionKey) @@ -110,6 +111,11 @@ int CWebTVSetup::exec(CMenuTarget* parent, const std::string & actionKey) } return res; } + //NI + if(actionKey == "r" /* reload */) { + changed = true; + return menu_return::RETURN_EXIT_ALL; + } if (actionKey == "script_path") { const char *action_str = "ScriptPath"; chooserDir(g_settings.livestreamScriptPath, false, action_str); @@ -131,6 +137,7 @@ int CWebTVSetup::Show() m = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_MOVIEPLAYER, width, MN_WIDGET_ID_WEBTVSETUP); m->addKey(CRCInput::RC_red, this, "d"); m->addKey(CRCInput::RC_green, this, "a"); + m->addKey(CRCInput::RC_blue, this, "r"); //NI m->addIntroItems(LOCALE_WEBTV_HEAD, LOCALE_LIVESTREAM_HEAD); diff --git a/src/system/locals.h b/src/system/locals.h index b4ce71bda..e17cd13fa 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -2732,6 +2732,7 @@ typedef enum LOCALE_WEBTV_XML_ADD, LOCALE_WEBTV_XML_AUTO, LOCALE_WEBTV_XML_DEL, + LOCALE_WEBTV_XML_RELOAD, LOCALE_WINDOW_SIZE, LOCALE_WIZARD_INITIAL_SETTINGS, LOCALE_WIZARD_INSTALL_SETTINGS, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 3b5f04786..57254caa3 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -2732,6 +2732,7 @@ const char * locale_real_names[] = "webtv.xml.add", "webtv.xml.auto", "webtv.xml.del", + "webtv.xml.reload", "window_size", "wizard.initial_settings", "wizard.install_settings",