1 files changed, 61 insertions, 1 deletions

diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index 582660c..3901446 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -8,30 +8,33 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
+#include <qpe/qpeapplication.h>
+#include <qpe/resource.h>
+
 #include <qwidget.h>
 #include <qpixmap.h>
 #include <qbutton.h>
 #include <qpainter.h>
 #include <qframe.h>
-#include <qpe/resource.h>
+
 #include "audiowidget.h"
 #include "mediaplayerstate.h"
 
 extern MediaPlayerState *mediaPlayerState;
 
 
 static const int xo = -2; // movable x offset
 static const int yo = 22; // movable y offset
 
 
 struct MediaButton {
     int  xPos, yPos;
@@ -51,24 +54,25 @@ MediaButton audioButtons[] = {
     {    3*30+xo,  6*30-5+yo, 3, FALSE, FALSE, FALSE, FALSE }, // volume down
     {    5*30+xo,    1*30+yo, 0,  TRUE, FALSE, FALSE, FALSE }, // repeat/loop
     {    1*30+xo,    1*30+yo, 0, FALSE, FALSE, FALSE, FALSE }  // playlist
 };
 
 
 static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton));
 
 
 AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     QWidget( parent, name, f )
 {
+//    QPEApplication::grabKeyboard();
     setCaption( tr("OpiePlayer") );
     setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) );
     pixmaps[0] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButtonsAll" ) );
     pixmaps[1] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButtonsBig" ) );
     pixmaps[2] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaControls" ) );
     pixmaps[3] = new QPixmap( Resource::loadPixmap( "mpegplayer/animatedButton" ) );
 
     songInfo = new Ticker( this );
     songInfo->setFocusPolicy( QWidget::NoFocus );
     songInfo->setGeometry( QRect( 7, 3, 220, 20 ) );
 
     slider = new QSlider( Qt::Horizontal, this );
@@ -207,24 +211,25 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
       // The test to see if the mouse click is inside the circular button or not
       // (compared with the radius squared to avoid a square-root of our distance)
       int radius = 32 + 13 * size;
       QPoint center = QPoint( x + radius, y + radius );
       QPoint dXY = center - event->pos();
       int dist = dXY.x() * dXY.x() + dXY.y() * dXY.y();
       bool isOnButton = dist <= (radius * radius);
 //      QRect r( x, y, 64 + 22*size, 64 + 22*size );
 //      bool isOnButton = r.contains( event->pos() ); // Rectangular Button code
       if ( isOnButton && !audioButtons[i].isHeld ) {
     audioButtons[i].isHeld = TRUE;
     toggleButton(i);
+                qDebug("button toggled %d",i);
     switch (i) {
                     case AudioVolumeUp:   emit moreClicked(); return;
                     case AudioVolumeDown: emit lessClicked(); return;
     }
       } else if ( !isOnButton && audioButtons[i].isHeld ) {
     audioButtons[i].isHeld = FALSE;
     toggleButton(i);
       }
   } else {
       if ( audioButtons[i].isHeld ) {
     audioButtons[i].isHeld = FALSE;
     if ( !audioButtons[i].isToggle )
@@ -265,12 +270,67 @@ void AudioWidget::showEvent( QShowEvent* ) {
 void AudioWidget::closeEvent( QCloseEvent* ) {
     mediaPlayerState->setList();
 }
 
 
 void AudioWidget::paintEvent( QPaintEvent * ) {
     QPainter p( this );
     for ( int i = 0; i < numButtons; i++ )
   paintButton( &p, i );
 }
 
 
+void AudioWidget::keyReleaseEvent( QKeyEvent *e)
+{
+    switch ( e->key() ) {
+////////////////////////////// Zaurus keys
+      case Key_Home:
+          break;
+      case Key_F9: //activity
+          break;
+      case Key_F10: //contacts
+          break;
+      case Key_F11: //menu
+          break;
+      case Key_F12: //home
+          break;
+      case Key_F13: //mail
+          break;
+      case Key_Space: {
+          if(mediaPlayerState->playing()) {
+//                toggleButton(1);
+              mediaPlayerState->setPlaying(FALSE);
+//                toggleButton(1);
+          } else {
+//                toggleButton(0);
+              mediaPlayerState->setPlaying(TRUE);
+//                toggleButton(0);
+          }
+      }
+          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:
+//            toggleButton(3);
+          mediaPlayerState->setNext();
+//            toggleButton(3);
+          break;
+      case Key_Left:
+//            toggleButton(4);
+          mediaPlayerState->setPrev();
+//            toggleButton(4);
+          break;
+      case Key_Escape:
+          break;
+        
+    };
+}