mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 08:51:04 +02:00
Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes
Conflicts:
configure.ac
data/icons/shutdown.jpg
data/icons/start.jpg
data/locale/deutsch.locale
data/locale/english.locale
lib/libmd5sum/md5.c
src/driver/scanepg.cpp
src/driver/streamts.cpp
src/driver/vfd.cpp
src/driver/vfd.h
src/driver/volume.cpp
src/eitd/dmx.cpp
src/eitd/xmlutil.cpp
src/gui/Makefile.am
src/gui/audiomute.cpp
src/gui/channellist.cpp
src/gui/dboxinfo.cpp
src/gui/epgview.cpp
src/gui/eventlist.cpp
src/gui/filebrowser.cpp
src/gui/hdd_menu.cpp
src/gui/infoviewer.cpp
src/gui/infoviewer_bb.cpp
src/gui/infoviewer_bb.h
src/gui/keybind_setup.cpp
src/gui/luainstance.cpp
src/gui/luainstance.h
src/gui/miscsettings_menu.cpp
src/gui/moviebrowser.cpp
src/gui/movieplayer.cpp
src/gui/osd_progressbar_setup.cpp
src/gui/osd_progressbar_setup.h
src/gui/osd_setup.cpp
src/gui/osdlang_setup.cpp
src/gui/personalize.cpp
src/gui/plugins.cpp
src/gui/plugins.h
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/gui/update_settings.cpp
src/gui/user_menue.cpp
src/gui/user_menue_setup.cpp
src/gui/videosettings.cpp
src/gui/widget/buttons.cpp
src/gui/widget/menue.cpp
src/gui/widget/menue.h
src/gui/widget/progresswindow.cpp
src/neutrino.cpp
src/neutrino_menue.cpp
src/nhttpd/yhttpd.cpp
src/system/helpers.cpp
src/system/locals.h
src/system/locals_intern.h
src/system/setting_helpers.cpp
src/zapit/lib/zapitclient.cpp
src/zapit/src/fastscan.cpp
src/zapit/src/frontend.cpp
src/zapit/src/getservices.cpp
src/zapit/src/scan.cpp
src/zapit/src/scannit.cpp
src/zapit/src/scanpmt.cpp
src/zapit/src/transponder.cpp
src/zapit/src/zapit.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
@@ -44,6 +44,7 @@
|
||||
#include "screensetup.h"
|
||||
#include "osdlang_setup.h"
|
||||
#include "filebrowser.h"
|
||||
#include "osd_progressbar_setup.h"
|
||||
|
||||
#include <gui/audiomute.h>
|
||||
#include <gui/infoclock.h>
|
||||
@@ -130,12 +131,6 @@ const SNeutrinoSettings::FONT_TYPES epg_font_sizes[4] =
|
||||
SNeutrinoSettings::FONT_TYPE_EPG_DATE
|
||||
};
|
||||
|
||||
const SNeutrinoSettings::FONT_TYPES gamelist_font_sizes[2] =
|
||||
{
|
||||
SNeutrinoSettings::FONT_TYPE_GAMELIST_ITEMLARGE,
|
||||
SNeutrinoSettings::FONT_TYPE_GAMELIST_ITEMSMALL
|
||||
};
|
||||
|
||||
const SNeutrinoSettings::FONT_TYPES menu_font_sizes[4] =
|
||||
{
|
||||
SNeutrinoSettings::FONT_TYPE_MENU_TITLE,
|
||||
@@ -149,16 +144,15 @@ const SNeutrinoSettings::FONT_TYPES other_font_sizes[2] =
|
||||
SNeutrinoSettings::FONT_TYPE_FILEBROWSER_ITEM
|
||||
};
|
||||
|
||||
#define FONT_GROUP_COUNT 7
|
||||
#define FONT_GROUP_COUNT 6
|
||||
font_sizes_groups font_sizes_groups[FONT_GROUP_COUNT] =
|
||||
{
|
||||
{LOCALE_FONTMENU_MENU , 4, menu_font_sizes , "fontsize.doth", LOCALE_MENU_HINT_MENU_FONTS },
|
||||
{LOCALE_FONTMENU_MENU , 4, menu_font_sizes , "fontsize.dmen", LOCALE_MENU_HINT_MENU_FONTS },
|
||||
{LOCALE_FONTMENU_CHANNELLIST, 5, channellist_font_sizes, "fontsize.dcha", LOCALE_MENU_HINT_CHANNELLIST_FONTS },
|
||||
{LOCALE_FONTMENU_EVENTLIST , 5, eventlist_font_sizes , "fontsize.deve", LOCALE_MENU_HINT_EVENTLIST_FONTS },
|
||||
{LOCALE_FONTMENU_EPG , 4, epg_font_sizes , "fontsize.depg", LOCALE_MENU_HINT_EPG_FONTS },
|
||||
{LOCALE_FONTMENU_INFOBAR , 4, infobar_font_sizes , "fontsize.dinf", LOCALE_MENU_HINT_INFOBAR_FONTS },
|
||||
{LOCALE_FONTMENU_GAMELIST , 2, gamelist_font_sizes , "fontsize.dgam", LOCALE_MENU_HINT_GAMELIST_FONTS },
|
||||
{LOCALE_FONTMENU_OTHER , 2, other_font_sizes , "fontsize.dgam", LOCALE_MENU_HINT_GAMELIST_FONTS }
|
||||
{LOCALE_FONTMENU_OTHER , 2, other_font_sizes , "fontsize.doth", LOCALE_MENU_HINT_OTHER_FONTS }
|
||||
};
|
||||
|
||||
font_sizes_struct neutrino_font[SNeutrinoSettings::FONT_TYPE_COUNT] =
|
||||
@@ -175,8 +169,6 @@ font_sizes_struct neutrino_font[SNeutrinoSettings::FONT_TYPE_COUNT] =
|
||||
{LOCALE_FONTSIZE_EVENTLIST_ITEMSMALL, 14, CNeutrinoFonts::FONT_STYLE_REGULAR, 1},
|
||||
{LOCALE_FONTSIZE_EVENTLIST_DATETIME , 16, CNeutrinoFonts::FONT_STYLE_REGULAR, 1},
|
||||
{LOCALE_FONTSIZE_EVENTLIST_EVENT , 17, CNeutrinoFonts::FONT_STYLE_REGULAR, 1},
|
||||
{LOCALE_FONTSIZE_GAMELIST_ITEMLARGE , 20, CNeutrinoFonts::FONT_STYLE_BOLD , 1},
|
||||
{LOCALE_FONTSIZE_GAMELIST_ITEMSMALL , 16, CNeutrinoFonts::FONT_STYLE_REGULAR, 1},
|
||||
{LOCALE_FONTSIZE_CHANNELLIST , 20, CNeutrinoFonts::FONT_STYLE_BOLD , 1},
|
||||
{LOCALE_FONTSIZE_CHANNELLIST_DESCR , 20, CNeutrinoFonts::FONT_STYLE_REGULAR, 1},
|
||||
{LOCALE_FONTSIZE_CHANNELLIST_NUMBER , 14, CNeutrinoFonts::FONT_STYLE_BOLD , 2},
|
||||
@@ -409,11 +401,11 @@ const CMenuOptionChooser::keyval VOLUMEBAR_DISP_POS_OPTIONS[VOLUMEBAR_DISP_POS_
|
||||
#define MENU_DISP_POS_OPTIONS_COUNT 5
|
||||
const CMenuOptionChooser::keyval MENU_DISP_POS_OPTIONS[MENU_DISP_POS_OPTIONS_COUNT]=
|
||||
{
|
||||
{ 0 , LOCALE_SETTINGS_POS_DEFAULT_CENTER },
|
||||
{ 1 , LOCALE_SETTINGS_POS_TOP_LEFT },
|
||||
{ 2 , LOCALE_SETTINGS_POS_TOP_RIGHT },
|
||||
{ 3 , LOCALE_SETTINGS_POS_BOTTOM_LEFT },
|
||||
{ 4 , LOCALE_SETTINGS_POS_BOTTOM_RIGHT }
|
||||
{ 0 , LOCALE_SETTINGS_POS_DEFAULT_CENTER },
|
||||
{ 1 , LOCALE_SETTINGS_POS_TOP_LEFT },
|
||||
{ 2 , LOCALE_SETTINGS_POS_TOP_RIGHT },
|
||||
{ 3 , LOCALE_SETTINGS_POS_BOTTOM_LEFT },
|
||||
{ 4 , LOCALE_SETTINGS_POS_BOTTOM_RIGHT }
|
||||
};
|
||||
|
||||
#define INFOBAR_SHOW_RES_MODE_OPTION_COUNT 3
|
||||
@@ -447,6 +439,14 @@ const CMenuOptionChooser::keyval CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS[CHANNE
|
||||
{ 1 , LOCALE_CHANNELLIST_EPGTEXT_ALIGN_RIGHT }
|
||||
};
|
||||
|
||||
#define CHANNELLIST_EXTENDED_OPTIONS_COUNT 3
|
||||
const CMenuOptionChooser::keyval CHANNELLIST_EXTENDED_OPTIONS[CHANNELLIST_EXTENDED_OPTIONS_COUNT]=
|
||||
{
|
||||
{ 0, LOCALE_OPTIONS_OFF }, //none
|
||||
{ 1, LOCALE_CHANNELLIST_EXTENDED_SIMPLE }, //unicolor
|
||||
{ 2, LOCALE_CHANNELLIST_EXTENDED_COLORED } //colored
|
||||
};
|
||||
|
||||
#define OPTIONS_COLORED_EVENTS_OPTION_COUNT 3
|
||||
const CMenuOptionChooser::keyval OPTIONS_COLORED_EVENTS_OPTIONS[OPTIONS_COLORED_EVENTS_OPTION_COUNT] =
|
||||
{
|
||||
@@ -456,20 +456,21 @@ const CMenuOptionChooser::keyval OPTIONS_COLORED_EVENTS_OPTIONS[OPTIONS_COLORED_
|
||||
};
|
||||
|
||||
/* these are more descriptive... */
|
||||
#define LOCALE_PROGRESSBAR_COLOR_MATRIX LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_0
|
||||
#define LOCALE_PROGRESSBAR_COLOR_VERTICAL LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_1
|
||||
#define LOCALE_PROGRESSBAR_COLOR_HORIZONTAL LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_2
|
||||
#define LOCALE_PROGRESSBAR_COLOR_FULL LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_3
|
||||
#define LOCALE_PROGRESSBAR_COLOR_MONO LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_4
|
||||
#define _LOCALE_PROGRESSBAR_COLOR_MATRIX LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_0
|
||||
#define _LOCALE_PROGRESSBAR_COLOR_VERTICAL LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_1
|
||||
#define _LOCALE_PROGRESSBAR_COLOR_HORIZONTAL LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_2
|
||||
#define _LOCALE_PROGRESSBAR_COLOR_FULL LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_3
|
||||
#define _LOCALE_PROGRESSBAR_COLOR_MONO LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_4
|
||||
|
||||
#define PROGRESSBAR_COLOR_OPTION_COUNT 5
|
||||
#define PROGRESSBAR_COLOR_OPTION_COUNT 6
|
||||
const CMenuOptionChooser::keyval PROGRESSBAR_COLOR_OPTIONS[PROGRESSBAR_COLOR_OPTION_COUNT] =
|
||||
{
|
||||
{ -1, LOCALE_PROGRESSBAR_COLOR_MONO },
|
||||
{ CProgressBar::PB_MATRIX, LOCALE_PROGRESSBAR_COLOR_MATRIX },
|
||||
{ CProgressBar::PB_LINES_V, LOCALE_PROGRESSBAR_COLOR_VERTICAL },
|
||||
{ CProgressBar::PB_LINES_H, LOCALE_PROGRESSBAR_COLOR_HORIZONTAL },
|
||||
{ CProgressBar::PB_COLOR, LOCALE_PROGRESSBAR_COLOR_FULL }
|
||||
{ CProgressBar::PB_OFF, LOCALE_OPTIONS_OFF },
|
||||
{ CProgressBar::PB_MONO, _LOCALE_PROGRESSBAR_COLOR_MONO },
|
||||
{ CProgressBar::PB_MATRIX, _LOCALE_PROGRESSBAR_COLOR_MATRIX },
|
||||
{ CProgressBar::PB_LINES_V, _LOCALE_PROGRESSBAR_COLOR_VERTICAL },
|
||||
{ CProgressBar::PB_LINES_H, _LOCALE_PROGRESSBAR_COLOR_HORIZONTAL },
|
||||
{ CProgressBar::PB_COLOR, _LOCALE_PROGRESSBAR_COLOR_FULL },
|
||||
};
|
||||
|
||||
//show osd setup
|
||||
@@ -489,27 +490,27 @@ int COsdSetup::showOsdSetup()
|
||||
|
||||
//item menu colors
|
||||
showOsdMenueColorSetup(&osd_menu_colors);
|
||||
CMenuForwarder * mf = new CMenuForwarder(LOCALE_COLORMENU_MENUCOLORS, true, NULL, &osd_menu_colors, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
|
||||
CMenuForwarder * mf = new CMenuForwarder(LOCALE_COLORMENU_MENUCOLORS, true, NULL, &osd_menu_colors, NULL, CRCInput::RC_red);
|
||||
mf->setHint("", LOCALE_MENU_HINT_COLORS);
|
||||
osd_menu->addItem(mf);
|
||||
|
||||
//fonts
|
||||
CMenuWidget osd_menu_fonts(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_COLORS, w_max(50, 10), MN_WIDGET_ID_OSDSETUP_FONT);
|
||||
showOsdFontSizeSetup(&osd_menu_fonts);
|
||||
mf = new CMenuForwarder(LOCALE_FONTMENU_HEAD, true, NULL, &osd_menu_fonts, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
|
||||
mf = new CMenuForwarder(LOCALE_FONTMENU_HEAD, true, NULL, &osd_menu_fonts, NULL, CRCInput::RC_green);
|
||||
mf->setHint("", LOCALE_MENU_HINT_FONTS);
|
||||
osd_menu->addItem(mf);
|
||||
|
||||
//timeouts
|
||||
CMenuWidget osd_menu_timing(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_TIMEOUT);
|
||||
showOsdTimeoutSetup(&osd_menu_timing);
|
||||
mf = new CMenuForwarder(LOCALE_COLORMENU_TIMING, true, NULL, &osd_menu_timing, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
|
||||
mf = new CMenuForwarder(LOCALE_COLORMENU_TIMING, true, NULL, &osd_menu_timing, NULL, CRCInput::RC_yellow);
|
||||
mf->setHint("", LOCALE_MENU_HINT_TIMEOUTS);
|
||||
osd_menu->addItem(mf);
|
||||
|
||||
//screen
|
||||
CScreenSetup screensetup;
|
||||
mf = new CMenuForwarder(LOCALE_VIDEOMENU_SCREENSETUP, true, NULL, &screensetup, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
|
||||
mf = new CMenuForwarder(LOCALE_VIDEOMENU_SCREENSETUP, true, NULL, &screensetup, NULL, CRCInput::RC_blue);
|
||||
mf->setHint("", LOCALE_MENU_HINT_SCREEN_SETUP);
|
||||
osd_menu->addItem(mf);
|
||||
|
||||
@@ -520,6 +521,11 @@ int COsdSetup::showOsdSetup()
|
||||
mf->setHint("", LOCALE_MENU_HINT_MENUS);
|
||||
osd_menu->addItem(mf);
|
||||
|
||||
//progressbar
|
||||
mf = new CMenuDForwarder(LOCALE_MISCSETTINGS_PROGRESSBAR, true, NULL, new CProgressbarSetup(), NULL, CRCInput::convertDigitToKey(shortcut++));
|
||||
mf->setHint("", LOCALE_MENU_HINT_PROGRESSBAR);
|
||||
osd_menu->addItem(mf);
|
||||
|
||||
//infobar
|
||||
CMenuWidget osd_menu_infobar(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_INFOBAR);
|
||||
showOsdInfobarSetup(&osd_menu_infobar);
|
||||
@@ -592,11 +598,18 @@ int COsdSetup::showOsdSetup()
|
||||
mfWindowSize->setHint("", LOCALE_MENU_HINT_WINDOW_SIZE);
|
||||
osd_menu->addItem(mfWindowSize);
|
||||
|
||||
#ifdef CHECK_MERGE
|
||||
// color progress bar
|
||||
int pb_color = g_settings.progressbar_color ? g_settings.progressbar_design : -1;
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_LONG, &pb_color, PROGRESSBAR_COLOR_OPTIONS, PROGRESSBAR_COLOR_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_COLOR);
|
||||
osd_menu->addItem(mc);
|
||||
#endif
|
||||
// color gradient
|
||||
mc = new CMenuOptionChooser(LOCALE_COLOR_GRADIENT, &g_settings.gradiant, MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true, this );
|
||||
mc->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT);
|
||||
osd_menu->addItem(mc);
|
||||
|
||||
osd_menu->addItem(GenericMenuSeparatorLine);
|
||||
|
||||
// scrambled
|
||||
@@ -642,25 +655,27 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
|
||||
{
|
||||
menu_colors->addIntroItems(LOCALE_COLORMENU_MENUCOLORS);
|
||||
|
||||
CMenuForwarder * mf = new CMenuDForwarder(LOCALE_COLORMENU_THEMESELECT, true, NULL, new CThemes(), NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
|
||||
CMenuForwarder * mf = new CMenuDForwarder(LOCALE_COLORMENU_THEMESELECT, true, NULL, new CThemes(), NULL, CRCInput::RC_red);
|
||||
mf->setHint("", LOCALE_MENU_HINT_THEME);
|
||||
menu_colors->addItem(mf);
|
||||
|
||||
CColorChooser* chHeadcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &g_settings.menu_Head_red, &g_settings.menu_Head_green, &g_settings.menu_Head_blue,
|
||||
&g_settings.menu_Head_alpha, colorSetupNotifier);
|
||||
CColorChooser* chHeadTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &g_settings.menu_Head_Text_red, &g_settings.menu_Head_Text_green, &g_settings.menu_Head_Text_blue,
|
||||
SNeutrinoTheme &t = g_settings.theme;
|
||||
|
||||
CColorChooser* chHeadcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.menu_Head_red, &t.menu_Head_green, &t.menu_Head_blue,
|
||||
&t.menu_Head_alpha, colorSetupNotifier);
|
||||
CColorChooser* chHeadTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.menu_Head_Text_red, &t.menu_Head_Text_green, &t.menu_Head_Text_blue,
|
||||
NULL, colorSetupNotifier);
|
||||
CColorChooser* chContentcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &g_settings.menu_Content_red, &g_settings.menu_Content_green, &g_settings.menu_Content_blue,
|
||||
&g_settings.menu_Content_alpha, colorSetupNotifier);
|
||||
CColorChooser* chContentTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &g_settings.menu_Content_Text_red, &g_settings.menu_Content_Text_green, &g_settings.menu_Content_Text_blue,
|
||||
CColorChooser* chContentcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.menu_Content_red, &t.menu_Content_green, &t.menu_Content_blue,
|
||||
&t.menu_Content_alpha, colorSetupNotifier);
|
||||
CColorChooser* chContentTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.menu_Content_Text_red, &t.menu_Content_Text_green, &t.menu_Content_Text_blue,
|
||||
NULL, colorSetupNotifier);
|
||||
CColorChooser* chContentSelectedcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &g_settings.menu_Content_Selected_red, &g_settings.menu_Content_Selected_green, &g_settings.menu_Content_Selected_blue,
|
||||
&g_settings.menu_Content_Selected_alpha, colorSetupNotifier);
|
||||
CColorChooser* chContentSelectedTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &g_settings.menu_Content_Selected_Text_red, &g_settings.menu_Content_Selected_Text_green, &g_settings.menu_Content_Selected_Text_blue,
|
||||
CColorChooser* chContentSelectedcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.menu_Content_Selected_red, &t.menu_Content_Selected_green, &t.menu_Content_Selected_blue,
|
||||
&t.menu_Content_Selected_alpha, colorSetupNotifier);
|
||||
CColorChooser* chContentSelectedTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.menu_Content_Selected_Text_red, &t.menu_Content_Selected_Text_green, &t.menu_Content_Selected_Text_blue,
|
||||
NULL, colorSetupNotifier);
|
||||
CColorChooser* chContentInactivecolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &g_settings.menu_Content_inactive_red, &g_settings.menu_Content_inactive_green, &g_settings.menu_Content_inactive_blue,
|
||||
&g_settings.menu_Content_inactive_alpha, colorSetupNotifier);
|
||||
CColorChooser* chContentInactiveTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &g_settings.menu_Content_inactive_Text_red, &g_settings.menu_Content_inactive_Text_green, &g_settings.menu_Content_inactive_Text_blue,
|
||||
CColorChooser* chContentInactivecolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.menu_Content_inactive_red, &t.menu_Content_inactive_green, &t.menu_Content_inactive_blue,
|
||||
&t.menu_Content_inactive_alpha, colorSetupNotifier);
|
||||
CColorChooser* chContentInactiveTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.menu_Content_inactive_Text_red, &t.menu_Content_inactive_Text_green, &t.menu_Content_inactive_Text_blue,
|
||||
NULL, colorSetupNotifier);
|
||||
|
||||
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORMENUSETUP_MENUHEAD));
|
||||
@@ -700,10 +715,10 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
|
||||
mf->setHint("", LOCALE_MENU_HINT_SELECTED_TEXT);
|
||||
menu_colors->addItem(mf);
|
||||
|
||||
CColorChooser* chInfobarcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &g_settings.infobar_red,
|
||||
&g_settings.infobar_green, &g_settings.infobar_blue, &g_settings.infobar_alpha, colorSetupNotifier);
|
||||
CColorChooser* chInfobarTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &g_settings.infobar_Text_red,
|
||||
&g_settings.infobar_Text_green, &g_settings.infobar_Text_blue, NULL, colorSetupNotifier);
|
||||
CColorChooser* chInfobarcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.infobar_red,
|
||||
&t.infobar_green, &t.infobar_blue, &t.infobar_alpha, colorSetupNotifier);
|
||||
CColorChooser* chInfobarTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.infobar_Text_red,
|
||||
&t.infobar_Text_green, &t.infobar_Text_blue, NULL, colorSetupNotifier);
|
||||
|
||||
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORSTATUSBAR_TEXT));
|
||||
mf = new CMenuDForwarder(LOCALE_COLORMENU_BACKGROUND, true, NULL, chInfobarcolor );
|
||||
@@ -714,8 +729,8 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
|
||||
mf->setHint("", LOCALE_MENU_HINT_INFOBAR_TEXTCOLOR);
|
||||
menu_colors->addItem(mf);
|
||||
|
||||
CColorChooser* chColored_Events = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &g_settings.colored_events_red,
|
||||
&g_settings.colored_events_green, &g_settings.colored_events_blue, NULL, colorSetupNotifier);
|
||||
CColorChooser* chColored_Events = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.colored_events_red,
|
||||
&t.colored_events_green, &t.colored_events_blue, NULL, colorSetupNotifier);
|
||||
|
||||
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS));
|
||||
mf = new CMenuDForwarder(LOCALE_COLORMENU_TEXTCOLOR, true, NULL, chColored_Events );
|
||||
@@ -784,26 +799,26 @@ void COsdSetup::showOsdFontSizeSetup(CMenuWidget *menu_fonts)
|
||||
// select gui font file
|
||||
osdFontFile = g_settings.font_file;
|
||||
osdFontFile = "(" + getBaseName(osdFontFile) + ")";
|
||||
mfFontFile = new CMenuForwarder(LOCALE_COLORMENU_FONT, true, osdFontFile.c_str(), this, "select_font", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
|
||||
mfFontFile = new CMenuForwarder(LOCALE_COLORMENU_FONT, true, osdFontFile.c_str(), this, "select_font", CRCInput::RC_red);
|
||||
mfFontFile->setHint("", LOCALE_MENU_HINT_FONT_GUI);
|
||||
fontSettings->addItem(mfFontFile);
|
||||
|
||||
// select teletext font file
|
||||
osdTtxFontFile = g_settings.ttx_font_file;
|
||||
osdTtxFontFile = "(" + getBaseName(osdTtxFontFile) + ")";
|
||||
mfTtxFontFile = new CMenuForwarder(LOCALE_COLORMENU_FONT_TTX, true, osdTtxFontFile.c_str(), this, "ttx_font", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
|
||||
mfTtxFontFile = new CMenuForwarder(LOCALE_COLORMENU_FONT_TTX, true, osdTtxFontFile.c_str(), this, "ttx_font", CRCInput::RC_green);
|
||||
mfTtxFontFile->setHint("", LOCALE_MENU_HINT_FONT_TTX);
|
||||
fontSettings->addItem(mfTtxFontFile);
|
||||
|
||||
// contrast fonts
|
||||
CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_COLORMENU_CONTRAST_FONTS, &g_settings.contrast_fonts, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
|
||||
CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_COLORMENU_CONTRAST_FONTS, &g_settings.contrast_fonts, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this, CRCInput::RC_yellow);
|
||||
mc->setHint("", LOCALE_MENU_HINT_CONTRAST_FONTS);
|
||||
fontSettings->addItem(mc);
|
||||
|
||||
fontSettings->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_FONTMENU_SIZES));
|
||||
|
||||
//submenu font scaling
|
||||
mf = new CMenuForwarder(LOCALE_FONTMENU_SCALING, true, NULL, this, "font_scaling", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
|
||||
mf = new CMenuForwarder(LOCALE_FONTMENU_SCALING, true, NULL, this, "font_scaling", CRCInput::RC_blue);
|
||||
mf->setHint("", LOCALE_MENU_HINT_FONT_SCALING);
|
||||
fontSettings->addItem(mf);
|
||||
|
||||
@@ -846,19 +861,28 @@ void COsdSetup::showOsdTimeoutSetup(CMenuWidget* menu_timeout)
|
||||
}
|
||||
|
||||
menu_timeout->addItem(GenericMenuSeparatorLine);
|
||||
menu_timeout->addItem(new CMenuForwarder(LOCALE_OPTIONS_DEFAULT, true, NULL, this, "osd.def", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));
|
||||
menu_timeout->addItem(new CMenuForwarder(LOCALE_OPTIONS_DEFAULT, true, NULL, this, "osd.def", CRCInput::RC_red));
|
||||
}
|
||||
|
||||
#define LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS_COUNT 7
|
||||
const CMenuOptionChooser::keyval LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS[LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS_COUNT]=
|
||||
{
|
||||
{ 0 , LOCALE_MISCSETTINGS_INFOBAR_DISP_0 },
|
||||
{ 1 , LOCALE_MISCSETTINGS_INFOBAR_DISP_1 },
|
||||
{ 2 , LOCALE_MISCSETTINGS_INFOBAR_DISP_2 },
|
||||
{ 3 , LOCALE_MISCSETTINGS_INFOBAR_DISP_3 },
|
||||
{ 4 , LOCALE_MISCSETTINGS_INFOBAR_DISP_4 },
|
||||
{ 5 , LOCALE_MISCSETTINGS_INFOBAR_DISP_5 },
|
||||
{ 6 , LOCALE_MISCSETTINGS_INFOBAR_DISP_6 }
|
||||
{ 0 , LOCALE_MISCSETTINGS_INFOBAR_DISP_0 },
|
||||
{ 1 , LOCALE_MISCSETTINGS_INFOBAR_DISP_1 },
|
||||
{ 2 , LOCALE_MISCSETTINGS_INFOBAR_DISP_2 },
|
||||
{ 3 , LOCALE_MISCSETTINGS_INFOBAR_DISP_3 },
|
||||
{ 4 , LOCALE_MISCSETTINGS_INFOBAR_DISP_4 },
|
||||
{ 5 , LOCALE_MISCSETTINGS_INFOBAR_DISP_5 },
|
||||
{ 6 , LOCALE_MISCSETTINGS_INFOBAR_DISP_6 }
|
||||
};
|
||||
|
||||
#define PROGRESSBAR_INFOBAR_POSITION_COUNT 4
|
||||
const CMenuOptionChooser::keyval PROGRESSBAR_INFOBAR_POSITION_OPTIONS[PROGRESSBAR_INFOBAR_POSITION_COUNT]=
|
||||
{
|
||||
{ 0 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_0 },
|
||||
{ 1 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_1 },
|
||||
{ 2 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_2 },
|
||||
{ 3 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_3 }
|
||||
};
|
||||
#define LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_COUNT 4
|
||||
const CMenuOptionChooser::keyval LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_OPTIONS[LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_COUNT]=
|
||||
@@ -889,6 +913,14 @@ void COsdSetup::showOsdMenusSetup(CMenuWidget *menu_menus)
|
||||
submenu_menus->addItem(mc);
|
||||
}
|
||||
|
||||
#define HDD_STATFS_OPTION_COUNT 3
|
||||
const CMenuOptionChooser::keyval HDD_STATFS_OPTIONS[HDD_STATFS_OPTION_COUNT] =
|
||||
{
|
||||
{ SNeutrinoSettings::HDD_STATFS_OFF, LOCALE_OPTIONS_OFF },
|
||||
{ SNeutrinoSettings::HDD_STATFS_ALWAYS, LOCALE_HDD_STATFS_ALWAYS },
|
||||
{ SNeutrinoSettings::HDD_STATFS_RECORDING, LOCALE_HDD_STATFS_RECORDING }
|
||||
};
|
||||
|
||||
//infobar
|
||||
void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar)
|
||||
{
|
||||
@@ -916,16 +948,28 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar)
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_SAT);
|
||||
menu_infobar->addItem(mc);
|
||||
|
||||
#ifdef CHECK_MERGE
|
||||
// infobar progress
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR, &g_settings.infobar_progressbar, LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_OPTIONS, LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_PROGRESSBAR);
|
||||
menu_infobar->addItem(mc);
|
||||
#endif
|
||||
//infobar position
|
||||
CMenuOptionChooser *infobar_position;
|
||||
infobar_position = new CMenuOptionChooser(LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION, &g_settings.infobar_progressbar, PROGRESSBAR_INFOBAR_POSITION_OPTIONS, PROGRESSBAR_INFOBAR_POSITION_COUNT, true);
|
||||
infobar_position->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_INFOBAR_POSITION);
|
||||
menu_infobar->addItem(infobar_position);
|
||||
|
||||
// flash/hdd progress
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_SYSFS_HDD, &g_settings.infobar_show_sysfs_hdd, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_FILESYS);
|
||||
menu_infobar->addItem(mc);
|
||||
|
||||
// hdd update
|
||||
mc = new CMenuOptionChooser(LOCALE_HDD_STATFS, &g_settings.hdd_statfs_mode, HDD_STATFS_OPTIONS, HDD_STATFS_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_HDD_STATFS);
|
||||
menu_infobar->addItem(mc);
|
||||
|
||||
// resolution
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_RES, &g_settings.infobar_show_res, INFOBAR_SHOW_RES_MODE_OPTIONS, INFOBAR_SHOW_RES_MODE_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_RES);
|
||||
@@ -963,7 +1007,7 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar)
|
||||
// radiotext
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_RADIOTEXT, &g_settings.radiotext_enable, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this);
|
||||
mc->setHint("", LOCALE_MENU_HINT_INFOBAR_RADIOTEXT);
|
||||
menu_infobar->addItem(mc);
|
||||
menu_infobar->addItem(mc);
|
||||
}
|
||||
|
||||
//channellist
|
||||
@@ -984,7 +1028,7 @@ void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist)
|
||||
menu_chanlist->addItem(mc);
|
||||
|
||||
// extended channel list
|
||||
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_EXTENDED, &g_settings.channellist_extended, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_EXTENDED, &g_settings.channellist_progressbar_design, PROGRESSBAR_COLOR_OPTIONS, PROGRESSBAR_COLOR_OPTION_COUNT, true, this);
|
||||
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_EXTENDED);
|
||||
menu_chanlist->addItem(mc);
|
||||
|
||||
@@ -1002,6 +1046,11 @@ void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist)
|
||||
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELLOGO, &g_settings.channellist_show_channellogo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO);
|
||||
menu_chanlist->addItem(mc);
|
||||
|
||||
//show numbers
|
||||
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELNUMBER, &g_settings.channellist_show_numbers, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELNUMBER);
|
||||
menu_chanlist->addItem(mc);
|
||||
}
|
||||
|
||||
//eventlist
|
||||
@@ -1052,7 +1101,7 @@ void COsdSetup::showOsdInfoclockSetup(CMenuWidget *menu_infoclock)
|
||||
{
|
||||
menu_infoclock->addIntroItems(LOCALE_MISCSETTINGS_INFOCLOCK);
|
||||
|
||||
CMenuOptionChooser *mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOCLOCK, &g_settings.mode_clock, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
|
||||
CMenuOptionChooser *mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOCLOCK, &g_settings.mode_clock, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::RC_red);
|
||||
mc->setHint("", LOCALE_MENU_HINT_CLOCK_MODE);
|
||||
menu_infoclock->addItem(mc);
|
||||
|
||||
@@ -1076,7 +1125,7 @@ void COsdSetup::showOsdInfoclockSetup(CMenuWidget *menu_infoclock)
|
||||
menu_infoclock->addItem(mc);
|
||||
|
||||
// digit color
|
||||
CColorChooser* cc = new CColorChooser(LOCALE_COLORMENU_CLOCK_TEXTCOLOR, &g_settings.clock_Digit_red, &g_settings.clock_Digit_green, &g_settings.clock_Digit_blue,
|
||||
CColorChooser* cc = new CColorChooser(LOCALE_COLORMENU_CLOCK_TEXTCOLOR, &g_settings.theme.clock_Digit_red, &g_settings.theme.clock_Digit_green, &g_settings.theme.clock_Digit_blue,
|
||||
NULL, colorSetupNotifier);
|
||||
CMenuDForwarder* mf = new CMenuDForwarder(LOCALE_COLORMENU_CLOCK_TEXTCOLOR, !g_settings.infoClockBackground, NULL, cc);
|
||||
mf->setHint("", LOCALE_MENU_HINT_CLOCK_TEXTCOLOR);
|
||||
@@ -1105,6 +1154,10 @@ bool COsdSetup::changeNotify(const neutrino_locale_t OptionName, void * data)
|
||||
g_InfoViewer->changePB();
|
||||
return false;
|
||||
}
|
||||
else if(ARE_LOCALES_EQUAL(OptionName, LOCALE_COLOR_GRADIENT)) {
|
||||
osd_menu->hide();
|
||||
return true;
|
||||
}
|
||||
else if(ARE_LOCALES_EQUAL(OptionName, LOCALE_COLORMENU_OSD_PRESET)) {
|
||||
int preset = * (int *) data;
|
||||
printf("preset %d (setting %d)\n", preset, g_settings.screen_preset);
|
||||
@@ -1153,35 +1206,7 @@ int COsdSetup::showContextChanlistMenu()
|
||||
menu_chanlist->enableFade(false);
|
||||
menu_chanlist->setSelected(cselected);
|
||||
|
||||
CMenuOptionChooser * mc;
|
||||
|
||||
menu_chanlist->addIntroItems(LOCALE_MISCSETTINGS_CHANNELLIST);//, NONEXISTANT_LOCALE, CMenuWidget::BTN_TYPE_CANCEL);
|
||||
|
||||
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_ADDITIONAL, &g_settings.channellist_additional, CHANNELLIST_ADDITIONAL_OPTIONS, CHANNELLIST_ADDITIONAL_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_ADDITIONAL);
|
||||
menu_chanlist->addItem(mc);
|
||||
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_CHANNELLIST_EPGTEXT_ALIGN, &g_settings.channellist_epgtext_align_right, CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS, CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_EPG_ALIGN);
|
||||
menu_chanlist->addItem(mc);
|
||||
|
||||
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_EXTENDED, &g_settings.channellist_extended, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_EXTENDED);
|
||||
menu_chanlist->addItem(mc);
|
||||
|
||||
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_FOOT, &g_settings.channellist_foot, CHANNELLIST_FOOT_OPTIONS, CHANNELLIST_FOOT_OPTIONS_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_FOOT);
|
||||
menu_chanlist->addItem(mc);
|
||||
|
||||
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_CHANNELLIST_COLORED_EVENTS, &g_settings.colored_events_channellist, OPTIONS_COLORED_EVENTS_OPTIONS, OPTIONS_COLORED_EVENTS_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_COLORED);
|
||||
menu_chanlist->addItem(mc);
|
||||
|
||||
//show channel logo
|
||||
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELLOGO, &g_settings.channellist_show_channellogo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
|
||||
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO);
|
||||
menu_chanlist->addItem(mc);
|
||||
|
||||
showOsdChanlistSetup(menu_chanlist);
|
||||
menu_chanlist->addItem(new CMenuSeparator(CMenuSeparator::LINE));
|
||||
|
||||
CMenuWidget *fontSettingsSubMenu = new CMenuWidget(LOCALE_FONTMENU_HEAD, NEUTRINO_ICON_KEYBINDING);
|
||||
@@ -1198,7 +1223,7 @@ int COsdSetup::showContextChanlistMenu()
|
||||
fontSettingsSubMenu->addItem(GenericMenuSeparatorLine);
|
||||
fontSettingsSubMenu->addItem(new CMenuForwarder(LOCALE_OPTIONS_DEFAULT, true, NULL, this, font_sizes_groups[i].actionkey));
|
||||
|
||||
CMenuForwarder * mf = new CMenuDForwarder(LOCALE_FONTMENU_HEAD, true, NULL, fontSettingsSubMenu, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
|
||||
CMenuForwarder * mf = new CMenuDForwarder(LOCALE_FONTMENU_HEAD, true, NULL, fontSettingsSubMenu, NULL, CRCInput::RC_red);
|
||||
mf->setHint("", LOCALE_MENU_HINT_FONTS);
|
||||
menu_chanlist->addItem(mf);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user