Diffstat (limited to 'core/multimedia/opieplayer/playlistwidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 180 |
1 files changed, 105 insertions, 75 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index 9969526..524747e 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp @@ -102,12 +102,13 @@ public: PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) : QMainWindow( parent, name, fl ) { d = new PlayListWidgetPrivate; d->setDocumentUsed = FALSE; d->current = NULL; + fromSetDocument = FALSE; // menuTimer = new QTimer( this ,"menu timer"), // connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) ); setBackgroundMode( PaletteButton ); setCaption( tr("OpiePlayer") ); @@ -171,27 +172,33 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) tabWidget = new QTabWidget( hbox6, "tabWidget" ); tabWidget->setTabShape(QTabWidget::Triangular); QWidget *pTab; pTab = new QWidget( tabWidget, "pTab" ); - playlistView = new QListView( pTab, "Videoview" ); - playlistView->setMinimumSize(236,260); +// 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 @@ -201,13 +208,20 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) 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); + audioView->setAllColumnsShowFocus(TRUE); tabWidget->insertTab(aTab,"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; @@ -229,12 +243,16 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) videoView->addColumn("Title",150); videoView->addColumn("Size",45); videoView->addColumn("Media",35); 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"); Global::findDocuments(&vFiles, "video/*"); QListIterator<DocLnk> Vdit( vFiles.children() ); for ( ; Vdit.current(); ++Vdit ) { @@ -258,14 +276,12 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) 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 - 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 *)) ); @@ -416,31 +432,32 @@ void PlayListWidget::addAllVideoToList() { 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"); +// qDebug("setDocument "+fileref); if(fileref.find("playlist",0,TRUE) == -1) { + clearList(); addToSelection( DocLnk( fileref ) ); d->setDocumentUsed = TRUE; - qApp->processEvents(); mediaPlayerState->setPlaying( FALSE ); qApp->processEvents(); mediaPlayerState->setPlaying( TRUE ); - d->selectedFiles->removeSelected( ); - } else { + qApp->processEvents(); + setCaption("OpiePlayer"); + + } else { //is playlist + clearList(); 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 @@ -452,25 +469,59 @@ void PlayListWidget::setActiveWindow() { void PlayListWidget::useSelectedDocument() { d->setDocumentUsed = FALSE; } -const DocLnk *PlayListWidget::current() { +const DocLnk *PlayListWidget::current() { // this is fugly -// qDebug("in Playlist widget ::current"); +// 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 + switch (tabWidget->currentPageIndex()) { + case 0: //playlist + { if ( mediaPlayerState->playlist() ) { return d->selectedFiles->current(); } else if ( d->setDocumentUsed && d->current ) { return d->current; } else { return d->files->selected(); } } - + break; + case 1: { //audio + Global::findDocuments(&files, "audio/*"); + QListIterator<DocLnk> dit( files.children() ); + for ( ; dit.current(); ++dit ) { + if( dit.current()->name() == audioView->currentItem()->text(0)) + return dit; + } + } + break; + case 2: { // video + Global::findDocuments(&vFiles, "video/*"); + QListIterator<DocLnk> Vdit( vFiles.children() ); + for ( ; Vdit.current(); ++Vdit ) { + if( Vdit.current()->name() == videoView->currentItem()->text(0)) + return Vdit; + } + } + break; + }; +} bool PlayListWidget::prev() { if ( mediaPlayerState->playlist() ) { if ( mediaPlayerState->shuffled() ) { const DocLnk *cur = current(); int j = 1 + (int)(97.0 * rand() / (RAND_MAX + 1.0)); @@ -566,16 +617,14 @@ void PlayListWidget::saveList() { Config config( "MediaPlayer" ); config.writeEntry("CurrentPlaylist",filename); setCaption("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"); @@ -586,21 +635,19 @@ void PlayListWidget::loadList( const DocLnk & lnk) { 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(); } @@ -701,84 +748,67 @@ void PlayListWidget::tabChanged(QWidget *widg) { playLists->reread(); } break; }; } -/* - list is right clicked*/ -void PlayListWidget::fauxPlay(QListViewItem *it) { - switch (tabWidget->currentPageIndex()) { - case 0: //playlist - break; - case 1: { //audio - QListIterator<DocLnk> dit( files.children() ); - for ( ; dit.current(); ++dit ) { -// qDebug(dit.current()->name()); - if( dit.current()->name() == it->text(0)) { - d->selectedFiles->addToSelection( **dit ); - } - } +/* + play button is pressed*/ +void PlayListWidget::btnPlay(bool b) { + mediaPlayerState->setPlaying(b); } + +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 2: { // video - QListIterator<DocLnk> dit( vFiles.children() ); - for ( ; dit.current(); ++dit ) { -// qDebug(dit.current()->name()); - if( dit.current()->name() == it->text(0)) { - d->selectedFiles->addToSelection( **dit ); - } - } - } + case 1: // Cancel break; }; - mediaPlayerState->setPlaying( TRUE ); -// tabWidget->setCurrentPage(0); - d->selectedFiles->removeSelected(); + } -/* - play button is pressed*/ -void PlayListWidget::btnPlay(bool b) { // this is fugly - switch ( tabWidget->currentPageIndex()) { - case 0: +void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint& point, int i) { - mediaPlayerState->setPlaying(b); - } - break; + switch (mouse) { case 1: - { - addToSelection( audioView->selectedItem() ); - mediaPlayerState->setPlaying(b); - qApp->processEvents(); - d->selectedFiles->removeSelected( ); - tabWidget->setCurrentPage(1); - } break; - case 2: - { - addToSelection( videoView->selectedItem() ); - mediaPlayerState->setPlaying(b); - qApp->processEvents(); - d->selectedFiles->removeSelected( ); - tabWidget->setCurrentPage(2); + 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.exec( QCursor::pos() ); } 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(); +void PlayListWidget::playSelected() +{ + btnPlay( TRUE); +} + +void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const QPoint& point, int i) +{ + switch (mouse) { + case 1: break; - case 1: // Cancel + 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; }; } |