summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp172
-rw-r--r--core/multimedia/opieplayer/playlistwidget.h36
2 files changed, 131 insertions, 77 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index db6533a..3b8f6d7 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -19,8 +19,11 @@
**********************************************************************/
// code added by L. J. Potter Sat 03-02-2002 06:17:54
+#define QTOPIA_INTERNAL_FSLP
+
#include <qpe/qpemenubar.h>
#include <qpe/qpetoolbar.h>
#include <qpe/fileselector.h>
#include <qpe/qpeapplication.h>
+#include <qpe/lnkproperties.h>
#include <qpe/applnk.h>
@@ -208,11 +211,11 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
audioView = new QListView( aTab, "Audioview" );
audioView->setMinimumSize(233,260);
- audioView->addColumn( "Title",140);
- audioView->addColumn("Size", -1);
- audioView->addColumn("Media",-1);
+ audioView->addColumn( tr("Title"),140);
+ audioView->addColumn(tr("Size"), -1);
+ audioView->addColumn(tr("Media"),-1);
audioView->setColumnAlignment(1, Qt::AlignRight);
audioView->setColumnAlignment(2, Qt::AlignRight);
audioView->setAllColumnsShowFocus(TRUE);
- tabWidget->insertTab(aTab,"Audio");
+ tabWidget->insertTab(aTab,tr("Audio"));
QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold);
@@ -222,18 +225,5 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
// audioView
- Global::findDocuments(&files, "audio/*");
- QListIterator<DocLnk> dit( files.children() );
- QString storage;
- for ( ; dit.current(); ++dit ) {
- QListViewItem * newItem;
- if(dit.current()->file().find("/mnt/cf") != -1 ) storage="CF";
- else if(dit.current()->file().find("/mnt/hda") != -1 ) storage="CF";
- else if(dit.current()->file().find("/mnt/card") != -1 ) storage="SD";
- else storage="RAM";
- if ( QFile( dit.current()->file()).exists() ) {
- newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), QString::number( QFile( dit.current()->file()).size() ), storage);
- newItem->setPixmap(0, Resource::loadPixmap( "mpegplayer/musicfile" ));
- }
- }
+ populateAudioView();
// videowidget
@@ -243,7 +233,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
videoView->setMinimumSize(233,260);
- videoView->addColumn("Title",140);
- videoView->addColumn("Size",-1);
- videoView->addColumn("Media",-1);
+ videoView->addColumn(tr("Title"),140);
+ videoView->addColumn(tr("Size"),-1);
+ videoView->addColumn(tr("Media"),-1);
videoView->setColumnAlignment(1, Qt::AlignRight);
videoView->setColumnAlignment(2, Qt::AlignRight);
@@ -253,19 +243,6 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
- tabWidget->insertTab( vTab,"Video");
+ tabWidget->insertTab( vTab,tr("Video"));
- Global::findDocuments(&vFiles, "video/*");
- QListIterator<DocLnk> Vdit( vFiles.children() );
- for ( ; Vdit.current(); ++Vdit ) {
- if( Vdit.current()->file().find("/mnt/cf") != -1 ) storage="CF";
- else if( Vdit.current()->file().find("/mnt/hda") != -1 ) storage="CF";
- else if( Vdit.current()->file().find("/mnt/card") != -1 ) storage="SD";
- else storage="RAM";
- QListViewItem * newItem;
- if ( QFile( Vdit.current()->file()).exists() ) {
- newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), QString::number( QFile( Vdit.current()->file()).size() ), storage);
- newItem->setPixmap(0, Resource::loadPixmap( "mpegplayer/videofile" ));
- }
- }
//playlists list
@@ -274,5 +251,5 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
playLists = new FileSelector( "playlist/plain", LTab, "fileselector" , FALSE, FALSE); //buggy
playLists->setMinimumSize(233,260);;
- tabWidget->insertTab(LTab,"Lists");
+ tabWidget->insertTab(LTab,tr("Lists"));
connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) );
@@ -309,5 +286,5 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
// qDebug("currentList is "+currentPlaylist);
loadList(DocLnk( currentPlaylist));
- setCaption("OpiePlayer: "+ currentPlaylist );
+ setCaption(tr("OpiePlayer: ")+ currentPlaylist );
initializeStates();
@@ -451,5 +428,5 @@ void PlayListWidget::setDocument(const QString& fileref) {
mediaPlayerState->setPlaying( TRUE );
qApp->processEvents();
- setCaption("OpiePlayer");
+ setCaption(tr("OpiePlayer"));
} else { //is playlist
@@ -494,5 +471,5 @@ const DocLnk *PlayListWidget::current() { // this is fugly
qDebug("playlist");
if ( mediaPlayerState->playlist() ) {
- return d->selectedFiles->current();
+ return d->selectedFiles->current();
}
else if ( d->setDocumentUsed && d->current ) {
@@ -603,5 +580,5 @@ void PlayListWidget::saveList() {
QString filename;
InputDialog *fileDlg;
- fileDlg = new InputDialog(this,"Save Playlist",TRUE, 0);
+ fileDlg = new InputDialog(this,tr("Save Playlist"),TRUE, 0);
fileDlg->exec();
if( fileDlg->result() == 1 ) {
@@ -630,5 +607,5 @@ void PlayListWidget::saveList() {
Config config( "MediaPlayer" );
config.writeEntry("CurrentPlaylist",filename);
- setCaption("OpiePlayer: "+filename);
+ setCaption(tr("OpiePlayer: ")+filename);
d->selectedFiles->first();
if(fileDlg)
@@ -682,5 +659,5 @@ void PlayListWidget::addSelected() {
QString linkFile = cfg.readEntry( entryName );
if( DocLnk( linkFile).name() == audioView->selectedItem()->text(0) ) {
- int result= QMessageBox::warning(this,"OpiePlayer",
+ int result= QMessageBox::warning(this,tr("OpiePlayer"),
tr("This is all ready in your playlist.\nContinue?"),
tr("Yes"),tr("No"),0,0,1);
@@ -699,5 +676,5 @@ void PlayListWidget::addSelected() {
QString linkFile = cfg.readEntry( entryName );
if( DocLnk( linkFile).name() == videoView->selectedItem()->text(0) ) {
- int result= QMessageBox::warning(this,"OpiePlayer",
+ int result= QMessageBox::warning(this,tr("OpiePlayer"),
tr("This is all ready in your playlist.\nContinue?"),
tr("Yes"),tr("No"),0,0,1);
@@ -717,5 +694,4 @@ void PlayListWidget::removeSelected() {
}
-
void PlayListWidget::playIt( QListViewItem *it) {
// d->setDocumentUsed = FALSE;
@@ -727,11 +703,8 @@ void PlayListWidget::addToSelection( QListViewItem *it) {
if(it) {
-// qDebug("add to selection");
switch (tabWidget->currentPageIndex()) {
case 1: {
-// qDebug("case 1");
QListIterator<DocLnk> dit( files.children() );
for ( ; dit.current(); ++dit ) {
-// qDebug(dit.current()->name());
if( dit.current()->name() == it->text(0)) {
d->selectedFiles->addToSelection( **dit );
@@ -741,8 +714,6 @@ void PlayListWidget::addToSelection( QListViewItem *it) {
break;
case 2: {
-// qDebug("case 2");
QListIterator<DocLnk> dit( vFiles.children() );
for ( ; dit.current(); ++dit ) {
-// qDebug(dit.current()->name());
if( dit.current()->name() == it->text(0)) {
d->selectedFiles->addToSelection( **dit );
@@ -755,5 +726,4 @@ void PlayListWidget::addToSelection( QListViewItem *it) {
};
tabWidget->setCurrentPage(0);
-// mediaPlayerState->setPlaying( TRUE );
}
}
@@ -797,7 +767,7 @@ void PlayListWidget::tabChanged(QWidget *widg) {
-/*
- play button is pressed*/
+
void PlayListWidget::btnPlay(bool b) {
+
// mediaPlayerState->setPlaying(b);
switch ( tabWidget->currentPageIndex()) {
@@ -814,5 +784,5 @@ void PlayListWidget::btnPlay(bool b) {
d->selectedFiles->removeSelected( );
tabWidget->setCurrentPage(1);
- d->selectedFiles->unSelect();
+ d->selectedFiles->unSelect();
// mediaPlayerState->setPlaying(FALSE);
}
@@ -825,13 +795,9 @@ void PlayListWidget::btnPlay(bool b) {
d->selectedFiles->removeSelected( );
tabWidget->setCurrentPage(2);
- d->selectedFiles->unSelect();
+ d->selectedFiles->unSelect();
// mediaPlayerState->setPlaying(FALSE);
}
break;
};
-
-
-
-
}
@@ -860,11 +826,10 @@ void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint&
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.insertSeparator();
+ m.insertItem( tr( "Properties" ), this, SLOT( listDelete() ));
m.exec( QCursor::pos() );
}
break;
};
-
}
@@ -890,2 +855,87 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const
}
+
+void PlayListWidget::listDelete() {
+ Config cfg( "MediaPlayer" );
+ cfg.setGroup("PlayList");
+ QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
+ QString file;
+ int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
+ switch ( tabWidget->currentPageIndex()) {
+ case 0:
+ break;
+ case 1:
+ {
+ file = audioView->selectedItem()->text(0);
+// Global::findDocuments(&files, "audio/*");
+// AppLnkSet appFiles;
+ QListIterator<DocLnk> dit( files.children() );
+ for ( ; dit.current(); ++dit ) {
+ if( dit.current()->name() == file) {
+ qDebug(file);
+ LnkProperties prop( dit.current() );
+// connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
+ prop.showMaximized();
+ prop.exec();
+ }
+ }
+ populateAudioView();
+ }
+ break;
+ case 2:
+ {
+// file = videoView->selectedItem()->text(0);
+// for ( int i = 0; i < noOfFiles; i++ ) {
+// QString entryName;
+// entryName.sprintf( "File%i", i + 1 );
+// QString linkFile = cfg.readEntry( entryName );
+// AppLnk lnk( AppLnk(linkFile));
+// if( lnk.name() == file ) {
+// LnkProperties prop( &lnk);
+// // connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
+// prop.showMaximized();
+// prop.exec();
+// }
+// }
+ }
+ break;
+ };
+}
+
+void PlayListWidget::populateAudioView() {
+// if(files)
+// files.~DocLnkSet();
+ Global::findDocuments(&files, "audio/*");
+ QListIterator<DocLnk> dit( files.children() );
+ audioView->clear();
+ QString storage;
+ for ( ; dit.current(); ++dit ) {
+ 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() ) {
+ newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), QString::number( QFile( dit.current()->file()).size() ), storage);
+ newItem->setPixmap(0, Resource::loadPixmap( "mpegplayer/musicfile" ));
+ }
+ }
+}
+
+void PlayListWidget::populateVideoView() {
+ Global::findDocuments(&vFiles, "video/*");
+ QListIterator<DocLnk> Vdit( vFiles.children() );
+ videoView->clear();
+ QString storage;
+ 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");
+ QListViewItem * newItem;
+ if ( QFile( Vdit.current()->file()).exists() ) {
+ newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), QString::number( QFile( Vdit.current()->file()).size() ), storage);
+ newItem->setPixmap(0, Resource::loadPixmap( "mpegplayer/videofile" ));
+ }
+ }
+}
diff --git a/core/multimedia/opieplayer/playlistwidget.h b/core/multimedia/opieplayer/playlistwidget.h
index 10a42df..186ca1b 100644
--- a/core/multimedia/opieplayer/playlistwidget.h
+++ b/core/multimedia/opieplayer/playlistwidget.h
@@ -59,4 +59,22 @@ public:
QPushButton *tbDeletePlaylist;
public slots:
+ bool first();
+ bool last();
+ bool next();
+ bool prev();
+/* void setFullScreen(); */
+/* void setScaled(); */
+protected:
+/* void contentsMousePressEvent( QMouseEvent * e ); */
+/* void contentsMouseReleaseEvent( QMouseEvent * e ); */
+
+private:
+ void initializeStates();
+ void readConfig( Config& cfg );
+ void writeConfig( Config& cfg ) const;
+ PlayListWidgetPrivate *d; // Private implementation data
+ void populateAudioView();
+ void populateVideoView();
+private slots:
void setDocument( const QString& fileref );
void addToSelection( const DocLnk& ); // Add a media file to the playlist
@@ -75,8 +93,4 @@ public slots:
void btnPlay(bool);
void deletePlaylist();
- bool first();
- bool last();
- bool next();
- bool prev();
void addSelected();
void removeSelected();
@@ -85,16 +99,6 @@ public slots:
void playlistViewPressed( int, QListViewItem *, const QPoint&, int);
void playSelected();
-/* void setFullScreen(); */
-/* void setScaled(); */
-protected:
-/* void contentsMousePressEvent( QMouseEvent * e ); */
-/* void contentsMouseReleaseEvent( QMouseEvent * e ); */
-
-private:
- void initializeStates();
- void readConfig( Config& cfg );
- void writeConfig( Config& cfg ) const;
- PlayListWidgetPrivate *d; // Private implementation data
-
+ void listDelete();
+
protected slots:
/* void cancelMenuTimer(); */