mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 18:31:12 +02:00
webtv_setup: allow to reload webtv xml files
Origin commit data
------------------
Branch: ni/coolstream
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
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -2705,6 +2705,7 @@ webtv.xml WebTV-XML-Dateien
|
|||||||
webtv.xml.add XML-Datei hinzufügen
|
webtv.xml.add XML-Datei hinzufügen
|
||||||
webtv.xml.auto XML-Dateien automatisch laden
|
webtv.xml.auto XML-Dateien automatisch laden
|
||||||
webtv.xml.del XML-Datei entfernen
|
webtv.xml.del XML-Datei entfernen
|
||||||
|
webtv.xml.reload XML-Dateien neu laden
|
||||||
window_size Fenstergröße in %
|
window_size Fenstergröße in %
|
||||||
wizard.initial_settings Grundeinstellungen gefunden
|
wizard.initial_settings Grundeinstellungen gefunden
|
||||||
wizard.install_settings Kanalliste für Astra 19.2°E installieren?
|
wizard.install_settings Kanalliste für Astra 19.2°E installieren?
|
||||||
|
@@ -2705,6 +2705,7 @@ webtv.xml WebTV XML files
|
|||||||
webtv.xml.add Add XML file
|
webtv.xml.add Add XML file
|
||||||
webtv.xml.auto Auto-load XML files
|
webtv.xml.auto Auto-load XML files
|
||||||
webtv.xml.del Remove XML file
|
webtv.xml.del Remove XML file
|
||||||
|
webtv.xml.reload Reload XML files
|
||||||
window_size Window size in %
|
window_size Window size in %
|
||||||
wizard.initial_settings Initial settings found
|
wizard.initial_settings Initial settings found
|
||||||
wizard.install_settings Do you want to install channels for Astra 19.2°E?
|
wizard.install_settings Do you want to install channels for Astra 19.2°E?
|
||||||
|
@@ -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 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] = {
|
static const struct button_label CWebTVSetupFooterButtons[CWebTVSetupFooterButtonCount] = {
|
||||||
{ NEUTRINO_ICON_BUTTON_RED, LOCALE_WEBTV_XML_DEL },
|
{ 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)
|
int CWebTVSetup::exec(CMenuTarget* parent, const std::string & actionKey)
|
||||||
@@ -110,6 +111,11 @@ int CWebTVSetup::exec(CMenuTarget* parent, const std::string & actionKey)
|
|||||||
}
|
}
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
//NI
|
||||||
|
if(actionKey == "r" /* reload */) {
|
||||||
|
changed = true;
|
||||||
|
return menu_return::RETURN_EXIT_ALL;
|
||||||
|
}
|
||||||
if (actionKey == "script_path") {
|
if (actionKey == "script_path") {
|
||||||
const char *action_str = "ScriptPath";
|
const char *action_str = "ScriptPath";
|
||||||
chooserDir(g_settings.livestreamScriptPath, false, action_str);
|
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 = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_MOVIEPLAYER, width, MN_WIDGET_ID_WEBTVSETUP);
|
||||||
m->addKey(CRCInput::RC_red, this, "d");
|
m->addKey(CRCInput::RC_red, this, "d");
|
||||||
m->addKey(CRCInput::RC_green, this, "a");
|
m->addKey(CRCInput::RC_green, this, "a");
|
||||||
|
m->addKey(CRCInput::RC_blue, this, "r"); //NI
|
||||||
|
|
||||||
m->addIntroItems(LOCALE_WEBTV_HEAD, LOCALE_LIVESTREAM_HEAD);
|
m->addIntroItems(LOCALE_WEBTV_HEAD, LOCALE_LIVESTREAM_HEAD);
|
||||||
|
|
||||||
|
@@ -2732,6 +2732,7 @@ typedef enum
|
|||||||
LOCALE_WEBTV_XML_ADD,
|
LOCALE_WEBTV_XML_ADD,
|
||||||
LOCALE_WEBTV_XML_AUTO,
|
LOCALE_WEBTV_XML_AUTO,
|
||||||
LOCALE_WEBTV_XML_DEL,
|
LOCALE_WEBTV_XML_DEL,
|
||||||
|
LOCALE_WEBTV_XML_RELOAD,
|
||||||
LOCALE_WINDOW_SIZE,
|
LOCALE_WINDOW_SIZE,
|
||||||
LOCALE_WIZARD_INITIAL_SETTINGS,
|
LOCALE_WIZARD_INITIAL_SETTINGS,
|
||||||
LOCALE_WIZARD_INSTALL_SETTINGS,
|
LOCALE_WIZARD_INSTALL_SETTINGS,
|
||||||
|
@@ -2732,6 +2732,7 @@ const char * locale_real_names[] =
|
|||||||
"webtv.xml.add",
|
"webtv.xml.add",
|
||||||
"webtv.xml.auto",
|
"webtv.xml.auto",
|
||||||
"webtv.xml.del",
|
"webtv.xml.del",
|
||||||
|
"webtv.xml.reload",
|
||||||
"window_size",
|
"window_size",
|
||||||
"wizard.initial_settings",
|
"wizard.initial_settings",
|
||||||
"wizard.install_settings",
|
"wizard.install_settings",
|
||||||
|
Reference in New Issue
Block a user