mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 01:11:12 +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
This commit is contained in:
Stefan Seyfried
2013-04-06 14:28:16 +02:00
parent 21cb7fc249 8ba673497e
commit 8b689f4b26
42 changed files with 861 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/driver/volume.cpp
View File

@@ -43,7 +43,7 @@
#include <zapit/zapit.h>
#if HAVE_COOL_HARDWARE
#include <gui/widget/progressbar.h>
#include <gui/components/cc_item_progressbar.h>
#endif
#define VOLUME_SCRIPT CONFIGDIR "/volume.sh"
@@ -108,13 +108,15 @@ void CVolume::Init()
digit_w = g_Font[VolumeFont]->getRenderWidth("100");
digit_offset = g_Font[VolumeFont]->getDigitOffset();
digit_h = g_Font[VolumeFont]->getDigitHeight();
progress_h = std::max(icon_h, digit_h) - 2*pB;
progress_h = std::max(icon_h, digit_h);
vbar_w += digit_w;
}
vbar_h = std::max((icon_h * faktor_h) / 10, digit_h+digit_offset);
if (volscale)
delete volscale;
volscale = new CProgressBar(true, progress_w, progress_h, 50, 100, 80, true);
volscale = new CProgressBar(progress_x, progress_y, progress_w, progress_h, colFrame, colBar, colShadow, COL_MENUCONTENT_PLUS_3, COL_MENUCONTENT_PLUS_1, true);
volscale->setInvert();
volscale->setFrameThickness(2);
// mute icon
mute_icon_dx = 0;
@@ -258,8 +260,6 @@ void CVolume::setVolume(const neutrino_msg_t key, const bool bDoPaint, bool nowa
frameBuffer->paintBoxRel(x+ShadowOffset , y+ShadowOffset , (paintDigits) ? vbar_w - vbar_h : vbar_w + 1, vbar_h, colShadow, ROUNDED, (paintDigits) ? CORNER_TOP_LEFT | CORNER_BOTTOM_LEFT : CORNER_ALL);
// volumebar
frameBuffer->paintBoxRel(x , y , (paintDigits) ? vbar_w - vbar_h : vbar_w + 1, vbar_h, colBar, ROUNDED, (paintDigits) ? CORNER_TOP_LEFT | CORNER_BOTTOM_LEFT : CORNER_ALL);
// frame for progress
frameBuffer->paintBoxRel(progress_x-pB, progress_y-pB, progress_w+pB*2, progress_h+pB*2, colFrame);
// volume icon
frameBuffer->paintIcon(NEUTRINO_ICON_VOLUME, icon_x, icon_y, 0, colBar);
@@ -367,8 +367,6 @@ void CVolume::setVolume(const neutrino_msg_t key, const bool bDoPaint, bool nowa
void CVolume::refreshVolumebar(int current_volume)
{
// progressbar
volscale->paintProgressBar2(progress_x, progress_y, current_volume);
if (paintDigits) {
// shadow for erase digits
if (paintShadow)
@@ -380,6 +378,9 @@ void CVolume::refreshVolumebar(int current_volume)
snprintf(buff, 4, "%3d", current_volume);
g_Font[VolumeFont]->RenderString(digit_x, digit_y, digit_w, buff, colContent);
}
// progressbar
volscale->setValues(current_volume, 100);
volscale->paint();
}
bool CVolume::changeNotify(const neutrino_locale_t OptionName, void * data)