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 /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/components/cc_detailsline.h
	src/gui/components/cc_item_infobox.h
	src/gui/infoviewer.cpp
	src/gui/upnpbrowser.cpp
	src/gui/widget/keyboard_input.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
This commit is contained in:
vanhofen
2016-10-10 16:45:30 +02:00
parent 4bce5144ba 892603fe68
commit 248b6c8684
88 changed files with 525 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,8 +105,8 @@ class CProgressBar : public CComponentsItem
fb_pixel_t color_frame = 0,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0,
const fb_pixel_t active_col = COL_INFOBAR_PLUS_7,
const fb_pixel_t passive_col = COL_INFOBAR_PLUS_3,
const fb_pixel_t active_col = COL_PROGRESSBAR_ACTIVE_PLUS_0,
const fb_pixel_t passive_col = COL_PROGRESSBAR_PASSIVE_PLUS_0,
const int R = 40,
const int G = 100,
const int Y = 70,