mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-30 00:41:17 +02:00
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 is contained in:
@@ -29,9 +29,9 @@
|
||||
#include <gui/timeosd.h>
|
||||
#include <driver/fontrenderer.h>
|
||||
#include <system/settings.h>
|
||||
#include <gui/scale.h>
|
||||
#include <gui/widget/progressbar.h>
|
||||
|
||||
static CScale * timescale;
|
||||
static CProgressBar *timescale;
|
||||
|
||||
#define TIMEOSD_FONT SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME
|
||||
#define TIMEBARH 38
|
||||
@@ -42,8 +42,8 @@ CTimeOSD::CTimeOSD()
|
||||
visible=false;
|
||||
m_mode=MODE_ASC;
|
||||
GetDimensions();
|
||||
if(!timescale)
|
||||
timescale = new CScale(200, 32, 40, 100, 70, true);
|
||||
if (! timescale)
|
||||
timescale = new CProgressBar(200, 32, PB_COLORED, 40, 100, 70, true);
|
||||
}
|
||||
|
||||
CTimeOSD::~CTimeOSD()
|
||||
@@ -121,7 +121,7 @@ void CTimeOSD::update(time_t time_show)
|
||||
|
||||
void CTimeOSD::updatePos(short runningPercent)
|
||||
{
|
||||
timescale->paint(m_xstart, m_y, runningPercent);
|
||||
timescale->paintProgressBar2(m_xstart, m_y, runningPercent);
|
||||
}
|
||||
|
||||
void CTimeOSD::hide()
|
||||
|
Reference in New Issue
Block a user