- less code duplication. code from resizeEvent is now shared as well as

  the image composing method and the pixmap mask helper

4 files changed, 42 insertions, 41 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index bb686f1..bb07882 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -1,363 +1,354 @@
 /*
                             This file is part of the Opie Project
 
                              Copyright (c)  2002 Max Reiss <harlekin@handhelds.org>
                              Copyright (c)  2002 L. Potter <ljp@llornkcor.com>
                              Copyright (c)  2002 Holger Freyther <zecke@handhelds.org>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #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>
 #include <qlayout.h>
 #include <qdir.h>
 #include <stdlib.h>
 #include <stdio.h>
 
 #include "audiowidget.h"
 #include "mediaplayerstate.h"
 #include "playlistwidget.h"
 
 namespace
 {
 
 const int xo = -2; // movable x offset
 const int yo = 22; // movable y offset
 
 const MediaWidget::SkinButtonInfo skinInfo[] =
 {
     { MediaWidget::Play, "play", MediaWidget::ToggleButton },
     { MediaWidget::Stop, "stop", MediaWidget::NormalButton },
     { MediaWidget::Next, "next", MediaWidget::NormalButton },
     { MediaWidget::Previous, "prev", MediaWidget::NormalButton },
     { MediaWidget::VolumeUp, "up", MediaWidget::NormalButton },
     { MediaWidget::VolumeDown, "down", MediaWidget::NormalButton },
     { MediaWidget::Loop, "loop", MediaWidget::ToggleButton },
     { MediaWidget::PlayList, "playlist", MediaWidget::NormalButton },
     { MediaWidget::Forward, "forward", MediaWidget::NormalButton },
     { MediaWidget::Back, "back", MediaWidget::NormalButton }
 };
 
 const uint buttonCount = sizeof( skinInfo ) / sizeof( skinInfo[ 0 ] );
 
 void changeTextColor( QWidget * w) {
    QPalette p = w->palette();
    p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) );
    p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) );
    w->setPalette( p );
 }
 
 }
 
 AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) :
 
     MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ),  time( this ),
     audioSliderBeingMoved( false )
 {
     setCaption( tr("OpiePlayer") );
 
     loadSkin();
 
     connect( &mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) );
     connect( &mediaPlayerState, SIGNAL( isSeekableToggled( bool ) ), this, SLOT( setSeekable( bool ) ) );
 
     connect( this,  SIGNAL( forwardClicked() ), this, SLOT( skipFor() ) );
     connect( this,  SIGNAL( backClicked() ),  this, SLOT( skipBack() ) );
     connect( this,  SIGNAL( forwardReleased() ), this, SLOT( stopSkip() ) );
     connect( this,  SIGNAL( backReleased() ), this, SLOT( stopSkip() ) );
 
     // Intialise state
     setLength( mediaPlayerState.length() );
     setPosition( mediaPlayerState.position() );
     setLooping( mediaPlayerState.isFullscreen() );
     //    setPaused( mediaPlayerState->paused() );
     setPlaying( mediaPlayerState.isPlaying() );
 }
 
 AudioWidget::~AudioWidget() {
 
 //    mediaPlayerState->setPlaying(false);
 }
 
 namespace {
 
 QPixmap combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) {
     QPixmap pix( img.width(), img.height() );
     QPainter p( &pix );
     p.drawTiledPixmap( pix.rect(), bg, offset );
     p.drawImage( 0, 0, img );
     return pix;
 }
 
 
 QPixmap maskPixToMask( QPixmap pix, QBitmap mask ) {
     QPixmap pixmap( pix );
     pixmap.setMask( mask );
     return pixmap;
 }
 
 };
 
-void AudioWidget::resizeEvent( QResizeEvent * ) {
+void AudioWidget::resizeEvent( QResizeEvent *e ) {
     int h = height();
     int w = width();
 
     songInfo.setGeometry( QRect( 2, 2, w - 4, 20 ) );
     slider.setFixedWidth( w - 110 );
     slider.setGeometry( QRect( 15, h - 22, w - 90, 20 ) );
     slider.setBackgroundOrigin( QWidget::ParentOrigin );
     time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) );
 
     upperLeftOfButtonMask.rx() = ( w - buttonUpImage.width() ) / 2;
     upperLeftOfButtonMask.ry() = (( h - buttonUpImage.height() ) / 2) - 10;
-    QPoint p = upperLeftOfButtonMask;
 
-    QPixmap pixUp = combineImageWithBackground( buttonUpImage, backgroundPixmap, p );
-    QPixmap pixDn = combineImageWithBackground( buttonDownImage, backgroundPixmap, p );
-
-    for ( uint i = 0; i < buttons.size(); i++ ) {
-        if ( !buttons[i].mask.isNull() ) {
-            buttons[i].pixUp = maskPixToMask( pixUp, buttons[i].mask );
-            buttons[i].pixDown = maskPixToMask( pixDn, buttons[i].mask );
-        }
-    }
+    MediaWidget::resizeEvent( e );
 }
 
 void AudioWidget::sliderPressed() {
     audioSliderBeingMoved = TRUE;
 }
 
 
 void AudioWidget::sliderReleased() {
     audioSliderBeingMoved = FALSE;
     if ( slider.width() == 0 )
   return;
     long val = long((double)slider.value() * mediaPlayerState.length() / slider.width());
     mediaPlayerState.setPosition( val );
 }
 
 void AudioWidget::setPosition( long i ) {
     //    qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i);
     updateSlider( i, mediaPlayerState.length() );
 }
 
 
 void AudioWidget::setLength( long max ) {
     updateSlider( mediaPlayerState.position(), max );
 }
 
 
 void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) {
     if ( mediaType == MediaPlayerState::Audio ) {
         // startTimer( 150 );
         showMaximized();
         return;
     }
 
     killTimers();
     hide();
 }
 
 void AudioWidget::loadSkin()
 {
     loadDefaultSkin( skinInfo, buttonCount );
 
     setBackgroundPixmap( backgroundPixmap );
 
     songInfo.setFocusPolicy( QWidget::NoFocus );
 //    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( backgroundPixmap );
 
 //     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 );
 
     resizeEvent( 0 );
 }
 
 void AudioWidget::setSeekable( bool isSeekable ) {
 
     if ( !isSeekable ) {
         qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>");
         if( !slider.isHidden()) {
             slider.hide();
         }
         disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
         disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
         disconnect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
         disconnect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
     } else {
         // this stops the slider from being moved, thus
         // does not stop stream when it reaches the end
         slider.show();
         qDebug( " CONNECT SET POSTION " );
         connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
         connect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
         connect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
         connect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
     }
 }
 
 
 static QString timeAsString( long length ) {
     int minutes = length / 60;
     int seconds = length % 60;
     return QString("%1:%2%3").arg( minutes ).arg( seconds / 10 ).arg( seconds % 10 );
 }
 
 void AudioWidget::updateSlider( long i, long max ) {
 
     time.setText( timeAsString( i ) + " / " + timeAsString( max ) );
 //    qDebug( timeAsString( i ) + " / " + timeAsString( max ) ) ;
 
     if ( max == 0 ) {
         return;
     }
     // Will flicker too much if we don't do this
     // Scale to something reasonable
     int width = slider.width();
     int val = int((double)i * width / max);
     if ( !audioSliderBeingMoved ) {
         if ( slider.value() != val ) {
             slider.setValue( val );
         }
 
         if ( slider.maxValue() != width ) {
             slider.setMaxValue( width );
         }
     }
 }
 
 void AudioWidget::skipFor() {
     skipDirection = +1;
     startTimer( 50 );
     mediaPlayerState.setPosition( mediaPlayerState.position() + 2 );
 }
 
 void AudioWidget::skipBack() {
     skipDirection = -1;
     startTimer( 50 );
     mediaPlayerState.setPosition( mediaPlayerState.position() - 2 );
 }
 
 
 
 void AudioWidget::stopSkip() {
     killTimers();
 }
 
 
 void AudioWidget::timerEvent( QTimerEvent * ) {
     if ( skipDirection == +1 ) {
         mediaPlayerState.setPosition( mediaPlayerState.position() + 2 );
     }  else if ( skipDirection == -1 ) {
         mediaPlayerState.setPosition( mediaPlayerState.position() - 2 );
     }
 }
 
 void AudioWidget::keyReleaseEvent( QKeyEvent *e) {
     switch ( e->key() ) {
         ////////////////////////////// Zaurus keys
       case Key_Home:
           break;
       case Key_F9: //activity
            hide();
            //           qDebug("Audio F9");
            e->accept();
           break;
       case Key_F10: //contacts
           break;
       case Key_F11: //menu
               mediaPlayerState.toggleBlank();
               e->accept();
           break;
       case Key_F12: //home
           break;
       case Key_F13: //mail
              mediaPlayerState.toggleBlank();
              e->accept();
           break;
       case Key_Space: {
           e->accept();
           mediaPlayerState.togglePaused();
       }
           break;
       case Key_Down:
           //              toggleButton(6);
           emit lessClicked();
           emit lessReleased();
           //          toggleButton(6);
           e->accept();
           break;
       case Key_Up:
           //             toggleButton(5);
            emit moreClicked();
            emit moreReleased();
            //             toggleButton(5);
            e->accept();
            break;
       case Key_Right:
           //            toggleButton(3);
           mediaPlayerState.setNext();
           //            toggleButton(3);
            e->accept();
           break;
       case Key_Left:
           //            toggleButton(4);
           mediaPlayerState.setPrev();
           //            toggleButton(4);
           e->accept();
           break;
       case Key_Escape: {
       }
           break;
 
     };
 }
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index ab23aa8..ab2ec50 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -1,234 +1,267 @@
 /*
    Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
              (C) 2002 Max Reiss <harlekin@handhelds.org>
              (C) 2002 L. Potter <ljp@llornkcor.com>
              (C) 2002 Holger Freyther <zecke@handhelds.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 
 
 #include "mediawidget.h"
 #include "playlistwidget.h"
 #include "skin.h"
 
 MediaWidget::MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name )
     : QWidget( parent, name ), mediaPlayerState( _mediaPlayerState ), playList( _playList )
 {
     connect( &mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ),
              this, SLOT( setDisplayType( MediaPlayerState::DisplayType ) ) );
     connect( &mediaPlayerState, SIGNAL( lengthChanged( long ) ),
              this, SLOT( setLength( long ) ) );
     connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ),
              this, SLOT( setPlaying( bool ) ) );
 }
 
 MediaWidget::~MediaWidget()
 {
 }
 
 void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount,
                                 const Skin &skin )
 {
     buttonMask = skin.buttonMask( skinInfo, buttonCount );
 
     buttons.clear();
     buttons.reserve( buttonCount );
 
     for ( uint i = 0; i < buttonCount; ++i ) {
         Button button = setupButton( skinInfo[ i ], skin );
         buttons.push_back( button );
     }
 }
 
 MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo, const Skin &skin )
 {
     Button button;
     button.command = buttonInfo.command;
     button.type = buttonInfo.type;
     button.mask = skin.buttonMaskImage( buttonInfo.fileName );
 
     return button;
 }
 
 void MediaWidget::loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix )
 {
     Skin skin( fileNameInfix );
     loadSkin( skinInfo, buttonCount, skin );
 }
 
 void MediaWidget::loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const Skin &skin )
 {
     backgroundPixmap = skin.backgroundImage();
     buttonUpImage = skin.buttonUpImage();
     buttonDownImage = skin.buttonDownImage();
 
     setupButtons( skinInfo, buttonCount, skin );
 }
 
 void MediaWidget::closeEvent( QCloseEvent * )
 {
     mediaPlayerState.setList();
 }
 
 void MediaWidget::paintEvent( QPaintEvent *pe )
 {
     QPainter p( this );
 
     if ( mediaPlayerState.isFullscreen() ) {
         // Clear the background
         p.setBrush( QBrush( Qt::black ) );
         return;
     } 
 
     if ( !pe->erased() ) {
         // Combine with background and double buffer
         QPixmap pix( pe->rect().size() );
         QPainter p( &pix );
         p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() );
         p.drawTiledPixmap( pe->rect(), backgroundPixmap, pe->rect().topLeft() );
         paintAllButtons( p );
         QPainter p2( this );
         p2.drawPixmap( pe->rect().topLeft(), pix );
     } else {
         QPainter p( this );
         paintAllButtons( p );
     }
 }
 
+void MediaWidget::resizeEvent( QResizeEvent *e )
+{
+    QPixmap pixUp = combineImageWithBackground( buttonUpImage, backgroundPixmap, upperLeftOfButtonMask );
+    QPixmap pixDn = combineImageWithBackground( buttonDownImage, backgroundPixmap, upperLeftOfButtonMask );
+
+    for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) {
+        Button &button = *it;
+
+        if ( button.mask.isNull() )
+            continue;
+        button.pixUp = addMaskToPixmap( pixUp, button.mask );
+        button.pixDown = addMaskToPixmap( pixDn, button.mask );
+    }
+
+    QWidget::resizeEvent( e );
+}
+
 MediaWidget::Button *MediaWidget::buttonAt( const QPoint &position )
 {
     if ( position.x() <= 0 || position.y() <= 0 ||
          position.x() >= buttonMask.width() ||
          position.y() >= buttonMask.height() )
         return 0;
 
     int pixelIdx = buttonMask.pixelIndex( position.x(), position.y() );
     for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it )
         if ( it->command + 1 == pixelIdx )
             return &( *it );
 
     return 0;
 }
 
 void MediaWidget::mousePressEvent( QMouseEvent *event )
 {
     Button *button = buttonAt( event->pos() - upperLeftOfButtonMask );
 
     if ( !button ) {
         QWidget::mousePressEvent( event );
         return;
     }
 
     switch ( button->command ) {
         case VolumeUp:   emit moreClicked(); return;
         case VolumeDown: emit lessClicked(); return;
         case Back:       emit backClicked(); return;
         case Forward:    emit forwardClicked(); return;
         default: break;
     }
 }
 
 void MediaWidget::mouseReleaseEvent( QMouseEvent *event )
 {
     Button *button = buttonAt( event->pos() - upperLeftOfButtonMask );
 
     if ( !button ) {
         QWidget::mouseReleaseEvent( event );
         return;
     }
 
     if ( button->type == ToggleButton )
         toggleButton( *button );
 
     handleCommand( button->command, button->isDown );
 }
 
 void MediaWidget::makeVisible()
 {
 }
 
 void MediaWidget::handleCommand( Command command, bool buttonDown )
 {
     switch ( command ) {
         case Play:       mediaPlayerState.togglePaused(); return;
         case Stop:       mediaPlayerState.setPlaying(FALSE); return;
         case Next:       if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return;
         case Previous:   if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return;
         case Loop:       mediaPlayerState.setLooping( buttonDown ); return;
         case VolumeUp:   emit moreReleased(); return;
         case VolumeDown: emit lessReleased(); return;
         case PlayList:   mediaPlayerState.setList();  return;
         case Forward:    emit forwardReleased(); return;
         case Back:       emit backReleased(); return;
         case FullScreen: mediaPlayerState.setFullscreen( true ); makeVisible(); return;
         default: assert( false );
     }
 }
 
 bool MediaWidget::isOverButton( const QPoint &position, int buttonId ) const
 {
     return ( position.x() > 0 && position.y() > 0 && 
              position.x() < buttonMask.width() && 
              position.y() < buttonMask.height() && 
              buttonMask.pixelIndex( position.x(), position.y() ) == buttonId + 1 );
 }
 
 void MediaWidget::paintAllButtons( QPainter &p )
 {
     for ( ButtonVector::const_iterator it = buttons.begin();
           it != buttons.end(); ++it )
         paintButton( p, *it );
 }
 
 void MediaWidget::paintButton( const Button &button )
 {
     QPainter p( this );
     paintButton( p, button );
 }
 
 void MediaWidget::paintButton( QPainter &p, const Button &button )
 {
     if ( button.isDown )
         p.drawPixmap( upperLeftOfButtonMask, button.pixDown );
     else
         p.drawPixmap( upperLeftOfButtonMask, button.pixUp );
 }
 
 void MediaWidget::setToggleButton( Command command, bool down )
 {
     for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it )
         if ( it->command == command ) {
             setToggleButton( *it, down );
             return;
         }
 }
 
 void MediaWidget::setToggleButton( Button &button, bool down )
 {
     if ( down != button.isDown )
         toggleButton( button );
 }
 
 void MediaWidget::toggleButton( Button &button )
 {
     button.isDown = !button.isDown;
 
     paintButton( button );
 }
 
+QPixmap MediaWidget::combineImageWithBackground( const QImage &image, const QPixmap &background, const QPoint &offset )
+{
+    QPixmap pix( image.size() );
+    QPainter p( &pix );
+    p.drawTiledPixmap( pix.rect(), background, offset );
+    p.drawImage( 0, 0, image );
+    return pix;
+}
+
+QPixmap MediaWidget::addMaskToPixmap( const QPixmap &pix, const QBitmap &mask )
+{
+    QPixmap result( pix );
+    result.setMask( mask );
+    return result;
+}
+
 /* vim: et sw=4 ts=4
  */
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 9f13677..4599637 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -1,150 +1,155 @@
 /*
    Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
              (C) 2002 Max Reiss <harlekin@handhelds.org>
              (C) 2002 L. Potter <ljp@llornkcor.com>
              (C) 2002 Holger Freyther <zecke@handhelds.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 
 #ifndef MEDIAWIDGET_H
 #define MEDIAWIDGET_H
 
 #include <qwidget.h>
 #include <qmap.h>
 
 #include "mediaplayerstate.h"
 #include "playlistwidget.h"
 
 #include <vector>
 #include <memory>
 
 namespace
 {
     struct simpleAndStupidAllocator
     {
         static void *allocate( size_t amount )
         { return ::operator new( amount ); }
         static void deallocate( void *p, size_t )
         { ::operator delete( p ); }
     };
 }
 
 class Skin;
 
 class MediaWidget : public QWidget
 {
     Q_OBJECT
 public:
     enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back, FullScreen, Undefined };
     enum ButtonType { NormalButton, ToggleButton };
 
     struct Button
     {
         Button() : command( Undefined ), type( NormalButton ), isDown( false ) {}
 
         Command command;
 
         ButtonType type; // this should be part of the bitfield but gcc2 is too buggy to support this :-(
         bool isDown : 1;
 
         QBitmap mask;
         QPixmap pixUp;
         QPixmap pixDown;
     };
 #if defined( _CC_GNU_ )
     // use that allocator to avoid the default allocator that on gcc2 requires libstdc++ because
     // in the BAD_ALLOC macro it uses std::cerr and friends :-(
     typedef std::vector<Button, std::__allocator<Button, simpleAndStupidAllocator> > ButtonVector;
 #else
     typedef std::vector<Button> ButtonVector;
 #endif
 
     struct SkinButtonInfo
     {
         Command command;
         const char *fileName;
         ButtonType type;
     };
 
     MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 );
     virtual ~MediaWidget();
 
 public slots:
     virtual void setDisplayType( MediaPlayerState::DisplayType displayType ) = 0;
     virtual void setLength( long length ) = 0;
     virtual void setPlaying( bool playing ) = 0;
 
     virtual void loadSkin() = 0;
 
 signals:
     void moreReleased();
     void lessReleased();
     void forwardReleased();
     void backReleased();
     void forwardClicked();
     void backClicked();
     void moreClicked();
     void lessClicked();
 
 protected:
     void setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount,
                        const Skin &skin );
     Button setupButton( const SkinButtonInfo &buttonInfo, const Skin &skin );
 
     void loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix = QString::null );
     void loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const Skin &skin );
 
     virtual void closeEvent( QCloseEvent * );
 
     virtual void paintEvent( QPaintEvent *pe );
 
+    virtual void resizeEvent( QResizeEvent *e );
+
     Button *buttonAt( const QPoint &position );
 
     virtual void mousePressEvent( QMouseEvent *event );
     virtual void mouseReleaseEvent( QMouseEvent *event );
 
     virtual void makeVisible();
 
     void handleCommand( Command command, bool buttonDown );
 
     bool isOverButton( const QPoint &position, int buttonId ) const;
 
     void paintAllButtons( QPainter &p );
     void paintButton( const Button &button );
     void paintButton( QPainter &p, const Button &button );
 
     void setToggleButton( Button &button, bool down );
     void setToggleButton( Command command, bool down );
     void toggleButton( Button &button );
 
     MediaPlayerState &mediaPlayerState;
     PlayListWidget &playList;
 
     ButtonVector buttons;
 
     QImage buttonMask;
 
     QPoint upperLeftOfButtonMask;
 
     QPixmap backgroundPixmap;
     QImage buttonUpImage;
     QImage buttonDownImage;
+
+    static QPixmap combineImageWithBackground( const QImage &background, const QPixmap &pixmap, const QPoint &offset );
+    static QPixmap addMaskToPixmap( const QPixmap &pix, const QBitmap &mask );
 };
 
 #endif // MEDIAWIDGET_H
 /* vim: et sw=4 ts=4
  */
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index bc47717..a8ff540 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -1,339 +1,311 @@
 /*
                             This file is part of the Opie Project
 
                              Copyright (c)  2002 Max Reiss <harlekin@handhelds.org>
                              Copyright (c)  2002 L. Potter <ljp@llornkcor.com>
                              Copyright (c)  2002 Holger Freyther <zecke@handhelds.org>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 
 #include <qwidget.h>
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qslider.h>
 #include <qdrawutil.h>
 #include "videowidget.h"
 #include "mediaplayerstate.h"
 #include "playlistwidget.h"
 
 
 #ifdef Q_WS_QWS
 # define USE_DIRECT_PAINTER
 # include <qdirectpainter_qws.h>
 # include <qgfxraster_qws.h>
 #endif
 
 
 namespace
 {
 
 const int xo = 2; // movable x offset
 const int yo = 0; // movable y offset
 
 const MediaWidget::SkinButtonInfo skinInfo[] =
 {
     { MediaWidget::Play, "play", MediaWidget::ToggleButton },
     { MediaWidget::Stop, "stop", MediaWidget::NormalButton },
     { MediaWidget::Next, "fwd", MediaWidget::NormalButton },
     { MediaWidget::Previous, "back", MediaWidget::NormalButton },
     { MediaWidget::VolumeUp, "up", MediaWidget::NormalButton },
     { MediaWidget::VolumeDown, "down", MediaWidget::NormalButton },
     { MediaWidget::FullScreen, "full", MediaWidget::ToggleButton }
 };
 
 const uint buttonCount = sizeof( skinInfo ) / sizeof( skinInfo[ 0 ] );
 
 }
 
 VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) 
     : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ), videoSliderBeingMoved( false )
 {
     setCaption( tr("OpiePlayer - Video") );
 
     videoFrame = new XineVideoWidget ( this, "Video frame" );
 
     connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & )));
     connect ( videoFrame,  SIGNAL( clicked () ),  this,  SLOT ( backToNormal() ) );
 
     slider = 0;
 
     loadSkin();
 
     setLength( mediaPlayerState.length() );
     setPosition( mediaPlayerState.position() );
     setFullscreen( mediaPlayerState.isFullscreen() );
     setPlaying( mediaPlayerState.isPlaying() );
 }
 
 
 VideoWidget::~VideoWidget() 
 {
 }
 
-QPixmap *combineVImageWithBackground( QImage img, QPixmap bg, QPoint offset ) {
-    QPixmap pix( img.width(), img.height() );
-    QPainter p( &pix );
-    p.drawTiledPixmap( pix.rect(), bg, offset );
-    p.drawImage( 0, 0, img );
-    return new QPixmap( pix );
-}
-
-QPixmap maskVPixToMask( QPixmap pix, QBitmap mask ) {
-    QPixmap pixmap( pix );
-    pixmap.setMask( mask );
-    return pixmap;
-}
-
-void VideoWidget::resizeEvent( QResizeEvent * ) {
+void VideoWidget::resizeEvent( QResizeEvent *e ) {
     int h = height();
     int w = width();
     //int Vh = 160;
     //int Vw = 220;
 
     slider->setFixedWidth( w - 20 );
     slider->setGeometry( QRect( 15, h - 22, w - 90, 20 ) );
     slider->setBackgroundOrigin( QWidget::ParentOrigin );
     slider->setFocusPolicy( QWidget::NoFocus );
     slider->setBackgroundPixmap( backgroundPixmap );
 
     upperLeftOfButtonMask.rx() = 0;// ( imgUp->width() ) / 2;
     if(w>h)
         upperLeftOfButtonMask.ry() = 0;
     else
         upperLeftOfButtonMask.ry() = 185;//(( Vh  - imgUp->height() ) / 2) - 10;
-    QPoint p = upperLeftOfButtonMask;
-
-    QPixmap *pixUp = combineVImageWithBackground( buttonUpImage, backgroundPixmap, p );
-    QPixmap *pixDn = combineVImageWithBackground( buttonDownImage, backgroundPixmap, p );
-
-    for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) {
-        Button &button = *it;
-
-        if ( !button.mask.isNull() ) {
-            button.pixUp = maskVPixToMask( *pixUp, button.mask );
-            button.pixDown = maskVPixToMask( *pixDn, button.mask );
-        }
-    }
 
-    delete pixUp;
-    delete pixDn;
+    MediaWidget::resizeEvent( e );
 }
 
 void VideoWidget::sliderPressed() {
     videoSliderBeingMoved = TRUE;
 }
 
 void VideoWidget::sliderReleased() {
     videoSliderBeingMoved = FALSE;
     if ( slider->width() == 0 ) {
         return;
     }
     long val = long((double)slider->value() * mediaPlayerState.length() / slider->width());
     mediaPlayerState.setPosition( val );
 }
 
 void VideoWidget::setPosition( long i ) {
     updateSlider( i, mediaPlayerState.length() );
 }
 
 
 void VideoWidget::setLength( long max ) {
     updateSlider( mediaPlayerState.position(), max );
 }
 
 void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType )
 {
     if ( displayType == MediaPlayerState::Video ) {
         makeVisible();
         return;
     }
 
     // Effectively blank the view next time we show it so it looks nicer
     scaledWidth = 0;
     scaledHeight = 0;
     hide();
 }
 
 void VideoWidget::loadSkin()
 {
     loadDefaultSkin( skinInfo, buttonCount, "V" );
 
     setBackgroundPixmap( backgroundPixmap );
 
     delete slider;
     slider = new QSlider( Qt::Horizontal, this );
     slider->setMinValue( 0 );
     slider->setMaxValue( 1 );
     slider->setBackgroundPixmap( backgroundPixmap );
     //slider->setFocusPolicy( QWidget::NoFocus );
 
     resizeEvent( 0 );
 }
 
 void VideoWidget::updateSlider( long i, long max ) {
     // Will flicker too much if we don't do this
     if ( max == 0 ) {
         return;
     }
     int width = slider->width();
     int val = int((double)i * width / max);
     if ( !mediaPlayerState.isFullscreen() && !videoSliderBeingMoved ) {
         if ( slider->value() != val ) {
             slider->setValue( val );
         }
         if ( slider->maxValue() != width ) {
             slider->setMaxValue( width );
         }
     }
 }
 
 void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
     if ( mediaPlayerState.isFullscreen() ) {
         mediaPlayerState.setFullscreen( FALSE );
         makeVisible();
     }
     MediaWidget::mouseReleaseEvent( event );
 }
 
 void VideoWidget::backToNormal() {
      mediaPlayerState.setFullscreen( FALSE );
      makeVisible();
 }
 
 void VideoWidget::makeVisible() {
     if ( mediaPlayerState.isFullscreen() ) {
         setBackgroundMode( QWidget::NoBackground );
         showFullScreen();
         resize( qApp->desktop()->size() );
         videoFrame-> setGeometry ( 0, 0, width ( ), height ( ));
 
         slider->hide();
         disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
         disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
         disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
         disconnect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
 
     } else {
         showNormal();
         showMaximized();
         setBackgroundPixmap( backgroundPixmap );
         QWidget *d = QApplication::desktop();
         int w = d->width();
         int h = d->height();
 
         if(w>h) {
             int newW=(w/2)-(246/2); //this will only work with 320x240
             videoFrame->setGeometry( QRect( newW, 4, 240, 170  ) );
         } else {
             videoFrame->setGeometry( QRect( 0, 30, 240, 170  ) );
         }
 
         if ( !mediaPlayerState.isSeekable()  ) {
             if( !slider->isHidden()) {
                 slider->hide();
             }
             disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
             disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
             disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
             disconnect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
         } else {
             slider->show();
             connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
             connect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
             connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
             connect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
         }
     }
 }
 
 void VideoWidget::keyReleaseEvent( QKeyEvent *e) {
     switch ( e->key() ) {
 ////////////////////////////// Zaurus keys
       case Key_Home:
           break;
       case Key_F9: //activity
           break;
       case Key_F10: //contacts
 //           hide();
           break;
       case Key_F11: //menu
           break;
       case Key_F12: //home
           break;
       case Key_F13: //mail
           break;
       case Key_Space: {
           if(mediaPlayerState.isPlaying()) {
               mediaPlayerState.setPlaying(FALSE);
           } else {
               mediaPlayerState.setPlaying(TRUE);
           }
       }
           break;
       case Key_Down:
 //            toggleButton(6);
             emit lessClicked();
             emit lessReleased();
 //            toggleButton(6);
           break;
       case Key_Up:
 //             toggleButton(5);
              emit moreClicked();
              emit moreReleased();
 //             toggleButton(5);
            break;
       case Key_Right:
           mediaPlayerState.setNext();
           break;
       case Key_Left:
           mediaPlayerState.setPrev();
           break;
       case Key_Escape:
           break;
 
     };
 }
 
 XineVideoWidget* VideoWidget::vidWidget() {
     return videoFrame;
 }
 
 
 void VideoWidget::setFullscreen ( bool b ) {
     setToggleButton( FullScreen, b );
 }
 
 
 void VideoWidget::setPlaying( bool b) {
     setToggleButton( Play, b );
 }