mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-28 16:01:10 +02:00
Merge branch 'uncool/dvbsi++' commit 'd493b1155c4'
...needs buildfixing...
Conflicts:
data/icons/shutdown.jpg
data/icons/start.jpg
lib/libtuxtxt/tuxtxt.h
src/driver/Makefile.am
src/driver/audiodec/Makefile.am
src/driver/framebuffer.cpp
src/driver/record.cpp
src/driver/volume.cpp
src/gui/audio_setup.cpp
src/gui/audioplayer.cpp
src/gui/epgview.cpp
src/gui/eventlist.cpp
src/gui/filebrowser.cpp
src/gui/infoviewer.cpp
src/gui/keybind_setup.cpp
src/gui/miscsettings_menu.cpp
src/gui/movieplayer.cpp
src/gui/osd_setup.cpp
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/gui/streaminfo2.cpp
src/gui/update.cpp
src/gui/videosettings.cpp
src/gui/widget/menue.cpp
src/neutrino.cpp
src/neutrino_menue.cpp
src/system/Makefile.am
src/system/configure_network.cpp
src/system/httptool.cpp
src/system/setting_helpers.cpp
src/timerd/timermanager.cpp
src/zapit/include/zapit/frontend_c.h
src/zapit/src/Makefile.am
src/zapit/src/capmt.cpp
src/zapit/src/frontend.cpp
src/zapit/src/zapit.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)
------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
@@ -35,13 +35,13 @@
|
||||
#include <neutrino_menue.h>
|
||||
#include <system/setting_helpers.h>
|
||||
|
||||
#include "gui/miscsettings_menu.h"
|
||||
#include "gui/cec_setup.h"
|
||||
#include "gui/filebrowser.h"
|
||||
#include "gui/keybind_setup.h"
|
||||
#include "gui/plugins.h"
|
||||
#include "gui/sleeptimer.h"
|
||||
#include "gui/zapit_setup.h"
|
||||
#include <gui/miscsettings_menu.h>
|
||||
#include <gui/cec_setup.h>
|
||||
#include <gui/filebrowser.h>
|
||||
#include <gui/keybind_setup.h>
|
||||
#include <gui/plugins.h>
|
||||
#include <gui/sleeptimer.h>
|
||||
#include <gui/zapit_setup.h>
|
||||
|
||||
#include <gui/widget/icons.h>
|
||||
#include <gui/widget/stringinput.h>
|
||||
@@ -64,7 +64,6 @@ CMiscMenue::~CMiscMenue()
|
||||
|
||||
}
|
||||
|
||||
|
||||
int CMiscMenue::exec(CMenuTarget* parent, const std::string &actionKey)
|
||||
{
|
||||
printf("init extended settings menu...\n");
|
||||
@@ -167,32 +166,42 @@ int CMiscMenue::showMiscSettingsMenu()
|
||||
//general
|
||||
CMenuWidget misc_menue_general(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_MISCSETUP_GENERAL);
|
||||
showMiscSettingsMenuGeneral(&misc_menue_general);
|
||||
misc_menue.addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_GENERAL, true, NULL, &misc_menue_general, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));
|
||||
CMenuForwarder * mf = new CMenuForwarder(LOCALE_MISCSETTINGS_GENERAL, true, NULL, &misc_menue_general, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
|
||||
mf->setHint("", LOCALE_MENU_HINT_MISC_GENERAL);
|
||||
misc_menue.addItem(mf);
|
||||
|
||||
//energy, shutdown
|
||||
if (g_info.hw_caps->can_shutdown)
|
||||
{
|
||||
CMenuWidget *misc_menue_energy = new CMenuWidget(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_MISCSETUP_ENERGY);
|
||||
showMiscSettingsMenuEnergy(misc_menue_energy);
|
||||
misc_menue.addItem(new CMenuDForwarder(LOCALE_MISCSETTINGS_ENERGY, true, NULL, misc_menue_energy, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
|
||||
mf = new CMenuDForwarder(LOCALE_MISCSETTINGS_ENERGY, true, NULL, misc_menue_energy, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
|
||||
mf->setHint("", LOCALE_MENU_HINT_MISC_ENERGY);
|
||||
misc_menue.addItem(mf);
|
||||
}
|
||||
|
||||
//epg
|
||||
CMenuWidget misc_menue_epg(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_MISCSETUP_EPG);
|
||||
showMiscSettingsMenuEpg(&misc_menue_epg);
|
||||
misc_menue.addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_HEAD, true, NULL, &misc_menue_epg, NULL, CRCInput::RC_yellow,NEUTRINO_ICON_BUTTON_YELLOW));
|
||||
mf = new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_HEAD, true, NULL, &misc_menue_epg, NULL, CRCInput::RC_yellow,NEUTRINO_ICON_BUTTON_YELLOW);
|
||||
mf->setHint("", LOCALE_MENU_HINT_MISC_EPG);
|
||||
misc_menue.addItem(mf);
|
||||
|
||||
//filebrowser settings
|
||||
CMenuWidget misc_menue_fbrowser(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_MISCSETUP_FILEBROWSER);
|
||||
showMiscSettingsMenuFBrowser(&misc_menue_fbrowser);
|
||||
misc_menue.addItem( new CMenuForwarder(LOCALE_FILEBROWSER_HEAD, true, NULL, &misc_menue_fbrowser, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));
|
||||
mf = new CMenuForwarder(LOCALE_FILEBROWSER_HEAD, true, NULL, &misc_menue_fbrowser, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
|
||||
mf->setHint("", LOCALE_MENU_HINT_MISC_FILEBROWSER);
|
||||
misc_menue.addItem(mf);
|
||||
|
||||
misc_menue.addItem(GenericMenuSeparatorLine);
|
||||
|
||||
//cec settings
|
||||
CCECSetup cecsetup;
|
||||
if (g_info.hw_caps->can_cec) {
|
||||
CCECSetup cecsetup;
|
||||
misc_menue.addItem(new CMenuForwarder(LOCALE_VIDEOMENU_HDMI_CEC, true, NULL, &cecsetup, NULL, CRCInput::RC_1));
|
||||
mf = new CMenuForwarder(LOCALE_VIDEOMENU_HDMI_CEC, true, NULL, &cecsetup, NULL, CRCInput::RC_1);
|
||||
mf->setHint("", LOCALE_MENU_HINT_MISC_CEC);
|
||||
misc_menue.addItem(mf);
|
||||
}
|
||||
|
||||
if (!g_info.hw_caps->can_shutdown) {
|
||||
@@ -203,11 +212,15 @@ int CMiscMenue::showMiscSettingsMenu()
|
||||
//channellist
|
||||
CMenuWidget misc_menue_chanlist(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_MISCSETUP_CHANNELLIST);
|
||||
showMiscSettingsMenuChanlist(&misc_menue_chanlist);
|
||||
misc_menue.addItem( new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLIST, true, NULL, &misc_menue_chanlist, NULL, CRCInput::RC_2));
|
||||
mf = new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLIST, true, NULL, &misc_menue_chanlist, NULL, CRCInput::RC_2);
|
||||
mf->setHint("", LOCALE_MENU_HINT_MISC_CHANNELLIST);
|
||||
misc_menue.addItem(mf);
|
||||
|
||||
//start channels
|
||||
CZapitSetup zapitsetup;
|
||||
misc_menue.addItem(new CMenuForwarder(LOCALE_ZAPITSETUP_HEAD, true, NULL, &zapitsetup, NULL, CRCInput::RC_3));
|
||||
mf = new CMenuForwarder(LOCALE_ZAPITSETUP_HEAD, true, NULL, &zapitsetup, NULL, CRCInput::RC_3);
|
||||
mf->setHint("", LOCALE_MENU_HINT_MISC_ZAPIT);
|
||||
misc_menue.addItem(mf);
|
||||
|
||||
#ifdef CPU_FREQ
|
||||
//CPU
|
||||
@@ -229,22 +242,34 @@ void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general)
|
||||
ms_general->addIntroItems(LOCALE_MISCSETTINGS_GENERAL);
|
||||
|
||||
//standby after boot
|
||||
ms_general->addItem(new CMenuOptionChooser(LOCALE_EXTRA_START_TOSTANDBY, &g_settings.power_standby, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
|
||||
ms_general->addItem(new CMenuOptionChooser(LOCALE_EXTRA_CACHE_TXT, (int *)&g_settings.cacheTXT, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
|
||||
CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_EXTRA_START_TOSTANDBY, &g_settings.power_standby, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_START_TOSTANDBY);
|
||||
ms_general->addItem(mc);
|
||||
|
||||
mc = new CMenuOptionChooser(LOCALE_EXTRA_CACHE_TXT, (int *)&g_settings.cacheTXT, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_CACHE_TXT);
|
||||
ms_general->addItem(mc);
|
||||
|
||||
//fan speed
|
||||
if (g_info.has_fan)
|
||||
{
|
||||
ms_general->addItem(new CMenuOptionNumberChooser(LOCALE_FAN_SPEED, &g_settings.fan_speed, true, 1, 14, fanNotifier, 0, 0, LOCALE_OPTIONS_OFF) );
|
||||
CMenuOptionNumberChooser * mn = new CMenuOptionNumberChooser(LOCALE_FAN_SPEED, &g_settings.fan_speed, true, 1, 14, fanNotifier, 0, 0, LOCALE_OPTIONS_OFF);
|
||||
mn->setHint("", LOCALE_MENU_HINT_FAN_SPEED);
|
||||
ms_general->addItem(mn);
|
||||
fanNotifier->changeNotify(NONEXISTANT_LOCALE, (void*) &g_settings.fan_speed);
|
||||
}
|
||||
|
||||
//rotor
|
||||
//don't show rotor settings on cable box
|
||||
if (g_info.delivery_system == DVB_S)
|
||||
ms_general->addItem(new CMenuOptionChooser(LOCALE_EXTRA_ROTOR_SWAP, &g_settings.rotor_swap, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
|
||||
if (g_info.delivery_system == DVB_S) {
|
||||
mc = new CMenuOptionChooser(LOCALE_EXTRA_ROTOR_SWAP, &g_settings.rotor_swap, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_ROTOR_SWAP);
|
||||
ms_general->addItem(mc);
|
||||
}
|
||||
|
||||
ms_general->addItem(new CMenuForwarder(LOCALE_PLUGINS_HDD_DIR, true, g_settings.plugin_hdd_dir, this, "plugin_dir"));
|
||||
CMenuForwarder * mf = new CMenuForwarder(LOCALE_PLUGINS_HDD_DIR, true, g_settings.plugin_hdd_dir, this, "plugin_dir");
|
||||
mf->setHint("", LOCALE_MENU_HINT_PLUGINS_HDD_DIR);
|
||||
ms_general->addItem(mf);
|
||||
#ifdef ONE_KEY_PLUGIN
|
||||
ms_general->addItem(new CMenuForwarder(LOCALE_EXTRA_KEY_PLUGIN, true, g_settings.onekey_plugin,this,"onekeyplugin"));
|
||||
#endif /*ONE_KEY_PLUGIN*/
|
||||
@@ -256,16 +281,26 @@ void CMiscMenue::showMiscSettingsMenuEnergy(CMenuWidget *ms_energy)
|
||||
ms_energy->addIntroItems(LOCALE_MISCSETTINGS_ENERGY);
|
||||
|
||||
CMenuOptionChooser *m1 = new CMenuOptionChooser(LOCALE_MISCSETTINGS_SHUTDOWN_REAL_RCDELAY, &g_settings.shutdown_real_rcdelay, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, !g_settings.shutdown_real);
|
||||
m1->setHint("", LOCALE_MENU_HINT_SHUTDOWN_RCDELAY);
|
||||
|
||||
CStringInput * miscSettings_shutdown_count = new CStringInput(LOCALE_MISCSETTINGS_SHUTDOWN_COUNT, g_settings.shutdown_count, 3, LOCALE_MISCSETTINGS_SHUTDOWN_COUNT_HINT1, LOCALE_MISCSETTINGS_SHUTDOWN_COUNT_HINT2, "0123456789 ");
|
||||
CMenuForwarder *m2 = new CMenuDForwarder(LOCALE_MISCSETTINGS_SHUTDOWN_COUNT, !g_settings.shutdown_real, g_settings.shutdown_count, miscSettings_shutdown_count);
|
||||
m2->setHint("", LOCALE_MENU_HINT_SHUTDOWN_COUNT);
|
||||
|
||||
miscNotifier = new COnOffNotifier(1);
|
||||
miscNotifier->addItem(m1);
|
||||
miscNotifier->addItem(m2);
|
||||
|
||||
miscNotifier = new CMiscNotifier( m1, m2 );
|
||||
CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_SHUTDOWN_REAL, &g_settings.shutdown_real, OPTIONS_OFF1_ON0_OPTIONS, OPTIONS_OFF1_ON0_OPTION_COUNT, true, miscNotifier);
|
||||
mc->setHint("", LOCALE_MENU_HINT_SHUTDOWN_REAL);
|
||||
|
||||
ms_energy->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_SHUTDOWN_REAL, &g_settings.shutdown_real, OPTIONS_OFF1_ON0_OPTIONS, OPTIONS_OFF1_ON0_OPTION_COUNT, true, miscNotifier));
|
||||
ms_energy->addItem(mc);
|
||||
ms_energy->addItem(m1);
|
||||
ms_energy->addItem(m2);
|
||||
ms_energy->addItem(new CMenuDForwarder(LOCALE_MISCSETTINGS_SLEEPTIMER, true, g_settings.shutdown_min, new CSleepTimerWidget, "permanent"));
|
||||
|
||||
m2 = new CMenuDForwarder(LOCALE_MISCSETTINGS_SLEEPTIMER, true, g_settings.shutdown_min, new CSleepTimerWidget, "permanent");
|
||||
m2->setHint("", LOCALE_MENU_HINT_INACT_TIMER);
|
||||
ms_energy->addItem(m2);
|
||||
}
|
||||
|
||||
//EPG settings
|
||||
@@ -273,21 +308,33 @@ void CMiscMenue::showMiscSettingsMenuEpg(CMenuWidget *ms_epg)
|
||||
{
|
||||
ms_epg->addIntroItems(LOCALE_MISCSETTINGS_EPG_HEAD);
|
||||
|
||||
ms_epg->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SAVE, &g_settings.epg_save, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
|
||||
CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SAVE, &g_settings.epg_save, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_EPG_SAVE);
|
||||
ms_epg->addItem(mc);
|
||||
|
||||
CStringInput * miscSettings_epg_cache = new CStringInput(LOCALE_MISCSETTINGS_EPG_CACHE, &g_settings.epg_cache, 2,LOCALE_MISCSETTINGS_EPG_CACHE_HINT1, LOCALE_MISCSETTINGS_EPG_CACHE_HINT2 , "0123456789 ", sectionsdConfigNotifier);
|
||||
ms_epg->addItem(new CMenuDForwarder(LOCALE_MISCSETTINGS_EPG_CACHE, true, g_settings.epg_cache, miscSettings_epg_cache));
|
||||
CMenuForwarder * mf = new CMenuDForwarder(LOCALE_MISCSETTINGS_EPG_CACHE, true, g_settings.epg_cache, miscSettings_epg_cache);
|
||||
mf->setHint("", LOCALE_MENU_HINT_EPG_CACHE);
|
||||
ms_epg->addItem(mf);
|
||||
|
||||
CStringInput * miscSettings_epg_cache_e = new CStringInput(LOCALE_MISCSETTINGS_EPG_EXTENDEDCACHE, &g_settings.epg_extendedcache, 3,LOCALE_MISCSETTINGS_EPG_EXTENDEDCACHE_HINT1, LOCALE_MISCSETTINGS_EPG_EXTENDEDCACHE_HINT2 , "0123456789 ", sectionsdConfigNotifier);
|
||||
ms_epg->addItem(new CMenuDForwarder(LOCALE_MISCSETTINGS_EPG_EXTENDEDCACHE, true, g_settings.epg_extendedcache, miscSettings_epg_cache_e));
|
||||
mf = new CMenuDForwarder(LOCALE_MISCSETTINGS_EPG_EXTENDEDCACHE, true, g_settings.epg_extendedcache, miscSettings_epg_cache_e);
|
||||
mf->setHint("", LOCALE_MENU_HINT_EPG_EXTENDEDCACHE);
|
||||
ms_epg->addItem(mf);
|
||||
|
||||
CStringInput * miscSettings_epg_old_events = new CStringInput(LOCALE_MISCSETTINGS_EPG_OLD_EVENTS, &g_settings.epg_old_events, 3,LOCALE_MISCSETTINGS_EPG_OLD_EVENTS_HINT1, LOCALE_MISCSETTINGS_EPG_OLD_EVENTS_HINT2 , "0123456789 ", sectionsdConfigNotifier);
|
||||
ms_epg->addItem(new CMenuDForwarder(LOCALE_MISCSETTINGS_EPG_OLD_EVENTS, true, g_settings.epg_old_events, miscSettings_epg_old_events));
|
||||
mf = new CMenuDForwarder(LOCALE_MISCSETTINGS_EPG_OLD_EVENTS, true, g_settings.epg_old_events, miscSettings_epg_old_events);
|
||||
mf->setHint("", LOCALE_MENU_HINT_EPG_OLD_EVENTS);
|
||||
ms_epg->addItem(mf);
|
||||
|
||||
CStringInput * miscSettings_epg_max_events = new CStringInput(LOCALE_MISCSETTINGS_EPG_MAX_EVENTS, &g_settings.epg_max_events, 6,LOCALE_MISCSETTINGS_EPG_MAX_EVENTS_HINT1, LOCALE_MISCSETTINGS_EPG_MAX_EVENTS_HINT2 , "0123456789 ", sectionsdConfigNotifier);
|
||||
ms_epg->addItem(new CMenuDForwarder(LOCALE_MISCSETTINGS_EPG_MAX_EVENTS, true, g_settings.epg_max_events, miscSettings_epg_max_events));
|
||||
mf = new CMenuDForwarder(LOCALE_MISCSETTINGS_EPG_MAX_EVENTS, true, g_settings.epg_max_events, miscSettings_epg_max_events);
|
||||
mf->setHint("", LOCALE_MENU_HINT_EPG_MAX_EVENTS);
|
||||
ms_epg->addItem(mf);
|
||||
|
||||
ms_epg->addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_DIR, true, g_settings.epg_dir, this, "epgdir"));
|
||||
mf = new CMenuForwarder(LOCALE_MISCSETTINGS_EPG_DIR, true, g_settings.epg_dir, this, "epgdir");
|
||||
mf->setHint("", LOCALE_MENU_HINT_EPG_DIR);
|
||||
ms_epg->addItem(mf);
|
||||
}
|
||||
|
||||
//filebrowser settings
|
||||
@@ -295,9 +342,17 @@ void CMiscMenue::showMiscSettingsMenuFBrowser(CMenuWidget *ms_fbrowser)
|
||||
{
|
||||
ms_fbrowser->addIntroItems(LOCALE_FILEBROWSER_HEAD);
|
||||
|
||||
ms_fbrowser->addItem(new CMenuOptionChooser(LOCALE_FILESYSTEM_IS_UTF8 , &g_settings.filesystem_is_utf8 , MISCSETTINGS_FILESYSTEM_IS_UTF8_OPTIONS, MISCSETTINGS_FILESYSTEM_IS_UTF8_OPTION_COUNT, true ));
|
||||
ms_fbrowser->addItem(new CMenuOptionChooser(LOCALE_FILEBROWSER_SHOWRIGHTS , &g_settings.filebrowser_showrights , MESSAGEBOX_NO_YES_OPTIONS , MESSAGEBOX_NO_YES_OPTION_COUNT , true ));
|
||||
ms_fbrowser->addItem(new CMenuOptionChooser(LOCALE_FILEBROWSER_DENYDIRECTORYLEAVE, &g_settings.filebrowser_denydirectoryleave, MESSAGEBOX_NO_YES_OPTIONS , MESSAGEBOX_NO_YES_OPTION_COUNT , true ));
|
||||
CMenuOptionChooser * mc;
|
||||
mc = new CMenuOptionChooser(LOCALE_FILESYSTEM_IS_UTF8 , &g_settings.filesystem_is_utf8 , MISCSETTINGS_FILESYSTEM_IS_UTF8_OPTIONS, MISCSETTINGS_FILESYSTEM_IS_UTF8_OPTION_COUNT, true );
|
||||
mc->setHint("", LOCALE_MENU_HINT_FILESYSTEM_IS_UTF8);
|
||||
ms_fbrowser->addItem(mc);
|
||||
|
||||
mc = new CMenuOptionChooser(LOCALE_FILEBROWSER_SHOWRIGHTS , &g_settings.filebrowser_showrights , MESSAGEBOX_NO_YES_OPTIONS , MESSAGEBOX_NO_YES_OPTION_COUNT , true );
|
||||
mc->setHint("", LOCALE_MENU_HINT_FILEBROWSER_SHOWRIGHTS);
|
||||
ms_fbrowser->addItem(mc);
|
||||
mc = new CMenuOptionChooser(LOCALE_FILEBROWSER_DENYDIRECTORYLEAVE, &g_settings.filebrowser_denydirectoryleave, MESSAGEBOX_NO_YES_OPTIONS , MESSAGEBOX_NO_YES_OPTION_COUNT , true );
|
||||
mc->setHint("", LOCALE_MENU_HINT_FILEBROWSER_DENYDIRECTORYLEAVE);
|
||||
ms_fbrowser->addItem(mc);
|
||||
}
|
||||
|
||||
//channellist
|
||||
@@ -305,12 +360,30 @@ void CMiscMenue::showMiscSettingsMenuChanlist(CMenuWidget *ms_chanlist)
|
||||
{
|
||||
ms_chanlist->addIntroItems(LOCALE_MISCSETTINGS_CHANNELLIST);
|
||||
|
||||
ms_chanlist->addItem(new CMenuOptionChooser(LOCALE_CHANNELLIST_MAKE_HDLIST , &g_settings.make_hd_list , OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
|
||||
ms_chanlist->addItem(new CMenuOptionChooser(LOCALE_CHANNELLIST_MAKE_NEWLIST, &g_settings.make_new_list , OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
|
||||
ms_chanlist->addItem(new CMenuOptionChooser(LOCALE_CHANNELLIST_MAKE_REMOVEDLIST, &g_settings.make_removed_list , OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
|
||||
ms_chanlist->addItem(new CMenuOptionChooser(LOCALE_CHANNELLIST_KEEP_NUMBERS, &g_settings.keep_channel_numbers , OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
|
||||
ms_chanlist->addItem(new CMenuOptionChooser(LOCALE_EXTRA_ZAP_CYCLE , &g_settings.zap_cycle , OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
|
||||
ms_chanlist->addItem(new CMenuOptionChooser(LOCALE_CHANNELLIST_NEW_ZAP_MODE, &g_settings.channellist_new_zap_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true ));
|
||||
CMenuOptionChooser * mc;
|
||||
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_MAKE_HDLIST , &g_settings.make_hd_list , OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_MAKE_HDLIST);
|
||||
ms_chanlist->addItem(mc);
|
||||
|
||||
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_MAKE_NEWLIST, &g_settings.make_new_list , OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_MAKE_NEWLIST);
|
||||
ms_chanlist->addItem(mc);
|
||||
|
||||
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_MAKE_REMOVEDLIST, &g_settings.make_removed_list , OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_MAKE_REMOVEDLIST);
|
||||
ms_chanlist->addItem(mc);
|
||||
|
||||
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_KEEP_NUMBERS, &g_settings.keep_channel_numbers , OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_KEEP_NUMBERS);
|
||||
ms_chanlist->addItem(mc);
|
||||
|
||||
mc = new CMenuOptionChooser(LOCALE_EXTRA_ZAP_CYCLE , &g_settings.zap_cycle , OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_ZAP_CYCLE);
|
||||
ms_chanlist->addItem(mc);
|
||||
|
||||
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_NEW_ZAP_MODE, &g_settings.channellist_new_zap_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true );
|
||||
mc->setHint("", LOCALE_MENU_HINT_NEW_ZAP_MODE);
|
||||
ms_chanlist->addItem(mc);
|
||||
}
|
||||
|
||||
#ifdef CPU_FREQ
|
||||
|
||||
Reference in New Issue
Block a user