| -rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 47 |
1 files changed, 6 insertions, 41 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index de91a59..e21b0b1 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp @@ -31,12 +31,13 @@ */ #include <qpe/qpeapplication.h> #include <qpe/resource.h> #include <qpe/config.h> +#include <opie/oticker.h> #include <qwidget.h> #include <qpixmap.h> #include <qbutton.h> #include <qpainter.h> #include <qframe.h> @@ -52,52 +53,12 @@ extern MediaPlayerState *mediaPlayerState; extern PlayListWidget *playList; static const int xo = -2; // movable x offset static const int yo = 22; // movable y offset - -Ticker::Ticker( QWidget* parent=0 ) : QFrame( parent ) { - setFrameStyle( WinPanel | Sunken ); - //setText( "No Song" ); -} - -Ticker::~Ticker() { -} - -void Ticker::setText( const QString& text ) { - pos = 0; // reset it everytime the text is changed - scrollText = text; - pixelLen = fontMetrics().width( scrollText ); - killTimers(); - if ( pixelLen > width() ) { - startTimer( 50 ); - } - update(); -} - - -void Ticker::timerEvent( QTimerEvent * ) { - pos = ( pos + 1 > pixelLen ) ? 0 : pos + 1; - scroll( -1, 0, contentsRect() ); - repaint( FALSE ); -} - -void Ticker::drawContents( QPainter *p ) { - for ( int i = 0; i - pos < width() && (i < 1 || pixelLen > width()); i += pixelLen ) { - p->drawText( i - pos, 0, INT_MAX, height(), AlignVCenter, scrollText ); - } - QPixmap pm( width(), height() ); - pm.fill( colorGroup().base() ); - QPainter pmp( &pm ); - for ( int i = 0; i - pos < width() && (i < 1 || pixelLen > width()); i += pixelLen ) { - pmp.drawText( i - pos, 0, INT_MAX, height(), AlignVCenter, scrollText ); - } - p->drawPixmap( 0, 0, pm ); -} - struct MediaButton { bool isToggle, isHeld, isDown; }; //Layout information for the audioButtons (and if it is a toggle button or not) MediaButton audioButtons[] = { @@ -171,13 +132,17 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : buttonPixDown[i] = 0l; } setBackgroundPixmap( *pixBg ); songInfo.setFocusPolicy( QWidget::NoFocus ); - changeTextColor( &songInfo ); +// changeTextColor( &songInfo ); +// songInfo.setBackgroundColor( QColor( 167, 212, 167 )); +// songInfo.setFrameStyle( QFrame::NoFrame); + songInfo.setFrameStyle( QFrame::WinPanel | QFrame::Sunken ); +// songInfo.setForegroundColor(Qt::white); slider.setFixedHeight( 20 ); slider.setMinValue( 0 ); slider.setMaxValue( 1 ); slider.setFocusPolicy( QWidget::NoFocus ); slider.setBackgroundPixmap( *pixBg ); |