author | llornkcor <llornkcor> | 2002-11-10 19:01:52 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-11-10 19:01:52 (UTC) |
commit | 7c012ee8cd16d8befacc6f6750711443fac0fd5e (patch) (side-by-side diff) | |
tree | daa73f288c2dc74fda7a64822649f8bd81724aee /noncore/multimedia | |
parent | 6078687cb1e389751503ae171ed1bea72846a4de (diff) | |
download | opie-7c012ee8cd16d8befacc6f6750711443fac0fd5e.zip opie-7c012ee8cd16d8befacc6f6750711443fac0fd5e.tar.gz opie-7c012ee8cd16d8befacc6f6750711443fac0fd5e.tar.bz2 |
*** empty log message ***
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 9 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 20 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/nullvideo.c | 0 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 3 |
4 files changed, 9 insertions, 23 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index e21b0b1..6ccf206 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp @@ -147,10 +147,15 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : slider.setFocusPolicy( QWidget::NoFocus ); slider.setBackgroundPixmap( *pixBg ); +// Config cofg("qpe"); +// cofg.setGroup("Appearance"); +// QColor backgroundcolor = QColor( cofg.readEntry( "Background", "#E5E1D5" ) ); + time.setFocusPolicy( QWidget::NoFocus ); time.setAlignment( Qt::AlignCenter ); - time.setFrame(FALSE); - changeTextColor( &time ); + +// time.setFrame(FALSE); +// changeTextColor( &time ); resizeEvent( NULL ); diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index bcd941e..7cb1d79 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h @@ -43,6 +43,7 @@ #include <qframe.h> #include <qlineedit.h> +#include <opie/oticker.h> class QPixmap; @@ -62,23 +63,6 @@ enum AudioButtons { }; }; -class Ticker : public QFrame { - Q_OBJECT - -public: - Ticker( QWidget* parent=0 ); - ~Ticker(); - void setText( const QString& text ) ; - -protected: - void timerEvent( QTimerEvent * ); - void drawContents( QPainter *p ); -private: - QString scrollText; - int pos, pixelLen; -}; - - class AudioWidget : public QWidget { Q_OBJECT public: @@ -138,7 +122,7 @@ private: QPixmap *buttonPixDown[10]; QPixmap *pixmaps[4]; - Ticker songInfo; + OTicker songInfo; QSlider slider; QLineEdit time; int xoff, yoff; diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c index 707efeb..9c285a0 100644 --- a/noncore/multimedia/opieplayer2/nullvideo.c +++ b/noncore/multimedia/opieplayer2/nullvideo.c diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 040ef71..8e88e9b 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp @@ -791,9 +791,6 @@ void PlayListWidget::readm3u( const QString &filename ) { if(s.left(4)=="http") { lnk.setName( s ); //sets file name lnk.setIcon("opieplayer2/musicfile"); -// if(s.right(4) != '.' || s.right(5) != '.') -// lnk.setFile( s+"/"); //if url with no extension -// else lnk.setFile( s ); //sets file name } else { |