summaryrefslogtreecommitdiff
path: root/core/multimedia/opieplayer/playlistwidget.cpp
Side-by-side diff
Diffstat (limited to 'core/multimedia/opieplayer/playlistwidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp98
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
@@ -27,2 +27,3 @@
#include <qpe/lnkproperties.h>
+#include <qpe/storage.h>
@@ -218,2 +219,5 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
audioView->setAllColumnsShowFocus(TRUE);
+// audioView->setMultiSelection( TRUE );
+// audioView->setSelectionMode( QListView::Extended);
+
tabWidget->insertTab(aTab,tr("Audio"));
@@ -240,2 +244,5 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
videoView->setAllColumnsShowFocus(TRUE);
+// videoView->setMultiSelection( TRUE );
+// videoView->setSelectionMode( QListView::Extended);
+
QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold);
@@ -320,5 +327,4 @@ void PlayListWidget::readConfig( Config& cfg ) {
cfg.setGroup("PlayList");
-
+ QString currentString = cfg.readEntry("current", "" );
int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
-
for ( int i = 0; i < noOfFiles; i++ ) {
@@ -328,3 +334,3 @@ void PlayListWidget::readConfig( Config& cfg ) {
DocLnk lnk( linkFile );
- if ( lnk.isValid() )
+ if ( lnk.isValid() ) {
d->selectedFiles->addToSelection( lnk );
@@ -332,2 +338,4 @@ void PlayListWidget::readConfig( Config& cfg ) {
}
+// d->selectedFiles->setSelectedItem( (const QString &)currentString);
+}
@@ -335,6 +343,6 @@ void PlayListWidget::readConfig( Config& cfg ) {
void PlayListWidget::writeConfig( Config& cfg ) const {
- cfg.setGroup("PlayList");
+ d->selectedFiles->writeCurrent( cfg);
+ cfg.setGroup("PlayList");
int noOfFiles = 0;
-
d->selectedFiles->first();
@@ -345,2 +353,3 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
entryName.sprintf( "File%i", noOfFiles + 1 );
+ qDebug(entryName);
cfg.writeEntry( entryName, lnk->linkFile() );
@@ -363,7 +372,5 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
}
- } while ( d->selectedFiles->next() );
-
+ }
+ while ( d->selectedFiles->next() );
cfg.writeEntry("NumberOfFiles", noOfFiles );
-
-
}
@@ -388,7 +395,7 @@ void PlayListWidget::clearList() {
void PlayListWidget::addAllToList() {
- DocLnkSet files;
- Global::findDocuments(&files, "video/*;audio/*");
- QListIterator<DocLnk> dit( files.children() );
- for ( ; dit.current(); ++dit )
- d->selectedFiles->addToSelection( **dit );
+ DocLnkSet filesAll;
+ Global::findDocuments(&filesAll, "video/*;audio/*");
+ QListIterator<DocLnk> Adit( filesAll.children() );
+ for ( ; Adit.current(); ++Adit )
+ d->selectedFiles->addToSelection( **Adit );
}
@@ -397,4 +404,4 @@ void PlayListWidget::addAllToList() {
void PlayListWidget::addAllMusicToList() {
- DocLnkSet files;
- Global::findDocuments(&files, "audio/*");
+// DocLnkSet files;
+// Global::findDocuments(&files, "audio/*");
QListIterator<DocLnk> dit( files.children() );
@@ -406,5 +413,3 @@ void PlayListWidget::addAllMusicToList() {
void PlayListWidget::addAllVideoToList() {
- DocLnkSet files;
- Global::findDocuments(&files, "video/*");
- QListIterator<DocLnk> dit( files.children() );
+ QListIterator<DocLnk> dit( vFiles.children() );
for ( ; dit.current(); ++dit )
@@ -590,9 +595,12 @@ void PlayListWidget::saveList() {
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();
- }
+// qDebug("same name so delete lnk??");
+// if( playLists->selected()->name() == filename) {
+
+// qDebug("same name so delete lnk");
+// QFile().remove(playLists->selected()->file());
+// QFile().remove(playLists->selected()->linkFile());
+// playLists->reread();
+// }
+// qDebug("new doclnk");
DocLnk lnk;
@@ -603,2 +611,3 @@ void PlayListWidget::saveList() {
lnk.setName( filename); //sets file name
+ qDebug(filename);
if(!lnk.writeLink())
@@ -623,7 +632,10 @@ void PlayListWidget::loadList( const DocLnk & lnk) {
readConfig(cfg);
+
tabWidget->setCurrentPage(0);
+
Config config( "MediaPlayer" );
config.writeEntry("CurrentPlaylist", name);
- d->selectedFiles->first();
+// d->selectedFiles->first();
}
+
}
@@ -785,3 +797,4 @@ void PlayListWidget::btnPlay(bool b) {
tabWidget->setCurrentPage(1);
- d->selectedFiles->unSelect();
+ audioView->clearSelection();
+// d->selectedFiles->unSelect();
// mediaPlayerState->setPlaying(FALSE);
@@ -796,3 +809,4 @@ void PlayListWidget::btnPlay(bool b) {
tabWidget->setCurrentPage(2);
- d->selectedFiles->unSelect();
+ videoView->clearSelection();
+// d->selectedFiles->unSelect();
// mediaPlayerState->setPlaying(FALSE);
@@ -907,4 +921,8 @@ void PlayListWidget::populateAudioView() {
// files.~DocLnkSet();
+ StorageInfo storageInfo;
+ const QList<FileSystem> &fs = storageInfo.fileSystems();
+
Global::findDocuments(&files, "audio/*");
QListIterator<DocLnk> dit( files.children() );
+ QListIterator<FileSystem> it ( fs );
audioView->clear();
@@ -912,7 +930,9 @@ void PlayListWidget::populateAudioView() {
for ( ; dit.current(); ++dit ) {
+ for( ; it.current(); ++it ){
+ const QString name = (*it)->name();
+ const QString path = (*it)->path();
+ if(dit.current()->file().find(path) != -1 ) storage=name;
+ }
+
QListViewItem * newItem;
- if(dit.current()->file().find("/mnt/cf") != -1 ) storage=tr("CF");
- else if(dit.current()->file().find("/mnt/hda") != -1 ) storage=tr("CF");
- else if(dit.current()->file().find("/mnt/card") != -1 ) storage=tr("SD");
- else storage=tr("RAM");
if ( QFile( dit.current()->file()).exists() ) {
@@ -925,4 +945,8 @@ void PlayListWidget::populateAudioView() {
void PlayListWidget::populateVideoView() {
+ StorageInfo storageInfo;
+ const QList<FileSystem> &fs = storageInfo.fileSystems();
+
Global::findDocuments(&vFiles, "video/*");
QListIterator<DocLnk> Vdit( vFiles.children() );
+ QListIterator<FileSystem> it ( fs );
videoView->clear();
@@ -930,6 +954,8 @@ void PlayListWidget::populateVideoView() {
for ( ; Vdit.current(); ++Vdit ) {
- if( Vdit.current()->file().find("/mnt/cf") != -1 ) storage=tr("CF");
- else if( Vdit.current()->file().find("/mnt/hda") != -1 ) storage=tr("CF");
- else if( Vdit.current()->file().find("/mnt/card") != -1 ) storage=tr("SD");
- else storage=tr("RAM");
+ for( ; it.current(); ++it ){
+ const QString name = (*it)->name();
+ const QString path = (*it)->path();
+ if( Vdit.current()->file().find(path) != -1 ) storage=name;
+ }
+
QListViewItem * newItem;