/*****************************************************************************
* open.cpp : Advanced open dialog
*****************************************************************************
- * Copyright © 2006-2007 the VideoLAN team
+ * Copyright © 2006-2009 the VideoLAN team
* $Id$
*
* Authors: Jean-Baptiste Kempf <jb@videolan.org>
* 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 <QTabWidget>
#include <QGridLayout>
-#include <QFileDialog>
#include <QRegExp>
#include <QMenu>
+#define DEBUG_QT 1
+
OpenDialog *OpenDialog::instance = NULL;
OpenDialog* OpenDialog::getInstance( QWidget *parent, intf_thread_t *p_intf,
- bool b_rawInstance, int _action_flag, bool b_selectMode )
+ bool b_rawInstance, int _action_flag, bool b_selectMode, bool _b_pl )
{
/* Creation */
if( !instance )
- instance = new OpenDialog( parent, p_intf, b_selectMode, _action_flag );
+ instance = new OpenDialog( parent, p_intf, b_selectMode,
+ _action_flag, _b_pl );
else if( !b_rawInstance )
{
/* Request the instance but change small details:
if the call is correct */
}
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 ) : QVLCDialog( parent, _p_intf )
+ int _action_flag,
+ bool _b_pl) : QVLCDialog( parent, _p_intf )
{
i_action_flag = _action_flag;
+ b_pl =_b_pl;
/* Workaround the Win32 Vout that put the video on top at regular times */
#ifdef WIN32
/* Basic Creation of the Window */
ui.setupUi( this );
- setWindowTitle( qtr( "Open" ) );
- /* resize( 410, 600 ); */
- setMinimumSize( 520, 490 );
+ setWindowTitle( qtr( "Open Media" ) );
/* 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" ) );
QKeySequence( "Alt+C" ) );
ui.menuButton->setMenu( openButtonMenu );
+ ui.menuButton->setIcon( QIcon( ":/down_arrow" ) );
/* Add the three Buttons */
ui.buttonsBox->addButton( selectButton, QDialogButtonBox::AcceptRole );
/* Force MRL update on tab change */
CONNECT( ui.Tab, currentChanged( int ), this, signalCurrent( int ) );
- 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, mrlUpdated( QStringList, QString ),
+ this, updateMRL( const QStringList&, const QString& ) );
+ CONNECT( netOpenPanel, mrlUpdated( QStringList, QString ),
+ this, updateMRL( const QStringList&, const QString& ) );
+ CONNECT( discOpenPanel, mrlUpdated( QStringList, QString ),
+ this, updateMRL( const QStringList&, const QString& ) );
+ CONNECT( captureOpenPanel, mrlUpdated( QStringList, QString ),
+ this, updateMRL( const QStringList&, const QString& ) );
CONNECT( fileOpenPanel, methodChanged( QString ),
- this, newCachingMethod( QString ) );
+ this, newCachingMethod( const QString& ) );
CONNECT( netOpenPanel, methodChanged( QString ),
- this, newCachingMethod( QString ) );
+ this, newCachingMethod( const QString& ) );
CONNECT( discOpenPanel, methodChanged( QString ),
- this, newCachingMethod( QString ) );
+ this, newCachingMethod( const QString& ) );
CONNECT( captureOpenPanel, methodChanged( QString ),
- this, newCachingMethod( QString ) );
+ this, newCachingMethod( const QString& ) );
/* Advanced frame Connects */
+ CONNECT( ui.slaveCheckbox, toggled( bool ), this, updateMRL() );
CONNECT( ui.slaveText, textChanged( QString ), this, updateMRL() );
CONNECT( ui.cacheSpinBox, valueChanged( int ), this, updateMRL() );
CONNECT( ui.startTimeSpinBox, valueChanged( int ), this, updateMRL() );
storedMethod = "";
newCachingMethod( "file-caching" );
- resize( getSettings()->value( "opendialog-size", QSize( 520, 490 ) ).toSize() );
+ 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()
{
if( ui.advancedFrame->isVisible() )
{
ui.advancedFrame->hide();
- //setMinimumSize( 520, 460 );
if( size().isValid() )
resize( size().width(), size().height()
- ui.advancedFrame->height() );
else
{
ui.advancedFrame->show();
- //setMinimumSize( 520, 460 + ui.advancedFrame->height() );
if( size().isValid() )
resize( size().width(), size().height()
+ ui.advancedFrame->height() );
dynamic_cast<OpenPanel*>( 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( i_action_flag == SELECT ) reject();
void OpenDialog::finish( bool b_enqueue = false )
{
toggleVisible();
- mrl = ui.advancedLineInput->text();
- if( i_action_flag != SELECT )
+ 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_item_New( p_intf, qtu( tempMRL[i] ), NULL );
+ input_item_t *p_input;
+ p_input = input_item_New( p_intf, qtu( itemsMRL[i] ), NULL );
+
+ /* 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_item_AddOption( 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, true, pl_Unlocked );
- vlc_gc_decref( p_input );
- }
+ 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()
void OpenDialog::stream( bool b_transcode_only )
{
- mrl = ui.advancedLineInput->text();
+ QString soutMRL = getMRL( false );
+ if( soutMRL.isEmpty() ) return;
toggleVisible();
- /* Separate the entries */
- QStringList listMRL = SeparateEntries( mrl );
-
- /* We can only take the first entry since we have no idea what
- to do with many files ? Gather ? */
- if( listMRL.size() > 0 )
- {
- /* First item */
- QString soutMRL = listMRL[0];
-
- /* Keep all the :xxx options because they are needed see v4l and dshow */
- for( int i = 1; i < listMRL.size(); i++ )
- {
- if( listMRL[i].at( 0 ) == ':' )
- soutMRL.append( " " + listMRL[i] );
- else
- break;
- }
-
- /* Dbg and send :D */
- msg_Dbg( p_intf, "MRL passed to the Sout: %s", qtu( soutMRL ) );
- THEDP->streamingDialog( this, soutMRL, 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 ) );
+ int i_cache = config_GetInt( p_intf, qtu( storedMethod ) );
if( i_cache != ui.cacheSpinBox->value() ) {
mrl += QString( " :%1=%2" ).arg( storedMethod ).
arg( ui.cacheSpinBox->value() );
arg( ui.startTimeSpinBox->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 = config_GetInt( 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;
{
OpenDialog *od = new OpenDialog( this, p_intf, true, SELECT );
od->exec();
- ui.slaveText->setText( od->getMRL() );
+ ui.slaveText->setText( od->getMRL( false ) );
delete od;
}
projects / vlc / blobdiff