mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 18:01:06 +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
------------------
Commit: 4f2d36fe3e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
This commit is contained in:
vanhofen
2016-12-29 00:59:00 +01:00
parent 465c6ce561 e973c28e0f
commit 65cf83258c
11 changed files with 84 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/components/cc_item_progressbar.h
View File

@@ -161,10 +161,10 @@ class CProgressBar : public CComponentsItem
void setType(pb_type_t type);
//set design (overides g_settings.progressbar_design)
//set design (overides g_settings.theme.progressbar_design)
void setDesign(int &design) { pb_design = &design; }
//set gradient (overides g_settings.progressbar_gradient)
//set gradient (overides g_settings.theme.progressbar_gradient)
void setGradient(int &gradient) { pb_gradient = &gradient; }
};