summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-09 15:15:23 (UTC)
committer simon <simon>2002-12-09 15:15:23 (UTC)
commit3f37a852175ace7ee69b626f48eaea19d736b6ed (patch) (side-by-side diff)
tree5b35af63926143660dc634d27b9b230cc13aca7c
parent80902b6ade54252e05cf948040a11b2e975f6759 (diff)
downloadopie-3f37a852175ace7ee69b626f48eaea19d736b6ed.zip
opie-3f37a852175ace7ee69b626f48eaea19d736b6ed.tar.gz
opie-3f37a852175ace7ee69b626f48eaea19d736b6ed.tar.bz2
- pixBg is now backgroundPixmap and shared in the base class
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp12
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h1
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h2
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp14
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h1
5 files changed, 15 insertions, 15 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 5cc2814..553c56b 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -96,5 +96,5 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
QString skinPath = "opieplayer2/skins/" + skin;
- pixBg = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
+ backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) );
imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) );
@@ -124,5 +124,5 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
}
- setBackgroundPixmap( pixBg );
+ setBackgroundPixmap( backgroundPixmap );
songInfo.setFocusPolicy( QWidget::NoFocus );
@@ -137,5 +137,5 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
slider.setMaxValue( 1 );
slider.setFocusPolicy( QWidget::NoFocus );
- slider.setBackgroundPixmap( pixBg );
+ slider.setBackgroundPixmap( backgroundPixmap );
// Config cofg("qpe");
@@ -206,6 +206,6 @@ void AudioWidget::resizeEvent( QResizeEvent * ) {
QPoint p = upperLeftOfButtonMask;
- QPixmap pixUp = combineImageWithBackground( imgUp, pixBg, p );
- QPixmap pixDn = combineImageWithBackground( imgDn, pixBg, p );
+ QPixmap pixUp = combineImageWithBackground( imgUp, backgroundPixmap, p );
+ QPixmap pixDn = combineImageWithBackground( imgDn, backgroundPixmap, p );
for ( uint i = 0; i < buttons.count(); i++ ) {
@@ -405,5 +405,5 @@ void AudioWidget::paintEvent( QPaintEvent * pe ) {
QPainter p( &pix );
p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() );
- p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() );
+ p.drawTiledPixmap( pe->rect(), backgroundPixmap, pe->rect().topLeft() );
for ( unsigned int i = 0; i < buttons.count(); i++ )
paintButton( p, buttons[ i ] );
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 7a775cd..69837cd 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -95,5 +95,4 @@ private:
int skipDirection;
QString skin;
- QPixmap pixBg;
QImage imgUp;
QImage imgDn;
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 163f449..211e56c 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -99,4 +99,6 @@ protected:
QPoint upperLeftOfButtonMask;
+
+ QPixmap backgroundPixmap;
};
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index a483434..a8bf252 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -93,5 +93,5 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
QString skinPath = "opieplayer2/skins/" + skin;
- pixBg = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
+ backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
imgUp = QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) );
imgDn = QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) );
@@ -119,5 +119,5 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
}
- setBackgroundPixmap( pixBg );
+ setBackgroundPixmap( backgroundPixmap );
slider = new QSlider( Qt::Horizontal, this );
@@ -164,5 +164,5 @@ void VideoWidget::resizeEvent( QResizeEvent * ) {
slider->setBackgroundOrigin( QWidget::ParentOrigin );
slider->setFocusPolicy( QWidget::NoFocus );
- slider->setBackgroundPixmap( pixBg );
+ slider->setBackgroundPixmap( backgroundPixmap );
upperLeftOfButtonMask.rx() = 0;// ( imgUp->width() ) / 2;
@@ -173,6 +173,6 @@ void VideoWidget::resizeEvent( QResizeEvent * ) {
QPoint p = upperLeftOfButtonMask;
- QPixmap *pixUp = combineVImageWithBackground( imgUp, pixBg, p );
- QPixmap *pixDn = combineVImageWithBackground( imgDn, pixBg, p );
+ QPixmap *pixUp = combineVImageWithBackground( imgUp, backgroundPixmap, p );
+ QPixmap *pixDn = combineVImageWithBackground( imgDn, backgroundPixmap, p );
for ( int i = 0; i < 7; i++ ) {
@@ -346,5 +346,5 @@ void VideoWidget::makeVisible() {
showNormal();
showMaximized();
- setBackgroundPixmap( pixBg );
+ setBackgroundPixmap( backgroundPixmap );
QWidget *d = QApplication::desktop();
int w = d->width();
@@ -391,5 +391,5 @@ void VideoWidget::paintEvent( QPaintEvent * pe) {
QPainter p( &pix );
p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() );
- p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() );
+ p.drawTiledPixmap( pe->rect(), backgroundPixmap, pe->rect().topLeft() );
for ( unsigned int i = 0; i < buttons.count(); i++ ) {
paintButton( p, buttons[ i ] );
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index a271120..9d5239b 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -98,5 +98,4 @@ protected:
private:
// Ticker songInfo;
- QPixmap pixBg;
QImage imgUp;
QImage imgDn;