1 files changed, 105 insertions, 75 deletions

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
@@ -107,2 +107,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     d->current = NULL;
+    fromSetDocument = FALSE;
 //    menuTimer = new QTimer( this ,"menu timer"),
@@ -176,6 +177,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     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
@@ -191,2 +193,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
+    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
@@ -206,3 +213,10 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     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
@@ -234,2 +248,6 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     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)) );
 
@@ -263,4 +281,2 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 // add the library area
-   QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
-
 
@@ -421,2 +437,3 @@ void PlayListWidget::addAllVideoToList() {
 void PlayListWidget::setDocument(const QString& fileref) {
+    fromSetDocument = TRUE;
     if ( fileref.isNull() ) {
@@ -425,7 +442,7 @@ void PlayListWidget::setDocument(const QString& fileref) {
     }
-//    qDebug("setDocument");
+//    qDebug("setDocument "+fileref);
     if(fileref.find("playlist",0,TRUE) == -1) {
+        clearList();
     addToSelection( DocLnk( fileref ) );
     d->setDocumentUsed = TRUE;
-    qApp->processEvents();
     mediaPlayerState->setPlaying( FALSE );
@@ -433,9 +450,9 @@ void PlayListWidget::setDocument(const QString& fileref) {
     mediaPlayerState->setPlaying( TRUE );
-    d->selectedFiles->removeSelected( );
-    } else {
+        qApp->processEvents();
+        setCaption("OpiePlayer");
+
+    } else { //is playlist
+        clearList();
         loadList(DocLnk(fileref));
         d->selectedFiles->first();
-//      mediaPlayerState->setPlaying( TRUE );
-//      mediaPlayerState->setPlaying( FALSE );
-
     }
@@ -457,5 +474,19 @@ void PlayListWidget::useSelectedDocument() {
 
-const DocLnk *PlayListWidget::current() {
+const DocLnk *PlayListWidget::current() { // this is fugly
 
-//    qDebug("in Playlist  widget ::current");
+//      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() ) {
@@ -469,3 +500,23 @@ const DocLnk *PlayListWidget::current() {
 }
-
+          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;
+        };
+}
 
@@ -571,6 +622,4 @@ void PlayListWidget::saveList() {
         delete fileDlg;
-
 }
 
-
 void PlayListWidget::loadList( const DocLnk & lnk) {
@@ -591,3 +640,2 @@ void PlayListWidget::loadList( const DocLnk & lnk) {
 
-
 void PlayListWidget::setPlaylist( bool shown ) {
@@ -599,3 +647,2 @@ void PlayListWidget::setPlaylist( bool shown ) {
 
-
 void PlayListWidget::setView( char view ) {
@@ -706,60 +753,36 @@ 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 );
-              }
-          }
+/*
+  play button is pressed*/
+void PlayListWidget::btnPlay(bool b) {
+    mediaPlayerState->setPlaying(b);
       }           
+
+void PlayListWidget::deletePlaylist() {
+    switch( QMessageBox::information( this, (tr("Remove Playlist?")),
+                                      (tr("You really want to delete\nthis playlist?")),
+                                      (tr("Yes")), (tr("No")), 0 )){
+        case 0: // Yes clicked,
+            QFile().remove(playLists->selected()->file());
+            QFile().remove(playLists->selected()->linkFile());
+            playLists->reread();
           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 );
-              }
-          }
-      }
+        case 1: // Cancel
           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:
+void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint& point, int i)
       {
-          mediaPlayerState->setPlaying(b);
-      }
-      break;
+    switch (mouse) {
       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);
+      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() );
       }
@@ -770,12 +793,19 @@ void PlayListWidget::btnPlay(bool b) { // this is fugly
 
-void PlayListWidget::deletePlaylist() {
-    switch( QMessageBox::information( this, (tr("Remove Playlist?")),
-                                      (tr("You really want to delete\nthis playlist?")),
-                                      (tr("Yes")), (tr("No")), 0 )){
-        case 0: // Yes clicked,
-            QFile().remove(playLists->selected()->file());
-            QFile().remove(playLists->selected()->linkFile());
-            playLists->reread();
+void PlayListWidget::playSelected()
+{
+    btnPlay( TRUE);
+}
+
+void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const QPoint& point, int i)
+{
+ switch (mouse) {
+      case 1:
             break;
-        case 1: // Cancel
+      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;