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

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

Browse Source 
Origin commit data
------------------
Commit: 2b7afc5b38
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-21 (Thu, 21 Sep 2017)
This commit is contained in:
vanhofen
2017-09-21 10:33:00 +02:00
parent 8d642a4d57 1176d4169e
commit 0e3522fc52
32 changed files with 376 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/gui/osd_setup.cpp
View File

@@ -1340,7 +1340,7 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar)
}
//channellist
void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist)
void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist, bool hint_paint)
{
CMenuOptionChooser * mc;
@@ -1349,27 +1349,32 @@ void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist)
// channellist additional
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);
if(hint_paint)
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_ADDITIONAL);
menu_chanlist->addItem(mc);
// epg align
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);
if(hint_paint)
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_EPG_ALIGN);
menu_chanlist->addItem(mc);
// extended channel list
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_EXTENDED, &g_settings.theme.progressbar_design_channellist, PROGRESSBAR_COLOR_OPTIONS, PROGRESSBAR_COLOR_OPTION_COUNT, true, this);
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_EXTENDED);
if(hint_paint)
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_EXTENDED);
menu_chanlist->addItem(mc);
// show infobox
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_INFOBOX, &g_settings.channellist_show_infobox, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, channellistNotifier);
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_INFOBOX);
if(hint_paint)
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_INFOBOX);
menu_chanlist->addItem(mc);
// foot
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_FOOT, &g_settings.channellist_foot, CHANNELLIST_FOOT_OPTIONS, CHANNELLIST_FOOT_OPTIONS_COUNT, g_settings.channellist_show_infobox);
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_FOOT);
if(hint_paint)
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_FOOT);
menu_chanlist->addItem(mc);
channellistNotifier->addItem(mc);
@@ -1377,13 +1382,15 @@ void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist)
#if 0
//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);
if(hint_paint)
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO);
menu_chanlist->addItem(mc);
#endif
//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);
if(hint_paint)
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELNUMBER);
menu_chanlist->addItem(mc);
}
@@ -1623,7 +1630,7 @@ int COsdSetup::showContextChanlistMenu(CChannelList *parent_channellist)
menu_chanlist->enableFade(false);
menu_chanlist->setSelected(cselected);
showOsdChanlistSetup(menu_chanlist);
showOsdChanlistSetup(menu_chanlist, false);
menu_chanlist->addItem(new CMenuSeparator(CMenuSeparator::LINE));
CMenuWidget *fontSettingsSubMenu = new CMenuWidget(LOCALE_FONTMENU_HEAD, NEUTRINO_ICON_KEYBINDING);
@@ -1641,7 +1648,7 @@ int COsdSetup::showContextChanlistMenu(CChannelList *parent_channellist)
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);
mf->setHint("", LOCALE_MENU_HINT_FONTS);
// mf->setHint("", LOCALE_MENU_HINT_FONTS);//FIXME menu restoreScreen
menu_chanlist->addItem(mf);
int res = menu_chanlist->exec(NULL, "");
@@ -1754,7 +1761,7 @@ void COsdSetup::paintWindowSize(int w, int h)
{
if (win_demo == NULL) {
win_demo = new CComponentsShapeSquare(0, 0, 0, 0);
win_demo->setFrameThickness(8);
win_demo->setFrameThickness(OFFSET_INNER_MID);
win_demo->disableShadow();
win_demo->setColorBody(COL_BACKGROUND);
win_demo->setColorFrame(COL_RED);