-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 | |||
@@ -41,48 +41,51 @@ public: | |||
41 | }; | 41 | }; |
42 | 42 | ||
43 | const DocLnk *file() const { return fl; } | 43 | const DocLnk *file() const { return fl; } |
44 | 44 | ||
45 | private: | 45 | private: |
46 | const DocLnk *fl; | 46 | const DocLnk *fl; |
47 | }; | 47 | }; |
48 | 48 | ||
49 | 49 | ||
50 | PlayListSelection::PlayListSelection( QWidget *parent, const char *name ) | 50 | PlayListSelection::PlayListSelection( QWidget *parent, const char *name ) |
51 | : QListView( parent, name ) | 51 | : QListView( parent, name ) |
52 | { | 52 | { |
53 | qDebug("starting playlistselector"); | ||
53 | // #ifdef USE_PLAYLIST_BACKGROUND | 54 | // #ifdef USE_PLAYLIST_BACKGROUND |
54 | setStaticBackground( TRUE ); | 55 | // setStaticBackground( TRUE ); |
55 | // setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/background" ) ); | 56 | // setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/background" ) ); |
56 | setBackgroundPixmap( Resource::loadPixmap( "opielogo" ) ); | 57 | |
58 | // setBackgroundPixmap( Resource::loadPixmap( "opielogo" ) ); | ||
57 | // #endif | 59 | // #endif |
58 | // addColumn("Title",236); | 60 | // addColumn("Title",236); |
59 | // setAllColumnsShowFocus( TRUE ); | 61 | // setAllColumnsShowFocus( TRUE ); |
60 | addColumn( tr( "Playlist Selection" ) ); | 62 | addColumn( tr( "Playlist Selection" ) ); |
61 | header()->hide(); | 63 | header()->hide(); |
62 | setSorting( -1, FALSE ); | 64 | setSorting( -1, FALSE ); |
63 | } | 65 | } |
64 | 66 | ||
65 | 67 | ||
66 | PlayListSelection::~PlayListSelection() { | 68 | PlayListSelection::~PlayListSelection() { |
67 | } | 69 | } |
68 | 70 | ||
69 | 71 | ||
70 | // #ifdef USE_PLAYLIST_BACKGROUND | 72 | // #ifdef USE_PLAYLIST_BACKGROUND |
71 | void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) { | 73 | void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) { |
72 | p->fillRect( r, QBrush( white ) ); | 74 | // qDebug("drawBackground"); |
75 | // p->fillRect( r, QBrush( white ) ); | ||
73 | // QImage logo = Resource::loadImage( "mpegplayer/background" ); | 76 | // QImage logo = Resource::loadImage( "mpegplayer/background" ); |
74 | QImage logo = Resource::loadImage( "opielogo" ); | 77 | // // QImage logo = Resource::loadImage( "opielogo" ); |
75 | if ( !logo.isNull() ) | 78 | // if ( !logo.isNull() ) |
76 | p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo ); | 79 | // p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo ); |
77 | } | 80 | } |
78 | // #endif | 81 | // #endif |
79 | 82 | ||
80 | 83 | ||
81 | void PlayListSelection::contentsMouseMoveEvent( QMouseEvent *event ) { | 84 | void PlayListSelection::contentsMouseMoveEvent( QMouseEvent *event ) { |
82 | if ( event->state() == QMouseEvent::LeftButton ) { | 85 | if ( event->state() == QMouseEvent::LeftButton ) { |
83 | QListViewItem *currentItem = selectedItem(); | 86 | QListViewItem *currentItem = selectedItem(); |
84 | QListViewItem *itemUnder = itemAt( QPoint( event->pos().x(), event->pos().y() - contentsY() ) ); | 87 | QListViewItem *itemUnder = itemAt( QPoint( event->pos().x(), event->pos().y() - contentsY() ) ); |
85 | if ( currentItem && currentItem->itemAbove() == itemUnder ) | 88 | if ( currentItem && currentItem->itemAbove() == itemUnder ) |
86 | moveSelectedUp(); | 89 | moveSelectedUp(); |
87 | else if ( currentItem && currentItem->itemBelow() == itemUnder ) | 90 | else if ( currentItem && currentItem->itemBelow() == itemUnder ) |
88 | moveSelectedDown(); | 91 | moveSelectedDown(); |
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 | |||
@@ -23,25 +23,24 @@ | |||
23 | #include <qlist.h> | 23 | #include <qlist.h> |
24 | #include <qlistview.h> | 24 | #include <qlistview.h> |
25 | #include <qpe/applnk.h> | 25 | #include <qpe/applnk.h> |
26 | 26 | ||
27 | 27 | ||
28 | class PlayListSelection : public QListView { | 28 | class PlayListSelection : public QListView { |
29 | Q_OBJECT | 29 | Q_OBJECT |
30 | public: | 30 | public: |
31 | PlayListSelection( QWidget *parent, const char *name=0 ); | 31 | PlayListSelection( QWidget *parent, const char *name=0 ); |
32 | ~PlayListSelection(); | 32 | ~PlayListSelection(); |
33 | 33 | ||
34 | const DocLnk *current(); // retrieve the current playlist entry (media file link) | 34 | const DocLnk *current(); // retrieve the current playlist entry (media file link) |
35 | |||
36 | public slots: | 35 | public slots: |
37 | void addToSelection( const DocLnk & ); // Add a media file to the playlist | 36 | void addToSelection( const DocLnk & ); // Add a media file to the playlist |
38 | void removeSelected(); // Remove a media file from the playlist | 37 | void removeSelected(); // Remove a media file from the playlist |
39 | void moveSelectedUp(); // Move the media file up the playlist so it is played earlier | 38 | void moveSelectedUp(); // Move the media file up the playlist so it is played earlier |
40 | void moveSelectedDown(); // Move the media file down the playlist so it is played later | 39 | void moveSelectedDown(); // Move the media file down the playlist so it is played later |
41 | bool prev(); | 40 | bool prev(); |
42 | bool next(); | 41 | bool next(); |
43 | bool first(); | 42 | bool first(); |
44 | bool last(); | 43 | bool last(); |
45 | 44 | ||
46 | protected: | 45 | protected: |
47 | virtual void contentsMouseMoveEvent(QMouseEvent *); | 46 | virtual void contentsMouseMoveEvent(QMouseEvent *); |
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 | |||
@@ -409,31 +409,39 @@ void PlayListWidget::addAllVideoToList() { | |||
409 | Global::findDocuments(&files, "video/*"); | 409 | Global::findDocuments(&files, "video/*"); |
410 | QListIterator<DocLnk> dit( files.children() ); | 410 | QListIterator<DocLnk> dit( files.children() ); |
411 | for ( ; dit.current(); ++dit ) | 411 | for ( ; dit.current(); ++dit ) |
412 | d->selectedFiles->addToSelection( **dit ); | 412 | d->selectedFiles->addToSelection( **dit ); |
413 | } | 413 | } |
414 | 414 | ||
415 | 415 | ||
416 | void PlayListWidget::setDocument(const QString& fileref) { | 416 | void PlayListWidget::setDocument(const QString& fileref) { |
417 | if ( fileref.isNull() ) { | 417 | if ( fileref.isNull() ) { |
418 | QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) ); | 418 | QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) ); |
419 | return; | 419 | return; |
420 | } | 420 | } |
421 | if(fileref.find("playlist",0,TRUE) == -1) { | ||
421 | addToSelection( DocLnk( fileref ) ); | 422 | addToSelection( DocLnk( fileref ) ); |
422 | d->setDocumentUsed = TRUE; | 423 | d->setDocumentUsed = TRUE; |
423 | qApp->processEvents(); | 424 | qApp->processEvents(); |
424 | mediaPlayerState->setPlaying( FALSE ); | 425 | mediaPlayerState->setPlaying( FALSE ); |
425 | qApp->processEvents(); | 426 | qApp->processEvents(); |
426 | mediaPlayerState->setPlaying( TRUE ); | 427 | mediaPlayerState->setPlaying( TRUE ); |
427 | d->selectedFiles->removeSelected( ); | 428 | d->selectedFiles->removeSelected( ); |
429 | } else { | ||
430 | loadList(DocLnk(fileref)); | ||
431 | d->selectedFiles->first(); | ||
432 | // mediaPlayerState->setPlaying( TRUE ); | ||
433 | // mediaPlayerState->setPlaying( FALSE ); | ||
434 | |||
435 | } | ||
428 | } | 436 | } |
429 | 437 | ||
430 | 438 | ||
431 | void PlayListWidget::setActiveWindow() { | 439 | void PlayListWidget::setActiveWindow() { |
432 | // When we get raised we need to ensure that it switches views | 440 | // When we get raised we need to ensure that it switches views |
433 | char origView = mediaPlayerState->view(); | 441 | char origView = mediaPlayerState->view(); |
434 | mediaPlayerState->setView( 'l' ); // invalidate | 442 | mediaPlayerState->setView( 'l' ); // invalidate |
435 | mediaPlayerState->setView( origView ); // now switch back | 443 | mediaPlayerState->setView( origView ); // now switch back |
436 | } | 444 | } |
437 | 445 | ||
438 | 446 | ||
439 | void PlayListWidget::useSelectedDocument() { | 447 | void PlayListWidget::useSelectedDocument() { |
@@ -520,48 +528,39 @@ bool PlayListWidget::last() { | |||
520 | } | 528 | } |
521 | 529 | ||
522 | 530 | ||
523 | void PlayListWidget::saveList() { | 531 | void PlayListWidget::saveList() { |
524 | 532 | ||
525 | QString filename; | 533 | QString filename; |
526 | InputDialog *fileDlg; | 534 | InputDialog *fileDlg; |
527 | fileDlg=new InputDialog(this,"Save Playlist",TRUE, 0); | 535 | fileDlg=new InputDialog(this,"Save Playlist",TRUE, 0); |
528 | fileDlg->exec(); | 536 | fileDlg->exec(); |
529 | if( fileDlg->result() == 1 ) { | 537 | if( fileDlg->result() == 1 ) { |
530 | filename = fileDlg->LineEdit1->text();//+".playlist"; | 538 | filename = fileDlg->LineEdit1->text();//+".playlist"; |
531 | qDebug("saving playlist "+filename+".playlist"); | 539 | qDebug("saving playlist "+filename+".playlist"); |
532 | |||
533 | // DocLnk *lnk; | ||
534 | // lnk.setName( filename); //sets file name | ||
535 | // // lnk.setComment(title); | ||
536 | // lnk.setFile( filename+".playlist"); //sets File property | ||
537 | // lnk.setType("player/plain");// hey is this a REGISTERED mime type?!?!? ;D | ||
538 | // lnk.setIcon("MPEGPlayer"); | ||
539 | // if(!lnk.writeLink()) | ||
540 | // qDebug("Writing doclink did not work"); | ||
541 | |||
542 | Config cfg( filename +".playlist"); | 540 | Config cfg( filename +".playlist"); |
543 | writeConfig( cfg ); | 541 | writeConfig( cfg ); |
544 | } | ||
545 | DocLnk lnk; | 542 | DocLnk lnk; |
546 | lnk.setName( filename); //sets file name | 543 | lnk.setName( filename); //sets file name |
547 | // lnk.setComment(title); | 544 | // lnk.setComment( ""); |
548 | lnk.setFile(QPEApplication::qpeDir()+"Settings/"+filename+".playlist.conf"); //sets File property | 545 | lnk.setFile(QPEApplication::qpeDir()+"Settings/"+filename+".playlist.conf"); //sets File property |
549 | lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D | 546 | lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D |
550 | lnk.setIcon("MPEGPlayer"); | 547 | lnk.setIcon("mpegplayer/playlist2"); |
551 | if(!lnk.writeLink()) | 548 | if(!lnk.writeLink()) |
552 | qDebug("Writing doclink did not work"); | 549 | qDebug("Writing doclink did not work"); |
550 | } | ||
553 | 551 | ||
554 | if(fileDlg) | 552 | if(fileDlg) |
555 | delete fileDlg; | 553 | delete fileDlg; |
554 | |||
556 | } | 555 | } |
557 | 556 | ||
558 | 557 | ||
559 | void PlayListWidget::loadList( const DocLnk & lnk) { | 558 | void PlayListWidget::loadList( const DocLnk & lnk) { |
560 | qDebug("load list "+ lnk.name()+".playlist"); | 559 | qDebug("load list "+ lnk.name()+".playlist"); |
561 | clearList(); | 560 | clearList(); |
562 | Config cfg( lnk.name()+".playlist"); | 561 | Config cfg( lnk.name()+".playlist"); |
563 | readConfig(cfg); | 562 | readConfig(cfg); |
564 | tabWidget->setCurrentPage(0); | 563 | tabWidget->setCurrentPage(0); |
565 | setCaption("OpiePlayer: "+lnk.name()); | 564 | setCaption("OpiePlayer: "+lnk.name()); |
566 | } | 565 | } |
567 | 566 | ||