X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs_provider.cpp;h=fb9dd8b11d4fc667abd38d0d2b7f0b9eff49fa94;hb=c54636dbd4783446fcd0fe871c7c323ea781f109;hp=879980ad931433737e7c8df605024f4bff7a75d3;hpb=22168eab8bdf29606b3c64fd216a86f684866d97;p=vlc diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp index 879980ad93..fb9dd8b11d 100644 --- a/modules/gui/qt4/dialogs_provider.cpp +++ b/modules/gui/qt4/dialogs_provider.cpp @@ -26,16 +26,14 @@ # include "config.h" #endif -#include #include #include "qt4.hpp" #include "dialogs_provider.hpp" -#include "main_interface.hpp" +#include "input_manager.hpp" /* Load Subtitles */ #include "menus.hpp" -#include "input_manager.hpp" #include "recents.hpp" -#include "util/qvlcapp.hpp" +#include "util/qt_dirs.hpp" /* The dialogs */ #include "dialogs/playlist.hpp" @@ -46,10 +44,14 @@ #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 @@ -78,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(); @@ -88,6 +89,7 @@ DialogsProvider::~DialogsProvider() #ifdef UPDATE_CHECK UpdateDialog::killInstance(); #endif + ToolbarEditDialog::killInstance(); delete menusMapper; delete menusUpdateMapper; @@ -96,12 +98,8 @@ DialogsProvider::~DialogsProvider() void DialogsProvider::quit() { - /* Stop the playlist */ - playlist_Stop( THEPL ); b_isDying = true; - vlc_object_kill( p_intf->p_libvlc ); - QApplication::closeAllWindows(); - QApplication::quit(); + libvlc_Quit( p_intf->p_libvlc ); } void DialogsProvider::customEvent( QEvent *event ) @@ -141,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: @@ -176,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() @@ -184,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(); @@ -238,6 +240,17 @@ void DialogsProvider::podcastConfigureDialog() PodcastConfigDialog::getInstance( p_intf )->toggleVisible(); } +void DialogsProvider::toolbarDialog() +{ + ToolbarEditDialog::getInstance( p_intf )->toggleVisible(); +} + +void DialogsProvider::pluginDialog() +{ + PluginDialog *diag = new PluginDialog( p_intf ); + diag->show(); +} + /* Generic open file */ void DialogsProvider::openFileGenericDialog( intf_dialog_args_t *p_arg ) { @@ -282,7 +295,7 @@ void DialogsProvider::openFileGenericDialog( intf_dialog_args_t *p_arg ) p_arg->i_results = files.count(); p_arg->psz_results = (char **)malloc( p_arg->i_results * sizeof( char * ) ); i = 0; - foreach( QString file, files ) + foreach( const QString &file, files ) p_arg->psz_results[i++] = strdup( qtu( toNativeSepNoSlash( file ) ) ); } @@ -372,7 +385,7 @@ QStringList DialogsProvider::showSimpleOpen( QString help, fileTypes.replace(QString(";*"), QString(" *")); return QFileDialog::getOpenFileNames( NULL, - help.isEmpty() ? qfu(I_OP_SEL_FILES ) : help, + help.isEmpty() ? qtr(I_OP_SEL_FILES ) : help, path.isEmpty() ? qfu( p_intf->p_sys->psz_filepath ) : path, fileTypes ); } @@ -386,7 +399,7 @@ void DialogsProvider::addFromSimple( bool pl, bool go) { QStringList files = DialogsProvider::showSimpleOpen(); int i = 0; - foreach( QString file, files ) + foreach( const QString &file, files ) { playlist_Add( THEPL, qtu( toNativeSeparators( file ) ), NULL, go ? ( PLAYLIST_APPEND | ( i ? 0 : PLAYLIST_GO ) | @@ -415,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, @@ -427,11 +464,9 @@ static void openDirectory( intf_thread_t *p_intf, bool pl, bool go ) if (!dir.isEmpty() ) { - QString mrl = dir.endsWith( "VIDEO_TS", Qt::CaseInsensitive ) - ? "dvd://" : "directory://" + toNativeSeparators( dir ); - msg_Dbg( p_intf, "Directory opening: %s", qtu( dir ) ); - input_item_t *p_input = input_item_NewExt( THEPL, qtu( mrl ), - NULL, 0, NULL, -1 ); + 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, @@ -466,7 +501,7 @@ void DialogsProvider::openAPlaylist() { QStringList files = showSimpleOpen( qtr( "Open playlist..." ), EXT_FILTER_PLAYLIST ); - foreach( QString file, files ) + foreach( const QString &file, files ) { playlist_Import( THEPL, qtu( toNativeSeparators( file ) ) ); } @@ -478,7 +513,8 @@ void DialogsProvider::saveAPlaylist() 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 ); @@ -488,25 +524,37 @@ 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( toNativeSeparators( file ) ), THEPL->p_local_category, psz_module); @@ -519,24 +567,71 @@ void DialogsProvider::saveAPlaylist() * 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::openAndStreamingDialogs() @@ -569,10 +664,9 @@ void DialogsProvider::loadSubtitlesFile() EXT_FILTER_SUBTITLE, path ); free( path ); - QString qsFile; - foreach( qsFile, qsl ) + foreach( const QString &qsFile, qsl ) { - if( !input_AddSubtitles( p_input, qtu( toNativeSeparators( qsFile ) ), + if( input_AddSubtitle( p_input, qtu( toNativeSeparators( qsFile ) ), true ) ) msg_Warn( p_intf, "unable to load subtitles from '%s'", qtu( qsFile ) ); @@ -586,7 +680,7 @@ void DialogsProvider::loadSubtitlesFile() void DialogsProvider::menuAction( QObject *data ) { - QVLCMenu::DoAction( p_intf, data ); + QVLCMenu::DoAction( data ); } void DialogsProvider::menuUpdateAction( QObject *data ) @@ -598,11 +692,12 @@ void DialogsProvider::menuUpdateAction( QObject *data ) void DialogsProvider::SDMenuAction( QString data ) { - char *psz_sd = qtu( data ); + char *psz_sd = strdup( qtu( data ) ); if( !playlist_IsServicesDiscoveryLoaded( THEPL, psz_sd ) ) playlist_ServicesDiscoveryAdd( THEPL, psz_sd ); else playlist_ServicesDiscoveryRemove( THEPL, psz_sd ); + free( psz_sd ); } /** @@ -610,60 +705,8 @@ void DialogsProvider::SDMenuAction( QString data ) **/ void DialogsProvider::playMRL( const QString &mrl ) { - input_item_t *p_input = input_item_New( p_intf, - qtu( mrl ), NULL ); - playlist_AddInput( THEPL, p_input, PLAYLIST_GO, - PLAYLIST_END, true, pl_Unlocked ); - vlc_gc_decref( p_input ); + playlist_Add( THEPL, qtu( mrl ) , NULL, + PLAYLIST_APPEND | PLAYLIST_GO , PLAYLIST_END, true, false ); RecentsMRL::getInstance( p_intf )->addRecent( mrl ); } - -/************************************* - * Interactions - *************************************/ -void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg ) -{ - 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: - msg_Dbg( p_intf, "Hide the Interaction Dialog" ); - qdialog = (InteractionDialog*)(p_dialog->p_private); - if( qdialog ) - qdialog->hide(); - p_dialog->i_status = HIDDEN_DIALOG; - break; - case INTERACT_DESTROY: - msg_Dbg( p_intf, "Destroy the Interaction Dialog" ); - qdialog = (InteractionDialog*)(p_dialog->p_private); - if( !p_dialog->i_flags & DIALOG_NONBLOCKING_ERROR ) - delete qdialog; - p_dialog->i_status = DESTROYED_DIALOG; - break; - } -} -