From 9bfda722eeba2f5861393e9f5f41170fab502da8 Mon Sep 17 00:00:00 2001 From: harlekin Date: Wed, 18 Jun 2003 20:19:16 +0000 Subject: separate Add URL from Add file --- (limited to 'noncore') diff --git a/noncore/multimedia/opieplayer2/inputDialog.cpp b/noncore/multimedia/opieplayer2/inputDialog.cpp index 2c4be1b..ebde9c6 100644 --- a/noncore/multimedia/opieplayer2/inputDialog.cpp +++ b/noncore/multimedia/opieplayer2/inputDialog.cpp @@ -1,9 +1,40 @@ +/* +                This file is part of the Opie Project + +              Copyright (c) 2002,2003 Max Reiss + Copyright (c) 2002 L. Potter + =. + .=l. +           .>+-= + _;:,     .>    :=|. This program is free software; you can +.> <`_,   >  .   <= redistribute it and/or modify it under +:`=1 )Y*s>-.--   : the terms of the GNU General Public +.="- .-=="i,     .._ License as published by the Free Software + - .   .-<_>     .<> Foundation; either version 2 of the License, +     ._= =}       : or (at your option) any later version. +    .%`+i>       _;_. +    .i_,=:_.      -`: PARTICULAR PURPOSE. See the GNU +..}^=.=       =       ; General Public License for more +++=   -.     .`     .: details. + :     =  ...= . :.=- + -.   .:....=;==+<; You should have received a copy of the GNU +  -_. . .   )=.  = General Public License along with +    --        :-=` this library; see the file COPYING.LIB. + If not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + +*/ + + #include "inputDialog.h" #include #include -#include -#include #include #include @@ -22,9 +53,9 @@ InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags setCaption( tr( name ) ); QPushButton *browserButton; - browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton"); - browserButton->setGeometry( QRect( 205, 10, 22, 22)); - connect( browserButton, SIGNAL(released()),this,SLOT(browse())); + //browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton"); + //browserButton->setGeometry( QRect( 205, 10, 22, 22)); + //connect( browserButton, SIGNAL(released()),this,SLOT(browse())); LineEdit1 = new QLineEdit( this, "LineEdit1" ); LineEdit1->setGeometry( QRect( 4, 10, 190, 22 ) ); LineEdit1->setFocus(); @@ -33,7 +64,7 @@ InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags * return the current text(input) */ QString InputDialog::text() const { - return LineEdit1->text(); + return LineEdit1->text(); } /* * Destroys the object and frees any allocated resources @@ -41,29 +72,3 @@ QString InputDialog::text() const { InputDialog::~InputDialog() { } -void InputDialog::browse() { - Config cfg( "OpiePlayer" ); - cfg.setGroup("Dialog"); - MimeTypes types; - QStringList audio, video, all; - audio << "audio/*"; - audio << "playlist/plain"; - audio << "audio/x-mpegurl"; - - video << "video/*"; - video << "playlist/plain"; - - all += audio; - all += video; - types.insert("All Media Files", all ); - types.insert("Audio", audio ); - types.insert("Video", video ); - - QString str = OFileDialog::getOpenFileName( 1, - cfg.readEntry("LastDirectory",QPEApplication::documentDir()),"", - types, 0 ); - if(str.left(2) == "//") str=str.right(str.length()-1); - LineEdit1->setText(str); - cfg.writeEntry("LastDirectory" ,QFileInfo(str).dirPath()); -} - diff --git a/noncore/multimedia/opieplayer2/inputDialog.h b/noncore/multimedia/opieplayer2/inputDialog.h index 0f36ea4..f64f6d4 100644 --- a/noncore/multimedia/opieplayer2/inputDialog.h +++ b/noncore/multimedia/opieplayer2/inputDialog.h @@ -1,3 +1,36 @@ +/* +                This file is part of the Opie Project + +              Copyright (c) 2002,2003 Max Reiss + Copyright (c) 2002 L. Potter + =. + .=l. +           .>+-= + _;:,     .>    :=|. This program is free software; you can +.> <`_,   >  .   <= redistribute it and/or modify it under +:`=1 )Y*s>-.--   : the terms of the GNU General Public +.="- .-=="i,     .._ License as published by the Free Software + - .   .-<_>     .<> Foundation; either version 2 of the License, +     ._= =}       : or (at your option) any later version. +    .%`+i>       _;_. +    .i_,=:_.      -`: PARTICULAR PURPOSE. See the GNU +..}^=.=       =       ; General Public License for more +++=   -.     .`     .: details. + :     =  ...= . :.=- + -.   .:....=;==+<; You should have received a copy of the GNU +  -_. . .   )=.  = General Public License along with +    --        :-=` this library; see the file COPYING.LIB. + If not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + +*/ + + #ifndef INPUTDIALOG_H #define INPUTDIALOG_H @@ -18,8 +51,6 @@ public: private: QLineEdit* LineEdit1; -protected slots: - void browse(); }; #endif // INPUTDIALOG_H diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index c91a565..4e31670 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp @@ -1,7 +1,7 @@ /*                 This file is part of the Opie Project -              Copyright (c) 2002 Max Reiss +              Copyright (c) 2002,2003 Max Reiss Copyright (c) 2002 L. Potter Copyright (c) 2002 Holger Freyther =. @@ -37,6 +37,9 @@ #include #include #include +#include + +#include #include #include @@ -85,8 +88,10 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par (void)new MenuItem( pmPlayList, tr( "Save Playlist" ), this, SLOT(writem3u() ) ); pmPlayList->insertSeparator(-1); - (void)new MenuItem( pmPlayList, tr( "Open File or URL" ), + (void)new MenuItem( pmPlayList, tr( "Add File" ), this,SLOT( openFile() ) ); + (void)new MenuItem( pmPlayList, tr("Add URL"), + this,SLOT( openURL() ) ); pmPlayList->insertSeparator(-1); (void)new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ), audioView, SLOT( scanFiles() ) ); @@ -327,7 +332,7 @@ void PlayListWidget::setDocument( const QString& fileref ) { // qDebug( "<<<<<<<>>>>>>>>> "+fileref ); fromSetDocument = TRUE; QFileInfo fileInfo(fileref); - + if ( !fileInfo.exists() ) { QMessageBox::warning( this, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) ); @@ -337,7 +342,7 @@ void PlayListWidget::setDocument( const QString& fileref ) { clearList(); QString extension = fileInfo.extension(false); - if( extension.find( "m3u", 0, false) != -1 + if( extension.find( "m3u", 0, false) != -1 || extension.find( "pls", 0, false) != -1 ) { readListFromFile( fileref ); } else { @@ -602,12 +607,12 @@ bool PlayListWidget::inFileListMode() const return tab == AudioFiles || tab == VideoFiles; } -void PlayListWidget::openFile() { - // http://66.28.164.33:2080 - // http://somafm.com/star0242.m3u +void PlayListWidget::openURL() { + // http://66.28.164.33:2080 + // http://somafm.com/star0242.m3u QString filename, name; InputDialog *fileDlg; - fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0); + fileDlg = new InputDialog(this,tr("Add URL"),TRUE, 0); fileDlg->exec(); if( fileDlg->result() == 1 ) { filename = fileDlg->text(); @@ -653,6 +658,55 @@ void PlayListWidget::openFile() { delete fileDlg; } + +void PlayListWidget::openFile() { + + QString filename, name; + + Config cfg( "OpiePlayer" ); + cfg.setGroup("Dialog"); + MimeTypes types; + QStringList audio, video, all; + audio << "audio/*"; + audio << "playlist/plain"; + audio << "audio/x-mpegurl"; + + video << "video/*"; + video << "playlist/plain"; + + all += audio; + all += video; + types.insert("All Media Files", all ); + types.insert("Audio", audio ); + types.insert("Video", video ); + + QString str = OFileDialog::getOpenFileName( 1, + cfg.readEntry("LastDirectory",QPEApplication::documentDir()),"", + types, 0 ); + if(str.left(2) == "//") str=str.right(str.length()-1); + cfg.writeEntry("LastDirectory" ,QFileInfo(str).dirPath()); + + + if( !str.isEmpty() ) { + qDebug( "Selected filename is " + str ); + filename = str; + DocLnk lnk; + Config cfg( "OpiePlayer" ); + cfg.setGroup("PlayList"); + + if( filename.right( 3) == "m3u" || filename.right(3) == "pls" ) { + readListFromFile( filename ); + } else { + lnk.setName( QFileInfo(filename).baseName() ); //sets name + lnk.setFile( filename ); //sets file name + d->selectedFiles->addToSelection( lnk); + writeCurrentM3u(); + d->selectedFiles->setSelectedItem( lnk.name()); + } + } +} + + void PlayListWidget::readListFromFile( const QString &filename ) { qDebug( "read list filename " + filename ); QFileInfo fi(filename); @@ -676,7 +730,7 @@ void PlayListWidget::readListFromFile( const QString &filename ) { } else { //is file lnk.setName( QFileInfo(s).baseName()); if(s.left(1) != "/") { - + lnk.setFile( QFileInfo(filename).dirPath()+"/"+s); } else { lnk.setFile( s); @@ -744,7 +798,7 @@ void PlayListWidget::writem3u() { if( filename.right( 3 ) != "m3u" ) //needs filename extension filename += ".m3u"; - + if( d->selectedFiles->first()) { //ramble through playlist view m3uList = new Om3u( filename, IO_ReadWrite | IO_Truncate); @@ -931,9 +985,9 @@ void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) { } else if ( msg == "togglePause()" ) { mediaPlayerState.togglePaused(); } else if ( msg == "next()" ) { //select next in list - mediaPlayerState.setNext(); + mediaPlayerState.setNext(); } else if ( msg == "prev()" ) { //select previous in list - mediaPlayerState.setPrev(); + mediaPlayerState.setPrev(); } else if ( msg == "toggleLooping()" ) { //loop or not loop mediaPlayerState.toggleLooping(); } else if ( msg == "toggleShuffled()" ) { //shuffled or not shuffled @@ -961,5 +1015,5 @@ void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) { stream >> file; } - + } diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h index 54e9d16..5230b03 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.h +++ b/noncore/multimedia/opieplayer2/playlistwidget.h @@ -1,7 +1,7 @@ /*                 This file is part of the Opie Project -              Copyright (c) 2002 Max Reiss +              Copyright (c) 2002,2003 Max Reiss Copyright (c) 2002 L. Potter Copyright (c) 2002 Holger Freyther =. @@ -111,6 +111,7 @@ private slots: void writem3u(); void writeCurrentM3u(); void openFile(); + void openURL(); void setDocument( const QString& fileref ); void addToSelection( const DocLnk& ); // Add a media file to the playlist void addToSelection( QListViewItem* ); // Add a media file to the playlist -- cgit v0.9.0.2