mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 09:21:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

webtv_setup: allow to reload webtv xml files

Browse Source 
Origin commit data
------------------
Commit: 5fb5f94493
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-09 (Tue, 09 Aug 2016)

Origin message was:
------------------
- webtv_setup: allow to reload webtv xml files
This commit is contained in:
vanhofen
2016-08-09 12:06:18 +02:00
parent 250c539e03
commit 0d1e6e34d7
5 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -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?

1
data/locale/english.locale
View File

@@ -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?

11
src/gui/webtv_setup.cpp
View File

@@ -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);

1
src/system/locals.h
View File

@@ -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,

1
src/system/locals_intern.h
View File

@@ -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",