*** empty log message ***

1 files changed, 26 insertions, 21 deletions

diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 4e1543e..269aed8 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -18,49 +18,49 @@
 **
 **********************************************************************/
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/fileselector.h>
 #include <qpe/qpeapplication.h>
 
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <qpe/resource.h>
 #include <qaction.h>
 #include <qimage.h>
 #include <qfile.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qlist.h>
 #include <qlistbox.h>
 #include <qmainwindow.h>
 #include <qmessagebox.h>
 #include <qtoolbutton.h>
 #include <qtabwidget.h>
 #include <qlistview.h>
 #include <qpoint.h>
-#include <qtimer.h>
+//#include <qtimer.h>
 
 #include "playlistselection.h"
 #include "playlistwidget.h"
 #include "mediaplayerstate.h"
 
 #include <stdlib.h>
 
 #define BUTTONS_ON_TOOLBAR
 #define SIDE_BUTTONS
 #define CAN_SAVE_LOAD_PLAYLISTS
 
 extern MediaPlayerState *mediaPlayerState;
 
 // class myFileSelector {
 
 // };
 class PlayListWidgetPrivate {
 public:
     QToolButton *tbPlay, *tbFull, *tbLoop, *tbScale, *tbShuffle, *tbAddToList,  *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove;
     QFrame *playListFrame;
     FileSelector *files;
     PlayListSelection *selectedFiles;
     bool setDocumentUsed;
     DocLnk *current;
@@ -77,50 +77,50 @@ public:
   setFocusPolicy( QWidget::NoFocus );
   setToggleButton( t );
   connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot );
   QPEMenuToolFocusManager::manager()->addWidget( this );
     }
 };
 
 
 class MenuItem : public QAction {
 public:
     MenuItem( QWidget *parent, const QString& text, QObject *handler, const QString& slot )
   : QAction( text, QString::null, 0, 0 ) {
   connect( this, SIGNAL( activated() ), handler, slot );
   addTo( parent );
     }
 };
 
 
 PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     : QMainWindow( parent, name, fl ) {
 
     d = new PlayListWidgetPrivate;
     d->setDocumentUsed = FALSE;
     d->current = NULL;
-    menuTimer = new QTimer( this ,"menu timer"),
-    connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) );
+//    menuTimer = new QTimer( this ,"menu timer"),
+//     connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) );
 
     setBackgroundMode( PaletteButton );
 
     setCaption( tr("OpiePlayer") );
     setIcon( Resource::loadPixmap( "MPEGPlayer" ) );
 
     setToolBarsMovable( FALSE );
 
     // Create Toolbar
     QPEToolBar *toolbar = new QPEToolBar( this );
     toolbar->setHorizontalStretchable( TRUE );
 
     // Create Menubar
     QPEMenuBar *menu = new QPEMenuBar( toolbar );
     menu->setMargin( 0 );
 
     QPEToolBar *bar = new QPEToolBar( this );
     bar->setLabel( tr( "Play Operations" ) );
     d->tbAddToList =  new ToolButton( bar, tr( "Add to Playlist" ),      "mpegplayer/add_to_playlist",
                                       this , SLOT(addSelected()) );
     d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), "mpegplayer/remove_from_playlist",
                                           this , SLOT(removeSelected()) );
     d->tbPlay    = new ToolButton( bar, tr( "Play" ),       "mpegplayer/play",
                                    mediaPlayerState, SLOT(setPlaying(bool)), TRUE );
@@ -183,78 +183,83 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
      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()) );
      new ToolButton( vbox1, tr( "Move Down" ), "mpegplayer/down", d->selectedFiles, SLOT(moveSelectedDown()) );
      QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch
 
     QWidget *aTab;
     aTab = new QWidget( tabWidget, "aTab" );
     audioView = new QListView( aTab, "Audioview" );
     audioView->setMinimumSize(233,260);
     audioView->addColumn( "Title",150);
     audioView->addColumn("Size", 45);
     audioView->addColumn("Media",35);
     audioView->setColumnAlignment(1, Qt::AlignRight);
     audioView->setColumnAlignment(2, Qt::AlignRight);
     tabWidget->insertTab(aTab,"Audio");
 //    audioView
      Global::findDocuments(&files, "audio/*");
      QListIterator<DocLnk> dit( files.children() );
      QString storage;
      for ( ; dit.current(); ++dit ) {
          QListViewItem * newItem;
          if(dit.current()->file().find("/mnt/cf") != -1 ) storage="CF";
+         else if(dit.current()->file().find("/mnt/hda") != -1 ) storage="CF";
          else if(dit.current()->file().find("/mnt/card") != -1 ) storage="SD";
          else storage="RAM";
-         
+         if ( QFile( dit.current()->file()).exists() ) {
          newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), QString::number( QFile( dit.current()->file()).size() ), storage);
          newItem->setPixmap(0, Resource::loadPixmap( "mpegplayer/musicfile" ));
+         }
      }
 // videowidget
      
     QWidget *vTab;
     vTab = new QWidget( tabWidget, "vTab" );
     videoView = new QListView( vTab, "Videoview" );
     videoView->setMinimumSize(233,260);
     
     videoView->addColumn("Title",150);
     videoView->addColumn("Size",45);
     videoView->addColumn("Media",35);
     videoView->setColumnAlignment(1, Qt::AlignRight);
     videoView->setColumnAlignment(2, Qt::AlignRight);
 
     tabWidget->insertTab( vTab,"Video");
 
     Global::findDocuments(&vFiles, "video/*");
     QListIterator<DocLnk> Vdit( vFiles.children() );
     for ( ; Vdit.current(); ++Vdit ) {
          if( Vdit.current()->file().find("/mnt/cf") != -1 ) storage="CF";
+         else if( Vdit.current()->file().find("/mnt/hda") != -1 ) storage="CF";
          else if( Vdit.current()->file().find("/mnt/card") != -1 ) storage="SD";
          else storage="RAM";
         QListViewItem * newItem;
+         if ( QFile( Vdit.current()->file()).exists() ) {
         newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), QString::number( QFile( Vdit.current()->file()).size() ), storage);
         newItem->setPixmap(0, Resource::loadPixmap( "mpegplayer/videofile" ));
+         }
      }
 
 
 //     d->tbPlay = new ToolButton( vbox1, tr( "Play" ), "mpegplayer/play", mediaPlayerState, SLOT(setPlaying(bool)), TRUE );
 //     d->tbShuffle = new ToolButton( vbox1, tr( "Randomize" ), "mpegplayer/shuffle", mediaPlayerState, SLOT(setShuffled(bool)), TRUE );
 
     // add the library area
 
 //     d->files->setBackgroundMode( PaletteButton );
 //     QVBox *vbox7 = new QVBox( hbox6 ); vbox7->setBackgroundMode( PaletteButton );
 
 // #ifdef SIDE_BUTTONS
 //     QVBox *stretch3 = new QVBox( vbox1 ); stretch3->setBackgroundMode( PaletteButton ); // add stretch
 // #endif
     QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
 
 //      connect( audioView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
 //      connect( videoView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
 
     connect( audioView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
     connect( videoView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
 
    connect( audioView, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint&, int ) ),
             this, SLOT( addToSelection( QListViewItem *, const QPoint&, int )) );
@@ -642,52 +647,52 @@ void PlayListWidget::tabChanged(QWidget *widg) {
 
     int tabPage=tabWidget->currentPageIndex();
       switch (tabPage) {
       case 0:
       {
            d->tbRemoveFromList->setEnabled(TRUE);
            d->tbAddToList->setEnabled(FALSE);
       }
           break;
         case 1:
         {
            d->tbRemoveFromList->setEnabled(FALSE);
           d->tbAddToList->setEnabled(TRUE);
         }
             break;
         case 2:
         {
           d->tbRemoveFromList->setEnabled(FALSE);
           d->tbAddToList->setEnabled(TRUE);
         }
             break;
       };
 }
 
-void PlayListWidget::cancelMenuTimer() {
-    if( menuTimer->isActive() )
-    menuTimer->stop();
-}
+// void PlayListWidget::cancelMenuTimer() {
+//     if( menuTimer->isActive() )
+//     menuTimer->stop();
+// }
 
-void PlayListWidget::showFileMenu() {
+// void PlayListWidget::showFileMenu() {
 
-}
+// }
 
-void PlayListWidget::contentsMousePressEvent( QMouseEvent * e )
-{
-//    QListView::contentsMousePressEvent( e );
-    menuTimer->start( 750, TRUE );
-}
+// void PlayListWidget::contentsMousePressEvent( QMouseEvent * e )
+// {
+// //    QListView::contentsMousePressEvent( e );
+//     menuTimer->start( 750, TRUE );
+// }
 
 
-void PlayListWidget::contentsMouseReleaseEvent( QMouseEvent * e )
-{
-//    QListView::contentsMouseReleaseEvent( e );
-    menuTimer->stop();
-}
-// void PlayListWidget::setFullScreen() {
+// void PlayListWidget::contentsMouseReleaseEvent( QMouseEvent * e )
+// {
+// //    QListView::contentsMouseReleaseEvent( e );
+//     menuTimer->stop();
+// }
+// // void PlayListWidget::setFullScreen() {
 //  mediaPlayerState->toggleFullscreen( );
 // }
 
 // void PlayListWidget::setScaled() {
 //  mediaPlayerState->toggleScaled();
 // }