-rw-r--r-- | core/multimedia/opieplayer/playlistselection.cpp | 15 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistselection.h | 1 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 25 |
3 files changed, 21 insertions, 20 deletions
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp index d70df51..d6aff66 100644 --- a/core/multimedia/opieplayer/playlistselection.cpp +++ b/core/multimedia/opieplayer/playlistselection.cpp @@ -47,16 +47,18 @@ private: }; PlayListSelection::PlayListSelection( QWidget *parent, const char *name ) : QListView( parent, name ) { + qDebug("starting playlistselector"); // #ifdef USE_PLAYLIST_BACKGROUND - setStaticBackground( TRUE ); +// setStaticBackground( TRUE ); // setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/background" ) ); - setBackgroundPixmap( Resource::loadPixmap( "opielogo" ) ); + +// setBackgroundPixmap( Resource::loadPixmap( "opielogo" ) ); // #endif // addColumn("Title",236); // setAllColumnsShowFocus( TRUE ); addColumn( tr( "Playlist Selection" ) ); header()->hide(); setSorting( -1, FALSE ); @@ -66,17 +68,18 @@ PlayListSelection::PlayListSelection( QWidget *parent, const char *name ) PlayListSelection::~PlayListSelection() { } // #ifdef USE_PLAYLIST_BACKGROUND void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) { - p->fillRect( r, QBrush( white ) ); +// 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 void PlayListSelection::contentsMouseMoveEvent( QMouseEvent *event ) { if ( event->state() == QMouseEvent::LeftButton ) { diff --git a/core/multimedia/opieplayer/playlistselection.h b/core/multimedia/opieplayer/playlistselection.h index 57e10f1..b0d249c 100644 --- a/core/multimedia/opieplayer/playlistselection.h +++ b/core/multimedia/opieplayer/playlistselection.h @@ -29,13 +29,12 @@ class PlayListSelection : public QListView { Q_OBJECT public: PlayListSelection( QWidget *parent, const char *name=0 ); ~PlayListSelection(); const DocLnk *current(); // retrieve the current playlist entry (media file link) - public slots: void addToSelection( const DocLnk & ); // Add a media file to the playlist void removeSelected(); // Remove a media file from the playlist void moveSelectedUp(); // Move the media file up the playlist so it is played earlier void moveSelectedDown(); // Move the media file down the playlist so it is played later bool prev(); diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index a6202bc..3171a84 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp @@ -415,19 +415,27 @@ void PlayListWidget::addAllVideoToList() { void PlayListWidget::setDocument(const QString& fileref) { if ( fileref.isNull() ) { QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) ); return; } + 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 { + loadList(DocLnk(fileref)); + d->selectedFiles->first(); +// mediaPlayerState->setPlaying( TRUE ); +// mediaPlayerState->setPlaying( FALSE ); + + } } void PlayListWidget::setActiveWindow() { // When we get raised we need to ensure that it switches views char origView = mediaPlayerState->view(); @@ -526,36 +534,27 @@ void PlayListWidget::saveList() { InputDialog *fileDlg; fileDlg=new InputDialog(this,"Save Playlist",TRUE, 0); fileDlg->exec(); if( fileDlg->result() == 1 ) { filename = fileDlg->LineEdit1->text();//+".playlist"; qDebug("saving playlist "+filename+".playlist"); - -// DocLnk *lnk; -// lnk.setName( filename); //sets file name -// // lnk.setComment(title); -// lnk.setFile( filename+".playlist"); //sets File property -// lnk.setType("player/plain");// hey is this a REGISTERED mime type?!?!? ;D -// lnk.setIcon("MPEGPlayer"); -// if(!lnk.writeLink()) -// qDebug("Writing doclink did not work"); - Config cfg( filename +".playlist"); writeConfig( cfg ); - } DocLnk lnk; lnk.setName( filename); //sets file name -// lnk.setComment(title); +// lnk.setComment( ""); lnk.setFile(QPEApplication::qpeDir()+"Settings/"+filename+".playlist.conf"); //sets File property lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D - lnk.setIcon("MPEGPlayer"); + lnk.setIcon("mpegplayer/playlist2"); if(!lnk.writeLink()) qDebug("Writing doclink did not work"); + } if(fileDlg) delete fileDlg; + } void PlayListWidget::loadList( const DocLnk & lnk) { qDebug("load list "+ lnk.name()+".playlist"); clearList(); |