summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp9
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h20
-rw-r--r--noncore/multimedia/opieplayer2/nullvideo.c0
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp3
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 {