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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e4c63f289
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-13 (Fri, 13 Jan 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-01-13 13:27:49 +01:00
parent f2b271a823 76ff131c56
commit 6df0618eec
37 changed files with 177 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/miscsettings_menu.cpp
View File

@@ -57,6 +57,8 @@
#include <video.h>
#include <sectionsdclient/sectionsdclient.h>
extern CPlugins * g_PluginList;
extern cVideo *videoDecoder;
@@ -68,6 +70,7 @@ CMiscMenue::CMiscMenue()
epg_save_standby = NULL;
epg_save_frequently = NULL;
epg_read = NULL;
epg_read_now = NULL;
epg_read_frequently = NULL;
epg_dir = NULL;
}
@@ -140,6 +143,12 @@ int CMiscMenue::exec(CMenuTarget* parent, const std::string &actionKey)
{
return showMiscSettingsMenuOnlineServices();
}
else if(actionKey == "epg_read_now")
{
printf("Reading epg cache from %s....\n", g_settings.epg_dir.c_str());
g_Sectionsd->readSIfromXML(g_settings.epg_dir.c_str());
return menu_return::RETURN_REPAINT;
}
return showMiscSettingsMenu();
}
@@ -429,6 +438,9 @@ void CMiscMenue::showMiscSettingsMenuEpg(CMenuWidget *ms_epg)
epg_dir = new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_DIR, (g_settings.epg_save || g_settings.epg_read), g_settings.epg_dir, this, "epgdir");
epg_dir->setHint("", LOCALE_MENU_HINT_EPG_DIR);
epg_read_now = new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_READ_NOW, g_settings.epg_read, NULL, this, "epg_read_now");
epg_read_now->setHint("", LOCALE_MENU_HINT_EPG_READ_NOW);
epg_cache = to_string(g_settings.epg_cache);
if (epg_cache.length() < 2)
epg_cache.insert(0, 2 - epg_cache.length(), ' ');
@@ -476,6 +488,7 @@ void CMiscMenue::showMiscSettingsMenuEpg(CMenuWidget *ms_epg)
ms_epg->addItem(epg_read);
ms_epg->addItem(epg_read_frequently);
ms_epg->addItem(epg_dir);
ms_epg->addItem(epg_read_now);
ms_epg->addItem(GenericMenuSeparatorLine);
ms_epg->addItem(mf);
ms_epg->addItem(mf1);
@@ -649,6 +662,7 @@ bool CMiscMenue::changeNotify(const neutrino_locale_t OptionName, void * /*data*
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_MISCSETTINGS_EPG_READ))
{
epg_read_frequently->setActive(g_settings.epg_read);
epg_read_now->setActive(g_settings.epg_read);
epg_dir->setActive(g_settings.epg_read || g_settings.epg_save);
CNeutrinoApp::getInstance()->SendSectionsdConfig();