mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 02:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'check/pu-cc' into master

Browse Source 
Conflicts:
	src/gui/osd_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 61bf95f552
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-13 (Sat, 13 Apr 2013)
This commit is contained in:
Stefan Seyfried
2013-04-13 17:17:30 +02:00
parent e3308033b1 7dfb8931d7
commit 51bbad3ab1
15 changed files with 123 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,7 +111,7 @@ class CProgressBar : public CComponentsItem
CProgressBar();
CProgressBar( const int x_pos, const int y_pos,
const int w = -1, const int h = -1,
fb_pixel_t color_frame = 0, fb_pixel_t color_body = COL_INFOBAR_PLUS_3, fb_pixel_t color_shadow = COL_INFOBAR_PLUS_7,
fb_pixel_t color_frame = 0, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0,
const fb_pixel_t active_col = COL_INFOBAR_PLUS_7, const fb_pixel_t passive_col = COL_INFOBAR_PLUS_3,
const bool blinkenlights = false,
const int r = 40, const int g = 100, const int b =70,