2 files changed, 28 insertions, 11 deletions

diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index b187cb4..44fbe48 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -108,47 +108,58 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
             uchar **dest = imgButtonMask->jumpTable();
             for ( int y = 0; y < imgUp->height(); y++ ) {
                 uchar *line = dest[y];
                 for ( int x = 0; x < imgUp->width(); x++ ) 
                     if ( !qRed( imgMask.pixel( x, y ) ) ) 
                         line[x] = i + 1;
             }
         }
 
     }
 
     for ( int i = 0; i < 11; i++ ) {
         buttonPixUp[i] = NULL;
         buttonPixDown[i] = NULL;
     }
 
-    setBackgroundPixmap( *pixBg );
+ 		QWidget *d = QApplication::desktop();
+ 		int width = d->width();
+ 		int height = d->height();
+
+    if( (width != pixBg->width() ) || (height != pixBg->height() ) ) {
+//				qDebug("<<<<<<<< scale image >>>>>>>>>>>>");
+				QImage img;
+				img = pixBg->convertToImage();
+				pixBg->convertFromImage( img.smoothScale( width, height));
+		}
+    setBackgroundPixmap( *pixBg);
 
     songInfo.setFocusPolicy( QWidget::NoFocus );
     
 //    changeTextColor( &songInfo );
 //    songInfo.setBackgroundColor( QColor( 167, 212, 167 ));
 //    songInfo.setFrameStyle( QFrame::NoFrame);
 //    songInfo.setFrameStyle( QFrame::WinPanel | QFrame::Sunken );
       //NoFrame
 //    songInfo.setForegroundColor(Qt::white);
     
     slider.setFixedHeight( 20 );
     slider.setMinValue( 0 );
     slider.setMaxValue( 1 );
     slider.setFocusPolicy( QWidget::NoFocus );
+
     slider.setBackgroundPixmap( *pixBg );
 
     time.setFocusPolicy( QWidget::NoFocus );
     time.setAlignment( Qt::AlignCenter );
     time.setFrame(FALSE);
     changeTextColor( &time );
 
     resizeEvent( NULL );
 
     connect( &slider,           SIGNAL( sliderPressed() ),      this, SLOT( sliderPressed() ) );
     connect( &slider,           SIGNAL( sliderReleased() ),     this, SLOT( sliderReleased() ) );
 
     connect( mediaPlayerState, SIGNAL( lengthChanged(long) ),  this, SLOT( setLength(long) ) );
     connect( mediaPlayerState, SIGNAL( viewChanged(char) ),    this, SLOT( setView(char) ) );
     connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) );
 //    connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ),  this, SLOT( setPaused(bool) ) );
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index 02c8568..d9a9478 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -84,61 +84,67 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
    QString skinPath;
    skinPath = "opieplayer2/skins/" + skin;
     if(!QDir(QString(getenv("OPIEDIR")) +"/pics/"+skinPath).exists())
       skinPath = "opieplayer2/skins/default";
 
     //   qDebug("skin path " + skinPath);
 
 //     QString skinPath = "opieplayer2/skins/" + skin;
 
    pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
    imgUp = new QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) );
    imgDn = new QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) );
 
    imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 );
    imgButtonMask->fill( 0 );
 
-   for ( int i = 0; i < 7; i++ )
-   {
+   for ( int i = 0; i < 7; i++ ) {
       QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath +
                                   "/skinV_mask_" + skinV_mask_file_names[i] + ".png" );
       //      qDebug("loading "+filename);
       masks[i] = new QBitmap( filename );
 
-      if ( !masks[i]->isNull() )
-      {
+      if ( !masks[i]->isNull() ) {
          QImage imgMask = masks[i]->convertToImage();
          uchar **dest = imgButtonMask->jumpTable();
-         for ( int y = 0; y < imgUp->height(); y++ )
-         {
+         for ( int y = 0; y < imgUp->height(); y++ ) {
             uchar *line = dest[y];
-            for ( int x = 0; x < imgUp->width(); x++ )
-            {
+            for ( int x = 0; x < imgUp->width(); x++ ) {
                if ( !qRed( imgMask.pixel( x, y ) ) )
                   line[x] = i + 1;
             }
          }
       }
    }
    //   qDebug("finished loading first pics");
-   for ( int i = 0; i < 7; i++ )
-   {
+   for ( int i = 0; i < 7; i++ ) {
       buttonPixUp[i] = NULL;
       buttonPixDown[i] = NULL;
    }
 
+
+ 		QWidget *d = QApplication::desktop();
+ 		int width = d->width();
+ 		int height = d->height();
+
+    if( (width != pixBg->width() ) || (height != pixBg->height() ) ) {
+//				qDebug("<<<<<<<< scale image >>>>>>>>>>>>");
+				QImage img;
+				img = pixBg->convertToImage();
+				pixBg->convertFromImage( img.smoothScale( width, height));
+		}
    setBackgroundPixmap( *pixBg );
 
    currentFrame = new QImage( 220 + 2, 160, (QPixmap::defaultDepth() == 16) ? 16 : 32 );
 
    slider = new QSlider( Qt::Horizontal, this );
    slider->setMinValue( 0 );
    slider->setMaxValue( 1 );
    slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) );
    slider->setFocusPolicy( QWidget::NoFocus );
 //    slider->setGeometry( QRect( 7, 250, 220, 20 ) );
 
    connect( slider,         SIGNAL( sliderPressed() ),      this, SLOT( sliderPressed() ) );
    connect( slider,         SIGNAL( sliderReleased() ),     this, SLOT( sliderReleased() ) );
 
    connect( mediaPlayerState, SIGNAL( lengthChanged(long) ),  this, SLOT( setLength(long) ) );
    connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );