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 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fb_generic.cpp
	src/gui/components/cc_frm_header.h
	src/gui/osd_setup.cpp
	src/gui/themes.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 644a634f3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-08 (Tue, 08 Aug 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-08-08 15:54:12 +02:00
parent 2d6ad62b30 c647e359ec
commit aa022d1ee4
21 changed files with 256 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/system/settings.h
View File

@@ -154,6 +154,11 @@ struct SNeutrinoTheme
int progressbar_timescale_yellow;
int progressbar_timescale_invert;
unsigned char shadow_alpha;
unsigned char shadow_red;
unsigned char shadow_green;
unsigned char shadow_blue;
//NI
unsigned char progressbar_active_red;
unsigned char progressbar_active_green;
@@ -1009,6 +1014,8 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
#define DETAILSLINE_WIDTH CFrameBuffer::getInstance()->scale2Res(16)
#define SIDEBAR_WIDTH CFrameBuffer::getInstance()->scale2Res(40)
#define BIGFONT_FACTOR 1.5
struct SglobalInfo