1 files changed, 58 insertions, 40 deletions

diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 218fd49..250645c 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -2,80 +2,82 @@
 ** 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/storage.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 <qregexp.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 {
@@ -88,154 +90,154 @@ 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;
     fromSetDocument = FALSE;
     insanityBool=FALSE;
 //    menuTimer = new QTimer( this ,"menu timer"),
 //     connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) );
 
     setBackgroundMode( PaletteButton );
 
     setCaption( tr("OpiePlayer") );
-    setIcon( Resource::loadPixmap( "MPEGPlayer" ) );
+    setIcon( Resource::loadPixmap( "opieplayer/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->tbPlayCurList =  new ToolButton( bar, tr( "play List" ), "mpegplayer/play_current_list",
+//      d->tbPlayCurList =  new ToolButton( bar, tr( "play List" ), "opieplayer/play_current_list",
 //                                        this , SLOT( addSelected()) );
     tbDeletePlaylist = new QPushButton( Resource::loadIconSet("trash"),"",bar,"close");
     tbDeletePlaylist->setFlat(TRUE);
     tbDeletePlaylist->setFixedSize(20,20);
     connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist()));
     
-    d->tbAddToList =  new ToolButton( bar, tr( "Add to Playlist" ), "mpegplayer/add_to_playlist",
+    d->tbAddToList =  new ToolButton( bar, tr( "Add to Playlist" ), "opieplayer/add_to_playlist",
                                       this , SLOT(addSelected()) );
-    d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), "mpegplayer/remove_from_playlist",
+    d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), "opieplayer/remove_from_playlist",
                                           this , SLOT(removeSelected()) );
-//    d->tbPlay    = new ToolButton( bar, tr( "Play" ), "mpegplayer/play", /*this */mediaPlayerState , SLOT(setPlaying(bool) /* btnPlay() */), TRUE );
-    d->tbPlay    = new ToolButton( bar, tr( "Play" ), "mpegplayer/play",
+//    d->tbPlay    = new ToolButton( bar, tr( "Play" ), "opieplayer/play", /*this */mediaPlayerState , SLOT(setPlaying(bool) /* btnPlay() */), TRUE );
+    d->tbPlay    = new ToolButton( bar, tr( "Play" ), "opieplayer/play",
                                    this , SLOT( btnPlay(bool) ), TRUE );
-    d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"mpegplayer/shuffle",
+    d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer/shuffle",
                                    mediaPlayerState, SLOT(setShuffled(bool)), TRUE );
-    d->tbLoop    = new ToolButton( bar, tr( "Loop" ),"mpegplayer/loop",
+    d->tbLoop    = new ToolButton( bar, tr( "Loop" ),"opieplayer/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() ) );
 //     pmPlayList->insertSeparator(-1);
     new MenuItem( pmPlayList, tr( "Save PlayList" ), this, SLOT( saveList() ) );
     pmPlayList->insertSeparator(-1);
     new MenuItem( pmPlayList, tr( "Open File or URL" ), this,SLOT( openFile() ) );
 
     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);
+    scaleButton = new QAction(tr("Scale"), Resource::loadPixmap("opieplayer/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()) );
+     new ToolButton( vbox1, tr( "Move Up" ),   "opieplayer/up",   d->selectedFiles, SLOT(moveSelectedUp()) );
+     new ToolButton( vbox1, tr( "Remove" ),    "opieplayer/cut",  d->selectedFiles, SLOT(removeSelected()) );
+     new ToolButton( vbox1, tr( "Move Down" ), "opieplayer/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( 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);
 //     audioView->setMultiSelection( TRUE );
 //     audioView->setSelectionMode( QListView::Extended);
     
     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
      populateAudioView();
 // videowidget
      
     QWidget *vTab;
     vTab = new QWidget( tabWidget, "vTab" );
     videoView = new QListView( vTab, "Videoview" );
     videoView->setMinimumSize(233,260);
     
     videoView->addColumn(tr("Title"),140);
@@ -400,72 +402,73 @@ void PlayListWidget::addAllToList() {
     DocLnkSet filesAll;
     Global::findDocuments(&filesAll, "video/*;audio/*");
     QListIterator<DocLnk> Adit( filesAll.children() );
     for ( ; Adit.current(); ++Adit )
         d->selectedFiles->addToSelection( **Adit );
 }
 
 
 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() {
     QListIterator<DocLnk> dit( vFiles.children() );
     for ( ; dit.current(); ++dit )
         d->selectedFiles->addToSelection( **dit );
 }
 
 
 void PlayListWidget::setDocument(const QString& fileref) {
     qDebug(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("m3u",0,TRUE) != -1) { //is m3u
-        clearList();
-        addToSelection( DocLnk( fileref ) );
-        d->setDocumentUsed = TRUE;
-        d->selectedFiles->first();
-        qApp->processEvents();
-    }
-    else if(fileref.find("playlist",0,TRUE) != -1) {//is playlist
+//     if(fileref.find("m3u",0,TRUE) != -1) { //is m3u
+//         clearList();
+//         addToSelection( DocLnk( fileref ) );
+//         d->setDocumentUsed = TRUE;
+//         d->selectedFiles->first();
+//         qApp->processEvents();
+//     }
+//    else
+    if(fileref.find("playlist",0,TRUE) != -1) {//is playlist
         clearList();
         loadList(DocLnk(fileref));
         d->selectedFiles->first();
     } else { 
         clearList();
         addToSelection( DocLnk( fileref ) );
         d->setDocumentUsed = TRUE;
         mediaPlayerState->setPlaying( FALSE );
         qApp->processEvents();
         mediaPlayerState->setPlaying( TRUE );
         qApp->processEvents();
         setCaption(tr("OpiePlayer"));
     }
 }
 
 
 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) {
@@ -590,65 +593,65 @@ bool PlayListWidget::last() {
     else
         return mediaPlayerState->looping();
 }
 
 
 void PlayListWidget::saveList() {
 
     QString filename;
     InputDialog *fileDlg;
     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 );
 
 //             qDebug("same name so delete lnk??");
 //         if( playLists->selected()->name() == filename) {
 
 //             qDebug("same name so delete lnk");
 //             QFile().remove(playLists->selected()->file());
 //             QFile().remove(playLists->selected()->linkFile());
 //             playLists->reread();
 //         }
 //        qDebug("new doclnk");            
         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.setIcon("opieplayer/playlist2");
         lnk.setName( filename); //sets file name
 //        qDebug(filename);
         if(!lnk.writeLink())
             qDebug("Writing doclink did not work");
       }
         Config config( "OpiePlayer" );
         config.writeEntry("CurrentPlaylist",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( "OpiePlayer" );
         config.writeEntry("CurrentPlaylist", name);
 //        d->selectedFiles->first();
     }
     
 }
 
@@ -917,87 +920,102 @@ void PlayListWidget::listDelete() {
 //                   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();
     StorageInfo storageInfo;
     const QList<FileSystem> &fs = storageInfo.fileSystems();
 
     Global::findDocuments(&files, "audio/*");
     QListIterator<DocLnk> dit( files.children() );
     QListIterator<FileSystem> it ( fs );
     audioView->clear();
     QString storage;
     for ( ; dit.current(); ++dit ) {
         for( ; it.current(); ++it ){
             const QString name = (*it)->name();
             const QString path = (*it)->path();
             if(dit.current()->file().find(path) != -1 ) storage=name;
         }
 
         QListViewItem * newItem;
         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" ));
+            newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/musicfile" ));
         }
     }
 }
 
 void PlayListWidget::populateVideoView() {
     StorageInfo storageInfo;
     const QList<FileSystem> &fs = storageInfo.fileSystems();
 
     Global::findDocuments(&vFiles, "video/*");
     QListIterator<DocLnk> Vdit( vFiles.children() );
     QListIterator<FileSystem> it ( fs );
     videoView->clear();
     QString storage;
     for ( ; Vdit.current(); ++Vdit ) {
         for( ; it.current(); ++it ){
             const QString name = (*it)->name();
             const QString path = (*it)->path();
             if( Vdit.current()->file().find(path) != -1 ) storage=name;
         }
 
         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" ));
+            newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/videofile" ));
         }
     }
 }
 
 void PlayListWidget::openFile() {
-    QString filename;
+    QString filename, name;
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         filename = fileDlg->LineEdit1->text();
+
+//         InputDialog *fileDlg2;
+//         fileDlg2 = new InputDialog(this,tr("Name"),TRUE, 0);
+//         fileDlg2->exec();
+//         if( fileDlg2->result() == 1 ) {
+//             name = fileDlg2->LineEdit1->text();
+//         }
+//http://205.188.234.129:8030
+        qDebug(filename);
+        DocLnk lnk;
+//     if(filename.left(7) == "http://")
+//         name=  filename.right(filename.length()-filename.find("http://")-7);
+//     else name = filename;
+//     qDebug("name is "+name);
+//     lnk.setComment(filename);
+        lnk.setName(filename); //sets file name
+        if(filename.right(1) != "/" && filename.right(3) != "mp3" && filename.right(3) != "MP3")
+            filename += "/";
+        lnk.setFile(filename); //sets File property
+
+        lnk.setType("audio/x-mpegurl");
+        lnk.setExec("opieplayer");
+        lnk.setIcon("opieplayer/MPEGPlayer");
+
+        if(!lnk.writeLink()) 
+            qDebug("Writing doclink did not work");
+        d->selectedFiles->addToSelection(  lnk);
+//     if(fileDlg2)
+//         delete fileDlg2;
     }
-    qDebug(filename);
-    DocLnk lnk;
-    QString name =  filename.right(filename.length()-filename.find("http://")-7);
-    qDebug(name);
-    lnk.setName( name); //sets file name
-//    lnk.setComment();
-    lnk.setFile(filename); //sets File property
-// problem is, the launcher sees this as a broken link and does not display it :(
-    lnk.setType("audio/x-mpegurl");
-    lnk.setExec("opieplayer");
-    lnk.setIcon("opieplayer/MPEGPlayer");
-
-    if(!lnk.writeLink()) 
-        qDebug("Writing doclink did not work");
-     d->selectedFiles->addToSelection(  lnk);
+
     if(fileDlg)
-    delete fileDlg;
+        delete fileDlg;
 }