X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs%2Fopen.cpp;h=bb45cfafdd0e0417eb7d1a29149fc981cc288cf5;hb=965c64221f5d91443e9ee2993b758beb132d00d5;hp=0e0b5b212761ce29d1b35af7ad5b2e565e4017d3;hpb=9a801558d77879b1b7a99db0214117016b32380f;p=vlc diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp index 0e0b5b2127..bb45cfafdd 100644 --- a/modules/gui/qt4/dialogs/open.cpp +++ b/modules/gui/qt4/dialogs/open.cpp @@ -1,7 +1,7 @@ /***************************************************************************** * open.cpp : Advanced open dialog ***************************************************************************** - * Copyright © 2006-2007 the VideoLAN team + * Copyright © 2006-2009 the VideoLAN team * $Id$ * * Authors: Jean-Baptiste Kempf @@ -20,71 +20,82 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ + #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include "input_manager.hpp" - #include "dialogs/open.hpp" +#include "dialogs_provider.hpp" + +#include "recents.hpp" +#include "util/qt_dirs.hpp" + #include #include -#include #include #include +#define DEBUG_QT 1 + OpenDialog *OpenDialog::instance = NULL; OpenDialog* OpenDialog::getInstance( QWidget *parent, intf_thread_t *p_intf, - int _action_flag, bool modal ) + bool b_rawInstance, int _action_flag, bool b_selectMode, bool _b_pl ) { /* Creation */ if( !instance ) - instance = new OpenDialog( parent, p_intf, modal, _action_flag ); - else + 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 - - Modality on top of the parent dialog */ + - 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(); - if( modal ) instance->setWindowModality( Qt::WindowModal ); } return instance; } OpenDialog::OpenDialog( QWidget *parent, intf_thread_t *_p_intf, - bool modal, - int _action_flag ) : QVLCDialog( parent, _p_intf ) + bool b_selectMode, + int _action_flag, + bool _b_pl) : QVLCDialog( parent, _p_intf ) { i_action_flag = _action_flag; + b_pl =_b_pl; - if( modal ) /* Select mode */ - { - setWindowModality( Qt::WindowModal ); + if( b_selectMode ) /* Select mode */ i_action_flag = SELECT; - } /* Basic Creation of the Window */ ui.setupUi( this ); - setWindowTitle( qtr( "Open" ) ); - /* resize( 410, 600 ); */ - setMinimumSize( 520, 460 ); + setWindowTitle( qtr( "Open Media" ) ); + setWindowRole( "vlc-open-media" ); + setWindowModality( Qt::WindowModal ); /* Tab definition and creation */ - fileOpenPanel = new FileOpenPanel( ui.Tab, p_intf ); - discOpenPanel = new DiscOpenPanel( ui.Tab, p_intf ); - netOpenPanel = new NetOpenPanel( ui.Tab, p_intf ); - captureOpenPanel = new CaptureOpenPanel( ui.Tab, p_intf ); + fileOpenPanel = new FileOpenPanel( this, p_intf ); + discOpenPanel = new DiscOpenPanel( this, p_intf ); + netOpenPanel = new NetOpenPanel( this, p_intf ); + captureOpenPanel = new CaptureOpenPanel( this, p_intf ); /* Insert the tabs */ - ui.Tab->insertTab( OPEN_FILE_TAB, fileOpenPanel, qtr( "&File" ) ); - ui.Tab->insertTab( OPEN_DISC_TAB, discOpenPanel, qtr( "&Disc" ) ); - ui.Tab->insertTab( OPEN_NETWORK_TAB, netOpenPanel, qtr( "&Network" ) ); + 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, - qtr( "Capture &Device" ) ); + QIcon( ":/type/capture-card" ), qtr( "Capture &Device" ) ); /* Hide the Slave input widgets */ ui.slaveLabel->hide(); @@ -99,7 +110,7 @@ OpenDialog::OpenDialog( QWidget *parent, cancelButton = new QPushButton( qtr( "&Cancel" ) ); /* Select Button */ - selectButton = new QPushButton( qtr( "Select" ) ); + selectButton = new QPushButton( qtr( "&Select" ) ); /* Menu for the Play button */ QMenu * openButtonMenu = new QMenu( "Open" ); @@ -112,7 +123,7 @@ OpenDialog::OpenDialog( QWidget *parent, openButtonMenu->addAction( qtr( "&Convert" ), this, SLOT( transcode() ) , QKeySequence( "Alt+C" ) ); - ui.menuButton->setMenu( openButtonMenu ); + playButton->setMenu( openButtonMenu ); /* Add the three Buttons */ ui.buttonsBox->addButton( selectButton, QDialogButtonBox::AcceptRole ); @@ -122,27 +133,33 @@ OpenDialog::OpenDialog( QWidget *parent, setMenuAction(); /* Force MRL update on tab change */ - CONNECT( ui.Tab, currentChanged( int ), this, signalCurrent() ); - - CONNECT( fileOpenPanel, mrlUpdated( QString ), this, updateMRL( QString ) ); - CONNECT( netOpenPanel, mrlUpdated( QString ), this, updateMRL( QString ) ); - CONNECT( discOpenPanel, mrlUpdated( QString ), this, updateMRL( QString ) ); - CONNECT( captureOpenPanel, mrlUpdated( QString ), this, updateMRL( QString ) ); - - CONNECT( fileOpenPanel, methodChanged( QString ), - this, newCachingMethod( QString ) ); - CONNECT( netOpenPanel, methodChanged( QString ), - this, newCachingMethod( QString ) ); - CONNECT( discOpenPanel, methodChanged( QString ), - this, newCachingMethod( QString ) ); - CONNECT( captureOpenPanel, methodChanged( QString ), - this, newCachingMethod( QString ) ); + 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.slaveText, textChanged( QString ), this, updateMRL() ); + CONNECT( ui.slaveCheckbox, toggled( bool ), this, updateMRL() ); + CONNECT( ui.slaveText, textChanged( const QString& ), this, updateMRL() ); CONNECT( ui.cacheSpinBox, valueChanged( int ), this, updateMRL() ); - CONNECT( ui.startTimeSpinBox, valueChanged( int ), this, updateMRL() ); - BUTTONACT( ui.advancedCheckBox , toggleAdvancedPanel() ); + CONNECT( ui.startTimeDoubleSpinBox, valueChanged( double ), this, updateMRL() ); + BUTTONACT( ui.advancedCheckBox, toggleAdvancedPanel() ); + BUTTONACT( ui.slaveBrowseButton, browseInputSlave() ); /* Buttons action */ BUTTONACT( playButton, selectSlots() ); @@ -150,7 +167,7 @@ OpenDialog::OpenDialog( QWidget *parent, BUTTONACT( cancelButton, cancel() ); /* Hide the advancedPanel */ - if( !config_GetInt( p_intf, "qt-adv-options" ) ) + if( !var_InheritBool( p_intf, "qt-adv-options" ) ) ui.advancedFrame->hide(); else ui.advancedCheckBox->setChecked( true ); @@ -158,10 +175,24 @@ OpenDialog::OpenDialog( QWidget *parent, /* Initialize caching */ storedMethod = ""; newCachingMethod( "file-caching" ); + + setMinimumSize( sizeHint() ); + setMaximumWidth( 900 ); + resize( getSettings()->value( "opendialog-size", QSize( 500, 490 ) ).toSize() ); } OpenDialog::~OpenDialog() -{} +{ + getSettings()->setValue( "opendialog-size", size() ); +} + +/* Used by VLM dialog and inputSlave selection */ +QString OpenDialog::getMRL( bool b_all ) +{ + if( itemsMRL.size() == 0 ) return ""; + return b_all ? itemsMRL[0] + ui.advancedLineInput->text() + : itemsMRL[0]; +} /* Finish the dialog and decide if you open another one after */ void OpenDialog::setMenuAction() @@ -190,20 +221,22 @@ void OpenDialog::setMenuAction() playButton->setText( qtr( "&Play" ) ); } playButton->show(); - playButton->setDefault( true ); selectButton->hide(); } } -void OpenDialog::showTab( int i_tab=0 ) +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() +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(); } @@ -213,7 +246,6 @@ void OpenDialog::toggleAdvancedPanel() if( ui.advancedFrame->isVisible() ) { ui.advancedFrame->hide(); - //setMinimumSize( 520, 460 ); if( size().isValid() ) resize( size().width(), size().height() - ui.advancedFrame->height() ); @@ -221,7 +253,6 @@ void OpenDialog::toggleAdvancedPanel() else { ui.advancedFrame->show(); - //setMinimumSize( 520, 460 + ui.advancedFrame->height() ); if( size().isValid() ) resize( size().width(), size().height() + ui.advancedFrame->height() ); @@ -239,18 +270,19 @@ void OpenDialog::cancel() dynamic_cast( ui.Tab->widget( i ) )->clear(); /* Clear the variables */ - mrl.clear(); - mainMRL.clear(); + itemsMRL.clear(); + optionsMRL.clear(); /* If in Select Mode, reject instead of hiding */ - if( windowModality() != Qt::NonModal ) reject(); + if( i_action_flag == SELECT ) reject(); else hide(); } /* If EnterKey is pressed */ void OpenDialog::close() { - if( windowModality() != Qt::NonModal ) + /* If in Select Mode, accept instead of selecting a Slot */ + if( i_action_flag == SELECT ) accept(); else selectSlots(); @@ -290,34 +322,58 @@ void OpenDialog::enqueue() void OpenDialog::finish( bool b_enqueue = false ) { toggleVisible(); - mrl = ui.advancedLineInput->text(); - if( windowModality() == Qt::NonModal ) + 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; + accept(); + return; + } + + /* Sort alphabetically */ + itemsMRL.sort(); + + /* Go through the item list */ + for( int i = 0; i < itemsMRL.size(); i++ ) + { + bool b_start = !i && !b_enqueue; - p_input = input_ItemNew( p_intf, qtu( tempMRL[i] ), NULL ); + input_item_t *p_input; + char* psz_uri = make_URI( qtu( itemsMRL[i] ) ); + 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 */ - while( i + 1 < tempMRL.size() && tempMRL[i + 1].startsWith( ":" ) ) + for( int j = 0; j < optionsList.size(); j++ ) { - i++; - input_ItemAddOption( p_input, qtu( tempMRL[i] ) ); + 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, + /* 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, VLC_TRUE, VLC_FALSE ); - } + 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::transcode() @@ -327,45 +383,48 @@ void OpenDialog::transcode() void OpenDialog::stream( bool b_transcode_only ) { - mrl = ui.advancedLineInput->text(); + QString soutMRL = getMRL( false ); + if( soutMRL.isEmpty() ) return; toggleVisible(); - THEDP->streamingDialog( this, mrl, b_transcode_only ); + + /* 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( " :" ) ); } /* Update the MRL */ -void OpenDialog::updateMRL( QString tempMRL ) +void OpenDialog::updateMRL( const QStringList& item, const QString& tempMRL ) { - mainMRL = 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() ); - } - if( ui.startTimeSpinBox->value() ) { - mrl += " :start-time=" + QString( "%1" ). - arg( ui.startTimeSpinBox->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.mrlLine->setText( itemsMRL.join( " " ) ); } -void OpenDialog::newCachingMethod( QString method ) +void OpenDialog::newCachingMethod( const QString& method ) { if( method != storedMethod ) { storedMethod = method; - int i_value = config_GetInt( p_intf, qta( storedMethod ) ); + 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; @@ -412,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; +}