mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'check/pu-cc' into master

Browse Source 
...needs some build- and logical fixing...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b689f4b26
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-04-06 14:28:16 +02:00
parent 5bba845cac 1589230f2e
commit ab5760e4de
42 changed files with 861 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gui/infoviewer_bb.cpp
View File

@@ -646,17 +646,22 @@ void* CInfoViewerBB::hddperThread(void *arg)
}
void CInfoViewerBB::showBarSys(int percent)
{
if (is_visible)
sysscale->paintProgressBar(bbIconMinX, BBarY + InfoHeightY_Info / 2 - 2 - 6, hddwidth, 6, percent, 100);
{
if (is_visible){
sysscale->setDimensionsAll(bbIconMinX, BBarY + InfoHeightY_Info / 2 - 2 - 6, hddwidth, 6);
sysscale->setValues(percent, 100);
sysscale->paint();
}
}
void CInfoViewerBB::showBarHdd(int percent)
{
if (is_visible) {
if (percent >= 0)
hddscale->paintProgressBar(bbIconMinX, BBarY + InfoHeightY_Info / 2 + 2 + 0, hddwidth, 6, percent, 100);
else {
if (percent >= 0){
hddscale->setDimensionsAll(bbIconMinX, BBarY + InfoHeightY_Info / 2 + 2 + 0, hddwidth, 6);
hddscale->setValues(percent, 100);
hddscale->paint();
}else {
frameBuffer->paintBoxRel(bbIconMinX, BBarY + InfoHeightY_Info / 2 + 2 + 0, hddwidth, 6, COL_INFOBAR_BUTTONS_BACKGROUND);
hddscale->reset();
}
@@ -815,12 +820,17 @@ void CInfoViewerBB::paintCA_bar(int left, int right)
void CInfoViewerBB::changePB()
{
hddwidth = frameBuffer->getScreenWidth(true) * ((g_settings.screen_preset == 1) ? 10 : 8) / 128; /* 80(CRT)/100(LCD) pix if screen is 1280 wide */
if (hddscale != NULL)
if (hddscale)
delete hddscale;
hddscale = new CProgressBar(true, hddwidth, 6, 50, 100, 75, true);
if (sysscale != NULL)
hddscale = new CProgressBar();
hddscale->setBlink();
hddscale->setInvert();
if (sysscale)
delete sysscale;
sysscale = new CProgressBar(true, hddwidth, 6, 50, 100, 75, true);
sysscale = new CProgressBar();
sysscale->setBlink();
sysscale->setInvert();
}
void CInfoViewerBB::reset_allScala()