X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs_provider.cpp;h=fb9dd8b11d4fc667abd38d0d2b7f0b9eff49fa94;hb=c54636dbd4783446fcd0fe871c7c323ea781f109;hp=621accc499dc06311551b8311958aa05f28baca9;hpb=1c64dc6d09f3c5e17c6996f74965653adb009066;p=vlc diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp index 621accc499..fb9dd8b11d 100644 --- a/modules/gui/qt4/dialogs_provider.cpp +++ b/modules/gui/qt4/dialogs_provider.cpp @@ -1,7 +1,7 @@ /***************************************************************************** - * main_inteface.cpp : Main interface + * dialogs_provider.cpp : Dialog Provider ***************************************************************************** - * Copyright (C) 2006-2007 the VideoLAN team + * Copyright (C) 2006-2008 the VideoLAN team * $Id$ * * Authors: Clément Stenac @@ -21,22 +21,19 @@ * 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 -#include -#include -#include +#include -#include #include "qt4.hpp" #include "dialogs_provider.hpp" -#include "main_interface.hpp" +#include "input_manager.hpp" /* Load Subtitles */ #include "menus.hpp" -#include -#include "input_manager.hpp" +#include "recents.hpp" +#include "util/qt_dirs.hpp" /* The dialogs */ #include "dialogs/playlist.hpp" @@ -47,19 +44,29 @@ #include "dialogs/extended.hpp" #include "dialogs/vlm.hpp" #include "dialogs/sout.hpp" +#include "dialogs/convert.hpp" #include "dialogs/open.hpp" +#include "dialogs/openurl.hpp" #include "dialogs/help.hpp" #include "dialogs/gototime.hpp" #include "dialogs/podcast_configuration.hpp" +#include "dialogs/toolbar.hpp" +#include "dialogs/plugins.hpp" + +#include +#include +#include +#include + DialogsProvider* DialogsProvider::instance = NULL; DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) : QObject( NULL ), p_intf( _p_intf ) { - fixed_timer = new QTimer( this ); - fixed_timer->start( 150 /* milliseconds */ ); + b_isDying = false; + /* Various signal mappers for the menus */ menusMapper = new QSignalMapper(); CONNECT( menusMapper, mapped(QObject *), this, menuAction( QObject *) ); @@ -73,7 +80,6 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) : DialogsProvider::~DialogsProvider() { - msg_Dbg( p_intf, "Destroying the Dialog Provider" ); PlaylistDialog::killInstance(); MediaInfoDialog::killInstance(); MessagesDialog::killInstance(); @@ -83,20 +89,22 @@ DialogsProvider::~DialogsProvider() #ifdef UPDATE_CHECK UpdateDialog::killInstance(); #endif + ToolbarEditDialog::killInstance(); - fixed_timer->stop(); + delete menusMapper; + delete menusUpdateMapper; + delete SDMapper; } void DialogsProvider::quit() { - vlc_object_kill( p_intf->p_libvlc ); - QApplication::closeAllWindows(); - QApplication::quit(); + b_isDying = true; + libvlc_Quit( p_intf->p_libvlc ); } void DialogsProvider::customEvent( QEvent *event ) { - if( event->type() == DialogEvent_Type ) + if( event->type() == (int)DialogEvent_Type ) { DialogEvent *de = static_cast(event); switch( de->i_dialog ) @@ -131,8 +139,6 @@ void DialogsProvider::customEvent( QEvent *event ) case INTF_DIALOG_VLM: vlmDialog(); break; #endif - case INTF_DIALOG_INTERACTION: - doInteraction( de->p_arg ); break; case INTF_DIALOG_POPUPMENU: QVLCMenu::PopupMenu( p_intf, (de->i_arg != 0) ); break; case INTF_DIALOG_AUDIOPOPUPMENU: @@ -143,7 +149,7 @@ void DialogsProvider::customEvent( QEvent *event ) QVLCMenu::MiscPopupMenu( p_intf ); break; case INTF_DIALOG_WIZARD: case INTF_DIALOG_STREAMWIZARD: - openThenStreamingDialogs(); break; + openAndStreamingDialogs(); break; #ifdef UPDATE_CHECK case INTF_DIALOG_UPDATEVLC: updateDialog(); break; @@ -166,7 +172,8 @@ void DialogsProvider::playlistDialog() void DialogsProvider::prefsDialog() { - PrefsDialog::getInstance( p_intf )->toggleVisible(); + PrefsDialog *p = new PrefsDialog( (QWidget *)p_intf->p_sys->p_mi, p_intf ); + p->toggleVisible(); } void DialogsProvider::extendedDialog() @@ -174,6 +181,11 @@ void DialogsProvider::extendedDialog() ExtendedDialog::getInstance( p_intf )->toggleVisible(); } +void DialogsProvider::synchroDialog() +{ + ExtendedDialog::getInstance( p_intf )->showTab( 2 ); +} + void DialogsProvider::messagesDialog() { MessagesDialog::getInstance( p_intf )->toggleVisible(); @@ -228,27 +240,27 @@ void DialogsProvider::podcastConfigureDialog() PodcastConfigDialog::getInstance( p_intf )->toggleVisible(); } - -/**************************************************************************** - * All the open/add stuff - * Open Dialog first - Simple Open then - ****************************************************************************/ - -void DialogsProvider::openDialog( int i_tab ) +void DialogsProvider::toolbarDialog() { - OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf )->showTab( i_tab ); + ToolbarEditDialog::getInstance( p_intf )->toggleVisible(); } -void DialogsProvider::openDialog() + +void DialogsProvider::pluginDialog() { - openDialog( OPEN_FILE_TAB ); + PluginDialog *diag = new PluginDialog( p_intf ); + diag->show(); } + +/* Generic open file */ void DialogsProvider::openFileGenericDialog( intf_dialog_args_t *p_arg ) { if( p_arg == NULL ) { - msg_Dbg( p_intf, "openFileGenericDialog() called with NULL arg" ); + msg_Warn( p_intf, "openFileGenericDialog() called with NULL arg" ); return; } + + /* Replace the extensions to a Qt format */ int i = 0; QString extensions = qfu( p_arg->psz_extensions ); while ( ( i = extensions.indexOf( "|", i ) ) != -1 ) @@ -260,29 +272,38 @@ void DialogsProvider::openFileGenericDialog( intf_dialog_args_t *p_arg ) } extensions.replace(QString(";*"), QString(" *")); extensions.append( ")" ); + + /* Save */ if( p_arg->b_save ) { - QString file = QFileDialog::getSaveFileName( NULL, p_arg->psz_title, qfu( p_intf->p_sys->psz_filepath ), extensions ); + QString file = QFileDialog::getSaveFileName( NULL, p_arg->psz_title, + qfu( p_intf->p_sys->psz_filepath ), extensions ); if( !file.isEmpty() ) { p_arg->i_results = 1; - p_arg->psz_results = ( char ** )malloc( p_arg->i_results * sizeof( char * ) ); - p_arg->psz_results[0] = strdup( qtu( file ) ); + p_arg->psz_results = (char **)malloc( p_arg->i_results * sizeof( char * ) ); + p_arg->psz_results[0] = strdup( qtu( toNativeSepNoSlash( file ) ) ); } else p_arg->i_results = 0; } - else + else /* non-save mode */ { - QStringList files = QFileDialog::getOpenFileNames( NULL, p_arg->psz_title, qfu( p_intf->p_sys->psz_filepath ), extensions ); + QStringList files = QFileDialog::getOpenFileNames( NULL, + p_arg->psz_title, qfu( p_intf->p_sys->psz_filepath ), + extensions ); p_arg->i_results = files.count(); - p_arg->psz_results = ( char ** )malloc( p_arg->i_results * sizeof( char * ) ); + p_arg->psz_results = (char **)malloc( p_arg->i_results * sizeof( char * ) ); i = 0; - foreach( QString file, files ) - p_arg->psz_results[i++] = strdup( qtu( file ) ); + foreach( const QString &file, files ) + p_arg->psz_results[i++] = strdup( qtu( toNativeSepNoSlash( file ) ) ); } + + /* Callback */ if( p_arg->pf_callback ) p_arg->pf_callback( p_arg ); + + /* Clean afterwards */ if( p_arg->psz_results ) { for( i = 0; i < p_arg->i_results; i++ ) @@ -293,6 +314,19 @@ void DialogsProvider::openFileGenericDialog( intf_dialog_args_t *p_arg ) free( p_arg->psz_extensions ); free( p_arg ); } +/**************************************************************************** + * All the open/add stuff + * Open Dialog first - Simple Open then + ****************************************************************************/ + +void DialogsProvider::openDialog( int i_tab ) +{ + OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf )->showTab( i_tab ); +} +void DialogsProvider::openDialog() +{ + openDialog( OPEN_FILE_TAB ); +} void DialogsProvider::openFileDialog() { openDialog( OPEN_FILE_TAB ); @@ -313,18 +347,19 @@ void DialogsProvider::openCaptureDialog() /* Same as the open one, but force the enqueue */ void DialogsProvider::PLAppendDialog() { - OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false, OPEN_AND_ENQUEUE) - ->showTab( OPEN_FILE_TAB ); + OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false, + OPEN_AND_ENQUEUE )->showTab( OPEN_FILE_TAB ); } -/* Unimplemmented yet - Usefull ? */ void DialogsProvider::MLAppendDialog() -{} +{ + OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false, + OPEN_AND_ENQUEUE, false, false ) + ->showTab( OPEN_FILE_TAB ); +} /** * Simple open - * Not used anymore. Let the code until we are sure we don't want it - * Two opens make it confusing for the user. ***/ QStringList DialogsProvider::showSimpleOpen( QString help, int filters, @@ -348,9 +383,10 @@ QStringList DialogsProvider::showSimpleOpen( QString help, } ADD_FILTER_ALL( fileTypes ); fileTypes.replace(QString(";*"), QString(" *")); + return QFileDialog::getOpenFileNames( NULL, - help.isNull() ? qfu(I_OP_SEL_FILES ) : help, - path.isNull() ? qfu( p_intf->p_sys->psz_filepath ) : path, + help.isEmpty() ? qtr(I_OP_SEL_FILES ) : help, + path.isEmpty() ? qfu( p_intf->p_sys->psz_filepath ) : path, fileTypes ); } @@ -363,15 +399,16 @@ void DialogsProvider::addFromSimple( bool pl, bool go) { QStringList files = DialogsProvider::showSimpleOpen(); int i = 0; - foreach( QString file, files ) + foreach( const QString &file, files ) { - const char * psz_utf8 = qtu( file ); - playlist_Add( THEPL, psz_utf8, NULL, + playlist_Add( THEPL, qtu( toNativeSeparators( file ) ), NULL, go ? ( PLAYLIST_APPEND | ( i ? 0 : PLAYLIST_GO ) | ( i ? PLAYLIST_PREPARSE : 0 ) ) : ( PLAYLIST_APPEND | PLAYLIST_PREPARSE ), PLAYLIST_END, pl ? true : false, false ); + RecentsMRL::getInstance( p_intf )->addRecent( + toNativeSeparators( file ) ); i++; } } @@ -391,6 +428,30 @@ void DialogsProvider::simpleMLAppendDialog() addFromSimple( false, false ); } +/* Url & Clipboard */ +/** + * Open a MRL. + * If the clipboard contains URLs, the first is automatically 'preselected'. + **/ +void DialogsProvider::openUrlDialog() +{ + OpenUrlDialog *oud = OpenUrlDialog::getInstance( p_intf->p_sys->p_mi, + p_intf ); + if( oud->exec() == QDialog::Accepted ) + { + QString url = oud->url(); + if( !url.isEmpty() ) + { + playlist_Add( THEPL, qtu( url ), + NULL, !oud->shouldEnqueue() ? + ( PLAYLIST_APPEND | PLAYLIST_GO ) + : ( PLAYLIST_APPEND | PLAYLIST_PREPARSE ), + PLAYLIST_END, true, false ); + RecentsMRL::getInstance( p_intf )->addRecent( url ); + } + } +} + /* Directory */ /** * Open a directory, @@ -399,21 +460,30 @@ void DialogsProvider::simpleMLAppendDialog() **/ static void openDirectory( intf_thread_t *p_intf, bool pl, bool go ) { - QString dir = QFileDialog::getExistingDirectory( 0, qtr("Open Directory") ); - if (!dir.isEmpty()) { - input_item_t *p_input = input_ItemNewExt( THEPL, - qtu( "directory://" + dir ), NULL, - 0, NULL, -1 ); + QString dir = QFileDialog::getExistingDirectory( NULL, qtr("Open Directory") ); + + if (!dir.isEmpty() ) + { + QString mrl = dir.endsWith( "VIDEO_TS", Qt::CaseInsensitive ) ? + "dvd://" : "directory://" + toNativeSeparators( dir ); + input_item_t *p_input = input_item_New( THEPL, qtu( mrl ), NULL ); /* FIXME: playlist_AddInput() can fail */ playlist_AddInput( THEPL, p_input, go ? ( PLAYLIST_APPEND | PLAYLIST_GO ) : PLAYLIST_APPEND, PLAYLIST_END, pl, pl_Unlocked ); - input_Read( THEPL, p_input, false ); + RecentsMRL::getInstance( p_intf )->addRecent( mrl ); + if( !go ) + input_Read( THEPL, p_input, true ); vlc_gc_decref( p_input ); } } +void DialogsProvider::PLOpenDir() +{ + openDirectory( p_intf, true, true ); +} + void DialogsProvider::PLAppendDir() { openDirectory( p_intf, true, false ); @@ -429,21 +499,22 @@ void DialogsProvider::MLAppendDir() ****************/ void DialogsProvider::openAPlaylist() { - QStringList files = showSimpleOpen( qtr( "Open playlist file" ), + QStringList files = showSimpleOpen( qtr( "Open playlist..." ), EXT_FILTER_PLAYLIST ); - foreach( QString file, files ) + foreach( const QString &file, files ) { - playlist_Import( THEPL, qtu(file) ); + playlist_Import( THEPL, qtu( toNativeSeparators( file ) ) ); } } void DialogsProvider::saveAPlaylist() { QFileDialog *qfd = new QFileDialog( NULL, - qtr( "Choose a filename to save playlist" ), + qtr( "Save playlist as..." ), qfu( p_intf->p_sys->psz_filepath ), qtr( "XSPF playlist (*.xspf);; " ) + - qtr( "M3U playlist (*.m3u);; Any (*.*) " ) ); + qtr( "M3U playlist (*.m3u);; " ) + + qtr( "HTML playlist (*.html)" ) ); qfd->setFileMode( QFileDialog::AnyFile ); qfd->setAcceptMode( QFileDialog::AcceptSave ); qfd->setConfirmOverwrite( true ); @@ -453,82 +524,170 @@ void DialogsProvider::saveAPlaylist() if( qfd->selectedFiles().count() > 0 ) { static const char psz_xspf[] = "export-xspf", - psz_m3u[] = "export-m3u"; + psz_m3u[] = "export-m3u", + psz_html[] = "export-html"; const char *psz_module; QString file = qfd->selectedFiles().first(); QString filter = qfd->selectedFilter(); - if( file.contains( ".xsp" ) || - ( filter.contains( ".xspf" ) && !file.contains( ".m3u" ) ) ) + if( file.contains( ".xsp" ) || filter.contains( "XSPF" ) ) { psz_module = psz_xspf; if( !file.contains( ".xsp" ) ) file.append( ".xspf" ); } - else + else if( file.contains( ".m3u" ) || filter.contains( "M3U" ) ) { psz_module = psz_m3u; if( !file.contains( ".m3u" ) ) file.append( ".m3u" ); } + else if( file.contains(".html" ) || filter.contains( "HTML" ) ) + { + psz_module = psz_html; + if( !file.contains( "html" ) ) + file.append( ".html" ); + } + else + { + msg_Err( p_intf, "Impossible to recognise the file type" ); + delete qfd; + return; + } - playlist_Export( THEPL, qtu( file ), THEPL->p_local_category, - psz_module); + playlist_Export( THEPL, qtu( toNativeSeparators( file ) ), + THEPL->p_local_category, psz_module); } } delete qfd; } - /**************************************************************************** * Sout emulation ****************************************************************************/ -void DialogsProvider::streamingDialog( QWidget *parent, QString mrl, - bool b_transcode_only ) +void DialogsProvider::streamingDialog( QWidget *parent, + QString mrl, + bool b_transcode_only, + QStringList options ) { - SoutDialog *s = SoutDialog::getInstance( parent, p_intf, b_transcode_only ); + char *psz_soutoption; - if( s->exec() == QDialog::Accepted ) + /* Stream */ + if( !b_transcode_only ) { - msg_Dbg( p_intf, "Sout mrl %s", qta( s->getMrl() ) ); - /* Just do it */ - int i_len = strlen( qtu( s->getMrl() ) ) + 10; - char *psz_option = (char*)malloc( i_len ); - snprintf( psz_option, i_len - 1, "%s", qtu( s->getMrl() ) ); - - playlist_AddExt( THEPL, qtu( mrl ), "Streaming", - PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END, - -1, &psz_option, 1, true, pl_Unlocked ); + SoutDialog *s = new SoutDialog( parent, p_intf, mrl ); + if( s->exec() == QDialog::Accepted ) + { + psz_soutoption = strdup( qtu( s->getMrl() ) ); + delete s; + } + else + { + delete s; return; + } + } else { + /* Convert */ + ConvertDialog *s = new ConvertDialog( parent, p_intf, mrl ); + if( s->exec() == QDialog::Accepted ) + { + psz_soutoption = strdup( qtu( s->getMrl() ) ); + delete s; + } + else + { + delete s; return; + } } + + /* Get SoutMRL */ + if( !EMPTY_STR( psz_soutoption ) ) + { + /* Create Input */ + input_item_t *p_input; + p_input = input_item_New( p_intf, qtu( mrl ), _("Streaming") ); + + /* Add normal Options */ + for( int j = 0; j < options.size(); j++ ) + { + QString qs = colon_unescape( options[j] ); + if( !qs.isEmpty() ) + { + input_item_AddOption( p_input, qtu( qs ), + VLC_INPUT_OPTION_TRUSTED ); + } + } + + /* Add SoutMRL */ + msg_Dbg( p_intf, "Streaming MRL is: %s", psz_soutoption ); + input_item_AddOption( p_input, psz_soutoption, VLC_INPUT_OPTION_TRUSTED ); + + /* Switch between enqueuing and starting the item */ + /* FIXME: playlist_AddInput() can fail */ + playlist_AddInput( THEPL, p_input, + PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END, true, pl_Unlocked ); + vlc_gc_decref( p_input ); + + RecentsMRL::getInstance( p_intf )->addRecent( mrl ); + } + free( psz_soutoption ); } -void DialogsProvider::openThenStreamingDialogs() +void DialogsProvider::openAndStreamingDialogs() { OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false, OPEN_AND_STREAM ) ->showTab( OPEN_FILE_TAB ); } -void DialogsProvider::openThenTranscodingDialogs() +void DialogsProvider::openAndTranscodingDialogs() { OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, false, OPEN_AND_SAVE ) ->showTab( OPEN_FILE_TAB ); } +void DialogsProvider::loadSubtitlesFile() +{ + input_thread_t *p_input = THEMIM->getInput(); + if( !p_input ) return; + + input_item_t *p_item = input_GetItem( p_input ); + if( !p_item ) return; + + char *path = input_item_GetURI( p_item ); + if( !path ) path = strdup( "" ); + + char *sep = strrchr( path, DIR_SEP_CHAR ); + if( sep ) *sep = '\0'; + + QStringList qsl = showSimpleOpen( qtr( "Open subtitles..." ), + EXT_FILTER_SUBTITLE, + path ); + free( path ); + foreach( const QString &qsFile, qsl ) + { + if( input_AddSubtitle( p_input, qtu( toNativeSeparators( qsFile ) ), + true ) ) + msg_Warn( p_intf, "unable to load subtitles from '%s'", + qtu( qsFile ) ); + } +} + + /**************************************************************************** - * Menus / Interaction + * Menus ****************************************************************************/ void DialogsProvider::menuAction( QObject *data ) { - QVLCMenu::DoAction( p_intf, data ); + QVLCMenu::DoAction( data ); } void DialogsProvider::menuUpdateAction( QObject *data ) { - MenuFunc * f = qobject_cast(data); - f->doFunc( p_intf ); + MenuFunc *func = qobject_cast(data); + assert( func ); + func->doFunc( p_intf ); } void DialogsProvider::SDMenuAction( QString data ) @@ -541,60 +700,13 @@ void DialogsProvider::SDMenuAction( QString data ) free( psz_sd ); } -void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg ) +/** + * Play the MRL contained in the Recently played menu. + **/ +void DialogsProvider::playMRL( const QString &mrl ) { - InteractionDialog *qdialog; - interaction_dialog_t *p_dialog = p_arg->p_dialog; - switch( p_dialog->i_action ) - { - case INTERACT_NEW: - qdialog = new InteractionDialog( p_intf, p_dialog ); - p_dialog->p_private = (void*)qdialog; - if( !(p_dialog->i_status == ANSWERED_DIALOG) ) - qdialog->show(); - break; - case INTERACT_UPDATE: - qdialog = (InteractionDialog*)(p_dialog->p_private); - if( qdialog ) - qdialog->update(); - else - { - /* The INTERACT_NEW message was forgotten - so we must create the dialog and update it*/ - qdialog = new InteractionDialog( p_intf, p_dialog ); - p_dialog->p_private = (void*)qdialog; - if( !(p_dialog->i_status == ANSWERED_DIALOG) ) - qdialog->show(); - if( qdialog ) - qdialog->update(); - } - break; - case INTERACT_HIDE: - qdialog = (InteractionDialog*)(p_dialog->p_private); - if( qdialog ) - qdialog->hide(); - p_dialog->i_status = HIDDEN_DIALOG; - break; - case INTERACT_DESTROY: - qdialog = (InteractionDialog*)(p_dialog->p_private); - if( !p_dialog->i_flags & DIALOG_NONBLOCKING_ERROR ) - delete qdialog; - p_dialog->i_status = DESTROYED_DIALOG; - break; - } -} + playlist_Add( THEPL, qtu( mrl ) , NULL, + PLAYLIST_APPEND | PLAYLIST_GO , PLAYLIST_END, true, false ); -void DialogsProvider::loadSubtitlesFile() -{ - input_thread_t *p_input = THEMIM->getInput(); - if( !p_input ) - return; - QString qsFile = QFileDialog::getOpenFileName( - NULL, - qtr( "Choose subtitles file" ), - "", - qtr( "Subtitles files (*.cdg *.idx *.srt *.sub *.utf);;" - "All files (*)" ) ); - if( !input_AddSubtitles( p_input, qtu( qsFile ), true ) ) - msg_Warn( p_intf, "unable to load subtitles file..." ); + RecentsMRL::getInstance( p_intf )->addRecent( mrl ); }