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

neutrino: consolidate CScale and CProgressBar code

Browse Source 
Add code for coloured progressbars to CProgressBar class. This
allows to deprecate the CScale code completely (is not used anymore)
and, in a follow-up step, make the progress bar style runtime configurable.

TODO: documentation ;)
 check if all progressbars still behave the same

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@131 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 697e3c6756
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-01-03 (Sun, 03 Jan 2010)

Origin message was:
------------------
neutrino: consolidate CScale and CProgressBar code

Add code for coloured progressbars to CProgressBar class. This
allows to deprecate the CScale code completely (is not used anymore)
and, in a follow-up step, make the progress bar style runtime configurable.

TODO: documentation ;)
   check if all progressbars still behave the same

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@131 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2010-01-03 10:39:40 +00:00
parent 2aef67aa92
commit 80c9969dcd
17 changed files with 325 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/epgview.cpp
View File

@@ -40,6 +40,7 @@
#include <gui/widget/icons.h>
#include <gui/widget/messagebox.h>
#include <gui/widget/mountchooser.h>
#include <gui/widget/progressbar.h>
#include <gui/timerlist.h>
#include <global.h>
@@ -49,13 +50,11 @@
#include <driver/screen_max.h>
#include <gui/filebrowser.h>
#include <gui/customcolor.h>
#include <gui/scale.h>
#include <gui/pictureviewer.h>
extern CPictureViewer * g_PicViewer;
#define PIC_W 52
#define PIC_H 39
static CScale * timescale;
#define ICON_LARGE_WIDTH 26
#define ROUND_RADIUS 9
@@ -120,7 +119,6 @@ CEpgData::CEpgData()
{
bigFonts = false;
frameBuffer = CFrameBuffer::getInstance();
timescale = new CScale(100, 12, 30, 100, 70, true);
}
#define MAX_W 540
@@ -628,8 +626,8 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
if ( epg_done!= -1 )
{
int pbx = sx + 10 + widthl + 10 + ((ox-104-widthr-widthl-10-10-20)>>1);
timescale->reset();
timescale->paint(pbx+2, sy+oy-height+2, epg_done);
CProgressBar pb;
pb.paintProgressBarDefault(pbx, sy+oy-height, 104, height-6, epg_done, 104);
}
GetPrevNextEPGData( epgData.eventID, &epgData.epg_times.startzeit );
@@ -668,9 +666,9 @@ int CEpgData::show(const t_channel_id channel_id, unsigned long long a_id, time_
if (data == g_InfoViewer->lcdUpdateTimer) {
GetEPGData(channel_id, id, &startzeit );
if ( epg_done!= -1 ) {
CProgressBar pb;
int pbx = sx + 10 + widthl + 10 + ((ox-104-widthr-widthl-10-10-20)>>1);
timescale->reset();
timescale->paint(pbx+2, sy+oy-height+2, epg_done);
pb.paintProgressBarDefault(pbx, sy+oy-height, 104, height-6, epg_done, 104);
}
}
CNeutrinoApp::getInstance()->handleMsg(msg, data);