mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +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

19
src/gui/scan.cpp
View File

@@ -40,7 +40,7 @@
#include <gui/widget/menue.h>
#include <gui/widget/messagebox.h>
#include <gui/widget/progressbar.h>
#include <gui/components/cc_item_progressbar.h>
#include <system/settings.h>
#include <system/helpers.h>
@@ -72,8 +72,11 @@ CScanTs::CScanTs()
total = done = 0;
freqready = 0;
sigscale = NULL;
snrscale = NULL;
sigscale = new CProgressBar();
sigscale->setBlink();
snrscale = new CProgressBar();
snrscale->setBlink();
}
void CScanTs::prev_next_TP( bool up)
@@ -592,13 +595,14 @@ void CScanTs::showSNR ()
sig = (ssig & 0xFFFF) * 100 / 65535;
posy = y + height - mheight - 5;
if (lastsig != sig) {
//TODO: move sig/snr display into its own class, similar or same code also to find in motorcontrol
if (lastsig != sig) {
lastsig = sig;
posx = x + 20;
sprintf(percent, "%d%%", sig);
sw = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth ("100%");
sigscale->paintProgressBar2(posx - 1, posy+2, sig);
sigscale->setProgress(posx - 1, posy+2, BAR_WIDTH, BAR_HEIGHT, sig, 100);
sigscale->paint();
posx = posx + barwidth + 3;
frameBuffer->paintBoxRel(posx, posy -1, sw, mheight-8, COL_MENUCONTENT_PLUS_0);
@@ -613,7 +617,8 @@ void CScanTs::showSNR ()
posx = x + 20 + barwidth + 3 + 4 * fw + 4 * fw;
sprintf(percent, "%d%%", snr);
sw = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth ("100%");
snrscale->paintProgressBar2(posx - 1, posy+2, snr);
snrscale->setProgress(posx - 1, posy+2, BAR_WIDTH, BAR_HEIGHT, snr, 100);
snrscale->paint();
posx = posx + barwidth + 3;
frameBuffer->paintBoxRel(posx, posy - 1, sw, mheight-8, COL_MENUCONTENT_PLUS_0, 0, true);