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

8
src/gui/components/cc_item_progressbar.cpp
View File

@@ -78,8 +78,8 @@ CProgressBar::CProgressBar( const int x_pos,
pb_active_col = active_col;
pb_passive_col = passive_col;
pb_design = &g_settings.progressbar_design;
pb_gradient = &g_settings.progressbar_gradient;
pb_design = &g_settings.theme.progressbar_design;
pb_gradient = &g_settings.theme.progressbar_gradient;
pb_type = PB_REDLEFT;
pb_last_width = -1;
@@ -448,7 +448,7 @@ void CProgressBar::paintProgress(bool do_save_bg)
return;
}
if (pb_type == PB_TIMESCALE)
setRgb(g_settings.progressbar_timescale_red, g_settings.progressbar_timescale_green, g_settings.progressbar_timescale_yellow);
setRgb(g_settings.theme.progressbar_timescale_red, g_settings.theme.progressbar_timescale_green, g_settings.theme.progressbar_timescale_yellow);
if (!pb_red && !pb_yellow && !pb_green)
pb_green = 1;
@@ -470,7 +470,7 @@ void CProgressBar::paintProgress(bool do_save_bg)
paintInit(do_save_bg);
//progress
bool pb_invert = (pb_type == PB_REDRIGHT) || ((pb_type == PB_TIMESCALE) && g_settings.progressbar_timescale_invert);
bool pb_invert = (pb_type == PB_REDRIGHT) || ((pb_type == PB_TIMESCALE) && g_settings.theme.progressbar_timescale_invert);
if (cc_allow_paint){
if (!is_painted || (pb_active_width != pb_last_width)) {

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; }
};