mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-26 15:02:56 +02:00
- usermenu: add read epg to epg function (thx to DboxOldie)
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
@@ -155,7 +155,7 @@ int CMiscMenue::exec(CMenuTarget* parent, const std::string &actionKey)
|
||||
{
|
||||
return showMiscSettingsSelectWeatherLocation();
|
||||
}
|
||||
else if(actionKey == "epg_read_now")
|
||||
else if(actionKey == "epg_read_now" || actionKey == "epg_read_now_usermenu")
|
||||
{
|
||||
struct stat my_stat;
|
||||
if (stat(g_settings.epg_dir.c_str(), &my_stat) == 0)
|
||||
@@ -170,7 +170,10 @@ int CMiscMenue::exec(CMenuTarget* parent, const std::string &actionKey)
|
||||
g_Sectionsd->readSIfromXMLTV((*it).c_str());
|
||||
}
|
||||
|
||||
return menu_return::RETURN_REPAINT;
|
||||
if (actionKey == "epg_read_now_usermenu")
|
||||
return menu_return::RETURN_EXIT_ALL;
|
||||
else
|
||||
return menu_return::RETURN_REPAINT;
|
||||
}
|
||||
|
||||
return showMiscSettingsMenu();
|
||||
|
@@ -82,6 +82,7 @@
|
||||
#include <gui/update_menue.h>
|
||||
#include <gui/hdd_menu.h>
|
||||
#include <gui/webtv_setup.h>
|
||||
#include <gui/miscsettings_menu.h>
|
||||
|
||||
#include <driver/radiotext.h>
|
||||
#include <driver/record.h>
|
||||
@@ -247,6 +248,11 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
|
||||
}
|
||||
case SNeutrinoSettings::ITEM_EPG_MISC:
|
||||
{
|
||||
keyhelper.get(&key,&icon);
|
||||
menu_item = new CMenuDForwarder(LOCALE_MISCSETTINGS_EPG_READ_NOW, g_settings.epg_read, NULL, new CMiscMenue(), "epg_read_now_usermenu", key, icon);
|
||||
menu_item->setHint("", LOCALE_MENU_HINT_EPG_READ_NOW);
|
||||
menu->addItem(menu_item, false);
|
||||
|
||||
dummy = g_Sectionsd->getIsScanningActive();
|
||||
keyhelper.get(&key,&icon);
|
||||
menu_item = new CMenuOptionChooser(LOCALE_MAINMENU_PAUSESECTIONSD, &dummy, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this , key, icon );
|
||||
|
Reference in New Issue
Block a user