author | bipolar <bipolar> | 2002-03-09 03:10:23 (UTC) |
---|---|---|
committer | bipolar <bipolar> | 2002-03-09 03:10:23 (UTC) |
commit | 3d03d0e3f679578080bbbf7d8b7f9eba1b9560db (patch) (side-by-side diff) | |
tree | 8ff01a8fad92869e97ba7983d16bcf7de531d69f /core/multimedia | |
parent | cb1d684a68565ff70fedd184eedf1ef4f2b71079 (diff) | |
download | opie-3d03d0e3f679578080bbbf7d8b7f9eba1b9560db.zip opie-3d03d0e3f679578080bbbf7d8b7f9eba1b9560db.tar.gz opie-3d03d0e3f679578080bbbf7d8b7f9eba1b9560db.tar.bz2 |
ljp:added playlist in caption, startup playlist, and saving currentplaylist to config file
something like that
-rw-r--r-- | core/multimedia/opieplayer/main.cpp | 2 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 48 |
2 files changed, 37 insertions, 13 deletions
diff --git a/core/multimedia/opieplayer/main.cpp b/core/multimedia/opieplayer/main.cpp index 4f43ff6..18cd7a6 100644 --- a/core/multimedia/opieplayer/main.cpp +++ b/core/multimedia/opieplayer/main.cpp @@ -47,7 +47,7 @@ int main(int argc, char **argv) { loopControl = &lc; MediaPlayer mp( 0, "mediaPlayer" ); - pl.setCaption( MediaPlayer::tr("OpiePlayer") ); +// pl.setCaption( MediaPlayer::tr("OpiePlayer") ); a.showMainDocumentWidget(&pl); return a.exec(); diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index cb58888..9969526 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp @@ -18,7 +18,6 @@ ** **********************************************************************/ // code added by L. J. Potter Sat 03-02-2002 06:17:54 - #include <qpe/qpemenubar.h> #include <qpe/qpetoolbar.h> #include <qpe/fileselector.h> @@ -256,6 +255,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) playLists = new FileSelector( "playlist/plain", LTab, "fileselector" , FALSE, FALSE); //buggy playLists->setMinimumSize(233,260);; tabWidget->insertTab(LTab,"Lists"); + connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) ); // connect( playLists, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) ); @@ -264,10 +264,10 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold ); - 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( 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 *) ) ); @@ -288,6 +288,10 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) Config cfg( "MediaPlayer" ); readConfig( cfg ); + QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); +// qDebug("currentList is "+currentPlaylist); + loadList(DocLnk( currentPlaylist)); + setCaption("OpiePlayer: "+ currentPlaylist ); initializeStates(); } @@ -297,6 +301,7 @@ PlayListWidget::~PlayListWidget() { Config cfg( "MediaPlayer" ); writeConfig( cfg ); + if ( d->current ) delete d->current; delete d; @@ -314,7 +319,6 @@ void PlayListWidget::initializeStates() { // setPlaylist( mediaPlayerState->playlist() ); setPlaylist( true); d->selectedFiles->first(); - } @@ -372,7 +376,7 @@ void PlayListWidget::writeConfig( Config& cfg ) const { void PlayListWidget::addToSelection( const DocLnk& lnk ) { - qDebug("add"); +// qDebug("add"); d->setDocumentUsed = FALSE; if ( mediaPlayerState->playlist() ) d->selectedFiles->addToSelection( lnk ); @@ -419,6 +423,7 @@ void PlayListWidget::setDocument(const QString& fileref) { QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) ); return; } +// qDebug("setDocument"); if(fileref.find("playlist",0,TRUE) == -1) { addToSelection( DocLnk( fileref ) ); d->setDocumentUsed = TRUE; @@ -536,10 +541,19 @@ void PlayListWidget::saveList() { fileDlg=new InputDialog(this,"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"); +// 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 @@ -549,7 +563,10 @@ void PlayListWidget::saveList() { if(!lnk.writeLink()) qDebug("Writing doclink did not work"); } - + Config config( "MediaPlayer" ); + config.writeEntry("CurrentPlaylist",filename); + setCaption("OpiePlayer: "+filename); + d->selectedFiles->first(); if(fileDlg) delete fileDlg; @@ -557,12 +574,19 @@ void PlayListWidget::saveList() { void PlayListWidget::loadList( const DocLnk & lnk) { - qDebug("load list "+ lnk.name()+".playlist"); + QString name= lnk.name(); +// qDebug("currentList is "+name); + if( name.length()>1) { + setCaption("OpiePlayer: "+name); +// qDebug("load list "+ name+".playlist"); clearList(); - Config cfg( lnk.name()+".playlist"); + Config cfg( name+".playlist"); readConfig(cfg); tabWidget->setCurrentPage(0); - setCaption("OpiePlayer: "+lnk.name()); + Config config( "MediaPlayer" ); + config.writeEntry("CurrentPlaylist", name); + d->selectedFiles->first(); + } } |