translations stuff

2 files changed, 131 insertions, 77 deletions

diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index db6533a..3b8f6d7 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -1,88 +1,91 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** 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.
 **
 **********************************************************************/
 // code added by L. J. Potter Sat 03-02-2002 06:17:54
+#define QTOPIA_INTERNAL_FSLP
+
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/fileselector.h>
 #include <qpe/qpeapplication.h>
+#include <qpe/lnkproperties.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 <qdir.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 <qlineedit.h>
 #include <qpushbutton.h>
 
 //#include <qtimer.h>
 
 #include "playlistselection.h"
 #include "playlistwidget.h"
 #include "mediaplayerstate.h"
 
 #include "inputDialog.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;
 };
 
 
 class ToolButton : public QToolButton {
 public:
     ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
   : QToolButton( parent, name ) {
   setTextLabel( name );
   setPixmap( Resource::loadPixmap( icon ) );
   setAutoRaise( TRUE );
   setFocusPolicy( QWidget::NoFocus );
   setToggleButton( t );
   connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot );
   QPEMenuToolFocusManager::manager()->addWidget( this );
     }
@@ -146,230 +149,204 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     d->tbLoop    = new ToolButton( bar, tr( "Loop" ),"mpegplayer/loop",
                                    mediaPlayerState, SLOT(setLooping(bool)), TRUE );
     tbDeletePlaylist->hide();
 
     QPopupMenu *pmPlayList = new QPopupMenu( this );
     menu->insertItem( tr( "File" ), pmPlayList );
     new MenuItem( pmPlayList, tr( "Clear List" ),          this,             SLOT( clearList() ) );
     new MenuItem( pmPlayList, tr( "Add all audio files" ), this,             SLOT( addAllMusicToList() ) );
     new MenuItem( pmPlayList, tr( "Add all video files" ), this,             SLOT( addAllVideoToList() ) );
     new MenuItem( pmPlayList, tr( "Add all files" ),       this,             SLOT( addAllToList() ) );
     new MenuItem( pmPlayList, tr( "Save PlayList" ),       this,             SLOT( saveList() ) );
       //   new MenuItem( pmPlayList, tr( "Load PlayList" ),       this,             SLOT( loadList() ) );
 
     QPopupMenu *pmView = new QPopupMenu( this );
     menu->insertItem( tr( "View" ), pmView );
 
     fullScreenButton = new QAction(tr("Full Screen"), Resource::loadPixmap("fullscreen"), QString::null, 0, this, 0);
     connect( fullScreenButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleFullscreen()) );
     fullScreenButton->addTo(pmView);
     scaleButton = new QAction(tr("Scale"), Resource::loadPixmap("mpegplayer/scale"), QString::null, 0, this, 0);
     connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled()) );
     scaleButton->addTo(pmView);
 
     QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton );
     QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton );
 
     QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton );
     
     tabWidget = new QTabWidget( hbox6, "tabWidget" );
     tabWidget->setTabShape(QTabWidget::Triangular);
     
     QWidget *pTab;
     pTab = new QWidget( tabWidget, "pTab" );
 //      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 );
     d->playListFrame = vbox3;
     d->playListFrame ->setMinimumSize(235,260);
 
     QHBox *hbox2 = new QHBox( vbox3 ); hbox2->setBackgroundMode( PaletteButton );
 
     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()) );
      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",140);
-    audioView->addColumn("Size", -1);
-    audioView->addColumn("Media",-1);
+    audioView->addColumn( tr("Title"),140);
+    audioView->addColumn(tr("Size"), -1);
+    audioView->addColumn(tr("Media"),-1);
     audioView->setColumnAlignment(1, Qt::AlignRight);
     audioView->setColumnAlignment(2, Qt::AlignRight);
     audioView->setAllColumnsShowFocus(TRUE);
-    tabWidget->insertTab(aTab,"Audio");
+    tabWidget->insertTab(aTab,tr("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() );
-     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" ));
-         }
-     }
+     populateAudioView();
 // videowidget
      
     QWidget *vTab;
     vTab = new QWidget( tabWidget, "vTab" );
     videoView = new QListView( vTab, "Videoview" );
     videoView->setMinimumSize(233,260);
     
-    videoView->addColumn("Title",140);
-    videoView->addColumn("Size",-1);
-    videoView->addColumn("Media",-1);
+    videoView->addColumn(tr("Title"),140);
+    videoView->addColumn(tr("Size"),-1);
+    videoView->addColumn(tr("Media"),-1);
     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");
+    tabWidget->insertTab( vTab,tr("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" ));
-         }
-     }
 
 //playlists list
     QWidget *LTab;
     LTab = new QWidget( tabWidget, "LTab" );
     playLists = new FileSelector( "playlist/plain", LTab, "fileselector" , FALSE, FALSE); //buggy
     playLists->setMinimumSize(233,260);;
-    tabWidget->insertTab(LTab,"Lists");
+    tabWidget->insertTab(LTab,tr("Lists"));
 
     connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) );
 //      connect( playLists, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) );
 
 
 // add the library area
 
 //     connect( audioView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)),
 //              this, SLOT( fauxPlay( QListViewItem *) ) );
 //     connect( videoView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)),
 //              this, SLOT( fauxPlay( QListViewItem *)) );
 
 //    connect( audioView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) );
 //    connect( videoView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) );
 
    connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
    connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
 
    connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*)));
    connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ),    d->tbPlay,    SLOT( setOn( bool ) ) );
    connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ),    d->tbLoop,    SLOT( setOn( bool ) ) );
    connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ),   d->tbShuffle, SLOT( setOn( bool ) ) );
    connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ),   this,         SLOT( setPlaylist( bool ) ) );
 
    connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
 //   connect( d->selectedFiles, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) );
 
     setCentralWidget( vbox5 );
 
     Config cfg( "MediaPlayer" );
     readConfig( cfg );
     QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
 //    qDebug("currentList is "+currentPlaylist);
     loadList(DocLnk( currentPlaylist));
-    setCaption("OpiePlayer: "+ currentPlaylist );
+    setCaption(tr("OpiePlayer: ")+ currentPlaylist );
     
     initializeStates();
 }
 
 
 PlayListWidget::~PlayListWidget() {
     Config cfg( "MediaPlayer" );
     writeConfig( cfg );
      
 
     if ( d->current )
   delete d->current;
     delete d;
 }
 
 
 void PlayListWidget::initializeStates() {
 
     d->tbPlay->setOn( mediaPlayerState->playing() );
     d->tbLoop->setOn( mediaPlayerState->looping() );
     d->tbShuffle->setOn( mediaPlayerState->shuffled() );
 //     d->tbFull->setOn( mediaPlayerState->fullscreen() );
 //     d->tbScale->setOn( mediaPlayerState->scaled() );
 //     d->tbScale->setEnabled( mediaPlayerState->fullscreen() );
 //    setPlaylist( mediaPlayerState->playlist() );
      setPlaylist( true);
      d->selectedFiles->first();
 }
 
 
 void PlayListWidget::readConfig( Config& cfg ) {
     cfg.setGroup("PlayList");
     
     int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
     
     for ( int i = 0; i < noOfFiles; i++ ) {
         QString entryName;
         entryName.sprintf( "File%i", i + 1 );
         QString linkFile = cfg.readEntry( entryName );
         DocLnk lnk( linkFile );
         if ( lnk.isValid() )
             d->selectedFiles->addToSelection( lnk );
     }
 }
 
 
 void PlayListWidget::writeConfig( Config& cfg ) const {
     cfg.setGroup("PlayList");
 
     int noOfFiles = 0;
 
     d->selectedFiles->first();
     do {
   const DocLnk *lnk = d->selectedFiles->current();
   if ( lnk ) {
       QString entryName;
       entryName.sprintf( "File%i", noOfFiles + 1 );
       cfg.writeEntry( entryName, lnk->linkFile() );
       // if this link does exist, add it so we have the file
       // next time...
       if ( !QFile::exists( lnk->linkFile() ) ) {
     // the way writing lnks doesn't really check for out
     // of disk space, but check it anyway.
     if ( !lnk->writeLink() ) {
@@ -389,503 +366,576 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
     cfg.writeEntry("NumberOfFiles", noOfFiles );
 
    
 }
 
 
 void PlayListWidget::addToSelection( const DocLnk& lnk ) {
 //    qDebug("add");
     d->setDocumentUsed = FALSE;
     if ( mediaPlayerState->playlist() )
         d->selectedFiles->addToSelection( lnk );
     else
   mediaPlayerState->setPlaying( TRUE );
 }
 
 
 void PlayListWidget::clearList() {
     while ( first() )
   d->selectedFiles->removeSelected();
 }
 
 
 void PlayListWidget::addAllToList() {
     DocLnkSet files;
     Global::findDocuments(&files, "video/*;audio/*");
     QListIterator<DocLnk> dit( files.children() );
     for ( ; dit.current(); ++dit )
         d->selectedFiles->addToSelection( **dit );
 }
 
 
 void PlayListWidget::addAllMusicToList() {
     DocLnkSet files;
     Global::findDocuments(&files, "audio/*");
     QListIterator<DocLnk> dit( files.children() );
     for ( ; dit.current(); ++dit )
         d->selectedFiles->addToSelection( **dit );
 }
 
 
 void PlayListWidget::addAllVideoToList() {
     DocLnkSet files;
     Global::findDocuments(&files, "video/*");
     QListIterator<DocLnk> dit( files.children() );
     for ( ; dit.current(); ++dit )
         d->selectedFiles->addToSelection( **dit );
 }
 
 
 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 "+fileref);
     if(fileref.find("playlist",0,TRUE) == -1) {
         clearList();
         addToSelection( DocLnk( fileref ) );
         d->setDocumentUsed = TRUE;
         mediaPlayerState->setPlaying( FALSE );
         qApp->processEvents();
         mediaPlayerState->setPlaying( TRUE );
         qApp->processEvents();
-        setCaption("OpiePlayer");
+        setCaption(tr("OpiePlayer"));
 
     } else { //is playlist
         clearList();
         loadList(DocLnk(fileref));
         d->selectedFiles->first();
     }
 }
 
 
 void PlayListWidget::setActiveWindow() {
     // When we get raised we need to ensure that it switches views
     char origView = mediaPlayerState->view();
     mediaPlayerState->setView( 'l' ); // invalidate
     mediaPlayerState->setView( origView ); // now switch back
 }
 
 
 void PlayListWidget::useSelectedDocument() {
     d->setDocumentUsed = FALSE;
 }
 
 
 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
 //    qDebug("current");
 //     switch (tabWidget->currentPageIndex()) {
 //          case 0: //playlist
 //          {
           qDebug("playlist");
           if ( mediaPlayerState->playlist() ) {
-		        return d->selectedFiles->current();
+            return d->selectedFiles->current();
           }
           else if ( d->setDocumentUsed && d->current ) {
               return d->current;
           } else {
               return d->files->selected();
           }
 //        }
 //        break;
 //        case 1://audio
 //        {
 //            qDebug("audioView");
 //            Global::findDocuments(&files, "audio/*");
 //            QListIterator<DocLnk> dit( files.children() );
 //            for ( ; dit.current(); ++dit ) {
 //                if( dit.current()->name() == audioView->currentItem()->text(0) && !insanityBool) {
 //                    qDebug("here");
 //                    insanityBool=TRUE;
 //                    return dit;
 //                }
 //            }
 //        }           
 //        break;
 //        case 2: // video
 //        {
 //            qDebug("videoView");
 //            Global::findDocuments(&vFiles, "video/*");
 //            QListIterator<DocLnk> Vdit( vFiles.children() );
 //            for ( ; Vdit.current(); ++Vdit ) {
 //                if( Vdit.current()->name() == videoView->currentItem()->text(0) && !insanityBool) {
 //                    insanityBool=TRUE;
 //                    return Vdit;
 //                }
 //            }
 //        }
 //        break;
 //      };
 //  return 0;
 }
 
 bool PlayListWidget::prev() {
     if ( mediaPlayerState->playlist() ) {
   if ( mediaPlayerState->shuffled() ) {
       const DocLnk *cur = current();
       int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0));
       for ( int i = 0; i < j; i++ ) {
     if ( !d->selectedFiles->next() )
         d->selectedFiles->first();
       }
       if ( cur == current() )
     if ( !d->selectedFiles->next() )
         d->selectedFiles->first();
       return TRUE;
   } else {
       if ( !d->selectedFiles->prev() ) {
     if ( mediaPlayerState->looping() ) {
         return d->selectedFiles->last();
     } else {
         return FALSE;
     }
       }
       return TRUE;
   }
     } else {
   return mediaPlayerState->looping();
     }
 }
 
 
 bool PlayListWidget::next() {
     if ( mediaPlayerState->playlist() ) {
   if ( mediaPlayerState->shuffled() ) {
       return prev();
   } else {
       if ( !d->selectedFiles->next() ) {
     if ( mediaPlayerState->looping() ) {
         return d->selectedFiles->first();
     } else {
         return FALSE;
     }
       }
       return TRUE;
   }
     } else {
   return mediaPlayerState->looping();
     }
 }
 
 
 bool PlayListWidget::first() {
     if ( mediaPlayerState->playlist() )
   return d->selectedFiles->first();
     else
   return mediaPlayerState->looping();
 }
 
 
 bool PlayListWidget::last() {
     if ( mediaPlayerState->playlist() )
   return d->selectedFiles->last();
     else
   return mediaPlayerState->looping();
 }
 
 
 void PlayListWidget::saveList() {
 
     QString filename;
     InputDialog *fileDlg;
-    fileDlg = new InputDialog(this,"Save Playlist",TRUE, 0);
+    fileDlg = new InputDialog(this,tr("Save Playlist"),TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
     if ( d->current )
         delete d->current;
         filename = fileDlg->LineEdit1->text();//+".playlist";
 //        qDebug("saving playlist "+filename+".playlist");
         Config cfg( filename +".playlist");
         writeConfig( cfg );
         if( playLists->selected()->name() == filename) {
 //            qDebug("same name so delete lnk");
             QFile().remove(playLists->selected()->file());
             QFile().remove(playLists->selected()->linkFile());
             playLists->reread();
         }
             
         DocLnk lnk;
 //        lnk.setComment( "");
         lnk.setFile(QDir::homeDirPath()+"/Settings/"+filename+".playlist.conf"); //sets File property
         lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D
         lnk.setIcon("mpegplayer/playlist2");
         lnk.setName( filename); //sets file name
         if(!lnk.writeLink())
             qDebug("Writing doclink did not work");
       }
         Config config( "MediaPlayer" );
         config.writeEntry("CurrentPlaylist",filename);
-        setCaption("OpiePlayer: "+filename);
+        setCaption(tr("OpiePlayer: ")+filename);
         d->selectedFiles->first();
     if(fileDlg)
         delete fileDlg;
 }
 
 void PlayListWidget::loadList( const DocLnk & lnk) {
     QString name= lnk.name();
 //    qDebug("currentList is "+name);
     if( name.length()>1) {
         setCaption("OpiePlayer: "+name);
 //    qDebug("load list "+ name+".playlist");
         clearList();
         Config cfg( name+".playlist");
         readConfig(cfg);
         tabWidget->setCurrentPage(0);
         Config config( "MediaPlayer" );
         config.writeEntry("CurrentPlaylist", name);
         d->selectedFiles->first();
     }
 }
 
 void PlayListWidget::setPlaylist( bool shown ) {
     if ( shown ) 
   d->playListFrame->show();
     else
   d->playListFrame->hide();
 }
 
 void PlayListWidget::setView( char view ) {
     if ( view == 'l' )
   showMaximized();
     else
   hide();
 }
 
 void PlayListWidget::addSelected() {
 
       Config cfg( "MediaPlayer" );
       cfg.setGroup("PlayList");
       QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
       int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
 
       switch (tabWidget->currentPageIndex()) {
         case 0: //playlist
             break;
         case 1: { //audio
             for ( int i = 0; i < noOfFiles; i++ ) {
                 QString entryName;
                 entryName.sprintf( "File%i", i + 1 );
                 QString linkFile = cfg.readEntry( entryName );
                   if( DocLnk( linkFile).name() == audioView->selectedItem()->text(0) ) {
-                      int result= QMessageBox::warning(this,"OpiePlayer",
+                      int result= QMessageBox::warning(this,tr("OpiePlayer"),
                                   tr("This is all ready in your playlist.\nContinue?"),
                                   tr("Yes"),tr("No"),0,0,1);
                       if (result !=0)
                           return;
                   }
             }
             addToSelection( audioView->selectedItem() );
             tabWidget->setCurrentPage(1);
         }           
         break;
         case 2: { // video
             for ( int i = 0; i < noOfFiles; i++ ) {
                 QString entryName;
                 entryName.sprintf( "File%i", i + 1 );
                 QString linkFile = cfg.readEntry( entryName );
                   if( DocLnk( linkFile).name() == videoView->selectedItem()->text(0) ) {
-                      int result= QMessageBox::warning(this,"OpiePlayer",
+                      int result= QMessageBox::warning(this,tr("OpiePlayer"),
                                   tr("This is all ready in your playlist.\nContinue?"),
                                   tr("Yes"),tr("No"),0,0,1);
                       if (result !=0)
                           return;
                   }
             }
             addToSelection( videoView->selectedItem() );
             tabWidget->setCurrentPage(2);
         }
         break;
       };
 }
 
 void PlayListWidget::removeSelected() {
     d->selectedFiles->removeSelected( );
 }
 
-
 void PlayListWidget::playIt( QListViewItem *it) {
 //   d->setDocumentUsed = FALSE;
         mediaPlayerState->setPlaying(TRUE);
 }
 
 void PlayListWidget::addToSelection( QListViewItem *it) {
     d->setDocumentUsed = FALSE;
     
     if(it) {
-//     qDebug("add to selection");
         switch (tabWidget->currentPageIndex()) {
           case 1: {
-//           qDebug("case 1");
               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: {
-//           qDebug("case 2");
               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;
           case 0:
               break;
         };
         tabWidget->setCurrentPage(0);
-//        mediaPlayerState->setPlaying( TRUE );
     }
 }
 
 void PlayListWidget::tabChanged(QWidget *widg) {
 
     switch ( tabWidget->currentPageIndex()) {
       case 0:
       {
           if( !tbDeletePlaylist->isHidden())
               tbDeletePlaylist->hide();
           d->tbRemoveFromList->setEnabled(TRUE);
           d->tbAddToList->setEnabled(FALSE);
       }
       break;
       case 1:
       {
           if( !tbDeletePlaylist->isHidden())
               tbDeletePlaylist->hide();
           d->tbRemoveFromList->setEnabled(FALSE);
           d->tbAddToList->setEnabled(TRUE);
       }
       break;
       case 2:
       {
           if( !tbDeletePlaylist->isHidden())
               tbDeletePlaylist->hide();
           d->tbRemoveFromList->setEnabled(FALSE);
           d->tbAddToList->setEnabled(TRUE);
       }
       break;
       case 3:
       {
           if( tbDeletePlaylist->isHidden())
               tbDeletePlaylist->show();
           playLists->reread();
       }
       break;
     };
 }
 
 
-/*
-  play button is pressed*/
+
 void PlayListWidget::btnPlay(bool b) {
+
 //    mediaPlayerState->setPlaying(b);
     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);
-		  d->selectedFiles->unSelect();
+      d->selectedFiles->unSelect();
 //            mediaPlayerState->setPlaying(FALSE);
       }
       break;
       case 2:
       {
           addToSelection( videoView->selectedItem() );
           mediaPlayerState->setPlaying(b);
           qApp->processEvents();
           d->selectedFiles->removeSelected( );
           tabWidget->setCurrentPage(2);
-		  d->selectedFiles->unSelect();
+      d->selectedFiles->unSelect();
 //            mediaPlayerState->setPlaying(FALSE);
       }
       break;
     };
-
-
-
-    
 }
 
 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 1: // Cancel
             break;
     };
 
 }
 
 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.insertSeparator();
+    m.insertItem( tr( "Properties" ), this, SLOT( listDelete() ));
     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;
     };
 
 }
+
+void PlayListWidget::listDelete() {
+      Config cfg( "MediaPlayer" );
+      cfg.setGroup("PlayList");
+      QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
+      QString file;
+      int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
+    switch ( tabWidget->currentPageIndex()) {
+      case 0:
+          break;
+      case 1:
+      {
+          file = audioView->selectedItem()->text(0);
+//           Global::findDocuments(&files, "audio/*");
+//           AppLnkSet appFiles;
+          QListIterator<DocLnk> dit( files.children() );
+          for ( ; dit.current(); ++dit ) {
+              if( dit.current()->name() == file) {
+                  qDebug(file);
+                  LnkProperties prop( dit.current() );
+//  connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
+                  prop.showMaximized();
+                  prop.exec();
+              }
+          }
+     populateAudioView();
+      }
+      break;
+      case 2:
+      {
+//           file = videoView->selectedItem()->text(0);
+//           for ( int i = 0; i < noOfFiles; i++ ) {
+//               QString entryName;
+//               entryName.sprintf( "File%i", i + 1 );
+//               QString linkFile = cfg.readEntry( entryName );
+//                   AppLnk lnk( AppLnk(linkFile));
+//               if( lnk.name() == file ) {
+//                   LnkProperties prop( &lnk);
+// //  connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
+//                   prop.showMaximized();
+//                   prop.exec();
+//               }
+//            }
+      }
+          break;
+    };
+}
+
+void PlayListWidget::populateAudioView() {
+//     if(files)
+//         files.~DocLnkSet();
+    Global::findDocuments(&files, "audio/*");
+    QListIterator<DocLnk> dit( files.children() );
+    audioView->clear();
+    QString storage;
+    for ( ; dit.current(); ++dit ) {
+        QListViewItem * newItem;
+        if(dit.current()->file().find("/mnt/cf") != -1 ) storage=tr("CF");
+        else if(dit.current()->file().find("/mnt/hda") != -1 ) storage=tr("CF");
+        else if(dit.current()->file().find("/mnt/card") != -1 ) storage=tr("SD");
+        else storage=tr("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" ));
+        }
+    }
+}
+
+void PlayListWidget::populateVideoView() {
+    Global::findDocuments(&vFiles, "video/*");
+    QListIterator<DocLnk> Vdit( vFiles.children() );
+    videoView->clear();
+     QString storage;
+    for ( ; Vdit.current(); ++Vdit ) {
+        if( Vdit.current()->file().find("/mnt/cf") != -1 ) storage=tr("CF");
+        else if( Vdit.current()->file().find("/mnt/hda") != -1 ) storage=tr("CF");
+        else if( Vdit.current()->file().find("/mnt/card") != -1 ) storage=tr("SD");
+        else storage=tr("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" ));
+        }
+    }
+}
diff --git a/core/multimedia/opieplayer/playlistwidget.h b/core/multimedia/opieplayer/playlistwidget.h
index 10a42df..186ca1b 100644
--- a/core/multimedia/opieplayer/playlistwidget.h
+++ b/core/multimedia/opieplayer/playlistwidget.h
@@ -1,108 +1,112 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** 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.
 **
 **********************************************************************/
 #ifndef PLAY_LIST_WIDGET_H
 #define PLAY_LIST_WIDGET_H
 
 #include <qmainwindow.h>
 #include <qpe/applnk.h>
 #include <qtabwidget.h>
 #include <qpe/fileselector.h>
 #include <qpushbutton.h>
 
 /* #include <qtimer.h> */
 
 
 class PlayListWidgetPrivate;
 class Config;
 class QListViewItem;
 class QListView;
 class QPoint;
 class QAction;
 class QLabel;
 
 class PlayListWidget : public QMainWindow {
     Q_OBJECT
 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;
     bool fromSetDocument;
     bool insanityBool;
     QString setDocFileRef;
     // retrieve the current playlist entry (media file link)
     const DocLnk *current();
     void useSelectedDocument();
 /*     QTimer    * menuTimer; */
     FileSelector*  playLists;
     QPushButton *tbDeletePlaylist;
 public slots:
+    bool first();
+    bool last();
+    bool next();
+    bool prev();
+/*     void setFullScreen(); */
+/*     void setScaled(); */
+protected:
+/*     void contentsMousePressEvent( QMouseEvent * e ); */
+/*     void contentsMouseReleaseEvent( QMouseEvent * e ); */
+
+private:
+    void initializeStates();
+    void readConfig( Config& cfg );
+    void writeConfig( Config& cfg ) const;
+    PlayListWidgetPrivate *d; // Private implementation data
+    void populateAudioView();
+    void populateVideoView();
+private slots:
     void setDocument( const QString& fileref );
     void addToSelection( const DocLnk& ); // Add a media file to the playlist
     void addToSelection( QListViewItem* ); // Add a media file to the playlist
     void setActiveWindow(); // need to handle this to show the right view
     void setPlaylist( bool ); // Show/Hide the playlist
     void setView( char );
     void clearList(); 
     void addAllToList(); 
     void addAllMusicToList(); 
     void addAllVideoToList(); 
     void saveList();  // Save the playlist
     void loadList( const DocLnk &);  // Load a playlist
     void playIt( QListViewItem *);
 
     void btnPlay(bool);
     void deletePlaylist();
-    bool first();
-    bool last();
-    bool next();
-    bool prev();
     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:
-/*     void contentsMousePressEvent( QMouseEvent * e ); */
-/*     void contentsMouseReleaseEvent( QMouseEvent * e ); */
-
-private:
-    void initializeStates();
-    void readConfig( Config& cfg );
-    void writeConfig( Config& cfg ) const;
-    PlayListWidgetPrivate *d; // Private implementation data
-
+    void listDelete();
+        
 protected slots:
 /*     void cancelMenuTimer(); */
 /*     void showFileMenu(); */
 
 
 };
 
 
 #endif // PLAY_LIST_WIDGET_H