-rw-r--r-- | core/launcher/launcherview.cpp | 2 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 10 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 11 |
3 files changed, 15 insertions, 8 deletions
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp index 0ced256..c54a00f 100644 --- a/core/launcher/launcherview.cpp +++ b/core/launcher/launcherview.cpp | |||
@@ -588,25 +588,25 @@ void LauncherView::itemPressed( int btn, QIconViewItem *item ) | |||
588 | */ | 588 | */ |
589 | item->setSelected(FALSE); | 589 | item->setSelected(FALSE); |
590 | } | 590 | } |
591 | } | 591 | } |
592 | 592 | ||
593 | void LauncherView::internalPopulate( AppLnkSet *folder, const QString& typefilter ) | 593 | void LauncherView::internalPopulate( AppLnkSet *folder, const QString& typefilter ) |
594 | { | 594 | { |
595 | QListIterator<AppLnk> it( folder->children() ); | 595 | QListIterator<AppLnk> it( folder->children() ); |
596 | icons->setTypeFilter(typefilter,FALSE); | 596 | icons->setTypeFilter(typefilter,FALSE); |
597 | 597 | ||
598 | while ( it.current() ) { | 598 | while ( it.current() ) { |
599 | // show only the icons for existing files | 599 | // show only the icons for existing files |
600 | if (!QFile(it.current()->file()).exists() ) | 600 | if (!QFile(it.current()->file()).exists() & it.current()->file().left(4) != "http") |
601 | { | 601 | { |
602 | //maybe insert some .desktop file deletion code later | 602 | //maybe insert some .desktop file deletion code later |
603 | //maybe dir specific | 603 | //maybe dir specific |
604 | } | 604 | } |
605 | else | 605 | else |
606 | { | 606 | { |
607 | icons->addItem(*it,FALSE); | 607 | icons->addItem(*it,FALSE); |
608 | } | 608 | } |
609 | ++it; | 609 | ++it; |
610 | } | 610 | } |
611 | 611 | ||
612 | icons->sort(); | 612 | icons->sort(); |
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index 65dc5fb..8d66407 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -1021,28 +1021,32 @@ void PlayListWidget::populateAudioView() { | |||
1021 | QListIterator<DocLnk> dit( files.children() ); | 1021 | QListIterator<DocLnk> dit( files.children() ); |
1022 | QListIterator<FileSystem> it ( fs ); | 1022 | QListIterator<FileSystem> it ( fs ); |
1023 | 1023 | ||
1024 | QString storage; | 1024 | QString storage; |
1025 | for ( ; dit.current(); ++dit ) { | 1025 | for ( ; dit.current(); ++dit ) { |
1026 | for( ; it.current(); ++it ){ | 1026 | for( ; it.current(); ++it ){ |
1027 | const QString name = (*it)->name(); | 1027 | const QString name = (*it)->name(); |
1028 | const QString path = (*it)->path(); | 1028 | const QString path = (*it)->path(); |
1029 | if(dit.current()->file().find(path) != -1 ) storage=name; | 1029 | if(dit.current()->file().find(path) != -1 ) storage=name; |
1030 | } | 1030 | } |
1031 | 1031 | ||
1032 | QListViewItem * newItem; | 1032 | QListViewItem * newItem; |
1033 | if ( QFile( dit.current()->file()).exists() ) { | 1033 | if ( QFile( dit.current()->file()).exists() || dit.current()->file().left(4) == "http" ) { |
1034 | // qDebug(dit.current()->name()); | 1034 | long size; |
1035 | if( dit.current()->file().left(4) == "http" ) | ||
1036 | size=0; | ||
1037 | else | ||
1038 | size = QFile( dit.current()->file() ).size(); | ||
1035 | newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), | 1039 | newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), |
1036 | QString::number( QFile( dit.current()->file()).size() ), storage); | 1040 | QString::number(size ), storage); |
1037 | newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/musicfile" )); | 1041 | newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/musicfile" )); |
1038 | } | 1042 | } |
1039 | } | 1043 | } |
1040 | 1044 | ||
1041 | } | 1045 | } |
1042 | 1046 | ||
1043 | void PlayListWidget::populateVideoView() { | 1047 | void PlayListWidget::populateVideoView() { |
1044 | videoView->clear(); | 1048 | videoView->clear(); |
1045 | StorageInfo storageInfo; | 1049 | StorageInfo storageInfo; |
1046 | const QList<FileSystem> &fs = storageInfo.fileSystems(); | 1050 | const QList<FileSystem> &fs = storageInfo.fileSystems(); |
1047 | 1051 | ||
1048 | if(!videoScan ) scanForVideo(); | 1052 | if(!videoScan ) scanForVideo(); |
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 603a7a3..6c4d07f 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -720,28 +720,31 @@ void PlayListWidget::populateAudioView() { | |||
720 | 720 | ||
721 | QString storage; | 721 | QString storage; |
722 | for ( ; dit.current(); ++dit ) { | 722 | for ( ; dit.current(); ++dit ) { |
723 | for( ; it.current(); ++it ){ | 723 | for( ; it.current(); ++it ){ |
724 | const QString name = (*it)->name(); | 724 | const QString name = (*it)->name(); |
725 | const QString path = (*it)->path(); | 725 | const QString path = (*it)->path(); |
726 | if(dit.current()->file().find(path) != -1 ) { | 726 | if(dit.current()->file().find(path) != -1 ) { |
727 | storage = name; | 727 | storage = name; |
728 | } | 728 | } |
729 | } | 729 | } |
730 | 730 | ||
731 | QListViewItem * newItem; | 731 | QListViewItem * newItem; |
732 | if ( QFile( dit.current()->file()).exists() ) { | 732 | if ( QFile( dit.current()->file()).exists() || dit.current()->file().left(4) == "http" ) { |
733 | // qDebug(dit.current()->name()); | 733 | long size; |
734 | newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), | 734 | if( dit.current()->file().left(4) == "http" ) |
735 | QString::number( QFile( dit.current()->file()).size() ), storage); | 735 | size=0; |
736 | else | ||
737 | size = QFile( dit.current()->file() ).size(); | ||
738 | newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), QString::number(size ), storage); | ||
736 | newItem->setPixmap( 0, Resource::loadPixmap( "opieplayer2/musicfile" ) ); | 739 | newItem->setPixmap( 0, Resource::loadPixmap( "opieplayer2/musicfile" ) ); |
737 | } | 740 | } |
738 | } | 741 | } |
739 | } | 742 | } |
740 | 743 | ||
741 | 744 | ||
742 | void PlayListWidget::populateVideoView() { | 745 | void PlayListWidget::populateVideoView() { |
743 | videoView->clear(); | 746 | videoView->clear(); |
744 | StorageInfo storageInfo; | 747 | StorageInfo storageInfo; |
745 | const QList<FileSystem> &fs = storageInfo.fileSystems(); | 748 | const QList<FileSystem> &fs = storageInfo.fileSystems(); |
746 | 749 | ||
747 | if(!videoScan ) { | 750 | if(!videoScan ) { |