mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-08 06:08:29 +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
------------------
Commit: 644a634f3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-08 (Tue, 08 Aug 2017)
This commit is contained in:
vanhofen
2017-08-08 15:54:12 +02:00
parent e21f270c04 22fdfc0484
commit a0f5a94440
21 changed files with 256 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/themes.cpp
View File

@@ -330,6 +330,11 @@ void CThemes::setTheme(CConfigFile &configfile)
configfile.setInt32( "progressbar_timescale_yellow", t.progressbar_timescale_yellow);
configfile.setInt32( "progressbar_timescale_invert", t.progressbar_timescale_invert);
configfile.setInt32( "shadow_alpha", t.shadow_alpha );
configfile.setInt32( "shadow_red", t.shadow_red );
configfile.setInt32( "shadow_green", t.shadow_green );
configfile.setInt32( "shadow_blue", t.shadow_blue );
//NI
configfile.setInt32( "progressbar_active_red", t.progressbar_active_red );
configfile.setInt32( "progressbar_active_green", t.progressbar_active_green );
@@ -437,6 +442,11 @@ void CThemes::getTheme(CConfigFile &configfile)
t.progressbar_timescale_yellow = configfile.getInt32("progressbar_timescale_yellow", 70);
t.progressbar_timescale_invert = configfile.getInt32("progressbar_timescale_invert", 0);
t.shadow_alpha = configfile.getInt32( "shadow_alpha", 0 );
t.shadow_red = configfile.getInt32( "shadow_red", 8 );
t.shadow_green = configfile.getInt32( "shadow_green", 8);
t.shadow_blue = configfile.getInt32( "shadow_blue", 8 );
//NI
t.progressbar_active_red = configfile.getInt32( "progressbar_active_red", 62 );
t.progressbar_active_green = configfile.getInt32( "progressbar_active_green", 62 );