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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 17546e7ba1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-10 (Sat, 10 Jun 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-10 11:43:50 +02:00
parent 6755871162 1fc432032a
commit 5a43934c6b
40 changed files with 122 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,9 +39,7 @@
#define GREEN 0x00FF00
#define YELLOW 0xFFFF00
//NI graphic
#include <sstream>
#include <unistd.h>
//NI starbar
#include <gui/pictureviewer.h>
extern CPictureViewer * g_PicViewer;
@@ -86,8 +84,6 @@ CProgressBar::CProgressBar( const int x_pos,
pb_value = 0;
pb_max_value = 0;
graphic_file = "progressbar"; //NI graphic
// init start positions x/y active bar
pb_x = x + fr_thickness;
pb_y = y + fr_thickness;
@@ -480,10 +476,6 @@ void CProgressBar::paintProgress(bool do_save_bg)
paintStarBar();
is_painted = true;
}
else if(*pb_design == PB_GRAPHIC) {
paintGraphic();
is_painted = true;
}
else {
CProgressBarCache *pbc = CProgressBarCache::pbcLookup(pb_height, pb_max_width, pb_active_col, pb_passive_col, *pb_design, pb_invert, *pb_gradient, pb_red, pb_yellow, pb_green);
if (pbc)
@@ -505,31 +497,6 @@ void CProgressBar::paintProgress(bool do_save_bg)
}
}
//NI graphic
void CProgressBar::paintGraphic()
{
std::string pb_active_graphic(frameBuffer->getIconPath(graphic_file));
std::string pb_passive_graphic(frameBuffer->getIconPath(graphic_file + "_passive"));
//printf("**** %04d::%04d: pb_last_width: %d, pb_active_width: %d, pb_max_width %d\n", pb_x, pb_y, pb_last_width, pb_active_width, pb_max_width);
if (pb_last_width == -1 ) {
if (pb_active_width <= pb_max_width && pb_passive_width > 0)
g_PicViewer->DisplayImage(pb_passive_graphic, pb_start_x_passive, pb_y, pb_passive_width, pb_height); // passive bar
}
if (pb_active_width > pb_last_width) {
// we have to paint the passive graphic in all cases to satisfy the CProgresswindow
if (pb_passive_width > 0)
g_PicViewer->DisplayImage(pb_passive_graphic, pb_start_x_passive, pb_y, pb_passive_width, pb_height); // passive bar
if (pb_active_width > 0)
g_PicViewer->DisplayImage(pb_active_graphic, pb_x, pb_y, pb_active_width, pb_height); // active bar
}
else if (pb_active_width <= pb_max_width && pb_passive_width > 0)
g_PicViewer->DisplayImage(pb_passive_graphic, pb_start_x_passive, pb_y, pb_passive_width, pb_height); // passive bar
}
//NI starbar
void CProgressBar::paintStarBar()
{