mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +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

15
src/system/settings.h
View File

@@ -144,6 +144,14 @@ struct SNeutrinoTheme
unsigned char clock_Digit_green;
unsigned char clock_Digit_blue;
int progressbar_design;
int progressbar_design_channellist;
int progressbar_gradient;
int progressbar_timescale_red;
int progressbar_timescale_green;
int progressbar_timescale_yellow;
int progressbar_timescale_invert;
//NI
unsigned char progressbar_active_red;
unsigned char progressbar_active_green;
@@ -204,12 +212,6 @@ struct SNeutrinoSettings
int infobar_show;
int infobar_show_channellogo;
int infobar_progressbar;
int progressbar_design;
int progressbar_gradient;
int progressbar_timescale_red;
int progressbar_timescale_green;
int progressbar_timescale_yellow;
int progressbar_timescale_invert;
int infobar_casystem_display;
int infobar_casystem_dotmatrix;
int infobar_casystem_frame;
@@ -605,7 +607,6 @@ struct SNeutrinoSettings
int eventlist_epgplus;
int channellist_additional;
int channellist_epgtext_align_right;
int channellist_progressbar_design;
int channellist_foot;
int channellist_new_zap_mode;
int channellist_sort_mode;