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

16
src/gui/epgview.cpp
View File

@@ -33,7 +33,7 @@
#include <gui/widget/icons.h>
#include <gui/widget/messagebox.h>
#include <gui/widget/mountchooser.h>
#include <gui/widget/progressbar.h>
#include <gui/components/cc_item_progressbar.h>
#include <gui/timerlist.h>
#include <global.h>
@@ -649,8 +649,10 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
if ( epg_done!= -1 )
{
int pbx = sx + 10 + widthl + 10 + ((ox-104-widthr-widthl-10-10-20)>>1);
CProgressBar pb(true, -1, -1, 30, 100, 70, true);
pb.paintProgressBarDefault(pbx, sy+oy-height, 104, height-6, epg_done, 100);
CProgressBar pb(pbx, sy+oy-height, 104, height-6);
pb.setBlink();
pb.setValues(epg_done, 100);
pb.paint(false);
}
GetPrevNextEPGData( epgData.eventID, &epgData.epg_times.startzeit );
@@ -692,9 +694,11 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
if (data == g_InfoViewer->getUpdateTimer()) {
GetEPGData(channel_id, id, &startzeit, false);
if ( epg_done!= -1 ) {
CProgressBar pb(true, -1, -1, 30, 100, 70, true);
int pbx = sx + 10 + widthl + 10 + ((ox-104-widthr-widthl-10-10-20)>>1);
pb.paintProgressBarDefault(pbx, sy+oy-height, 104, height-6, epg_done, 100);
int pbx = sx + 10 + widthl + 10 + ((ox-104-widthr-widthl-10-10-20)>>1);
CProgressBar pb(pbx, sy+oy-height, 104, height-6);
pb.setBlink();
pb.setValues(epg_done, 100);
pb.paint(false);
}
}
if(data == fader.GetTimer()) {