author | llornkcor <llornkcor> | 2002-04-10 19:13:40 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-04-10 19:13:40 (UTC) |
commit | 9237a75548f9b932fbb1900d8ea28dbee9da81ac (patch) (unidiff) | |
tree | a0249408df5ce581af8bcee5b6f58bcee1db461a /core/multimedia/opieplayer/playlistwidget.cpp | |
parent | 11d754ffa429875b526c49f125d8a844c5cda3d8 (diff) | |
download | opie-9237a75548f9b932fbb1900d8ea28dbee9da81ac.zip opie-9237a75548f9b932fbb1900d8ea28dbee9da81ac.tar.gz opie-9237a75548f9b932fbb1900d8ea28dbee9da81ac.tar.bz2 |
bug fix
Diffstat (limited to 'core/multimedia/opieplayer/playlistwidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 98 |
1 files changed, 62 insertions, 36 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index 3b8f6d7..63df715 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <qpe/fileselector.h> | 25 | #include <qpe/fileselector.h> |
26 | #include <qpe/qpeapplication.h> | 26 | #include <qpe/qpeapplication.h> |
27 | #include <qpe/lnkproperties.h> | 27 | #include <qpe/lnkproperties.h> |
28 | #include <qpe/storage.h> | ||
28 | 29 | ||
29 | #include <qpe/applnk.h> | 30 | #include <qpe/applnk.h> |
30 | #include <qpe/config.h> | 31 | #include <qpe/config.h> |
@@ -216,6 +217,9 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
216 | audioView->setColumnAlignment(1, Qt::AlignRight); | 217 | audioView->setColumnAlignment(1, Qt::AlignRight); |
217 | audioView->setColumnAlignment(2, Qt::AlignRight); | 218 | audioView->setColumnAlignment(2, Qt::AlignRight); |
218 | audioView->setAllColumnsShowFocus(TRUE); | 219 | audioView->setAllColumnsShowFocus(TRUE); |
220 | // audioView->setMultiSelection( TRUE ); | ||
221 | // audioView->setSelectionMode( QListView::Extended); | ||
222 | |||
219 | tabWidget->insertTab(aTab,tr("Audio")); | 223 | tabWidget->insertTab(aTab,tr("Audio")); |
220 | 224 | ||
221 | QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold); | 225 | QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold); |
@@ -238,6 +242,9 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
238 | videoView->setColumnAlignment(1, Qt::AlignRight); | 242 | videoView->setColumnAlignment(1, Qt::AlignRight); |
239 | videoView->setColumnAlignment(2, Qt::AlignRight); | 243 | videoView->setColumnAlignment(2, Qt::AlignRight); |
240 | videoView->setAllColumnsShowFocus(TRUE); | 244 | videoView->setAllColumnsShowFocus(TRUE); |
245 | // videoView->setMultiSelection( TRUE ); | ||
246 | // videoView->setSelectionMode( QListView::Extended); | ||
247 | |||
241 | QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold); | 248 | QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold); |
242 | connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), | 249 | connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), |
243 | this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); | 250 | this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); |
@@ -318,31 +325,33 @@ void PlayListWidget::initializeStates() { | |||
318 | 325 | ||
319 | void PlayListWidget::readConfig( Config& cfg ) { | 326 | void PlayListWidget::readConfig( Config& cfg ) { |
320 | cfg.setGroup("PlayList"); | 327 | cfg.setGroup("PlayList"); |
321 | 328 | QString currentString = cfg.readEntry("current", "" ); | |
322 | int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); | 329 | int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); |
323 | |||
324 | for ( int i = 0; i < noOfFiles; i++ ) { | 330 | for ( int i = 0; i < noOfFiles; i++ ) { |
325 | QString entryName; | 331 | QString entryName; |
326 | entryName.sprintf( "File%i", i + 1 ); | 332 | entryName.sprintf( "File%i", i + 1 ); |
327 | QString linkFile = cfg.readEntry( entryName ); | 333 | QString linkFile = cfg.readEntry( entryName ); |
328 | DocLnk lnk( linkFile ); | 334 | DocLnk lnk( linkFile ); |
329 | if ( lnk.isValid() ) | 335 | if ( lnk.isValid() ) { |
330 | d->selectedFiles->addToSelection( lnk ); | 336 | d->selectedFiles->addToSelection( lnk ); |
331 | } | 337 | } |
332 | } | 338 | } |
339 | // d->selectedFiles->setSelectedItem( (const QString &)currentString); | ||
340 | } | ||
333 | 341 | ||
334 | 342 | ||
335 | void PlayListWidget::writeConfig( Config& cfg ) const { | 343 | void PlayListWidget::writeConfig( Config& cfg ) const { |
336 | cfg.setGroup("PlayList"); | ||
337 | 344 | ||
345 | d->selectedFiles->writeCurrent( cfg); | ||
346 | cfg.setGroup("PlayList"); | ||
338 | int noOfFiles = 0; | 347 | int noOfFiles = 0; |
339 | |||
340 | d->selectedFiles->first(); | 348 | d->selectedFiles->first(); |
341 | do { | 349 | do { |
342 | const DocLnk *lnk = d->selectedFiles->current(); | 350 | const DocLnk *lnk = d->selectedFiles->current(); |
343 | if ( lnk ) { | 351 | if ( lnk ) { |
344 | QString entryName; | 352 | QString entryName; |
345 | entryName.sprintf( "File%i", noOfFiles + 1 ); | 353 | entryName.sprintf( "File%i", noOfFiles + 1 ); |
354 | qDebug(entryName); | ||
346 | cfg.writeEntry( entryName, lnk->linkFile() ); | 355 | cfg.writeEntry( entryName, lnk->linkFile() ); |
347 | // if this link does exist, add it so we have the file | 356 | // if this link does exist, add it so we have the file |
348 | // next time... | 357 | // next time... |
@@ -361,11 +370,9 @@ void PlayListWidget::writeConfig( Config& cfg ) const { | |||
361 | } | 370 | } |
362 | noOfFiles++; | 371 | noOfFiles++; |
363 | } | 372 | } |
364 | } while ( d->selectedFiles->next() ); | 373 | } |
365 | 374 | while ( d->selectedFiles->next() ); | |
366 | cfg.writeEntry("NumberOfFiles", noOfFiles ); | 375 | cfg.writeEntry("NumberOfFiles", noOfFiles ); |
367 | |||
368 | |||
369 | } | 376 | } |
370 | 377 | ||
371 | 378 | ||
@@ -386,17 +393,17 @@ void PlayListWidget::clearList() { | |||
386 | 393 | ||
387 | 394 | ||
388 | void PlayListWidget::addAllToList() { | 395 | void PlayListWidget::addAllToList() { |
389 | DocLnkSet files; | 396 | DocLnkSet filesAll; |
390 | Global::findDocuments(&files, "video/*;audio/*"); | 397 | Global::findDocuments(&filesAll, "video/*;audio/*"); |
391 | QListIterator<DocLnk> dit( files.children() ); | 398 | QListIterator<DocLnk> Adit( filesAll.children() ); |
392 | for ( ; dit.current(); ++dit ) | 399 | for ( ; Adit.current(); ++Adit ) |
393 | d->selectedFiles->addToSelection( **dit ); | 400 | d->selectedFiles->addToSelection( **Adit ); |
394 | } | 401 | } |
395 | 402 | ||
396 | 403 | ||
397 | void PlayListWidget::addAllMusicToList() { | 404 | void PlayListWidget::addAllMusicToList() { |
398 | DocLnkSet files; | 405 | // DocLnkSet files; |
399 | Global::findDocuments(&files, "audio/*"); | 406 | // Global::findDocuments(&files, "audio/*"); |
400 | QListIterator<DocLnk> dit( files.children() ); | 407 | QListIterator<DocLnk> dit( files.children() ); |
401 | for ( ; dit.current(); ++dit ) | 408 | for ( ; dit.current(); ++dit ) |
402 | d->selectedFiles->addToSelection( **dit ); | 409 | d->selectedFiles->addToSelection( **dit ); |
@@ -404,9 +411,7 @@ void PlayListWidget::addAllMusicToList() { | |||
404 | 411 | ||
405 | 412 | ||
406 | void PlayListWidget::addAllVideoToList() { | 413 | void PlayListWidget::addAllVideoToList() { |
407 | DocLnkSet files; | 414 | QListIterator<DocLnk> dit( vFiles.children() ); |
408 | Global::findDocuments(&files, "video/*"); | ||
409 | QListIterator<DocLnk> dit( files.children() ); | ||
410 | for ( ; dit.current(); ++dit ) | 415 | for ( ; dit.current(); ++dit ) |
411 | d->selectedFiles->addToSelection( **dit ); | 416 | d->selectedFiles->addToSelection( **dit ); |
412 | } | 417 | } |
@@ -588,19 +593,23 @@ void PlayListWidget::saveList() { | |||
588 | // qDebug("saving playlist "+filename+".playlist"); | 593 | // qDebug("saving playlist "+filename+".playlist"); |
589 | Config cfg( filename +".playlist"); | 594 | Config cfg( filename +".playlist"); |
590 | writeConfig( cfg ); | 595 | writeConfig( cfg ); |
591 | if( playLists->selected()->name() == filename) { | ||
592 | // qDebug("same name so delete lnk"); | ||
593 | QFile().remove(playLists->selected()->file()); | ||
594 | QFile().remove(playLists->selected()->linkFile()); | ||
595 | playLists->reread(); | ||
596 | } | ||
597 | 596 | ||
597 | // qDebug("same name so delete lnk??"); | ||
598 | // if( playLists->selected()->name() == filename) { | ||
599 | |||
600 | // qDebug("same name so delete lnk"); | ||
601 | // QFile().remove(playLists->selected()->file()); | ||
602 | // QFile().remove(playLists->selected()->linkFile()); | ||
603 | // playLists->reread(); | ||
604 | // } | ||
605 | // qDebug("new doclnk"); | ||
598 | DocLnk lnk; | 606 | DocLnk lnk; |
599 | // lnk.setComment( ""); | 607 | // lnk.setComment( ""); |
600 | lnk.setFile(QDir::homeDirPath()+"/Settings/"+filename+".playlist.conf"); //sets File property | 608 | lnk.setFile(QDir::homeDirPath()+"/Settings/"+filename+".playlist.conf"); //sets File property |
601 | lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D | 609 | lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D |
602 | lnk.setIcon("mpegplayer/playlist2"); | 610 | lnk.setIcon("mpegplayer/playlist2"); |
603 | lnk.setName( filename); //sets file name | 611 | lnk.setName( filename); //sets file name |
612 | qDebug(filename); | ||
604 | if(!lnk.writeLink()) | 613 | if(!lnk.writeLink()) |
605 | qDebug("Writing doclink did not work"); | 614 | qDebug("Writing doclink did not work"); |
606 | } | 615 | } |
@@ -621,11 +630,14 @@ void PlayListWidget::loadList( const DocLnk & lnk) { | |||
621 | clearList(); | 630 | clearList(); |
622 | Config cfg( name+".playlist"); | 631 | Config cfg( name+".playlist"); |
623 | readConfig(cfg); | 632 | readConfig(cfg); |
633 | |||
624 | tabWidget->setCurrentPage(0); | 634 | tabWidget->setCurrentPage(0); |
635 | |||
625 | Config config( "MediaPlayer" ); | 636 | Config config( "MediaPlayer" ); |
626 | config.writeEntry("CurrentPlaylist", name); | 637 | config.writeEntry("CurrentPlaylist", name); |
627 | d->selectedFiles->first(); | 638 | // d->selectedFiles->first(); |
628 | } | 639 | } |
640 | |||
629 | } | 641 | } |
630 | 642 | ||
631 | void PlayListWidget::setPlaylist( bool shown ) { | 643 | void PlayListWidget::setPlaylist( bool shown ) { |
@@ -783,7 +795,8 @@ void PlayListWidget::btnPlay(bool b) { | |||
783 | // qApp->processEvents(); | 795 | // qApp->processEvents(); |
784 | d->selectedFiles->removeSelected( ); | 796 | d->selectedFiles->removeSelected( ); |
785 | tabWidget->setCurrentPage(1); | 797 | tabWidget->setCurrentPage(1); |
786 | d->selectedFiles->unSelect(); | 798 | audioView->clearSelection(); |
799 | // d->selectedFiles->unSelect(); | ||
787 | // mediaPlayerState->setPlaying(FALSE); | 800 | // mediaPlayerState->setPlaying(FALSE); |
788 | } | 801 | } |
789 | break; | 802 | break; |
@@ -794,7 +807,8 @@ void PlayListWidget::btnPlay(bool b) { | |||
794 | qApp->processEvents(); | 807 | qApp->processEvents(); |
795 | d->selectedFiles->removeSelected( ); | 808 | d->selectedFiles->removeSelected( ); |
796 | tabWidget->setCurrentPage(2); | 809 | tabWidget->setCurrentPage(2); |
797 | d->selectedFiles->unSelect(); | 810 | videoView->clearSelection(); |
811 | // d->selectedFiles->unSelect(); | ||
798 | // mediaPlayerState->setPlaying(FALSE); | 812 | // mediaPlayerState->setPlaying(FALSE); |
799 | } | 813 | } |
800 | break; | 814 | break; |
@@ -905,16 +919,22 @@ void PlayListWidget::listDelete() { | |||
905 | void PlayListWidget::populateAudioView() { | 919 | void PlayListWidget::populateAudioView() { |
906 | // if(files) | 920 | // if(files) |
907 | // files.~DocLnkSet(); | 921 | // files.~DocLnkSet(); |
922 | StorageInfo storageInfo; | ||
923 | const QList<FileSystem> &fs = storageInfo.fileSystems(); | ||
924 | |||
908 | Global::findDocuments(&files, "audio/*"); | 925 | Global::findDocuments(&files, "audio/*"); |
909 | QListIterator<DocLnk> dit( files.children() ); | 926 | QListIterator<DocLnk> dit( files.children() ); |
927 | QListIterator<FileSystem> it ( fs ); | ||
910 | audioView->clear(); | 928 | audioView->clear(); |
911 | QString storage; | 929 | QString storage; |
912 | for ( ; dit.current(); ++dit ) { | 930 | for ( ; dit.current(); ++dit ) { |
931 | for( ; it.current(); ++it ){ | ||
932 | const QString name = (*it)->name(); | ||
933 | const QString path = (*it)->path(); | ||
934 | if(dit.current()->file().find(path) != -1 ) storage=name; | ||
935 | } | ||
936 | |||
913 | QListViewItem * newItem; | 937 | QListViewItem * newItem; |
914 | if(dit.current()->file().find("/mnt/cf") != -1 ) storage=tr("CF"); | ||
915 | else if(dit.current()->file().find("/mnt/hda") != -1 ) storage=tr("CF"); | ||
916 | else if(dit.current()->file().find("/mnt/card") != -1 ) storage=tr("SD"); | ||
917 | else storage=tr("RAM"); | ||
918 | if ( QFile( dit.current()->file()).exists() ) { | 938 | if ( QFile( dit.current()->file()).exists() ) { |
919 | newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), QString::number( QFile( dit.current()->file()).size() ), storage); | 939 | newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), QString::number( QFile( dit.current()->file()).size() ), storage); |
920 | newItem->setPixmap(0, Resource::loadPixmap( "mpegplayer/musicfile" )); | 940 | newItem->setPixmap(0, Resource::loadPixmap( "mpegplayer/musicfile" )); |
@@ -923,15 +943,21 @@ void PlayListWidget::populateAudioView() { | |||
923 | } | 943 | } |
924 | 944 | ||
925 | void PlayListWidget::populateVideoView() { | 945 | void PlayListWidget::populateVideoView() { |
946 | StorageInfo storageInfo; | ||
947 | const QList<FileSystem> &fs = storageInfo.fileSystems(); | ||
948 | |||
926 | Global::findDocuments(&vFiles, "video/*"); | 949 | Global::findDocuments(&vFiles, "video/*"); |
927 | QListIterator<DocLnk> Vdit( vFiles.children() ); | 950 | QListIterator<DocLnk> Vdit( vFiles.children() ); |
951 | QListIterator<FileSystem> it ( fs ); | ||
928 | videoView->clear(); | 952 | videoView->clear(); |
929 | QString storage; | 953 | QString storage; |
930 | for ( ; Vdit.current(); ++Vdit ) { | 954 | for ( ; Vdit.current(); ++Vdit ) { |
931 | if( Vdit.current()->file().find("/mnt/cf") != -1 ) storage=tr("CF"); | 955 | for( ; it.current(); ++it ){ |
932 | else if( Vdit.current()->file().find("/mnt/hda") != -1 ) storage=tr("CF"); | 956 | const QString name = (*it)->name(); |
933 | else if( Vdit.current()->file().find("/mnt/card") != -1 ) storage=tr("SD"); | 957 | const QString path = (*it)->path(); |
934 | else storage=tr("RAM"); | 958 | if( Vdit.current()->file().find(path) != -1 ) storage=name; |
959 | } | ||
960 | |||
935 | QListViewItem * newItem; | 961 | QListViewItem * newItem; |
936 | if ( QFile( Vdit.current()->file()).exists() ) { | 962 | if ( QFile( Vdit.current()->file()).exists() ) { |
937 | newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), QString::number( QFile( Vdit.current()->file()).size() ), storage); | 963 | newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), QString::number( QFile( Vdit.current()->file()).size() ), storage); |