added stuff and fixed stuff that I dont remember- plays w/o going to playlist among other things

9 files changed, 356 insertions, 213 deletions

diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp
index 5fef792..2087c7f 100644
--- a/core/multimedia/opieplayer/audiodevice.cpp
+++ b/core/multimedia/opieplayer/audiodevice.cpp
@@ -197,11 +197,9 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
     if( bps == 8)  format  = AFMT_U8;
     else if( bps <= 0) format = AFMT_S16_LE;
     else format = AFMT_S16_LE;
-
     qDebug("AD- freq %d, channels %d, b/sample %d, bitrate %d",f,chs,bps,format);
     connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) );
 
-
     int fragments = 0x10000 * 8 + sound_fragment_shift;
     int capabilities = 0;
 
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
@@ -17,12 +17,15 @@
 ** 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"
 
@@ -60,6 +63,7 @@ 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" ) );
@@ -200,48 +204,49 @@ void AudioWidget::timerEvent( QTimerEvent * ) {
 
 void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
     for ( int i = 0; i < numButtons; i++ ) {
-  int size = audioButtons[i].isBig;
-  int x = audioButtons[i].xPos;
-  int y = audioButtons[i].yPos;
-  if ( event->state() == QMouseEvent::LeftButton ) {
-      // 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);
+        int size = audioButtons[i].isBig;
+        int x = audioButtons[i].xPos;
+        int y = audioButtons[i].yPos;
+        if ( event->state() == QMouseEvent::LeftButton ) {
+              // 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);
-    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 )
-        setToggleButton( i, FALSE );
-    switch (i) {
-        case AudioPlay:       mediaPlayerState->setPlaying(audioButtons[i].isDown); return;
-        case AudioStop:       mediaPlayerState->setPlaying(FALSE); return;
-        case AudioPause:      mediaPlayerState->setPaused(audioButtons[i].isDown); return;
-        case AudioNext:       mediaPlayerState->setNext(); return;
-        case AudioPrevious:   mediaPlayerState->setPrev(); return;
-        case AudioLoop:       mediaPlayerState->setLooping(audioButtons[i].isDown); return;
-        case AudioVolumeUp:   emit moreReleased(); return;
-        case AudioVolumeDown: emit lessReleased(); return;
-        case AudioPlayList:   mediaPlayerState->setList();  return;
-    }
-      }
-  }
+            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 )
+                    setToggleButton( i, FALSE );
+                switch (i) {
+                  case AudioPlay:       mediaPlayerState->setPlaying(audioButtons[i].isDown); return;
+                  case AudioStop:       mediaPlayerState->setPlaying(FALSE); return;
+                  case AudioPause:      mediaPlayerState->setPaused(audioButtons[i].isDown); return;
+                  case AudioNext:       mediaPlayerState->setNext(); return;
+                  case AudioPrevious:   mediaPlayerState->setPrev(); return;
+                  case AudioLoop:       mediaPlayerState->setLooping(audioButtons[i].isDown); return;
+                  case AudioVolumeUp:   emit moreReleased(); return;
+                  case AudioVolumeDown: emit lessReleased(); return;
+                  case AudioPlayList:   mediaPlayerState->setList();  return;
+                }
+            }
+        }
     }
 }
 
@@ -274,3 +279,58 @@ void AudioWidget::paintEvent( QPaintEvent * ) {
 }
 
 
+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;
+        
+    };
+}
diff --git a/core/multimedia/opieplayer/audiowidget.h b/core/multimedia/opieplayer/audiowidget.h
index 53e84b3..a2850aa 100644
--- a/core/multimedia/opieplayer/audiowidget.h
+++ b/core/multimedia/opieplayer/audiowidget.h
@@ -52,41 +52,41 @@ class Ticker : public QFrame {
     Q_OBJECT
 public:
     Ticker( QWidget* parent=0 ) : QFrame( parent ) {
-	setFrameStyle( WinPanel | Sunken );
-	setText( "No Song" );
+  setFrameStyle( WinPanel | Sunken );
+  setText( "No Song" );
     }
     ~Ticker() { }
     void setText( const QString& text ) {
-	pos = 0; // reset it everytime the text is changed
-	scrollText = text;
-	pixelLen = fontMetrics().width( scrollText );
-	killTimers();
-	if ( pixelLen > width() )
-	    startTimer( 50 );
-	update();
+  pos = 0; // reset it everytime the text is changed
+  scrollText = text;
+  pixelLen = fontMetrics().width( scrollText );
+  killTimers();
+  if ( pixelLen > width() )
+      startTimer( 50 );
+  update();
     }
 protected:
     void timerEvent( QTimerEvent * ) {
-	pos = ( pos + 1 > pixelLen ) ? 0 : pos + 1;
+  pos = ( pos + 1 > pixelLen ) ? 0 : pos + 1;
 #ifndef USE_DBLBUF
-	scroll( -1, 0, contentsRect() );
+  scroll( -1, 0, contentsRect() );
 #else
-	repaint( FALSE );
+  repaint( FALSE );
 #endif
     }
     void drawContents( QPainter *p ) {
 #ifndef USE_DBLBUF
-	for ( int i = 0; i - pos < width() && (i < 1 || pixelLen > width()); i += pixelLen )
-	    p->drawText( i - pos, 0, INT_MAX, height(), AlignVCenter, scrollText );
+  for ( int i = 0; i - pos < width() && (i < 1 || pixelLen > width()); i += pixelLen )
+      p->drawText( i - pos, 0, INT_MAX, height(), AlignVCenter, scrollText );
 #else
-	// Double buffering code.
-	// Looks like qvfb makes it look like it flickers but I don't think it really is
-	QPixmap pm( width(), height() );
-	pm.fill( colorGroup().base() );
-	QPainter pmp( &pm );
-	for ( int i = 0; i - pos < width() && (i < 1 || pixelLen > width()); i += pixelLen )
-	    pmp.drawText( i - pos, 0, INT_MAX, height(), AlignVCenter, scrollText );
-	p->drawPixmap( 0, 0, pm );
+  // Double buffering code.
+  // Looks like qvfb makes it look like it flickers but I don't think it really is
+  QPixmap pm( width(), height() );
+  pm.fill( colorGroup().base() );
+  QPainter pmp( &pm );
+  for ( int i = 0; i - pos < width() && (i < 1 || pixelLen > width()); i += pixelLen )
+      pmp.drawText( i - pos, 0, INT_MAX, height(), AlignVCenter, scrollText );
+  p->drawPixmap( 0, 0, pm );
 #endif
     }
 private:
@@ -128,6 +128,7 @@ protected:
     void mouseReleaseEvent( QMouseEvent *event );
     void timerEvent( QTimerEvent *event );
     void closeEvent( QCloseEvent *event );
+    void keyReleaseEvent( QKeyEvent *e);
 
 private:
     void toggleButton( int );
diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp
index cb8de8a..4b2827e 100644
--- a/core/multimedia/opieplayer/loopcontrol.cpp
+++ b/core/multimedia/opieplayer/loopcontrol.cpp
@@ -221,7 +221,6 @@ void LoopControl::startVideo() {
 
 void LoopControl::startAudio() {
     
-//qDebug("start audio");
     audioMutex->lock();
     if ( moreAudio ) {
 
@@ -237,14 +236,14 @@ void LoopControl::startAudio() {
       long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000;
       long sampleWaitTime = currentSample - sampleWeShouldBeAt;
 
-//         if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) {
-//       usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) );
-//         }
-//       else if ( sampleWaitTime <= -5000 ) {
-//      qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
-//      //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
-//      currentSample = sampleWeShouldBeAt;
-//        }
+//             if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) {
+//           usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) );
+//             }
+//           else if ( sampleWaitTime <= -5000 ) {
+//    //      qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
+//          //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
+//          currentSample = sampleWeShouldBeAt;
+//            }
 
       audioDevice->write( audioBuffer, samplesRead * 2 * channels );
       audioSampleCounter = currentSample + samplesRead - 1;
@@ -379,7 +378,7 @@ bool LoopControl::init( const QString& filename ) {
   int astream = 0;
 
   channels = mediaPlayerState->curDecoder()->audioChannels( astream );
-  qDebug( "LC- channels = %d", channels );
+//   qDebug( "LC- channels = %d", channels );
   
   if ( !total_audio_samples )
       total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream );
@@ -389,15 +388,17 @@ bool LoopControl::init( const QString& filename ) {
   mediaPlayerState->setLength( total_audio_samples );
   
   freq = mediaPlayerState->curDecoder()->audioFrequency( astream );
-  qDebug( "LC- frequency = %d", freq );
+//    qDebug( "LC- frequency = %d", freq );
 
   audioSampleCounter = 0;
    int bits_per_sample;
-   if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibWavPlugin") ) {
+   if ( mediaPlayerState->curDecoder()->pluginName() == QString("WavPlugin") ) {
        bits_per_sample =(int) mediaPlayerState->curDecoder()->getTime();
-       qDebug("using stupid hack");
+//         qDebug("using stupid hack");
    } else {
-           bits_per_sample=0;
+       bits_per_sample=0;
+//       freq=44100;
+       channels=2;
    }
 
   audioDevice = new AudioDevice( freq, channels, bits_per_sample);
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp
index 4019d12..47fc731 100644
--- a/core/multimedia/opieplayer/playlistselection.cpp
+++ b/core/multimedia/opieplayer/playlistselection.cpp
@@ -55,7 +55,7 @@ PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
 //    setStaticBackground( TRUE );
 //      setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/background" ) );
 
-//    setBackgroundPixmap( Resource::loadPixmap( "opielogo" ) );
+    setBackgroundPixmap( Resource::loadPixmap( "opielogo" ) );
 // #endif
 //      addColumn("Title",236);
 //      setAllColumnsShowFocus( TRUE );
@@ -73,10 +73,9 @@ PlayListSelection::~PlayListSelection() {
 void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) {
 //  qDebug("drawBackground");
    p->fillRect( r, QBrush( white ) );
-//      QImage logo = Resource::loadImage( "mpegplayer/background" );
-//  //      QImage logo = Resource::loadImage( "opielogo" );
-//        if ( !logo.isNull() )
-//      p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo );
+      QImage logo = Resource::loadImage( "opielogo" );
+        if ( !logo.isNull() )
+      p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo );
 }
 // #endif
 
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 9969526..524747e 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -105,6 +105,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     d = new PlayListWidgetPrivate;
     d->setDocumentUsed = FALSE;
     d->current = NULL;
+    fromSetDocument = FALSE;
 //    menuTimer = new QTimer( this ,"menu timer"),
 //     connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) );
 
@@ -174,10 +175,11 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     
     QWidget *pTab;
     pTab = new QWidget( tabWidget, "pTab" );
-    playlistView = new QListView( pTab, "Videoview" );
-    playlistView->setMinimumSize(236,260);
+//      playlistView = new QListView( pTab, "playlistview" );
+//    playlistView->setMinimumSize(236,260);
     tabWidget->insertTab( pTab,"Playlist");
 
+
     // Add the playlist area
 
     QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton );
@@ -189,6 +191,11 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     d->selectedFiles = new PlayListSelection( hbox2);
     QVBox *vbox1 = new QVBox( hbox2 ); vbox1->setBackgroundMode( PaletteButton );
 
+    QPEApplication::setStylusOperation( d->selectedFiles->viewport(),QPEApplication::RightOnHold);
+          connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
+                   this,SLOT( playlistViewPressed(int, QListViewItem *, const QPoint&, int)) );
+
+          
      QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch
      new ToolButton( vbox1, tr( "Move Up" ),   "mpegplayer/up",   d->selectedFiles, SLOT(moveSelectedUp()) );
      new ToolButton( vbox1, tr( "Remove" ),    "mpegplayer/cut",  d->selectedFiles, SLOT(removeSelected()) );
@@ -204,7 +211,14 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     audioView->addColumn("Media",35);
     audioView->setColumnAlignment(1, Qt::AlignRight);
     audioView->setColumnAlignment(2, Qt::AlignRight);
+    audioView->setAllColumnsShowFocus(TRUE);
     tabWidget->insertTab(aTab,"Audio");
+
+    QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold);
+    connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
+             this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
+    
+
 //    audioView
      Global::findDocuments(&files, "audio/*");
      QListIterator<DocLnk> dit( files.children() );
@@ -232,6 +246,10 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     videoView->addColumn("Media",35);
     videoView->setColumnAlignment(1, Qt::AlignRight);
     videoView->setColumnAlignment(2, Qt::AlignRight);
+    videoView->setAllColumnsShowFocus(TRUE);
+    QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold);
+    connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
+             this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
 
     tabWidget->insertTab( vTab,"Video");
 
@@ -261,8 +279,6 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
 
 // add the library area
-   QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
-
 
 //     connect( audioView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)),
 //              this, SLOT( fauxPlay( QListViewItem *) ) );
@@ -419,25 +435,26 @@ void PlayListWidget::addAllVideoToList() {
 
 
 void PlayListWidget::setDocument(const QString& fileref) {
+    fromSetDocument = TRUE;
     if ( fileref.isNull() ) {
         QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) );
         return;
     }
-//    qDebug("setDocument");
+//    qDebug("setDocument "+fileref);
     if(fileref.find("playlist",0,TRUE) == -1) {
-    addToSelection( DocLnk( fileref ) );
-    d->setDocumentUsed = TRUE;
-    qApp->processEvents();
-    mediaPlayerState->setPlaying( FALSE );
-    qApp->processEvents();
-    mediaPlayerState->setPlaying( TRUE );
-    d->selectedFiles->removeSelected( );
-    } else {
+        clearList();
+        addToSelection( DocLnk( fileref ) );
+        d->setDocumentUsed = TRUE;
+        mediaPlayerState->setPlaying( FALSE );
+        qApp->processEvents();
+        mediaPlayerState->setPlaying( TRUE );
+        qApp->processEvents();
+        setCaption("OpiePlayer");
+
+    } else { //is playlist
+        clearList();
         loadList(DocLnk(fileref));
         d->selectedFiles->first();
-//      mediaPlayerState->setPlaying( TRUE );
-//      mediaPlayerState->setPlaying( FALSE );
-
     }
 }
 
@@ -455,20 +472,54 @@ void PlayListWidget::useSelectedDocument() {
 }
 
 
-const DocLnk *PlayListWidget::current() {
-
-//    qDebug("in Playlist  widget ::current");
-    if ( mediaPlayerState->playlist() ) {
- return d->selectedFiles->current();
-    }
-    else if ( d->setDocumentUsed && d->current ) {
- return d->current;
-    } else {
- return d->files->selected();
-    }
+const DocLnk *PlayListWidget::current() { // this is fugly
+
+//      if( fromSetDocument) {
+//          qDebug("from setDoc");
+//          DocLnkSet files;
+//          Global::findDocuments(&files, "video/*;audio/*");
+//          QListIterator<DocLnk> dit( files.children() );
+//          for ( ; dit.current(); ++dit ) {
+//              if(dit.current()->linkFile() ==  setDocFileRef) {
+//                  qDebug(setDocFileRef);  
+//                  return dit;
+//              }
+//          }
+//      } else
+        switch (tabWidget->currentPageIndex()) {
+          case 0: //playlist
+          {
+              if ( mediaPlayerState->playlist() ) {
+                  return d->selectedFiles->current();
+              }
+              else if ( d->setDocumentUsed && d->current ) {
+                  return d->current;
+              } else {
+                  return d->files->selected();
+              }
+          }
+          break;
+          case 1: { //audio
+              Global::findDocuments(&files, "audio/*");
+              QListIterator<DocLnk> dit( files.children() );
+              for ( ; dit.current(); ++dit ) {
+                  if( dit.current()->name() == audioView->currentItem()->text(0))
+                      return dit;
+              }
+          }           
+              break;
+          case 2: { // video
+              Global::findDocuments(&vFiles, "video/*");
+              QListIterator<DocLnk> Vdit( vFiles.children() );
+              for ( ; Vdit.current(); ++Vdit ) {
+                  if( Vdit.current()->name() == videoView->currentItem()->text(0))
+                      return Vdit;
+              }      
+          }
+              break;
+        };
 }
 
-
 bool PlayListWidget::prev() {
     if ( mediaPlayerState->playlist() ) {
   if ( mediaPlayerState->shuffled() ) {
@@ -569,10 +620,8 @@ void PlayListWidget::saveList() {
         d->selectedFiles->first();
     if(fileDlg)
         delete fileDlg;
-
 }
 
-
 void PlayListWidget::loadList( const DocLnk & lnk) {
     QString name= lnk.name();
 //    qDebug("currentList is "+name);
@@ -589,7 +638,6 @@ void PlayListWidget::loadList( const DocLnk & lnk) {
     }
 }
 
-
 void PlayListWidget::setPlaylist( bool shown ) {
     if ( shown ) 
   d->playListFrame->show();
@@ -597,7 +645,6 @@ void PlayListWidget::setPlaylist( bool shown ) {
   d->playListFrame->hide();
 }
 
-
 void PlayListWidget::setView( char view ) {
     if ( view == 'l' )
   showMaximized();
@@ -704,68 +751,11 @@ void PlayListWidget::tabChanged(QWidget *widg) {
     };
 }
 
-/*
-  list is right clicked*/
-void PlayListWidget::fauxPlay(QListViewItem *it) {
-
-    switch (tabWidget->currentPageIndex()) {
-      case 0: //playlist
-          break;
-      case 1: { //audio
-          QListIterator<DocLnk> dit( files.children() );
-          for ( ; dit.current(); ++dit ) {
-//               qDebug(dit.current()->name());
-              if( dit.current()->name() == it->text(0)) {
-                  d->selectedFiles->addToSelection(  **dit );
-              }
-          }
-      }           
-          break;
-      case 2: { // video
-          QListIterator<DocLnk> dit( vFiles.children() );
-          for ( ; dit.current(); ++dit ) {
-//               qDebug(dit.current()->name());
-              if( dit.current()->name() == it->text(0)) {
-                  d->selectedFiles->addToSelection(  **dit );
-              }
-          }
-      }
-          break;
-    };
-    mediaPlayerState->setPlaying( TRUE );
-//  tabWidget->setCurrentPage(0);
-    d->selectedFiles->removeSelected();
-}
 
 /*
   play button is pressed*/
-void PlayListWidget::btnPlay(bool b) { // this is fugly
-    switch ( tabWidget->currentPageIndex()) {
-      case 0:
-      {
-          mediaPlayerState->setPlaying(b);
-      }
-      break;
-      case 1:
-      {
-          addToSelection( audioView->selectedItem() );
-          mediaPlayerState->setPlaying(b);
-          qApp->processEvents();
-          d->selectedFiles->removeSelected( );
-          tabWidget->setCurrentPage(1);
-      }
-      break;
-      case 2:
-      {
-          addToSelection( videoView->selectedItem() );
-          mediaPlayerState->setPlaying(b);
-          qApp->processEvents();
-          d->selectedFiles->removeSelected( );
-          tabWidget->setCurrentPage(2);
-      }
-      break;
-    };
-
+void PlayListWidget::btnPlay(bool b) {
+    mediaPlayerState->setPlaying(b);
 }
 
 void PlayListWidget::deletePlaylist() {
@@ -782,3 +772,43 @@ void PlayListWidget::deletePlaylist() {
     };
 
 }
+
+void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint& point, int i)
+{
+    switch (mouse) {
+      case 1:
+          break;
+      case 2:{
+    QPopupMenu  m;
+    m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
+    m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() ));
+//      m.insertSeparator();
+//      m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
+    m.exec( QCursor::pos() );
+      }
+    break;
+    };
+
+}
+
+void PlayListWidget::playSelected()
+{
+    btnPlay( TRUE);
+}
+
+void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const QPoint& point, int i)
+{
+ switch (mouse) {
+      case 1:
+          break;
+      case 2:{
+    QPopupMenu  m;
+    m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() ));
+    m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() ));
+//      m.insertSeparator();
+    m.exec( QCursor::pos() );
+      }
+    break;
+    };
+
+}
diff --git a/core/multimedia/opieplayer/playlistwidget.h b/core/multimedia/opieplayer/playlistwidget.h
index e72551b..effc600 100644
--- a/core/multimedia/opieplayer/playlistwidget.h
+++ b/core/multimedia/opieplayer/playlistwidget.h
@@ -43,11 +43,13 @@ public:
     PlayListWidget( QWidget* parent=0, const char* name=0, WFlags fl=0 );
     ~PlayListWidget();
     QTabWidget * tabWidget;
-  QAction *fullScreenButton, *scaleButton;
-     DocLnkSet files;
-     DocLnkSet vFiles;
-     QListView *audioView, *videoView, *playlistView;
-     QLabel *libString; 
+    QAction *fullScreenButton, *scaleButton;
+    DocLnkSet files;
+    DocLnkSet vFiles;
+    QListView *audioView, *videoView, *playlistView;
+    QLabel *libString;
+    bool fromSetDocument;
+    QString setDocFileRef;
     // retrieve the current playlist entry (media file link)
     const DocLnk *current();
     void useSelectedDocument();
@@ -68,7 +70,7 @@ public slots:
     void saveList();  // Save the playlist
     void loadList( const DocLnk &);  // Load a playlist
     void playIt( QListViewItem *);
-    void fauxPlay(QListViewItem *);
+
     void btnPlay(bool);
     void deletePlaylist();
     bool first();
@@ -78,6 +80,9 @@ public slots:
     void addSelected();
     void removeSelected();
     void tabChanged(QWidget*);
+    void viewPressed( int, QListViewItem *, const QPoint&, int);
+    void playlistViewPressed( int, QListViewItem *, const QPoint&, int);
+    void playSelected();
 /*     void setFullScreen(); */
 /*     void setScaled(); */
 protected:
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index be838c4..bb5f9e8 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -184,36 +184,36 @@ void VideoWidget::paintButton( QPainter *p, int i ) {
 
 void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
     for ( int i = 0; i < numButtons; i++ ) {
-  int x = videoButtons[i].xPos;
-  int y = videoButtons[i].yPos;
-  if ( event->state() == QMouseEvent::LeftButton ) {
-      // 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 = 16;
-      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);
-      if ( isOnButton != videoButtons[i].isHeld ) {
-    videoButtons[i].isHeld = isOnButton;
-    toggleButton(i);
-      }
-  } else {
-      if ( videoButtons[i].isHeld ) {
-    videoButtons[i].isHeld = FALSE;
-    if ( !videoButtons[i].isToggle ) 
-        setToggleButton( i, FALSE );
-    switch (i) {
-        case VideoPlay:       mediaPlayerState->setPlaying(videoButtons[i].isDown); return;
-        case VideoStop:       mediaPlayerState->setPlaying(FALSE); return;
-        case VideoPause:      mediaPlayerState->setPaused(videoButtons[i].isDown); return;
-        case VideoNext:       mediaPlayerState->setNext(); return;
-        case VideoPrevious:   mediaPlayerState->setPrev(); return;
-        case VideoPlayList:   mediaPlayerState->setList(); return;
-        case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
-    }
-      }
-  }
+        int x = videoButtons[i].xPos;
+        int y = videoButtons[i].yPos;
+        if ( event->state() == QMouseEvent::LeftButton ) {
+              // 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 = 16;
+            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);
+            if ( isOnButton != videoButtons[i].isHeld ) {
+                videoButtons[i].isHeld = isOnButton;
+                toggleButton(i);
+            }
+        } else {
+            if ( videoButtons[i].isHeld ) {
+                videoButtons[i].isHeld = FALSE;
+                if ( !videoButtons[i].isToggle ) 
+                    setToggleButton( i, FALSE );
+                switch (i) {
+                  case VideoPlay:       mediaPlayerState->setPlaying(videoButtons[i].isDown); return;
+                  case VideoStop:       mediaPlayerState->setPlaying(FALSE); return;
+                  case VideoPause:      mediaPlayerState->setPaused(videoButtons[i].isDown); return;
+                  case VideoNext:       mediaPlayerState->setNext(); return;
+                  case VideoPrevious:   mediaPlayerState->setPrev(); return;
+                  case VideoPlayList:   mediaPlayerState->setList(); return;
+                  case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
+                }
+            }
+        }
     }
 }
 
@@ -227,7 +227,7 @@ void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
     if ( mediaPlayerState->fullscreen() ) {
   mediaPlayerState->setFullscreen( FALSE );
   makeVisible();
-    } else { 
+ 
   mouseMoveEvent( event );
     }
 }
@@ -421,3 +421,51 @@ bool VideoWidget::playVideo() {
 }
 
 
+
+void VideoWidget::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()) {
+              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;
+        
+    };
+}
diff --git a/core/multimedia/opieplayer/videowidget.h b/core/multimedia/opieplayer/videowidget.h
index cf13743..fe56ca1 100644
--- a/core/multimedia/opieplayer/videowidget.h
+++ b/core/multimedia/opieplayer/videowidget.h
@@ -67,6 +67,7 @@ protected:
     void mousePressEvent( QMouseEvent *event );
     void mouseReleaseEvent( QMouseEvent *event );
     void closeEvent( QCloseEvent *event );
+    void keyReleaseEvent( QKeyEvent *e);
 
 private:
     void paintButton( QPainter *p, int i );
@@ -76,7 +77,7 @@ private:
     QSlider *slider;
     QPixmap *pixmaps[3];
     QImage *currentFrame;
-    int	scaledWidth;
+    int scaledWidth;
     int scaledHeight;
 };