X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs%2Fopen.cpp;h=3b157888fbc00d416757ccbfc6d40d46d865b484;hb=1644d683e9df1620685ed666865b4752bfcca3a0;hp=58d890857e500dfba6f324c0688dddd17a5be303;hpb=ef3ddcbd1d236a32ab8d9e57af1500118914a341;p=vlc diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp index 58d890857e..3b157888fb 100644 --- a/modules/gui/qt4/dialogs/open.cpp +++ b/modules/gui/qt4/dialogs/open.cpp @@ -1,8 +1,8 @@ /***************************************************************************** * open.cpp : Advanced open dialog ***************************************************************************** - * Copyright (C) 2006 the VideoLAN team - * $Id: streaminfo.cpp 16816 2006-09-23 20:56:52Z jb $ + * Copyright © 2006-2009 the VideoLAN team + * $Id$ * * Authors: Jean-Baptiste Kempf * @@ -21,210 +21,410 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include "dialogs/open.hpp" + +#include "dialogs_provider.hpp" + +#include "recents.hpp" +#include "util/qt_dirs.hpp" + #include #include -#include #include #include -#include "dialogs/open.hpp" -#include "components/open.hpp" - -#include "qt4.hpp" -#include "util/qvlcframe.hpp" -#include "input_manager.hpp" -#include "dialogs_provider.hpp" +#define DEBUG_QT 1 OpenDialog *OpenDialog::instance = NULL; -OpenDialog::OpenDialog( QWidget *parent, intf_thread_t *_p_intf, bool modal ) : - QVLCDialog( parent, _p_intf ) +OpenDialog* OpenDialog::getInstance( QWidget *parent, intf_thread_t *p_intf, + bool b_rawInstance, int _action_flag, bool b_selectMode, bool _b_pl ) { - setModal( modal ); - ui.setupUi( this ); - setWindowTitle( qtr("Open" ) ); - resize( 500, 300); + /* Creation */ + if( !instance ) + instance = new OpenDialog( parent, p_intf, b_selectMode, + _action_flag, _b_pl ); + else if( !b_rawInstance ) + { + /* Request the instance but change small details: + - Button menu */ + if( b_selectMode ) + _action_flag = SELECT; /* This should be useless, but we never know + if the call is correct */ + instance->setWindowModality( Qt::WindowModal ); + instance->i_action_flag = _action_flag; + instance->b_pl = _b_pl; + instance->setMenuAction(); + } + return instance; +} + +OpenDialog::OpenDialog( QWidget *parent, + intf_thread_t *_p_intf, + bool b_selectMode, + int _action_flag, + bool _b_pl) : QVLCDialog( parent, _p_intf ) +{ + i_action_flag = _action_flag; + b_pl =_b_pl; - fileOpenPanel = new FileOpenPanel( this , p_intf ); - diskOpenPanel = new DiskOpenPanel( this , p_intf ); - netOpenPanel = new NetOpenPanel( this , p_intf ); + if( b_selectMode ) /* Select mode */ + i_action_flag = SELECT; + + /* Basic Creation of the Window */ + ui.setupUi( this ); + setWindowTitle( qtr( "Open Media" ) ); + setWindowRole( "vlc-open-media" ); + setWindowModality( Qt::WindowModal ); + + /* Tab definition and creation */ + fileOpenPanel = new FileOpenPanel( this, p_intf ); + discOpenPanel = new DiscOpenPanel( this, p_intf ); + netOpenPanel = new NetOpenPanel( this, p_intf ); captureOpenPanel = new CaptureOpenPanel( this, p_intf ); - ui.Tab->addTab( fileOpenPanel, qtr( "&File" ) ); - ui.Tab->addTab( diskOpenPanel, qtr( "&Disc" ) ); - ui.Tab->addTab( netOpenPanel, qtr( "&Network" ) ); - ui.Tab->addTab( captureOpenPanel, qtr( "Capture &Device" ) ); + /* Insert the tabs */ + ui.Tab->insertTab( OPEN_FILE_TAB, fileOpenPanel, QIcon( ":/type/folder-grey" ), + qtr( "&File" ) ); + ui.Tab->insertTab( OPEN_DISC_TAB, discOpenPanel, QIcon( ":/type/disc" ), + qtr( "&Disc" ) ); + ui.Tab->insertTab( OPEN_NETWORK_TAB, netOpenPanel, QIcon( ":/type/network" ), + qtr( "&Network" ) ); + ui.Tab->insertTab( OPEN_CAPTURE_TAB, captureOpenPanel, + QIcon( ":/type/capture-card" ), qtr( "Capture &Device" ) ); - ui.advancedFrame->hide(); + /* Hide the Slave input widgets */ + ui.slaveLabel->hide(); + ui.slaveText->hide(); + ui.slaveBrowseButton->hide(); - QMenu * openButtonMenu = new QMenu( "Open" ); - openButtonMenu->addAction( qtr("&Enqueue"), this, SLOT( enqueue() ), - QKeySequence( "Alt+E") ); - openButtonMenu->addAction( qtr("&Stream"), this, SLOT( stream() ) , - QKeySequence( "Alt+T" ) ); + /* Buttons Creation */ + /* Play Button */ + playButton = ui.playButton; - ui.playButton->setMenu( openButtonMenu ); - /* Force MRL update on tab change */ - CONNECT( ui.Tab, currentChanged(int), this, signalCurrent()); + /* Cancel Button */ + cancelButton = new QPushButton( qtr( "&Cancel" ) ); + + /* Select Button */ + selectButton = new QPushButton( qtr( "&Select" ) ); - CONNECT( fileOpenPanel, mrlUpdated( QString ), this, updateMRL(QString) ); - CONNECT( netOpenPanel, mrlUpdated( QString ), this, updateMRL(QString) ); - CONNECT( diskOpenPanel, mrlUpdated( QString ), this, updateMRL(QString) ); - CONNECT( captureOpenPanel, mrlUpdated( QString ), this, - updateMRL(QString) ); + /* Menu for the Play button */ + QMenu * openButtonMenu = new QMenu( "Open" ); + openButtonMenu->addAction( qtr( "&Enqueue" ), this, SLOT( enqueue() ), + QKeySequence( "Alt+E" ) ); + openButtonMenu->addAction( qtr( "&Play" ), this, SLOT( play() ), + QKeySequence( "Alt+P" ) ); + openButtonMenu->addAction( qtr( "&Stream" ), this, SLOT( stream() ) , + QKeySequence( "Alt+S" ) ); + openButtonMenu->addAction( qtr( "&Convert" ), this, SLOT( transcode() ) , + QKeySequence( "Alt+C" ) ); + playButton->setMenu( openButtonMenu ); - CONNECT( fileOpenPanel, methodChanged( QString ), - this, newMethod(QString) ); - CONNECT( netOpenPanel, methodChanged( QString ), - this, newMethod(QString) ); - CONNECT( diskOpenPanel, methodChanged( QString ), - this, newMethod(QString) ); + /* Add the three Buttons */ + ui.buttonsBox->addButton( selectButton, QDialogButtonBox::AcceptRole ); + ui.buttonsBox->addButton( cancelButton, QDialogButtonBox::RejectRole ); - CONNECT( ui.slaveText, textChanged(QString), this, updateMRL()); - CONNECT( ui.cacheSpinBox, valueChanged(int), this, updateMRL()); + /* At creation time, modify the default buttons */ + setMenuAction(); - BUTTONACT( ui.playButton, play()); - BUTTONACT( ui.cancelButton, cancel()); - BUTTONACT( ui.advancedCheckBox , toggleAdvancedPanel() ); + /* Force MRL update on tab change */ + CONNECT( ui.Tab, currentChanged( int ), this, signalCurrent( int ) ); + + CONNECT( fileOpenPanel, mrlUpdated( const QStringList&, const QString& ), + this, updateMRL( const QStringList&, const QString& ) ); + CONNECT( netOpenPanel, mrlUpdated( const QStringList&, const QString& ), + this, updateMRL( const QStringList&, const QString& ) ); + CONNECT( discOpenPanel, mrlUpdated( const QStringList&, const QString& ), + this, updateMRL( const QStringList&, const QString& ) ); + CONNECT( captureOpenPanel, mrlUpdated( const QStringList&, const QString& ), + this, updateMRL( const QStringList&, const QString& ) ); + + CONNECT( fileOpenPanel, methodChanged( const QString& ), + this, newCachingMethod( const QString& ) ); + CONNECT( netOpenPanel, methodChanged( const QString& ), + this, newCachingMethod( const QString& ) ); + CONNECT( discOpenPanel, methodChanged( const QString& ), + this, newCachingMethod( const QString& ) ); + CONNECT( captureOpenPanel, methodChanged( const QString& ), + this, newCachingMethod( const QString& ) ); + + /* Advanced frame Connects */ + CONNECT( ui.slaveCheckbox, toggled( bool ), this, updateMRL() ); + CONNECT( ui.slaveText, textChanged( const QString& ), this, updateMRL() ); + CONNECT( ui.cacheSpinBox, valueChanged( int ), this, updateMRL() ); + CONNECT( ui.startTimeDoubleSpinBox, valueChanged( double ), this, updateMRL() ); + BUTTONACT( ui.advancedCheckBox, toggleAdvancedPanel() ); + BUTTONACT( ui.slaveBrowseButton, browseInputSlave() ); + + /* Buttons action */ + BUTTONACT( playButton, selectSlots() ); + BUTTONACT( selectButton, close() ); + BUTTONACT( cancelButton, cancel() ); + + /* Hide the advancedPanel */ + if( !var_InheritBool( p_intf, "qt-adv-options" ) ) + ui.advancedFrame->hide(); + else + ui.advancedCheckBox->setChecked( true ); /* Initialize caching */ storedMethod = ""; - newMethod("file-caching"); + newCachingMethod( "file-caching" ); - mainHeight = advHeight = 0; + setMinimumSize( sizeHint() ); + setMaximumWidth( 900 ); + resize( getSettings()->value( "opendialog-size", QSize( 500, 490 ) ).toSize() ); } OpenDialog::~OpenDialog() { + getSettings()->setValue( "opendialog-size", size() ); } -void OpenDialog::showTab(int i_tab=0) +/* Used by VLM dialog and inputSlave selection */ +QString OpenDialog::getMRL( bool b_all ) { - this->show(); - ui.Tab->setCurrentIndex(i_tab); + if( itemsMRL.size() == 0 ) return ""; + return b_all ? itemsMRL[0] + ui.advancedLineInput->text() + : itemsMRL[0]; } -void OpenDialog::signalCurrent() { - if (ui.Tab->currentWidget() != NULL) { - (dynamic_cast(ui.Tab->currentWidget()))->updateMRL(); +/* Finish the dialog and decide if you open another one after */ +void OpenDialog::setMenuAction() +{ + if( i_action_flag == SELECT ) + { + playButton->hide(); + selectButton->show(); + selectButton->setDefault( true ); + } + else + { + switch ( i_action_flag ) + { + case OPEN_AND_STREAM: + playButton->setText( qtr( "&Stream" ) ); + break; + case OPEN_AND_SAVE: + playButton->setText( qtr( "&Convert / Save" ) ); + break; + case OPEN_AND_ENQUEUE: + playButton->setText( qtr( "&Enqueue" ) ); + break; + case OPEN_AND_PLAY: + default: + playButton->setText( qtr( "&Play" ) ); + } + playButton->show(); + selectButton->hide(); } } +void OpenDialog::showTab( int i_tab ) +{ + if( i_tab == OPEN_CAPTURE_TAB ) captureOpenPanel->initialize(); + ui.Tab->setCurrentIndex( i_tab ); + show(); +} + +/* Function called on signal currentChanged triggered */ +void OpenDialog::signalCurrent( int i_tab ) +{ + if( i_tab == OPEN_CAPTURE_TAB ) captureOpenPanel->initialize(); + + if( ui.Tab->currentWidget() != NULL ) + ( dynamic_cast( ui.Tab->currentWidget() ) )->updateMRL(); +} + +void OpenDialog::toggleAdvancedPanel() +{ + if( ui.advancedFrame->isVisible() ) + { + ui.advancedFrame->hide(); + if( size().isValid() ) + resize( size().width(), size().height() + - ui.advancedFrame->height() ); + } + else + { + ui.advancedFrame->show(); + if( size().isValid() ) + resize( size().width(), size().height() + + ui.advancedFrame->height() ); + } +} + +/*********** + * Actions * + ***********/ +/* If Cancel is pressed or escaped */ void OpenDialog::cancel() { - fileOpenPanel->clear(); - this->toggleVisible(); - if( isModal() ) - reject(); + /* Clear the panels */ + for( int i = 0; i < OPEN_TAB_MAX; i++ ) + dynamic_cast( ui.Tab->widget( i ) )->clear(); + + /* Clear the variables */ + itemsMRL.clear(); + optionsMRL.clear(); + + /* If in Select Mode, reject instead of hiding */ + if( i_action_flag == SELECT ) reject(); + else hide(); +} + +/* If EnterKey is pressed */ +void OpenDialog::close() +{ + /* If in Select Mode, accept instead of selecting a Slot */ + if( i_action_flag == SELECT ) + accept(); + else + selectSlots(); +} + +/* Play button */ +void OpenDialog::selectSlots() +{ + switch ( i_action_flag ) + { + case OPEN_AND_STREAM: + stream(); + break; + case OPEN_AND_SAVE: + transcode(); + break; + case OPEN_AND_ENQUEUE: + enqueue(); + break; + case OPEN_AND_PLAY: + default: + play(); + } } void OpenDialog::play() { - playOrEnqueue( false ); + finish( false ); } void OpenDialog::enqueue() { - playOrEnqueue( true ); + finish( true ); } -void OpenDialog::playOrEnqueue( bool b_enqueue = false ) + +void OpenDialog::finish( bool b_enqueue = false ) { - this->toggleVisible(); - mrl = ui.advancedLineInput->text(); + toggleVisible(); - if( !isModal() ) + if( i_action_flag == SELECT ) { - QStringList tempMRL = SeparateEntries( mrl ); - for( size_t i = 0; i < tempMRL.size(); i++ ) - { - bool b_start = !i && !b_enqueue; - input_item_t *p_input; - const char *psz_utf8 = qtu( tempMRL[i] ); + accept(); + return; + } - p_input = input_ItemNew( p_intf, psz_utf8, NULL ); + /* Sort alphabetically */ + itemsMRL.sort(); - /* Insert options */ - while( i + 1 < tempMRL.size() && tempMRL[i + 1].startsWith( ":" ) ) - { - i++; - psz_utf8 = qtu( tempMRL[i] ); - input_ItemAddOption( p_input, psz_utf8 ); - } + /* Go through the item list */ + for( int i = 0; i < itemsMRL.size(); i++ ) + { + bool b_start = !i && !b_enqueue; - if( b_start ) - { - playlist_AddInput( THEPL, p_input, - PLAYLIST_APPEND | PLAYLIST_GO, - PLAYLIST_END, VLC_TRUE, VLC_FALSE ); - } - else + input_item_t *p_input; + char* psz_uri = make_URI( qtu( itemsMRL[i] ), "file" ); + p_input = input_item_New( p_intf, psz_uri, NULL ); + free( psz_uri ); + + /* Insert options only for the first element. + We don't know how to edit that anyway. */ + if( i == 0 ) + { + /* Take options from the UI, not from what we stored */ + QStringList optionsList = ui.advancedLineInput->text().split( " :" ); + + /* Insert options */ + for( int j = 0; j < optionsList.size(); j++ ) { - playlist_AddInput( THEPL, p_input, - PLAYLIST_APPEND|PLAYLIST_PREPARSE, - PLAYLIST_END, VLC_TRUE, VLC_FALSE ); + QString qs = colon_unescape( optionsList[j] ); + if( !qs.isEmpty() ) + { + input_item_AddOption( p_input, qtu( qs ), + VLC_INPUT_OPTION_TRUSTED ); +#ifdef DEBUG_QT + msg_Warn( p_intf, "Input option: %s", qtu( qs ) ); +#endif + } } } + + /* Switch between enqueuing and starting the item */ + /* FIXME: playlist_AddInput() can fail */ + playlist_AddInput( THEPL, p_input, + PLAYLIST_APPEND | ( b_start ? PLAYLIST_GO : PLAYLIST_PREPARSE ), + PLAYLIST_END, b_pl ? true : false, pl_Unlocked ); + vlc_gc_decref( p_input ); + + /* Do not add the current MRL if playlist_AddInput fail */ + RecentsMRL::getInstance( p_intf )->addRecent( itemsMRL[i] ); } - else - accept(); } -void OpenDialog::stream() +void OpenDialog::transcode() { -//TODO. Policy not yet defined + stream( true ); } -void OpenDialog::toggleAdvancedPanel() +void OpenDialog::stream( bool b_transcode_only ) { - //FIXME does not work under Windows - if (ui.advancedFrame->isVisible()) { - ui.advancedFrame->hide(); - setMinimumHeight(1); - resize( width(), mainHeight ); - - } else { - if( mainHeight == 0 ) - mainHeight = height(); + QString soutMRL = getMRL( false ); + if( soutMRL.isEmpty() ) return; + toggleVisible(); + + /* Dbg and send :D */ + msg_Dbg( p_intf, "MRL passed to the Sout: %s", qtu( soutMRL ) ); + THEDP->streamingDialog( this, soutMRL, b_transcode_only, + ui.advancedLineInput->text().split( " :" ) ); +} - ui.advancedFrame->show(); - if( advHeight == 0 ) { - advHeight = height() - mainHeight; - } - resize( width(), mainHeight + advHeight ); - } +/* Update the MRL */ +void OpenDialog::updateMRL( const QStringList& item, const QString& tempMRL ) +{ + optionsMRL = tempMRL; + itemsMRL = item; + updateMRL(); } void OpenDialog::updateMRL() { - mrl = mainMRL; + QString mrl = optionsMRL; if( ui.slaveCheckbox->isChecked() ) { mrl += " :input-slave=" + ui.slaveText->text(); } - int i_cache = config_GetInt( p_intf, qta(storedMethod) ); - if( i_cache != ui.cacheSpinBox->value() ) { - mrl += QString(" :%1=%2").arg(storedMethod). - arg(ui.cacheSpinBox->value()); + mrl += QString( " :%1=%2" ).arg( storedMethod ). + arg( ui.cacheSpinBox->value() ); + if( ui.startTimeDoubleSpinBox->value() ) { + mrl += " :start-time=" + QString::number( ui.startTimeDoubleSpinBox->value() ); } - ui.advancedLineInput->setText(mrl); + ui.advancedLineInput->setText( mrl ); + ui.mrlLine->setText( itemsMRL.join( " " ) ); } -void OpenDialog::updateMRL(QString tempMRL) -{ - mainMRL = tempMRL; - updateMRL(); -} - -void OpenDialog::newMethod(QString method) +void OpenDialog::newCachingMethod( const QString& method ) { if( method != storedMethod ) { storedMethod = method; - int i_value = config_GetInt( p_intf, qta(storedMethod) ); - ui.cacheSpinBox->setValue(i_value); + int i_value = var_InheritInteger( p_intf, qtu( storedMethod ) ); + ui.cacheSpinBox->setValue( i_value ); } } -QStringList OpenDialog::SeparateEntries( QString entries ) +QStringList OpenDialog::SeparateEntries( const QString& entries ) { bool b_quotes_mode = false; @@ -271,3 +471,11 @@ QStringList OpenDialog::SeparateEntries( QString entries ) return entries_array; } + +void OpenDialog::browseInputSlave() +{ + OpenDialog *od = new OpenDialog( this, p_intf, true, SELECT ); + od->exec(); + ui.slaveText->setText( od->getMRL( false ) ); + delete od; +}