- yay, mouseMoveEvent is no more duplicated code :)

6 files changed, 50 insertions, 91 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 37c565b..dda039c 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -288,141 +288,96 @@ 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::mouseMoveEvent( QMouseEvent *event ) {
-    for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) {
-        Button &button = *it;
-        Command command = button.command;
-
-        if ( event->state() == QMouseEvent::LeftButton ) {
-            // The test to see if the mouse click is inside the button or not
-            bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, command );
-
-            if ( isOnButton && !button.isHeld ) {
-                button.isHeld = TRUE;
-                toggleButton( button );
-                switch ( command ) {
-                case VolumeUp:
-                    emit moreClicked();
-                    return;
-                case VolumeDown:
-                    emit lessClicked();
-                    return;
-                case Forward:
-                    emit forwardClicked();
-                    return;
-                case Back:
-                    emit backClicked();
-                    return;
-                default: break;
-                }
-            } else if ( !isOnButton && button.isHeld ) {
-                button.isHeld = FALSE;
-                toggleButton( button );
-            }
-        } else {
-            if ( button.isHeld ) {
-                button.isHeld = FALSE;
-                if ( button.type != ToggleButton ) {
-                    setToggleButton( button, FALSE );
-                }
-                handleCommand( command, button.isDown );
-            }
-        }
-    }
-}
-
-
 void AudioWidget::mousePressEvent( QMouseEvent *event ) {
     mouseMoveEvent( event );
 }
 
 
 void AudioWidget::mouseReleaseEvent( QMouseEvent *event ) {
     mouseMoveEvent( event );
 }
 
 
 void AudioWidget::showEvent( QShowEvent* ) {
     QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 );
     mouseMoveEvent( &event );
 }
 
 void AudioWidget::keyReleaseEvent( QKeyEvent *e) {
     switch ( e->key() ) {
         ////////////////////////////// Zaurus keys
       case Key_Home:
           break;
       case Key_F9: //activity
            hide();
            //           qDebug("Audio F9");
           break;
       case Key_F10: //contacts
           break;
       case Key_F11: //menu
               mediaPlayerState.toggleBlank();
           break;
       case Key_F12: //home
           break;
       case Key_F13: //mail
              mediaPlayerState.toggleBlank();
           break;
       case Key_Space: {
           mediaPlayerState.togglePaused();
       }
           break;
       case Key_Down:
           //              toggleButton(6);
           emit lessClicked();
           emit lessReleased();
           //          toggleButton(6);
           break;
       case Key_Up:
           //             toggleButton(5);
            emit moreClicked();
            emit moreReleased();
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 9b276b5..690d1b3 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -24,84 +24,79 @@
  :     =  ...= . :.=-
  -.   .:....=;==+<;          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 AUDIO_WIDGET_H
 #define AUDIO_WIDGET_H
 
 #include <qpainter.h>
 #include <qdrawutil.h>
 #include <qpixmap.h>
 #include <qstring.h>
 #include <qslider.h>
 #include <qframe.h>
 #include <qlineedit.h>
 #include <qimage.h>
 
 #include <opie/oticker.h>
 
 #include "mediawidget.h"
 
 class QPixmap;
 
 class AudioWidget : public MediaWidget {
     Q_OBJECT
 public:
     AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 );
     ~AudioWidget();
     void setTickerText( const QString &text ) { songInfo.setText( text ); }
 public slots:
     void updateSlider( long, long );
     void sliderPressed( );
     void sliderReleased( );
     void setLooping( bool b) { setToggleButton( Loop, b ); }
     void setPosition( long );
     void setSeekable( bool );
 
 public:
     virtual void setLength( long );
     virtual void setPlaying( bool b) { setToggleButton( Play, b ); }
     virtual void setDisplayType( MediaPlayerState::DisplayType displayType );
 
 signals:
-    void moreClicked();
-    void lessClicked();
-    void forwardClicked();
-    void backClicked();
     void sliderMoved(long);
 
 protected:
     void doBlank();
     void doUnblank();
     void showEvent( QShowEvent *se );
     void resizeEvent( QResizeEvent *re );
-    void mouseMoveEvent( QMouseEvent *event );
     void mousePressEvent( QMouseEvent *event );
     void mouseReleaseEvent( QMouseEvent *event );
     void timerEvent( QTimerEvent *event );
     void keyReleaseEvent( QKeyEvent *e);
 private slots:
     void skipFor();
     void skipBack();
     void stopSkip();
 private:
     int skipDirection;
     QString skin;
     QImage  imgUp;
     QImage  imgDn;
 
     OTicker  songInfo;
     QSlider slider;
     QLineEdit time;
     bool isStreaming : 1;
     bool audioSliderBeingMoved : 1;
 };
 
 
 #endif // AUDIO_WIDGET_H
 
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 7eb75e6..3533d74 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -24,96 +24,140 @@
 #include "mediawidget.h"
 #include "playlistwidget.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::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::mouseMoveEvent( QMouseEvent *event )
+{
+    for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) {
+        Button &button = *it;
+        Command command = button.command;
+
+        if ( event->state() == QMouseEvent::LeftButton ) {
+            // The test to see if the mouse click is inside the button or not
+            bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, command );
+
+            if ( isOnButton && !button.isHeld ) {
+                button.isHeld = TRUE;
+                toggleButton( button );
+                switch ( command ) {
+                case VolumeUp:
+                    emit moreClicked();
+                    return;
+                case VolumeDown:
+                    emit lessClicked();
+                    return;
+                case Forward:
+                    emit forwardClicked();
+                    return;
+                case Back:
+                    emit backClicked();
+                    return;
+                default: break;
+                }
+            } else if ( !isOnButton && button.isHeld ) {
+                button.isHeld = FALSE;
+                toggleButton( button );
+            }
+        } else {
+            if ( button.isHeld ) {
+                button.isHeld = FALSE;
+                if ( button.type != ToggleButton ) {
+                    setToggleButton( button, FALSE );
+                }
+                handleCommand( command, button.isDown );
+            }
+        }
+    }
+}
+
 void MediaWidget::makeVisible()
 {
 }
 
 void MediaWidget::handleCommand( Command command, bool buttonDown )
 {
     switch ( command ) {
         case Play:       mediaPlayerState.togglePaused();
         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
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 3f4c45d..c19fdbb 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -32,83 +32,89 @@
 #include <vector>
 
 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 ), isHeld( false ), isDown( false ) {}
 
         Command command;
 
         ButtonType type : 1;
         bool isHeld : 1;
         bool isDown : 1;
 
         QBitmap mask;
         QPixmap pixUp;
         QPixmap pixDown;
     };
     typedef std::vector<Button> ButtonVector;
 
     struct SkinButtonInfo
     {
         Command command;
         const char *fileName;
         ButtonType type;
     };
 
     typedef std::vector<QBitmap> MaskVector;
     typedef std::vector<QPixmap> PixmapVector;
 
     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;
 
 signals:
     void moreReleased();
     void lessReleased();
     void forwardReleased();
     void backReleased();
+    void forwardClicked();
+    void backClicked();
+    void moreClicked();
+    void lessClicked();
 
 protected:
     virtual void closeEvent( QCloseEvent * );
 
     virtual void paintEvent( QPaintEvent *pe );
 
+    virtual void mouseMoveEvent( 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;
 };
 
 #endif // MEDIAWIDGET_H
 /* vim: et sw=4 ts=4
  */
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index cc586cc..41844e1 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -198,136 +198,96 @@ void VideoWidget::sliderPressed() {
 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::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::mouseMoveEvent( QMouseEvent *event ) {
-    for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) {
-        Button &button = *it;
-        Command command = button.command;
-
-        if ( event->state() == QMouseEvent::LeftButton ) {
-            // The test to see if the mouse click is inside the button or not
-            bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, command );
-
-            if ( isOnButton && !button.isHeld ) {
-                button.isHeld = TRUE;
-                toggleButton( button );
-
-                switch ( command ) {
-                case VolumeUp:
-                    emit moreClicked();
-                    return;
-                case VolumeDown:
-                    emit lessClicked();
-                    return;
-                default: break;
-                }
-            } else if ( !isOnButton && button.isHeld ) {
-                        button.isHeld = FALSE;
-                        toggleButton( button );
-            }
-        } else {
-
-            if ( button.isHeld ) {
-                button.isHeld = FALSE;
-                if ( button.type != ToggleButton ) {
-                    setToggleButton( button, FALSE );
-                }
-
-                handleCommand( command, button.isDown );
-            }
-        }
-    }
-}
-
 void VideoWidget::mousePressEvent( QMouseEvent *event ) {
     mouseMoveEvent( event );
 }
 
 void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
     if ( mediaPlayerState.isFullscreen() ) {
         mediaPlayerState.setFullscreen( FALSE );
         makeVisible();
     }
     mouseMoveEvent( event );
 }
 
 void VideoWidget::showEvent( QShowEvent* ) {
     QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 );
     mouseMoveEvent( &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 {
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index ef88186..7d50ea0 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -31,73 +31,72 @@
 
 */
 
 #ifndef VIDEO_WIDGET_H
 #define VIDEO_WIDGET_H
 
 #include <qwidget.h>
 #include <qimage.h>
 #include <qpixmap.h>
 #include "xinevideowidget.h"
 
 #include "mediawidget.h"
 
 class QPixmap;
 class QSlider;
 
 class VideoWidget : public MediaWidget {
     Q_OBJECT
 public:
     VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 );
     ~VideoWidget();
 
 
     XineVideoWidget* vidWidget();
 public slots:
     void updateSlider( long, long );
     void sliderPressed( );
     void sliderReleased( );
     void setFullscreen( bool b );
     virtual void makeVisible();
     void backToNormal();
     void setPosition( long );
 
 public:
     virtual void setPlaying( bool b);
     virtual void setLength( long );
     virtual void setDisplayType( MediaPlayerState::DisplayType displayType );
 
 signals:
     void moreClicked();
     void lessClicked();
     void sliderMoved( long );
     void videoResized ( const QSize &s );
 
 protected:
 
     void resizeEvent( QResizeEvent * );
     void showEvent( QShowEvent *se );
-    void mouseMoveEvent( QMouseEvent *event );
     void mousePressEvent( QMouseEvent *event );
     void mouseReleaseEvent( QMouseEvent *event );
     void keyReleaseEvent( QKeyEvent *e);
 
 private:
 //    Ticker songInfo;
     QImage  imgUp;
     QImage  imgDn;
     QString skin;
 
 
 
     QString backgroundPix;
     QSlider *slider;
     QImage *currentFrame;
     int scaledWidth;
     int scaledHeight;
     XineVideoWidget* videoFrame;
 };
 
 #endif // VIDEO_WIDGET_H