/*****************************************************************************
* open.cpp : Advanced open dialog
*****************************************************************************
- * Copyright (C) 2006-2007 the VideoLAN team
+ * Copyright © 2006-2009 the VideoLAN team
* $Id$
*
* Authors: Jean-Baptiste Kempf <jb@videolan.org>
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include "input_manager.hpp"
+#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 <QTabWidget>
#include <QGridLayout>
-#include <QFileDialog>
#include <QRegExp>
#include <QMenu>
+#define DEBUG_QT 1
+
OpenDialog *OpenDialog::instance = NULL;
-OpenDialog::OpenDialog( QWidget *parent, intf_thread_t *_p_intf, bool modal,
- int _action_flag ) : 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 )
+{
+ /* 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
+ - Modality on top of the parent dialog */
+ if( b_selectMode )
+ {
+ instance->setWindowModality( Qt::WindowModal );
+ _action_flag = SELECT; /* This should be useless, but we never know
+ 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,
+ bool _b_pl) : QVLCDialog( parent, _p_intf )
{
- setModal( modal );
i_action_flag = _action_flag;
+ b_pl =_b_pl;
+
+ /* Workaround the Win32 Vout that put the video on top at regular times */
+#ifdef WIN32
+ setWindowFlags( Qt::WindowStaysOnTopHint | Qt::Dialog );
+#endif
+
+ if( b_selectMode ) /* Select mode */
+ {
+ i_action_flag = SELECT;
+ setWindowModality( Qt::WindowModal );
+ }
/* Basic Creation of the Window */
ui.setupUi( this );
- setWindowTitle( qtr("Open" ) );
- resize( 410, 300);
+ 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" ) );
ui.Tab->insertTab( OPEN_DISC_TAB, discOpenPanel, qtr( "&Disc" ) );
ui.Tab->insertTab( OPEN_NETWORK_TAB, netOpenPanel, qtr( "&Network" ) );
ui.Tab->insertTab( OPEN_CAPTURE_TAB, captureOpenPanel,
- qtr( "Capture &Device" ) );
+ qtr( "Capture &Device" ) );
/* Hide the Slave input widgets */
ui.slaveLabel->hide();
ui.slaveText->hide();
ui.slaveBrowseButton->hide();
- /* Hide the advancedPanel */
- if(! config_GetInt( p_intf, "qt-adv-options") )
- ui.advancedFrame->hide();
- else
- ui.advancedCheckBox->setCheckState( Qt::Checked );
-
/* Buttons Creation */
- QSizePolicy buttonSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum );
- buttonSizePolicy.setHorizontalStretch(0);
- buttonSizePolicy.setVerticalStretch(0);
-
/* Play Button */
- playButton = new QToolButton( this );
- playButton->setText( qtr( "&Play" ) );
- playButton->setSizePolicy( buttonSizePolicy );
- playButton->setMinimumSize( QSize(90, 0) );
- playButton->setPopupMode( QToolButton::MenuButtonPopup );
- playButton->setToolButtonStyle( Qt::ToolButtonTextOnly );
+ playButton = ui.playButton;
/* Cancel Button */
- cancelButton = new QPushButton();
- cancelButton->setText( qtr( "&Cancel" ) );
- cancelButton->setSizePolicy( buttonSizePolicy );
+ cancelButton = new QPushButton( qtr( "&Cancel" ) );
+
+ /* Select Button */
+ selectButton = new QPushButton( qtr( "&Select" ) );
/* 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() ),
+ 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() ) ,
+ openButtonMenu->addAction( qtr( "&Stream" ), this, SLOT( stream() ) ,
QKeySequence( "Alt+S" ) );
- openButtonMenu->addAction( qtr("&Convert"), this, SLOT( transcode() ) ,
+ openButtonMenu->addAction( qtr( "&Convert" ), this, SLOT( transcode() ) ,
QKeySequence( "Alt+C" ) );
- playButton->setMenu( openButtonMenu );
+ ui.menuButton->setMenu( openButtonMenu );
+ ui.menuButton->setIcon( QIcon( ":/down_arrow" ) );
- ui.buttonsBox->addButton( playButton, QDialogButtonBox::AcceptRole );
+ /* Add the three Buttons */
+ ui.buttonsBox->addButton( selectButton, QDialogButtonBox::AcceptRole );
ui.buttonsBox->addButton( cancelButton, QDialogButtonBox::RejectRole );
+ /* At creation time, modify the default buttons */
+ setMenuAction();
+
/* Force MRL update on tab change */
- CONNECT( ui.Tab, currentChanged(int), this, signalCurrent());
+ 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.slaveText, textChanged(QString), this, updateMRL());
- CONNECT( ui.cacheSpinBox, valueChanged(int), this, updateMRL());
- CONNECT( ui.startTimeSpinBox, valueChanged(int), this, updateMRL());
- BUTTONACT( ui.advancedCheckBox , toggleAdvancedPanel() );
+ 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() );
+ BUTTONACT( ui.advancedCheckBox, toggleAdvancedPanel() );
+ BUTTONACT( ui.slaveBrowseButton, browseInputSlave() );
/* Buttons action */
- BUTTONACT( playButton, play());
- BUTTONACT( cancelButton, cancel());
+ BUTTONACT( playButton, selectSlots() );
+ BUTTONACT( selectButton, close() );
+ BUTTONACT( cancelButton, cancel() );
- /* At creation time, modify the default buttons */
- if ( i_action_flag ) setMenuAction();
+ /* Hide the advancedPanel */
+ if( !config_GetInt( p_intf, "qt-adv-options" ) )
+ ui.advancedFrame->hide();
+ else
+ ui.advancedCheckBox->setChecked( true );
/* Initialize caching */
storedMethod = "";
- newCachingMethod("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() );
+}
+
+/* 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()
{
- switch ( i_action_flag )
+ 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") );
- BUTTONACT( playButton, stream() );
+ playButton->setText( qtr( "&Stream" ) );
break;
case OPEN_AND_SAVE:
- playButton->setText( qtr("&Convert / Save") );
- BUTTONACT( playButton, transcode() );
+ playButton->setText( qtr( "&Convert / Save" ) );
break;
case OPEN_AND_ENQUEUE:
- playButton->setText( qtr("&Enqueue") );
- BUTTONACT( playButton, enqueue() );
+ playButton->setText( qtr( "&Enqueue" ) );
break;
case OPEN_AND_PLAY:
default:
- playButton->setText( qtr("&Play") );
- BUTTONACT( playButton, play() );
- }
+ playButton->setText( qtr( "&Play" ) );
+ }
+ playButton->show();
+ selectButton->hide();
+ playButton->setDefault( true );
+ }
}
-void OpenDialog::showTab( int i_tab=0 )
+void OpenDialog::showTab( int i_tab )
{
- this->show();
+ if( i_tab == OPEN_CAPTURE_TAB ) captureOpenPanel->initialize();
ui.Tab->setCurrentIndex( i_tab );
+ show();
}
-void OpenDialog::signalCurrent() {
- if (ui.Tab->currentWidget() != NULL)
- (dynamic_cast<OpenPanel *>( ui.Tab->currentWidget() ))->updateMRL();
+/* 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<OpenPanel *>( ui.Tab->currentWidget() ) )->updateMRL();
}
void OpenDialog::toggleAdvancedPanel()
{
- //FIXME does not work under Windows
- if( ui.advancedFrame->isVisible() ) {
+ if( ui.advancedFrame->isVisible() )
+ {
ui.advancedFrame->hide();
-#ifndef WIN32
- setMinimumHeight(1);
- resize( width(), mainHeight );
-#endif
- } else {
-#ifndef WIN32
- if( mainHeight == 0 )
- mainHeight = height();
-#endif
-
+ if( size().isValid() )
+ resize( size().width(), size().height()
+ - ui.advancedFrame->height() );
+ }
+ else
+ {
ui.advancedFrame->show();
-#ifndef WIN32
- if( advHeight == 0 ) {
- advHeight = height() - mainHeight;
- }
- resize( width(), mainHeight + advHeight );
-#endif
+ if( size().isValid() )
+ resize( size().width(), size().height()
+ + ui.advancedFrame->height() );
}
}
/***********
* Actions *
***********/
-
/* If Cancel is pressed or escaped */
void OpenDialog::cancel()
{
+ /* Clear the panels */
for( int i = 0; i < OPEN_TAB_MAX; i++ )
- dynamic_cast<OpenPanel*>(ui.Tab->widget( i ))->clear();
- toggleVisible();
- if( isModal() ) reject();
+ dynamic_cast<OpenPanel*>( 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()
{
- /* FIXME */
- if ( !i_action_flag )
- {
- play();
- }
+ /* 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();
}
}
-/* Play button */
void OpenDialog::play()
{
finish( false );
finish( true );
}
-void OpenDialog::transcode()
-{
- stream( true );
-}
-
-void OpenDialog::stream( bool b_transcode_only )
-{
- /* not finished FIXME */
- /* Should go through the finish function */
- THEDP->streamingDialog( mrl, b_transcode_only );
-}
void OpenDialog::finish( bool b_enqueue = false )
{
toggleVisible();
- mrl = ui.advancedLineInput->text();
- 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;
+ accept();
+ return;
+ }
- p_input = input_ItemNew( p_intf, qtu( tempMRL[i] ), NULL );
+ /* Sort alphabetically */
+ itemsMRL.sort();
- /* Insert options */
- while( i + 1 < tempMRL.size() && tempMRL[i + 1].startsWith( ":" ) )
- {
- i++;
- input_ItemAddOption( p_input, qtu( tempMRL[i] ) );
- }
+ /* Go through the item list */
+ for( int i = 0; i < itemsMRL.size(); i++ )
+ {
+ bool b_start = !i && !b_enqueue;
- /* Switch between enqueuing and starting the item */
- if( b_start )
- {
- playlist_AddInput( THEPL, p_input,
- PLAYLIST_APPEND | PLAYLIST_GO,
- PLAYLIST_END, VLC_TRUE, VLC_FALSE );
- }
- else
+ 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 */
+ 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::transcode()
+{
+ stream( true );
+}
+
+void OpenDialog::stream( bool b_transcode_only )
+{
+ 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( ":" ) );
+}
/* 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());
+ mrl += QString( " :%1=%2" ).arg( storedMethod ).
+ arg( ui.cacheSpinBox->value() );
}
- if( ui.startTimeSpinBox->value()) {
- mrl += " :start-time=" + QString("%1").
- arg(ui.startTimeSpinBox->value());
+ if( ui.startTimeSpinBox->value() ) {
+ mrl += " :start-time=" + QString( "%1" ).
+ arg( ui.startTimeSpinBox->value() );
}
- ui.advancedLineInput->setText(mrl);
+ 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;
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;
+}
projects / vlc / blobdiff