mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 01:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

- channellist: allow epgtext alignment

Browse Source 
Conflicts:
	src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2022-05-06 23:41:05 +02:00
committed by Thilo Graf
parent 2cdbdb5ce4
commit 0f3dee2e57
11 changed files with 86 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/osd_setup.cpp
View File

@@ -485,7 +485,7 @@ const CMenuOptionChooser::keyval VOLUMEBAR_DISP_POS_OPTIONS[VOLUMEBAR_DISP_POS_O
#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 },
{ 0, LOCALE_SETTINGS_POS_CENTER },
{ 1, LOCALE_SETTINGS_POS_TOP_LEFT },
{ 2, LOCALE_SETTINGS_POS_TOP_RIGHT },
{ 3, LOCALE_SETTINGS_POS_BOTTOM_LEFT },
@@ -516,11 +516,13 @@ const CMenuOptionChooser::keyval CHANNELLIST_FOOT_OPTIONS[CHANNELLIST_FOOT_OPTIO
{ 2, LOCALE_CHANNELLIST_FOOT_OFF }
};
#define CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS_COUNT 2
const CMenuOptionChooser::keyval CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS[CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS_COUNT]=
#define CHANNELLIST_EPGTEXT_ALIGNMENT_OPTIONS_COUNT 4
const CMenuOptionChooser::keyval CHANNELLIST_EPGTEXT_ALIGNMENT_OPTIONS[CHANNELLIST_EPGTEXT_ALIGNMENT_OPTIONS_COUNT]=
{
{ 0, LOCALE_CHANNELLIST_EPGTEXT_ALIGN_LEFT },
{ 1, LOCALE_CHANNELLIST_EPGTEXT_ALIGN_RIGHT }
{ EPGTEXT_ALIGN_LEFT_MIDDLE, LOCALE_CHANNELLIST_EPGTEXT_ALIGN_LEFT_MIDDLE },
{ EPGTEXT_ALIGN_LEFT_BOTTOM, LOCALE_CHANNELLIST_EPGTEXT_ALIGN_LEFT_BOTTOM },
{ EPGTEXT_ALIGN_RIGHT_MIDDLE, LOCALE_CHANNELLIST_EPGTEXT_ALIGN_RIGHT_MIDDLE },
{ EPGTEXT_ALIGN_RIGHT_BOTTOM, LOCALE_CHANNELLIST_EPGTEXT_ALIGN_RIGHT_BOTTOM }
};
#define OPTIONS_COLORED_EVENTS_OPTION_COUNT 3
@@ -571,10 +573,10 @@ const CMenuOptionChooser::keyval PROGRESSBAR_COLOR_OPTIONS[PROGRESSBAR_COLOR_OPT
#define OPTIONS_CHANNELLOGO_POSITION_COUNT 4
const CMenuOptionChooser::keyval OPTIONS_CHANNELLOGO_POSITION[OPTIONS_CHANNELLOGO_POSITION_COUNT] =
{
{ 0, LOCALE_OPTIONS_OFF }, // off
{ CCHeaderTypes::CC_LOGO_RIGHT, LOCALE_CHANNELLIST_EPGTEXT_ALIGN_RIGHT }, // right
{ CCHeaderTypes::CC_LOGO_LEFT, LOCALE_CHANNELLIST_EPGTEXT_ALIGN_LEFT }, // left
{ CCHeaderTypes::CC_LOGO_CENTER, LOCALE_SETTINGS_POS_DEFAULT_CENTER } // centered
{ 0, LOCALE_OPTIONS_OFF }, // off
{ CCHeaderTypes::CC_LOGO_RIGHT, LOCALE_SETTINGS_POS_RIGHT }, // right
{ CCHeaderTypes::CC_LOGO_LEFT, LOCALE_SETTINGS_POS_LEFT }, // left
{ CCHeaderTypes::CC_LOGO_CENTER, LOCALE_SETTINGS_POS_CENTER } // centered
};
// show osd setup
@@ -1389,7 +1391,7 @@ void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist)
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 = new CMenuOptionChooser(LOCALE_MISCSETTINGS_CHANNELLIST_EPGTEXT_ALIGNMENT, &g_settings.channellist_epgtext_alignment, CHANNELLIST_EPGTEXT_ALIGNMENT_OPTIONS, CHANNELLIST_EPGTEXT_ALIGNMENT_OPTIONS_COUNT, true);
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_EPG_ALIGN);
menu_chanlist->addItem(mc);