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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/themes.cpp
	src/neutrino.cpp
	src/system/settings.h
	version_pseudo.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4f2d36fe3e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-12-29 00:59:00 +01:00
parent 410b62d233 9445cd0324
commit 107026cb75
11 changed files with 84 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/channellist.cpp
View File

@@ -1919,7 +1919,7 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
int prg_offset = 0;
int title_offset = 0;
int rec_mode;
if(g_settings.channellist_progressbar_design != CProgressBar::PB_OFF)
if(g_settings.theme.progressbar_design_channellist != CProgressBar::PB_OFF)
{
prg_offset = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->getRenderWidth("00:00");
title_offset = OFFSET_INNER_SMALL;
@@ -2041,11 +2041,11 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
int pb_height = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->getDigitHeight();
CProgressBar pb(x + OFFSET_INNER_SMALL + numwidth + title_offset, ypos + (fheight-pb_height)/2, pb_space + 2, pb_height, COL_MENUCONTENT_PLUS_0);
pb.setType(CProgressBar::PB_TIMESCALE);
pb.setDesign(g_settings.channellist_progressbar_design);
pb.setDesign(g_settings.theme.progressbar_design_channellist);
pb.setCornerType(0);
pb.setStatusColors(COL_PROGRESSBAR_ACTIVE_PLUS_0, COL_PROGRESSBAR_PASSIVE_PLUS_0); //NI
int pb_frame = 0;
if (g_settings.channellist_progressbar_design == CProgressBar::PB_MONO && !g_settings.progressbar_gradient)
if (g_settings.theme.progressbar_design_channellist == CProgressBar::PB_MONO && !g_settings.theme.progressbar_gradient)
{
// add small frame to mono progressbars w/o gradient for a better visibility
pb_frame = 1;
@@ -2067,7 +2067,7 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
if ((int) ch_desc_len > max_desc_len)
ch_desc_len = max_desc_len;
if(g_settings.channellist_progressbar_design != CProgressBar::PB_OFF) {
if(g_settings.theme.progressbar_design_channellist != CProgressBar::PB_OFF) {
if(displayNext)
{
struct tm *pStartZeit = localtime(&p_event->startTime);
@@ -2102,10 +2102,10 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
}
else
{
if (g_settings.channellist_progressbar_design != CProgressBar::PB_OFF)
if (g_settings.theme.progressbar_design_channellist != CProgressBar::PB_OFF)
{
pb.setValues(0, pb_max);
if (g_settings.progressbar_design == CProgressBar::PB_GRAPHIC) //NI graphic
if (g_settings.theme.progressbar_design == CProgressBar::PB_GRAPHIC) //NI graphic
pb.setGraphic("progressbar_inactive");
pb.paint();
}